Compile ole32 with -DSTRICT.

dlls/ole32/Makefile.in

-EXTRADEFS = -D_OLE32_ -DWINE_NO_STRICT
+EXTRADEFS = -D_OLE32_
 TOPSRCDIR = @top_srcdir@
 TOPOBJDIR = ../..
 SRCDIR    = @srcdir@

dlls/ole32/clipboard.c

@@ -110,9 +110,9 @@ struct OLEClipbrd
   UINT                       cfDataObj;
 
   /*
-   * The handle to our ourself
+   * The handle to ourself
    */
-  UINT                       hSelf;
+  HGLOBAL                    hSelf;
 
   /*
    * Reference count of this object
@@ -1779,4 +1779,3 @@ static HRESULT WINAPI OLEClipbrd_IEnumFORMATETC_Clone
 
   return (*ppenum) ? S_OK : E_OUTOFMEMORY;
 }
-

dlls/ole32/compobj.c

@@ -220,7 +220,7 @@ static void COMPOBJ_DllList_FreeUnused(int Timeout)
 	if ( (DllCanUnloadNow != NULL) && (DllCanUnloadNow() == S_OK) ) {
 	    next = curr->next;
 
-	    TRACE("freeing 0x%08x\n", curr->hLibrary);
+	    TRACE("freeing %p\n", curr->hLibrary);
 	    FreeLibrary(curr->hLibrary);
 
 	    HeapFree(GetProcessHeap(), 0, curr);

dlls/ole32/datacache.c

@@ -1580,7 +1580,7 @@ static HRESULT WINAPI DataCache_Draw(
 
   _ICOM_THIS_From_IViewObject2(DataCache, iface);
 
-  TRACE("(%p, %lx, %ld, %p, %x, %x, %p, %p, %p, %lx)\n",
+  TRACE("(%p, %lx, %ld, %p, %p, %p, %p, %p, %p, %lx)\n",
 	iface,
 	dwDrawAspect,
 	lindex,
@@ -2035,5 +2035,3 @@ static HRESULT WINAPI DataCache_OnStop(
   FIXME("stub\n");
   return E_NOTIMPL;
 }
-
-

dlls/ole32/ole2.c

@@ -51,6 +51,7 @@ WINE_DECLARE_DEBUG_CHANNEL(accel);
 
 #define HICON_16(h32)		(LOWORD(h32))
 #define HICON_32(h16)		((HICON)(ULONG_PTR)(h16))
+#define HINSTANCE_32(h16)	((HINSTANCE)(ULONG_PTR)(h16))
 
 /******************************************************************************
  * These are static/global variables and internal data structures that the
@@ -335,7 +336,7 @@ HRESULT WINAPI RegisterDragDrop(
 {
   DropTargetNode* dropTargetInfo;
 
-  TRACE("(0x%x,%p)\n", hwnd, pDropTarget);
+  TRACE("(%p,%p)\n", hwnd, pDropTarget);
 
   /*
    * First, check if the window is already registered.
@@ -387,7 +388,7 @@ HRESULT WINAPI RevokeDragDrop(
 {
   DropTargetNode* dropTargetInfo;
 
-  TRACE("(0x%x)\n", hwnd);
+  TRACE("(%p)\n", hwnd);
 
   /*
    * First, check if the window is already registered.
@@ -1370,7 +1371,7 @@ HRESULT WINAPI OleSetMenuDescriptor(
 
   if ( lpFrame || lpActiveObject )
   {
-     FIXME("(%x, %x, %x, %p, %p), Context sensitive help filtering not implemented!\n",
+     FIXME("(%x, %p, %p, %p, %p), Context sensitive help filtering not implemented!\n",
 	(unsigned int)hOleMenu,
 	hwndFrame,
 	hwndActiveObject,
@@ -1437,7 +1438,7 @@ BOOL WINAPI IsAccelerator(HACCEL hAccel, int cAccelEntries, LPMSG lpMsg, WORD* l
     if(!lpMsg) return FALSE;
     if (!hAccel || !(lpAccelTbl = (LPACCEL16)LockResource16(HACCEL_16(hAccel))))
     {
-	WARN_(accel)("invalid accel handle=%04x\n", hAccel);
+	WARN_(accel)("invalid accel handle=%p\n", hAccel);
 	return FALSE;
     }
     if((lpMsg->message != WM_KEYDOWN &&
@@ -1446,8 +1447,8 @@ BOOL WINAPI IsAccelerator(HACCEL hAccel, int cAccelEntries, LPMSG lpMsg, WORD* l
 	lpMsg->message != WM_SYSKEYUP &&
 	lpMsg->message != WM_CHAR)) return FALSE;
 
-    TRACE_(accel)("hAccel=%04x, cAccelEntries=%d,"
-		"msg->hwnd=%04x, msg->message=%04x, wParam=%08x, lParam=%08lx\n",
+    TRACE_(accel)("hAccel=%p, cAccelEntries=%d,"
+		"msg->hwnd=%p, msg->message=%04x, wParam=%08x, lParam=%08lx\n",
 		hAccel, cAccelEntries,
 		lpMsg->hwnd, lpMsg->message, lpMsg->wParam, lpMsg->lParam);
     for(i = 0; i < cAccelEntries; i++)
@@ -2243,10 +2244,10 @@ HGLOBAL16 WINAPI OleMetaFilePictFromIconAndLabel16(
 	    HINSTANCE16 hInstance = LoadLibrary16(lpszSourceFile);
 
 	    /* load the icon at index from lpszSourceFile */
