wine-commits April 2016

wine-commits@winehq.org

2 participants
750 discussions

Nikolay Sivov : ucrtbase: Implement _execute_onexit_table().
by Alexandre Julliard 27 Apr '16

27 Apr '16

Module: wine Branch: master Commit: f3465ecbae0b7f99008c4ad63680b7315a247eec URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3465ecbae0b7f99008c4ad63… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 27 09:21:12 2016 +0300 ucrtbase: Implement _execute_onexit_table(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-runtime-l1-1-0.spec | 2 +- dlls/msvcrt/exit.c | 27 ++++++++ dlls/ucrtbase/tests/misc.c | 74 ++++++++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 4 files changed, 103 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec b/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec index ceb4e35..e138bf6 100644 --- a/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec +++ b/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec @@ -34,7 +34,7 @@ @ cdecl _endthread() ucrtbase._endthread @ cdecl _endthreadex(long) ucrtbase._endthreadex @ cdecl _errno() ucrtbase._errno -@ stub _execute_onexit_table +@ cdecl _execute_onexit_table(ptr) ucrtbase._execute_onexit_table @ cdecl _exit(long) ucrtbase._exit @ cdecl _fpieee_flt(long ptr ptr) ucrtbase._fpieee_flt @ cdecl _fpreset() ucrtbase._fpreset diff --git a/dlls/msvcrt/exit.c b/dlls/msvcrt/exit.c index 60aa85d..9ba0891 100644 --- a/dlls/msvcrt/exit.c +++ b/dlls/msvcrt/exit.c @@ -400,6 +400,33 @@ int CDECL MSVCRT__register_onexit_function(MSVCRT__onexit_table_t *table, MSVCRT } /********************************************************************* + * _execute_onexit_table (UCRTBASE.@) + */ +int CDECL MSVCRT__execute_onexit_table(MSVCRT__onexit_table_t *table) +{ + MSVCRT__onexit_t *func; + + TRACE("(%p)\n", table); + + if (!table) + return -1; + + if (!table->_first || table->_first >= table->_last) + return 0; + + for (func = table->_last - 1; func >= table->_first; func--) + { + if (*func) + (*func)(); + } + + MSVCRT_free(table->_first); + memset(table, 0, sizeof(*table)); + MSVCRT__initialize_onexit_table(table); + return 0; +} + +/********************************************************************* * _set_purecall_handler (MSVCR71.@) */ MSVCRT_purecall_handler CDECL _set_purecall_handler(MSVCRT_purecall_handler function) diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index 0b77066..63ea465 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -37,6 +37,7 @@ typedef struct MSVCRT__onexit_table_t static int (CDECL *p_initialize_onexit_table)(MSVCRT__onexit_table_t *table); static int (CDECL *p_register_onexit_function)(MSVCRT__onexit_table_t *table, MSVCRT__onexit_t func); +static int (CDECL *p_execute_onexit_table)(MSVCRT__onexit_table_t *table); static void test__initialize_onexit_table(void) { @@ -98,8 +99,17 @@ static void test__initialize_onexit_table(void) table._first, table._last, table._end); } +static int g_onexit_called; static int CDECL onexit_func(void) { + g_onexit_called++; + return 0; +} + +static int CDECL onexit_func2(void) +{ + ok(g_onexit_called == 0, "got %d\n", g_onexit_called); + g_onexit_called++; return 0; } @@ -139,12 +149,75 @@ static void test__register_onexit_function(void) ok(f != table._last, "got %p, initial %p\n", table._last, f); } +static void test__execute_onexit_table(void) +{ + MSVCRT__onexit_table_t table; + int ret; + + if (!p_execute_onexit_table) + { + win_skip("_execute_onexit_table() is not available.\n"); + return; + } + + ret = p_execute_onexit_table(NULL); + ok(ret == -1, "got %d\n", ret); + + memset(&table, 0, sizeof(table)); + ret = p_initialize_onexit_table(&table); + ok(ret == 0, "got %d\n", ret); + + /* execute empty table */ + ret = p_execute_onexit_table(&table); + ok(ret == 0, "got %d\n", ret); + + /* same functions registered twice */ + ret = p_register_onexit_function(&table, onexit_func); + ok(ret == 0, "got %d\n", ret); + + ret = p_register_onexit_function(&table, NULL); + ok(ret == 0, "got %d\n", ret); + + ret = p_register_onexit_function(&table, onexit_func); + ok(ret == 0, "got %d\n", ret); + + ok(table._first != table._end, "got %p, %p\n", table._first, table._end); + g_onexit_called = 0; + ret = p_execute_onexit_table(&table); + ok(ret == 0, "got %d\n", ret); + ok(g_onexit_called == 2, "got %d\n", g_onexit_called); + ok(table._first == table._end, "got %p, %p\n", table._first, table._end); + + /* execute again, table is already empty */ + g_onexit_called = 0; + ret = p_execute_onexit_table(&table); + ok(ret == 0, "got %d\n", ret); + ok(g_onexit_called == 0, "got %d\n", g_onexit_called); + + /* check call order */ + memset(&table, 0, sizeof(table)); + ret = p_initialize_onexit_table(&table); + ok(ret == 0, "got %d\n", ret); + + ret = p_register_onexit_function(&table, onexit_func); + ok(ret == 0, "got %d\n", ret); + + ret = p_register_onexit_function(&table, onexit_func2); + ok(ret == 0, "got %d\n", ret); + + g_onexit_called = 0; + ret = p_execute_onexit_table(&table); + ok(ret == 0, "got %d\n", ret); + ok(g_onexit_called == 2, "got %d\n", g_onexit_called); +} + static void init(void) { HMODULE module = LoadLibraryA("ucrtbase.dll"); p_initialize_onexit_table = (void*)GetProcAddress(module, "_initialize_onexit_table"); p_register_onexit_function = (void*)GetProcAddress(module, "_register_onexit_function"); + p_execute_onexit_table = (void*)GetProcAddress(module, "_execute_onexit_table"); } START_TEST(misc) @@ -153,4 +226,5 @@ START_TEST(misc) test__initialize_onexit_table(); test__register_onexit_function(); + test__execute_onexit_table(); } diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 3ac30eb..cfb2a0a 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -279,7 +279,7 @@ @ varargs _execle(str str) @ varargs _execlp(str str) @ varargs _execlpe(str str) -@ stub _execute_onexit_table +@ cdecl _execute_onexit_table(ptr) MSVCRT__execute_onexit_table @ cdecl _execv(str ptr) @ cdecl _execve(str ptr ptr) MSVCRT__execve @ cdecl _execvp(str ptr)

