[pywin32-checkins] pywin32/com/win32com/src PyStorage.cpp,1.6,1.7

[Trent M. <tm...@us...>]

Update of /cvsroot/pywin32/pywin32/com/win32com/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15678

Modified Files:
	PyStorage.cpp 
Log Message:
Patch to remove a dep on a specific version of ole32.dll that kills "import
pythoncom" on WinNT and Win98 (at least). r=mhammond


Index: PyStorage.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/src/PyStorage.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** PyStorage.cpp	7 Jan 2005 06:54:55 -0000	1.6
--- PyStorage.cpp	10 Feb 2005 02:23:21 -0000	1.7
***************
*** 222,226 ****
  	if (!PyWinObject_AsIID(obfmtid, &fmtid))
  		return NULL;
! 	err=FmtIdToPropStgName(&fmtid, oszName);
  	if (err!=S_OK)
  		return PyCom_BuildPyException(err);
--- 222,235 ----
  	if (!PyWinObject_AsIID(obfmtid, &fmtid))
  		return NULL;
! 
! 	typedef HRESULT (WINAPI * PFNFmtIdToPropStgName)(const FMTID*, LPOLESTR);
! 	HMODULE hmod = GetModuleHandle(TEXT("ole32.dll"));
! 	PFNFmtIdToPropStgName pfnFmtIdToPropStgName = (PFNFmtIdToPropStgName)GetProcAddress(hmod, "FmtIdToPropStgName");
! 	if (pfnFmtIdToPropStgName==NULL)
! 		return PyCom_BuildPyException(E_NOTIMPL);
! 	PY_INTERFACE_PRECALL;
! 	err = (*pfnFmtIdToPropStgName)(&fmtid, oszName);
! 	PY_INTERFACE_POSTCALL;
! 
  	if (err!=S_OK)
  		return PyCom_BuildPyException(err);
***************
*** 240,244 ****
  	if (!PyWinObject_AsWCHAR(obName,&oszName))
  		return NULL;
! 	err=PropStgNameToFmtId(oszName,&fmtid);
  	PyWinObject_FreeWCHAR(oszName);
  	if (err!=S_OK)
--- 249,262 ----
  	if (!PyWinObject_AsWCHAR(obName,&oszName))
  		return NULL;
! 
! 	typedef HRESULT (WINAPI * PFNPropStgNameToFmtId)(const LPOLESTR, FMTID*);
! 	HMODULE hmod = GetModuleHandle(TEXT("ole32.dll"));
! 	PFNPropStgNameToFmtId pfnPropStgNameToFmtId = (PFNPropStgNameToFmtId)GetProcAddress(hmod, "PropStgNameToFmtId");
! 	if (pfnPropStgNameToFmtId==NULL)
! 		return PyCom_BuildPyException(E_NOTIMPL);
! 	PY_INTERFACE_PRECALL;
! 	err = (*pfnPropStgNameToFmtId)(oszName, &fmtid);
! 	PY_INTERFACE_POSTCALL;
! 
  	PyWinObject_FreeWCHAR(oszName);
  	if (err!=S_OK)