October 2009 - Wine-Commits

Henri Verbeet : d3d9: Add some tests for CreateStateBlock().
by Alexandre Julliard Oct. 8, 2009

Oct. 8, 2009

Module: wine Branch: master Commit: 50e1106ecaf1d5c44123ae66fcf76eee598e9065 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50e1106ecaf1d5c44123ae66f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 8 09:23:24 2009 +0200 d3d9: Add some tests for CreateStateBlock(). --- dlls/d3d9/tests/stateblock.c | 30 ++++++++++++++++++++++++++++++ 1 files changed, 30 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/stateblock.c b/dlls/d3d9/tests/stateblock.c index 88eaec9..dd1cd44 100644 --- a/dlls/d3d9/tests/stateblock.c +++ b/dlls/d3d9/tests/stateblock.c @@ -294,6 +294,16 @@ static int revert_render_target(IDirect3DDevice9 *device, struct event_data *eve return EVENT_OK; } +static int create_stateblock(IDirect3DDevice9 *device, struct event_data *event_data) +{ + HRESULT hr; + + hr = IDirect3DDevice9_CreateStateBlock(device, D3DSBT_ALL, &event_data->stateblock); + ok(SUCCEEDED(hr), "CreateStateBlock returned %#x.\n", hr); + if (FAILED(hr)) return EVENT_ERROR; + return EVENT_OK; +} + static int begin_stateblock(IDirect3DDevice9 *device, struct event_data *event_data) { HRESULT hret; @@ -386,6 +396,20 @@ static void execute_test_chain_all(IDirect3DDevice9 *device, struct state_test * {apply_stateblock, SB_DATA_DEFAULT, SB_DATA_NONE}, }; + struct event create_stateblock_capture_apply_events[] = + { + {create_stateblock, SB_DATA_DEFAULT, SB_DATA_TEST_IN}, + {capture_stateblock, SB_DATA_TEST, SB_DATA_DEFAULT}, + {apply_stateblock, SB_DATA_TEST, SB_DATA_NONE}, + }; + + struct event create_stateblock_apply_events[] = + { + {NULL, SB_DATA_DEFAULT, SB_DATA_TEST_IN}, + {create_stateblock, SB_DATA_TEST, SB_DATA_DEFAULT}, + {apply_stateblock, SB_DATA_TEST, SB_DATA_NONE}, + }; + struct event rendertarget_switch_events[] = { {NULL, SB_DATA_NONE, SB_DATA_TEST_IN}, @@ -425,6 +449,12 @@ static void execute_test_chain_all(IDirect3DDevice9 *device, struct state_test * trace("Running stateblock capture/reapply state tests\n"); execute_test_chain(device, test, ntests, capture_reapply_stateblock_events, 4, &arg); + trace("Running create stateblock capture/apply state tests\n"); + execute_test_chain(device, test, ntests, create_stateblock_capture_apply_events, 3, &arg); + + trace("Running create stateblock apply state tests\n"); + execute_test_chain(device, test, ntests, create_stateblock_apply_events, 3, &arg); + trace("Running rendertarget switch state tests\n"); execute_test_chain(device, test, ntests, rendertarget_switch_events, 3, &arg);

1 0

Paul Vriens : comctl32/tests: Fix some test failures on older comctl32 versions.
by Alexandre Julliard Oct. 8, 2009

Oct. 8, 2009

Module: wine Branch: master Commit: 87441ff83c7abade447ea5f797728a44c376da59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87441ff83c7abade447ea5f79… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Oct 8 08:00:14 2009 +0200 comctl32/tests: Fix some test failures on older comctl32 versions. --- dlls/comctl32/tests/monthcal.c | 25 +++++++++++++++---------- 1 files changed, 15 insertions(+), 10 deletions(-) diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index d3f6681..21c171e 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -811,16 +811,21 @@ static void test_monthcal_currdate(void) st_new.wMonth = 1; st_new.wDay = 1; res = SendMessage(hwnd, MCM_SETCURSEL, 0, (LPARAM)&st_new); - expect(0, res); - memset(&st_test, 0, sizeof(st_test)); - res = SendMessage(hwnd, MCM_GETCURSEL, 0, (LPARAM)&st_test); - expect(1, res); - expect(st_original.wYear, st_test.wYear); - expect(st_original.wMonth, st_test.wMonth); - expect(st_original.wDay, st_test.wDay); - expect(st_original.wHour, st_test.wHour); - expect(st_original.wMinute, st_test.wMinute); - expect(st_original.wSecond, st_test.wSecond); + ok(0 == res || + broken(1 == res), /* comctl32 <= 4.72 */ + "Expected 0, got %d\n", res); + if (0 == res) + { + memset(&st_test, 0, sizeof(st_test)); + res = SendMessage(hwnd, MCM_GETCURSEL, 0, (LPARAM)&st_test); + expect(1, res); + expect(st_original.wYear, st_test.wYear); + expect(st_original.wMonth, st_test.wMonth); + expect(st_original.wDay, st_test.wDay); + expect(st_original.wHour, st_test.wHour); + expect(st_original.wMinute, st_test.wMinute); + expect(st_original.wSecond, st_test.wSecond); + } /* setting selection equal to current reports success even if out range */ memset(&st_new, 0, sizeof(st_new));

1 0

Francois Gouget : system.drv16: Remove the 32-bit timer callback support.
by Alexandre Julliard Oct. 8, 2009

Oct. 8, 2009

Module: wine Branch: master Commit: 4f8b800f69dc5b768f468feb9cfeecd7d1162fa7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f8b800f69dc5b768f468feb9… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Oct 8 11:19:04 2009 +0200 system.drv16: Remove the 32-bit timer callback support. Also merge CreateSystemTimer() with WIN16_CreateSystemTimer() and rename it to CreateSystemTimer16() for consistency. --- dlls/system.drv16/system.c | 56 ++++++++++++---------------------- dlls/system.drv16/system.drv16.spec | 2 +- include/wine/winuser16.h | 5 --- 3 files changed, 21 insertions(+), 42 deletions(-) diff --git a/dlls/system.drv16/system.c b/dlls/system.drv16/system.c index 46ab04e..7d8433a 100644 --- a/dlls/system.drv16/system.c +++ b/dlls/system.drv16/system.c @@ -34,7 +34,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(system); typedef struct { - SYSTEMTIMERPROC callback; /* NULL if not in use */ FARPROC16 callback16; INT rate; INT ticks; @@ -49,6 +48,7 @@ static HANDLE SYS_timer; static HANDLE SYS_thread; static int SYS_timers_disabled; + /*********************************************************************** * SYSTEM_TimerTick */ @@ -59,11 +59,23 @@ static void CALLBACK SYSTEM_TimerTick( LPVOID arg, DWORD low, DWORD high ) if (SYS_timers_disabled) return; for (i = 0; i < NB_SYS_TIMERS; i++) { - if (!SYS_Timers[i].callback) continue; + if (!SYS_Timers[i].callback16) continue; if ((SYS_Timers[i].ticks -= SYS_TIMER_RATE) <= 0) { + FARPROC16 proc = SYS_Timers[i].callback16; + CONTEXT86 context; + SYS_Timers[i].ticks += SYS_Timers[i].rate; - SYS_Timers[i].callback( i+1 ); + + memset( &context, 0, sizeof(context) ); + context.SegFs = wine_get_fs(); + context.SegGs = wine_get_gs(); + context.SegCs = SELECTOROF( proc ); + context.Eip = OFFSETOF( proc ); + context.Ebp = OFFSETOF(NtCurrentTeb()->WOW32Reserved) + FIELD_OFFSET(STACK16FRAME, bp); + context.Eax = i + 1; + + WOWCallback16Ex( 0, WCB16_REGS, 0, NULL, (DWORD *)&context ); } } } @@ -150,51 +162,23 @@ DWORD WINAPI InquireSystem16( WORD code, WORD arg ) /*********************************************************************** * CreateSystemTimer (SYSTEM.2) */ -WORD WINAPI CreateSystemTimer( WORD rate, SYSTEMTIMERPROC callback ) +WORD WINAPI CreateSystemTimer16( WORD rate, FARPROC16 proc ) { int i; for (i = 0; i < NB_SYS_TIMERS; i++) - if (!SYS_Timers[i].callback) /* Found one */ + if (!SYS_Timers[i].callback16) /* Found one */ { SYS_Timers[i].rate = (UINT)rate * 1000; if (SYS_Timers[i].rate < SYS_TIMER_RATE) SYS_Timers[i].rate = SYS_TIMER_RATE; SYS_Timers[i].ticks = SYS_Timers[i].rate; - SYS_Timers[i].callback = callback; + SYS_Timers[i].callback16 = proc; if (++SYS_NbTimers == 1) SYSTEM_StartTicks(); return i + 1; /* 0 means error */ } return 0; } -/**********************************************************************/ - -static void call_timer_proc16( WORD timer ) -{ - CONTEXT86 context; - FARPROC16 proc = SYS_Timers[timer-1].callback16; - - memset( &context, 0, sizeof(context) ); - - context.SegFs = wine_get_fs(); - context.SegGs = wine_get_gs(); - context.SegCs = SELECTOROF( proc ); - context.Eip = OFFSETOF( proc ); - context.Ebp = OFFSETOF(NtCurrentTeb()->WOW32Reserved) + FIELD_OFFSET(STACK16FRAME,bp); - context.Eax = timer; - - WOWCallback16Ex( 0, WCB16_REGS, 0, NULL, (DWORD *)&context ); -} - -/**********************************************************************/ - -WORD WINAPI WIN16_CreateSystemTimer( WORD rate, FARPROC16 proc ) -{ - WORD ret = CreateSystemTimer( rate, call_timer_proc16 ); - if (ret) SYS_Timers[ret - 1].callback16 = proc; - return ret; -} - /*********************************************************************** * KillSystemTimer (SYSTEM.3) @@ -203,9 +187,9 @@ WORD WINAPI WIN16_CreateSystemTimer( WORD rate, FARPROC16 proc ) */ WORD WINAPI SYSTEM_KillSystemTimer( WORD timer ) { - if ( !timer || timer > NB_SYS_TIMERS || !SYS_Timers[timer-1].callback ) + if ( !timer || timer > NB_SYS_TIMERS || !SYS_Timers[timer-1].callback16 ) return timer; /* Error */ - SYS_Timers[timer-1].callback = NULL; + SYS_Timers[timer-1].callback16 = 0; if (!--SYS_NbTimers) SYSTEM_StopTicks(); return 0; } diff --git a/dlls/system.drv16/system.drv16.spec b/dlls/system.drv16/system.drv16.spec index 85b975d..daa1e81 100644 --- a/dlls/system.drv16/system.drv16.spec +++ b/dlls/system.drv16/system.drv16.spec @@ -1,5 +1,5 @@ 1 pascal InquireSystem(word word) InquireSystem16 -2 pascal -ret16 CreateSystemTimer(word segptr) WIN16_CreateSystemTimer +2 pascal -ret16 CreateSystemTimer(word segptr) CreateSystemTimer16 3 pascal -ret16 KillSystemTimer(word) SYSTEM_KillSystemTimer 4 pascal -ret16 EnableSystemTimers() EnableSystemTimers16 5 pascal -ret16 DisableSystemTimers() DisableSystemTimers16 diff --git a/include/wine/winuser16.h b/include/wine/winuser16.h index 0a05bdd..a1898d5 100644 --- a/include/wine/winuser16.h +++ b/include/wine/winuser16.h @@ -961,12 +961,7 @@ INT16 WINAPI lstrcmpi16(LPCSTR,LPCSTR); /* undocumented functions */ -typedef VOID (*SYSTEMTIMERPROC)(WORD); - void WINAPI ConvertDialog32To16(LPCVOID,DWORD,LPVOID); -WORD WINAPI CreateSystemTimer(WORD,SYSTEMTIMERPROC); -VOID WINAPI DisableSystemTimers16(void); -VOID WINAPI EnableSystemTimers16(void); BOOL16 WINAPI EnumTaskWindows16(HTASK16,WNDENUMPROC16,LPARAM); BOOL16 WINAPI GrayString16(HDC16,HBRUSH16,GRAYSTRINGPROC16,LPARAM, INT16,INT16,INT16,INT16,INT16);

1 0

Francois Gouget : comctl32/tests: Make test_ApproximateViewRect() static.
by Alexandre Julliard Oct. 8, 2009

Oct. 8, 2009

Module: wine Branch: master Commit: fd90aab3a45410337332cd31091f29bcada3c977 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd90aab3a45410337332cd310… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Oct 8 11:23:13 2009 +0200 comctl32/tests: Make test_ApproximateViewRect() static. --- dlls/comctl32/tests/listview.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index c9551a1..2e8e555 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -4021,7 +4021,7 @@ static void test_LVS_EX_TRANSPARENTBKGND(void) DestroyWindow(hwnd); } -void test_ApproximateViewRect(void) +static void test_ApproximateViewRect(void) { HWND hwnd; DWORD ret;

1 0

Francois Gouget : rpcrt4: A signed 1-bit bitfield doesn't make much sense; use unsigned.
by Alexandre Julliard Oct. 8, 2009

Oct. 8, 2009

Module: wine Branch: master Commit: 8f43b54a901ea655e5650bad70eeb8c8a82d4259 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f43b54a901ea655e5650bad7… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Oct 8 11:22:01 2009 +0200 rpcrt4: A signed 1-bit bitfield doesn't make much sense; use unsigned. --- include/rpcndr.h | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/include/rpcndr.h b/include/rpcndr.h index 8fee143..81baa87 100644 --- a/include/rpcndr.h +++ b/include/rpcndr.h @@ -204,19 +204,19 @@ typedef struct _MIDL_STUB_MESSAGE struct _FULL_PTR_XLAT_TABLES *FullPtrXlatTables; ULONG FullPtrRefId; ULONG PointerLength; - int fInDontFree:1; - int fDontCallFreeInst:1; - int fInOnlyParam:1; - int fHasReturn:1; - int fHasExtensions:1; - int fHasNewCorrDesc:1; - int fIsIn:1; - int fIsOut:1; - int fIsOicf:1; - int fBufferValid:1; - int fHasMemoryValidateCallback:1; - int fInFree:1; - int fNeedMCCP:1; + unsigned int fInDontFree:1; + unsigned int fDontCallFreeInst:1; + unsigned int fInOnlyParam:1; + unsigned int fHasReturn:1; + unsigned int fHasExtensions:1; + unsigned int fHasNewCorrDesc:1; + unsigned int fIsIn:1; + unsigned int fIsOut:1; + unsigned int fIsOicf:1; + unsigned int fBufferValid:1; + unsigned int fHasMemoryValidateCallback:1; + unsigned int fInFree:1; + unsigned int fNeedMCCP:1; int fUnused:3; int fUnused2:16; DWORD dwDestContext;

1 0

Jörg Höhle : mcicda: Fix an early return statement in Open.
by Alexandre Julliard Oct. 8, 2009

Oct. 8, 2009

Module: wine Branch: master Commit: 4c357492c3c210736d060e0e0112537f72a0fdc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c357492c3c210736d060e0e0… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Thu Oct 1 19:34:05 2009 +0200 mcicda: Fix an early return statement in Open. --- dlls/mcicda/mcicda.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/mcicda/mcicda.c b/dlls/mcicda/mcicda.c index 81dc18f..92c9435 100644 --- a/dlls/mcicda/mcicda.c +++ b/dlls/mcicda/mcicda.c @@ -419,7 +419,8 @@ static DWORD MCICDA_Open(UINT wDevID, DWORD dwFlags, LPMCI_OPEN_PARMSW lpOpenPar if (dwFlags & MCI_OPEN_ELEMENT) { if (dwFlags & MCI_OPEN_ELEMENT_ID) { WARN("MCI_OPEN_ELEMENT_ID %p! Abort\n", lpOpenParms->lpstrElementName); - return MCIERR_NO_ELEMENT_ALLOWED; + ret = MCIERR_NO_ELEMENT_ALLOWED; + goto the_error; } TRACE("MCI_OPEN_ELEMENT element name: %s\n", debugstr_w(lpOpenParms->lpstrElementName)); if (!isalpha(lpOpenParms->lpstrElementName[0]) || lpOpenParms->lpstrElementName[1] != ':' ||

1 0

Paul Vriens : user32/tests: Skip some tests on Win9x/WinMe.
by Alexandre Julliard Oct. 8, 2009

Oct. 8, 2009

Module: wine Branch: master Commit: 429bf7e0e25859558ab210a772bcd750fcf80dbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=429bf7e0e25859558ab210a77… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Oct 8 11:25:20 2009 +0200 user32/tests: Skip some tests on Win9x/WinMe. --- dlls/user32/tests/dde.c | 34 ++++++++++++++++++++++------------ 1 files changed, 22 insertions(+), 12 deletions(-) diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c index 6625837..9e1da70 100644 --- a/dlls/user32/tests/dde.c +++ b/dlls/user32/tests/dde.c @@ -2390,23 +2390,33 @@ START_TEST(dde) test_end_to_end_server(proc.hProcess, proc.hThread, TRUE); - sprintf(buffer, "%s dde endw", argv[0]); - CreateProcessA(NULL, buffer, NULL, NULL, FALSE, - CREATE_SUSPENDED, NULL, NULL, &startup, &proc); + /* Don't bother testing W interfaces on Win9x/WinMe */ + SetLastError(0xdeadbeef); + lstrcmpW(NULL, NULL); + if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { + win_skip("Skipping W-interface tests\n"); + } + else + { + sprintf(buffer, "%s dde endw", argv[0]); + CreateProcessA(NULL, buffer, NULL, NULL, FALSE, + CREATE_SUSPENDED, NULL, NULL, &startup, &proc); - test_end_to_end_server(proc.hProcess, proc.hThread, FALSE); + test_end_to_end_server(proc.hProcess, proc.hThread, FALSE); - sprintf(buffer, "%s dde enda", argv[0]); - CreateProcessA(NULL, buffer, NULL, NULL, FALSE, - CREATE_SUSPENDED, NULL, NULL, &startup, &proc); + sprintf(buffer, "%s dde enda", argv[0]); + CreateProcessA(NULL, buffer, NULL, NULL, FALSE, + CREATE_SUSPENDED, NULL, NULL, &startup, &proc); - test_end_to_end_server(proc.hProcess, proc.hThread, FALSE); + test_end_to_end_server(proc.hProcess, proc.hThread, FALSE); - sprintf(buffer, "%s dde endw", argv[0]); - CreateProcessA(NULL, buffer, NULL, NULL, FALSE, - CREATE_SUSPENDED, NULL, NULL, &startup, &proc); + sprintf(buffer, "%s dde endw", argv[0]); + CreateProcessA(NULL, buffer, NULL, NULL, FALSE, + CREATE_SUSPENDED, NULL, NULL, &startup, &proc); - test_end_to_end_server(proc.hProcess, proc.hThread, TRUE); + test_end_to_end_server(proc.hProcess, proc.hThread, TRUE); + } test_dde_aw_transaction();

1 0

Paul Vriens : ddraw/tests: Fix some test failures on WinME/VMware.
by Alexandre Julliard Oct. 8, 2009

Oct. 8, 2009

Module: wine Branch: master Commit: ddd255cb0898b706edb6c4100c348f99384be9d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddd255cb0898b706edb6c4100… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Oct 8 10:40:31 2009 +0200 ddraw/tests: Fix some test failures on WinME/VMware. --- dlls/ddraw/tests/visual.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/tests/visual.c b/dlls/ddraw/tests/visual.c index 3a29151..450d231 100644 --- a/dlls/ddraw/tests/visual.c +++ b/dlls/ddraw/tests/visual.c @@ -2294,7 +2294,8 @@ static void p8_primary_test(void) U1(ddsd.ddpfPixelFormat).dwRGBBitCount = 8; hr = IDirectDraw_CreateSurface(DirectDraw1, &ddsd, &offscreen, NULL); ok(hr == DD_OK || - broken(hr == DDERR_INVALIDPIXELFORMAT), /* VMware */ + broken(hr == DDERR_INVALIDPIXELFORMAT) || /* VMware */ + broken(hr == DDERR_NODIRECTDRAWHW), /* VMware */ "IDirectDraw_CreateSurface returned %08x\n", hr); if (FAILED(hr)) goto out; @@ -2614,7 +2615,7 @@ static void cubemap_test(IDirect3DDevice7 *device) if(SUCCEEDED(hr)) { hr = IDirect3DDevice7_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, D3DFVF_XYZ | D3DFVF_TEXCOORDSIZE3(0) | D3DFVF_TEX1, quad + 0 * 6, 4, 0); - if (hr == E_NOTIMPL) + if (hr == DDERR_UNSUPPORTED || hr == DDERR_NODIRECTDRAWHW) { /* VMware */ win_skip("IDirect3DDevice7_DrawPrimitive is not completely implemented, colors won't be tested\n");

1 0

Michael Stefaniuc : msvcrt/tests: Use LONG instead of long.
by Alexandre Julliard Oct. 8, 2009

Oct. 8, 2009

Module: wine Branch: master Commit: 5ca700713deb2f2ea9177cd34967dcf33575bc82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ca700713deb2f2ea9177cd34… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Oct 8 01:20:22 2009 +0200 msvcrt/tests: Use LONG instead of long. --- dlls/msvcrt/tests/string.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 5a97bad..fc2ad3c 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -666,40 +666,40 @@ static void test_strtok(void) static void test_strtol(void) { char* e; - long l; - unsigned long ul; + LONG l; + ULONG ul; /* errno is only set in case of error, so reset errno to EBADF to check for errno modification */ /* errno is modified on W2K8+ */ errno = EBADF; l = strtol("-1234", &e, 0); - ok(l==-1234, "wrong value %ld\n", l); + ok(l==-1234, "wrong value %d\n", l); ok(errno == EBADF || broken(errno == 0), "wrong errno %d\n", errno); errno = EBADF; ul = strtoul("1234", &e, 0); - ok(ul==1234, "wrong value %lu\n", ul); + ok(ul==1234, "wrong value %u\n", ul); ok(errno == EBADF || broken(errno == 0), "wrong errno %d\n", errno); errno = EBADF; l = strtol("2147483647L", &e, 0); - ok(l==2147483647, "wrong value %ld\n", l); + ok(l==2147483647, "wrong value %d\n", l); ok(errno == EBADF || broken(errno == 0), "wrong errno %d\n", errno); errno = EBADF; l = strtol("-2147483648L", &e, 0); - ok(l==-2147483647L - 1, "wrong value %ld\n", l); + ok(l==-2147483647L - 1, "wrong value %d\n", l); ok(errno == EBADF || broken(errno == 0), "wrong errno %d\n", errno); errno = EBADF; ul = strtoul("4294967295UL", &e, 0); - ok(ul==4294967295ul, "wrong value %lu\n", ul); + ok(ul==4294967295ul, "wrong value %u\n", ul); ok(errno == EBADF || broken(errno == 0), "wrong errno %d\n", errno); errno = 0; l = strtol("9223372036854775807L", &e, 0); - ok(l==2147483647, "wrong value %ld\n", l); + ok(l==2147483647, "wrong value %d\n", l); ok(errno == ERANGE, "wrong errno %d\n", errno); errno = 0; ul = strtoul("9223372036854775807L", &e, 0); - ok(ul==4294967295ul, "wrong value %lu\n", ul); + ok(ul==4294967295ul, "wrong value %u\n", ul); ok(errno == ERANGE, "wrong errno %d\n", errno); }

1 0

Francois Gouget : Assorted spelling fixes.
by Alexandre Julliard Oct. 8, 2009

Oct. 8, 2009

Module: wine Branch: master Commit: fe935e8d503aba6b29c9b066af51d75e1b4a2da0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe935e8d503aba6b29c9b066a… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Oct 8 11:23:19 2009 +0200 Assorted spelling fixes. --- dlls/comctl32/monthcal.c | 2 +- dlls/jscript/activex.c | 2 +- dlls/msi/tests/install.c | 2 +- dlls/shell32/tests/shlexec.c | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index a44ae31..766dbde 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -331,7 +331,7 @@ static BOOL MONTHCAL_IsSelRangeValid(const MONTHCAL_INFO *infoPtr, } /* Used in MCM_SETRANGE/MCM_SETSELRANGE to determine resulting time part. - Milliseconds are intentionaly not validated. */ + Milliseconds are intentionally not validated. */ static BOOL MONTHCAL_ValidateTime(const SYSTEMTIME *time) { if((time->wHour > 24) || (time->wMinute > 59) || (time->wSecond > 59)) diff --git a/dlls/jscript/activex.c b/dlls/jscript/activex.c index 8af4eb7..cb94d4e 100644 --- a/dlls/jscript/activex.c +++ b/dlls/jscript/activex.c @@ -156,7 +156,7 @@ static HRESULT ActiveXObject_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flag } if(arg_cnt(dp) != 1) { - FIXME("unsuported arg_cnt %d\n", arg_cnt(dp)); + FIXME("unsupported arg_cnt %d\n", arg_cnt(dp)); return E_NOTIMPL; } diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 0044e03..ed1ebc2 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -2903,7 +2903,7 @@ static void test_lastusedsource(void) r = MsiInstallProductA("msifile0.msi", "REMOVE=ALL"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - /* seperate cabinet file */ + /* separate cabinet file */ size = MAX_PATH; lstrcpyA(value, "aaa"); diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 889743c..7d9e7b2 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -1391,8 +1391,8 @@ static DWORD WINAPI hooked_WaitForInputIdle(HANDLE process, DWORD timeout) * a problem for us because ShellExecute will assume that an app is ready to * receive DDE messages after it has called WaitForInputIdle() on that app. * To work around that we install our own version of WaitForInputIdle() that - * will wait for the child to explicitly tell it it's ready. We do that by - * changing the entry for WaitForInputIdle() in the shell32 import address + * will wait for the child to explicitly tell us that it is ready. We do that + * by changing the entry for WaitForInputIdle() in the shell32 import address * table. */ static void hook_WaitForInputIdle(void *new_func)

1 0