1 0

Austin English : winsta: Add a stub for WinStationEnumerateW.
by Alexandre Julliard 27 Apr '16

27 Apr '16

Module: wine Branch: master Commit: 0a31f489a65230cb72ae9953c184571101b059d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a31f489a65230cb72ae9953c… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Apr 26 23:36:47 2016 -0500 winsta: Add a stub for WinStationEnumerateW. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winsta/main.c | 7 +++++++ dlls/winsta/winsta.spec | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/winsta/main.c b/dlls/winsta/main.c index a95782f..59efef2 100644 --- a/dlls/winsta/main.c +++ b/dlls/winsta/main.c @@ -91,3 +91,10 @@ BOOL WINAPI WinStationVirtualOpen( PVOID a, PVOID b, PVOID c ) SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); return FALSE; } + +BOOLEAN WINAPI WinStationEnumerateW( HANDLE server, PSESSIONIDW *sessionids, ULONG *count ) +{ + FIXME( "%p %p %p\n", server, sessionids, count ); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return FALSE; +} diff --git a/dlls/winsta/winsta.spec b/dlls/winsta/winsta.spec index 30aa6b5..20db0ca 100644 --- a/dlls/winsta/winsta.spec +++ b/dlls/winsta/winsta.spec @@ -29,7 +29,7 @@ @ stub WinStationEnumerateA @ stub WinStationEnumerateLicenses @ stub WinStationEnumerateProcesses -@ stub WinStationEnumerateW +@ stdcall WinStationEnumerateW(ptr ptr ptr) @ stub WinStationEnumerate_IndexedA @ stub WinStationEnumerate_IndexedW @ stub WinStationFreeGAPMemory

1 0

Austin English : fsutil: Add stub program.
by Alexandre Julliard 27 Apr '16

27 Apr '16

