[pywin32-checkins] pywin32/com/win32comext/shell/src shell.cpp,1.39,1.40

[Mark H. <mha...@us...>]

Update of /cvsroot/pywin32/pywin32/com/win32comext/shell/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10701/com/win32comext/shell/src

Modified Files:
	shell.cpp 
Log Message:
Add .dll when doing a LoadLibrary of shlwapi and fix indentation of
closing braces.


Index: shell.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32comext/shell/src/shell.cpp,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** shell.cpp	18 Oct 2005 00:36:05 -0000	1.39
--- shell.cpp	20 Oct 2005 22:30:58 -0000	1.40
***************
*** 2224,2228 ****
  		pfnSHILCreateFromPath=(PFNSHILCreateFromPath)GetProcAddress(shell32, "SHILCreateFromPath");
  		pfnSHShellFolderView_Message=(PFNSHShellFolderView_Message)GetProcAddress(shell32, "SHShellFolderView_Message");
! 		}
  	// SHGetFolderPath comes from shfolder.dll on older systems
  	if (pfnSHGetFolderPath==NULL){
--- 2224,2228 ----
  		pfnSHILCreateFromPath=(PFNSHILCreateFromPath)GetProcAddress(shell32, "SHILCreateFromPath");
  		pfnSHShellFolderView_Message=(PFNSHShellFolderView_Message)GetProcAddress(shell32, "SHShellFolderView_Message");
! 	}
  	// SHGetFolderPath comes from shfolder.dll on older systems
  	if (pfnSHGetFolderPath==NULL){
***************
*** 2232,2244 ****
  		if (shfolder!=NULL)
  			pfnSHGetFolderPath=(PFNSHGetFolderPath)GetProcAddress(shfolder, "SHGetFolderPathW");
! 		}
  
! 	shlwapi=GetModuleHandle(TEXT("shlwapi"));
  	if (shlwapi==NULL)
! 		shlwapi=LoadLibrary(TEXT("shlwapi"));
  	if (shlwapi!=NULL){
  		pfnSHGetViewStatePropertyBag=(PFNSHGetViewStatePropertyBag)GetProcAddress(shlwapi, "SHGetViewStatePropertyBag");
  		pfnAssocCreate=(PFNAssocCreate)GetProcAddress(shlwapi, "AssocCreate");
! 		}
  
  	ADD_CONSTANT(SLR_NO_UI);
--- 2232,2244 ----
  		if (shfolder!=NULL)
  			pfnSHGetFolderPath=(PFNSHGetFolderPath)GetProcAddress(shfolder, "SHGetFolderPathW");
! 	}
  
! 	shlwapi=GetModuleHandle(TEXT("shlwapi.dll"));
  	if (shlwapi==NULL)
! 		shlwapi=LoadLibrary(TEXT("shlwapi.dll"));
  	if (shlwapi!=NULL){
  		pfnSHGetViewStatePropertyBag=(PFNSHGetViewStatePropertyBag)GetProcAddress(shlwapi, "SHGetViewStatePropertyBag");
  		pfnAssocCreate=(PFNAssocCreate)GetProcAddress(shlwapi, "AssocCreate");
! 	}
  
  	ADD_CONSTANT(SLR_NO_UI);