January 2007 - Wine-commits

Alexandre Julliard : winecoreaudio.drv: Fix printf format warnings.
by Alexandre Julliard 18 Jan '07

18 Jan '07

Module: wine Branch: master Commit: 3ccf501209bb4df7e96fe5bda4e2373f57c599d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ccf501209bb4df7e96fe5bda… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 18 13:27:55 2007 +0100 winecoreaudio.drv: Fix printf format warnings. --- dlls/winecoreaudio.drv/audio.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winecoreaudio.drv/audio.c b/dlls/winecoreaudio.drv/audio.c index 0c90afe..61b2d5c 100644 --- a/dlls/winecoreaudio.drv/audio.c +++ b/dlls/winecoreaudio.drv/audio.c @@ -2187,7 +2187,7 @@ OSStatus CoreAudio_wiAudioUnitIOProc(voi if (wwi->trace_on) fprintf(stderr, "trace:wave:CoreAudio_wiAudioUnitIOProc (ioActionFlags = %08lx, " - "inTimeStamp = { %f, %lx%08lx, %f, %lx%08lx, %08lx }, inBusNumber = %lu, inNumberFrames = %lu)\n", + "inTimeStamp = { %f, %x%08x, %f, %x%08x, %08lx }, inBusNumber = %lu, inNumberFrames = %lu)\n", *ioActionFlags, inTimeStamp->mSampleTime, (DWORD)(inTimeStamp->mHostTime >>32), (DWORD)inTimeStamp->mHostTime, inTimeStamp->mRateScalar, (DWORD)(inTimeStamp->mWordClockTime >> 32), (DWORD)inTimeStamp->mWordClockTime, inTimeStamp->mFlags, inBusNumber, inNumberFrames);

1 0

Francois Gouget : Assorted spelling fixes.
by Alexandre Julliard 18 Jan '07

18 Jan '07

Module: wine Branch: master Commit: b0bde6b87c998c5d4ebd4a8bb328c45e94e13755 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0bde6b87c998c5d4ebd4a8bb… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jan 18 11:35:50 2007 +0100 Assorted spelling fixes. --- dlls/comctl32/listview.c | 4 ++-- dlls/localspl/tests/localmon.c | 4 ++-- dlls/mapi32/tests/prop.c | 4 ++-- dlls/odbccp32/odbccp32.c | 2 +- dlls/ole32/rpc.c | 2 +- dlls/urlmon/mk.c | 4 ++-- dlls/wined3d/state.c | 4 ++-- dlls/winspool.drv/info.c | 10 +++++----- include/wine/debug.h | 2 +- tools/winapi/options.pm | 2 +- 10 files changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index bc0db87..53d8837 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -2391,7 +2391,7 @@ static SUBITEM_INFO* LISTVIEW_GetSubItem /*** * DESCRIPTION: - * Caclulates the desired item width. + * Calculates the desired item width. * * PARAMETER(S): * [I] infoPtr : valid pointer to the listview structure @@ -2436,7 +2436,7 @@ static INT LISTVIEW_CalculateItemWidth(L /*** * DESCRIPTION: - * Caclulates the desired item height. + * Calculates the desired item height. * * PARAMETER(S): * [I] infoPtr : valid pointer to the listview structure diff --git a/dlls/localspl/tests/localmon.c b/dlls/localspl/tests/localmon.c index a254a90..657eba8 100644 --- a/dlls/localspl/tests/localmon.c +++ b/dlls/localspl/tests/localmon.c @@ -594,7 +594,7 @@ static void test_XcvDataPort_PortIsValid res, GetLastError(), needed); - /* a normal, writeable file is allowed */ + /* a normal, writable file is allowed */ needed = (DWORD) 0xdeadbeef; SetLastError(0xdeadbeef); res = pXcvDataPort(hXcv, cmd_PortIsValidW, (PBYTE) tempfileW, (lstrlenW(tempfileW) + 1) * sizeof(WCHAR), NULL, 0, &needed); @@ -684,7 +684,7 @@ START_TEST(localmon) DWORD numentries; DWORD res; - /* This DLL does not exists on Win9x */ + /* This DLL does not exist on Win9x */ hdll = LoadLibraryA("localspl.dll"); if (!hdll) return; diff --git a/dlls/mapi32/tests/prop.c b/dlls/mapi32/tests/prop.c index 3ffd015..ac397ff 100644 --- a/dlls/mapi32/tests/prop.c +++ b/dlls/mapi32/tests/prop.c @@ -1190,7 +1190,7 @@ static void test_IProp(void) pMAPIFreeBuffer(lpProps); } - /* Add (NULL) - Can't add NULL's */ + /* Add (NULL) - Can't add NULLs */ lpProbs = NULL; pvs[0].ulPropTag = PROP_TAG(PT_NULL,0x01); sc = IPropData_SetProps(lpIProp, 1, pvs, &lpProbs); @@ -1198,7 +1198,7 @@ static void test_IProp(void) "SetProps(): Expected INVALID_PARAMETER, null, got 0x%08X,%p\n", sc, lpProbs); - /* Add (OBJECT) - Can't add OBJECTS's */ + /* Add (OBJECT) - Can't add OBJECTs */ lpProbs = NULL; pvs[0].ulPropTag = PROP_TAG(PT_OBJECT,0x01); sc = IPropData_SetProps(lpIProp, 1, pvs, &lpProbs); diff --git a/dlls/odbccp32/odbccp32.c b/dlls/odbccp32/odbccp32.c index 44957a2..5289e14 100644 --- a/dlls/odbccp32/odbccp32.c +++ b/dlls/odbccp32/odbccp32.c @@ -178,7 +178,7 @@ static BOOL SQLInstall_narrow(int mode, } else { - ERR("transfering wide to narrow\n"); + ERR("transferring wide to narrow\n"); } if (pbuf != buffer) { diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c index d28241b..fdb81ed 100644 --- a/dlls/ole32/rpc.c +++ b/dlls/ole32/rpc.c @@ -856,7 +856,7 @@ static HRESULT WINAPI ClientRpcChannelBu TRACE("hrFault = 0x%08x\n", hrFault); /* FIXME: this condition should be - * "hr == S_OK && (!hrFault || msg->BufferLength > FIELD_OFFSET(ORPCTHAT, extentions) + 4)" + * "hr == S_OK && (!hrFault || msg->BufferLength > FIELD_OFFSET(ORPCTHAT, extensions) + 4)" * but we don't currently reset the message length for PostMessage * dispatched calls */ if (hr == S_OK && hrFault == S_OK) diff --git a/dlls/urlmon/mk.c b/dlls/urlmon/mk.c index 3ee4329..2af01f2 100644 --- a/dlls/urlmon/mk.c +++ b/dlls/urlmon/mk.c @@ -256,10 +256,10 @@ static HRESULT WINAPI MkProtocol_Read(II } static HRESULT WINAPI MkProtocol_Seek(IInternetProtocol *iface, LARGE_INTEGER dlibMove, - DWORD dwOrgin, ULARGE_INTEGER *plibNewPosition) + DWORD dwOrigin, ULARGE_INTEGER *plibNewPosition) { MkProtocol *This = PROTOCOL_THIS(iface); - FIXME("(%p)->(%d %d %p)\n", This, dlibMove.u.LowPart, dwOrgin, plibNewPosition); + FIXME("(%p)->(%d %d %p)\n", This, dlibMove.u.LowPart, dwOrigin, plibNewPosition); return E_NOTIMPL; } diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index adcd9c5..40d4fa4 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -2683,7 +2683,7 @@ static void vertexdeclaration(DWORD stat handleStreams(stateblock, useVertexShaderFunction); - /* Do I have to use ? TRUE : FALSE ? Or can I rely on 15==15 beeing equal to TRUE(=1)? */ + /* Do I have to use ? TRUE : FALSE ? Or can I rely on 15==15 being equal to TRUE(=1)? */ transformed = ((device->strided_streams.u.s.position.lpData != NULL || device->strided_streams.u.s.position.VBO != 0) && device->strided_streams.u.s.position_transformed) ? TRUE : FALSE; @@ -2692,7 +2692,7 @@ static void vertexdeclaration(DWORD stat updateFog = TRUE; } - /* Reapply lighting if it is not sheduled for reapplication already */ + /* Reapply lighting if it is not scheduled for reapplication already */ if(!isStateDirty(device, STATE_RENDER(WINED3DRS_LIGHTING))) { state_lighting(STATE_RENDER(WINED3DRS_LIGHTING), stateblock); } diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index af2c8b7..79a9b94 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -1342,8 +1342,8 @@ static LPCWSTR get_basename_from_name(LP /* skip over the servername and search for the following '\' */ name = strchrW(&name[2], '\\'); if ((name) && (name[1])) { - /* found a seperator ('\') followed by a name: - skip over the seperator and return the rest */ + /* found a separator ('\') followed by a name: + skip over the separator and return the rest */ name++; } else @@ -2364,7 +2364,7 @@ BOOL WINAPI DeleteMonitorW (LPWSTR pName return TRUE; } - WARN("monitor %s does not exists\n", debugstr_w(pMonitorName)); + WARN("monitor %s does not exist\n", debugstr_w(pMonitorName)); RegCloseKey(hroot); /* NT: ERROR_UNKNOWN_PRINT_MONITOR (3000), 9x: ERROR_INVALID_PARAMETER (87) */ @@ -5085,7 +5085,7 @@ BOOL WINAPI EnumPortsA( LPSTR pName, DWO We use the smaller Ansi-Size to avoid conflicts with fixed Buffers of old Apps. */ if (res) { - /* EnumPortsW collected all Data. Parse them to caclulate ANSI-Size */ + /* EnumPortsW collected all Data. Parse them to calculate ANSI-Size */ DWORD entrysize = 0; DWORD index; LPSTR ptr; @@ -6463,7 +6463,7 @@ BOOL WINAPI EnumMonitorsA(LPSTR pName, D We use the smaller Ansi-Size to avoid conflicts with fixed Buffers of old Apps. */ if (res) { - /* EnumMonitorsW collected all Data. Parse them to caclulate ANSI-Size */ + /* EnumMonitorsW collected all Data. Parse them to calculate ANSI-Size */ DWORD entrysize = 0; DWORD index; LPSTR ptr; diff --git a/include/wine/debug.h b/include/wine/debug.h index c1ef2b5..31752b0 100644 --- a/include/wine/debug.h +++ b/include/wine/debug.h @@ -162,7 +162,7 @@ extern void __wine_dbg_set_functions( co * Exported definitions and macros */ -/* These function return a printable version of a string, including +/* These functions return a printable version of a string, including quotes. The string will be valid for some time, but not indefinitely as strings are re-used. */ extern const char *wine_dbgstr_an( const char * s, int n ); diff --git a/tools/winapi/options.pm b/tools/winapi/options.pm index 714eebb..232de7f 100644 --- a/tools/winapi/options.pm +++ b/tools/winapi/options.pm @@ -383,7 +383,7 @@ sub AUTOLOAD { my $refvalue = $self->{$name}; if(!defined($refvalue)) { - die "<internal>: options.pm: member $name does not exists\n"; + die "<internal>: options.pm: member $name does not exist\n"; } if(ref($$refvalue) ne "HASH") {

1 0

Francois Gouget : Don't put single quotes around '%s' when using the debugstr_*() functions.
by Alexandre Julliard 18 Jan '07

18 Jan '07

Module: wine Branch: master Commit: aab5e5856eb05ec2ae3ad24f9d254ab1de6dec28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aab5e5856eb05ec2ae3ad24f9… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jan 18 11:40:15 2007 +0100 Don't put single quotes around '%s' when using the debugstr_*() functions. --- dlls/comctl32/ipaddress.c | 2 +- dlls/comctl32/propsheet.c | 6 +++--- dlls/comdlg32/filedlg.c | 2 +- dlls/dmloader/loaderstream.c | 6 +++--- dlls/gdi32/mfdrv/init.c | 2 +- dlls/gdi32/palette.c | 4 ++-- dlls/kernel32/lcformat.c | 4 ++-- dlls/msacm32/driver.c | 2 +- dlls/msi/action.c | 4 ++-- dlls/msvcrt/dir.c | 2 +- dlls/msvcrt/file.c | 2 +- dlls/msvfw32/mciwnd.c | 2 +- dlls/secur32/ntlm.c | 2 +- dlls/shell32/shellpath.c | 4 ++-- dlls/shlwapi/ordinal.c | 2 +- dlls/user32/dialog.c | 4 ++-- dlls/user32/edit.c | 2 +- dlls/wineps.drv/ps.c | 2 +- dlls/wininet/http.c | 4 ++-- dlls/winmm/playsound.c | 6 +++--- programs/winemenubuilder/winemenubuilder.c | 2 +- programs/winhelp/hlpfile.c | 2 +- 22 files changed, 34 insertions(+), 34 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=aab5e5856eb05ec2ae3ad…

1 0

Francois Gouget : shell32: There is no need to check strings for NULL when using debugstr_w().
by Alexandre Julliard 18 Jan '07

18 Jan '07

Module: wine Branch: master Commit: 4abebb8eb5b540ba5603286da371cfe9c25c519c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4abebb8eb5b540ba5603286da… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jan 18 11:38:19 2007 +0100 shell32: There is no need to check strings for NULL when using debugstr_w(). Also don't put single quotes around '%s' in that case. --- dlls/shell32/shlexec.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index 0c3b5a4..88ee3e6 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -576,7 +576,7 @@ UINT SHELL_FindExecutable(LPCWSTR lpPath WCHAR xlpFile[256]; /* result of SearchPath */ DWORD attribs; /* file attributes */ - TRACE("%s\n", (lpFile != NULL) ? debugstr_w(lpFile) : "-"); + TRACE("%s\n", debugstr_w(lpFile)); if (!lpResult) return ERROR_INVALID_PARAMETER; @@ -828,7 +828,7 @@ static unsigned dde_connect(WCHAR* key, if (!hConv) { static const WCHAR wIfexec[] = {'\\','i','f','e','x','e','c',0}; - TRACE("Launching '%s'\n", debugstr_w(start)); + TRACE("Launching %s\n", debugstr_w(start)); ret = execfunc(start, env, TRUE, psei, psei_out); if (ret <= 32) { @@ -1009,8 +1009,7 @@ HINSTANCE WINAPI FindExecutableW(LPCWSTR UINT_PTR retval = SE_ERR_NOASSOC; WCHAR old_dir[1024]; - TRACE("File %s, Dir %s\n", - (lpFile != NULL ? debugstr_w(lpFile) : "-"), (lpDirectory != NULL ? debugstr_w(lpDirectory) : "-")); + TRACE("File %s, Dir %s\n", debugstr_w(lpFile), debugstr_w(lpDirectory)); lpResult[0] = '\0'; /* Start off with an empty return string */ if (lpFile == NULL) @@ -1413,7 +1412,7 @@ BOOL SHELL_execute( LPSHELLEXECUTEINFOW wszParameters, sizeof(wszParameters)/sizeof(WCHAR)); /* FIXME: get the extension of lpFile, check if it fits to the lpClass */ - TRACE("SEE_MASK_CLASSNAME->'%s', doc->'%s'\n", debugstr_w(wszParameters), debugstr_w(wszApplicationName)); + TRACE("SEE_MASK_CLASSNAME->%s, doc->%s\n", debugstr_w(wszParameters), debugstr_w(wszApplicationName)); wcmd[0] = '\0'; done = SHELL_ArgifyW(wcmd, sizeof(wcmd)/sizeof(WCHAR), wszParameters, wszApplicationName, sei_tmp.lpIDList, NULL, &resultLen);

1 0

Francois Gouget : winspool.drv: Use '%u' to print GetLastError().
by Alexandre Julliard 18 Jan '07

18 Jan '07

Module: wine Branch: master Commit: 42c4114401dec7bbc3fb5e2796b0387045ab253b URL: http://source.winehq.org/git/wine.git/?a=commit;h=42c4114401dec7bbc3fb5e279… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jan 18 11:37:51 2007 +0100 winspool.drv: Use '%u' to print GetLastError(). --- dlls/winspool.drv/info.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 90e11c2..af2c8b7 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -1488,7 +1488,7 @@ static HANDLE get_opened_printer_entry(L goto end; } if (RegOpenKeyW(hkeyPrinters, printername, &hkeyPrinter) != ERROR_SUCCESS) { - WARN("Printer not found in Registry: '%s'\n", debugstr_w(printername)); + WARN("Printer not found in Registry: %s\n", debugstr_w(printername)); RegCloseKey(hkeyPrinters); SetLastError(ERROR_INVALID_PRINTER_NAME); handle = 0; @@ -2073,7 +2073,7 @@ BOOL WINAPI OpenPrinterW(LPWSTR lpPrinte /* Get the unique handle of the printer or Printserver */ *phPrinter = get_opened_printer_entry(lpPrinterName, pDefault); - TRACE("returning %d with 0x%x and %p\n", *phPrinter != NULL, GetLastError(), *phPrinter); + TRACE("returning %d with %u and %p\n", *phPrinter != NULL, GetLastError(), *phPrinter); return (*phPrinter != 0); } @@ -2905,7 +2905,7 @@ HANDLE WINAPI AddPrinterW(LPWSTR pName, size = DocumentPropertiesW(0, 0, pi->pPrinterName, NULL, NULL, 0); if(size < 0) { - FIXME("DocumentPropertiesW on printer '%s' fails\n", debugstr_w(pi->pPrinterName)); + FIXME("DocumentPropertiesW on printer %s fails\n", debugstr_w(pi->pPrinterName)); size = sizeof(DEVMODEW); } if(pi->pDevMode) @@ -2917,7 +2917,7 @@ HANDLE WINAPI AddPrinterW(LPWSTR pName, dmW->dmSize = size; if (0>DocumentPropertiesW(0,0,pi->pPrinterName,dmW,NULL,DM_OUT_BUFFER)) { - WARN("DocumentPropertiesW on printer '%s' failed!\n", debugstr_w(pi->pPrinterName)); + WARN("DocumentPropertiesW on printer %s failed!\n", debugstr_w(pi->pPrinterName)); HeapFree(GetProcessHeap(),0,dmW); dmW=NULL; } @@ -3370,7 +3370,7 @@ DWORD WINAPI StartDocPrinterW(HANDLE hPr if(!AddJobW(hPrinter, 1, addjob_buf, sizeof(addjob_buf), &needed)) { - ERR("AddJob failed gle %08x\n", GetLastError()); + ERR("AddJob failed gle %u\n", GetLastError()); goto end; } @@ -4299,7 +4299,7 @@ static BOOL WINSPOOL_GetDriverInfoFromRe } if(!DriverName[0] || RegOpenKeyW(hkeyDrivers, DriverName, &hkeyDriver) != ERROR_SUCCESS) { - ERR("Can't find driver '%s' in registry\n", debugstr_w(DriverName)); + ERR("Can't find driver %s in registry\n", debugstr_w(DriverName)); SetLastError(ERROR_UNKNOWN_PRINTER_DRIVER); /* ? */ return FALSE; }

1 0

Francois Gouget : winmm/tests: Use '%u' to print GetLastError().
by Alexandre Julliard 18 Jan '07

18 Jan '07

Module: wine Branch: master Commit: 6834945ece92fb88e8fd4b939c82335007d6e095 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6834945ece92fb88e8fd4b939… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jan 18 11:37:36 2007 +0100 winmm/tests: Use '%u' to print GetLastError(). --- dlls/winmm/tests/timer.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winmm/tests/timer.c b/dlls/winmm/tests/timer.c index 22ce81d..7ac86b9 100644 --- a/dlls/winmm/tests/timer.c +++ b/dlls/winmm/tests/timer.c @@ -167,7 +167,7 @@ static void CALLBACK priorityTimeProc(UI DWORD_PTR dw1, DWORD_PTR dw2) { priority = GetThreadPriority(GetCurrentThread()); - ok(priority!=THREAD_PRIORITY_ERROR_RETURN, "GetThreadPriority() failed, GetLastError() = %08x\n", GetLastError()); + ok(priority!=THREAD_PRIORITY_ERROR_RETURN, "GetThreadPriority() failed, GetLastError() = %u\n", GetLastError()); fired = TRUE; }

1 0

Francois Gouget : ntdll/tests: Use '%u' to print GetLastError().
by Alexandre Julliard 18 Jan '07

18 Jan '07

Module: wine Branch: master Commit: fb6569a720d06f76d60651db4b9615c0041e70d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb6569a720d06f76d60651db4… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jan 18 11:36:55 2007 +0100 ntdll/tests: Use '%u' to print GetLastError(). --- dlls/ntdll/tests/info.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 8d288d7..d460f33 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -680,7 +680,7 @@ static void test_query_process_times(voi process = OpenProcess(PROCESS_QUERY_INFORMATION, FALSE, one_before_last_pid); if (!process) { - trace("Could not open process with ID : %d, error : %08x. Going to use current one.\n", one_before_last_pid, GetLastError()); + trace("Could not open process with ID : %d, error : %u. Going to use current one.\n", one_before_last_pid, GetLastError()); process = GetCurrentProcess(); trace("ProcessTimes for current process\n"); } @@ -733,7 +733,7 @@ static void test_query_process_handlecou process = OpenProcess(PROCESS_QUERY_INFORMATION, FALSE, one_before_last_pid); if (!process) { - trace("Could not open process with ID : %d, error : %08x. Going to use current one.\n", one_before_last_pid, GetLastError()); + trace("Could not open process with ID : %d, error : %u. Going to use current one.\n", one_before_last_pid, GetLastError()); process = GetCurrentProcess(); trace("ProcessHandleCount for current process\n"); }

1 0

Francois Gouget : mcicda: Use '%u' to print GetLastError().
by Alexandre Julliard 18 Jan '07

18 Jan '07

Module: wine Branch: master Commit: 9a036530d05c398aa9874011db5323bdbe8069a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a036530d05c398aa9874011d… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jan 18 11:36:44 2007 +0100 mcicda: Use '%u' to print GetLastError(). --- dlls/mcicda/mcicda.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mcicda/mcicda.c b/dlls/mcicda/mcicda.c index 359df7f..5ec14e8 100644 --- a/dlls/mcicda/mcicda.c +++ b/dlls/mcicda/mcicda.c @@ -148,7 +148,7 @@ static int MCICDA_GetError(WINE_MCICDAUD case ERROR_NOT_READY: return MCIERR_DEVICE_NOT_READY; case ERROR_IO_DEVICE: return MCIERR_HARDWARE; default: - FIXME("Unknown mode %x\n", GetLastError()); + FIXME("Unknown mode %u\n", GetLastError()); } return MCIERR_DRIVER_INTERNAL; }

1 0

Francois Gouget : secur32: Use '%u' to print GetLastError().
by Alexandre Julliard 18 Jan '07

18 Jan '07

Module: wine Branch: master Commit: 933bf76b5db5cf96cd75e7a355f7c300fa754041 URL: http://source.winehq.org/git/wine.git/?a=commit;h=933bf76b5db5cf96cd75e7a35… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jan 18 11:37:08 2007 +0100 secur32: Use '%u' to print GetLastError(). --- dlls/secur32/secur32.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/secur32.c b/dlls/secur32/secur32.c index edb2c1d..0841ae7 100644 --- a/dlls/secur32/secur32.c +++ b/dlls/secur32/secur32.c @@ -943,7 +943,7 @@ BOOLEAN WINAPI GetComputerObjectNameW( if (ntStatus != STATUS_SUCCESS) { SetLastError(LsaNtStatusToWinError(ntStatus)); - WARN("LsaOpenPolicy failed with NT status %x\n", GetLastError()); + WARN("LsaOpenPolicy failed with NT status %u\n", GetLastError()); return FALSE; } @@ -953,7 +953,7 @@ BOOLEAN WINAPI GetComputerObjectNameW( if (ntStatus != STATUS_SUCCESS) { SetLastError(LsaNtStatusToWinError(ntStatus)); - WARN("LsaQueryInformationPolicy failed with NT status %x\n", + WARN("LsaQueryInformationPolicy failed with NT status %u\n", GetLastError()); LsaClose(policyHandle); return FALSE;

1 0

Francois Gouget : localspl: Remove unneeded cast.
by Alexandre Julliard 18 Jan '07

18 Jan '07

Module: wine Branch: master Commit: 8c613a79e6cd24516acc8b4e9b046651a699db2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c613a79e6cd24516acc8b4e9… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jan 18 11:36:02 2007 +0100 localspl: Remove unneeded cast. --- dlls/localspl/localmon.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/localspl/localmon.c b/dlls/localspl/localmon.c index 66d95cf..f7dcb62 100644 --- a/dlls/localspl/localmon.c +++ b/dlls/localspl/localmon.c @@ -490,7 +490,7 @@ BOOL WINAPI localmon_XcvOpenPort(LPCWSTR } else { - *phXcv = (HANDLE) NULL; + *phXcv = NULL; return FALSE; } }

1 0