Module: wine Branch: master Commit: db77a0dba67a3a808b6dda144810957ecb8342a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db77a0dba67a3a808b6dda144… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Dec 14 00:46:30 2015 -0600 fsutil: Add stub program. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + programs/fsutil/Makefile.in | 5 +++++ programs/fsutil/main.c | 33 +++++++++++++++++++++++++++++++++ 4 files changed, 41 insertions(+) diff --git a/configure b/configure index dcec63c..5fb33d6 100755 --- a/configure +++ b/configure @@ -1462,6 +1462,7 @@ enable_expand enable_explorer enable_extrac32 enable_findstr +enable_fsutil enable_hh enable_hostname enable_icacls @@ -18215,6 +18216,7 @@ wine_fn_config_program expand enable_expand install wine_fn_config_program explorer enable_explorer clean,install wine_fn_config_program extrac32 enable_extrac32 install wine_fn_config_program findstr enable_findstr install +wine_fn_config_program fsutil enable_fsutil install wine_fn_config_program hh enable_hh install wine_fn_config_program hostname enable_hostname clean,install wine_fn_config_program icacls enable_icacls install diff --git a/configure.ac b/configure.ac index b0d94ce..597b84e 100644 --- a/configure.ac +++ b/configure.ac @@ -3463,6 +3463,7 @@ WINE_CONFIG_PROGRAM(expand,,[install]) WINE_CONFIG_PROGRAM(explorer,,[clean,install]) WINE_CONFIG_PROGRAM(extrac32,,[install]) WINE_CONFIG_PROGRAM(findstr,,[install]) +WINE_CONFIG_PROGRAM(fsutil,,[install]) WINE_CONFIG_PROGRAM(hh,,[install]) WINE_CONFIG_PROGRAM(hostname,,[clean,install]) WINE_CONFIG_PROGRAM(icacls,,[install]) diff --git a/programs/fsutil/Makefile.in b/programs/fsutil/Makefile.in new file mode 100644 index 0000000..f339c4c --- /dev/null +++ b/programs/fsutil/Makefile.in @@ -0,0 +1,5 @@ +MODULE = fsutil.exe +APPMODE = -mconsole -municode + +C_SRCS = \ + main.c diff --git a/programs/fsutil/main.c b/programs/fsutil/main.c new file mode 100644 index 0000000..2bce87e --- /dev/null +++ b/programs/fsutil/main.c @@ -0,0 +1,33 @@ +/* + * Copyright 2016 Austin English + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(fsutil); + +int wmain(int argc, WCHAR *argv[]) +{ + int i; + + WINE_FIXME("stub:"); + for (i = 0; i < argc; i++) + WINE_FIXME(" %s", wine_dbgstr_w(argv[i])); + WINE_FIXME("\n"); + + return 0; +}

1 0

Nikolay Sivov : dwrite: For object creation helpers with many arguments pack them in structures.
by Alexandre Julliard 27 Apr '16

27 Apr '16

Module: wine Branch: master Commit: 5fb8acc53659e70f0c38260c3143d88a95739411 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fb8acc53659e70f0c38260c3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 27 11:19:41 2016 +0300 dwrite: For object creation helpers with many arguments pack them in structures. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 35 ++++++++++++++++++--- dlls/dwrite/font.c | 72 +++++++++++++++++++++----------------------- dlls/dwrite/layout.c | 59 +++++++++++------------------------- dlls/dwrite/main.c | 60 ++++++++++++++++++++++++++++++------ 4 files changed, 133 insertions(+), 93 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5fb8acc53659e70f0c382…

1 0

Michael Müller : wininet/tests: Add more tests for INTERNET_INVALID_PORT_NUMBER.
by Alexandre Julliard 27 Apr '16

27 Apr '16

Module: wine Branch: master Commit: 05a10d5fc80c36f7d2ed5ab3ef733f9539e08984 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05a10d5fc80c36f7d2ed5ab3e… Author: Michael Müller <michael(a)fds-team.de> Date: Tue Apr 26 23:38:52 2016 +0200 wininet/tests: Add more tests for INTERNET_INVALID_PORT_NUMBER. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/tests/http.c | 47 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 46 insertions(+), 1 deletion(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 82fd10b..66ba526 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -5733,7 +5733,8 @@ static void test_connection_failure(void) static void test_default_service_port(void) { HINTERNET session, connect, request; - DWORD error; + DWORD size, error; + char buffer[128]; BOOL ret; session = InternetOpenA("winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); @@ -5753,6 +5754,50 @@ static void test_default_service_port(void) ok(error == ERROR_INTERNET_SECURITY_CHANNEL_ERROR || error == ERROR_INTERNET_CANNOT_CONNECT, "got %u\n", error); + size = sizeof(buffer); + memset(buffer, 0, sizeof(buffer)); + ret = HttpQueryInfoA(request, HTTP_QUERY_HOST | HTTP_QUERY_FLAG_REQUEST_HEADERS, buffer, &size, NULL); + ok(ret, "HttpQueryInfo failed with error %u\n", GetLastError()); + ok(!strcmp(buffer, "test.winehq.org:80"), "Expected test.winehg.org:80, got '%s'\n", buffer); + + InternetCloseHandle(request); + InternetCloseHandle(connect); + + connect = InternetConnectA(session, "test.winehq.org", INTERNET_INVALID_PORT_NUMBER, NULL, NULL, + INTERNET_SERVICE_HTTP, INTERNET_FLAG_SECURE, 0); + ok(connect != NULL, "InternetConnect failed\n"); + + request = HttpOpenRequestA(connect, NULL, "/", NULL, NULL, NULL, INTERNET_FLAG_SECURE, 0); + ok(request != NULL, "HttpOpenRequest failed\n"); + + ret = HttpSendRequestA(request, NULL, 0, NULL, 0); + todo_wine ok(ret, "HttpSendRequest failed with error %u\n", GetLastError()); + + size = sizeof(buffer); + memset(buffer, 0, sizeof(buffer)); + ret = HttpQueryInfoA(request, HTTP_QUERY_HOST | HTTP_QUERY_FLAG_REQUEST_HEADERS, buffer, &size, NULL); + ok(ret, "HttpQueryInfo failed with error %u\n", GetLastError()); + todo_wine ok(!strcmp(buffer, "test.winehq.org"), "Expected test.winehg.org, got '%s'\n", buffer); + + InternetCloseHandle(request); + InternetCloseHandle(connect); + + connect = InternetConnectA(session, "test.winehq.org", INTERNET_INVALID_PORT_NUMBER, NULL, NULL, + INTERNET_SERVICE_HTTP, INTERNET_FLAG_SECURE, 0); + ok(connect != NULL, "InternetConnect failed\n"); + + request = HttpOpenRequestA(connect, NULL, "/", NULL, NULL, NULL, 0, 0); + ok(request != NULL, "HttpOpenRequest failed\n"); + + ret = HttpSendRequestA(request, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed with error %u\n", GetLastError()); + + size = sizeof(buffer); + memset(buffer, 0, sizeof(buffer)); + ret = HttpQueryInfoA(request, HTTP_QUERY_HOST | HTTP_QUERY_FLAG_REQUEST_HEADERS, buffer, &size, NULL); + ok(ret, "HttpQueryInfo failed with error %u\n", GetLastError()); + todo_wine ok(!strcmp(buffer, "test.winehq.org:443"), "Expected test.winehg.org:443, got '%s'\n", buffer); + InternetCloseHandle(request); InternetCloseHandle(connect); InternetCloseHandle(session);

1 0

Nikolay Sivov : kernel32/nls: Convert most of the locale data files to UTF-8.
by Alexandre Julliard 27 Apr '16

27 Apr '16

Module: wine Branch: master Commit: d488f6b8561d01f80362ae4cd29f893b70ecd5eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=d488f6b8561d01f80362ae4cd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 25 18:33:03 2016 +0300 kernel32/nls: Convert most of the locale data files to UTF-8. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/nls/afk.nls | 4 +- dlls/kernel32/nls/ara.nls | 94 ++++++++++++++++----------------- dlls/kernel32/nls/arb.nls | 94 ++++++++++++++++----------------- dlls/kernel32/nls/are.nls | 94 ++++++++++++++++----------------- dlls/kernel32/nls/arg.nls | 94 ++++++++++++++++----------------- dlls/kernel32/nls/arh.nls | 94 ++++++++++++++++----------------- dlls/kernel32/nls/ari.nls | 94 ++++++++++++++++----------------- dlls/kernel32/nls/arj.nls | 94 ++++++++++++++++----------------- dlls/kernel32/nls/ark.nls | 94 ++++++++++++++++----------------- dlls/kernel32/nls/arl.nls | 94 ++++++++++++++++----------------- dlls/kernel32/nls/arm.nls | 94 ++++++++++++++++----------------- dlls/kernel32/nls/aro.nls | 94 ++++++++++++++++----------------- dlls/kernel32/nls/arq.nls | 94 ++++++++++++++++----------------- dlls/kernel32/nls/ars.nls | 94 ++++++++++++++++----------------- dlls/kernel32/nls/art.nls | 94 ++++++++++++++++----------------- dlls/kernel32/nls/aru.nls | 94 ++++++++++++++++----------------- dlls/kernel32/nls/ary.nls | 94 ++++++++++++++++----------------- dlls/kernel32/nls/aze.nls | 74 +++++++++++++------------- dlls/kernel32/nls/azl.nls | 22 ++++---- dlls/kernel32/nls/bel.nls | 90 ++++++++++++++++---------------- dlls/kernel32/nls/bgr.nls | 100 +++++++++++++++++------------------ dlls/kernel32/nls/brf.nls | 10 ++-- dlls/kernel32/nls/cat.nls | 14 ++--- dlls/kernel32/nls/chs.nls | 100 +++++++++++++++++------------------ dlls/kernel32/nls/cht.nls | 96 +++++++++++++++++----------------- dlls/kernel32/nls/cor.nls | 8 +-- dlls/kernel32/nls/csy.nls | 80 ++++++++++++++-------------- dlls/kernel32/nls/cym.nls | 6 +-- dlls/kernel32/nls/dan.nls | 12 ++--- dlls/kernel32/nls/dea.nls | 20 +++---- dlls/kernel32/nls/dec.nls | 8 +-- dlls/kernel32/nls/del.nls | 10 ++-- dlls/kernel32/nls/des.nls | 8 +-- dlls/kernel32/nls/deu.nls | 12 ++--- dlls/kernel32/nls/ell.nls | 94 ++++++++++++++++----------------- dlls/kernel32/nls/ena.nls | 4 +- dlls/kernel32/nls/enb.nls | 4 +- dlls/kernel32/nls/enc.nls | 4 +- dlls/kernel32/nls/eng.nls | 6 +-- dlls/kernel32/nls/eni.nls | 6 +-- dlls/kernel32/nls/enj.nls | 4 +- dlls/kernel32/nls/enl.nls | 4 +- dlls/kernel32/nls/enp.nls | 4 +- dlls/kernel32/nls/ens.nls | 4 +- dlls/kernel32/nls/ent.nls | 6 +-- dlls/kernel32/nls/enu.nls | 4 +- dlls/kernel32/nls/enw.nls | 4 +- dlls/kernel32/nls/enz.nls | 4 +- dlls/kernel32/nls/esa.nls | 18 +++---- dlls/kernel32/nls/esb.nls | 16 +++--- dlls/kernel32/nls/esc.nls | 18 +++---- dlls/kernel32/nls/esd.nls | 18 +++---- dlls/kernel32/nls/ese.nls | 16 +++--- dlls/kernel32/nls/esf.nls | 16 +++--- dlls/kernel32/nls/esg.nls | 16 +++--- dlls/kernel32/nls/esh.nls | 14 ++--- dlls/kernel32/nls/esi.nls | 16 +++--- dlls/kernel32/nls/esl.nls | 16 +++--- dlls/kernel32/nls/esm.nls | 20 +++---- dlls/kernel32/nls/esn.nls | 20 +++---- dlls/kernel32/nls/eso.nls | 16 +++--- dlls/kernel32/nls/esp.nls | 18 +++---- dlls/kernel32/nls/esr.nls | 18 +++---- dlls/kernel32/nls/ess.nls | 16 +++--- dlls/kernel32/nls/esu.nls | 16 +++--- dlls/kernel32/nls/esv.nls | 20 +++---- dlls/kernel32/nls/esy.nls | 16 +++--- dlls/kernel32/nls/esz.nls | 18 +++---- dlls/kernel32/nls/eti.nls | 24 ++++----- dlls/kernel32/nls/euq.nls | 6 +-- dlls/kernel32/nls/far.nls | 94 ++++++++++++++++----------------- dlls/kernel32/nls/fin.nls | 18 +++---- dlls/kernel32/nls/fos.nls | 26 +++++----- dlls/kernel32/nls/fra.nls | 40 +++++++------- dlls/kernel32/nls/frb.nls | 36 ++++++------- dlls/kernel32/nls/frc.nls | 38 +++++++------- dlls/kernel32/nls/frl.nls | 40 +++++++------- dlls/kernel32/nls/frm.nls | 42 +++++++-------- dlls/kernel32/nls/frs.nls | 34 ++++++------ dlls/kernel32/nls/gae.nls | 78 ++++++++++++++-------------- dlls/kernel32/nls/gdh.nls | 40 +++++++------- dlls/kernel32/nls/gdv.nls | 6 +-- dlls/kernel32/nls/glc.nls | 20 +++---- dlls/kernel32/nls/heb.nls | 124 +++++++++++++++++++++---------------------- dlls/kernel32/nls/hrv.nls | 16 +++--- dlls/kernel32/nls/hun.nls | 46 ++++++++-------- dlls/kernel32/nls/ind.nls | 4 +- dlls/kernel32/nls/isl.nls | 56 ++++++++++---------- dlls/kernel32/nls/ita.nls | 14 ++--- dlls/kernel32/nls/its.nls | 14 ++--- dlls/kernel32/nls/ivl.nls | 2 +- dlls/kernel32/nls/jpn.nls | 72 ++++++++++++------------- dlls/kernel32/nls/kkz.nls | 58 ++++++++++----------- dlls/kernel32/nls/kor.nls | 70 ++++++++++++------------- dlls/kernel32/nls/kyr.nls | 96 +++++++++++++++++----------------- dlls/kernel32/nls/lvi.nls | 30 +++++------ dlls/kernel32/nls/mki.nls | 90 ++++++++++++++++---------------- dlls/kernel32/nls/mon.nls | 60 ++++++++++----------- dlls/kernel32/nls/msb.nls | 4 +- dlls/kernel32/nls/msl.nls | 4 +- dlls/kernel32/nls/nlb.nls | 8 +-- dlls/kernel32/nls/nld.nls | 6 +-- dlls/kernel32/nls/nls.nls | 2 +- dlls/kernel32/nls/non.nls | 12 ++--- dlls/kernel32/nls/nor.nls | 26 +++++----- dlls/kernel32/nls/plk.nls | 46 ++++++++-------- dlls/kernel32/nls/ptb.nls | 30 +++++------ dlls/kernel32/nls/ptg.nls | 32 ++++++------ dlls/kernel32/nls/rmc.nls | 2 +- dlls/kernel32/nls/rus.nls | 2 +- dlls/kernel32/nls/sky.nls | 66 +++++++++++------------ dlls/kernel32/nls/slv.nls | 8 +-- dlls/kernel32/nls/sqi.nls | 26 +++++----- dlls/kernel32/nls/srb.nls | 88 +++++++++++++++---------------- dlls/kernel32/nls/srl.nls | 8 +-- dlls/kernel32/nls/sve.nls | 18 +++---- dlls/kernel32/nls/svf.nls | 22 ++++---- dlls/kernel32/nls/swk.nls | 4 +- dlls/kernel32/nls/trk.nls | 38 +++++++------- dlls/kernel32/nls/ttt.nls | 72 ++++++++++++------------- dlls/kernel32/nls/ukr.nls | 130 +++++++++++++++++++++++----------------------- dlls/kernel32/nls/urd.nls | 84 +++++++++++++++--------------- dlls/kernel32/nls/uzb.nls | 94 ++++++++++++++++----------------- dlls/kernel32/nls/uzl.nls | 8 +-- dlls/kernel32/nls/wal.nls | 28 +++++----- dlls/kernel32/nls/zhh.nls | 10 ++-- dlls/kernel32/nls/zhi.nls | 88 +++++++++++++++---------------- dlls/kernel32/nls/zhm.nls | 80 ++++++++++++++-------------- 128 files changed, 2506 insertions(+), 2506 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d488f6b8561d01f80362a…

1 0

Hugh McMaster : reg: Support recursion when querying a registry value.
by Alexandre Julliard 27 Apr '16

27 Apr '16

Module: wine Branch: master Commit: dd5da0ae640966be2ccc2ea84a6fb1b638da0f5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd5da0ae640966be2ccc2ea84… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Apr 26 12:28:24 2016 +0000 reg: Support recursion when querying a registry value. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 57 +++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 41 insertions(+), 16 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 26a1288..c9903ac 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -655,16 +655,19 @@ static WCHAR *build_subkey_path(WCHAR *path, DWORD path_len, WCHAR *subkey_name, return subkey_path; } -static int query_value(HKEY key, WCHAR *value_name, WCHAR *path) +static int query_value(HKEY key, WCHAR *value_name, WCHAR *path, BOOL recurse) { LONG rc; + DWORD num_subkeys, max_subkey_len, subkey_len; DWORD max_data_bytes, data_size; - DWORD type; + DWORD type, path_len, i; BYTE *data; WCHAR fmt[] = {'%','1','\n',0}; WCHAR newlineW[] = {'\n',0}; + WCHAR *subkey_name, *subkey_path; + HKEY subkey; - rc = RegQueryInfoKeyW(key, NULL, NULL, NULL, NULL, NULL, + rc = RegQueryInfoKeyW(key, NULL, NULL, NULL, &num_subkeys, &max_subkey_len, NULL, NULL, NULL, &max_data_bytes, NULL, NULL); if (rc) { @@ -690,11 +693,43 @@ static int query_value(HKEY key, WCHAR *value_name, WCHAR *path) HeapFree(GetProcessHeap(), 0, data); - if (rc == ERROR_FILE_NOT_FOUND) + if (!recurse) { - output_message(STRING_CANNOT_FIND); + if (rc == ERROR_FILE_NOT_FOUND) + { + output_message(STRING_CANNOT_FIND); + return 1; + } + return 0; + } + + max_subkey_len++; + subkey_name = HeapAlloc(GetProcessHeap(), 0, max_subkey_len * sizeof(WCHAR)); + if (!subkey_name) + { + ERR("Failed to allocate memory for subkey_name\n"); return 1; } + + path_len = strlenW(path); + + for (i = 0; i < num_subkeys; i++) + { + subkey_len = max_subkey_len; + rc = RegEnumKeyExW(key, i, subkey_name, &subkey_len, NULL, NULL, NULL, NULL); + if (rc == ERROR_SUCCESS) + { + subkey_path = build_subkey_path(path, path_len, subkey_name, subkey_len); + if (!RegOpenKeyExW(key, subkey_name, 0, KEY_READ, &subkey)) + { + query_value(subkey, value_name, subkey_path, recurse); + RegCloseKey(subkey); + } + HeapFree(GetProcessHeap(), 0, subkey_path); + } + } + + HeapFree(GetProcessHeap(), 0, subkey_name); return 0; } @@ -795,8 +830,6 @@ static int reg_query(WCHAR *key_name, WCHAR *value_name, BOOL value_empty, BOOL { WCHAR *p; HKEY root, key; - static const WCHAR stubW[] = {'S','T','U','B',' ','Q','U','E','R','Y',' ', - '-',' ','%','1',' ','%','2',' ','%','3','!','d','!',' ','%','4','!','d','!','\n',0}; int ret; if (!sane_path(key_name)) @@ -825,15 +858,7 @@ static int reg_query(WCHAR *key_name, WCHAR *value_name, BOOL value_empty, BOOL } if (value_name || value_empty) - { - if (recurse) - { - RegCloseKey(key); - output_string(stubW, key_name, value_name, value_empty, recurse); - return 1; - } - ret = query_value(key, value_name, key_name); - } + ret = query_value(key, value_name, key_name, recurse); else ret = query_all(key, key_name, recurse);

1 0

Michael Stefaniuc : user32: Use wine_dbgstr_rect() to print a RECT.
by Alexandre Julliard 27 Apr '16

27 Apr '16

Module: wine Branch: master Commit: 959b9d1cbb4a24daa47a3a5735030075443a0f38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=959b9d1cbb4a24daa47a3a573… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Apr 26 20:58:55 2016 +0200 user32: Use wine_dbgstr_rect() to print a RECT. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/misc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/misc.c b/dlls/user32/misc.c index 4faea6b..7b283cc 100644 --- a/dlls/user32/misc.c +++ b/dlls/user32/misc.c @@ -642,7 +642,7 @@ BOOL WINAPI AlignRects(LPRECT rect, DWORD b, DWORD c, DWORD d) { FIXME("(%p, %d, %d, %d): stub\n", rect, b, c, d); if (rect) - FIXME("rect: [[%d, %d], [%d, %d]]\n", rect->left, rect->top, rect->right, rect->bottom); + FIXME("rect: %s\n", wine_dbgstr_rect(rect)); /* Calls OffsetRect */ return FALSE; }

