October 2012 - Wine-commits

Jason Edmeades : cmd: Strip quotes from for / f string before attempting to parse it.
by Alexandre Julliard 24 Oct '12

24 Oct '12

Module: wine Branch: master Commit: a45301cb939f4cfc5a574392c260184d82f35f98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a45301cb939f4cfc5a574392c… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Tue Oct 23 21:35:05 2012 +0100 cmd: Strip quotes from for /f string before attempting to parse it. --- programs/cmd/builtins.c | 12 +++++++++++- programs/cmd/tests/test_builtins.cmd | 11 +++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 23 ++++++++++++++--------- 3 files changed, 36 insertions(+), 10 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 721a1b7..4bb4702 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -2086,8 +2086,18 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { } else if (doFileset && ((!forf_usebackq && *itemStart == '"') || (forf_usebackq && *itemStart == '\''))) { + /* Remove leading and trailing character, ready to parse with delims= delimiters + Note that the last quote is removed from the set and the string terminates + there to mimic windows */ + WCHAR *strend = strrchrW(itemStart, forf_usebackq?'\'':'"'); + + if (strend) { + *strend = 0x00; + itemStart++; + } + /* Copy the item away from the global buffer used by WCMD_parameter */ - strcpyW(buffer, item); + strcpyW(buffer, itemStart); WCMD_parse_line(cmdStart, firstCmd, &cmdEnd, variable, buffer, &doExecuted, &forf_skip, forf_eol); diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index acd5a44..bfd051b 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -1111,11 +1111,22 @@ set var= echo --- for /F mkdir foobar & cd foobar echo ------ string argument +rem NT4 does not support usebackq for /F %%i in ("a b c") do echo %%i +for /f usebackq %%i in ('a b c') do echo %%i>output_file +if not exist output_file (echo no output) else (type output_file & del output_file) for /f %%i in ("a ") do echo %%i +for /f usebackq %%i in ('a ') do echo %%i>output_file +if not exist output_file (echo no output) else (type output_file & del output_file) for /f %%i in ("a") do echo %%i +for /f usebackq %%i in ('a') do echo %%i>output_file +if not exist output_file (echo no output) else (type output_file & del output_file) fOr /f %%i in (" a") do echo %%i +for /f usebackq %%i in (' a') do echo %%i>output_file +if not exist output_file (echo no output) else (type output_file & del output_file) for /f %%i in (" a ") do echo %%i +for /f usebackq %%i in (' a ') do echo %%i>output_file +if not exist output_file (echo no output) else (type output_file & del output_file) echo ------ fileset argument echo --------- basic blank handling echo a b c>foo diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 66820be..c15a58d 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -781,11 +781,16 @@ ErrorLevel 0 --- for /F ------ string argument -(a)todo_wine@a -(a)todo_wine@a a -(a)todo_wine@a -(a)todo_wine@a +a(a)or_broken@no output +a +a(a)or_broken@no output +a +a(a)or_broken@no output +a +a(a)or_broken@no output +a +a(a)or_broken@no output ------ fileset argument --------- basic blank handling a @@ -817,18 +822,18 @@ Passed3(a)or_broken@Missing functionality - Broken3 and(a)or_broken@Broken NT4 functionality1 Line(a)or_broken@Broken NT4 functionality2 Line(a)or_broken@Broken NT4 functionality3 -(a)todo_wine@ad -(a)todo_wine@z(a)y +ad +z(a)y a|d -(a)todo_wine@no output +no output @todo_wine(a)no output ------ delims option @todo_wine(a)a @todo_wine(a)a@space@ @todo_wine(a)a d -(a)todo_wine@a +a @todo_wine(a)C r -foo bar baz +(a)todo_wine@foo bar baz @todo_wine(a)c:\ ------ skip option c

1 0

Jason Edmeades : cmd: Add for /f delims= support.
by Alexandre Julliard 24 Oct '12

24 Oct '12

Module: wine Branch: master Commit: 51b0d941d0b9c9dc60ecbcc99ed0eacae4329e85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51b0d941d0b9c9dc60ecbcc99… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Tue Oct 23 22:05:06 2012 +0100 cmd: Add for /f delims= support. --- programs/cmd/batch.c | 29 ++++++++++++++++++++++------- programs/cmd/builtins.c | 13 +++++++------ programs/cmd/tests/test_builtins.cmd.exp | 12 ++++++------ programs/cmd/wcmd.h | 2 ++ 4 files changed, 37 insertions(+), 19 deletions(-) diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c index 1c0bc24..7b037d7 100644 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -121,9 +121,10 @@ void WCMD_batch (WCHAR *file, WCHAR *command, BOOL called, WCHAR *startLabel, HA } /******************************************************************* - * WCMD_parameter + * WCMD_parameter_with_delims * - * Extracts a delimited parameter from an input string + * Extracts a delimited parameter from an input string, providing + * the delimiters characters to use * * PARAMS * s [I] input string, non NULL @@ -135,6 +136,7 @@ void WCMD_batch (WCHAR *file, WCHAR *command, BOOL called, WCHAR *startLabel, HA * wholecmdline [I] True to indicate this routine is being used to parse the * command line, and special logic for arg0->1 transition * needs to be applied. + * delims[I] The delimiter characters to use * * RETURNS * Success: The nth delimited parameter found in s @@ -150,10 +152,9 @@ void WCMD_batch (WCHAR *file, WCHAR *command, BOOL called, WCHAR *startLabel, HA * other API calls, e.g. c:\"a b"\c is returned as c:\a b\c. However, some commands * need to preserve the exact syntax (echo, for, etc) hence the raw option. */ -WCHAR *WCMD_parameter (WCHAR *s, int n, WCHAR **start, WCHAR **end, BOOL raw, - BOOL wholecmdline) +WCHAR *WCMD_parameter_with_delims (WCHAR *s, int n, WCHAR **start, WCHAR **end, + BOOL raw, BOOL wholecmdline, const WCHAR *delims) { - static const WCHAR defaultDelims[] = { ' ', '\t', ',', '=', ';', '\0' }; int curParamNb = 0; static WCHAR param[MAX_PATH]; WCHAR *p = s, *begin; @@ -165,7 +166,7 @@ WCHAR *WCMD_parameter (WCHAR *s, int n, WCHAR **start, WCHAR **end, BOOL raw, while (TRUE) { /* Absorb repeated word delimiters until we get to the next token (or the end!) */ - while (*p && (strchrW(defaultDelims, *p) != NULL)) + while (*p && (strchrW(delims, *p) != NULL)) p++; if (*p == '\0') return param; @@ -179,7 +180,7 @@ WCHAR *WCMD_parameter (WCHAR *s, int n, WCHAR **start, WCHAR **end, BOOL raw, /* Loop character by character, but just need to special case quotes */ while (*p) { /* Once we have found a delimiter, break */ - if (strchrW(defaultDelims, *p) != NULL) break; + if (strchrW(delims, *p) != NULL) break; /* Very odd special case - Seems as if a ( acts as a delimiter which is not swallowed but is effective only when it comes between the program @@ -218,6 +219,20 @@ WCHAR *WCMD_parameter (WCHAR *s, int n, WCHAR **start, WCHAR **end, BOOL raw, } } +/******************************************************************* + * WCMD_parameter + * + * Extracts a delimited parameter from an input string, using a + * default set of delimiter characters. For parameters, see the main + * function above. + */ +WCHAR *WCMD_parameter (WCHAR *s, int n, WCHAR **start, WCHAR **end, BOOL raw, + BOOL wholecmdline) +{ + static const WCHAR defaultDelims[] = { ' ', '\t', ',', '=', ';', '\0' }; + return WCMD_parameter_with_delims (s, n, start, end, raw, wholecmdline, defaultDelims); +} + /**************************************************************************** * WCMD_fgets * diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 4bb4702..8eaa9e7 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1600,7 +1600,7 @@ static BOOL WCMD_parse_forf_options(WCHAR *options, WCHAR *eol, int *skip, } if (*pos==' ' && *(pos+1)==0) delims[i++] = *pos; delims[i++] = 0; /* Null terminate the delims */ - WINE_FIXME("Found delims as '%s'\n", wine_dbgstr_w(delims)); + WINE_TRACE("Found delims as '%s'\n", wine_dbgstr_w(delims)); /* Save the tokens being requested */ } else if (CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, @@ -1694,6 +1694,7 @@ static void WCMD_add_dirstowalk(DIRECTORY_STACK *dirsToWalk) { * doExecuted [O] - Set to TRUE if the DO is ever executed once * forf_skip [I/O] - How many lines to skip first * forf_eol [I] - The 'end of line' (comment) character + * forf_delims [I] - The delimiters to use when breaking the string apart */ static void WCMD_parse_line(CMD_LIST *cmdStart, const WCHAR *firstCmd, @@ -1702,7 +1703,8 @@ static void WCMD_parse_line(CMD_LIST *cmdStart, WCHAR *buffer, BOOL *doExecuted, int *forf_skip, - WCHAR forf_eol) { + WCHAR forf_eol, + WCHAR *forf_delims) { WCHAR *parm, *where; @@ -1713,7 +1715,7 @@ static void WCMD_parse_line(CMD_LIST *cmdStart, } /* Extract the parameter */ - parm = WCMD_parameter (buffer, 0, &where, NULL, FALSE, FALSE); + parm = WCMD_parameter_with_delims(buffer, 0, &where, NULL, FALSE, FALSE, forf_delims); WINE_TRACE("Parsed parameter: %s from %s\n", wine_dbgstr_w(parm), wine_dbgstr_w(buffer)); @@ -2070,7 +2072,7 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { /* Read line by line until end of file */ while (WCMD_fgets(buffer, sizeof(buffer)/sizeof(WCHAR), input)) { WCMD_parse_line(cmdStart, firstCmd, &cmdEnd, variable, buffer, &doExecuted, - &forf_skip, forf_eol); + &forf_skip, forf_eol, forf_delims); buffer[0] = 0; } CloseHandle (input); @@ -2090,7 +2092,6 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { Note that the last quote is removed from the set and the string terminates there to mimic windows */ WCHAR *strend = strrchrW(itemStart, forf_usebackq?'\'':'"'); - if (strend) { *strend = 0x00; itemStart++; @@ -2099,7 +2100,7 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { /* Copy the item away from the global buffer used by WCMD_parameter */ strcpyW(buffer, itemStart); WCMD_parse_line(cmdStart, firstCmd, &cmdEnd, variable, buffer, &doExecuted, - &forf_skip, forf_eol); + &forf_skip, forf_eol, forf_delims); /* Only one string can be supplied in the whole set, abort future set processing */ thisSet = NULL; diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index c15a58d..9b5eb3b 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -826,14 +826,14 @@ ad z(a)y a|d no output -(a)todo_wine@no output +no output ------ delims option -(a)todo_wine@a -(a)todo_wine@a(a)space@ -(a)todo_wine@a d a -(a)todo_wine@C r -(a)todo_wine@foo bar baz +a(a)space@ +a d +a +C r +foo bar baz @todo_wine(a)c:\ ------ skip option c diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index d4d148f..26b89c6 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -108,6 +108,8 @@ static inline BOOL WCMD_is_console_handle(HANDLE h) } WCHAR *WCMD_fgets (WCHAR *buf, DWORD n, HANDLE stream); WCHAR *WCMD_parameter (WCHAR *s, int n, WCHAR **start, WCHAR **end, BOOL raw, BOOL wholecmdline); +WCHAR *WCMD_parameter_with_delims (WCHAR *s, int n, WCHAR **start, WCHAR **end, BOOL raw, + BOOL wholecmdline, const WCHAR *delims); WCHAR *WCMD_skip_leading_spaces (WCHAR *string); BOOL WCMD_keyword_ws_found(const WCHAR *keyword, int len, const WCHAR *ptr); void WCMD_HandleTildaModifiers(WCHAR **start, const WCHAR *forVariable, const WCHAR *forValue, BOOL justFors);

1 0

André Hentschel : ntdll/tests: Remove duplicate function prototypes (coverity).
by Alexandre Julliard 24 Oct '12

24 Oct '12

Module: wine Branch: master Commit: 48ce2cc2829dda00f29a34f7e288c161d3ea8421 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48ce2cc2829dda00f29a34f7e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Oct 24 01:24:55 2012 +0200 ntdll/tests: Remove duplicate function prototypes (coverity). --- dlls/ntdll/tests/reg.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index ef903c6..076948e 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -124,7 +124,6 @@ static NTSTATUS (WINAPI * pRtlCheckRegistryKey)(IN ULONG,IN PWSTR); static NTSTATUS (WINAPI * pRtlOpenCurrentUser)(IN ACCESS_MASK, PHANDLE); static NTSTATUS (WINAPI * pNtOpenKey)(PHANDLE, IN ACCESS_MASK, IN POBJECT_ATTRIBUTES); static NTSTATUS (WINAPI * pNtClose)(IN HANDLE); -static NTSTATUS (WINAPI * pNtDeleteValueKey)(IN HANDLE, IN PUNICODE_STRING); static NTSTATUS (WINAPI * pNtFlushKey)(HANDLE); static NTSTATUS (WINAPI * pNtDeleteKey)(HANDLE); static NTSTATUS (WINAPI * pNtCreateKey)( PHANDLE retkey, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr, @@ -143,7 +142,6 @@ static NTSTATUS (WINAPI * pRtlFreeHeap)(PVOID, ULONG, PVOID); static LPVOID (WINAPI * pRtlAllocateHeap)(PVOID,ULONG,ULONG); static NTSTATUS (WINAPI * pRtlZeroMemory)(PVOID, ULONG); static NTSTATUS (WINAPI * pRtlpNtQueryValueKey)(HANDLE,ULONG*,PBYTE,DWORD*,void *); -static NTSTATUS (WINAPI * pRtlOpenCurrentUser)(ACCESS_MASK,HANDLE*); static HMODULE hntdll = 0; static int CurrentTest = 0;

1 0

André Hentschel : msi/tests: Make multiline macros blocks (coverity).
by Alexandre Julliard 24 Oct '12

24 Oct '12

Module: wine Branch: master Commit: 1e361aa8cb9b6f0030fd1b24e2a0b07c7de24b5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e361aa8cb9b6f0030fd1b24e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Oct 24 02:05:15 2012 +0200 msi/tests: Make multiline macros blocks (coverity). --- dlls/msi/tests/action.c | 30 ++++++++++++++++++++---------- 1 files changed, 20 insertions(+), 10 deletions(-) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 1fcb82d..0a825cd 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -2610,36 +2610,46 @@ static void check_reg_dword5(HKEY prodkey, LPCSTR name, DWORD expected1, DWORD e check_reg_str(prodkey, name, expected, TRUE, __LINE__); #define CHECK_DEL_REG_STR(prodkey, name, expected) \ - check_reg_str(prodkey, name, expected, TRUE, __LINE__); \ - RegDeleteValueA(prodkey, name); + do { \ + check_reg_str(prodkey, name, expected, TRUE, __LINE__); \ + RegDeleteValueA(prodkey, name); \ + } while(0) #define CHECK_REG_ISTR(prodkey, name, expected) \ check_reg_str(prodkey, name, expected, FALSE, __LINE__); #define CHECK_DEL_REG_ISTR(prodkey, name, expected) \ - check_reg_str(prodkey, name, expected, FALSE, __LINE__); \ - RegDeleteValueA(prodkey, name); + do { \ + check_reg_str(prodkey, name, expected, FALSE, __LINE__); \ + RegDeleteValueA(prodkey, name); \ + } while(0) #define CHECK_REG_DWORD(prodkey, name, expected) \ check_reg_dword(prodkey, name, expected, __LINE__); #define CHECK_DEL_REG_DWORD(prodkey, name, expected) \ - check_reg_dword(prodkey, name, expected, __LINE__); \ - RegDeleteValueA(prodkey, name); + do { \ + check_reg_dword(prodkey, name, expected, __LINE__); \ + RegDeleteValueA(prodkey, name); \ + } while(0) #define CHECK_REG_DWORD2(prodkey, name, expected1, expected2) \ check_reg_dword2(prodkey, name, expected1, expected2, __LINE__); #define CHECK_DEL_REG_DWORD2(prodkey, name, expected1, expected2) \ - check_reg_dword2(prodkey, name, expected1, expected2, __LINE__); \ - RegDeleteValueA(prodkey, name); + do { \ + check_reg_dword2(prodkey, name, expected1, expected2, __LINE__); \ + RegDeleteValueA(prodkey, name); \ + } while(0) #define CHECK_REG_DWORD4(prodkey, name, expected1, expected2, expected3, expected4) \ check_reg_dword4(prodkey, name, expected1, expected2, expected3, expected4, __LINE__); #define CHECK_DEL_REG_DWORD5(prodkey, name, expected1, expected2, expected3, expected4 ,expected5) \ - check_reg_dword5(prodkey, name, expected1, expected2, expected3, expected4, expected5, __LINE__); \ - RegDeleteValueA(prodkey, name); + do { \ + check_reg_dword5(prodkey, name, expected1, expected2, expected3, expected4, expected5, __LINE__); \ + RegDeleteValueA(prodkey, name); \ + } while(0) static void get_date_str(LPSTR date) {

1 0

André Hentschel : usp10: Add missing break in switch ( coverity).
by Alexandre Julliard 24 Oct '12

24 Oct '12

Module: wine Branch: master Commit: c41bdf98bb7e0f19ec3d1923c33897a23ea47fa2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c41bdf98bb7e0f19ec3d1923c… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Oct 24 02:05:47 2012 +0200 usp10: Add missing break in switch (coverity). --- dlls/usp10/opentype.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index fe4bde4..138890f 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -1498,6 +1498,7 @@ static INT GPOS_apply_lookup(LPOUTLINETEXTMETRICW lpotm, LPLOGFONTW lplogfont, I if (advance.y) FIXME("Unhandled adjustment to Y advancement\n"); } + break; } case 2: {

1 0

André Hentschel : d3dx9_36/tests: Fix sizeof to be more portable (coverity).
by Alexandre Julliard 24 Oct '12

24 Oct '12

Module: wine Branch: master Commit: 472010911dc111b48a68512c6d02d4cee0720ce8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=472010911dc111b48a68512c6… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Oct 24 03:31:55 2012 +0200 d3dx9_36/tests: Fix sizeof to be more portable (coverity). --- dlls/d3dx9_36/tests/mesh.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index 563c759..97d7e2d 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -10167,7 +10167,7 @@ static void test_optimize_faces(void) DWORD j; DWORD *face_remap; face_remap = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - tc[i].num_faces*sizeof(face_remap)); + tc[i].num_faces*sizeof(*face_remap)); hr = D3DXOptimizeFaces(tc[i].indices, tc[i].num_faces, tc[i].num_vertices, tc[i].indices_are_32bit,

1 0

Alexandre Julliard : fusion/tests: Remove a broken macro.
by Alexandre Julliard 24 Oct '12

24 Oct '12

Module: wine Branch: master Commit: 7e50d67d7ea496371fab06d1b882b3c27c3bc23f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e50d67d7ea496371fab06d1b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 24 11:38:34 2012 +0200 fusion/tests: Remove a broken macro. --- dlls/fusion/tests/fusion.c | 20 ++++++-------------- 1 files changed, 6 insertions(+), 14 deletions(-) diff --git a/dlls/fusion/tests/fusion.c b/dlls/fusion/tests/fusion.c index 6ebd455..3fc67ef 100644 --- a/dlls/fusion/tests/fusion.c +++ b/dlls/fusion/tests/fusion.c @@ -30,14 +30,6 @@ static HRESULT (WINAPI *pLoadLibraryShim)(LPCWSTR szDllName, LPCWSTR szVersion, static HRESULT (WINAPI *pGetCORVersion)(LPWSTR pbuffer, DWORD cchBuffer, DWORD *dwLength); -static CHAR string1[MAX_PATH], string2[MAX_PATH]; - -#define ok_w2(format, szString1, szString2) \ -\ - WideCharToMultiByte(CP_ACP, 0, szString1, -1, string1, MAX_PATH, NULL, NULL); \ - WideCharToMultiByte(CP_ACP, 0, szString2, -1, string2, MAX_PATH, NULL, NULL); \ - ok(!lstrcmpA(string1, string2), format, string1, string2) - static BOOL init_functionpointers(void) { HRESULT hr; @@ -127,14 +119,14 @@ static void test_GetCachePath(void) lstrcpyW(path, nochange); hr = pGetCachePath(ASM_CACHE_GAC, path, NULL); ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr); - ok_w2("Expected \"%s\", got \"%s\"\n", nochange, path); + ok( !lstrcmpW( nochange, path ), "Expected %s, got %s\n", wine_dbgstr_w(nochange), wine_dbgstr_w(path)); /* get the cache path */ lstrcpyW(path, nochange); size = MAX_PATH; hr = pGetCachePath(ASM_CACHE_GAC, path, &size); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - ok_w2("Expected \"%s\", got \"%s\"\n", cachepath, path); + ok( !lstrcmpW( cachepath, path ), "Expected %s, got %s\n", wine_dbgstr_w(cachepath), wine_dbgstr_w(path)); /* pcchPath has no room for NULL terminator */ lstrcpyW(path, nochange); @@ -142,7 +134,7 @@ static void test_GetCachePath(void) hr = pGetCachePath(ASM_CACHE_GAC, path, &size); ok(hr == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), "Expected HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), got %08x\n", hr); - ok_w2("Expected \"%s\", got \"%s\"\n", nochange, path); + ok( !lstrcmpW( nochange, path ), "Expected %s, got %s\n", wine_dbgstr_w(nochange), wine_dbgstr_w(path)); lstrcpyW(cachepath, windir); lstrcatW(cachepath, backslash); @@ -156,7 +148,7 @@ static void test_GetCachePath(void) broken(hr == E_INVALIDARG), /* .NET 1.1 */ "Expected S_OK, got %08x\n", hr); if (hr == S_OK) - ok_w2("Expected \"%s\", got \"%s\"\n", cachepath, path); + ok( !lstrcmpW( cachepath, path ), "Expected %s, got %s\n", wine_dbgstr_w(cachepath), wine_dbgstr_w(path)); if (pGetCORVersion) { @@ -191,7 +183,7 @@ static void test_GetCachePath(void) size = MAX_PATH; hr = pGetCachePath(ASM_CACHE_ZAP, path, &size); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - ok_w2("Expected \"%s\", got \"%s\"\n", cachepath, path); + ok( !lstrcmpW( cachepath, path ), "Expected %s, got %s\n", wine_dbgstr_w(cachepath), wine_dbgstr_w(path)); } /* two flags at once */ @@ -199,7 +191,7 @@ static void test_GetCachePath(void) size = MAX_PATH; hr = pGetCachePath(ASM_CACHE_GAC | ASM_CACHE_ROOT, path, &size); ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr); - ok_w2("Expected \"%s\", got \"%s\"\n", nochange, path); + ok( !lstrcmpW( nochange, path ), "Expected %s, got %s\n", wine_dbgstr_w(nochange), wine_dbgstr_w(path)); } START_TEST(fusion)

1 0

Michael Stefaniuc : user32: Remove redundant sizeof check.
by Alexandre Julliard 24 Oct '12

24 Oct '12

Module: wine Branch: master Commit: 7d4605db416c9a0748b2258982455f09c4db9c21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d4605db416c9a0748b225898… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Oct 24 10:24:00 2012 +0200 user32: Remove redundant sizeof check. --- dlls/user32/cursoricon.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 6002bbb..62afa3d 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -1330,9 +1330,6 @@ static HICON CURSORICON_LoadFromFile( LPCWSTR filename, } dir = (const CURSORICONFILEDIR*) bits; - if ( filesize < sizeof(*dir) ) - goto end; - if ( filesize < (sizeof(*dir) + sizeof(dir->idEntries[0])*(dir->idCount-1)) ) goto end;

1 0

Michael Stefaniuc : user32: Use FIELD_OFFSET to calculate the size of a struct with variable length array .
by Alexandre Julliard 24 Oct '12

24 Oct '12

Module: wine Branch: master Commit: 8ab1fc5ff795a0f0a71e7779ca8f563c62198d5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ab1fc5ff795a0f0a71e7779c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Oct 24 10:26:02 2012 +0200 user32: Use FIELD_OFFSET to calculate the size of a struct with variable length array. --- dlls/user32/cursoricon.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 62afa3d..8f6f9ce 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -1330,7 +1330,7 @@ static HICON CURSORICON_LoadFromFile( LPCWSTR filename, } dir = (const CURSORICONFILEDIR*) bits; - if ( filesize < (sizeof(*dir) + sizeof(dir->idEntries[0])*(dir->idCount-1)) ) + if ( filesize < FIELD_OFFSET( CURSORICONFILEDIR, idEntries[dir->idCount] )) goto end; if ( fCursor )

1 0

Akihiro Sagawa : ntdll: Add ReturnLength test for NtQuerySystemInformation with SystemProcessInformation .
by Alexandre Julliard 24 Oct '12

24 Oct '12

Module: wine Branch: master Commit: 3fc4e884739388d576909f54bc767f866f209953 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fc4e884739388d576909f54b… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Oct 23 23:52:33 2012 +0900 ntdll: Add ReturnLength test for NtQuerySystemInformation with SystemProcessInformation. --- dlls/ntdll/tests/info.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 333dc4a..5dba2da 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -285,8 +285,14 @@ static void test_query_process(void) ULONG SystemInformationLength = sizeof(SYSTEM_PROCESS_INFORMATION_PRIVATE); SYSTEM_PROCESS_INFORMATION_PRIVATE *spi, *spi_buf = HeapAlloc(GetProcessHeap(), 0, SystemInformationLength); - /* Only W2K3 returns the needed length, the rest returns 0, so we have to loop */ - + /* test ReturnLength */ + ReturnLength = 0; + status = pNtQuerySystemInformation(SystemProcessInformation, NULL, 0, &ReturnLength); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_LENGTH_MISMATCH got %08x\n", status); + todo_wine ok( ReturnLength > 0 || broken(ReturnLength == 0) /* NT4, Win2K */, + "Expected a ReturnLength to show the needed length\n"); + + /* W2K3 and later returns the needed length, the rest returns 0, so we have to loop */ for (;;) { status = pNtQuerySystemInformation(SystemProcessInformation, spi_buf, SystemInformationLength, &ReturnLength);

1 0