July 2010 - Wine-commits - list.winehq.org

Alexandre Julliard : tests: Print information about the last executed test before crashing.
by Alexandre Julliard 20 Jul '10

20 Jul '10

Module: wine Branch: master Commit: 89ad1f2615918067bb6198bcdae74304f2c40dbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=89ad1f2615918067bb6198bcd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 19 23:46:18 2010 +0200 tests: Print information about the last executed test before crashing. --- include/wine/test.h | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-) diff --git a/include/wine/test.h b/include/wine/test.h index 27c4938..6ff4372 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -237,8 +237,7 @@ static tls_data* get_tls_data(void) data=TlsGetValue(tls_index); if (!data) { - data=HeapAlloc(GetProcessHeap(), 0, sizeof(tls_data)); - data->todo_level = 0; + data=HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(tls_data)); data->str_pos = data->strings; TlsSetValue(tls_index,data); } @@ -577,6 +576,19 @@ static void usage( const char *argv0 ) exit_process(1); } +/* trap unhandled exceptions */ +static LONG CALLBACK exc_filter( EXCEPTION_POINTERS *ptrs ) +{ + tls_data *data = get_tls_data(); + + if (data->current_file) + fprintf( stdout, "%s:%d: this is the last test seen before the exception\n", + data->current_file, data->current_line ); + fprintf( stdout, "%s: unhandled exception %08x at %p\n", current_test->name, + ptrs->ExceptionRecord->ExceptionCode, ptrs->ExceptionRecord->ExceptionAddress ); + fflush( stdout ); + return EXCEPTION_EXECUTE_HANDLER; +} /* main function */ int main( int argc, char **argv ) @@ -593,6 +605,7 @@ 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 (!strcmp( winetest_platform, "windows" )) SetUnhandledExceptionFilter( exc_filter ); if (!winetest_interactive) SetErrorMode( SEM_FAILCRITICALERRORS | SEM_NOGPFAULTERRORBOX ); if (!argv[1])

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

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

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

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 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: 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

David Hedberg : include: Add SIGDN enumeration.
by Alexandre Julliard 19 Jul '10

19 Jul '10

Module: wine Branch: master Commit: 789a818971e92ea5b115b62e84f50f740fd359e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=789a818971e92ea5b115b62e8… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Sat Jul 17 17:21:58 2010 +0200 include: Add SIGDN enumeration. --- include/shobjidl.idl | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/include/shobjidl.idl b/include/shobjidl.idl index ee9d949..5ad5bf4 100644 --- a/include/shobjidl.idl +++ b/include/shobjidl.idl @@ -346,7 +346,17 @@ interface IShellFolder2 : IShellFolder ] interface IShellItem : IUnknown { - typedef DWORD SIGDN; + typedef [v1_enum] enum { + SIGDN_NORMALDISPLAY = 0, + SIGDN_PARENTRELATIVEPARSING = 0x80018001, + SIGDN_DESKTOPABSOLUTEPARSING = 0x80028000, + SIGDN_PARENTRELATIVEEDITING = 0x80031001, + SIGDN_DESKTOPABSOLUTEEDITING = 0x8004c000, + SIGDN_FILESYSPATH = 0x80058000, + SIGDN_URL = 0x80068000, + SIGDN_PARENTRELATIVEFORADDRESSBAR = 0x8007c001, + SIGDN_PARENTRELATIVE = 0x80080001 + } SIGDN; /* & 0xFFFF => SHGDN */ typedef DWORD SICHINTF;

1 0

Austin English : ntoskrnl.exe: Add stubs for MmMapIoSpace/MmUnmapIoSpace.
by Alexandre Julliard 19 Jul '10

19 Jul '10

Module: wine Branch: master Commit: a4ea347f9fb82473c5dc2d01de314f08b384877c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4ea347f9fb82473c5dc2d01d… Author: Austin English <austinenglish(a)gmail.com> Date: Sun Jul 18 15:22:43 2010 -0500 ntoskrnl.exe: Add stubs for MmMapIoSpace/MmUnmapIoSpace. --- dlls/ntoskrnl.exe/ntoskrnl.c | 17 +++++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 4 ++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 7823f73..ab113b0 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1327,6 +1327,15 @@ BOOLEAN WINAPI MmIsAddressValid(PVOID VirtualAddress) } /*********************************************************************** + * MmMapIoSpace (NTOSKRNL.EXE.@) + */ +PVOID WINAPI MmMapIoSpace( PHYSICAL_ADDRESS PhysicalAddress, DWORD NumberOfBytes, DWORD CacheType ) +{ + FIXME( "stub: 0x%08x%08x, %d, %d\n", PhysicalAddress.u.HighPart, PhysicalAddress.u.LowPart, NumberOfBytes, CacheType ); + return NULL; +} + +/*********************************************************************** * MmPageEntireDriver (NTOSKRNL.EXE.@) */ PVOID WINAPI MmPageEntireDriver(PVOID AddrInSection) @@ -1344,6 +1353,14 @@ void WINAPI MmResetDriverPaging(PVOID AddrInSection) } /*********************************************************************** + * MmUnmapIoSpace (NTOSKRNL.EXE.@) + */ +VOID WINAPI MmUnmapIoSpace( PVOID BaseAddress, SIZE_T NumberOfBytes ) +{ + FIXME( "stub: %p, %lu\n", BaseAddress, NumberOfBytes ); +} + +/*********************************************************************** * ObfReferenceObject (NTOSKRNL.EXE.@) */ VOID WINAPI ObfReferenceObject(PVOID Object) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 0a816ab..38ccb58 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -688,7 +688,7 @@ @ stub MmLockPagableDataSection @ stub MmLockPagableImageSection @ stub MmLockPagableSectionByHandle -@ stub MmMapIoSpace +@ stdcall MmMapIoSpace(long long long long) @ stub MmMapLockedPages @ stub MmMapLockedPagesSpecifyCache @ stub MmMapLockedPagesWithReservedMapping @@ -718,7 +718,7 @@ @ stub MmTrimAllSystemPagableMemory @ stub MmUnlockPagableImageSection @ stub MmUnlockPages -@ stub MmUnmapIoSpace +@ stdcall MmUnmapIoSpace(ptr long) @ stub MmUnmapLockedPages @ stub MmUnmapReservedMapping @ stub MmUnmapVideoDisplay

