Skip to content

W
wine-winehq
Commit 05fef748 authored by Eric Pouech's avatar Eric Pouech Committed by Alexandre Julliard
Browse files
Options

comdlg32: Enable compilation with long types.

Signed-off-by: 's avatarEric Pouech <eric.pouech@gmail.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 8a3bc321
Expand all Show whitespace changes
Inline Side-by-side
Showing with 59 additions and 60 deletions
dlls/comdlg32/Makefile.in
View file @ 05fef748
EXTRADEFS = -DWINE_NO_LONG_TYPES
MODULE = comdlg32.dll
IMPORTLIB = comdlg32
IMPORTS = uuid shell32 shlwapi comctl32 winspool user32 gdi32 advapi32
......
dlls/comdlg32/cdlg32.c
View file @ 05fef748
......@@ -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)
......
dlls/comdlg32/colordlg.c
View file @ 05fef748
......@@ -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 */
......
dlls/comdlg32/filedlg.c
View file @ 05fef748
......@@ -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 ))
{
......
dlls/comdlg32/filedlg31.c
View file @ 05fef748
......@@ -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)
{
......
dlls/comdlg32/filedlgbrowser.c
View file @ 05fef748
......@@ -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;
}
......
dlls/comdlg32/finddlg.c
View file @ 05fef748
......@@ -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))
{
......
dlls/comdlg32/fontdlg.c
View file @ 05fef748
......@@ -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:
......
dlls/comdlg32/printdlg.c
View file @ 05fef748
......@@ -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 */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment