wine-commits April 2017

wine-commits@winehq.org

2 participants
757 discussions

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

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

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

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

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

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

Daniel Lehman : msvcp140: Add __crtFlushProcessWriteBuffers.
by Alexandre Julliard 03 Apr '17

03 Apr '17

Module: wine Branch: master Commit: d22569e83c166eedd99dabf0f8b00935575eb3b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d22569e83c166eedd99dabf0f… Author: Daniel Lehman <dlehman(a)esri.com> Date: Fri Mar 31 16:04:32 2017 -0700 msvcp140: Add __crtFlushProcessWriteBuffers. 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/msvcp140/msvcp140.spec | 2 +- dlls/msvcp90/misc.c | 8 ++++++++ include/winbase.h | 1 + 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index 15b558df..14e0fa1 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3762,7 +3762,7 @@ @ stub __crtCreateSymbolicLinkW @ cdecl __crtCreateThreadpoolTimer(ptr ptr ptr) MSVCP__crtCreateThreadpoolTimer @ cdecl __crtCreateThreadpoolWait(ptr ptr ptr) MSVCP__crtCreateThreadpoolWait -@ stub __crtFlushProcessWriteBuffers +@ cdecl __crtFlushProcessWriteBuffers() MSVCP__crtFlushProcessWriteBuffers @ cdecl __crtFreeLibraryWhenCallbackReturns(ptr ptr) MSVCP__crtFreeLibraryWhenCallbackReturns @ cdecl __crtGetCurrentProcessorNumber() MSVCP__crtGetCurrentProcessorNumber @ stub __crtGetFileInformationByHandleEx diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index 7d9c408..9f3724a 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -1263,6 +1263,14 @@ DWORD CDECL MSVCP__crtGetCurrentProcessorNumber(void) } /********************************************************************* + * __crtFlushProcessWriteBuffers (MSVCP140.@) + */ +VOID CDECL MSVCP__crtFlushProcessWriteBuffers(void) +{ + return FlushProcessWriteBuffers(); +} + +/********************************************************************* * __crtCreateSemaphoreExW (MSVCP140.@) */ HANDLE CDECL MSVCP__crtCreateSemaphoreExW( diff --git a/include/winbase.h b/include/winbase.h index b7f86a2..67c29b5 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1985,6 +1985,7 @@ WINBASEAPI PVOID WINAPI FlsGetValue(DWORD); WINBASEAPI BOOL WINAPI FlsSetValue(DWORD,PVOID); WINBASEAPI BOOL WINAPI FlushFileBuffers(HANDLE); WINBASEAPI BOOL WINAPI FlushInstructionCache(HANDLE,LPCVOID,SIZE_T); +WINBASEAPI VOID WINAPI FlushProcessWriteBuffers(void); WINBASEAPI BOOL WINAPI FlushViewOfFile(LPCVOID,SIZE_T); WINBASEAPI DWORD WINAPI FormatMessageA(DWORD,LPCVOID,DWORD,DWORD,LPSTR,DWORD,__ms_va_list*); WINBASEAPI DWORD WINAPI FormatMessageW(DWORD,LPCVOID,DWORD,DWORD,LPWSTR,DWORD,__ms_va_list*);

1 0

Daniel Lehman : msvcp140: Add __crtGetCurrentProcessorNumber.
by Alexandre Julliard 03 Apr '17

03 Apr '17

Module: wine Branch: master Commit: e437438a1248280e133dbcd2de2b022c93ee685d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e437438a1248280e133dbcd2d… Author: Daniel Lehman <dlehman(a)esri.com> Date: Fri Mar 31 14:18:27 2017 -0700 msvcp140: Add __crtGetCurrentProcessorNumber. 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/msvcp140/msvcp140.spec | 2 +- dlls/msvcp90/misc.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index 81a3902..15b558df 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3764,7 +3764,7 @@ @ cdecl __crtCreateThreadpoolWait(ptr ptr ptr) MSVCP__crtCreateThreadpoolWait @ stub __crtFlushProcessWriteBuffers @ cdecl __crtFreeLibraryWhenCallbackReturns(ptr ptr) MSVCP__crtFreeLibraryWhenCallbackReturns -@ stub __crtGetCurrentProcessorNumber +@ cdecl __crtGetCurrentProcessorNumber() MSVCP__crtGetCurrentProcessorNumber @ stub __crtGetFileInformationByHandleEx @ stub __crtGetLocaleInfoEx @ stub __crtGetSystemTimePreciseAsFileTime diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index b358656..7d9c408 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -1255,6 +1255,14 @@ ULONGLONG CDECL MSVCP__crtGetTickCount64(void) } /********************************************************************* + * __crtGetCurrentProcessorNumber (MSVCP140.@) + */ +DWORD CDECL MSVCP__crtGetCurrentProcessorNumber(void) +{ + return GetCurrentProcessorNumber(); +} + +/********************************************************************* * __crtCreateSemaphoreExW (MSVCP140.@) */ HANDLE CDECL MSVCP__crtCreateSemaphoreExW(

1 0

Daniel Lehman : msvcp140: Add __crtFreeLibraryWhenCallbackReturns.
by Alexandre Julliard 03 Apr '17

03 Apr '17

Module: wine Branch: master Commit: e54654ef3f00a49d31e04e1674ade03f412fb718 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e54654ef3f00a49d31e04e167… Author: Daniel Lehman <dlehman(a)esri.com> Date: Fri Mar 31 17:10:26 2017 -0700 msvcp140: Add __crtFreeLibraryWhenCallbackReturns. 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/msvcp140/msvcp140.spec | 2 +- dlls/msvcp90/misc.c | 9 +++++++++ include/winbase.h | 1 + 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index c32514a..81a3902 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3763,7 +3763,7 @@ @ cdecl __crtCreateThreadpoolTimer(ptr ptr ptr) MSVCP__crtCreateThreadpoolTimer @ cdecl __crtCreateThreadpoolWait(ptr ptr ptr) MSVCP__crtCreateThreadpoolWait @ stub __crtFlushProcessWriteBuffers -@ stub __crtFreeLibraryWhenCallbackReturns +@ cdecl __crtFreeLibraryWhenCallbackReturns(ptr ptr) MSVCP__crtFreeLibraryWhenCallbackReturns @ stub __crtGetCurrentProcessorNumber @ stub __crtGetFileInformationByHandleEx @ stub __crtGetLocaleInfoEx diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index 7b97b5c..b358656 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -1332,6 +1332,15 @@ VOID CDECL MSVCP__crtSetThreadpoolWait(TP_WAIT *wait, HANDLE handle, FILETIME *d return SetThreadpoolWait(wait, handle, due_time); } +/********************************************************************* + * __crtFreeLibraryWhenCallbackReturns (MSVCP140.@) + */ +VOID CDECL MSVCP__crtFreeLibraryWhenCallbackReturns(PTP_CALLBACK_INSTANCE instance, HMODULE mod) +{ + TRACE("(%p %p)\n", instance, mod); + FreeLibraryWhenCallbackReturns(instance, mod); +} + /* ?_Execute_once@std@@YAHAAUonce_flag@1@P6GHPAX1PAPAX@Z1@Z */ /* ?_Execute_once@std@@YAHAEAUonce_flag@1@P6AHPEAX1PEAPEAX@Z1@Z */ BOOL __cdecl _Execute_once(INIT_ONCE *flag, PINIT_ONCE_FN func, void *param) diff --git a/include/winbase.h b/include/winbase.h index 25e5077..b7f86a2 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1994,6 +1994,7 @@ WINBASEAPI BOOL WINAPI FreeEnvironmentStringsW(LPWSTR); #define FreeEnvironmentStrings WINELIB_NAME_AW(FreeEnvironmentStrings) WINBASEAPI BOOL WINAPI FreeLibrary(HMODULE); WINBASEAPI VOID DECLSPEC_NORETURN WINAPI FreeLibraryAndExitThread(HINSTANCE,DWORD); +WINBASEAPI VOID WINAPI FreeLibraryWhenCallbackReturns(PTP_CALLBACK_INSTANCE,HMODULE); #define FreeModule(handle) FreeLibrary(handle) #define FreeProcInstance(proc) /*nothing*/ WINBASEAPI BOOL WINAPI FreeResource(HGLOBAL);

1 0

← Newer
1
...
69
70
71
72
73
74
75
76
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 April 2017