[pywin32-checkins] pywin32/win32/src win32security.i,1.37,1.38

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/pywin32/pywin32/win32/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25854/win32/src

Modified Files:
	win32security.i 
Log Message:
Fix 's#' 64 bit issues

Index: win32security.i
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/src/win32security.i,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** win32security.i	24 May 2007 06:01:06 -0000	1.37
--- win32security.i	28 May 2007 23:25:43 -0000	1.38
***************
*** 152,159 ****
  PyObject *PyWinObject_FromSecHandle(PSecHandle h)
  {
! 	ULARGE_INTEGER ul;
! 	ul.LowPart=h->dwLower;
! 	ul.HighPart=h->dwUpper;
! 	return PyWinObject_FromULARGE_INTEGER(ul);
  }
  
--- 152,161 ----
  PyObject *PyWinObject_FromSecHandle(PSecHandle h)
  {
! 	// SecInvalidateHandle sets both parts of struct to -1.
! 	// PyWinObject_FromULARGE_INTEGER which was formerly used to translate to a long returned this as -1,
! 	// but _PyLong_FromByteArray returns it as a large positive integer
! 	if (!SecIsValidHandle(h))
! 		return PyLong_FromLong(-1);
! 	return _PyLong_FromByteArray((unsigned char *)h, sizeof(*h), TRUE, FALSE);
  }
  
***************
*** 426,444 ****
  }
  
  BOOL PyWinObject_AsLSA_UNICODE_STRING(PyObject *obstr, LSA_UNICODE_STRING *plsaus, BOOL bNoneOk)
  {
! 	TCHAR *ret_string = NULL;
! 	USHORT strlen = 0;
! 	if (!PyWinObject_AsTCHAR(obstr, &ret_string, bNoneOk)) {
! 		plsaus->Buffer = ret_string;
  		return FALSE;
! 	}
! 	if (ret_string == NULL)
! 		strlen=0;
! 	else
! 		strlen = wcslen(ret_string);
! 	plsaus->Buffer = ret_string;
! 	plsaus->Length = strlen * sizeof(WCHAR);
! 	plsaus->MaximumLength= (strlen+1) * sizeof(WCHAR);
  	return TRUE;
  }
--- 428,463 ----
  }
  
+ BOOL PyWinObject_AsLSA_STRING(PyObject *obname, PLSA_STRING plsas)
+ {
+ 	Py_ssize_t len;
+ 	if (PyString_AsStringAndSize(obname, &plsas->Buffer, &len)==-1)
+ 		return FALSE;
+ 	if (len>USHRT_MAX){
+ 		PyErr_Format(PyExc_ValueError,"String can be at most %d characters", USHRT_MAX);
+ 		return FALSE;
+ 		}
+ 	plsas->Length=(USHORT)len;
+ 	plsas->MaximumLength=plsas->Length;
+ 	return TRUE;
+ }
+ 
  BOOL PyWinObject_AsLSA_UNICODE_STRING(PyObject *obstr, LSA_UNICODE_STRING *plsaus, BOOL bNoneOk)
  {
! 	DWORD len = 0;
! 	ZeroMemory(plsaus, sizeof(plsaus));
! 	if (!PyWinObject_AsWCHAR(obstr, &plsaus->Buffer, bNoneOk, &len))
  		return FALSE;
! 	// Length is in bytes, not characters, and does not include null terminator
! 	static USHORT max_len = USHRT_MAX/sizeof(WCHAR) - 1;
! 	if (len > max_len){
! 		PyErr_Format(PyExc_ValueError,"String can be at most %d characters", max_len);
! 		PyWinObject_FreeWCHAR(plsaus->Buffer);
! 		plsaus->Buffer=NULL;
! 		return FALSE;
! 		}
! 	if (plsaus->Buffer){
! 		plsaus->Length = (USHORT)len * sizeof(WCHAR);
! 		plsaus->MaximumLength=plsaus->Length+sizeof(WCHAR);
! 		}
  	return TRUE;
  }
