April 2017 - Wine-commits - list.winehq.org

Daniel Lehman : msvcr120: Add __crtSleep.
by Alexandre Julliard 03 Apr '17

03 Apr '17

Module: wine Branch: master Commit: b5465d9605c2195bfdc0072f2116932d03cf5878 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5465d9605c2195bfdc0072f2… Author: Daniel Lehman <dlehman(a)esri.com> Date: Fri Mar 31 15:20:32 2017 -0700 msvcr120: Add __crtSleep. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcrt/misc.c | 9 +++++++++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 3ae8098..b58ad8b 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -919,7 +919,7 @@ @ stub -arch=i386,win64 __crtSetThreadStackGuarantee @ cdecl __crtSetUnhandledExceptionFilter(ptr) MSVCR110__crtSetUnhandledExceptionFilter @ cdecl -arch=i386,win64 __crtTerminateProcess(long) MSVCR110__crtTerminateProcess -@ stub __crtSleep +@ cdecl __crtSleep(long) MSVCRT__crtSleep @ cdecl -arch=i386,win64 __crtUnhandledException(ptr) MSVCRT__crtUnhandledException @ cdecl __daylight() MSVCRT___p__daylight @ cdecl __dllonexit(ptr ptr ptr) diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 6d48f74..0b896aa 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -895,7 +895,7 @@ @ stub __crtIsPackagedApp @ cdecl __crtLCMapStringA(long long str long ptr long long long) msvcr120.__crtLCMapStringA @ cdecl __crtLCMapStringW(long long wstr long ptr long long long) msvcr120.__crtLCMapStringW -@ stub __crtSleep +@ cdecl __crtSleep(long) msvcr120.__crtSleep @ stub __crtWaitForWinRTThreadExit @ cdecl __daylight() msvcr120.__daylight @ cdecl __dllonexit(ptr ptr ptr) msvcr120.__dllonexit diff --git a/dlls/msvcrt/misc.c b/dlls/msvcrt/misc.c index 767972f..9e38364 100644 --- a/dlls/msvcrt/misc.c +++ b/dlls/msvcrt/misc.c @@ -542,3 +542,12 @@ LONG CDECL MSVCRT__crtUnhandledException(EXCEPTION_POINTERS *ep) SetUnhandledExceptionFilter(NULL); return UnhandledExceptionFilter(ep); } + +/********************************************************************* + * __crtSleep (MSVCR120.@) + */ +void CDECL MSVCRT__crtSleep(DWORD timeout) +{ + TRACE("(%u)\n", timeout); + Sleep(timeout); +}

1 0

Francois Gouget : msvcp140/tests: Make chore_callback() static.
by Alexandre Julliard 03 Apr '17

03 Apr '17

Module: wine Branch: master Commit: 39314912556f7f68c6a173d3a010a91eb6ec1729 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39314912556f7f68c6a173d3a… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Apr 1 14:36:42 2017 +0200 msvcp140/tests: Make chore_callback() static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140/tests/msvcp140.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcp140/tests/msvcp140.c b/dlls/msvcp140/tests/msvcp140.c index 6d1a5f8..1419669 100644 --- a/dlls/msvcp140/tests/msvcp140.c +++ b/dlls/msvcp140/tests/msvcp140.c @@ -410,7 +410,7 @@ static void test__TaskEventLogger(void) ok(logger.started, "logger.started = FALSE\n"); } -void __cdecl chore_callback(void *arg) +static void __cdecl chore_callback(void *arg) { HANDLE event = arg; SetEvent(event);

1 0

Francois Gouget : msvcp90: {init, free}_misc() are only used with msvcp >= 100.
by Alexandre Julliard 03 Apr '17

03 Apr '17

Module: wine Branch: master Commit: 459134b855f4cad5cb83336d7dca9b5f84b08e23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=459134b855f4cad5cb83336d7… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Apr 1 14:36:29 2017 +0200 msvcp90: {init,free}_misc() are only used with msvcp >= 100. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/misc.c | 2 ++ dlls/msvcp90/msvcp_main.c | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index 9f3724a..828c4c2 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -1364,6 +1364,7 @@ BOOL __cdecl _Execute_once(INIT_ONCE *flag, PINIT_ONCE_FN func, void *param) return InitOnceExecuteOnce(flag, func, param, NULL); } +#if _MSVCP_VER >= 100 void init_misc(void *base) { #ifdef __x86_64__ @@ -1393,6 +1394,7 @@ void free_misc(void) HeapFree(GetProcessHeap(), 0, broadcast_at_thread_exit.to_broadcast); #endif } +#endif #if _MSVCP_VER >= 140 LONGLONG __cdecl _Query_perf_counter(void) diff --git a/dlls/msvcp90/msvcp_main.c b/dlls/msvcp90/msvcp_main.c index 3898c9d..8eb1e21 100644 --- a/dlls/msvcp90/msvcp_main.c +++ b/dlls/msvcp90/msvcp_main.c @@ -209,14 +209,18 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) init_exception(hinstDLL); init_locale(hinstDLL); init_io(hinstDLL); +#if _MSVCP_VER >= 100 init_misc(hinstDLL); +#endif break; case DLL_PROCESS_DETACH: if (lpvReserved) break; free_io(); free_locale(); free_lockit(); +#if _MSVCP_VER >= 100 free_misc(); +#endif break; }

