wine-commits July 2010

wine-commits@winehq.org

2 participants
892 discussions

Alexandre Julliard : tests: Try to avoid message boxes popping up in non-interactive testing.
by Alexandre Julliard 20 Jul '10

20 Jul '10

Module: wine Branch: master Commit: e2c48c595206c3d7411cf07ba397a0fad6c5e0d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2c48c595206c3d7411cf07ba… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 19 23:45:28 2010 +0200 tests: Try to avoid message boxes popping up in non-interactive testing. --- dlls/kernel32/tests/debugger.c | 4 ++++ include/wine/test.h | 2 ++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index fa96767..dacad1f 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -160,6 +160,10 @@ static void doCrash(int argc, char** argv) { char* p; + /* make sure the exception gets to the debugger */ + SetErrorMode( 0 ); + SetUnhandledExceptionFilter( NULL ); + if (argc >= 4) { crash_blackbox_t blackbox; diff --git a/include/wine/test.h b/include/wine/test.h index 0d00e4b..27c4938 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -593,6 +593,8 @@ int main( int argc, char **argv ) if (GetEnvironmentVariableA( "WINETEST_INTERACTIVE", p, sizeof(p) )) winetest_interactive = atoi(p); if (GetEnvironmentVariableA( "WINETEST_REPORT_SUCCESS", p, sizeof(p) )) report_success = atoi(p); + if (!winetest_interactive) SetErrorMode( SEM_FAILCRITICALERRORS | SEM_NOGPFAULTERRORBOX ); + if (!argv[1]) { if (winetest_testlist[0].name && !winetest_testlist[1].name) /* only one test */

1 0

Tag wine-docs-1.2 : Alexandre Julliard : Release 1.2
by Alexandre Julliard 20 Jul '10

20 Jul '10

Module: docs Branch: refs/tags/wine-docs-1.2 Tag: 24b5f7e680d9f22f064bcb69c26293f46ee29aa0 URL: http://source.winehq.org/git/docs.git/?a=tag;h=24b5f7e680d9f22f064bcb69c262… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 20 12:08:39 2010 +0200 Release 1.2

1 0

Alexandre Julliard : Release 1.2.
by Alexandre Julliard 20 Jul '10

20 Jul '10

Module: docs Branch: master Commit: 4134d7eb567b843c27b1d6e976f23854ca208040 URL: http://source.winehq.org/git/docs.git/?a=commit;h=4134d7eb567b843c27b1d6e97… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 20 12:08:39 2010 +0200 Release 1.2. --- ANNOUNCE | 193 ++---- VERSION | 2 +- configure | 2230 +++++++++++++++++++++++++++++++++---------------------------- 3 files changed, 1270 insertions(+), 1155 deletions(-) Diff: http://source.winehq.org/git/docs.git/?a=commitdiff;h=4134d7eb567b843c27b1d…

1 0

Alexandre Julliard : README: Fix some typos.
by Alexandre Julliard 20 Jul '10

20 Jul '10

Module: docs Branch: master Commit: 4f3fd35facb87096357fe34b5ca103ae6695428c URL: http://source.winehq.org/git/docs.git/?a=commit;h=4f3fd35facb87096357fe34b5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 20 12:07:57 2010 +0200 README: Fix some typos. --- README | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README b/README index 036f72a..8958363 100644 --- a/README +++ b/README @@ -10,7 +10,7 @@ be used for porting Win32 code into native Unix executables. This package is Wine's documentation repository. It consists of various guides and their translations. -Wine and the Wine documenation is free software, released under +Wine and the Wine documentation are free software, released under the GNU LGPL; see the file LICENSE for the details. 2. QUICK START @@ -55,19 +55,19 @@ $ cd <lang>; make <format> Currently, we support English (en) and French (fr). However, French is not built by default due to -bugs in the openjage/opensp/sp packages. +bugs in the openjade/opensp/sp packages. 5. SENDING PATCHES Here are the important points you should keep in mind when sending patches: - * submit them to he Wine patches mailing list, wine-patches(a)winehq.org + * submit them to the Wine patches mailing list, wine-patches(a)winehq.org * include a ChangeLog entry with a description of the patch * keep the patch small and the point of the change clear * one patch per email * unified format only (diff -u) For more information on composing and sending patches, please refer to: - http://www.winehq.org/site/sending_patches + http://wiki.winehq.org/SubmittingPatches -- Dimi Paun <dimi(a)lattica.com>

1 0

Jeff Zaroyko : wineusr: Remove confusing reference to fake Windows installation.
by Alexandre Julliard 20 Jul '10

20 Jul '10

Module: docs Branch: master Commit: b7b497f30b6bf056c32e0727013fbe0292872214 URL: http://source.winehq.org/git/docs.git/?a=commit;h=b7b497f30b6bf056c32e07270… Author: Jeff Zaroyko <jeffz(a)jeffz.name> Date: Sat Jul 17 02:22:08 2010 +1000 wineusr: Remove confusing reference to fake Windows installation. --- en/wineusr-running.sgml | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) diff --git a/en/wineusr-running.sgml b/en/wineusr-running.sgml index 1ec71e9..042c2ba 100644 --- a/en/wineusr-running.sgml +++ b/en/wineusr-running.sgml @@ -10,14 +10,13 @@ <sect1 id="basic-usage"> <title>Basic usage: applications and control panel applets</title> <para> - Assuming you are using a fake Windows installation, you install - applications into Wine in the same way you would in Windows: by - running the installer. You can just accept the defaults for - where to install, most installers will default to "C:\Program - Files", which is fine. If the application installer requests it, - you may find that Wine creates icons on your desktop and in your - app menu. If that happens, you can start the app by clicking on - them. + Applications are installed under Wine the same way you would + in Windows: by running the installer. You can just accept the + defaults for where to install, most installers will default to + "C:\Program Files", which is fine. If the application + installer requests it, you may find that Wine creates icons on + your desktop and in your app menu. If that happens, you can + start the app by clicking on them. </para> <para>

1 0

Andrew Nguyen : shlwapi: Implement StrStrNIW.
by Alexandre Julliard 19 Jul '10

19 Jul '10

Module: wine Branch: master Commit: 15c6057ce1454004ac8120fc079ef581fa0efb9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=15c6057ce1454004ac8120fc0… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Sun Jul 18 19:35:43 2010 -0500 shlwapi: Implement StrStrNIW. --- dlls/shlwapi/shlwapi.spec | 1 + dlls/shlwapi/string.c | 35 +++++++++++++++ dlls/shlwapi/tests/string.c | 97 +++++++++++++++++++++++++++++++++++++++++++ include/shlwapi.h | 1 + 4 files changed, 134 insertions(+), 0 deletions(-) diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index b0e3e0e..8ad4373 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -802,6 +802,7 @@ @ stdcall StrStrIA(str str) @ stdcall StrStrIW(wstr wstr) @ stdcall StrStrNW(wstr wstr long) +@ stdcall StrStrNIW(wstr wstr long) @ stdcall StrStrW(wstr wstr) @ stdcall StrToIntA(str) @ stdcall StrToIntExA(str long ptr) diff --git a/dlls/shlwapi/string.c b/dlls/shlwapi/string.c index 96a7843..6102f3c 100644 --- a/dlls/shlwapi/string.c +++ b/dlls/shlwapi/string.c @@ -744,6 +744,41 @@ LPWSTR WINAPI StrStrNW(LPCWSTR lpFirst, LPCWSTR lpSrch, UINT cchMax) } /************************************************************************* + * StrStrNIW [SHLWAPI.@] + * + * Find a substring within a string up to a given number of initial characters, + * ignoring case. + * + * PARAMS + * lpFirst [I] String to search in + * lpSrch [I] String to look for + * cchMax [I] Maximum number of initial search characters + * + * RETURNS + * The start of lpFirst within lpSrch, or NULL if not found. + */ +LPWSTR WINAPI StrStrNIW(LPCWSTR lpFirst, LPCWSTR lpSrch, UINT cchMax) +{ + UINT i; + int len; + + TRACE("(%s, %s, %u)\n", debugstr_w(lpFirst), debugstr_w(lpSrch), cchMax); + + if (!lpFirst || !lpSrch || !*lpSrch || !cchMax) + return NULL; + + len = strlenW(lpSrch); + + for (i = cchMax; *lpFirst && (i > 0); i--, lpFirst++) + { + if (!strncmpiW(lpFirst, lpSrch, len)) + return (LPWSTR)lpFirst; + } + + return NULL; +} + +/************************************************************************* * StrToIntA [SHLWAPI.@] * * Read a signed integer from a string. diff --git a/dlls/shlwapi/tests/string.c b/dlls/shlwapi/tests/string.c index 71e1d4b..3d6d4a2 100644 --- a/dlls/shlwapi/tests/string.c +++ b/dlls/shlwapi/tests/string.c @@ -59,6 +59,7 @@ static HRESULT (WINAPI *pStrRetToBSTR)(STRRET*,void*,BSTR*); static HRESULT (WINAPI *pStrRetToBufA)(STRRET*,LPCITEMIDLIST,LPSTR,UINT); static HRESULT (WINAPI *pStrRetToBufW)(STRRET*,LPCITEMIDLIST,LPWSTR,UINT); static LPWSTR (WINAPI *pStrStrNW)(LPCWSTR,LPCWSTR,UINT); +static LPWSTR (WINAPI *pStrStrNIW)(LPCWSTR,LPCWSTR,UINT); static INT (WINAPIV *pwnsprintfA)(LPSTR,INT,LPCSTR, ...); static INT (WINAPIV *pwnsprintfW)(LPWSTR,INT,LPCWSTR, ...); static LPWSTR (WINAPI *pStrChrNW)(LPWSTR,WCHAR,UINT); @@ -1248,6 +1249,100 @@ static void test_StrStrNW(void) } } +static void test_StrStrNIW(void) +{ + static const WCHAR emptyW[] = {0}; + static const WCHAR deadbeefW[] = {'D','e','A','d','B','e','E','f',0}; + static const WCHAR deadW[] = {'D','e','A','d',0}; + static const WCHAR dead_lowerW[] = {'d','e','a','d',0}; + static const WCHAR adbeW[] = {'A','d','B','e',0}; + static const WCHAR adbe_lowerW[] = {'a','d','b','e',0}; + static const WCHAR beefW[] = {'B','e','E','f',0}; + static const WCHAR beef_lowerW[] = {'b','e','e','f',0}; + static const WCHAR cafeW[] = {'c','a','f','e',0}; + + const struct + { + const WCHAR *search; + const UINT count; + const WCHAR *expect; + } StrStrNIW_cases[] = + { + {emptyW, sizeof(deadbeefW)/sizeof(WCHAR), NULL}, + {deadW, sizeof(deadbeefW)/sizeof(WCHAR), deadbeefW}, + {dead_lowerW, sizeof(deadbeefW)/sizeof(WCHAR), deadbeefW}, + {adbeW, sizeof(deadbeefW)/sizeof(WCHAR), deadbeefW + 2}, + {adbe_lowerW, sizeof(deadbeefW)/sizeof(WCHAR), deadbeefW + 2}, + {beefW, sizeof(deadbeefW)/sizeof(WCHAR), deadbeefW + 4}, + {beef_lowerW, sizeof(deadbeefW)/sizeof(WCHAR), deadbeefW + 4}, + {cafeW, sizeof(deadbeefW)/sizeof(WCHAR), NULL}, + {beefW, 0, NULL}, + {beefW, 1, NULL}, + {beefW, 2, NULL}, + {beefW, 3, NULL}, + {beefW, 4, NULL}, + {beefW, 5, deadbeefW + 4}, + {beefW, 6, deadbeefW + 4}, + {beefW, 7, deadbeefW + 4}, + {beefW, 8, deadbeefW + 4}, + {beefW, 9, deadbeefW + 4}, + {beef_lowerW, 0, NULL}, + {beef_lowerW, 1, NULL}, + {beef_lowerW, 2, NULL}, + {beef_lowerW, 3, NULL}, + {beef_lowerW, 4, NULL}, + {beef_lowerW, 5, deadbeefW + 4}, + {beef_lowerW, 6, deadbeefW + 4}, + {beef_lowerW, 7, deadbeefW + 4}, + {beef_lowerW, 8, deadbeefW + 4}, + {beef_lowerW, 9, deadbeefW + 4}, + }; + + LPWSTR ret; + UINT i; + + if (!pStrStrNIW) + { + win_skip("StrStrNIW() is not available\n"); + return; + } + + ret = pStrStrNIW(NULL, NULL, 0); + ok(!ret, "Expected StrStrNIW to return NULL, got %p\n", ret); + + ret = pStrStrNIW(NULL, NULL, 10); + ok(!ret, "Expected StrStrNIW to return NULL, got %p\n", ret); + + ret = pStrStrNIW(NULL, emptyW, 10); + ok(!ret, "Expected StrStrNIW to return NULL, got %p\n", ret); + + ret = pStrStrNIW(emptyW, NULL, 10); + ok(!ret, "Expected StrStrNIW to return NULL, got %p\n", ret); + + ret = pStrStrNIW(emptyW, emptyW, 10); + ok(!ret, "Expected StrStrNIW to return NULL, got %p\n", ret); + + for (i = 0; i < sizeof(StrStrNIW_cases)/sizeof(StrStrNIW_cases[0]); i++) + { + ret = pStrStrNIW(deadbeefW, StrStrNIW_cases[i].search, StrStrNIW_cases[i].count); + ok(ret == StrStrNIW_cases[i].expect, + "[%d] Expected StrStrNIW to return %p, got %p\n", + i, StrStrNIW_cases[i].expect, ret); + } + + /* StrStrNIW accepts counts larger than the search string length but rejects + * counts larger than around 2G. The limit seems to change based on the + * caller executable itself. */ + ret = pStrStrNIW(deadbeefW, beefW, 100); + ok(ret == deadbeefW + 4, "Expected StrStrNIW to return deadbeefW + 4, got %p\n", ret); + + if (0) + { + ret = pStrStrNIW(deadbeefW, beefW, ~0U); + ok(!ret, "Expected StrStrNIW to return NULL, got %p\n", ret); + } +} + START_TEST(string) { HMODULE hShlwapi; @@ -1279,6 +1374,7 @@ START_TEST(string) pStrRetToBufA = (void *)GetProcAddress(hShlwapi, "StrRetToBufA"); pStrRetToBufW = (void *)GetProcAddress(hShlwapi, "StrRetToBufW"); pStrStrNW = (void *)GetProcAddress(hShlwapi, "StrStrNW"); + pStrStrNIW = (void *)GetProcAddress(hShlwapi, "StrStrNIW"); pwnsprintfA = (void *)GetProcAddress(hShlwapi, "wnsprintfA"); pwnsprintfW = (void *)GetProcAddress(hShlwapi, "wnsprintfW"); @@ -1323,6 +1419,7 @@ START_TEST(string) test_StrStrIA(); test_StrStrIW(); test_StrStrNW(); + test_StrStrNIW(); CoUninitialize(); } diff --git a/include/shlwapi.h b/include/shlwapi.h index fe58bb5..dd2da4f 100644 --- a/include/shlwapi.h +++ b/include/shlwapi.h @@ -877,6 +877,7 @@ LPWSTR WINAPI StrStrIW(LPCWSTR,LPCWSTR); #define StrStrI WINELIB_NAME_AW(StrStrI) LPWSTR WINAPI StrStrNW(LPCWSTR,LPCWSTR,UINT); +LPWSTR WINAPI StrStrNIW(LPCWSTR,LPCWSTR,UINT); int WINAPI StrToIntA(LPCSTR); int WINAPI StrToIntW(LPCWSTR);

1 0

Andrew Nguyen : shlwapi: Implement StrStrNW.
by Alexandre Julliard 19 Jul '10

19 Jul '10

Module: wine Branch: master Commit: 9bd13c93ab58ad34c62b70c404dde708a9807d31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bd13c93ab58ad34c62b70c40… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Sun Jul 18 19:35:27 2010 -0500 shlwapi: Implement StrStrNW. --- dlls/shlwapi/shlwapi.spec | 1 + dlls/shlwapi/string.c | 34 +++++++++++++++++ dlls/shlwapi/tests/string.c | 85 +++++++++++++++++++++++++++++++++++++++++++ include/shlwapi.h | 2 + 4 files changed, 122 insertions(+), 0 deletions(-) diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index 268a2e2..b0e3e0e 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -801,6 +801,7 @@ @ stdcall StrStrA(str str) @ stdcall StrStrIA(str str) @ stdcall StrStrIW(wstr wstr) +@ stdcall StrStrNW(wstr wstr long) @ stdcall StrStrW(wstr wstr) @ stdcall StrToIntA(str) @ stdcall StrToIntExA(str long ptr) diff --git a/dlls/shlwapi/string.c b/dlls/shlwapi/string.c index 5647a35..96a7843 100644 --- a/dlls/shlwapi/string.c +++ b/dlls/shlwapi/string.c @@ -710,6 +710,40 @@ LPWSTR WINAPI StrStrIW(LPCWSTR lpszStr, LPCWSTR lpszSearch) } /************************************************************************* + * StrStrNW [SHLWAPI.@] + * + * Find a substring within a string up to a given number of initial characters. + * + * PARAMS + * lpFirst [I] String to search in + * lpSrch [I] String to look for + * cchMax [I] Maximum number of initial search characters + * + * RETURNS + * The start of lpFirst within lpSrch, or NULL if not found. + */ +LPWSTR WINAPI StrStrNW(LPCWSTR lpFirst, LPCWSTR lpSrch, UINT cchMax) +{ + UINT i; + int len; + + TRACE("(%s, %s, %u)\n", debugstr_w(lpFirst), debugstr_w(lpSrch), cchMax); + + if (!lpFirst || !lpSrch || !*lpSrch || !cchMax) + return NULL; + + len = strlenW(lpSrch); + + for (i = cchMax; *lpFirst && (i > 0); i--, lpFirst++) + { + if (!strncmpW(lpFirst, lpSrch, len)) + return (LPWSTR)lpFirst; + } + + return NULL; +} + +/************************************************************************* * StrToIntA [SHLWAPI.@] * * Read a signed integer from a string. diff --git a/dlls/shlwapi/tests/string.c b/dlls/shlwapi/tests/string.c index 8b4bb17..71e1d4b 100644 --- a/dlls/shlwapi/tests/string.c +++ b/dlls/shlwapi/tests/string.c @@ -58,6 +58,7 @@ static BOOL (WINAPI *pStrIsIntlEqualW)(BOOL,LPCWSTR,LPCWSTR,int); static HRESULT (WINAPI *pStrRetToBSTR)(STRRET*,void*,BSTR*); static HRESULT (WINAPI *pStrRetToBufA)(STRRET*,LPCITEMIDLIST,LPSTR,UINT); static HRESULT (WINAPI *pStrRetToBufW)(STRRET*,LPCITEMIDLIST,LPWSTR,UINT); +static LPWSTR (WINAPI *pStrStrNW)(LPCWSTR,LPCWSTR,UINT); static INT (WINAPIV *pwnsprintfA)(LPSTR,INT,LPCSTR, ...); static INT (WINAPIV *pwnsprintfW)(LPWSTR,INT,LPCWSTR, ...); static LPWSTR (WINAPI *pStrChrNW)(LPWSTR,WCHAR,UINT); @@ -1165,6 +1166,88 @@ static void test_StrStrIW(void) } } +static void test_StrStrNW(void) +{ + static const WCHAR emptyW[] = {0}; + static const WCHAR deadbeefW[] = {'D','e','A','d','B','e','E','f',0}; + static const WCHAR deadW[] = {'D','e','A','d',0}; + static const WCHAR dead_lowerW[] = {'d','e','a','d',0}; + static const WCHAR adbeW[] = {'A','d','B','e',0}; + static const WCHAR adbe_lowerW[] = {'a','d','b','e',0}; + static const WCHAR beefW[] = {'B','e','E','f',0}; + static const WCHAR beef_lowerW[] = {'b','e','e','f',0}; + + const struct + { + const WCHAR *search; + const UINT count; + const WCHAR *expect; + } StrStrNW_cases[] = + { + {emptyW, sizeof(deadbeefW)/sizeof(WCHAR), NULL}, + {deadW, sizeof(deadbeefW)/sizeof(WCHAR), deadbeefW}, + {dead_lowerW, sizeof(deadbeefW)/sizeof(WCHAR), NULL}, + {adbeW, sizeof(deadbeefW)/sizeof(WCHAR), deadbeefW + 2}, + {adbe_lowerW, sizeof(deadbeefW)/sizeof(WCHAR), NULL}, + {beefW, sizeof(deadbeefW)/sizeof(WCHAR), deadbeefW + 4}, + {beef_lowerW, sizeof(deadbeefW)/sizeof(WCHAR), NULL}, + {beefW, 0, NULL}, + {beefW, 1, NULL}, + {beefW, 2, NULL}, + {beefW, 3, NULL}, + {beefW, 4, NULL}, + {beefW, 5, deadbeefW + 4}, + {beefW, 6, deadbeefW + 4}, + {beefW, 7, deadbeefW + 4}, + {beefW, 8, deadbeefW + 4}, + {beefW, 9, deadbeefW + 4}, + }; + + LPWSTR ret; + UINT i; + + if (!pStrStrNW) + { + win_skip("StrStrNW() is not available\n"); + return; + } + + ret = pStrStrNW(NULL, NULL, 0); + ok(!ret, "Expected StrStrNW to return NULL, got %p\n", ret); + + ret = pStrStrNW(NULL, NULL, 10); + ok(!ret, "Expected StrStrNW to return NULL, got %p\n", ret); + + ret = pStrStrNW(NULL, emptyW, 10); + ok(!ret, "Expected StrStrNW to return NULL, got %p\n", ret); + + ret = pStrStrNW(emptyW, NULL, 10); + ok(!ret, "Expected StrStrNW to return NULL, got %p\n", ret); + + ret = pStrStrNW(emptyW, emptyW, 10); + ok(!ret, "Expected StrStrNW to return NULL, got %p\n", ret); + + for (i = 0; i < sizeof(StrStrNW_cases)/sizeof(StrStrNW_cases[0]); i++) + { + ret = pStrStrNW(deadbeefW, StrStrNW_cases[i].search, StrStrNW_cases[i].count); + ok(ret == StrStrNW_cases[i].expect, + "[%d] Expected StrStrNW to return %p, got %p\n", + i, StrStrNW_cases[i].expect, ret); + } + + /* StrStrNW accepts counts larger than the search string length but rejects + * counts larger than around 2G. The limit seems to change based on the + * caller executable itself. */ + ret = pStrStrNW(deadbeefW, beefW, 100); + ok(ret == deadbeefW + 4, "Expected StrStrNW to return deadbeefW + 4, got %p\n", ret); + + if (0) + { + ret = pStrStrNW(deadbeefW, beefW, ~0U); + ok(!ret, "Expected StrStrNW to return NULL, got %p\n", ret); + } +} + START_TEST(string) { HMODULE hShlwapi; @@ -1195,6 +1278,7 @@ START_TEST(string) pStrRetToBSTR = (void *)GetProcAddress(hShlwapi, "StrRetToBSTR"); pStrRetToBufA = (void *)GetProcAddress(hShlwapi, "StrRetToBufA"); pStrRetToBufW = (void *)GetProcAddress(hShlwapi, "StrRetToBufW"); + pStrStrNW = (void *)GetProcAddress(hShlwapi, "StrStrNW"); pwnsprintfA = (void *)GetProcAddress(hShlwapi, "wnsprintfA"); pwnsprintfW = (void *)GetProcAddress(hShlwapi, "wnsprintfW"); @@ -1238,6 +1322,7 @@ START_TEST(string) test_StrStrW(); test_StrStrIA(); test_StrStrIW(); + test_StrStrNW(); CoUninitialize(); } diff --git a/include/shlwapi.h b/include/shlwapi.h index 744be84..fe58bb5 100644 --- a/include/shlwapi.h +++ b/include/shlwapi.h @@ -876,6 +876,8 @@ LPSTR WINAPI StrStrIA(LPCSTR,LPCSTR); LPWSTR WINAPI StrStrIW(LPCWSTR,LPCWSTR); #define StrStrI WINELIB_NAME_AW(StrStrI) +LPWSTR WINAPI StrStrNW(LPCWSTR,LPCWSTR,UINT); + int WINAPI StrToIntA(LPCSTR); int WINAPI StrToIntW(LPCWSTR); #define StrToInt WINELIB_NAME_AW(StrToInt)