***************
*** 628,632 ****
  	ADD_UNICODE_CONSTANT(SE_REMOTE_INTERACTIVE_LOGON_NAME);
  	ADD_UNICODE_CONSTANT(SE_DENY_REMOTE_INTERACTIVE_LOGON_NAME);
! 	
  	PyDict_SetItemString(d,"MSV1_0_PACKAGE_NAME",PyString_FromString(MSV1_0_PACKAGE_NAME));
  	PyDict_SetItemString(d,"MICROSOFT_KERBEROS_NAME_A",PyString_FromString(MICROSOFT_KERBEROS_NAME_A));
--- 647,659 ----
  	ADD_UNICODE_CONSTANT(SE_REMOTE_INTERACTIVE_LOGON_NAME);
  	ADD_UNICODE_CONSTANT(SE_DENY_REMOTE_INTERACTIVE_LOGON_NAME);
! 	ADD_UNICODE_CONSTANT(SE_IMPERSONATE_NAME);
! 	ADD_UNICODE_CONSTANT(SE_CREATE_GLOBAL_NAME);
! 	/*
! 	ADD_UNICODE_CONSTANT(SE_TRUSTED_CREDMAN_ACCESS_NAME);
! 	ADD_UNICODE_CONSTANT(SE_RELABEL_NAME);
! 	ADD_UNICODE_CONSTANT(SE_INC_WORKING_SET_NAME);
! 	ADD_UNICODE_CONSTANT(SE_TIME_ZONE_NAME);
! 	ADD_UNICODE_CONSTANT(SE_CREATE_SYMBOLIC_LINK_NAME);
! 	*/
  	PyDict_SetItemString(d,"MSV1_0_PACKAGE_NAME",PyString_FromString(MSV1_0_PACKAGE_NAME));
  	PyDict_SetItemString(d,"MICROSOFT_KERBEROS_NAME_A",PyString_FromString(MICROSOFT_KERBEROS_NAME_A));
***************
*** 1637,1643 ****
  			TOKEN_SOURCE *ts = (TOKEN_SOURCE *)buf;
  			PLUID pluid = &ts->SourceIdentifier;
! 			PyObject *obluid = PyWinObject_FromLARGE_INTEGER(*((LARGE_INTEGER *) pluid));
! 			ret = Py_BuildValue("(s#O)",ts->SourceName,8,obluid);
! 			Py_DECREF(obluid);
  			break;
  			}
--- 1664,1670 ----
  			TOKEN_SOURCE *ts = (TOKEN_SOURCE *)buf;
  			PLUID pluid = &ts->SourceIdentifier;
! 			ret = Py_BuildValue("NN",
! 				PyString_FromStringAndSize(ts->SourceName,8),
! 				PyWinObject_FromLARGE_INTEGER(*((LARGE_INTEGER *) pluid)));
  			break;
  			}
***************
*** 2062,2076 ****
  		return NULL;
  	if (!PyWinObject_AsLSA_UNICODE_STRING(obsystem_name, &system_name, TRUE))
! 		goto done;
  
  	ntsResult = LsaOpenPolicy(&system_name, &ObjectAttributes, access_mask, &lsahPolicyHandle);
! 	if (ntsResult != STATUS_SUCCESS){
  		PyWin_SetAPIError("LsaOpenPolicy",LsaNtStatusToWinError(ntsResult));
! 		goto done;
! 		}
! 	ret = PyWinObject_FromLSA_HANDLE(lsahPolicyHandle);
! 	done:
! 		PyWinObject_FreeTCHAR(system_name.Buffer);
! 		return ret;
  }
  %}
--- 2089,2101 ----
  		return NULL;
  	if (!PyWinObject_AsLSA_UNICODE_STRING(obsystem_name, &system_name, TRUE))
! 		return NULL;
  
  	ntsResult = LsaOpenPolicy(&system_name, &ObjectAttributes, access_mask, &lsahPolicyHandle);
! 	if (ntsResult != STATUS_SUCCESS)
  		PyWin_SetAPIError("LsaOpenPolicy",LsaNtStatusToWinError(ntsResult));
