November 2010 - Wine-Commits

David Adam : ddraw: Add tests for the foreground window set by SetCooperativeLevel.
by Alexandre Julliard Nov. 1, 2010

Nov. 1, 2010

Module: wine Branch: master Commit: 94f74a7caf84458d4400db46e0158b3e951f1d75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94f74a7caf84458d4400db46e… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Thu Oct 28 14:18:15 2010 +0200 ddraw: Add tests for the foreground window set by SetCooperativeLevel. --- dlls/ddraw/tests/ddrawmodes.c | 106 +++++++++++++++++++++++++++++++++------- 1 files changed, 87 insertions(+), 19 deletions(-) diff --git a/dlls/ddraw/tests/ddrawmodes.c b/dlls/ddraw/tests/ddrawmodes.c index b6491f3..e83541a 100644 --- a/dlls/ddraw/tests/ddrawmodes.c +++ b/dlls/ddraw/tests/ddrawmodes.c @@ -33,7 +33,7 @@ static LPDIRECTDRAW lpDD = NULL; static LPDIRECTDRAWSURFACE lpDDSPrimary = NULL; static LPDIRECTDRAWSURFACE lpDDSBack = NULL; static WNDCLASS wc; -static HWND hwnd; +static HWND hwnd, hwnd2; static int modes_cnt; static int modes_size; static LPDDSURFACEDESC modes; @@ -54,31 +54,21 @@ static void init_function_pointers(void) pDirectDrawEnumerateExW = (void*)GetProcAddress(hmod, "DirectDrawEnumerateExW"); } -static void createwindow(void) +static HWND createwindow(void) { - wc.style = CS_HREDRAW | CS_VREDRAW; - wc.lpfnWndProc = DefWindowProcA; - wc.cbClsExtra = 0; - wc.cbWndExtra = 0; - wc.hInstance = GetModuleHandleA(0); - wc.hIcon = LoadIconA(wc.hInstance, IDI_APPLICATION); - wc.hCursor = LoadCursorA(NULL, IDC_ARROW); - wc.hbrBackground = GetStockObject(BLACK_BRUSH); - wc.lpszMenuName = NULL; - wc.lpszClassName = "TestWindowClass"; - if(!RegisterClassA(&wc)) - assert(0); + HWND hwnd; hwnd = CreateWindowExA(0, "TestWindowClass", "TestWindowClass", WS_POPUP, 0, 0, GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN), NULL, NULL, GetModuleHandleA(0), NULL); - assert(hwnd != NULL); ShowWindow(hwnd, SW_HIDE); UpdateWindow(hwnd); SetFocus(hwnd); + + return hwnd; } static BOOL createdirectdraw(void) @@ -546,6 +536,7 @@ static void testdisplaymodes(void) static void testcooperativelevels_normal(void) { + BOOL sfw; HRESULT rc; DDSURFACEDESC surfacedesc; IDirectDrawSurface *surface = (IDirectDrawSurface *) 0xdeadbeef; @@ -561,11 +552,23 @@ static void testcooperativelevels_normal(void) ok(rc==DDERR_INVALIDPARAMS,"SetCooperativeLevel(DDSCL_SETFOCUSWINDOW | DDSCL_CREATEDEVICEWINDOW) returned: %x\n",rc); /* Do some tests with DDSCL_NORMAL mode */ + /* Fullscreen mode + normal mode + exclusive mode */ + sfw=FALSE; + if(hwnd2) + sfw=SetForegroundWindow(hwnd2); + else + skip("Failed to create the second window\n"); + rc = IDirectDraw_SetCooperativeLevel(lpDD, hwnd, DDSCL_FULLSCREEN | DDSCL_EXCLUSIVE | DDSCL_NORMAL); todo_wine ok(rc==DD_OK,"SetCooperativeLevel(DDSCL_FULLSCREEN | DDSCL_EXCLUSIVE | DDSCL_NORMAL) returned: %x\n",rc); + + if(sfw) + todo_wine ok(GetForegroundWindow()==hwnd,"Expected the main windows (%p) for foreground, received the second one (%p)\n",hwnd, hwnd2); + /* Try creating a double buffered primary in fullscreen + exclusive + normal mode */ rc = IDirectDraw_CreateSurface(lpDD, &surfacedesc, &surface, NULL); + if (rc == DDERR_UNSUPPORTEDMODE) skip("Unsupported mode\n"); else @@ -574,12 +577,21 @@ static void testcooperativelevels_normal(void) todo_wine ok(surface!=NULL, "Returned NULL surface pointer \n"); } if(surface && surface != (IDirectDrawSurface *)0xdeadbeef) IDirectDrawSurface_Release(surface); + /* Exclusive mode + normal mode */ rc = IDirectDraw_SetCooperativeLevel(lpDD, hwnd, DDSCL_EXCLUSIVE | DDSCL_NORMAL); ok(rc==DDERR_INVALIDPARAMS,"SetCooperativeLevel(DDSCL_EXCLUSIVE | DDSCL_NORMAL) returned: %x\n",rc); + /* Fullscreen mode + normal mode */ + sfw=FALSE; + if(hwnd2) sfw=SetForegroundWindow(hwnd2); + rc = IDirectDraw_SetCooperativeLevel(lpDD, hwnd, DDSCL_FULLSCREEN | DDSCL_NORMAL); todo_wine ok(rc==DD_OK,"SetCooperativeLevel(DDSCL_FULLSCREEN | DDSCL_NORMAL) returned: %x\n",rc); + + if(sfw) + ok(GetForegroundWindow()==hwnd2,"Expected the second windows (%p) for foreground, received the main one (%p)\n",hwnd2, hwnd); + /* Try creating a double buffered primary in fullscreen + normal mode */ rc = IDirectDraw_CreateSurface(lpDD, &surfacedesc, &surface, NULL); if (rc == DDERR_UNSUPPORTEDMODE) @@ -589,12 +601,20 @@ static void testcooperativelevels_normal(void) ok(rc == DDERR_NOEXCLUSIVEMODE, "IDirectDraw_CreateSurface returned %08x\n", rc); ok(surface == NULL, "Returned surface pointer is %p\n", surface); } + if(surface && surface != (IDirectDrawSurface *)0xdeadbeef) IDirectDrawSurface_Release(surface); - /* Normal mode */ + + /* switching from Fullscreen mode to Normal mode */ + sfw=FALSE; + if(hwnd2) sfw=SetForegroundWindow(hwnd2); + rc = IDirectDraw_SetCooperativeLevel(lpDD, hwnd, DDSCL_NORMAL); ok(rc==DD_OK,"SetCooperativeLevel(DDSCL_NORMAL) returned: %x\n",rc); + if(sfw) + ok(GetForegroundWindow()==hwnd2,"Expected the second windows (%p) for foreground, received the main one (%p)\n",hwnd2, hwnd); + /* Try creating a double buffered primary in normal mode */ rc = IDirectDraw_CreateSurface(lpDD, &surfacedesc, &surface, NULL); if (rc == DDERR_UNSUPPORTEDMODE) @@ -606,6 +626,17 @@ static void testcooperativelevels_normal(void) } if(surface && surface != (IDirectDrawSurface *)0xdeadbeef) IDirectDrawSurface_Release(surface); + /* switching from Normal mode to Fullscreen + Normal mode */ + sfw=FALSE; + if(hwnd2) sfw=SetForegroundWindow(hwnd2); + + rc = IDirectDraw_SetCooperativeLevel(lpDD, + hwnd, DDSCL_NORMAL | DDSCL_FULLSCREEN); + todo_wine ok(rc==DD_OK,"SetCooperativeLevel(DDSCL_NORMAL | FULLSCREEN) returned: %x\n",rc); + + if(sfw) + ok(GetForegroundWindow()==hwnd2,"Expected the second windows (%p) for foreground, received the main one (%p)\n",hwnd2, hwnd); + /* Set the focus window */ rc = IDirectDraw_SetCooperativeLevel(lpDD, hwnd, DDSCL_SETFOCUSWINDOW | DDSCL_CREATEDEVICEWINDOW); @@ -681,7 +712,7 @@ static void testcooperativelevels_normal(void) static void testcooperativelevels_exclusive(void) { - BOOL success; + BOOL sfw, success; HRESULT rc; RECT window_rect; @@ -702,11 +733,21 @@ static void testcooperativelevels_exclusive(void) ok(rc==DDERR_INVALIDPARAMS,"SetCooperativeLevel(DDSCL_FULLSCREEN) returned: %x\n",rc); /* Full screen mode + exclusive mode */ + sfw=FALSE; + if(hwnd2) + sfw=SetForegroundWindow(hwnd2); + else + skip("Failed to create the second window\n"); + rc = IDirectDraw_SetCooperativeLevel(lpDD, hwnd, DDSCL_FULLSCREEN | DDSCL_EXCLUSIVE); ok(rc==DD_OK,"SetCooperativeLevel(DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN) returned: %x\n",rc); - GetClientRect(hwnd, &window_rect); + + if(sfw) + ok(GetForegroundWindow()==hwnd,"Expected the main windows (%p) for foreground, received the second one (%p)\n",hwnd, hwnd2); + /* rect_before_create is assumed to hold the screen rect */ + GetClientRect(hwnd, &window_rect); rc = EqualRect(&rect_before_create, &window_rect); todo_wine ok(rc!=0, "Fullscreen window has wrong size\n"); @@ -783,9 +824,36 @@ START_TEST(ddrawmodes) { init_function_pointers(); - createwindow(); + wc.style = CS_HREDRAW | CS_VREDRAW; + wc.lpfnWndProc = DefWindowProcA; + wc.cbClsExtra = 0; + wc.cbWndExtra = 0; + wc.hInstance = GetModuleHandleA(0); + wc.hIcon = LoadIconA(wc.hInstance, IDI_APPLICATION); + wc.hCursor = LoadCursorA(NULL, IDC_ARROW); + wc.hbrBackground = GetStockObject(BLACK_BRUSH); + wc.lpszMenuName = NULL; + wc.lpszClassName = "TestWindowClass"; + if (!RegisterClassA(&wc)) + { + skip("RegisterClassA failed\n"); + return; + } + + hwnd2=createwindow(); + hwnd=createwindow(); + + if (!hwnd) + { + skip("Failed to create the main window\n"); + return; + } + if (!createdirectdraw()) + { + skip("Failed to create the direct draw object\n"); return; + } test_DirectDrawEnumerateA(); test_DirectDrawEnumerateW();

1 0

Eric Pouech : msvcrt: Use parameter checking macros in vsn(w)printf_s_l.
by Alexandre Julliard Nov. 1, 2010

Nov. 1, 2010

Module: wine Branch: master Commit: 5d4de2ac45574c94a40ae1d09098bf347cff2dfa URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d4de2ac45574c94a40ae1d09… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Fri Oct 29 15:39:42 2010 +0200 msvcrt: Use parameter checking macros in vsn(w)printf_s_l. --- dlls/msvcrt/wcs.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index a100f31..1042008 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1050,7 +1050,7 @@ int CDECL MSVCRT_vsnprintf_s_l( char *str, MSVCRT_size_t sizeOfBuffer, if(ret<0 || ret==len) { if(count!=MSVCRT__TRUNCATE && count>sizeOfBuffer) { - MSVCRT__invalid_parameter( NULL, NULL, NULL, 0, 0 ); + MSVCRT_INVALID_PMT("str[sizeOfBuffer] is too small"); *MSVCRT__errno() = MSVCRT_ERANGE; memset(str, 0, sizeOfBuffer); } else @@ -1188,7 +1188,7 @@ int CDECL MSVCRT_vsnwprintf_s_l( MSVCRT_wchar_t *str, MSVCRT_size_t sizeOfBuffer if(ret<0 || ret==len) { if(count!=MSVCRT__TRUNCATE && count>sizeOfBuffer) { - MSVCRT__invalid_parameter( NULL, NULL, NULL, 0, 0 ); + MSVCRT_INVALID_PMT("str[sizeOfBuffer] is too small"); *MSVCRT__errno() = MSVCRT_ERANGE; memset(str, 0, sizeOfBuffer*sizeof(MSVCRT_wchar_t)); } else

1 0

Eric Pouech : msvcrt: Added macro to ease implementation of so called secure (_s postfix) APIs.
by Alexandre Julliard Nov. 1, 2010

Nov. 1, 2010

Module: wine Branch: master Commit: fd3ad8cd2ae938189ddf460b159a6ab3ec936de1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd3ad8cd2ae938189ddf460b1… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Fri Oct 29 15:38:46 2010 +0200 msvcrt: Added macro to ease implementation of so called secure (_s postfix) APIs. --- dlls/msvcrt/msvcrt.h | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 167fa83..c36b5bd 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -847,6 +847,17 @@ void __cdecl _wsearchenv(const MSVCRT_wchar_t*, const MSVCRT_wchar_t*, MSVCRT MSVCRT_intptr_t __cdecl MSVCRT__spawnvpe(int, const char*, const char* const*, const char* const*); void __cdecl MSVCRT__invalid_parameter(const MSVCRT_wchar_t *expr, const MSVCRT_wchar_t *func, const MSVCRT_wchar_t *file, unsigned int line, MSVCRT_uintptr_t arg); + +/* Maybe one day we'll enable the invalid parameter handlers with the full set of information (msvcrXXd) + * #define MSVCRT_INVALID_PMT(x) MSVCRT_call_invalid_parameter_handler(x, __FUNCTION__, __FILE__, __LINE__, 0) + * #define MSVCRT_CHECK_PMT(x) ((x) ? TRUE : MSVCRT_INVALID_PMT(#x),FALSE) + * Until this is done, just keep the same semantics for CHECK_PMT(), but without generating / sending + * any information + * NB : MSVCRT_call_invalid_parameter_handler is a wrapper around MSVCRT__invalid_parameter in order + * to do the Ansi to Unicode transformation + */ +#define MSVCRT_INVALID_PMT(x) MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0) +#define MSVCRT_CHECK_PMT(x) ((x) || (MSVCRT_INVALID_PMT(0),FALSE)) #endif #endif /* __WINE_MSVCRT_H */

1 0

Gerald Pfeifer : comctl32: Remove TOOLTIPS_WindowFromPoint, putting its functionality into its sole calling site.
by Alexandre Julliard Nov. 1, 2010

Nov. 1, 2010

Module: wine Branch: master Commit: d25d6676277872321ff112725c4a9c276b01bd3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d25d6676277872321ff112725… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Oct 31 18:34:02 2010 +0100 comctl32: Remove TOOLTIPS_WindowFromPoint, putting its functionality into its sole calling site. --- dlls/comctl32/tooltips.c | 11 +---------- 1 files changed, 1 insertions(+), 10 deletions(-) diff --git a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c index e74c701..5b48d38 100644 --- a/dlls/comctl32/tooltips.c +++ b/dlls/comctl32/tooltips.c @@ -1840,14 +1840,6 @@ TOOLTIPS_UpdateTipTextT (TOOLTIPS_INFO *infoPtr, const TTTOOLINFOW *ti, BOOL isW static LRESULT -TOOLTIPS_WindowFromPoint (HWND hwnd, WPARAM wParam, LPARAM lParam) -{ - return (LRESULT)WindowFromPoint (*((LPPOINT)lParam)); -} - - - -static LRESULT TOOLTIPS_Create (HWND hwnd) { TOOLTIPS_INFO *infoPtr; @@ -2268,8 +2260,7 @@ TOOLTIPS_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) uMsg == TTM_UPDATETIPTEXTW); case TTM_WINDOWFROMPOINT: - return TOOLTIPS_WindowFromPoint (hwnd, wParam, lParam); - + return (LRESULT)WindowFromPoint (*((LPPOINT)lParam)); case WM_CREATE: return TOOLTIPS_Create (hwnd);

1 0

Eric Pouech : msvcrt: Use parameter checking macros for strtok_s.
by Alexandre Julliard Nov. 1, 2010

Nov. 1, 2010

Module: wine Branch: master Commit: 14187ed2aa9b2d42295519a895b511aa9bbfade0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14187ed2aa9b2d42295519a89… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Fri Oct 29 15:39:14 2010 +0200 msvcrt: Use parameter checking macros for strtok_s. --- dlls/msvcrt/string.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 944c7e6..fb02bd5 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -152,8 +152,8 @@ char * CDECL MSVCRT_strtok( char *str, const char *delim ) */ char * CDECL MSVCRT_strtok_s(char *str, const char *delim, char **ctx) { - if(!delim || !ctx || (!str && !*ctx)) { - MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0); + if (!MSVCRT_CHECK_PMT(delim != NULL) || !MSVCRT_CHECK_PMT(ctx != NULL) || + !MSVCRT_CHECK_PMT(str != NULL || *ctx != NULL)) { *MSVCRT__errno() = MSVCRT_EINVAL; return NULL; }

1 0

Eric Pouech : msvcrt: Use parameter validation macros for mcstowcs_s_l.
by Alexandre Julliard Nov. 1, 2010

Nov. 1, 2010

Module: wine Branch: master Commit: 8583bd317e25e42df592de56249997bb931a465a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8583bd317e25e42df592de562… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Fri Oct 29 15:39:08 2010 +0200 msvcrt: Use parameter validation macros for mcstowcs_s_l. --- dlls/msvcrt/mbcs.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index d92365f..5767242 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -1824,8 +1824,7 @@ int CDECL MSVCRT__mbstowcs_s_l(MSVCRT_size_t *ret, MSVCRT_wchar_t *wcstr, return 0; } - if(!mbstr || !wcstr) { - MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0); + if(!MSVCRT_CHECK_PMT(mbstr != NULL) || !MSVCRT_CHECK_PMT(wcstr != NULL)) { if(wcstr && size) wcstr[0] = '\0'; *MSVCRT__errno() = MSVCRT_EINVAL; @@ -1843,7 +1842,7 @@ int CDECL MSVCRT__mbstowcs_s_l(MSVCRT_size_t *ret, MSVCRT_wchar_t *wcstr, else if(conv==size && (count==MSVCRT__TRUNCATE || wcstr[conv-1]=='\0')) wcstr[conv-1] = '\0'; else { - MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0); + MSVCRT_INVALID_PMT("wcstr[size] is too small"); if(size) wcstr[0] = '\0'; *MSVCRT__errno() = MSVCRT_ERANGE;

1 0

Eric Pouech : msvcrt: Use the parameter checking macros for strncpy_s.
by Alexandre Julliard Nov. 1, 2010

Nov. 1, 2010

Module: wine Branch: master Commit: c10a6d74d5a0df8dce3e54dec2ae98706c9b8d1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c10a6d74d5a0df8dce3e54dec… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Fri Oct 29 15:39:03 2010 +0200 msvcrt: Use the parameter checking macros for strncpy_s. --- dlls/msvcrt/heap.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/heap.c b/dlls/msvcrt/heap.c index b1d4076..548dd82 100644 --- a/dlls/msvcrt/heap.c +++ b/dlls/msvcrt/heap.c @@ -572,8 +572,7 @@ int CDECL strncpy_s(char *dest, MSVCRT_size_t numberOfElements, if(!count) return 0; - if(!dest || !src || !numberOfElements) { - MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0); + if (!MSVCRT_CHECK_PMT(dest != NULL) || !MSVCRT_CHECK_PMT(src != NULL) || !MSVCRT_CHECK_PMT(numberOfElements != 0)) { *MSVCRT__errno() = MSVCRT_EINVAL; return MSVCRT_EINVAL; } @@ -591,7 +590,7 @@ int CDECL strncpy_s(char *dest, MSVCRT_size_t numberOfElements, return 0; } - MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0); + MSVCRT_INVALID_PMT("dest[numberOfElements] is too small"); dest[0] = '\0'; *MSVCRT__errno() = MSVCRT_EINVAL; return MSVCRT_EINVAL;

1 0

Gerald Pfeifer : comctl32: Fix test description in test_hittest.
by Alexandre Julliard Nov. 1, 2010

Nov. 1, 2010

Module: wine Branch: master Commit: 42b10069253b4a17e90a792cb890b48be49326c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42b10069253b4a17e90a792cb… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Oct 31 19:15:05 2010 +0100 comctl32: Fix test description in test_hittest. --- 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 d249af8..0223167 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -3025,7 +3025,7 @@ static void test_hittest(void) horiz = LOWORD(r); vert = HIWORD(r); ok(bounds.bottom - bounds.top == vert, - "Horizontal spacing inconsistent (%d != %d)\n", bounds.bottom - bounds.top, vert); + "Vertical spacing inconsistent (%d != %d)\n", bounds.bottom - bounds.top, vert); r = SendMessage(hwnd, LVM_GETITEMPOSITION, 0, (LPARAM)&pos); expect(TRUE, r);

1 0

Eric Pouech : msvcrt: Use parameter checking macros for wcsto{number} functions.
by Alexandre Julliard Nov. 1, 2010

Nov. 1, 2010

Module: wine Branch: master Commit: 16c89a543a3b018da4018dc982c70ff2f4f005c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16c89a543a3b018da4018dc98… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Fri Oct 29 15:39:30 2010 +0200 msvcrt: Use parameter checking macros for wcsto{number} functions. --- dlls/msvcrt/wcs.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index d7d2fd4..3dcfa1a 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -135,8 +135,7 @@ double CDECL MSVCRT__wcstod_l(const MSVCRT_wchar_t* str, MSVCRT_wchar_t** end, double ret; BOOL found_digit = FALSE; - if(!str) { - MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0); + if (!MSVCRT_CHECK_PMT(str != NULL)) { *MSVCRT__errno() = MSVCRT_EINVAL; return 0; } @@ -1642,8 +1641,9 @@ __int64 CDECL MSVCRT__wcstoi64_l(const MSVCRT_wchar_t *nptr, TRACE("(%s %p %d %p)\n", debugstr_w(nptr), endptr, base, locale); - if(!nptr || base<0 || base>36 || base==1) { - MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0); + if (!MSVCRT_CHECK_PMT(nptr != NULL) || !MSVCRT_CHECK_PMT(base == 0 || base >= 2) || + !MSVCRT_CHECK_PMT(base <= 36)) { + *MSVCRT__errno() = MSVCRT_EINVAL; return 0; } @@ -1724,8 +1724,9 @@ unsigned __int64 CDECL MSVCRT__wcstoui64_l(const MSVCRT_wchar_t *nptr, TRACE("(%s %p %d %p)\n", debugstr_w(nptr), endptr, base, locale); - if(!nptr || base<0 || base>36 || base==1) { - MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0); + if (!MSVCRT_CHECK_PMT(nptr != NULL) || !MSVCRT_CHECK_PMT(base == 0 || base >= 2) || + !MSVCRT_CHECK_PMT(base <= 36)) { + *MSVCRT__errno() = MSVCRT_EINVAL; return 0; }

1 0

Eric Pouech : msvcrt: Moved _get_osplatform to the new macros for parameters validation.
by Alexandre Julliard Nov. 1, 2010

Nov. 1, 2010

Module: wine Branch: master Commit: 4b9489074115d790cc91bd867c9d85e2f50a2627 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b9489074115d790cc91bd867… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Fri Oct 29 15:38:51 2010 +0200 msvcrt: Moved _get_osplatform to the new macros for parameters validation. --- dlls/msvcrt/data.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/data.c b/dlls/msvcrt/data.c index 068b29f..53dd114 100644 --- a/dlls/msvcrt/data.c +++ b/dlls/msvcrt/data.c @@ -228,15 +228,14 @@ MSVCRT_wchar_t*** CDECL __p___winitenv(void) { return &MSVCRT___winitenv; } /********************************************************************* * _get_osplatform (MSVCRT.@) */ -int CDECL MSVCRT__get_osplatform(int *ret) +int CDECL MSVCRT__get_osplatform(int *pValue) { - if(!ret) { - MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0); + if (!MSVCRT_CHECK_PMT(pValue != NULL)) { *MSVCRT__errno() = MSVCRT_EINVAL; return MSVCRT_EINVAL; } - *ret = MSVCRT__osplatform; + *pValue = MSVCRT__osplatform; return 0; }

1 0