1 0

Andrew Nguyen : shlwapi/tests: Add tests for StrStrIW.
by Alexandre Julliard 19 Jul '10

19 Jul '10

Module: wine Branch: master Commit: 355057d5290bb75098b468e94e570bca3ca49214 URL: http://source.winehq.org/git/wine.git/?a=commit;h=355057d5290bb75098b468e94… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Sun Jul 18 19:34:00 2010 -0500 shlwapi/tests: Add tests for StrStrIW. --- dlls/shlwapi/tests/string.c | 57 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 57 insertions(+), 0 deletions(-) diff --git a/dlls/shlwapi/tests/string.c b/dlls/shlwapi/tests/string.c index 07a4602..8b4bb17 100644 --- a/dlls/shlwapi/tests/string.c +++ b/dlls/shlwapi/tests/string.c @@ -1109,6 +1109,62 @@ static void test_StrStrIA(void) } } +static void test_StrStrIW(void) +{ + static const WCHAR emptyW[] = {0}; + static const WCHAR deadbeefW[] = {'D','e','A','d','B','e','E','f',0}; + static const WCHAR deadW[] = {'D','e','A','d',0}; + static const WCHAR dead_lowerW[] = {'d','e','a','d',0}; + static const WCHAR adbeW[] = {'A','d','B','e',0}; + static const WCHAR adbe_lowerW[] = {'a','d','b','e',0}; + static const WCHAR beefW[] = {'B','e','E','f',0}; + static const WCHAR beef_lowerW[] = {'b','e','e','f',0}; + static const WCHAR cafeW[] = {'c','a','f','e',0}; + + const struct + { + const WCHAR *search; + const WCHAR *expect; + } StrStrIW_cases[] = + { + {emptyW, NULL}, + {deadW, deadbeefW}, + {dead_lowerW, deadbeefW}, + {adbeW, deadbeefW + 2}, + {adbe_lowerW, deadbeefW + 2}, + {beefW, deadbeefW + 4}, + {beef_lowerW, deadbeefW + 4}, + {cafeW, NULL}, + }; + + LPWSTR ret; + int i; + + /* Tests crash on Win9x/Win2k */ + if (0) + { + ret = StrStrIW(NULL, NULL); + ok(!ret, "Expected StrStrIW to return NULL, got %p\n", ret); + + ret = StrStrIW(NULL, emptyW); + ok(!ret, "Expected StrStrIW to return NULL, got %p\n", ret); + + ret = StrStrIW(emptyW, NULL); + ok(!ret, "Expected StrStrIW to return NULL, got %p\n", ret); + } + + ret = StrStrIW(emptyW, emptyW); + ok(!ret, "Expected StrStrIW to return NULL, got %p\n", ret); + + for (i = 0; i < sizeof(StrStrIW_cases)/sizeof(StrStrIW_cases[0]); i++) + { + ret = StrStrIW(deadbeefW, StrStrIW_cases[i].search); + ok(ret == StrStrIW_cases[i].expect, + "[%d] Expected StrStrIW to return %p, got %p\n", + i, StrStrIW_cases[i].expect, ret); + } +} + START_TEST(string) { HMODULE hShlwapi; @@ -1181,6 +1237,7 @@ START_TEST(string) test_StrStrA(); test_StrStrW(); test_StrStrIA(); + test_StrStrIW(); CoUninitialize(); }