! 	else
! 		ret = PyWinObject_FromLSA_HANDLE(lsahPolicyHandle);
! 	PyWinObject_FreeWCHAR(system_name.Buffer);
! 	return ret;
  }
  %}
***************
*** 2967,2976 ****
  	HANDLE lsahandle;
  	NTSTATUS err;
  	LSA_STRING LogonProcessName;
  	LSA_OPERATIONAL_MODE dummy;   // sdk says this should be ignored
  	// @pyparm string|LogonProcessName||Name to use for this logon process
! 	if (!PyArg_ParseTuple(args, "s#:LsaRegisterLogonProcess", &LogonProcessName.Buffer, &LogonProcessName.Length))
  		return NULL;
- 	LogonProcessName.MaximumLength=LogonProcessName.Length+1;
  	err=(*pfnLsaRegisterLogonProcess)(&LogonProcessName, &lsahandle, &dummy);
  	if (err==STATUS_SUCCESS)
--- 2992,3003 ----
  	HANDLE lsahandle;
  	NTSTATUS err;
+ 	PyObject *obname;
  	LSA_STRING LogonProcessName;
  	LSA_OPERATIONAL_MODE dummy;   // sdk says this should be ignored
  	// @pyparm string|LogonProcessName||Name to use for this logon process
! 	if (!PyArg_ParseTuple(args, "O:LsaRegisterLogonProcess", &obname))
! 		return NULL;
! 	if (!PyWinObject_AsLSA_STRING(obname, &LogonProcessName))
  		return NULL;
  	err=(*pfnLsaRegisterLogonProcess)(&LogonProcessName, &lsahandle, &dummy);
  	if (err==STATUS_SUCCESS)
***************
*** 3028,3042 ****
  	NTSTATUS err;
  	HANDLE lsahandle;
! 	PyObject *obhandle;
  	LSA_STRING packagename;
  	ULONG packageid;
  	// @pyparm <o PyLsaLogon_HANDLE>|LsaHandle||An Lsa handle as returned by <om win32security.LsaConnectUntrusted> or <om win32security.LsaRegisterLogonProcess>
  	// @pyparm string|PackageName||Name of security package to be identified
! 	if (!PyArg_ParseTuple(args,"Os#:LsaLookupAuthenticationPackage", &obhandle, &packagename.Buffer, &packagename.Length))
  		return NULL;
  	if (!PyWinObject_AsHANDLE(obhandle, &lsahandle, FALSE))
  		return NULL;
! 
! 	packagename.MaximumLength=packagename.Length+1;
  	err=(*pfnLsaLookupAuthenticationPackage)(lsahandle, &packagename, &packageid);
  	if (err!=STATUS_SUCCESS)
--- 3055,3070 ----
  	NTSTATUS err;
  	HANDLE lsahandle;
! 	PyObject *obhandle, *obname;
  	LSA_STRING packagename;
  	ULONG packageid;
  	// @pyparm <o PyLsaLogon_HANDLE>|LsaHandle||An Lsa handle as returned by <om win32security.LsaConnectUntrusted> or <om win32security.LsaRegisterLogonProcess>
  	// @pyparm string|PackageName||Name of security package to be identified
! 	if (!PyArg_ParseTuple(args,"OO:LsaLookupAuthenticationPackage",
! 		&obhandle, &obname))
  		return NULL;
  	if (!PyWinObject_AsHANDLE(obhandle, &lsahandle, FALSE))
  		return NULL;
! 	if (!PyWinObject_AsLSA_STRING(obname, &packagename))
! 		return NULL;
  	err=(*pfnLsaLookupAuthenticationPackage)(lsahandle, &packagename, &packageid);
  	if (err!=STATUS_SUCCESS)

[pywin32-checkins] pywin32/win32/src win32security.i,1.37,1.38

OLD project page for the Python extensions for Windows

[pywin32-checkins] pywin32/win32/src win32security.i,1.37,1.38