1 0

Hugh McMaster : regedit/tests: Add import tests with various combinations of spaces and tabs.
by Alexandre Julliard 03 Apr '17

03 Apr '17

Module: wine Branch: master Commit: 0b513778c70943d153624d8d65ebf94276c6c229 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b513778c70943d153624d8d6… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Apr 3 12:01:51 2017 +0000 regedit/tests: Add import tests with various combinations of spaces and tabs. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 112 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 112 insertions(+) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 37ac2c1..354ddac 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -643,6 +643,117 @@ static void test_comments(void) ok(lr == ERROR_SUCCESS, "RegDeleteKeyA failed: %d\n", lr); } +static void test_import_with_whitespace(void) +{ + HKEY hkey; + LONG lr; + DWORD dword; + + exec_import_str(" REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n\n"); + + lr = RegOpenKeyExA(HKEY_CURRENT_USER, KEY_BASE, 0, KEY_READ, &hkey); + ok(lr == ERROR_SUCCESS, "RegOpenKeyExA failed: got %d, expected 0\n", lr); + + exec_import_str(" REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine1a\"=\"Value\"\n\n"); + verify_reg(hkey, "Wine1a", REG_SZ, "Value", 6, 0); + + exec_import_str("\tREGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine1b\"=\"Value\"\n\n"); + verify_reg(hkey, "Wine1b", REG_SZ, "Value", 6, 0); + + exec_import_str(" \t REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine1c\"=\"Value\"\n\n"); + verify_reg(hkey, "Wine1c", REG_SZ, "Value", 6, 0); + + exec_import_str("REGEDIT4\n\n" + " [HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine2a\"=\"Value\"\n\n"); + todo_wine verify_reg(hkey, "Wine2a", REG_SZ, "Value", 6, 0); + + exec_import_str("REGEDIT4\n\n" + "\t[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine2b\"=\"Value\"\n\n"); + todo_wine verify_reg(hkey, "Wine2b", REG_SZ, "Value", 6, 0); + + exec_import_str("REGEDIT4\n\n" + " \t [HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine2c\"=\"Value\"\n\n"); + todo_wine verify_reg(hkey, "Wine2c", REG_SZ, "Value", 6, 0); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + " \"Wine3a\"=\"Two leading spaces\"\n\n"); + todo_wine verify_reg(hkey, "Wine3a", REG_SZ, "Two leading spaces", 19, 0); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\t\"Wine3b\"=\"One leading tab\"\n\n"); + todo_wine verify_reg(hkey, "Wine3b", REG_SZ, "One leading tab", 16, 0); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + " \t \"Wine3c\"=\"Space, tab, space\"\n\n"); + todo_wine verify_reg(hkey, "Wine3c", REG_SZ, "Space, tab, space", 18, 0); + + exec_import_str(" REGEDIT4\n\n" + "\t\t\t[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\t \"Wine4a\"=\"Tab and four spaces\"\n" + " \"Wine4b\"=dword:00112233\n" + "\t \t \t \t \t \t \"Wine4c\"=hex(7):4c,69,6e,65,20,\\\n" + " 63,6f,6e,\\;comment\n" + "\t\t\t\t63,61,74,\\;comment\n" + " \t65,6e,61,74,69,6f,6e,00,00\n\n"); + todo_wine verify_reg(hkey, "Wine4a", REG_SZ, "Tab and four spaces", 20, 0); + dword = 0x112233; + todo_wine verify_reg(hkey, "Wine4b", REG_DWORD, &dword, sizeof(dword), 0); + todo_wine verify_reg(hkey, "Wine4c", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + + exec_import_str(" REGEDIT4\n\n" + "\t[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + " \"Wine5a\"=\"Leading spaces\"\n" + "\t\t\"Wine5b\"\t\t=\"Leading tabs\"\n" + "\t \"Wine5c\"=\t \"Tabs and spaces\"\n" + " \"Wine5d\" \t = \t \"More whitespace\"\n\n"); + todo_wine verify_reg(hkey, "Wine5a", REG_SZ, "Leading spaces", 15, 0); + todo_wine verify_reg(hkey, "Wine5b", REG_SZ, "Leading tabs", 13, 0); + todo_wine verify_reg(hkey, "Wine5c", REG_SZ, "Tabs and spaces", 16, 0); + todo_wine verify_reg(hkey, "Wine5d", REG_SZ, "More whitespace", 16, 0); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\" Wine6a\"=\"Leading spaces\"\n" + "\"\t\tWine6b\"=\"Leading tabs\"\n" + " \" Wine6c \" = \" Spaces everywhere \" \n\n"); + verify_reg(hkey, " Wine6a", REG_SZ, "Leading spaces", 15, 0); + verify_reg(hkey, "\t\tWine6b", REG_SZ, "Leading tabs", 13, 0); + todo_wine verify_reg(hkey, " Wine6c ", REG_SZ, " Spaces everywhere ", 22, 0); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine7a\"=\" Four spaces in the data\"\n" + "\"Wine7b\"=\"\t\tTwo tabs in the data\"\n\n"); + verify_reg(hkey, "Wine7a", REG_SZ, " Four spaces in the data", 28, 0); + verify_reg(hkey, "Wine7b", REG_SZ, "\t\tTwo tabs in the data", 23, 0); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine8a\"=\"Trailing spaces\" \n" + "\"Wine8b\"=\"Trailing tabs and spaces\"\t \t\n\n"); + verify_reg(hkey, "Wine8a", REG_SZ, "Trailing spaces", 16, 0); + verify_reg(hkey, "Wine8b", REG_SZ, "Trailing tabs and spaces", 25, 0); + + lr = RegCloseKey(hkey); + ok(lr == ERROR_SUCCESS, "RegCloseKey failed: got %d, expected 0\n", lr); + + lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); + ok(lr == ERROR_SUCCESS, "RegDeleteKeyA failed: got %d, expected 0\n", lr); +} + START_TEST(regedit) { WCHAR wchar_test[] = {0xFEFF,'W','i','n','d','o','w','s',' ','R','e','g', @@ -660,4 +771,5 @@ START_TEST(regedit) test_basic_import_31(); test_invalid_import(); test_comments(); + test_import_with_whitespace(); }

1 0

Hugh McMaster : regedit: Skip any leading spaces and tabs that may be present in the line being parsed.
by Alexandre Julliard 03 Apr '17

03 Apr '17

Module: wine Branch: master Commit: aacae1960299875160f1552b45bc3e3c3e2527a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aacae1960299875160f1552b4… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Apr 3 12:02:14 2017 +0000 regedit: Skip any leading spaces and tabs that may be present in the line being parsed. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 2 ++ programs/regedit/tests/regedit.c | 26 +++++++++++++------------- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 5610c87..e0049c6 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -748,6 +748,7 @@ static char *get_lineA(FILE *fp) next = line; continue; } + while (*line == ' ' || *line == '\t') line++; if (*line == ';' || *line == '#') { line = next; @@ -859,6 +860,7 @@ static WCHAR *get_lineW(FILE *fp) next = line; continue; } + while (*line == ' ' || *line == '\t') line++; if (*line == ';' || *line == '#') { line = next; diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 354ddac..bbe5c4b 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -673,32 +673,32 @@ static void test_import_with_whitespace(void) exec_import_str("REGEDIT4\n\n" " [HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Wine2a\"=\"Value\"\n\n"); - todo_wine verify_reg(hkey, "Wine2a", REG_SZ, "Value", 6, 0); + verify_reg(hkey, "Wine2a", REG_SZ, "Value", 6, 0); exec_import_str("REGEDIT4\n\n" "\t[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Wine2b\"=\"Value\"\n\n"); - todo_wine verify_reg(hkey, "Wine2b", REG_SZ, "Value", 6, 0); + verify_reg(hkey, "Wine2b", REG_SZ, "Value", 6, 0); exec_import_str("REGEDIT4\n\n" " \t [HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Wine2c\"=\"Value\"\n\n"); - todo_wine verify_reg(hkey, "Wine2c", REG_SZ, "Value", 6, 0); + verify_reg(hkey, "Wine2c", REG_SZ, "Value", 6, 0); exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" " \"Wine3a\"=\"Two leading spaces\"\n\n"); - todo_wine verify_reg(hkey, "Wine3a", REG_SZ, "Two leading spaces", 19, 0); + verify_reg(hkey, "Wine3a", REG_SZ, "Two leading spaces", 19, 0); exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\t\"Wine3b\"=\"One leading tab\"\n\n"); - todo_wine verify_reg(hkey, "Wine3b", REG_SZ, "One leading tab", 16, 0); + verify_reg(hkey, "Wine3b", REG_SZ, "One leading tab", 16, 0); exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" " \t \"Wine3c\"=\"Space, tab, space\"\n\n"); - todo_wine verify_reg(hkey, "Wine3c", REG_SZ, "Space, tab, space", 18, 0); + verify_reg(hkey, "Wine3c", REG_SZ, "Space, tab, space", 18, 0); exec_import_str(" REGEDIT4\n\n" "\t\t\t[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -708,9 +708,9 @@ static void test_import_with_whitespace(void) " 63,6f,6e,\\;comment\n" "\t\t\t\t63,61,74,\\;comment\n" " \t65,6e,61,74,69,6f,6e,00,00\n\n"); - todo_wine verify_reg(hkey, "Wine4a", REG_SZ, "Tab and four spaces", 20, 0); + verify_reg(hkey, "Wine4a", REG_SZ, "Tab and four spaces", 20, 0); dword = 0x112233; - todo_wine verify_reg(hkey, "Wine4b", REG_DWORD, &dword, sizeof(dword), 0); + verify_reg(hkey, "Wine4b", REG_DWORD, &dword, sizeof(dword), 0); todo_wine verify_reg(hkey, "Wine4c", REG_MULTI_SZ, "Line concatenation\0", 20, 0); exec_import_str(" REGEDIT4\n\n" @@ -719,10 +719,10 @@ static void test_import_with_whitespace(void) "\t\t\"Wine5b\"\t\t=\"Leading tabs\"\n" "\t \"Wine5c\"=\t \"Tabs and spaces\"\n" " \"Wine5d\" \t = \t \"More whitespace\"\n\n"); - todo_wine verify_reg(hkey, "Wine5a", REG_SZ, "Leading spaces", 15, 0); - todo_wine verify_reg(hkey, "Wine5b", REG_SZ, "Leading tabs", 13, 0); - todo_wine verify_reg(hkey, "Wine5c", REG_SZ, "Tabs and spaces", 16, 0); - todo_wine verify_reg(hkey, "Wine5d", REG_SZ, "More whitespace", 16, 0); + verify_reg(hkey, "Wine5a", REG_SZ, "Leading spaces", 15, 0); + verify_reg(hkey, "Wine5b", REG_SZ, "Leading tabs", 13, 0); + verify_reg(hkey, "Wine5c", REG_SZ, "Tabs and spaces", 16, 0); + verify_reg(hkey, "Wine5d", REG_SZ, "More whitespace", 16, 0); exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -731,7 +731,7 @@ static void test_import_with_whitespace(void) " \" Wine6c \" = \" Spaces everywhere \" \n\n"); verify_reg(hkey, " Wine6a", REG_SZ, "Leading spaces", 15, 0); verify_reg(hkey, "\t\tWine6b", REG_SZ, "Leading tabs", 13, 0); - todo_wine verify_reg(hkey, " Wine6c ", REG_SZ, " Spaces everywhere ", 22, 0); + verify_reg(hkey, " Wine6c ", REG_SZ, " Spaces everywhere ", 22, 0); exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"