1 0

Andrew Nguyen : shlwapi/tests: Fix Win98 SE test failures for StrFormatKBSizeA/W.
by Alexandre Julliard 19 Jul '10

19 Jul '10

Module: wine Branch: master Commit: ec0e9d0df87324d4d8c9d332d4f41d6c15ffe6f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec0e9d0df87324d4d8c9d332d… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Sun Jul 18 19:33:14 2010 -0500 shlwapi/tests: Fix Win98 SE test failures for StrFormatKBSizeA/W. --- dlls/shlwapi/tests/string.c | 31 ++++++++++++++++++++----------- 1 files changed, 20 insertions(+), 11 deletions(-) diff --git a/dlls/shlwapi/tests/string.c b/dlls/shlwapi/tests/string.c index 17c652d..b8cf7e0 100644 --- a/dlls/shlwapi/tests/string.c +++ b/dlls/shlwapi/tests/string.c @@ -107,6 +107,8 @@ typedef struct tagStrFormatSizeResult LONGLONG value; const char* byte_size_64; const char* kb_size; + int kb_size_broken; + const char* kb_size2; } StrFormatSizeResult; @@ -117,15 +119,15 @@ static const StrFormatSizeResult StrFormatSize_results[] = { { 10191, "9.95 KB", "10 KB"}, { 100353, "98.0 KB", "99 KB"}, { 1022286, "998 KB", "999 KB"}, - { 1046862, "0.99 MB", "1,023 KB"}, - { 1048574619, "999 MB", "1,023,999 KB"}, - { 1073741775, "0.99 GB", "1,048,576 KB"}, - { ((LONGLONG)0x000000f9 << 32) | 0xfffff94e, "999 GB", "1,048,575,999 KB"}, - { ((LONGLONG)0x000000ff << 32) | 0xfffffa9b, "0.99 TB", "1,073,741,823 KB"}, - { ((LONGLONG)0x0003e7ff << 32) | 0xfffffa9b, "999 TB", "1,073,741,823,999 KB"}, - { ((LONGLONG)0x0003ffff << 32) | 0xfffffbe8, "0.99 PB", "1,099,511,627,775 KB"}, - { ((LONGLONG)0x0f9fffff << 32) | 0xfffffd35, "999 PB", "1,099,511,627,776,000 KB"}, - { ((LONGLONG)0x0fffffff << 32) | 0xfffffa9b, "0.99 EB", "1,125,899,906,842,623 KB"}, + { 1046862, "0.99 MB", "1,023 KB", 1, "1023 KB"}, + { 1048574619, "999 MB", "1,023,999 KB", 1, "1023999 KB"}, + { 1073741775, "0.99 GB", "1,048,576 KB", 1, "1048576 KB"}, + { ((LONGLONG)0x000000f9 << 32) | 0xfffff94e, "999 GB", "1,048,575,999 KB", 1, "1048575999 KB"}, + { ((LONGLONG)0x000000ff << 32) | 0xfffffa9b, "0.99 TB", "1,073,741,823 KB", 1, "1073741823 KB"}, + { ((LONGLONG)0x0003e7ff << 32) | 0xfffffa9b, "999 TB", "1,073,741,823,999 KB", 1, "4294967295 KB"}, + { ((LONGLONG)0x0003ffff << 32) | 0xfffffbe8, "0.99 PB", "1,099,511,627,775 KB", 1, "4294967295 KB"}, + { ((LONGLONG)0x0f9fffff << 32) | 0xfffffd35, "999 PB", "1,099,511,627,776,000 KB", 1, "0 KB"}, + { ((LONGLONG)0x0fffffff << 32) | 0xfffffa9b, "0.99 EB", "1,125,899,906,842,623 KB", 1, "4294967295 KB"}, { 0, NULL, NULL } }; @@ -560,7 +562,11 @@ static void test_StrFormatKBSizeW(void) { pStrFormatKBSizeW(result->value, szBuffW, 256); WideCharToMultiByte(0,0,szBuffW,-1,szBuff,sizeof(szBuff)/sizeof(WCHAR),0,0); - ok(!strcmp(result->kb_size, szBuff), + + /* shlwapi on Win98 SE does not appear to apply delimiters to the output + * and does not correctly handle extremely large values. */ + ok(!strcmp(result->kb_size, szBuff) || + (result->kb_size_broken && !strcmp(result->kb_size2, szBuff)), "Formatted %x%08x wrong: got %s, expected %s\n", (LONG)(result->value >> 32), (LONG)result->value, szBuff, result->kb_size); result++; @@ -582,7 +588,10 @@ static void test_StrFormatKBSizeA(void) { pStrFormatKBSizeA(result->value, szBuff, 256); - ok(!strcmp(result->kb_size, szBuff), + /* shlwapi on Win98 SE does not appear to apply delimiters to the output + * and does not correctly handle extremely large values. */ + ok(!strcmp(result->kb_size, szBuff) || + (result->kb_size_broken && !strcmp(result->kb_size2, szBuff)), "Formatted %x%08x wrong: got %s, expected %s\n", (LONG)(result->value >> 32), (LONG)result->value, szBuff, result->kb_size); result++;

1 0