shdocvw: Enable compilation with long types.

dlls/shdocvw/Makefile.in

-EXTRADEFS = -DWINE_NO_LONG_TYPES -D_SHDOCVW_
+EXTRADEFS = -D_SHDOCVW_
 MODULE    = shdocvw.dll
 IMPORTLIB = shdocvw
 IMPORTS   = uuid shlwapi advapi32

dlls/shdocvw/shdocvw_main.c

@@ -120,7 +120,7 @@ DWORD WINAPI IEWinMain(LPSTR szCommandLine, int nShowWindow)
  */
 BOOL WINAPI DllMain(HINSTANCE hinst, DWORD fdwReason, LPVOID fImpLoad)
 {
-    TRACE("%p 0x%x %p\n", hinst, fdwReason, fImpLoad);
+    TRACE("%p 0x%lx %p\n", hinst, fdwReason, fImpLoad);
     switch (fdwReason)
     {
     case DLL_PROCESS_ATTACH:
@@ -246,7 +246,7 @@ DWORD WINAPI RunInstallUninstallStubs2(int arg)
  */
 DWORD WINAPI SetQueryNetSessionCount(DWORD arg)
 {
-    FIXME("(%u), stub!\n", arg);
+    FIXME("(%lu), stub!\n", arg);
     return 0;
 }
 
@@ -318,7 +318,7 @@ HRESULT WINAPI URLSubRegQueryA(LPCSTR regpath, LPCSTR name, DWORD type,
     DWORD len;
     LONG res;
 
-    TRACE("(%s, %s, %d, %p, %d, %d)\n", debugstr_a(regpath), debugstr_a(name),
+    TRACE("(%s, %s, %ld, %p, %ld, %ld)\n", debugstr_a(regpath), debugstr_a(name),
             type, out, outlen, unknown);
 
     if (!out) return S_OK;
@@ -347,14 +347,14 @@ DWORD WINAPI ParseURLFromOutsideSourceW(LPCWSTR url, LPWSTR out, LPDWORD plen, L
     DWORD res = 0;
 
 
-    TRACE("(%s, %p, %p, %p) len: %d, unknown: 0x%x\n", debugstr_w(url), out, plen, unknown,
+    TRACE("(%s, %p, %p, %p) len: %ld, unknown: 0x%lx\n", debugstr_w(url), out, plen, unknown,
             plen ? *plen : 0, unknown ? *unknown : 0);
 
     if (!PathIsURLW(ptr)) {
         len = ARRAY_SIZE(buffer_in);
         buffer_in[0] = 0;
         hr = UrlApplySchemeW(ptr, buffer_in, &len, URL_APPLY_GUESSSCHEME | URL_APPLY_DEFAULT);
-        TRACE("got 0x%x with %s\n", hr, debugstr_w(buffer_in));
+        TRACE("got 0x%lx with %s\n", hr, debugstr_w(buffer_in));
         if (hr == S_OK) {
             /* we parsed the url to buffer_in */
             ptr = buffer_in;
@@ -369,7 +369,7 @@ DWORD WINAPI ParseURLFromOutsideSourceW(LPCWSTR url, LPWSTR out, LPDWORD plen, L
     buffer_out[0] = '\0';
     hr = UrlCanonicalizeW(ptr, buffer_out, &len, URL_ESCAPE_SPACES_ONLY);
     needed = lstrlenW(buffer_out)+1;
-    TRACE("got 0x%x with %s (need %d)\n", hr, debugstr_w(buffer_out), needed);
+    TRACE("got 0x%lx with %s (need %ld)\n", hr, debugstr_w(buffer_out), needed);
 
     if (*plen >= needed) {
         if (out != NULL) {
@@ -381,7 +381,7 @@ DWORD WINAPI ParseURLFromOutsideSourceW(LPCWSTR url, LPWSTR out, LPDWORD plen, L
 
     *plen = needed;
 
-    TRACE("=> %d\n", res);
+    TRACE("=> %ld\n", res);
     return res;
 }
 
@@ -398,7 +398,7 @@ DWORD WINAPI ParseURLFromOutsideSourceA(LPCSTR url, LPSTR out, LPDWORD plen, LPD
     DWORD res;
     DWORD len;
 
-    TRACE("(%s, %p, %p, %p) len: %d, unknown: 0x%x\n", debugstr_a(url), out, plen, unknown,
+    TRACE("(%s, %p, %p, %p) len: %ld, unknown: 0x%lx\n", debugstr_a(url), out, plen, unknown,
             plen ? *plen : 0, unknown ? *unknown : 0);
 
     if (url) {
@@ -424,7 +424,7 @@ DWORD WINAPI ParseURLFromOutsideSourceA(LPCSTR url, LPSTR out, LPDWORD plen, LPD
 
     *plen = needed;
 
-    TRACE("=> %d\n", res);
+    TRACE("=> %ld\n", res);
     return res;
 }
 
@@ -434,7 +434,7 @@ DWORD WINAPI ParseURLFromOutsideSourceA(LPCSTR url, LPSTR out, LPDWORD plen, LPD
 HRESULT WINAPI IEParseDisplayNameWithBCW(DWORD codepage, LPCWSTR lpszDisplayName, LPBC pbc, LPITEMIDLIST *ppidl)
 {
     /* Guessing at parameter 3 based on IShellFolder's  ParseDisplayName */
-    FIXME("stub: 0x%x %s %p %p\n",codepage,debugstr_w(lpszDisplayName),pbc,ppidl);
+    FIXME("stub: 0x%lx %s %p %p\n",codepage,debugstr_w(lpszDisplayName),pbc,ppidl);
     return E_FAIL;
 }
 
@@ -443,7 +443,7 @@ HRESULT WINAPI IEParseDisplayNameWithBCW(DWORD codepage, LPCWSTR lpszDisplayName
  */
 DWORD WINAPI SHRestricted2W(DWORD res, LPCWSTR url, DWORD reserved)
 {
-    FIXME("(%d %s %d) stub\n", res, debugstr_w(url), reserved);
+    FIXME("(%ld %s %ld) stub\n", res, debugstr_w(url), reserved);
     return 0;
 }
 
@@ -457,7 +457,7 @@ DWORD WINAPI SHRestricted2A(DWORD restriction, LPCSTR url, DWORD reserved)
     LPWSTR urlW = NULL;
     DWORD res;
 
-    TRACE("(%d, %s, %d)\n", restriction, debugstr_a(url), reserved);
+    TRACE("(%ld, %s, %ld)\n", restriction, debugstr_a(url), reserved);
     if (url) {
         DWORD len = MultiByteToWideChar(CP_ACP, 0, url, -1, NULL, 0);
         urlW = heap_alloc(len * sizeof(WCHAR));

dlls/shdocvw/shlinstobj.c

@@ -274,14 +274,14 @@ static HRESULT WINAPI InstanceObjectFactory_IClassFactory_CreateInstance(IClassF
     hr = CoCreateInstance(&This->m_clsidInstance, NULL, CLSCTX_INPROC_SERVER,
                           &IID_IPersistPropertyBag, (LPVOID*)&pPersistPropertyBag);
     if (FAILED(hr)) {
-        TRACE("Failed to create instance of %s. hr = %08x\n",
+        TRACE("Failed to create instance of %s. hr = %08lx\n",
               debugstr_guid(&This->m_clsidInstance), hr);
         return hr;
     }
 
     hr = IPersistPropertyBag_Load(pPersistPropertyBag, This->m_pPropertyBag, NULL);
     if (FAILED(hr)) {
-        TRACE("Failed to initialize object from PropertyBag: hr = %08x\n", hr);
+        TRACE("Failed to initialize object from PropertyBag: hr = %08lx\n", hr);
         IPersistPropertyBag_Release(pPersistPropertyBag);
         return hr;
     }