1 0

Hugh McMaster : reg/tests: Add import tests with various combinations of spaces and tabs.
by Alexandre Julliard 03 Apr '17

03 Apr '17

Module: wine Branch: master Commit: 19d8fcc42e4ce7cedd171f50340eb5482cd89bca URL: http://source.winehq.org/git/wine.git/?a=commit;h=19d8fcc42e4ce7cedd171f503… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Apr 3 12:02:04 2017 +0000 reg/tests: Add import tests with various combinations of spaces and tabs. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 246 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 246 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=19d8fcc42e4ce7cedd171…

1 0

Aric Stewart : kernel32: Improve locale detection on Android.
by Alexandre Julliard 03 Apr '17

03 Apr '17

Module: wine Branch: master Commit: 9dc5d299f11c599862d39af3e32d92e787c1ae7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9dc5d299f11c599862d39af3e… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Mar 30 12:56:38 2017 -0500 kernel32: Improve locale detection on Android. setlocale is coded to just return 'C' for all inquiries ignoring locale that may be set in the environment. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index e14aedb..a72a8aa 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -985,6 +985,15 @@ static const char* get_locale(int category, const char* category_name) { const char* ret = setlocale(category, NULL); +#ifdef __ANDROID__ + if (!strcmp(ret, "C")) + { + ret = getenv( category_name ); + if (!ret || !ret[0]) ret = getenv( "LC_ALL" ); + if (!ret || !ret[0]) ret = "C"; + } +#endif + #ifdef __APPLE__ /* If LC_ALL is set, respect it as a user override. If LC_* is set, respect it as a user override, except if it's LC_CTYPE

1 0

Nikolay Sivov : usp10: Handle invalid arguments in ScriptIsComplex().
by Alexandre Julliard 03 Apr '17

03 Apr '17

Module: wine Branch: master Commit: 04e5466e12d0ae8088e83ef7a9b9d28d92e6a203 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04e5466e12d0ae8088e83ef7a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Apr 1 18:16:10 2017 +0300 usp10: Handle invalid arguments in ScriptIsComplex(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/tests/usp10.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/usp10/usp10.c | 3 +++ 2 files changed, 67 insertions(+) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 1b2ba6f..d302714 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -3911,6 +3911,68 @@ static void test_ScriptGetLogicalWidths(void) } } +static void test_ScriptIsComplex(void) +{ + static const WCHAR testW[] = {0x202a,'1',0x202c,0}; + static const WCHAR test2W[] = {'1',0}; + static const struct complex_test + { + const WCHAR *text; + DWORD flags; + HRESULT hr; + BOOL todo; + } complex_tests[] = + { + { test2W, SIC_ASCIIDIGIT, S_OK }, + { test2W, SIC_COMPLEX, S_FALSE }, + { test2W, SIC_COMPLEX | SIC_ASCIIDIGIT, S_OK }, + { testW, SIC_NEUTRAL | SIC_COMPLEX, S_OK }, + { testW, SIC_NEUTRAL, S_FALSE, TRUE }, + { testW, SIC_COMPLEX, S_OK }, + { testW, 0, S_FALSE }, + }; + unsigned int i; + HRESULT hr; + + hr = ScriptIsComplex(NULL, 0, 0); + ok(hr == E_INVALIDARG || broken(hr == S_FALSE) /* winxp/vista */, "got 0x%08x\n", hr); + + if (hr == E_INVALIDARG) + { + hr = ScriptIsComplex(NULL, 1, 0); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + } + + hr = ScriptIsComplex(test2W, -1, SIC_ASCIIDIGIT); + ok(hr == E_INVALIDARG || broken(hr == S_FALSE) /* winxp/vista */, "got 0x%08x\n", hr); + + hr = ScriptIsComplex(test2W, 0, SIC_ASCIIDIGIT); + ok(hr == S_FALSE, "got 0x%08x\n", hr); + + for (i = 0; i < sizeof(complex_tests)/sizeof(complex_tests[0]); i++) + { + hr = ScriptIsComplex(complex_tests[i].text, lstrlenW(complex_tests[i].text), complex_tests[i].flags); + todo_wine_if(complex_tests[i].todo) + ok(hr == complex_tests[i].hr, "%u: got %#x, expected %#x, flags %#x\n", i, hr, complex_tests[i].hr, + complex_tests[i].flags); + } + + hr = ScriptIsComplex(test2W, 1, ~0u); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = ScriptIsComplex(testW, 3, 0); + ok(hr == S_FALSE, "got 0x%08x\n", hr); + + hr = ScriptIsComplex(testW, 3, SIC_NEUTRAL | SIC_COMPLEX); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = ScriptIsComplex(testW, 3, SIC_COMPLEX); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = ScriptIsComplex(test2W, 1, SIC_COMPLEX); + ok(hr == S_FALSE, "got 0x%08x\n", hr); +} + START_TEST(usp10) { HWND hwnd; @@ -3966,6 +4028,8 @@ START_TEST(usp10) test_ScriptGetFontFunctions(hdc); test_ScriptGetLogicalWidths(); + test_ScriptIsComplex(); + ReleaseDC(hwnd, hdc); DestroyWindow(hwnd); } diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 2df27be..c1d9c1c 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -3019,6 +3019,9 @@ HRESULT WINAPI ScriptIsComplex(const WCHAR *chars, int len, DWORD flag) TRACE("(%s,%d,0x%x)\n", debugstr_wn(chars, len), len, flag); + if (!chars || len < 0) + return E_INVALIDARG; + for (i = 0; i < len; i+=consumed) { if (i >= len)

1 0

Piotr Caban : msvcrt: Add CurrentScheduler:: GetNumberOfVirtualProcessors implementation.
by Alexandre Julliard 03 Apr '17

03 Apr '17

Module: wine Branch: master Commit: 2d4be5cb35616552eb96cbf42996642c78626c5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d4be5cb35616552eb96cbf42… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 3 15:05:42 2017 +0200 msvcrt: Add CurrentScheduler::GetNumberOfVirtualProcessors implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/scheduler.c | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/scheduler.c b/dlls/msvcrt/scheduler.c index b5dc2f8..ff5cf6f 100644 --- a/dlls/msvcrt/scheduler.c +++ b/dlls/msvcrt/scheduler.c @@ -116,6 +116,7 @@ typedef struct Scheduler { const vtable_ptr *vtable; } Scheduler; #define call_Scheduler_Id(this) CALL_VTBL_FUNC(this, 4, unsigned int, (const Scheduler*), (this)) +#define call_Scheduler_GetNumberOfVirtualProcessors(this) CALL_VTBL_FUNC(this, 8, unsigned int, (const Scheduler*), (this)) #define call_Scheduler_Reference(this) CALL_VTBL_FUNC(this, 16, unsigned int, (Scheduler*), (this)) #define call_Scheduler_Release(this) CALL_VTBL_FUNC(this, 20, unsigned int, (Scheduler*), (this)) #define call_Scheduler_Attach(this) CALL_VTBL_FUNC(this, 28, void, (Scheduler*), (this)) @@ -181,6 +182,20 @@ static Context* get_current_context(void) return ret; } +static Scheduler* try_get_current_scheduler(void) +{ + ExternalContextBase *context = (ExternalContextBase*)try_get_current_context(); + + if (!context) + return NULL; + + if (context->context.vtable != &MSVCRT_ExternalContextBase_vtable) { + ERR("unknown context set\n"); + return NULL; + } + return context->scheduler.scheduler; +} + /* ?CurrentContext(a)Context@Concurrency@@SAPAV12(a)XZ */ /* ?CurrentContext(a)Context@Concurrency@@SAPEAV12(a)XZ */ Context* __cdecl Context_CurrentContext(void) @@ -240,7 +255,7 @@ unsigned int __cdecl Context_ScheduleGroupId(void) unsigned int __cdecl Context_VirtualProcessorId(void) { Context *ctx = try_get_current_context(); - FIXME("()\n"); + TRACE("()\n"); return ctx ? call_Context_GetVirtualProcessorId(ctx) : -1; } @@ -889,8 +904,11 @@ Scheduler* __cdecl CurrentScheduler_Get(void) /* ?GetNumberOfVirtualProcessors(a)CurrentScheduler@Concurrency@@SAIXZ */ unsigned int __cdecl CurrentScheduler_GetNumberOfVirtualProcessors(void) { - FIXME("() stub\n"); - return 0; + Scheduler *scheduler = try_get_current_scheduler(); + TRACE("()\n"); + if(!scheduler) + return -1; + return call_Scheduler_GetNumberOfVirtualProcessors(scheduler); } /* ?GetPolicy(a)CurrentScheduler@Concurrency@@SA?AVSchedulerPolicy(a)2@XZ */

1 0

Henri Verbeet : wined3d: Use resource.map_binding as destination location for blits to WINED3D_POOL_SYSTEM_MEM textures.
by Alexandre Julliard 03 Apr '17

03 Apr '17

Module: wine Branch: master Commit: 5e40695310739ea7d34703c7a961fb313f043ead URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e40695310739ea7d34703c7a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 3 07:39:46 2017 +0200 wined3d: Use resource.map_binding as destination location for blits to WINED3D_POOL_SYSTEM_MEM textures. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 237b604..5031fcb 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3405,6 +3405,7 @@ HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst struct wined3d_swapchain *src_swapchain, *dst_swapchain; DWORD src_ds_flags, dst_ds_flags; BOOL scale, convert; + DWORD dst_location; static const DWORD simple_blit = WINED3D_BLT_ASYNC | WINED3D_BLT_SRC_CKEY @@ -3511,17 +3512,19 @@ HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst src_rect, src_texture->resource.usage, src_texture->resource.pool, src_texture->resource.format, dst_rect, dst_texture->resource.usage, dst_texture->resource.pool, dst_texture->resource.format))) { + if (dst_texture->resource.pool == WINED3D_POOL_SYSTEM_MEM) + dst_location = dst_texture->resource.map_binding; + else + dst_location = dst_texture->resource.draw_binding; + context = context_acquire(device, dst_texture, dst_sub_resource_idx); blitter->blit_surface(device, WINED3D_BLIT_OP_DEPTH_BLIT, context, src_surface, src_texture->resource.draw_binding, src_rect, - dst_surface, dst_texture->resource.draw_binding, dst_rect, - NULL, filter); + dst_surface, dst_location, dst_rect, NULL, filter); context_release(context); - wined3d_texture_validate_location(dst_texture, dst_sub_resource_idx, - dst_texture->resource.draw_binding); - wined3d_texture_invalidate_location(dst_texture, dst_sub_resource_idx, - ~dst_texture->resource.draw_binding); + wined3d_texture_validate_location(dst_texture, dst_sub_resource_idx, dst_location); + wined3d_texture_invalidate_location(dst_texture, dst_sub_resource_idx, ~dst_location); return WINED3D_OK; } @@ -3620,17 +3623,19 @@ HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst { struct wined3d_context *context; + if (dst_texture->resource.pool == WINED3D_POOL_SYSTEM_MEM) + dst_location = dst_texture->resource.map_binding; + else + dst_location = dst_texture->resource.draw_binding; + context = context_acquire(device, dst_texture, dst_sub_resource_idx); blitter->blit_surface(device, blit_op, context, src_surface, src_texture->resource.draw_binding, src_rect, - dst_surface, dst_texture->resource.draw_binding, dst_rect, - colour_key, filter); + dst_surface, dst_location, dst_rect, colour_key, filter); context_release(context); - wined3d_texture_validate_location(dst_texture, dst_sub_resource_idx, - dst_texture->resource.draw_binding); - wined3d_texture_invalidate_location(dst_texture, dst_sub_resource_idx, - ~dst_texture->resource.draw_binding); + wined3d_texture_validate_location(dst_texture, dst_sub_resource_idx, dst_location); + wined3d_texture_invalidate_location(dst_texture, dst_sub_resource_idx, ~dst_location); return WINED3D_OK; }

1 0