1 0

Andrew Nguyen : shlwapi/tests: Add tests for StrStrIA.
by Alexandre Julliard 19 Jul '10

19 Jul '10

Module: wine Branch: master Commit: 1784dbd17a2fc3c71a44cf27a9f6a83ccbc5b0de URL: http://source.winehq.org/git/wine.git/?a=commit;h=1784dbd17a2fc3c71a44cf27a… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Sun Jul 18 19:33:47 2010 -0500 shlwapi/tests: Add tests for StrStrIA. --- dlls/shlwapi/tests/string.c | 49 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 49 insertions(+), 0 deletions(-) diff --git a/dlls/shlwapi/tests/string.c b/dlls/shlwapi/tests/string.c index 0eaaafb..07a4602 100644 --- a/dlls/shlwapi/tests/string.c +++ b/dlls/shlwapi/tests/string.c @@ -1061,6 +1061,54 @@ static void test_StrStrW(void) } } +static void test_StrStrIA(void) +{ + static const char *deadbeef = "DeAdBeEf"; + + const struct + { + const char *search; + const char *expect; + } StrStrIA_cases[] = + { + {"", NULL}, + {"DeAd", deadbeef}, + {"dead", deadbeef}, + {"AdBe", deadbeef + 2}, + {"adbe", deadbeef + 2}, + {"BeEf", deadbeef + 4}, + {"beef", deadbeef + 4}, + {"cafe", NULL}, + }; + + LPSTR ret; + int i; + + /* Tests crash on Win9x/Win2k. */ + if (0) + { + ret = StrStrIA(NULL, NULL); + ok(!ret, "Expected StrStrIA to return NULL, got %p\n", ret); + + ret = StrStrIA(NULL, ""); + ok(!ret, "Expected StrStrIA to return NULL, got %p\n", ret); + + ret = StrStrIA("", NULL); + ok(!ret, "Expected StrStrIA to return NULL, got %p\n", ret); + } + + ret = StrStrIA("", ""); + ok(!ret, "Expected StrStrIA to return NULL, got %p\n", ret); + + for (i = 0; i < sizeof(StrStrIA_cases)/sizeof(StrStrIA_cases[0]); i++) + { + ret = StrStrIA(deadbeef, StrStrIA_cases[i].search); + ok(ret == StrStrIA_cases[i].expect, + "[%d] Expected StrStrIA to return %p, got %p\n", + i, StrStrIA_cases[i].expect, ret); + } +} + START_TEST(string) { HMODULE hShlwapi; @@ -1132,6 +1180,7 @@ START_TEST(string) test_StrXXX_overflows(); test_StrStrA(); test_StrStrW(); + test_StrStrIA(); CoUninitialize(); }

