Commit in reactos/lib/shlwapi on MAIN
ordinal.c+7-61.12 -> 1.13
shlwapi.spec+1-11.11 -> 1.12
+8-7
2 modified files
- SHGetAppCompatFlags() takes 4 bytes of parameters
- QueryInterface will return NULL for the new pointer if it fails

reactos/lib/shlwapi
ordinal.c 1.12 -> 1.13
diff -u -r1.12 -r1.13
--- ordinal.c	19 Sep 2004 10:46:48 -0000	1.12
+++ ordinal.c	24 Sep 2004 11:12:44 -0000	1.13
@@ -1549,16 +1549,17 @@
         LPVOID *p2)       /* [out]  ptr for call results */
 {
     DWORD ret, aa;
+    IUnknown *iobjectwithsite;
 
     if (!p1) return E_FAIL;
 
     /* see if SetSite interface exists for IObjectWithSite object */
-    ret = IUnknown_QueryInterface((IUnknown *)p1, (REFIID)id1, (LPVOID *)&p1);
-    TRACE("first IU_QI ret=%08lx, p1=%p\n", ret, p1);
+    ret = IUnknown_QueryInterface((IUnknown *)p1, (REFIID)id1, (LPVOID *)&iobjectwithsite);
+    TRACE("first IU_QI ret=%08lx, iobjectwithsite=%p\n", ret, iobjectwithsite);
     if (ret) {
 
 	/* see if GetClassId interface exists for IPersistMoniker object */
-	ret = IUnknown_QueryInterface((IUnknown *)p1, (REFIID)id2, (LPVOID *)&aa);
+	ret = IUnknown_QueryInterface(p1, (REFIID)id2, (LPVOID *)&aa);
 	TRACE("second IU_QI ret=%08lx, aa=%08lx\n", ret, aa);
 	if (ret) return ret;
 
@@ -1570,10 +1571,10 @@
     }
     else {
 	/* fake a SetSite call */
-	ret = IOleWindow_GetWindow((IOleWindow *)p1, (HWND*)p2);
+	ret = IOleWindow_GetWindow((IOleWindow *)iobjectwithsite, (HWND*)p2);
 	TRACE("first IU_QI doing 0x0c ret=%08lx, *p2=%08lx\n", ret,
 	      *(LPDWORD)p2);
-	IUnknown_Release((IUnknown *)p1);
+	IUnknown_Release((IUnknown *)iobjectwithsite);
     }
     return ret;
 }
@@ -3978,7 +3979,7 @@
 /*************************************************************************
  *      @	[SHLWAPI.461]
  */
-DWORD WINAPI SHGetAppCompatFlags()
+DWORD WINAPI SHGetAppCompatFlags(DWORD Unknown)
 {
   FIXME("stub\n");
   return 0;

reactos/lib/shlwapi
shlwapi.spec 1.11 -> 1.12
diff -u -r1.11 -r1.12
--- shlwapi.spec	19 Sep 2004 10:46:48 -0000	1.11
+++ shlwapi.spec	24 Sep 2004 11:12:44 -0000	1.12
@@ -458,7 +458,7 @@
 458 stub -noname GetLongPathNameWrapA
 459 stdcall SHExpandEnvironmentStringsA(str ptr long) kernel32.ExpandEnvironmentStringsA
 460 stdcall SHExpandEnvironmentStringsW(wstr ptr long) kernel32.ExpandEnvironmentStringsW
-461 stdcall -noname SHGetAppCompatFlags()
+461 stdcall -noname SHGetAppCompatFlags(long)
 462 stub -noname UrlFixupW
 463 stub -noname SHExpandEnvironmentStringsForUserA
 464 stub -noname SHExpandEnvironmentStringsForUserW
CVSspam 0.2.8