1 0

Nikolay Sivov : uxtheme/tests: Only link dynamically for functions that could be missing.
by Alexandre Julliard 27 Apr '16

27 Apr '16

Module: wine Branch: master Commit: 1e54d38058e2c46f9caaaee83840a1dc35ed4b1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e54d38058e2c46f9caaaee83… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 26 21:57:23 2016 +0300 uxtheme/tests: Only link dynamically for functions that could be missing. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/tests/Makefile.in | 2 +- dlls/uxtheme/tests/system.c | 120 ++++++++++++++--------------------------- 2 files changed, 40 insertions(+), 82 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1e54d38058e2c46f9caaa…

1 0

Piotr Caban : msvcr120: Add __ExceptionPtrToBool implementation.
by Alexandre Julliard 27 Apr '16

27 Apr '16

Module: wine Branch: master Commit: 4f8aafbe2891d16aeb1aa7916405b5efb862d7af URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f8aafbe2891d16aeb1aa7916… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 26 20:39:41 2016 +0200 msvcr120: Add __ExceptionPtrToBool implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr110/msvcr110.spec | 4 ++-- dlls/msvcr120/msvcr120.spec | 4 ++-- dlls/msvcr120_app/msvcr120_app.spec | 4 ++-- dlls/msvcrt/cpp.c | 9 +++++++++ 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 76cafd9..ddab904 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -704,8 +704,8 @@ @ cdecl -arch=win64 ?__ExceptionPtrRethrow@@YAXPEBX@Z(ptr) __ExceptionPtrRethrow @ stub -arch=win32 ?__ExceptionPtrSwap@@YAXPAX0@Z @ stub -arch=win64 ?__ExceptionPtrSwap@@YAXPEAX0@Z -@ stub -arch=win32 ?__ExceptionPtrToBool@@YA_NPBX@Z -@ stub -arch=win64 ?__ExceptionPtrToBool@@YA_NPEBX@Z +@ cdecl -arch=win32 ?__ExceptionPtrToBool@@YA_NPBX@Z(ptr) __ExceptionPtrToBool +@ cdecl -arch=win64 ?__ExceptionPtrToBool@@YA_NPEBX@Z(ptr) __ExceptionPtrToBool @ cdecl __uncaught_exception() MSVCRT___uncaught_exception @ stub ?_inconsistency@@YAXXZ @ cdecl -arch=win32 ?_invalid_parameter@@YAXPBG00II@Z(wstr wstr wstr long long) MSVCRT__invalid_parameter diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index ad9749a..7efcb20 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -686,8 +686,8 @@ @ cdecl -arch=win64 ?__ExceptionPtrRethrow@@YAXPEBX@Z(ptr) __ExceptionPtrRethrow @ stub -arch=win32 ?__ExceptionPtrSwap@@YAXPAX0@Z @ stub -arch=win64 ?__ExceptionPtrSwap@@YAXPEAX0@Z -@ stub -arch=win32 ?__ExceptionPtrToBool@@YA_NPBX@Z -@ stub -arch=win64 ?__ExceptionPtrToBool@@YA_NPEBX@Z +@ cdecl -arch=win32 ?__ExceptionPtrToBool@@YA_NPBX@Z(ptr) __ExceptionPtrToBool +@ cdecl -arch=win64 ?__ExceptionPtrToBool@@YA_NPEBX@Z(ptr) __ExceptionPtrToBool @ cdecl __uncaught_exception() MSVCRT___uncaught_exception @ stub ?_inconsistency@@YAXXZ @ cdecl -arch=win32 ?_invalid_parameter@@YAXPBG00II@Z(wstr wstr wstr long long) MSVCRT__invalid_parameter diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index fb3e4a3..6bfc0b7 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -682,8 +682,8 @@ @ cdecl -arch=win64 ?__ExceptionPtrRethrow@@YAXPEBX@Z(ptr) msvcr120.?__ExceptionPtrRethrow@@YAXPEBX@Z @ stub -arch=win32 ?__ExceptionPtrSwap@@YAXPAX0@Z @ stub -arch=win64 ?__ExceptionPtrSwap@@YAXPEAX0@Z -@ stub -arch=win32 ?__ExceptionPtrToBool@@YA_NPBX@Z -@ stub -arch=win64 ?__ExceptionPtrToBool@@YA_NPEBX@Z +@ cdecl -arch=win32 ?__ExceptionPtrToBool@@YA_NPBX@Z(ptr) msvcr120.?__ExceptionPtrToBool@@YA_NPBX@Z +@ cdecl -arch=win64 ?__ExceptionPtrToBool@@YA_NPEBX@Z(ptr) msvcr120.?__ExceptionPtrToBool@@YA_NPEBX@Z @ cdecl __uncaught_exception() msvcr120.__uncaught_exception @ stub ?_inconsistency@@YAXXZ @ cdecl -arch=win32 ?_invalid_parameter@@YAXPBG00II@Z(wstr wstr wstr long long) msvcr120.?_invalid_parameter@@YAXPBG00II@Z diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index 17292d5..b470478 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -1500,6 +1500,15 @@ void __cdecl __ExceptionPtrCurrentException(exception_ptr *ep) } #endif +/********************************************************************* + * ?__ExceptionPtrToBool@@YA_NPBX@Z + * ?__ExceptionPtrToBool@@YA_NPEBX@Z + */ +MSVCRT_bool __cdecl __ExceptionPtrToBool(exception_ptr *ep) +{ + return !!ep->rec; +} + void* __cdecl __AdjustPointer(void *obj, const this_ptr_offsets *off) { return get_this_pointer(off, obj);

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
75
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 2016