[PATCH 06/25] dlls/comdlg32: enable compilation with long types
Eric Pouech
eric.pouech at gmail.com
Wed Feb 9 02:25:26 CST 2022
Signed-off-by: Eric Pouech <eric.pouech at gmail.com>
---
dlls/comdlg32/Makefile.in | 1
dlls/comdlg32/cdlg32.c | 4 +-
dlls/comdlg32/colordlg.c | 4 +-
dlls/comdlg32/filedlg.c | 36 +++++++--------
dlls/comdlg32/filedlg31.c | 16 +++----
dlls/comdlg32/filedlgbrowser.c | 14 +++---
dlls/comdlg32/finddlg.c | 2 -
dlls/comdlg32/fontdlg.c | 12 ++---
dlls/comdlg32/itemdlg.c | 98 ++++++++++++++++++++--------------------
dlls/comdlg32/printdlg.c | 30 ++++++------
10 files changed, 108 insertions(+), 109 deletions(-)
diff --git a/dlls/comdlg32/Makefile.in b/dlls/comdlg32/Makefile.in
index 959f4bac63c..f919a266a07 100644
--- a/dlls/comdlg32/Makefile.in
+++ b/dlls/comdlg32/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
MODULE = comdlg32.dll
IMPORTLIB = comdlg32
IMPORTS = uuid shell32 shlwapi comctl32 winspool user32 gdi32 advapi32
diff --git a/dlls/comdlg32/cdlg32.c b/dlls/comdlg32/cdlg32.c
index c63d201d526..f9619cc6a49 100644
--- a/dlls/comdlg32/cdlg32.c
+++ b/dlls/comdlg32/cdlg32.c
@@ -67,7 +67,7 @@ static const char GPA_string[] = "Failed to get entry point %s for hinst = %p\n"
BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD Reason, LPVOID Reserved)
{
- TRACE("(%p, %d, %p)\n", hInstance, Reason, Reserved);
+ TRACE("(%p, %ld, %p)\n", hInstance, Reason, Reserved);
switch(Reason)
{
@@ -118,7 +118,7 @@ void *COMDLG32_AllocMem(int size)
*/
void COMDLG32_SetCommDlgExtendedError(DWORD err)
{
- TRACE("(%08x)\n", err);
+ TRACE("(%08lx)\n", err);
if (COMDLG32_TlsIndex == TLS_OUT_OF_INDEXES)
COMDLG32_TlsIndex = TlsAlloc();
if (COMDLG32_TlsIndex != TLS_OUT_OF_INDEXES)
diff --git a/dlls/comdlg32/colordlg.c b/dlls/comdlg32/colordlg.c
index 1d459dd2d87..e16014c8d19 100644
--- a/dlls/comdlg32/colordlg.c
+++ b/dlls/comdlg32/colordlg.c
@@ -851,7 +851,7 @@ static LRESULT CC_WMInitDialog( HWND hDlg, WPARAM wParam, LPARAM lParam )
POINT point;
CCPRIV *lpp;
- TRACE("WM_INITDIALOG lParam=%08lX\n", lParam);
+ TRACE("WM_INITDIALOG lParam=%08IX\n", lParam);
if (cc->lStructSize != sizeof(CHOOSECOLORW))
{
@@ -958,7 +958,7 @@ static LRESULT CC_WMCommand(CCPRIV *lpp, WPARAM wParam, LPARAM lParam, WORD noti
HDC hdc;
COLORREF *cr;
- TRACE("CC_WMCommand wParam=%lx lParam=%lx\n", wParam, lParam);
+ TRACE("CC_WMCommand wParam=%Ix lParam=%Ix\n", wParam, lParam);
switch (LOWORD(wParam))
{
case COLOR_RED: /* edit notify RGB */
diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c
index 0f74c85fcd8..415c0580461 100644
--- a/dlls/comdlg32/filedlg.c
+++ b/dlls/comdlg32/filedlg.c
@@ -304,7 +304,7 @@ static void filedlg_collect_places_pidls(FileOpenDlgInfos *fodInfos)
{
hr = SHGetSpecialFolderLocation(NULL, value, &fodInfos->places[i]);
if (FAILED(hr))
- WARN("Unrecognized special folder %u.\n", value);
+ WARN("Unrecognized special folder %lu.\n", value);
}
else if (get_config_key_string(hkey, nameW, &str))
{
@@ -346,7 +346,7 @@ static BOOL GetFileName95(FileOpenDlgInfos *fodInfos)
/* test for missing functionality */
if (fodInfos->ofnInfos->Flags & UNIMPLEMENTED_FLAGS)
{
- FIXME("Flags 0x%08x not yet implemented\n",
+ FIXME("Flags 0x%08lx not yet implemented\n",
fodInfos->ofnInfos->Flags & UNIMPLEMENTED_FLAGS);
}
@@ -968,7 +968,7 @@ LRESULT SendCustomDlgNotificationMessage(HWND hwndParentDlg, UINT uCode)
else
hook_result = SendMessageA(fodInfos->DlgInfos.hwndCustomDlg, WM_NOTIFY, 0, (LPARAM)&ofnNotify);
- TRACE("RET NOTIFY retval %#lx\n", hook_result);
+ TRACE("RET NOTIFY retval %#Ix\n", hook_result);
return hook_result;
}
@@ -1132,7 +1132,7 @@ static LRESULT FILEDLG95_OnWMSize(HWND hwnd, WPARAM wParam)
if( !(fodInfos->ofnInfos->Flags & OFN_ENABLESIZING)) return FALSE;
/* get the new dialog rectangle */
GetWindowRect( hwnd, &rc);
- TRACE("%p, size from %d,%d to %d,%d\n", hwnd, fodInfos->sizedlg.cx, fodInfos->sizedlg.cy,
+ TRACE("%p, size from %ld,%ld to %ld,%ld\n", hwnd, fodInfos->sizedlg.cx, fodInfos->sizedlg.cy,
rc.right -rc.left, rc.bottom -rc.top);
/* not initialized yet */
if( (fodInfos->sizedlg.cx == 0 && fodInfos->sizedlg.cy == 0) ||
@@ -2253,7 +2253,7 @@ static WCHAR FILEDLG95_MRU_get_slot(LPCWSTR module_name, LPWSTR stored_path, PHK
ret = RegCreateKeyW(HKEY_CURRENT_USER,
L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\ComDlg32\\LastVisitedMRU", hkey);
if(ret){
- WARN("Unable to create MRU key: %d\n", ret);
+ WARN("Unable to create MRU key: %ld\n", ret);
return 0;
}
@@ -2263,7 +2263,7 @@ static WCHAR FILEDLG95_MRU_get_slot(LPCWSTR module_name, LPWSTR stored_path, PHK
if(ret == ERROR_FILE_NOT_FOUND)
return 'a';
- WARN("Error getting MRUList data: type: %d, ret: %d\n", key_type, ret);
+ WARN("Error getting MRUList data: type: %ld, ret: %ld\n", key_type, ret);
RegCloseKey(*hkey);
return 0;
}
@@ -2277,7 +2277,7 @@ static WCHAR FILEDLG95_MRU_get_slot(LPCWSTR module_name, LPWSTR stored_path, PHK
ret = RegGetValueW(*hkey, NULL, value_name, RRF_RT_REG_BINARY,
&key_type, (LPBYTE)value_data, &value_data_size);
if(ret || key_type != REG_BINARY){
- WARN("Error getting MRU slot data: type: %d, ret: %d\n", key_type, ret);
+ WARN("Error getting MRU slot data: type: %ld, ret: %ld\n", key_type, ret);
continue;
}
@@ -2316,7 +2316,7 @@ static void FILEDLG95_MRU_save_filename(LPCWSTR filename)
/* get the current executable's name */
if (!GetModuleFileNameW(GetModuleHandleW(NULL), module_path, ARRAY_SIZE(module_path)))
{
- WARN("GotModuleFileName failed: %d\n", GetLastError());
+ WARN("GotModuleFileName failed: %ld\n", GetLastError());
return;
}
module_name = wcsrchr(module_path, '\\');
@@ -2350,7 +2350,7 @@ static void FILEDLG95_MRU_save_filename(LPCWSTR filename)
ret = RegSetValueExW(hkey, slot_name, 0, REG_BINARY, (LPBYTE)final,
final_len * sizeof(WCHAR));
if(ret){
- WARN("Error saving MRU data to slot %s: %d\n", wine_dbgstr_w(slot_name), ret);
+ WARN("Error saving MRU data to slot %s: %ld\n", wine_dbgstr_w(slot_name), ret);
heap_free(final);
RegCloseKey(hkey);
return;
@@ -2371,7 +2371,7 @@ static void FILEDLG95_MRU_save_filename(LPCWSTR filename)
new_mru_list[0] = slot;
new_mru_list[1] = '\0';
}else{
- WARN("Error getting MRUList data: type: %d, ret: %d\n", key_type, ret);
+ WARN("Error getting MRUList data: type: %ld, ret: %ld\n", key_type, ret);
RegCloseKey(hkey);
return;
}
@@ -2389,7 +2389,7 @@ static void FILEDLG95_MRU_save_filename(LPCWSTR filename)
ret = RegSetValueExW(hkey, L"MRUList", 0, REG_SZ, (LPBYTE)new_mru_list,
(lstrlenW(new_mru_list) + 1) * sizeof(WCHAR));
if(ret){
- WARN("Error saving MRUList data: %d\n", ret);
+ WARN("Error saving MRUList data: %ld\n", ret);
RegCloseKey(hkey);
return;
}
@@ -2404,7 +2404,7 @@ static void FILEDLG95_MRU_load_filename(LPWSTR stored_path)
/* get the current executable's name */
if (!GetModuleFileNameW(GetModuleHandleW(NULL), module_path, ARRAY_SIZE(module_path)))
{
- WARN("GotModuleFileName failed: %d\n", GetLastError());
+ WARN("GotModuleFileName failed: %ld\n", GetLastError());
return;
}
module_name = wcsrchr(module_path, '\\');
@@ -2492,7 +2492,7 @@ int FILEDLG95_ValidatePathAction(LPWSTR lpstrPathAndFile, IShellFolder **ppsf,
if(SUCCEEDED(IShellFolder_ParseDisplayName(*ppsf, hwnd, NULL, lpwstrTemp, &dwEaten, &pidl, &dwAttributes)))
{
/* the path component is valid, we have a pidl of the next path component */
- TRACE("parse OK attr=0x%08x pidl=%p\n", dwAttributes, pidl);
+ TRACE("parse OK attr=0x%08lx pidl=%p\n", dwAttributes, pidl);
if(dwAttributes & SFGAO_FOLDER)
{
if(FAILED(IShellFolder_BindToObject(*ppsf, pidl, 0, &IID_IShellFolder, (LPVOID*)&lpsfChild)))
@@ -3541,7 +3541,7 @@ static int FILEDLG95_LOOKIN_AddItem(HWND hwnd,LPITEMIDLIST pidl, int iInsertId)
sizeof(sfi),
SHGFI_DISPLAYNAME | SHGFI_PIDL | SHGFI_ATTRIBUTES | SHGFI_ATTR_SPECIFIED);
- TRACE("-- Add %s attr=0x%08x\n", debugstr_w(sfi.szDisplayName), sfi.dwAttributes);
+ TRACE("-- Add %s attr=0x%08lx\n", debugstr_w(sfi.szDisplayName), sfi.dwAttributes);
if((sfi.dwAttributes & SFGAO_FILESYSANCESTOR) || (sfi.dwAttributes & SFGAO_FILESYSTEM))
{
@@ -3684,7 +3684,7 @@ static int FILEDLG95_LOOKIN_SearchItem(HWND hwnd,WPARAM searchArg,int iSearchMet
iCount = SendMessageW(hwnd, CB_GETCOUNT, 0, 0);
- TRACE("0x%08lx 0x%x\n",searchArg, iSearchMethod);
+ TRACE("0x%08Ix 0x%x\n",searchArg, iSearchMethod);
if (iCount != CB_ERR)
{
@@ -4092,7 +4092,7 @@ static BOOL IsPidlFolder (LPSHELLFOLDER psf, LPCITEMIDLIST pidl)
ret = IShellFolder_GetAttributesOf( psf, 1, &pidl, &uAttr );
- TRACE("-- 0x%08x 0x%08x\n", uAttr, ret);
+ TRACE("-- 0x%08lx 0x%08lx\n", uAttr, ret);
/* see documentation shell 4.1*/
return uAttr & (SFGAO_FOLDER | SFGAO_HASSUBFOLDER);
}
@@ -4158,7 +4158,7 @@ static inline BOOL is_win16_looks(DWORD flags)
*/
BOOL WINAPI GetOpenFileNameA(OPENFILENAMEA *ofn)
{
- TRACE("flags 0x%08x\n", ofn->Flags);
+ TRACE("flags 0x%08lx\n", ofn->Flags);
if (!valid_struct_size( ofn->lStructSize ))
{
@@ -4193,7 +4193,7 @@ BOOL WINAPI GetOpenFileNameA(OPENFILENAMEA *ofn)
*/
BOOL WINAPI GetOpenFileNameW(OPENFILENAMEW *ofn)
{
- TRACE("flags 0x%08x\n", ofn->Flags);
+ TRACE("flags 0x%08lx\n", ofn->Flags);
if (!valid_struct_size( ofn->lStructSize ))
{
diff --git a/dlls/comdlg32/filedlg31.c b/dlls/comdlg32/filedlg31.c
index b134814ab03..16a67422b02 100644
--- a/dlls/comdlg32/filedlg31.c
+++ b/dlls/comdlg32/filedlg31.c
@@ -125,18 +125,18 @@ static BOOL FD31_CallWindowProc(const FD31_DATA *lfs, UINT wMsg, WPARAM wParam,
if (lfs->ofnA)
{
- TRACE("Call hookA %p (%p, %04x, %08lx, %08lx)\n",
+ TRACE("Call hookA %p (%p, %04x, %08Ix, %08Ix)\n",
lfs->ofnA->lpfnHook, lfs->hwnd, wMsg, wParam, lParam);
ret = lfs->ofnA->lpfnHook(lfs->hwnd, wMsg, wParam, lParam);
- TRACE("ret hookA %p (%p, %04x, %08lx, %08lx)\n",
+ TRACE("ret hookA %p (%p, %04x, %08Ix, %08Ix)\n",
lfs->ofnA->lpfnHook, lfs->hwnd, wMsg, wParam, lParam);
return ret;
}
- TRACE("Call hookW %p (%p, %04x, %08lx, %08lx)\n",
+ TRACE("Call hookW %p (%p, %04x, %08Ix, %08Ix)\n",
lfs->ofnW->lpfnHook, lfs->hwnd, wMsg, wParam, lParam);
ret = lfs->ofnW->lpfnHook(lfs->hwnd, wMsg, wParam, lParam);
- TRACE("Ret hookW %p (%p, %04x, %08lx, %08lx)\n",
+ TRACE("Ret hookW %p (%p, %04x, %08Ix, %08Ix)\n",
lfs->ofnW->lpfnHook, lfs->hwnd, wMsg, wParam, lParam);
return ret;
}
@@ -968,7 +968,7 @@ static LONG FD31_WMInitDialog(HWND hWnd, WPARAM wParam, LPARAM lParam)
lfs->hwnd = hWnd;
ofn = lfs->ofnW;
- TRACE("flags=%x initialdir=%s\n", ofn->Flags, debugstr_w(ofn->lpstrInitialDir));
+ TRACE("flags=%lx initialdir=%s\n", ofn->Flags, debugstr_w(ofn->lpstrInitialDir));
SetWindowTextW( hWnd, ofn->lpstrTitle );
/* read custom filter information */
@@ -1021,7 +1021,7 @@ static LONG FD31_WMInitDialog(HWND hWnd, WPARAM wParam, LPARAM lParam)
{
lstrcpynW(tmpstr, FD31_GetFileType(ofn->lpstrCustomFilter,
ofn->lpstrFilter, ofn->nFilterIndex - 1),BUFFILE);
- TRACE("nFilterIndex = %d, SetText of edt1 to %s\n",
+ TRACE("nFilterIndex = %ld, SetText of edt1 to %s\n",
ofn->nFilterIndex, debugstr_w(tmpstr));
SetDlgItemTextW( hWnd, edt1, tmpstr );
}
@@ -1099,7 +1099,7 @@ static INT_PTR CALLBACK FD31_FileOpenDlgProc(HWND hWnd, UINT wMsg,
{
PFD31_DATA lfs = (PFD31_DATA)GetPropA( hWnd, FD31_OFN_PROP );
- TRACE("msg=%x wparam=%lx lParam=%lx\n", wMsg, wParam, lParam);
+ TRACE("msg=%x wparam=%Ix lParam=%Ix\n", wMsg, wParam, lParam);
if ((wMsg != WM_INITDIALOG) && lfs && lfs->hook)
{
INT_PTR lRet;
@@ -1149,7 +1149,7 @@ BOOL GetFileName31A( OPENFILENAMEA *lpofn, UINT dlgType )
if (!lpofn || !FD31_Init()) return FALSE;
- TRACE("ofn flags %08x\n", lpofn->Flags);
+ TRACE("ofn flags %08lx\n", lpofn->Flags);
lfs = FD31_AllocPrivate((LPARAM) lpofn, dlgType, FALSE);
if (lfs)
{
diff --git a/dlls/comdlg32/filedlgbrowser.c b/dlls/comdlg32/filedlgbrowser.c
index 5b5323f4d22..8f4e74b018c 100644
--- a/dlls/comdlg32/filedlgbrowser.c
+++ b/dlls/comdlg32/filedlgbrowser.c
@@ -150,7 +150,7 @@ static void COMDLG32_UpdateCurrentDir(const FileOpenDlgInfos *fodInfos)
/* copied from shell32 to avoid linking to it */
static BOOL COMDLG32_StrRetToStrNW (LPVOID dest, DWORD len, LPSTRRET src, LPCITEMIDLIST pidl)
{
- TRACE("dest=%p len=0x%x strret=%p pidl=%p\n", dest , len, src, pidl);
+ TRACE("dest=%p len=0x%lx strret=%p pidl=%p\n", dest , len, src, pidl);
switch (src->uType)
{
@@ -252,7 +252,7 @@ static ULONG WINAPI IShellBrowserImpl_AddRef(IShellBrowser * iface)
IShellBrowserImpl *This = impl_from_IShellBrowser(iface);
ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p,%u)\n", This, ref - 1);
+ TRACE("(%p,%lu)\n", This, ref - 1);
return ref;
}
@@ -265,7 +265,7 @@ static ULONG WINAPI IShellBrowserImpl_Release(IShellBrowser * iface)
IShellBrowserImpl *This = impl_from_IShellBrowser(iface);
ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p,%u)\n", This, ref + 1);
+ TRACE("(%p,%lu)\n", This, ref + 1);
if (!ref)
heap_free(This);
@@ -448,7 +448,7 @@ static HRESULT WINAPI IShellBrowserImpl_BrowseObject(IShellBrowser *iface,
&fodInfos->ShellInfos.folderSettings, fodInfos->Shell.FOIShellBrowser,
&rectView, &hwndView)))
{
- WARN("Failed to create view window, hr %#x.\n", hRes);
+ WARN("Failed to create view window, hr %#lx.\n", hRes);
return hRes;
}
@@ -513,7 +513,7 @@ static HRESULT WINAPI IShellBrowserImpl_GetViewStateStream(IShellBrowser *iface,
{
IShellBrowserImpl *This = impl_from_IShellBrowser(iface);
- FIXME("(%p 0x%08x %p)\n", This, grfMode, ppStrm);
+ FIXME("(%p 0x%08lx %p)\n", This, grfMode, ppStrm);
/* Feature not implemented */
return E_NOTIMPL;
@@ -602,7 +602,7 @@ static HRESULT WINAPI IShellBrowserImpl_SendControlMsg(IShellBrowser *iface,
IShellBrowserImpl *This = impl_from_IShellBrowser(iface);
LRESULT lres;
- TRACE("(%p)->(0x%08x 0x%08x 0x%08lx 0x%08lx %p)\n", This, id, uMsg, wParam, lParam, pret);
+ TRACE("(%p)->(0x%08x 0x%08x 0x%08Ix 0x%08Ix %p)\n", This, id, uMsg, wParam, lParam, pret);
switch (id)
{
@@ -903,7 +903,7 @@ static LRESULT send_includeitem_notification(HWND hwndParentDlg, LPCITEMIDLIST p
hook_result = SendMessageA(fodInfos->DlgInfos.hwndCustomDlg, WM_NOTIFY, 0, (LPARAM)&ofnNotify);
}
}
- TRACE("Retval: 0x%08lx\n", hook_result);
+ TRACE("Retval: 0x%08Ix\n", hook_result);
return hook_result;
}
diff --git a/dlls/comdlg32/finddlg.c b/dlls/comdlg32/finddlg.c
index d769325e9f0..e627dbce0c7 100644
--- a/dlls/comdlg32/finddlg.c
+++ b/dlls/comdlg32/finddlg.c
@@ -369,7 +369,7 @@ static HWND COMDLG32_FR_DoFindReplace(
DWORD error;
LPDLGTEMPLATEW rcs;
- TRACE("hInst=%p, Flags=%08x\n", pdata->fr.hInstance, pdata->fr.Flags);
+ TRACE("hInst=%p, Flags=%08lx\n", pdata->fr.hInstance, pdata->fr.Flags);
if(!(pdata->fr.Flags & FR_ENABLETEMPLATEHANDLE))
{
diff --git a/dlls/comdlg32/fontdlg.c b/dlls/comdlg32/fontdlg.c
index e2c8eb2b3ad..03c712c6bc2 100644
--- a/dlls/comdlg32/fontdlg.c
+++ b/dlls/comdlg32/fontdlg.c
@@ -496,7 +496,7 @@ static INT AddFontStyle( const ENUMLOGFONTEXW *lpElfex, const NEWTEXTMETRICEXW *
HDC hdc;
TRACE("(nFontType=%d)\n",nFontType);
- TRACE(" %s h=%d w=%d e=%d o=%d wg=%d i=%d u=%d s=%d"
+ TRACE(" %s h=%ld w=%ld e=%ld o=%ld wg=%ld i=%d u=%d s=%d"
" ch=%d op=%d cp=%d q=%d pf=%xh\n",
debugstr_w(lplf->lfFaceName),lplf->lfHeight,lplf->lfWidth,
lplf->lfEscapement,lplf->lfOrientation,
@@ -619,7 +619,7 @@ static LRESULT CFn_WMInitDialog(HWND hDlg, LPARAM lParam, LPCHOOSEFONTW lpcf)
SetPropW(hDlg, strWineFontData, lpcf);
lpxx=lpcf->lpLogFont;
- TRACE("WM_INITDIALOG lParam=%08lX\n", lParam);
+ TRACE("WM_INITDIALOG lParam=%08IX\n", lParam);
if (lpcf->lStructSize != sizeof(CHOOSEFONTW))
{
@@ -937,7 +937,7 @@ static LRESULT CFn_WMCommand(HWND hDlg, WPARAM wParam, LPARAM lParam, LPCHOOSEFO
}
}
- TRACE("WM_COMMAND wParam=%08X lParam=%08lX\n", (LONG)wParam, lParam);
+ TRACE("WM_COMMAND wParam=%08lX lParam=%08IX\n", (LONG)wParam, lParam);
switch (LOWORD(wParam))
{
case cmb1:
@@ -998,7 +998,7 @@ static LRESULT CFn_WMCommand(HWND hDlg, WPARAM wParam, LPARAM lParam, LPCHOOSEFO
WINDOWINFO wininfo;
LPLOGFONTW lpxx=lpcf->lpLogFont;
- TRACE("WM_COMMAND/cmb2,3 =%08lX\n", lParam);
+ TRACE("WM_COMMAND/cmb2,3 =%08IX\n", lParam);
/* face name */
i=SendDlgItemMessageW(hDlg,cmb1,CB_GETCURSEL,0,0);
@@ -1244,7 +1244,7 @@ static INT_PTR CALLBACK FormatCharDlgProcA(HWND hDlg, UINT uMsg, WPARAM wParam,
case WM_CHOOSEFONT_GETLOGFONT:
{
LOGFONTA *logfont = (LOGFONTA *)lParam;
- TRACE("WM_CHOOSEFONT_GETLOGFONT lParam=%08lX\n", lParam);
+ TRACE("WM_CHOOSEFONT_GETLOGFONT lParam=%08IX\n", lParam);
memcpy( logfont, lpcfw->lpLogFont, FIELD_OFFSET( LOGFONTA, lfFaceName ));
WideCharToMultiByte( CP_ACP, 0, lpcfw->lpLogFont->lfFaceName, LF_FACESIZE,
logfont->lfFaceName, LF_FACESIZE, NULL, NULL );
@@ -1294,7 +1294,7 @@ static INT_PTR CALLBACK FormatCharDlgProcW(HWND hDlg, UINT uMsg, WPARAM wParam,
case WM_DESTROY:
return TRUE;
case WM_CHOOSEFONT_GETLOGFONT:
- TRACE("WM_CHOOSEFONT_GETLOGFONT lParam=%08lX\n", lParam);
+ TRACE("WM_CHOOSEFONT_GETLOGFONT lParam=%08IX\n", lParam);
memcpy( (LOGFONTW *)lParam, lpcf->lpLogFont, sizeof(LOGFONTW) );
break;
case WM_PAINT:
diff --git a/dlls/comdlg32/itemdlg.c b/dlls/comdlg32/itemdlg.c
index 603d48876c0..95778c2f358 100644
--- a/dlls/comdlg32/itemdlg.c
+++ b/dlls/comdlg32/itemdlg.c
@@ -237,7 +237,7 @@ static HRESULT events_OnOverwrite(FileDialogImpl *This, IShellItem *shellitem)
{
TRACE("Notifying %p\n", cursor);
hr = IFileDialogEvents_OnOverwrite(cursor->pfde, (IFileDialog*)&This->IFileDialog2_iface, shellitem, &response);
- TRACE("<-- hr=%x response=%u\n", hr, response);
+ TRACE("<-- hr=%lx response=%u\n", hr, response);
if(FAILED(hr) && hr != E_NOTIMPL)
break;
}
@@ -294,7 +294,7 @@ static HRESULT cctrl_event_OnButtonClicked(FileDialogImpl *This, DWORD ctl_id)
static HRESULT cctrl_event_OnItemSelected(FileDialogImpl *This, DWORD ctl_id, DWORD item_id)
{
events_client *cursor;
- TRACE("%p %i %i\n", This, ctl_id, item_id);
+ TRACE("%p %li %li\n", This, ctl_id, item_id);
LIST_FOR_EACH_ENTRY(cursor, &This->events_clients, events_client, entry)
{
@@ -622,7 +622,7 @@ static HRESULT on_default_action(FileDialogImpl *This)
case ONOPEN_BROWSE:
hr = IExplorerBrowser_BrowseToObject(This->peb, (IUnknown*)psf_parent, SBSP_DEFBROWSER);
if(FAILED(hr))
- ERR("Failed to browse to directory: %08x\n", hr);
+ ERR("Failed to browse to directory: %08lx\n", hr);
IShellFolder_Release(psf_parent);
break;
@@ -823,7 +823,7 @@ static inline customctrl *get_cctrl_from_dlgid(FileDialogImpl *This, DWORD dlgid
return sub_ctrl;
}
- ERR("Failed to find control with dialog id %d\n", dlgid);
+ ERR("Failed to find control with dialog id %ld\n", dlgid);
return NULL;
}
@@ -844,7 +844,7 @@ static inline customctrl *get_cctrl(FileDialogImpl *This, DWORD ctlid)
if (This->hmenu_opendropdown && This->cctrl_opendropdown.id == ctlid)
return &This->cctrl_opendropdown;
- TRACE("No existing control with control id %d\n", ctlid);
+ TRACE("No existing control with control id %ld\n", ctlid);
return NULL;
}
@@ -1026,7 +1026,7 @@ static LRESULT notifysink_on_bn_clicked(FileDialogImpl *This, HWND hwnd, WPARAM
{
customctrl *ctrl = get_cctrl_from_dlgid(This, LOWORD(wparam));
- TRACE("%p, %lx\n", This, wparam);
+ TRACE("%p, %Ix\n", This, wparam);
if(ctrl)
{
@@ -1045,7 +1045,7 @@ static LRESULT notifysink_on_bn_clicked(FileDialogImpl *This, HWND hwnd, WPARAM
static LRESULT notifysink_on_cbn_selchange(FileDialogImpl *This, HWND hwnd, WPARAM wparam)
{
customctrl *ctrl = get_cctrl_from_dlgid(This, LOWORD(wparam));
- TRACE("%p, %p (%lx)\n", This, ctrl, wparam);
+ TRACE("%p, %p (%Ix)\n", This, ctrl, wparam);
if(ctrl)
{
@@ -1065,7 +1065,7 @@ static LRESULT notifysink_on_tvn_dropdown(FileDialogImpl *This, LPARAM lparam)
TBBUTTON tbb;
UINT idcmd;
- TRACE("%p, %p (%lx)\n", This, ctrl, lparam);
+ TRACE("%p, %p (%Ix)\n", This, ctrl, lparam);
if(ctrl)
{
@@ -1651,7 +1651,7 @@ static void update_layout(FileDialogImpl *This)
if(dialog_rc.right < min_width || dialog_rc.bottom < min_height)
{
- TRACE("Dialog size (%d, %d) too small, not updating layout\n", dialog_rc.right, dialog_rc.bottom);
+ TRACE("Dialog size (%ld, %ld) too small, not updating layout\n", dialog_rc.right, dialog_rc.bottom);
return;
}
@@ -1881,7 +1881,7 @@ static HRESULT init_explorerbrowser(FileDialogImpl *This)
hr = IObjectWithSite_SetSite(client, (IUnknown*)&This->IFileDialog2_iface);
IObjectWithSite_Release(client);
if(FAILED(hr))
- ERR("SetSite failed, 0x%08x\n", hr);
+ ERR("SetSite failed, 0x%08lx\n", hr);
}
/* Browse somewhere */
@@ -2251,11 +2251,11 @@ static HRESULT create_dialog(FileDialogImpl *This, HWND parent)
This->dlg_hwnd = NULL;
if(res == -1)
{
- ERR("Failed to show dialog (LastError: %d)\n", GetLastError());
+ ERR("Failed to show dialog (LastError: %ld)\n", GetLastError());
return E_FAIL;
}
- TRACE("Returning 0x%08x\n", (HRESULT)res);
+ TRACE("Returning 0x%08lx\n", (HRESULT)res);
return (HRESULT)res;
}
@@ -2328,7 +2328,7 @@ static ULONG WINAPI IFileDialog2_fnAddRef(IFileDialog2 *iface)
{
FileDialogImpl *This = impl_from_IFileDialog2(iface);
LONG ref = InterlockedIncrement(&This->ref);
- TRACE("%p - ref %d\n", This, ref);
+ TRACE("%p - ref %ld\n", This, ref);
return ref;
}
@@ -2337,7 +2337,7 @@ static ULONG WINAPI IFileDialog2_fnRelease(IFileDialog2 *iface)
{
FileDialogImpl *This = impl_from_IFileDialog2(iface);
LONG ref = InterlockedDecrement(&This->ref);
- TRACE("%p - ref %d\n", This, ref);
+ TRACE("%p - ref %ld\n", This, ref);
if(!ref)
{
@@ -2466,7 +2466,7 @@ static HRESULT WINAPI IFileDialog2_fnUnadvise(IFileDialog2 *iface, DWORD dwCooki
{
FileDialogImpl *This = impl_from_IFileDialog2(iface);
events_client *client, *found = NULL;
- TRACE("%p (%d)\n", This, dwCookie);
+ TRACE("%p (%ld)\n", This, dwCookie);
LIST_FOR_EACH_ENTRY(client, &This->events_clients, events_client, entry)
{
@@ -2491,7 +2491,7 @@ static HRESULT WINAPI IFileDialog2_fnUnadvise(IFileDialog2 *iface, DWORD dwCooki
static HRESULT WINAPI IFileDialog2_fnSetOptions(IFileDialog2 *iface, FILEOPENDIALOGOPTIONS fos)
{
FileDialogImpl *This = impl_from_IFileDialog2(iface);
- TRACE("%p (0x%x)\n", This, fos);
+ TRACE("%p (0x%lx)\n", This, fos);
if (fos & ~(FOS_OVERWRITEPROMPT | FOS_STRICTFILETYPES | FOS_NOCHANGEDIR | FOS_PICKFOLDERS | FOS_FORCEFILESYSTEM
| FOS_ALLNONSTORAGEITEMS | FOS_NOVALIDATE | FOS_ALLOWMULTISELECT | FOS_PATHMUSTEXIST | FOS_FILEMUSTEXIST
@@ -2499,7 +2499,7 @@ static HRESULT WINAPI IFileDialog2_fnSetOptions(IFileDialog2 *iface, FILEOPENDIA
| FOS_HIDEPINNEDPLACES | FOS_NODEREFERENCELINKS | FOS_DONTADDTORECENT | FOS_FORCESHOWHIDDEN
| FOS_DEFAULTNOMINIMODE | FOS_FORCEPREVIEWPANEON | FOS_SUPPORTSTREAMABLEITEMS))
{
- WARN("Invalid option %#x\n", fos);
+ WARN("Invalid option %#lx\n", fos);
return E_INVALIDARG;
}
@@ -2714,7 +2714,7 @@ static HRESULT WINAPI IFileDialog2_fnSetDefaultExtension(IFileDialog2 *iface, LP
static HRESULT WINAPI IFileDialog2_fnClose(IFileDialog2 *iface, HRESULT hr)
{
FileDialogImpl *This = impl_from_IFileDialog2(iface);
- TRACE("%p (0x%08x)\n", This, hr);
+ TRACE("%p (0x%08lx)\n", This, hr);
if(This->dlg_hwnd)
EndDialog(This->dlg_hwnd, hr);
@@ -3497,7 +3497,7 @@ static HRESULT WINAPI ICommDlgBrowser3_fnOnStateChange(ICommDlgBrowser3 *iface,
FileDialogImpl *This = impl_from_ICommDlgBrowser3(iface);
IDataObject *new_selection;
HRESULT hr;
- TRACE("%p (%p, %x)\n", This, shv, uChange);
+ TRACE("%p (%p, %lx)\n", This, shv, uChange);
switch(uChange)
{
@@ -3552,7 +3552,7 @@ static HRESULT WINAPI ICommDlgBrowser3_fnIncludeObject(ICommDlgBrowser3 *iface,
}
if(FAILED(hr))
{
- ERR("Failed to get shellitem (%08x).\n", hr);
+ ERR("Failed to get shellitem (%08lx).\n", hr);
return S_OK;
}
@@ -3585,7 +3585,7 @@ static HRESULT WINAPI ICommDlgBrowser3_fnNotify(ICommDlgBrowser3 *iface,
IShellView *ppshv, DWORD dwNotifyType)
{
FileDialogImpl *This = impl_from_ICommDlgBrowser3(iface);
- FIXME("Stub: %p (%p, 0x%x)\n", This, ppshv, dwNotifyType);
+ FIXME("Stub: %p (%p, 0x%lx)\n", This, ppshv, dwNotifyType);
return E_NOTIMPL;
}
@@ -3725,7 +3725,7 @@ static HRESULT WINAPI IFileDialogCustomize_fnEnableOpenDropDown(IFileDialogCusto
{
FileDialogImpl *This = impl_from_IFileDialogCustomize(iface);
MENUINFO mi;
- TRACE("%p (%d)\n", This, dwIDCtl);
+ TRACE("%p (%ld)\n", This, dwIDCtl);
if (This->hmenu_opendropdown || get_cctrl(This, dwIDCtl))
return E_UNEXPECTED;
@@ -3760,7 +3760,7 @@ static HRESULT WINAPI IFileDialogCustomize_fnAddMenu(IFileDialogCustomize *iface
customctrl *ctrl;
TBBUTTON tbb;
HRESULT hr;
- TRACE("%p (%d, %p)\n", This, dwIDCtl, pszLabel);
+ TRACE("%p (%ld, %p)\n", This, dwIDCtl, pszLabel);
hr = cctrl_create_new(This, dwIDCtl, NULL, TOOLBARCLASSNAMEW,
TBSTYLE_FLAT | CCS_NODIVIDER, 0,
@@ -3791,7 +3791,7 @@ static HRESULT WINAPI IFileDialogCustomize_fnAddPushButton(IFileDialogCustomize
FileDialogImpl *This = impl_from_IFileDialogCustomize(iface);
customctrl *ctrl;
HRESULT hr;
- TRACE("%p (%d, %p)\n", This, dwIDCtl, pszLabel);
+ TRACE("%p (%ld, %p)\n", This, dwIDCtl, pszLabel);
hr = cctrl_create_new(This, dwIDCtl, pszLabel, WC_BUTTONW, BS_MULTILINE, 0,
This->cctrl_def_height, &ctrl);
@@ -3807,7 +3807,7 @@ static HRESULT WINAPI IFileDialogCustomize_fnAddComboBox(IFileDialogCustomize *i
FileDialogImpl *This = impl_from_IFileDialogCustomize(iface);
customctrl *ctrl;
HRESULT hr;
- TRACE("%p (%d)\n", This, dwIDCtl);
+ TRACE("%p (%ld)\n", This, dwIDCtl);
hr = cctrl_create_new(This, dwIDCtl, NULL, WC_COMBOBOXW, CBS_DROPDOWNLIST, 0,
This->cctrl_def_height, &ctrl);
@@ -3823,7 +3823,7 @@ static HRESULT WINAPI IFileDialogCustomize_fnAddRadioButtonList(IFileDialogCusto
FileDialogImpl *This = impl_from_IFileDialogCustomize(iface);
customctrl *ctrl;
HRESULT hr;
- TRACE("%p (%d)\n", This, dwIDCtl);
+ TRACE("%p (%ld)\n", This, dwIDCtl);
hr = cctrl_create_new(This, dwIDCtl, NULL, L"RadioButtonList", 0, 0, 0, &ctrl);
if(SUCCEEDED(hr))
@@ -3843,7 +3843,7 @@ static HRESULT WINAPI IFileDialogCustomize_fnAddCheckButton(IFileDialogCustomize
FileDialogImpl *This = impl_from_IFileDialogCustomize(iface);
customctrl *ctrl;
HRESULT hr;
- TRACE("%p (%d, %p, %d)\n", This, dwIDCtl, pszLabel, bChecked);
+ TRACE("%p (%ld, %p, %d)\n", This, dwIDCtl, pszLabel, bChecked);
hr = cctrl_create_new(This, dwIDCtl, pszLabel, WC_BUTTONW, BS_AUTOCHECKBOX|BS_MULTILINE, 0,
This->cctrl_def_height, &ctrl);
@@ -3863,7 +3863,7 @@ static HRESULT WINAPI IFileDialogCustomize_fnAddEditBox(IFileDialogCustomize *if
FileDialogImpl *This = impl_from_IFileDialogCustomize(iface);
customctrl *ctrl;
HRESULT hr;
- TRACE("%p (%d, %p)\n", This, dwIDCtl, pszText);
+ TRACE("%p (%ld, %p)\n", This, dwIDCtl, pszText);
hr = cctrl_create_new(This, dwIDCtl, pszText, WC_EDITW, ES_AUTOHSCROLL, WS_EX_CLIENTEDGE,
This->cctrl_def_height, &ctrl);
@@ -3879,7 +3879,7 @@ static HRESULT WINAPI IFileDialogCustomize_fnAddSeparator(IFileDialogCustomize *
FileDialogImpl *This = impl_from_IFileDialogCustomize(iface);
customctrl *ctrl;
HRESULT hr;
- TRACE("%p (%d)\n", This, dwIDCtl);
+ TRACE("%p (%ld)\n", This, dwIDCtl);
hr = cctrl_create_new(This, dwIDCtl, NULL, WC_STATICW, SS_ETCHEDHORZ, 0,
GetSystemMetrics(SM_CYEDGE), &ctrl);
@@ -3896,7 +3896,7 @@ static HRESULT WINAPI IFileDialogCustomize_fnAddText(IFileDialogCustomize *iface
FileDialogImpl *This = impl_from_IFileDialogCustomize(iface);
customctrl *ctrl;
HRESULT hr;
- TRACE("%p (%d, %p)\n", This, dwIDCtl, pszText);
+ TRACE("%p (%ld, %p)\n", This, dwIDCtl, pszText);
hr = cctrl_create_new(This, dwIDCtl, pszText, WC_STATICW, 0, 0,
This->cctrl_def_height, &ctrl);
@@ -3912,7 +3912,7 @@ static HRESULT WINAPI IFileDialogCustomize_fnSetControlLabel(IFileDialogCustomiz
{
FileDialogImpl *This = impl_from_IFileDialogCustomize(iface);
customctrl *ctrl = get_cctrl(This, dwIDCtl);
- TRACE("%p (%d, %p)\n", This, dwIDCtl, pszLabel);
+ TRACE("%p (%ld, %p)\n", This, dwIDCtl, pszLabel);
if(!ctrl) return E_INVALIDARG;
@@ -3940,7 +3940,7 @@ static HRESULT WINAPI IFileDialogCustomize_fnGetControlState(IFileDialogCustomiz
{
FileDialogImpl *This = impl_from_IFileDialogCustomize(iface);
customctrl *ctrl = get_cctrl(This, dwIDCtl);
- TRACE("%p (%d, %p)\n", This, dwIDCtl, pdwState);
+ TRACE("%p (%ld, %p)\n", This, dwIDCtl, pdwState);
if(!ctrl || ctrl->type == IDLG_CCTRL_OPENDROPDOWN) return E_NOTIMPL;
@@ -3954,7 +3954,7 @@ static HRESULT WINAPI IFileDialogCustomize_fnSetControlState(IFileDialogCustomiz
{
FileDialogImpl *This = impl_from_IFileDialogCustomize(iface);
customctrl *ctrl = get_cctrl(This,dwIDCtl);
- TRACE("%p (%d, %x)\n", This, dwIDCtl, dwState);
+ TRACE("%p (%ld, %x)\n", This, dwIDCtl, dwState);
if(ctrl && ctrl->hwnd)
{
@@ -3987,7 +3987,7 @@ static HRESULT WINAPI IFileDialogCustomize_fnGetEditBoxText(IFileDialogCustomize
FileDialogImpl *This = impl_from_IFileDialogCustomize(iface);
customctrl *ctrl = get_cctrl(This, dwIDCtl);
WCHAR len, *text;
- TRACE("%p (%d, %p)\n", This, dwIDCtl, ppszText);
+ TRACE("%p (%ld, %p)\n", This, dwIDCtl, ppszText);
if(!ctrl || !ctrl->hwnd || !(len = SendMessageW(ctrl->hwnd, WM_GETTEXTLENGTH, 0, 0)))
return E_FAIL;
@@ -4006,7 +4006,7 @@ static HRESULT WINAPI IFileDialogCustomize_fnSetEditBoxText(IFileDialogCustomize
{
FileDialogImpl *This = impl_from_IFileDialogCustomize(iface);
customctrl *ctrl = get_cctrl(This, dwIDCtl);
- TRACE("%p (%d, %s)\n", This, dwIDCtl, debugstr_w(pszText));
+ TRACE("%p (%ld, %s)\n", This, dwIDCtl, debugstr_w(pszText));
if(!ctrl || ctrl->type != IDLG_CCTRL_EDITBOX)
return E_FAIL;
@@ -4021,7 +4021,7 @@ static HRESULT WINAPI IFileDialogCustomize_fnGetCheckButtonState(IFileDialogCust
{
FileDialogImpl *This = impl_from_IFileDialogCustomize(iface);
customctrl *ctrl = get_cctrl(This, dwIDCtl);
- TRACE("%p (%d, %p)\n", This, dwIDCtl, pbChecked);
+ TRACE("%p (%ld, %p)\n", This, dwIDCtl, pbChecked);
if(ctrl && ctrl->hwnd)
*pbChecked = (SendMessageW(ctrl->hwnd, BM_GETCHECK, 0, 0) == BST_CHECKED);
@@ -4035,7 +4035,7 @@ static HRESULT WINAPI IFileDialogCustomize_fnSetCheckButtonState(IFileDialogCust
{
FileDialogImpl *This = impl_from_IFileDialogCustomize(iface);
customctrl *ctrl = get_cctrl(This, dwIDCtl);
- TRACE("%p (%d, %d)\n", This, dwIDCtl, bChecked);
+ TRACE("%p (%ld, %d)\n", This, dwIDCtl, bChecked);
if(ctrl && ctrl->hwnd)
SendMessageW(ctrl->hwnd, BM_SETCHECK, bChecked ? BST_CHECKED:BST_UNCHECKED, 0);
@@ -4054,7 +4054,7 @@ static UINT get_combobox_index_from_id(HWND cb_hwnd, DWORD dwIDItem)
if(SendMessageW(cb_hwnd, CB_GETITEMDATA, i, 0) == dwIDItem)
return i;
- TRACE("Item with id %d not found in combobox %p (item count: %d)\n", dwIDItem, cb_hwnd, count);
+ TRACE("Item with id %ld not found in combobox %p (item count: %d)\n", dwIDItem, cb_hwnd, count);
return -1;
}
@@ -4066,7 +4066,7 @@ static HRESULT WINAPI IFileDialogCustomize_fnAddControlItem(IFileDialogCustomize
FileDialogImpl *This = impl_from_IFileDialogCustomize(iface);
customctrl *ctrl = get_cctrl(This, dwIDCtl);
HRESULT hr;
- TRACE("%p (%d, %d, %s)\n", This, dwIDCtl, dwIDItem, debugstr_w(pszLabel));
+ TRACE("%p (%ld, %ld, %s)\n", This, dwIDCtl, dwIDItem, debugstr_w(pszLabel));
if(!ctrl) return E_FAIL;
@@ -4144,7 +4144,7 @@ static HRESULT WINAPI IFileDialogCustomize_fnRemoveControlItem(IFileDialogCustom
{
FileDialogImpl *This = impl_from_IFileDialogCustomize(iface);
customctrl *ctrl = get_cctrl(This, dwIDCtl);
- TRACE("%p (%d, %d)\n", This, dwIDCtl, dwIDItem);
+ TRACE("%p (%ld, %ld)\n", This, dwIDCtl, dwIDItem);
if(!ctrl) return E_FAIL;
@@ -4224,7 +4224,7 @@ static HRESULT WINAPI IFileDialogCustomize_fnRemoveAllControlItems(IFileDialogCu
DWORD dwIDCtl)
{
FileDialogImpl *This = impl_from_IFileDialogCustomize(iface);
- TRACE("%p (%d)\n", This, dwIDCtl);
+ TRACE("%p (%ld)\n", This, dwIDCtl);
/* Not implemented by native */
return E_NOTIMPL;
@@ -4237,7 +4237,7 @@ static HRESULT WINAPI IFileDialogCustomize_fnGetControlItemState(IFileDialogCust
{
FileDialogImpl *This = impl_from_IFileDialogCustomize(iface);
customctrl *ctrl = get_cctrl(This, dwIDCtl);
- TRACE("%p (%d, %d, %p)\n", This, dwIDCtl, dwIDItem, pdwState);
+ TRACE("%p (%ld, %ld, %p)\n", This, dwIDCtl, dwIDItem, pdwState);
if(!ctrl) return E_FAIL;
@@ -4273,7 +4273,7 @@ static HRESULT WINAPI IFileDialogCustomize_fnSetControlItemState(IFileDialogCust
{
FileDialogImpl *This = impl_from_IFileDialogCustomize(iface);
customctrl *ctrl = get_cctrl(This, dwIDCtl);
- TRACE("%p (%d, %d, %x)\n", This, dwIDCtl, dwIDItem, dwState);
+ TRACE("%p (%ld, %ld, %x)\n", This, dwIDCtl, dwIDItem, dwState);
if(!ctrl) return E_FAIL;
@@ -4396,7 +4396,7 @@ static HRESULT WINAPI IFileDialogCustomize_fnGetSelectedControlItem(IFileDialogC
{
FileDialogImpl *This = impl_from_IFileDialogCustomize(iface);
customctrl *ctrl = get_cctrl(This, dwIDCtl);
- TRACE("%p (%d, %p)\n", This, dwIDCtl, pdwIDItem);
+ TRACE("%p (%ld, %p)\n", This, dwIDCtl, pdwIDItem);
if(!ctrl) return E_FAIL;
@@ -4460,7 +4460,7 @@ static HRESULT WINAPI IFileDialogCustomize_fnSetSelectedControlItem(IFileDialogC
{
FileDialogImpl *This = impl_from_IFileDialogCustomize(iface);
customctrl *ctrl = get_cctrl(This, dwIDCtl);
- TRACE("%p (%d, %d)\n", This, dwIDCtl, dwIDItem);
+ TRACE("%p (%ld, %ld)\n", This, dwIDCtl, dwIDItem);
if(!ctrl) return E_INVALIDARG;
@@ -4506,7 +4506,7 @@ static HRESULT WINAPI IFileDialogCustomize_fnStartVisualGroup(IFileDialogCustomi
FileDialogImpl *This = impl_from_IFileDialogCustomize(iface);
customctrl *vg;
HRESULT hr;
- TRACE("%p (%d, %s)\n", This, dwIDCtl, debugstr_w(pszLabel));
+ TRACE("%p (%ld, %s)\n", This, dwIDCtl, debugstr_w(pszLabel));
if(This->cctrl_active_vg)
return E_UNEXPECTED;
@@ -4536,7 +4536,7 @@ static HRESULT WINAPI IFileDialogCustomize_fnMakeProminent(IFileDialogCustomize
DWORD dwIDCtl)
{
FileDialogImpl *This = impl_from_IFileDialogCustomize(iface);
- FIXME("stub - %p (%d)\n", This, dwIDCtl);
+ FIXME("stub - %p (%ld)\n", This, dwIDCtl);
return S_OK;
}
@@ -4546,7 +4546,7 @@ static HRESULT WINAPI IFileDialogCustomize_fnSetControlItemText(IFileDialogCusto
LPCWSTR pszLabel)
{
FileDialogImpl *This = impl_from_IFileDialogCustomize(iface);
- FIXME("stub - %p (%d, %d, %s)\n", This, dwIDCtl, dwIDItem, debugstr_w(pszLabel));
+ FIXME("stub - %p (%ld, %ld, %s)\n", This, dwIDCtl, dwIDItem, debugstr_w(pszLabel));
return E_NOTIMPL;
}
@@ -4637,7 +4637,7 @@ static HRESULT FileDialog_constructor(IUnknown *pUnkOuter, REFIID riid, void **p
hr = init_custom_controls(fdimpl);
if(FAILED(hr))
{
- ERR("Failed to initialize custom controls (0x%08x).\n", hr);
+ ERR("Failed to initialize custom controls (0x%08lx).\n", hr);
IFileDialog2_Release(&fdimpl->IFileDialog2_iface);
return E_FAIL;
}
diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c
index 8d5ffc0e972..a466687dca3 100644
--- a/dlls/comdlg32/printdlg.c
+++ b/dlls/comdlg32/printdlg.c
@@ -178,7 +178,7 @@ static DRIVER_INFO_3W * get_driver_infoW(HANDLE hprn)
if (res)
return di3;
- TRACE("GetPrinterDriverW failed with %u\n", GetLastError());
+ TRACE("GetPrinterDriverW failed with %lu\n", GetLastError());
HeapFree(GetProcessHeap(), 0, di3);
return NULL;
}
@@ -198,7 +198,7 @@ static DRIVER_INFO_3A * get_driver_infoA(HANDLE hprn)
if (res)
return di3;
- TRACE("GetPrinterDriverA failed with %u\n", GetLastError());
+ TRACE("GetPrinterDriverA failed with %lu\n", GetLastError());
HeapFree(GetProcessHeap(), 0, di3);
return NULL;
}
@@ -225,7 +225,7 @@ static PRINTER_INFO_2W * get_printer_infoW(HANDLE hprn)
if (res)
return pi2;
- TRACE("GetPrinterW failed with %u\n", GetLastError());
+ TRACE("GetPrinterW failed with %lu\n", GetLastError());
HeapFree(GetProcessHeap(), 0, pi2);
return NULL;
}
@@ -245,7 +245,7 @@ static PRINTER_INFO_2A * get_printer_infoA(HANDLE hprn)
if (res)
return pi2;
- TRACE("GetPrinterA failed with %u\n", GetLastError());
+ TRACE("GetPrinterA failed with %lu\n", GetLastError());
HeapFree(GetProcessHeap(), 0, pi2);
return NULL;
}
@@ -1232,12 +1232,12 @@ static BOOL PRINTDLG_ChangePrinterA(HWND hDlg, char *name, PRINT_PTRA *PrintStru
{
if(dpiX == Resolutions[i])
IsDefault = TRUE;
- sprintf(buf, "%d dpi", Resolutions[i]);
+ sprintf(buf, "%ld dpi", Resolutions[i]);
} else
{
if(dpiX == Resolutions[i] && dpiY == Resolutions[i+1])
IsDefault = TRUE;
- sprintf(buf, "%d dpi x %d dpi", Resolutions[i], Resolutions[i+1]);
+ sprintf(buf, "%ld dpi x %ld dpi", Resolutions[i], Resolutions[i+1]);
}
Index = SendMessageA(hQuality, CB_ADDSTRING, 0, (LPARAM)buf);
@@ -2249,7 +2249,7 @@ BOOL WINAPI PrintDlgA(LPPRINTDLGA lppd)
}
TRACE("(%p): hwndOwner = %p, hDevMode = %p, hDevNames = %p\n"
"pp. %d-%d, min p %d, max p %d, copies %d, hinst %p\n"
- "flags %08x (%s)\n",
+ "flags %08lx (%s)\n",
lppd, lppd->hwndOwner, lppd->hDevMode, lppd->hDevNames,
lppd->nFromPage, lppd->nToPage, lppd->nMinPage, lppd->nMaxPage,
lppd->nCopies, lppd->hInstance, lppd->Flags, flagstr);
@@ -2285,7 +2285,7 @@ BOOL WINAPI PrintDlgA(LPPRINTDLGA lppd)
GetPrinterDriverA(hprn, NULL, 3, NULL, 0, &needed);
dbuf = HeapAlloc(GetProcessHeap(),0,needed);
if (!GetPrinterDriverA(hprn, NULL, 3, (LPBYTE)dbuf, needed, &needed)) {
- ERR("GetPrinterDriverA failed, le %d, fix your config for printer %s!\n",
+ ERR("GetPrinterDriverA failed, le %ld, fix your config for printer %s!\n",
GetLastError(),pbuf->pPrinterName);
HeapFree(GetProcessHeap(), 0, dbuf);
HeapFree(GetProcessHeap(), 0, pbuf);
@@ -2400,7 +2400,7 @@ BOOL WINAPI PrintDlgW(LPPRINTDLGW lppd)
}
TRACE("(%p): hwndOwner = %p, hDevMode = %p, hDevNames = %p\n"
"pp. %d-%d, min p %d, max p %d, copies %d, hinst %p\n"
- "flags %08x (%s)\n",
+ "flags %08lx (%s)\n",
lppd, lppd->hwndOwner, lppd->hDevMode, lppd->hDevNames,
lppd->nFromPage, lppd->nToPage, lppd->nMinPage, lppd->nMaxPage,
lppd->nCopies, lppd->hInstance, lppd->Flags, flagstr);
@@ -2436,7 +2436,7 @@ BOOL WINAPI PrintDlgW(LPPRINTDLGW lppd)
GetPrinterDriverW(hprn, NULL, 3, NULL, 0, &needed);
dbuf = HeapAlloc(GetProcessHeap(),0,needed);
if (!GetPrinterDriverW(hprn, NULL, 3, (LPBYTE)dbuf, needed, &needed)) {
- ERR("GetPrinterDriverA failed, le %d, fix your config for printer %s!\n",
+ ERR("GetPrinterDriverA failed, le %ld, fix your config for printer %s!\n",
GetLastError(),debugstr_w(pbuf->pPrinterName));
HeapFree(GetProcessHeap(), 0, dbuf);
HeapFree(GetProcessHeap(), 0, pbuf);
@@ -3180,7 +3180,7 @@ static void pagesetup_change_preview(const pagesetup_data *data)
}
x = (data->rtDrawRect.right + data->rtDrawRect.left - width) / 2;
y = (data->rtDrawRect.bottom + data->rtDrawRect.top - height) / 2;
- TRACE("draw rect %s x=%d, y=%d, w=%d, h=%d\n",
+ TRACE("draw rect %s x=%ld, y=%ld, w=%ld, h=%ld\n",
wine_dbgstr_rect(&data->rtDrawRect), x, y, width, height);
MoveWindow(GetDlgItem(data->hDlg, rct2), x + width, y + shadow, shadow, height, FALSE);
@@ -3348,7 +3348,7 @@ static BOOL pagesetup_wm_command(HWND hDlg, WPARAM wParam, LPARAM lParam, pagese
WORD msg = HIWORD(wParam);
WORD id = LOWORD(wParam);
- TRACE("loword (lparam) %d, wparam 0x%lx, lparam %08lx\n",
+ TRACE("loword (lparam) %d, wparam 0x%Ix, lparam %08Ix\n",
LOWORD(lParam),wParam,lParam);
switch (id) {
case IDOK:
@@ -3778,7 +3778,7 @@ static void pagesetup_dump_dlg_struct(const pagesetup_data *data)
}
}
TRACE("%s: (%p): hwndOwner = %p, hDevMode = %p, hDevNames = %p\n"
- "hinst %p, flags %08x (%s)\n",
+ "hinst %p, flags %08lx (%s)\n",
data->unicode ? "unicode" : "ansi",
data->u.dlgw, data->u.dlgw->hwndOwner, data->u.dlgw->hDevMode,
data->u.dlgw->hDevNames, data->u.dlgw->hInstance,
@@ -4025,7 +4025,7 @@ HRESULT WINAPI PrintDlgExA(LPPRINTDLGEXA lppd)
if (!lppd->nPropertyPages)
return E_INVALIDARG;
- FIXME("custom property sheets (%d at %p) not supported\n", lppd->nPropertyPages, lppd->lphPropertyPages);
+ FIXME("custom property sheets (%ld at %p) not supported\n", lppd->nPropertyPages, lppd->lphPropertyPages);
}
/* Use PD_NOPAGENUMS or set nMaxPageRanges and lpPageRanges */
@@ -4178,7 +4178,7 @@ HRESULT WINAPI PrintDlgExW(LPPRINTDLGEXW lppd)
if (!lppd->nPropertyPages)
return E_INVALIDARG;
- FIXME("custom property sheets (%d at %p) not supported\n", lppd->nPropertyPages, lppd->lphPropertyPages);
+ FIXME("custom property sheets (%ld at %p) not supported\n", lppd->nPropertyPages, lppd->lphPropertyPages);
}
/* Use PD_NOPAGENUMS or set nMaxPageRanges and lpPageRanges */
More information about the wine-devel
mailing list