1 0

Andrew Nguyen : shlwapi: Fix handling of an empty search string in StrStrW.
by Alexandre Julliard 19 Jul '10

19 Jul '10

Module: wine Branch: master Commit: 9bcdb1c423070d5ed387ba3efc767adea2d2930b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bcdb1c423070d5ed387ba3ef… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Sun Jul 18 19:33:36 2010 -0500 shlwapi: Fix handling of an empty search string in StrStrW. --- dlls/shlwapi/string.c | 4 ++- dlls/shlwapi/tests/string.c | 55 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 1 deletions(-) diff --git a/dlls/shlwapi/string.c b/dlls/shlwapi/string.c index a0269b6..5647a35 100644 --- a/dlls/shlwapi/string.c +++ b/dlls/shlwapi/string.c @@ -584,7 +584,9 @@ LPSTR WINAPI StrStrA(LPCSTR lpszStr, LPCSTR lpszSearch) */ LPWSTR WINAPI StrStrW(LPCWSTR lpszStr, LPCWSTR lpszSearch) { - if (!lpszStr || !lpszSearch) return NULL; + TRACE("(%s, %s)\n", debugstr_w(lpszStr), debugstr_w(lpszSearch)); + + if (!lpszStr || !lpszSearch || !*lpszSearch) return NULL; return strstrW( lpszStr, lpszSearch ); } diff --git a/dlls/shlwapi/tests/string.c b/dlls/shlwapi/tests/string.c index a4e8d45..0eaaafb 100644 --- a/dlls/shlwapi/tests/string.c +++ b/dlls/shlwapi/tests/string.c @@ -1007,6 +1007,60 @@ static void test_StrStrA(void) } } +static void test_StrStrW(void) +{ + static const WCHAR emptyW[] = {0}; + static const WCHAR deadbeefW[] = {'D','e','A','d','B','e','E','f',0}; + static const WCHAR deadW[] = {'D','e','A','d',0}; + static const WCHAR dead_lowerW[] = {'d','e','a','d',0}; + static const WCHAR adbeW[] = {'A','d','B','e',0}; + static const WCHAR adbe_lowerW[] = {'a','d','b','e',0}; + static const WCHAR beefW[] = {'B','e','E','f',0}; + static const WCHAR beef_lowerW[] = {'b','e','e','f',0}; + + const struct + { + const WCHAR *search; + const WCHAR *expect; + } StrStrW_cases[] = + { + {emptyW, NULL}, + {deadW, deadbeefW}, + {dead_lowerW, NULL}, + {adbeW, deadbeefW + 2}, + {adbe_lowerW, NULL}, + {beefW, deadbeefW + 4}, + {beef_lowerW, NULL}, + }; + + LPWSTR ret; + int i; + + /* Tests crash on Win9x. */ + if (0) + { + ret = StrStrW(NULL, NULL); + ok(!ret, "Expected StrStrW to return NULL, got %p\n", ret); + + ret = StrStrW(NULL, emptyW); + ok(!ret, "Expected StrStrW to return NULL, got %p\n", ret); + + ret = StrStrW(emptyW, NULL); + ok(!ret, "Expected StrStrW to return NULL, got %p\n", ret); + } + + ret = StrStrW(emptyW, emptyW); + ok(!ret, "Expected StrStrW to return NULL, got %p\n", ret); + + for (i = 0; i < sizeof(StrStrW_cases)/sizeof(StrStrW_cases[0]); i++) + { + ret = StrStrW(deadbeefW, StrStrW_cases[i].search); + ok(ret == StrStrW_cases[i].expect, + "[%d] Expected StrStrW to return %p, got %p\n", + i, StrStrW_cases[i].expect, ret); + } +} + START_TEST(string) { HMODULE hShlwapi; @@ -1077,6 +1131,7 @@ START_TEST(string) test_SHUnicodeToUnicode(); test_StrXXX_overflows(); test_StrStrA(); + test_StrStrW(); CoUninitialize(); }

1 0

← Newer
1
...
55
56
57
58
59
60
61
...
90
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2010