-	    hIcon = HICON_16(LoadIconA(hInstance, (LPCSTR)(DWORD)iIconIndex));
+	    hIcon = HICON_16(LoadIconA(HINSTANCE_32(hInstance), (LPCSTR)(DWORD)iIconIndex));
 	    FreeLibrary16(hInstance);
 	} else
-	    return (HGLOBAL)NULL;
+	    return 0;
     }
 
     hdc = CreateMetaFileA(NULL);

dlls/ole32/ole2stubs.c

@@ -45,7 +45,7 @@ HRESULT WINAPI  OleCreateLinkToFile(LPCOLESTR lpszFileName, REFIID riid,
 HRESULT WINAPI OleDuplicateData(HANDLE hSrc, CLIPFORMAT cfFormat,
 	                          UINT uiFlags)
 {
-    FIXME("(%x,%x,%x), stub!\n", hSrc, cfFormat, uiFlags);
+    FIXME("(%p,%x,%x), stub!\n", hSrc, cfFormat, uiFlags);
     return E_NOTIMPL;
 }
 

dlls/ole32/ole32_main.c

@@ -34,7 +34,7 @@ HINSTANCE OLE32_hInstance = 0;
 
 BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad)
 {
-    TRACE("0x%x 0x%lx %p\n", hinstDLL, fdwReason, fImpLoad);
+    TRACE("%p 0x%lx %p\n", hinstDLL, fdwReason, fImpLoad);
 
     switch(fdwReason) {
     case DLL_PROCESS_ATTACH:

dlls/ole32/rpc.c

@@ -90,11 +90,11 @@ static HRESULT WINAPI
 _xread(HANDLE hf, LPVOID ptr, DWORD size) {
     DWORD res;
     if (!ReadFile(hf,ptr,size,&res,NULL)) {
-	FIXME("Failed to read from %x, le is %lx\n",hf,GetLastError());
+	FIXME("Failed to read from %p, le is %lx\n",hf,GetLastError());
 	return E_FAIL;
     }
     if (res!=size) {
-	FIXME("Read only %ld of %ld bytes from %x.\n",res,size,hf);
+	FIXME("Read only %ld of %ld bytes from %p.\n",res,size,hf);
 	return E_FAIL;
     }
     return S_OK;
@@ -126,11 +126,11 @@ static HRESULT WINAPI
 _xwrite(HANDLE hf, LPVOID ptr, DWORD size) {
     DWORD res;
     if (!WriteFile(hf,ptr,size,&res,NULL)) {
-	FIXME("Failed to write to %x, le is %lx\n",hf,GetLastError());
+	FIXME("Failed to write to %p, le is %lx\n",hf,GetLastError());
 	return E_FAIL;
     }
     if (res!=size) {
-	FIXME("Wrote only %ld of %ld bytes to %x.\n",res,size,hf);
+	FIXME("Wrote only %ld of %ld bytes to %p.\n",res,size,hf);
 	return E_FAIL;
     }
     return S_OK;
@@ -441,7 +441,7 @@ PIPE_GetNewPipeBuf(wine_marshal_id *mid, IRpcChannelBuffer **pipebuf) {
 	      NULL,
 	      OPEN_EXISTING,
 	      0,
-	      -1
+	      0
       );
       if (hPipe == INVALID_HANDLE_VALUE) {
 	  FIXME("Could not open named pipe %s, le is %lx\n",pipefn,GetLastError());
@@ -518,7 +518,7 @@ HRESULT create_marshalled_proxy(REFCLSID rclsid, REFIID iid, LPVOID *ppv) {
 	      NULL,
 	      OPEN_EXISTING,
 	      0,
-	      -1
+	      0
       );
       if (hPipe == INVALID_HANDLE_VALUE) {
 	  if (tries == 1) {