January 2014 - Wine-Commits

Martin Storsjo : api-ms-win-core-debug-l1-1-1: Add stub dll.
by Alexandre Julliard Jan. 8, 2014

Jan. 8, 2014

Module: wine Branch: master Commit: 0ee5b475ccd925eef983e42b6766e37226b27a5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ee5b475ccd925eef983e42b6… Author: Martin Storsjo <martin(a)martin.st> Date: Wed Jan 8 14:48:22 2014 +0200 api-ms-win-core-debug-l1-1-1: Add stub dll. --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-debug-l1-1-1/Makefile.in | 1 + .../api-ms-win-core-debug-l1-1-1.spec | 9 +++++++++ tools/make_specfiles | 1 + 5 files changed, 14 insertions(+) diff --git a/configure b/configure index 5eae8a0..4a16c55 100755 --- a/configure +++ b/configure @@ -853,6 +853,7 @@ enable_actxprxy enable_advapi32 enable_advpack enable_amstream +enable_api_ms_win_core_debug_l1_1_1 enable_api_ms_win_core_localregistry_l1_1_0 enable_api_ms_win_core_processthreads_l1_1_0 enable_api_ms_win_core_processthreads_l1_1_1 @@ -16565,6 +16566,7 @@ wine_fn_config_dll advpack enable_advpack implib wine_fn_config_test dlls/advpack/tests advpack_test wine_fn_config_dll amstream enable_amstream clean wine_fn_config_test dlls/amstream/tests amstream_test +wine_fn_config_dll api-ms-win-core-debug-l1-1-1 enable_api_ms_win_core_debug_l1_1_1 wine_fn_config_dll api-ms-win-core-localregistry-l1-1-0 enable_api_ms_win_core_localregistry_l1_1_0 wine_fn_config_dll api-ms-win-core-processthreads-l1-1-0 enable_api_ms_win_core_processthreads_l1_1_0 wine_fn_config_dll api-ms-win-core-processthreads-l1-1-1 enable_api_ms_win_core_processthreads_l1_1_1 diff --git a/configure.ac b/configure.ac index 58ebafc..4e35752 100644 --- a/configure.ac +++ b/configure.ac @@ -2625,6 +2625,7 @@ WINE_CONFIG_DLL(advpack,,[implib]) WINE_CONFIG_TEST(dlls/advpack/tests) WINE_CONFIG_DLL(amstream,,[clean]) WINE_CONFIG_TEST(dlls/amstream/tests) +WINE_CONFIG_DLL(api-ms-win-core-debug-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-localregistry-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-processthreads-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-processthreads-l1-1-1) diff --git a/dlls/api-ms-win-core-debug-l1-1-1/Makefile.in b/dlls/api-ms-win-core-debug-l1-1-1/Makefile.in new file mode 100644 index 0000000..b3134a2 --- /dev/null +++ b/dlls/api-ms-win-core-debug-l1-1-1/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-debug-l1-1-1.dll diff --git a/dlls/api-ms-win-core-debug-l1-1-1/api-ms-win-core-debug-l1-1-1.spec b/dlls/api-ms-win-core-debug-l1-1-1/api-ms-win-core-debug-l1-1-1.spec new file mode 100644 index 0000000..bbee258 --- /dev/null +++ b/dlls/api-ms-win-core-debug-l1-1-1/api-ms-win-core-debug-l1-1-1.spec @@ -0,0 +1,9 @@ +@ stdcall CheckRemoteDebuggerPresent(long ptr) kernel32.CheckRemoteDebuggerPresent +@ stdcall ContinueDebugEvent(long long long) kernel32.ContinueDebugEvent +@ stdcall DebugActiveProcess(long) kernel32.DebugActiveProcess +@ stdcall DebugActiveProcessStop(long) kernel32.DebugActiveProcessStop +@ stdcall DebugBreak() kernel32.DebugBreak +@ stdcall IsDebuggerPresent() kernel32.IsDebuggerPresent +@ stdcall OutputDebugStringA(str) kernel32.OutputDebugStringA +@ stdcall OutputDebugStringW(wstr) kernel32.OutputDebugStringW +@ stdcall WaitForDebugEvent(ptr long) kernel32.WaitForDebugEvent diff --git a/tools/make_specfiles b/tools/make_specfiles index 89c8f9f..3c3c1d3 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -137,6 +137,7 @@ my @dll_groups = "api-ms-win-downlevel-normaliz-l1-1-0", "api-ms-win-core-processthreads-l1-1-0", "api-ms-win-core-processthreads-l1-1-1", + "api-ms-win-core-debug-l1-1-1", ], [ "ole32",

1 0

Martin Storsjo : api-ms-win-core-errorhandling-l1-1-1: Add stub dll.
by Alexandre Julliard Jan. 8, 2014

Jan. 8, 2014

Module: wine Branch: master Commit: 5ee522162c1f0ddad2eb8309153327488f41ca5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ee522162c1f0ddad2eb83091… Author: Martin Storsjo <martin(a)martin.st> Date: Wed Jan 8 14:48:23 2014 +0200 api-ms-win-core-errorhandling-l1-1-1: Add stub dll. --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-errorhandling-l1-1-1/Makefile.in | 1 + .../api-ms-win-core-errorhandling-l1-1-1.spec | 12 ++++++++++++ tools/make_specfiles | 1 + 5 files changed, 17 insertions(+) diff --git a/configure b/configure index 4a16c55..cbb2139 100755 --- a/configure +++ b/configure @@ -854,6 +854,7 @@ enable_advapi32 enable_advpack enable_amstream enable_api_ms_win_core_debug_l1_1_1 +enable_api_ms_win_core_errorhandling_l1_1_1 enable_api_ms_win_core_localregistry_l1_1_0 enable_api_ms_win_core_processthreads_l1_1_0 enable_api_ms_win_core_processthreads_l1_1_1 @@ -16567,6 +16568,7 @@ wine_fn_config_test dlls/advpack/tests advpack_test wine_fn_config_dll amstream enable_amstream clean wine_fn_config_test dlls/amstream/tests amstream_test wine_fn_config_dll api-ms-win-core-debug-l1-1-1 enable_api_ms_win_core_debug_l1_1_1 +wine_fn_config_dll api-ms-win-core-errorhandling-l1-1-1 enable_api_ms_win_core_errorhandling_l1_1_1 wine_fn_config_dll api-ms-win-core-localregistry-l1-1-0 enable_api_ms_win_core_localregistry_l1_1_0 wine_fn_config_dll api-ms-win-core-processthreads-l1-1-0 enable_api_ms_win_core_processthreads_l1_1_0 wine_fn_config_dll api-ms-win-core-processthreads-l1-1-1 enable_api_ms_win_core_processthreads_l1_1_1 diff --git a/configure.ac b/configure.ac index 4e35752..e068c84 100644 --- a/configure.ac +++ b/configure.ac @@ -2626,6 +2626,7 @@ WINE_CONFIG_TEST(dlls/advpack/tests) WINE_CONFIG_DLL(amstream,,[clean]) WINE_CONFIG_TEST(dlls/amstream/tests) WINE_CONFIG_DLL(api-ms-win-core-debug-l1-1-1) +WINE_CONFIG_DLL(api-ms-win-core-errorhandling-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-localregistry-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-processthreads-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-processthreads-l1-1-1) diff --git a/dlls/api-ms-win-core-errorhandling-l1-1-1/Makefile.in b/dlls/api-ms-win-core-errorhandling-l1-1-1/Makefile.in new file mode 100644 index 0000000..ce64a23 --- /dev/null +++ b/dlls/api-ms-win-core-errorhandling-l1-1-1/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-errorhandling-l1-1-1.dll diff --git a/dlls/api-ms-win-core-errorhandling-l1-1-1/api-ms-win-core-errorhandling-l1-1-1.spec b/dlls/api-ms-win-core-errorhandling-l1-1-1/api-ms-win-core-errorhandling-l1-1-1.spec new file mode 100644 index 0000000..8f00d0d --- /dev/null +++ b/dlls/api-ms-win-core-errorhandling-l1-1-1/api-ms-win-core-errorhandling-l1-1-1.spec @@ -0,0 +1,12 @@ +@ stub AddVectoredContinueHandler +@ stdcall AddVectoredExceptionHandler(long ptr) kernel32.AddVectoredExceptionHandler +@ stdcall GetErrorMode() kernel32.GetErrorMode +@ stdcall GetLastError() kernel32.GetLastError +@ stdcall RaiseException(long long long ptr) kernel32.RaiseException +@ stub RemoveVectoredContinueHandler +@ stdcall RemoveVectoredExceptionHandler(ptr) kernel32.RemoveVectoredExceptionHandler +@ stdcall RestoreLastError(long) kernel32.RestoreLastError +@ stdcall SetErrorMode(long) kernel32.SetErrorMode +@ stdcall SetLastError(long) kernel32.SetLastError +@ stdcall SetUnhandledExceptionFilter(ptr) kernel32.SetUnhandledExceptionFilter +@ stdcall UnhandledExceptionFilter(ptr) kernel32.UnhandledExceptionFilter diff --git a/tools/make_specfiles b/tools/make_specfiles index 3c3c1d3..e8de5e4 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -138,6 +138,7 @@ my @dll_groups = "api-ms-win-core-processthreads-l1-1-0", "api-ms-win-core-processthreads-l1-1-1", "api-ms-win-core-debug-l1-1-1", + "api-ms-win-core-errorhandling-l1-1-1", ], [ "ole32",

1 0

Martin Storsjo : api-ms-win-core-string-l1-1-0: Add stub dll.
by Alexandre Julliard Jan. 8, 2014

Jan. 8, 2014

Module: wine Branch: master Commit: 463bf7bb6153441a8b6dbe25696a0079c194b2d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=463bf7bb6153441a8b6dbe256… Author: Martin Storsjo <martin(a)martin.st> Date: Wed Jan 8 14:48:26 2014 +0200 api-ms-win-core-string-l1-1-0: Add stub dll. --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-string-l1-1-0/Makefile.in | 1 + .../api-ms-win-core-string-l1-1-0.spec | 8 ++++++++ tools/make_specfiles | 1 + 5 files changed, 13 insertions(+) diff --git a/configure b/configure index 5af9383..41a0b2c 100755 --- a/configure +++ b/configure @@ -860,6 +860,7 @@ enable_api_ms_win_core_localregistry_l1_1_0 enable_api_ms_win_core_processthreads_l1_1_0 enable_api_ms_win_core_processthreads_l1_1_1 enable_api_ms_win_core_profile_l1_1_0 +enable_api_ms_win_core_string_l1_1_0 enable_api_ms_win_core_winrt_error_l1_1_0 enable_api_ms_win_core_winrt_string_l1_1_0 enable_api_ms_win_downlevel_advapi32_l1_1_0 @@ -16576,6 +16577,7 @@ wine_fn_config_dll api-ms-win-core-localregistry-l1-1-0 enable_api_ms_win_core_l wine_fn_config_dll api-ms-win-core-processthreads-l1-1-0 enable_api_ms_win_core_processthreads_l1_1_0 wine_fn_config_dll api-ms-win-core-processthreads-l1-1-1 enable_api_ms_win_core_processthreads_l1_1_1 wine_fn_config_dll api-ms-win-core-profile-l1-1-0 enable_api_ms_win_core_profile_l1_1_0 +wine_fn_config_dll api-ms-win-core-string-l1-1-0 enable_api_ms_win_core_string_l1_1_0 wine_fn_config_dll api-ms-win-core-winrt-error-l1-1-0 enable_api_ms_win_core_winrt_error_l1_1_0 wine_fn_config_dll api-ms-win-core-winrt-string-l1-1-0 enable_api_ms_win_core_winrt_string_l1_1_0 wine_fn_config_dll api-ms-win-downlevel-advapi32-l1-1-0 enable_api_ms_win_downlevel_advapi32_l1_1_0 diff --git a/configure.ac b/configure.ac index 2e2bb95..9ec46f2 100644 --- a/configure.ac +++ b/configure.ac @@ -2632,6 +2632,7 @@ WINE_CONFIG_DLL(api-ms-win-core-localregistry-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-processthreads-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-processthreads-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-profile-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-core-string-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-winrt-error-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-winrt-string-l1-1-0) WINE_CONFIG_DLL(api-ms-win-downlevel-advapi32-l1-1-0) diff --git a/dlls/api-ms-win-core-string-l1-1-0/Makefile.in b/dlls/api-ms-win-core-string-l1-1-0/Makefile.in new file mode 100644 index 0000000..4d41488 --- /dev/null +++ b/dlls/api-ms-win-core-string-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-string-l1-1-0.dll diff --git a/dlls/api-ms-win-core-string-l1-1-0/api-ms-win-core-string-l1-1-0.spec b/dlls/api-ms-win-core-string-l1-1-0/api-ms-win-core-string-l1-1-0.spec new file mode 100644 index 0000000..5159f98 --- /dev/null +++ b/dlls/api-ms-win-core-string-l1-1-0/api-ms-win-core-string-l1-1-0.spec @@ -0,0 +1,8 @@ +@ stdcall CompareStringEx(wstr long wstr long wstr long ptr ptr long) kernel32.CompareStringEx +@ stdcall CompareStringOrdinal(wstr long wstr long long) kernel32.CompareStringOrdinal +@ stdcall CompareStringW(long long wstr long wstr long) kernel32.CompareStringW +@ stdcall FoldStringW(long wstr long ptr long) kernel32.FoldStringW +@ stdcall GetStringTypeExW(long long wstr long ptr) kernel32.GetStringTypeExW +@ stdcall GetStringTypeW(long wstr long ptr) kernel32.GetStringTypeW +@ stdcall MultiByteToWideChar(long long str long ptr long) kernel32.MultiByteToWideChar +@ stdcall WideCharToMultiByte(long long wstr long ptr long ptr ptr) kernel32.WideCharToMultiByte diff --git a/tools/make_specfiles b/tools/make_specfiles index 5cfe758..928d4b8 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -141,6 +141,7 @@ my @dll_groups = "api-ms-win-core-errorhandling-l1-1-1", "api-ms-win-core-interlocked-l1-2-0", "api-ms-win-core-profile-l1-1-0", + "api-ms-win-core-string-l1-1-0", ], [ "ole32",

1 0

Vincent Povirk : explorer: Add run dialog to start menu.
by Alexandre Julliard Jan. 8, 2014

Jan. 8, 2014

1 0

Vincent Povirk : explorer: Default to showing the systray if the desktop is named "shell".
by Alexandre Julliard Jan. 8, 2014

Jan. 8, 2014

Module: wine Branch: master Commit: dfaf6a42acdcb83c50f232d1f262b4721d01bdcd URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfaf6a42acdcb83c50f232d1f… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Jan 7 14:52:14 2014 -0600 explorer: Default to showing the systray if the desktop is named "shell". --- programs/explorer/desktop.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index 51791c7..db6a355 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -644,17 +644,22 @@ static BOOL get_default_enable_shell( const WCHAR *name ) 'E','x','p','l','o','r','e','r','\\', 'D','e','s','k','t','o','p','s',0}; static const WCHAR enable_shellW[] = {'E','n','a','b','l','e','S','h','e','l','l',0}; + static const WCHAR shellW[] = {'s','h','e','l','l',0}; HKEY hkey; - BOOL result = FALSE; + BOOL found = FALSE; + BOOL result; DWORD size = sizeof(result); /* @@ Wine registry key: HKCU\Software\Wine\Explorer\Desktops */ if (!RegOpenKeyW( HKEY_CURRENT_USER, desktop_keyW, &hkey )) { - if (RegGetValueW( hkey, name, enable_shellW, RRF_RT_REG_DWORD, NULL, &result, &size )) - result = FALSE; + if (!RegGetValueW( hkey, name, enable_shellW, RRF_RT_REG_DWORD, NULL, &result, &size )) + found = TRUE; RegCloseKey( hkey ); } + /* Default off, except for the magic desktop name "shell" */ + if (!found) + result = (lstrcmpiW( name, shellW ) == 0); return result; }

1 0

Stefan Dösinger : wined3d: Support custom pitches in wined3d_surface_update_desc.
by Alexandre Julliard Jan. 8, 2014

Jan. 8, 2014

Module: wine Branch: master Commit: 70eab9d025c163aa039ada7edb751774defacbe0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70eab9d025c163aa039ada7ed… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jan 7 22:12:12 2014 +0100 wined3d: Support custom pitches in wined3d_surface_update_desc. --- dlls/wined3d/surface.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 2fca299..7b96a21 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2861,7 +2861,10 @@ HRESULT CDECL wined3d_surface_update_desc(struct wined3d_surface *surface, surface->resource.format = format; surface->resource.multisample_type = multisample_type; surface->resource.multisample_quality = multisample_quality; - surface->resource.size = resource_size; + if (surface->pitch) + surface->resource.size = height * surface->pitch; + else + surface->resource.size = resource_size; if (create_dib) {

1 0

Martin Storsjo : api-ms-win-core-util-l1-1-0: Add stub dll.
by Alexandre Julliard Jan. 8, 2014

Jan. 8, 2014

Module: wine Branch: master Commit: 8d9ecf70e258b4fd76e43b869954974194154deb URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d9ecf70e258b4fd76e43b869… Author: Martin Storsjo <martin(a)martin.st> Date: Wed Jan 8 14:48:28 2014 +0200 api-ms-win-core-util-l1-1-0: Add stub dll. --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-util-l1-1-0/Makefile.in | 1 + dlls/api-ms-win-core-util-l1-1-0/api-ms-win-core-util-l1-1-0.spec | 5 +++++ tools/make_specfiles | 1 + 5 files changed, 10 insertions(+) diff --git a/configure b/configure index e45776c..a41afa4 100755 --- a/configure +++ b/configure @@ -862,6 +862,7 @@ enable_api_ms_win_core_processthreads_l1_1_1 enable_api_ms_win_core_profile_l1_1_0 enable_api_ms_win_core_string_l1_1_0 enable_api_ms_win_core_sysinfo_l1_2_0 +enable_api_ms_win_core_util_l1_1_0 enable_api_ms_win_core_winrt_error_l1_1_0 enable_api_ms_win_core_winrt_string_l1_1_0 enable_api_ms_win_downlevel_advapi32_l1_1_0 @@ -16580,6 +16581,7 @@ wine_fn_config_dll api-ms-win-core-processthreads-l1-1-1 enable_api_ms_win_core_ wine_fn_config_dll api-ms-win-core-profile-l1-1-0 enable_api_ms_win_core_profile_l1_1_0 wine_fn_config_dll api-ms-win-core-string-l1-1-0 enable_api_ms_win_core_string_l1_1_0 wine_fn_config_dll api-ms-win-core-sysinfo-l1-2-0 enable_api_ms_win_core_sysinfo_l1_2_0 +wine_fn_config_dll api-ms-win-core-util-l1-1-0 enable_api_ms_win_core_util_l1_1_0 wine_fn_config_dll api-ms-win-core-winrt-error-l1-1-0 enable_api_ms_win_core_winrt_error_l1_1_0 wine_fn_config_dll api-ms-win-core-winrt-string-l1-1-0 enable_api_ms_win_core_winrt_string_l1_1_0 wine_fn_config_dll api-ms-win-downlevel-advapi32-l1-1-0 enable_api_ms_win_downlevel_advapi32_l1_1_0 diff --git a/configure.ac b/configure.ac index f36dbd7..3d3e039 100644 --- a/configure.ac +++ b/configure.ac @@ -2634,6 +2634,7 @@ WINE_CONFIG_DLL(api-ms-win-core-processthreads-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-profile-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-string-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-sysinfo-l1-2-0) +WINE_CONFIG_DLL(api-ms-win-core-util-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-winrt-error-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-winrt-string-l1-1-0) WINE_CONFIG_DLL(api-ms-win-downlevel-advapi32-l1-1-0) diff --git a/dlls/api-ms-win-core-util-l1-1-0/Makefile.in b/dlls/api-ms-win-core-util-l1-1-0/Makefile.in new file mode 100644 index 0000000..4e2321d --- /dev/null +++ b/dlls/api-ms-win-core-util-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-util-l1-1-0.dll diff --git a/dlls/api-ms-win-core-util-l1-1-0/api-ms-win-core-util-l1-1-0.spec b/dlls/api-ms-win-core-util-l1-1-0/api-ms-win-core-util-l1-1-0.spec new file mode 100644 index 0000000..471ee42 --- /dev/null +++ b/dlls/api-ms-win-core-util-l1-1-0/api-ms-win-core-util-l1-1-0.spec @@ -0,0 +1,5 @@ +@ stdcall Beep(long long) kernel32.Beep +@ stdcall DecodePointer(ptr) kernel32.DecodePointer +@ stub DecodeSystemPointer +@ stdcall EncodePointer(ptr) kernel32.EncodePointer +@ stub EncodeSystemPointer diff --git a/tools/make_specfiles b/tools/make_specfiles index 2edb446..38917eb 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -143,6 +143,7 @@ my @dll_groups = "api-ms-win-core-profile-l1-1-0", "api-ms-win-core-string-l1-1-0", "api-ms-win-core-sysinfo-l1-2-0", + "api-ms-win-core-util-l1-1-0", ], [ "ole32",

1 0

Martin Storsjo : api-ms-win-core-interlocked-l1-2-0: Add stub dll.
by Alexandre Julliard Jan. 8, 2014

Jan. 8, 2014

Module: wine Branch: master Commit: e5c2036cfe210b948bd316cbb38f6e13a4d13dff URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5c2036cfe210b948bd316cbb… Author: Martin Storsjo <martin(a)martin.st> Date: Wed Jan 8 14:48:24 2014 +0200 api-ms-win-core-interlocked-l1-2-0: Add stub dll. --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-interlocked-l1-2-0/Makefile.in | 1 + .../api-ms-win-core-interlocked-l1-2-0.spec | 12 ++++++++++++ tools/make_specfiles | 1 + 5 files changed, 17 insertions(+) diff --git a/configure b/configure index cbb2139..417a7c9 100755 --- a/configure +++ b/configure @@ -855,6 +855,7 @@ enable_advpack enable_amstream enable_api_ms_win_core_debug_l1_1_1 enable_api_ms_win_core_errorhandling_l1_1_1 +enable_api_ms_win_core_interlocked_l1_2_0 enable_api_ms_win_core_localregistry_l1_1_0 enable_api_ms_win_core_processthreads_l1_1_0 enable_api_ms_win_core_processthreads_l1_1_1 @@ -16569,6 +16570,7 @@ wine_fn_config_dll amstream enable_amstream clean wine_fn_config_test dlls/amstream/tests amstream_test wine_fn_config_dll api-ms-win-core-debug-l1-1-1 enable_api_ms_win_core_debug_l1_1_1 wine_fn_config_dll api-ms-win-core-errorhandling-l1-1-1 enable_api_ms_win_core_errorhandling_l1_1_1 +wine_fn_config_dll api-ms-win-core-interlocked-l1-2-0 enable_api_ms_win_core_interlocked_l1_2_0 wine_fn_config_dll api-ms-win-core-localregistry-l1-1-0 enable_api_ms_win_core_localregistry_l1_1_0 wine_fn_config_dll api-ms-win-core-processthreads-l1-1-0 enable_api_ms_win_core_processthreads_l1_1_0 wine_fn_config_dll api-ms-win-core-processthreads-l1-1-1 enable_api_ms_win_core_processthreads_l1_1_1 diff --git a/configure.ac b/configure.ac index e068c84..72ece36 100644 --- a/configure.ac +++ b/configure.ac @@ -2627,6 +2627,7 @@ WINE_CONFIG_DLL(amstream,,[clean]) WINE_CONFIG_TEST(dlls/amstream/tests) WINE_CONFIG_DLL(api-ms-win-core-debug-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-errorhandling-l1-1-1) +WINE_CONFIG_DLL(api-ms-win-core-interlocked-l1-2-0) WINE_CONFIG_DLL(api-ms-win-core-localregistry-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-processthreads-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-processthreads-l1-1-1) diff --git a/dlls/api-ms-win-core-interlocked-l1-2-0/Makefile.in b/dlls/api-ms-win-core-interlocked-l1-2-0/Makefile.in new file mode 100644 index 0000000..7daa74b --- /dev/null +++ b/dlls/api-ms-win-core-interlocked-l1-2-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-interlocked-l1-2-0.dll diff --git a/dlls/api-ms-win-core-interlocked-l1-2-0/api-ms-win-core-interlocked-l1-2-0.spec b/dlls/api-ms-win-core-interlocked-l1-2-0/api-ms-win-core-interlocked-l1-2-0.spec new file mode 100644 index 0000000..f1fbd94 --- /dev/null +++ b/dlls/api-ms-win-core-interlocked-l1-2-0/api-ms-win-core-interlocked-l1-2-0.spec @@ -0,0 +1,12 @@ +@ stdcall InitializeSListHead(ptr) kernel32.InitializeSListHead +@ stdcall -arch=i386 -ret64 InterlockedCompareExchange64(ptr int64 int64) kernel32.InterlockedCompareExchange64 +@ stdcall -arch=i386 InterlockedCompareExchange(ptr long long) kernel32.InterlockedCompareExchange +@ stdcall -arch=i386 InterlockedDecrement(ptr) kernel32.InterlockedDecrement +@ stdcall -arch=i386 InterlockedExchange(ptr long) kernel32.InterlockedExchange +@ stdcall -arch=i386 InterlockedExchangeAdd(ptr long ) kernel32.InterlockedExchangeAdd +@ stdcall InterlockedFlushSList(ptr) kernel32.InterlockedFlushSList +@ stdcall -arch=i386 InterlockedIncrement(ptr) kernel32.InterlockedIncrement +@ stdcall InterlockedPopEntrySList(ptr) kernel32.InterlockedPopEntrySList +@ stdcall InterlockedPushEntrySList(ptr ptr) kernel32.InterlockedPushEntrySList +@ stub InterlockedPushListSListEx +@ stdcall QueryDepthSList(ptr) kernel32.QueryDepthSList diff --git a/tools/make_specfiles b/tools/make_specfiles index e8de5e4..6c1a7b7 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -139,6 +139,7 @@ my @dll_groups = "api-ms-win-core-processthreads-l1-1-1", "api-ms-win-core-debug-l1-1-1", "api-ms-win-core-errorhandling-l1-1-1", + "api-ms-win-core-interlocked-l1-2-0", ], [ "ole32",

1 0

Martin Storsjo : api-ms-win-core-sysinfo-l1-2-0: Add stub dll.
by Alexandre Julliard Jan. 8, 2014

Jan. 8, 2014

Module: wine Branch: master Commit: 6f174587937f7065ca62702e2258f965a9fb0ea8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f174587937f7065ca62702e2… Author: Martin Storsjo <martin(a)martin.st> Date: Wed Jan 8 14:48:27 2014 +0200 api-ms-win-core-sysinfo-l1-2-0: Add stub dll. --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-sysinfo-l1-2-0/Makefile.in | 1 + .../api-ms-win-core-sysinfo-l1-2-0.spec | 31 ++++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 36 insertions(+) diff --git a/configure b/configure index 41a0b2c..e45776c 100755 --- a/configure +++ b/configure @@ -861,6 +861,7 @@ enable_api_ms_win_core_processthreads_l1_1_0 enable_api_ms_win_core_processthreads_l1_1_1 enable_api_ms_win_core_profile_l1_1_0 enable_api_ms_win_core_string_l1_1_0 +enable_api_ms_win_core_sysinfo_l1_2_0 enable_api_ms_win_core_winrt_error_l1_1_0 enable_api_ms_win_core_winrt_string_l1_1_0 enable_api_ms_win_downlevel_advapi32_l1_1_0 @@ -16578,6 +16579,7 @@ wine_fn_config_dll api-ms-win-core-processthreads-l1-1-0 enable_api_ms_win_core_ wine_fn_config_dll api-ms-win-core-processthreads-l1-1-1 enable_api_ms_win_core_processthreads_l1_1_1 wine_fn_config_dll api-ms-win-core-profile-l1-1-0 enable_api_ms_win_core_profile_l1_1_0 wine_fn_config_dll api-ms-win-core-string-l1-1-0 enable_api_ms_win_core_string_l1_1_0 +wine_fn_config_dll api-ms-win-core-sysinfo-l1-2-0 enable_api_ms_win_core_sysinfo_l1_2_0 wine_fn_config_dll api-ms-win-core-winrt-error-l1-1-0 enable_api_ms_win_core_winrt_error_l1_1_0 wine_fn_config_dll api-ms-win-core-winrt-string-l1-1-0 enable_api_ms_win_core_winrt_string_l1_1_0 wine_fn_config_dll api-ms-win-downlevel-advapi32-l1-1-0 enable_api_ms_win_downlevel_advapi32_l1_1_0 diff --git a/configure.ac b/configure.ac index 9ec46f2..f36dbd7 100644 --- a/configure.ac +++ b/configure.ac @@ -2633,6 +2633,7 @@ WINE_CONFIG_DLL(api-ms-win-core-processthreads-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-processthreads-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-profile-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-string-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-core-sysinfo-l1-2-0) WINE_CONFIG_DLL(api-ms-win-core-winrt-error-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-winrt-string-l1-1-0) WINE_CONFIG_DLL(api-ms-win-downlevel-advapi32-l1-1-0) diff --git a/dlls/api-ms-win-core-sysinfo-l1-2-0/Makefile.in b/dlls/api-ms-win-core-sysinfo-l1-2-0/Makefile.in new file mode 100644 index 0000000..856ae15 --- /dev/null +++ b/dlls/api-ms-win-core-sysinfo-l1-2-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-sysinfo-l1-2-0.dll diff --git a/dlls/api-ms-win-core-sysinfo-l1-2-0/api-ms-win-core-sysinfo-l1-2-0.spec b/dlls/api-ms-win-core-sysinfo-l1-2-0/api-ms-win-core-sysinfo-l1-2-0.spec new file mode 100644 index 0000000..47f4419 --- /dev/null +++ b/dlls/api-ms-win-core-sysinfo-l1-2-0/api-ms-win-core-sysinfo-l1-2-0.spec @@ -0,0 +1,31 @@ +@ stub EnumSystemFirmwareTables +@ stdcall GetComputerNameExA(long ptr ptr) kernel32.GetComputerNameExA +@ stdcall GetComputerNameExW(long ptr ptr) kernel32.GetComputerNameExW +@ stdcall GetLocalTime(ptr) kernel32.GetLocalTime +@ stdcall GetLogicalProcessorInformation(ptr ptr) kernel32.GetLogicalProcessorInformation +@ stdcall GetLogicalProcessorInformationEx(long ptr ptr) kernel32.GetLogicalProcessorInformationEx +@ stdcall GetNativeSystemInfo(ptr) kernel32.GetNativeSystemInfo +@ stub GetOsSafeBootMode +@ stdcall GetProductInfo(long long long long ptr) kernel32.GetProductInfo +@ stdcall GetSystemDirectoryA(ptr long) kernel32.GetSystemDirectoryA +@ stdcall GetSystemDirectoryW(ptr long) kernel32.GetSystemDirectoryW +@ stub GetSystemFirmwareTable +@ stdcall GetSystemInfo(ptr) kernel32.GetSystemInfo +@ stdcall GetSystemTime(ptr) kernel32.GetSystemTime +@ stdcall GetSystemTimeAdjustment(ptr ptr ptr) kernel32.GetSystemTimeAdjustment +@ stdcall GetSystemTimeAsFileTime(ptr) kernel32.GetSystemTimeAsFileTime +@ stub GetSystemTimePreciseAsFileTime +@ stdcall GetSystemWindowsDirectoryA(ptr long) kernel32.GetSystemWindowsDirectoryA +@ stdcall GetSystemWindowsDirectoryW(ptr long) kernel32.GetSystemWindowsDirectoryW +@ stdcall GetTickCount() kernel32.GetTickCount +@ stdcall -ret64 GetTickCount64() kernel32.GetTickCount64 +@ stdcall GetVersion() kernel32.GetVersion +@ stdcall GetVersionExA(ptr) kernel32.GetVersionExA +@ stdcall GetVersionExW(ptr) kernel32.GetVersionExW +@ stdcall GetWindowsDirectoryA(ptr long) kernel32.GetWindowsDirectoryA +@ stdcall GetWindowsDirectoryW(ptr long) kernel32.GetWindowsDirectoryW +@ stdcall GlobalMemoryStatusEx(ptr) kernel32.GlobalMemoryStatusEx +@ stdcall SetComputerNameExW(long wstr) kernel32.SetComputerNameExW +@ stdcall SetLocalTime(ptr) kernel32.SetLocalTime +@ stdcall SetSystemTime(ptr) kernel32.SetSystemTime +@ stdcall -ret64 VerSetConditionMask(long long long long) kernel32.VerSetConditionMask diff --git a/tools/make_specfiles b/tools/make_specfiles index 928d4b8..2edb446 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -142,6 +142,7 @@ my @dll_groups = "api-ms-win-core-interlocked-l1-2-0", "api-ms-win-core-profile-l1-1-0", "api-ms-win-core-string-l1-1-0", + "api-ms-win-core-sysinfo-l1-2-0", ], [ "ole32",

1 0

Stefan Dösinger : wined3d: Simplify wined3d_surface_set_mem.
by Alexandre Julliard Jan. 8, 2014

Jan. 8, 2014

Module: wine Branch: master Commit: 82666af87aaf51d2b8cf648b6d6c85154d45e346 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82666af87aaf51d2b8cf648b6… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jan 7 22:12:14 2014 +0100 wined3d: Simplify wined3d_surface_set_mem. --- dlls/wined3d/surface.c | 61 ++++++++++++++---------------------------------- 1 file changed, 18 insertions(+), 43 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 7b96a21..9b9e245 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2619,54 +2619,29 @@ HRESULT CDECL wined3d_surface_set_mem(struct wined3d_surface *surface, void *mem return WINED3DERR_INVALIDCALL; } - if (mem && mem != surface->user_memory) + if (surface->flags & SFLAG_DIBSECTION) { - /* Do I have to copy the old surface content? */ - if (surface->flags & SFLAG_DIBSECTION) - { - DeleteDC(surface->hDC); - DeleteObject(surface->dib.DIBsection); - surface->dib.bitmap_data = NULL; - surface->resource.allocatedMemory = NULL; - surface->hDC = NULL; - surface->flags &= ~SFLAG_DIBSECTION; - } - else if (!(surface->flags & SFLAG_USERPTR)) - { - wined3d_resource_free_sysmem(&surface->resource); - surface->resource.allocatedMemory = NULL; - } - surface->user_memory = mem; - surface->flags |= SFLAG_USERPTR; - - /* Now the surface memory is most up do date. Invalidate drawable and texture. */ - surface_validate_location(surface, SFLAG_INSYSMEM); - surface_invalidate_location(surface, ~SFLAG_INSYSMEM); - - /* For client textures OpenGL has to be notified. */ - if (surface->flags & SFLAG_CLIENT) - surface_release_client_storage(surface); + DeleteDC(surface->hDC); + DeleteObject(surface->dib.DIBsection); + surface->dib.bitmap_data = NULL; + surface->resource.allocatedMemory = NULL; + surface->hDC = NULL; + surface->flags &= ~SFLAG_DIBSECTION; } - else if (surface->flags & SFLAG_USERPTR) + else if (!(surface->flags & SFLAG_USERPTR)) { - /* heap_memory should be NULL already. */ - if (surface->resource.heap_memory) - ERR("User pointer surface has heap memory allocated.\n"); - - if (!mem) - { - surface->user_memory = NULL; - surface->flags &= ~(SFLAG_USERPTR | SFLAG_INSYSMEM); - - if (surface->flags & SFLAG_CLIENT) - surface_release_client_storage(surface); + wined3d_resource_free_sysmem(&surface->resource); + surface->resource.allocatedMemory = NULL; + } - surface_prepare_system_memory(surface); - } + surface->user_memory = mem; + surface->flags |= SFLAG_USERPTR; + surface_validate_location(surface, SFLAG_INSYSMEM); + surface_invalidate_location(surface, ~SFLAG_INSYSMEM); - surface_validate_location(surface, SFLAG_INSYSMEM); - surface_invalidate_location(surface, ~SFLAG_INSYSMEM); - } + /* For client textures OpenGL has to be notified. */ + if (surface->flags & SFLAG_CLIENT) + surface_release_client_storage(surface); surface->pitch = pitch;

1 0

Vincent Povirk : explorer: Add a registry setting to always show the systray.
by Alexandre Julliard Jan. 8, 2014

Jan. 8, 2014

Module: wine Branch: master Commit: 913cb83622a1077731ed3505af9b36bb45571beb URL: http://source.winehq.org/git/wine.git/?a=commit;h=913cb83622a1077731ed3505a… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Dec 16 16:17:21 2013 -0600 explorer: Add a registry setting to always show the systray. --- programs/explorer/desktop.c | 28 +++++++++++++++++++++++++++- programs/explorer/explorer_private.h | 2 +- programs/explorer/systray.c | 9 ++++++--- 3 files changed, 34 insertions(+), 5 deletions(-) diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index 1a8db99..51791c7 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -638,6 +638,26 @@ static BOOL get_default_desktop_size( const WCHAR *name, unsigned int *width, un return found; } +static BOOL get_default_enable_shell( const WCHAR *name ) +{ + static const WCHAR desktop_keyW[] = {'S','o','f','t','w','a','r','e','\\','W','i','n','e','\\', + 'E','x','p','l','o','r','e','r','\\', + 'D','e','s','k','t','o','p','s',0}; + static const WCHAR enable_shellW[] = {'E','n','a','b','l','e','S','h','e','l','l',0}; + HKEY hkey; + BOOL result = FALSE; + DWORD size = sizeof(result); + + /* @@ Wine registry key: HKCU\Software\Wine\Explorer\Desktops */ + if (!RegOpenKeyW( HKEY_CURRENT_USER, desktop_keyW, &hkey )) + { + if (RegGetValueW( hkey, name, enable_shellW, RRF_RT_REG_DWORD, NULL, &result, &size )) + result = FALSE; + RegCloseKey( hkey ); + } + return result; +} + static HMODULE load_graphics_driver( const WCHAR *driver, const GUID *guid ) { static const WCHAR device_keyW[] = { @@ -780,6 +800,7 @@ void manage_desktop( WCHAR *arg ) WCHAR *cmdline = NULL, *driver = NULL; WCHAR *p = arg; const WCHAR *name = NULL; + BOOL enable_shell = FALSE; /* get the rest of the command line (if any) */ while (*p && !isspace(*p)) p++; @@ -809,6 +830,9 @@ void manage_desktop( WCHAR *arg ) if (!get_default_desktop_size( name, &width, &height )) width = height = 0; } + if (name) + enable_shell = get_default_enable_shell( name ); + if (name && width && height) { if (!(desktop = CreateDesktopW( name, NULL, NULL, 0, DESKTOP_ALL_ACCESS, NULL ))) @@ -850,7 +874,9 @@ void manage_desktop( WCHAR *arg ) HMODULE shell32; void (WINAPI *pShellDDEInit)( BOOL ); - initialize_systray( graphics_driver, using_root ); + if (using_root) enable_shell = FALSE; + + initialize_systray( graphics_driver, using_root, enable_shell ); if (!using_root) initialize_launchers( hwnd ); if ((shell32 = LoadLibraryA( "shell32.dll" )) && diff --git a/programs/explorer/explorer_private.h b/programs/explorer/explorer_private.h index 80bc7d0..49400cd 100644 --- a/programs/explorer/explorer_private.h +++ b/programs/explorer/explorer_private.h @@ -22,7 +22,7 @@ #define __WINE_EXPLORER_PRIVATE_H extern void manage_desktop( WCHAR *arg ); -extern void initialize_systray( HMODULE graphics_driver, BOOL using_root ); +extern void initialize_systray( HMODULE graphics_driver, BOOL using_root, BOOL enable_shell ); extern void initialize_appbar(void); extern void do_startmenu( HWND owner ); extern LRESULT menu_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam); diff --git a/programs/explorer/systray.c b/programs/explorer/systray.c index 75b9532..2a6ff14 100644 --- a/programs/explorer/systray.c +++ b/programs/explorer/systray.c @@ -86,7 +86,7 @@ static unsigned int alloc_displayed; static unsigned int nb_displayed; static struct icon **displayed; /* array of currently displayed icons */ -static BOOL hide_systray; +static BOOL hide_systray, enable_shell; static int icon_cx, icon_cy, tray_width; static struct icon *balloon_icon; @@ -352,7 +352,7 @@ static BOOL hide_icon(struct icon *icon) invalidate_icons( icon->display, nb_displayed ); icon->display = -1; - if (!nb_displayed) ShowWindow( tray_window, SW_HIDE ); + if (!nb_displayed && !enable_shell) ShowWindow( tray_window, SW_HIDE ); update_balloon( icon ); update_tooltip_position( icon ); @@ -651,7 +651,7 @@ static void get_system_text_size( const WCHAR *text, SIZE *size ) } /* this function creates the listener window */ -void initialize_systray( HMODULE graphics_driver, BOOL using_root ) +void initialize_systray( HMODULE graphics_driver, BOOL using_root, BOOL arg_enable_shell ) { WNDCLASSEXW class; static const WCHAR classname[] = {'S','h','e','l','l','_','T','r','a','y','W','n','d',0}; @@ -664,6 +664,7 @@ void initialize_systray( HMODULE graphics_driver, BOOL using_root ) icon_cx = GetSystemMetrics( SM_CXSMICON ) + 2*ICON_BORDER; icon_cy = GetSystemMetrics( SM_CYSMICON ) + 2*ICON_BORDER; hide_systray = using_root; + enable_shell = arg_enable_shell; /* register the systray listener window class */ ZeroMemory(&class, sizeof(class)); @@ -699,5 +700,7 @@ void initialize_systray( HMODULE graphics_driver, BOOL using_root ) start_button = CreateWindowW( button_class, start_label, WS_CHILD|WS_VISIBLE|BS_PUSHBUTTON, 0, 0, start_text_size.cx + 8, icon_cy, tray_window, 0, 0, 0 ); + if (enable_shell && !hide_systray) ShowWindow( tray_window, SW_SHOWNA ); + if (hide_systray) do_hide_systray(); }

1 0

Vincent Povirk : explorer: Add a start menu.
by Alexandre Julliard Jan. 8, 2014

Jan. 8, 2014

Module: wine Branch: master Commit: 058765f765c8697a4e90f21669e71b6532682ff2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=058765f765c8697a4e90f2166… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Dec 6 14:16:54 2013 -0600 explorer: Add a start menu. --- programs/explorer/Makefile.in | 1 + programs/explorer/explorer_private.h | 2 + programs/explorer/startmenu.c | 415 ++++++++++++++++++++++++++++++++++ programs/explorer/systray.c | 9 + 4 files changed, 427 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=058765f765c8697a4e90f…

1 0

Vincent Povirk : explorer: Add non-functional start button.
by Alexandre Julliard Jan. 8, 2014

Jan. 8, 2014

1 0

Alexandre Julliard : makefiles: Automatically add the necessary msvcrt flags to the generated rules.
by Alexandre Julliard Jan. 8, 2014

Jan. 8, 2014

Module: wine Branch: master Commit: 3e40fea9d61e7a0c5fe562c0f2d42fa5d971837c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e40fea9d61e7a0c5fe562c0f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 8 12:38:55 2014 +0100 makefiles: Automatically add the necessary msvcrt flags to the generated rules. --- Make.rules.in | 2 +- Make.vars.in | 1 + configure | 2 ++ configure.ac | 2 ++ dlls/crtdll/Makefile.in | 2 -- dlls/msvcirt/msvcirt.c | 1 - dlls/msvcp100/Makefile.in | 2 -- dlls/msvcp100/tests/Makefile.in | 2 -- dlls/msvcp110/Makefile.in | 2 -- dlls/msvcp60/Makefile.in | 2 -- dlls/msvcp60/tests/Makefile.in | 2 -- dlls/msvcp71/Makefile.in | 2 -- dlls/msvcp80/Makefile.in | 2 -- dlls/msvcp90/Makefile.in | 2 -- dlls/msvcp90/tests/Makefile.in | 2 -- dlls/msvcr100/Makefile.in | 2 -- dlls/msvcr100/tests/Makefile.in | 2 -- dlls/msvcr110/Makefile.in | 2 -- dlls/msvcr80/Makefile.in | 2 -- dlls/msvcr90/Makefile.in | 2 -- dlls/msvcr90/tests/Makefile.in | 2 -- dlls/msvcrt/tests/Makefile.in | 3 +-- dlls/msvcrtd/Makefile.in | 2 -- dlls/msvcrtd/tests/Makefile.in | 2 -- loader/Makefile.in | 1 - programs/notepad/Makefile.in | 3 --- programs/regedit/Makefile.in | 3 --- programs/taskmgr/Makefile.in | 3 --- programs/wordpad/Makefile.in | 3 --- programs/xcopy/Makefile.in | 2 -- tools/makedep.c | 31 ++++++++++++++++++++++++------- 31 files changed, 31 insertions(+), 62 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3e40fea9d61e7a0c5fe56…

1 0

Piotr Caban : msvcrt: Handle null mbstr parameter in mbstowcs.
by Alexandre Julliard Jan. 8, 2014

Jan. 8, 2014

Module: wine Branch: master Commit: 544d179434f728fa649648aaad74d93e5abd099f URL: http://source.winehq.org/git/wine.git/?a=commit;h=544d179434f728fa649648aaa… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jan 8 12:13:22 2014 +0100 msvcrt: Handle null mbstr parameter in mbstowcs. --- dlls/msvcrt/mbcs.c | 5 +++++ dlls/msvcrt/tests/string.c | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index b25649b6..e7eaf5e 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -2127,6 +2127,11 @@ MSVCRT_size_t CDECL MSVCRT__mbstowcs_l(MSVCRT_wchar_t *wcstr, const char *mbstr, MSVCRT_pthreadlocinfo locinfo; MSVCRT_size_t i, size; + if(!mbstr) { + *MSVCRT__errno() = MSVCRT_EINVAL; + return -1; + } + if(!locale) locinfo = get_locinfo(); else diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index c11c364..800a06b 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -1635,6 +1635,11 @@ static void test_mbstowcs(void) wOut[4] = '!'; wOut[5] = '\0'; mOut[4] = '!'; mOut[5] = '\0'; + errno = 0xdeadbeef; + ret = mbstowcs(wOut, NULL, 4); + ok(ret == -1, "mbstowcs did not return -1\n"); + ok(errno == EINVAL, "errno = %d\n", errno); + ret = mbstowcs(NULL, mSimple, 0); ok(ret == 4, "mbstowcs did not return 4\n");

1 0

Sergey Guralnik : winedump: Get rid of the MAKE_DLL_RULES in the Makefile.in template.
by Alexandre Julliard Jan. 8, 2014

Jan. 8, 2014

Module: wine Branch: master Commit: 4d13f84903eb227acabeaa90beac3d59dd6f8f31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d13f84903eb227acabeaa90b… Author: Sergey Guralnik <serhio(a)etersoft.ru> Date: Wed Jan 8 12:56:26 2014 +0200 winedump: Get rid of the MAKE_DLL_RULES in the Makefile.in template. --- tools/winedump/output.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tools/winedump/output.c b/tools/winedump/output.c index c7804d0..aff7f66 100644 --- a/tools/winedump/output.c +++ b/tools/winedump/output.c @@ -457,8 +457,7 @@ void output_makefile (void) if (globals.forward_dll) fprintf (makefile, "IMPORTS = %s", globals.forward_dll); - fprintf (makefile, "\n\nC_SRCS = \\\n\t%s_main.c\n\n(a)MAKE_DLL_RULES@\n\n", - OUTPUT_DLL_NAME); + fprintf (makefile, "\n\nC_SRCS = \\\n\t%s_main.c\n", OUTPUT_DLL_NAME); if (globals.forward_dll) fprintf (specfile,"#import %s.dll\n", globals.forward_dll);

1 0

Bruno Jesus : iphlpapi/tests: Add IcmpSendEcho tests.
by Alexandre Julliard Jan. 8, 2014

Jan. 8, 2014

Module: wine Branch: master Commit: 98e1560d498deb5aad34054d41b49e094d148ebc URL: http://source.winehq.org/git/wine.git/?a=commit;h=98e1560d498deb5aad34054d4… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Jan 7 04:00:19 2014 -0200 iphlpapi/tests: Add IcmpSendEcho tests. --- dlls/iphlpapi/tests/iphlpapi.c | 133 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 133 insertions(+) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 0d99e3c..dbf97b2 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -73,6 +73,8 @@ static BOOL (WINAPI *pCancelIPChangeNotify)(LPOVERLAPPED); static DWORD (WINAPI *pGetExtendedTcpTable)(PVOID,PDWORD,BOOL,ULONG,TCP_TABLE_CLASS,ULONG); static DWORD (WINAPI *pGetExtendedUdpTable)(PVOID,PDWORD,BOOL,ULONG,UDP_TABLE_CLASS,ULONG); static DWORD (WINAPI *pSetTcpEntry)(PMIB_TCPROW); +static HANDLE(WINAPI *pIcmpCreateFile)(VOID); +static DWORD (WINAPI *pIcmpSendEcho)(HANDLE,IPAddr,LPVOID,WORD,PIP_OPTION_INFORMATION,LPVOID,DWORD,DWORD); static void loadIPHlpApi(void) { @@ -105,6 +107,8 @@ static void loadIPHlpApi(void) pGetExtendedTcpTable = (void *)GetProcAddress(hLibrary, "GetExtendedTcpTable"); pGetExtendedUdpTable = (void *)GetProcAddress(hLibrary, "GetExtendedUdpTable"); pSetTcpEntry = (void *)GetProcAddress(hLibrary, "SetTcpEntry"); + pIcmpCreateFile = (void *)GetProcAddress(hLibrary, "IcmpCreateFile"); + pIcmpSendEcho = (void *)GetProcAddress(hLibrary, "IcmpSendEcho"); } } @@ -860,6 +864,134 @@ static void testSetTcpEntry(void) "got %u, expected %u\n", ret, ERROR_MR_MID_NOT_FOUND); } +static void testIcmpSendEcho(void) +{ + HANDLE icmp; + char senddata[32], replydata[sizeof(senddata) + sizeof(ICMP_ECHO_REPLY)]; + DWORD ret, error, replysz = sizeof(replydata); + IPAddr address; + + if (!pIcmpSendEcho || !pIcmpCreateFile) + { + win_skip( "ImcpSendEcho or IcmpCreateFile not available\n" ); + return; + } + memset(senddata, 0, sizeof(senddata)); + + address = htonl(INADDR_LOOPBACK); + SetLastError(0xdeadbeef); + ret = pIcmpSendEcho(INVALID_HANDLE_VALUE, address, senddata, sizeof(senddata), NULL, replydata, replysz, 1000); + error = GetLastError(); + ok (!ret, "IcmpSendEcho succeeded unexpectedly\n"); +todo_wine + ok (error == ERROR_INVALID_PARAMETER + || broken(error == ERROR_INVALID_HANDLE) /* <= 2003 */, + "expected 87, got %d\n", error); + + icmp = pIcmpCreateFile(); + if (icmp == INVALID_HANDLE_VALUE) + { + error = GetLastError(); + if (error == ERROR_ACCESS_DENIED) + { + skip ("ICMP is not available.\n"); + return; + } + } + ok (icmp != INVALID_HANDLE_VALUE, "IcmpCreateFile failed unexpectedly with error %d\n", GetLastError()); + + address = 0; + SetLastError(0xdeadbeef); + ret = pIcmpSendEcho(icmp, address, senddata, sizeof(senddata), NULL, replydata, replysz, 1000); + error = GetLastError(); + todo_wine { + ok (!ret, "IcmpSendEcho succeeded unexpectedly\n"); + ok (error == ERROR_INVALID_NETNAME + || broken(error == IP_BAD_DESTINATION) /* <= 2003 */, + "expected 1214, got %d\n", error); + } + + address = htonl(INADDR_LOOPBACK); + if (0) /* crashes in XP */ + { + ret = pIcmpSendEcho(icmp, address, NULL, sizeof(senddata), NULL, replydata, replysz, 1000); + ok (!ret, "IcmpSendEcho succeeded unexpectedly\n"); + } + + SetLastError(0xdeadbeef); + ret = pIcmpSendEcho(icmp, address, senddata, 0, NULL, replydata, replysz, 1000); + error = GetLastError(); + ok (ret, "IcmpSendEcho failed unexpectedly with error %d\n", error); + + SetLastError(0xdeadbeef); + ret = pIcmpSendEcho(icmp, address, NULL, 0, NULL, replydata, replysz, 1000); + error = GetLastError(); + ok (ret, "IcmpSendEcho failed unexpectedly with error %d\n", error); + + if (0) /* crashes in wine, remove IF when fixed */ + { + SetLastError(0xdeadbeef); + ret = pIcmpSendEcho(icmp, address, senddata, sizeof(senddata), NULL, NULL, replysz, 1000); + error = GetLastError(); + ok (!ret, "IcmpSendEcho succeeded unexpectedly\n"); + ok (error == ERROR_INVALID_PARAMETER, "expected 87, got %d\n", error); + } + + SetLastError(0xdeadbeef); + ret = pIcmpSendEcho(icmp, address, senddata, sizeof(senddata), NULL, replydata, 0, 1000); + error = GetLastError(); + ok (!ret, "IcmpSendEcho succeeded unexpectedly\n"); +todo_wine + ok (error == ERROR_INVALID_PARAMETER + || broken(error == ERROR_INSUFFICIENT_BUFFER) /* <= 2003 */, + "expected 87, got %d\n", error); + + SetLastError(0xdeadbeef); + ret = pIcmpSendEcho(icmp, address, senddata, sizeof(senddata), NULL, NULL, 0, 1000); + error = GetLastError(); + ok (!ret, "IcmpSendEcho succeeded unexpectedly\n"); +todo_wine + ok (error == ERROR_INVALID_PARAMETER + || broken(error == ERROR_INSUFFICIENT_BUFFER) /* <= 2003 */, + "expected 87, got %d\n", error); + + SetLastError(0xdeadbeef); + ret = pIcmpSendEcho(icmp, address, senddata, sizeof(senddata), NULL, replydata, sizeof(replydata) - 1, 1000); + error = GetLastError(); + todo_wine { + ok (!ret, "IcmpSendEcho succeeded unexpectedly\n"); + ok (error == IP_GENERAL_FAILURE + || broken(error == IP_BUF_TOO_SMALL) /* <= 2003 */, + "expected 11050, got %d\n", error); + } + + /* in windows >= vista the timeout can't be invalid */ + SetLastError(0xdeadbeef); + ret = pIcmpSendEcho(icmp, address, senddata, sizeof(senddata), NULL, replydata, replysz, 0); + error = GetLastError(); + if (!ret) ok(error == ERROR_INVALID_PARAMETER, "expected 87, got %d\n", error); + + SetLastError(0xdeadbeef); + ret = pIcmpSendEcho(icmp, address, senddata, sizeof(senddata), NULL, replydata, replysz, -1); + error = GetLastError(); + if (!ret) ok(error == ERROR_INVALID_PARAMETER, "expected 87, got %d\n", error); + + /* real ping test */ + SetLastError(0xdeadbeef); + address = htonl(INADDR_LOOPBACK); + ret = pIcmpSendEcho(icmp, address, senddata, sizeof(senddata), NULL, replydata, replysz, 1000); + error = GetLastError(); + if (ret) + { + PICMP_ECHO_REPLY pong = (PICMP_ECHO_REPLY) replydata; + trace ("ping roundtrip: %u ms\n", pong->RoundTripTime); + } + else + { + skip ("Failed to ping with error %d, is lo interface down?.\n", error); + } +} + /* still-to-be-tested NT4-onward functions: CreateIpForwardEntry @@ -892,6 +1024,7 @@ static void testWinNT4Functions(void) testGetTcpTable(); testGetUdpTable(); testSetTcpEntry(); + testIcmpSendEcho(); } static void testGetInterfaceInfo(void)

1 0

Piotr Caban : msvcp110: Fix streamsize parameter size in spec file.
by Alexandre Julliard Jan. 8, 2014

Jan. 8, 2014

Module: wine Branch: master Commit: f1105d3f81054ab7b3d181ceafdc3c1efd7a3b11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1105d3f81054ab7b3d181cea… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jan 8 12:13:36 2014 +0100 msvcp110: Fix streamsize parameter size in spec file. --- dlls/msvcp110/msvcp110.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index e822130..f00cb3e 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -3342,7 +3342,7 @@ @ cdecl -arch=arm ?setp@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@IAAXPA_W0(a)Z(ptr ptr ptr) basic_streambuf_wchar_setp @ thiscall -arch=i386 ?setp@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@IAEXPA_W0(a)Z(ptr ptr ptr) basic_streambuf_wchar_setp @ cdecl -arch=win64 ?setp@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@IEAAXPEA_W0(a)Z(ptr ptr ptr) basic_streambuf_wchar_setp -@ cdecl ?setprecision(a)std@@YA?AU?$_Smanip(a)_J@1(a)_J@Z(ptr long) setprecision +@ cdecl ?setprecision(a)std@@YA?AU?$_Smanip(a)_J@1(a)_J@Z(ptr int64) setprecision @ cdecl -arch=arm ?setstate@?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@QAAXH_N(a)Z(ptr long long) basic_ios_char_setstate_reraise @ thiscall -arch=i386 ?setstate@?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@QAEXH_N(a)Z(ptr long long) basic_ios_char_setstate_reraise @ cdecl -arch=win64 ?setstate@?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@QEAAXH_N(a)Z(ptr long long) basic_ios_char_setstate_reraise @@ -3370,7 +3370,7 @@ @ cdecl -arch=arm ?setstate(a)ios_base@std@@QAAXI(a)Z(ptr long) ios_base_setstate_unsigned @ thiscall -arch=i386 ?setstate(a)ios_base@std@@QAEXI(a)Z(ptr long) ios_base_setstate_unsigned @ cdecl -arch=win64 ?setstate(a)ios_base@std@@QEAAXI(a)Z(ptr long) ios_base_setstate_unsigned -@ cdecl ?setw(a)std@@YA?AU?$_Smanip(a)_J@1(a)_J@Z(ptr long) setw +@ cdecl ?setw(a)std@@YA?AU?$_Smanip(a)_J@1(a)_J@Z(ptr int64) setw @ cdecl -arch=arm ?sgetc@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@QAAHXZ(ptr) basic_streambuf_char_sgetc @ thiscall -arch=i386 ?sgetc@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@QAEHXZ(ptr) basic_streambuf_char_sgetc @ cdecl -arch=win64 ?sgetc@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@QEAAHXZ(ptr) basic_streambuf_char_sgetc

1 0

Alexandre Julliard : makefiles: Generate explicit commands to create object subdirectories.
by Alexandre Julliard Jan. 8, 2014

Jan. 8, 2014

Module: wine Branch: master Commit: ec8e5c610b82369e8111c1c7fa724d29ab03c37f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec8e5c610b82369e8111c1c7f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 8 16:04:33 2014 +0100 makefiles: Generate explicit commands to create object subdirectories. --- tools/makedep.c | 51 +++++++++++++++++++++++++-------------------------- 1 file changed, 25 insertions(+), 26 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 3295359..e8a1161 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -1394,7 +1394,6 @@ static struct strarray output_sources(void) struct strarray c2man_files = empty_strarray; struct strarray implib_objs = empty_strarray; struct strarray includes = empty_strarray; - struct strarray subdirs = empty_strarray; struct strarray phony_targets = empty_strarray; struct strarray all_targets = get_expanded_make_var_array( "PROGRAMS" ); struct strarray targetflags = get_expanded_make_var_array( "TARGETFLAGS" ); @@ -1423,7 +1422,7 @@ static struct strarray output_sources(void) LIST_FOR_EACH_ENTRY( source, &sources, struct incl_file, entry ) { struct strarray extradefs; - char *sourcedep; + char *subdir = NULL; char *obj = xstrdup( source->name ); char *ext = get_extension( obj ); @@ -1432,12 +1431,9 @@ static struct strarray output_sources(void) if (src_dir && strchr( obj, '/' )) { - char *dir = xstrdup( obj ); - *strrchr( dir, '/' ) = 0; - strarray_add_uniq( &subdirs, dir ); - sourcedep = strmake( "%s %s", dir, source->filename ); + subdir = xstrdup( obj ); + *strrchr( subdir, '/' ) = 0; } - else sourcedep = xstrdup( source->filename ); extradefs = get_expanded_make_var_array( strmake( "%s_EXTRADEFS", obj )); @@ -1448,28 +1444,32 @@ static struct strarray output_sources(void) if (find_include_file( header )) { - output( "%s.tab.h: %s\n", obj, sourcedep ); + output( "%s.tab.h: %s\n", obj, source->filename ); + if (subdir) output( "\t$(MKDIR_P) -m 755 %s\n", subdir ); output( "\t$(BISON) $(BISONFLAGS) -p %s_ -o %s.tab.c -d %s\n", obj, obj, source->filename ); output( "%s.tab.c: %s %s\n", obj, source->filename, header ); strarray_add( &clean_files, strmake( "%s.tab.h", obj )); } - else output( "%s.tab.c: %s\n", obj, sourcedep ); + else output( "%s.tab.c: %s\n", obj, source->filename ); + if (subdir) output( "\t$(MKDIR_P) -m 755 %s\n", subdir ); output( "\t$(BISON) $(BISONFLAGS) -p %s_ -o $@ %s\n", obj, source->filename ); free( header ); continue; /* no dependencies */ } else if (!strcmp( ext, "x" )) /* template file */ { - output( "%s.h: $(MAKEXFTMPL) %s\n", obj, sourcedep ); + output( "%s.h: $(MAKEXFTMPL) %s\n", obj, source->filename ); + if (subdir) output( "\t$(MKDIR_P) -m 755 %s\n", subdir ); output( "\t$(MAKEXFTMPL) -H -o $@ %s\n", source->filename ); strarray_add( &clean_files, strmake( "%s.h", obj )); continue; /* no dependencies */ } else if (!strcmp( ext, "l" )) /* lex file */ { - output( "%s.yy.c: %s\n", obj, sourcedep ); + output( "%s.yy.c: %s\n", obj, source->filename ); + if (subdir) output( "\t$(MKDIR_P) -m 755 %s\n", subdir ); output( "\t$(FLEX) $(LEXFLAGS) -o$@ %s\n", source->filename ); continue; /* no dependencies */ } @@ -1477,7 +1477,8 @@ static struct strarray output_sources(void) { if (source->flags & FLAG_RC_PO) { - output( "%s.res: $(WRC) $(ALL_MO_FILES) %s\n", obj, sourcedep ); + output( "%s.res: $(WRC) $(ALL_MO_FILES) %s\n", obj, source->filename ); + if (subdir) output( "\t$(MKDIR_P) -m 755 %s\n", subdir ); output( "\t$(WRC) -o $@ %s", source->filename ); if (is_win16) output_filename( "-m16" ); else output_filenames( targetflags ); @@ -1491,7 +1492,8 @@ static struct strarray output_sources(void) } else { - output( "%s.res: $(WRC) %s\n", obj, sourcedep ); + output( "%s.res: $(WRC) %s\n", obj, source->filename ); + if (subdir) output( "\t$(MKDIR_P) -m 755 %s\n", subdir ); output( "\t$(WRC) -o $@ %s", source->filename ); if (is_win16) output_filename( "-m16" ); else output_filenames( targetflags ); @@ -1506,7 +1508,8 @@ static struct strarray output_sources(void) } else if (!strcmp( ext, "mc" )) /* message file */ { - output( "%s.res: $(WMC) $(ALL_MO_FILES) %s\n", obj, sourcedep ); + output( "%s.res: $(WMC) $(ALL_MO_FILES) %s\n", obj, source->filename ); + if (subdir) output( "\t$(MKDIR_P) -m 755 %s\n", subdir ); output( "\t$(WMC) -U -O res $(PORCFLAGS) -o $@ %s\n", source->filename ); strarray_add( &res_files, strmake( "%s.res", obj )); strarray_add( &mc_files, source->filename ); @@ -1531,6 +1534,7 @@ static struct strarray output_sources(void) if (source->flags & FLAG_IDL_PROXY) strarray_add( &dlldata_files, source->name ); output_filenames( targets ); output( ": $(WIDL)\n" ); + if (subdir) output( "\t$(MKDIR_P) -m 755 %s\n", subdir ); output( "\t$(WIDL) -o $@ %s", source->filename ); output_filenames( targetflags ); output_filenames( includes ); @@ -1539,7 +1543,7 @@ static struct strarray output_sources(void) output_filename( "$(IDLFLAGS)" ); output( "\n" ); output_filenames( targets ); - output( ": %s", sourcedep ); + output( ": %s", source->filename ); } else if (!strcmp( ext, "in" )) /* .in file or man page */ { @@ -1565,7 +1569,8 @@ static struct strarray output_sources(void) strarray_add_uniq( &phony_targets, "install-man-pages" ); } else strarray_add( &clean_files, xstrdup(obj) ); - output( "%s: %s\n", obj, sourcedep ); + output( "%s: %s\n", obj, source->filename ); + if (subdir) output( "\t$(MKDIR_P) -m 755 %s\n", subdir ); output( "\t$(SED_CMD) %s >$@ || ($(RM) $@ && false)\n", source->filename ); output( "%s:", obj ); } @@ -1609,7 +1614,8 @@ static struct strarray output_sources(void) if (source->flags & FLAG_GENERATED) strarray_add( &clean_files, source->filename ); if (source->flags & FLAG_C_IMPLIB) strarray_add( &implib_objs, strmake( "%s.o", obj )); strarray_add( &object_files, strmake( "%s.o", obj )); - output( "%s.o: %s\n", obj, sourcedep ); + output( "%s.o: %s\n", obj, source->filename ); + if (subdir) output( "\t$(MKDIR_P) -m 755 %s\n", subdir ); output( "\t$(CC) -c -o $@ %s", source->filename ); output_filenames( includes ); output_filenames( define_args ); @@ -1620,7 +1626,8 @@ static struct strarray output_sources(void) if (crosstarget && need_cross) { strarray_add( &crossobj_files, strmake( "%s.cross.o", obj )); - output( "%s.cross.o: %s\n", obj, sourcedep ); + output( "%s.cross.o: %s\n", obj, source->filename ); + if (subdir) output( "\t$(MKDIR_P) -m 755 %s\n", subdir ); output( "\t$(CROSSCC) -c -o $@ %s", source->filename ); output_filenames( includes ); output_filenames( define_args ); @@ -1643,7 +1650,6 @@ static struct strarray output_sources(void) output( ":" ); } free( obj ); - free( sourcedep ); for (i = 0; i < source->files_count; i++) output_include( source->files[i], source ); output( "\n" ); @@ -1947,13 +1953,6 @@ static struct strarray output_sources(void) strarray_add( &phony_targets, "clean" ); } - if (subdirs.count) - { - output_filenames( subdirs ); - output( ":\n" ); - output( "\t$(MKDIR_P) -m 755 $@\n" ); - } - if (top_obj_dir) { output( "depend:\n" );

1 0

Henri Verbeet : d3d9/tests: Make sure create_device() returns NULL on failure.
by Alexandre Julliard Jan. 8, 2014

Jan. 8, 2014

Module: wine Branch: master Commit: 86ffd6c4eaacaadceaaa9b47e67c495fff8709e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86ffd6c4eaacaadceaaa9b47e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 8 10:56:16 2014 +0100 d3d9/tests: Make sure create_device() returns NULL on failure. --- dlls/d3d9/tests/visual.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index d4e7bd0..534d8bd 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -177,7 +177,6 @@ static IDirect3DDevice9 *create_device(IDirect3D9 *d3d9) { D3DPRESENT_PARAMETERS present_parameters = {0}; IDirect3DDevice9 *device; - HRESULT hr; present_parameters.Windowed = TRUE; present_parameters.hDeviceWindow = create_window(); @@ -188,14 +187,12 @@ static IDirect3DDevice9 *create_device(IDirect3D9 *d3d9) present_parameters.EnableAutoDepthStencil = TRUE; present_parameters.AutoDepthStencilFormat = D3DFMT_D24S8; - hr = IDirect3D9_CreateDevice(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, - present_parameters.hDeviceWindow, D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, &device); - ok(hr == D3D_OK || hr == D3DERR_NOTAVAILABLE || hr == D3DERR_INVALIDCALL, - "Failed to create a device, hr %#x.\n", hr); - if (FAILED(hr)) - DestroyWindow(present_parameters.hDeviceWindow); + if (SUCCEEDED(IDirect3D9_CreateDevice(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + present_parameters.hDeviceWindow, D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, &device))) + return device; - return device; + DestroyWindow(present_parameters.hDeviceWindow); + return NULL; } static IDirect3DDevice9 *init_d3d9(void)

1 0

Henri Verbeet : wined3d: Fix up the backbuffer count on failure in swapchain_init().
by Alexandre Julliard Jan. 8, 2014

Jan. 8, 2014

Module: wine Branch: master Commit: ddae20b6899e65456750981ba002e426e6d35539 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddae20b6899e65456750981ba… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 8 10:56:15 2014 +0100 wined3d: Fix up the backbuffer count on failure in swapchain_init(). --- dlls/wined3d/swapchain.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index ff2ac64..40fabc6 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -952,6 +952,7 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3 parent, &surface_desc, &swapchain->back_buffers[i]))) { WARN("Failed to create back buffer %u, hr %#x.\n", i, hr); + swapchain->desc.backbuffer_count = i; goto err; } surface_set_swapchain(swapchain->back_buffers[i], swapchain);

1 0

Henri Verbeet : wined3d: Get rid of the unused screen_palents field in struct wined3d_palette.
by Alexandre Julliard Jan. 8, 2014

Jan. 8, 2014

Module: wine Branch: master Commit: 2401a82bdc99fe8daf00ca0683bc1c625cbcfb21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2401a82bdc99fe8daf00ca068… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 8 10:56:14 2014 +0100 wined3d: Get rid of the unused screen_palents field in struct wined3d_palette. --- dlls/wined3d/wined3d_private.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a0cb5bb..0735116 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2951,8 +2951,6 @@ struct wined3d_palette WORD palVersion; /*| */ WORD palNumEntries; /*| LOGPALETTE */ PALETTEENTRY palents[256]; /*| */ - /* This is to store the palette in 'screen format' */ - int screen_palents[256]; DWORD flags; };

1 0

Nikolay Sivov : scrrun: Fill find data on second Next() call before testing it.
by Alexandre Julliard Jan. 8, 2014

Jan. 8, 2014

Module: wine Branch: master Commit: fac0d13ee74979bcfe954ebab66f291efa7eda5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=fac0d13ee74979bcfe954ebab… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 8 12:37:59 2014 +0400 scrrun: Fill find data on second Next() call before testing it. --- dlls/scrrun/filesystem.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index e0c9a34..bfb201c 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -510,6 +510,8 @@ static HRESULT WINAPI foldercoll_enumvariant_Next(IEnumVARIANT *iface, ULONG cel This->data.u.foldercoll.find = handle; } + else if (celt) + FindNextFileW(handle, &data); do { @@ -663,6 +665,8 @@ static HRESULT WINAPI filecoll_enumvariant_Next(IEnumVARIANT *iface, ULONG celt, This->data.u.filecoll.find = handle; } + else if (celt) + FindNextFileW(handle, &data); do {

1 0

Nikolay Sivov : scrrun: Implement Skip() for file and folder collections.
by Alexandre Julliard Jan. 8, 2014

Jan. 8, 2014

Module: wine Branch: master Commit: 64c93f607055c76a5ed4fa8f6a8fa1b68b2b42e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64c93f607055c76a5ed4fa8f6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 8 12:36:29 2014 +0400 scrrun: Implement Skip() for file and folder collections. --- dlls/scrrun/filesystem.c | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 1c0c6c3..eb9073a 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -545,8 +545,16 @@ static HRESULT WINAPI foldercoll_enumvariant_Next(IEnumVARIANT *iface, ULONG cel static HRESULT WINAPI foldercoll_enumvariant_Skip(IEnumVARIANT *iface, ULONG celt) { struct enumvariant *This = impl_from_IEnumVARIANT(iface); - FIXME("(%p)->(%d): stub\n", This, celt); - return E_NOTIMPL; + HANDLE handle = This->data.u.foldercoll.find; + WIN32_FIND_DATAW data; + + TRACE("(%p)->(%d)\n", This, celt); + + while (FindNextFileW(handle, &data) && celt) + if (is_dir_data(&data)) + --celt; + + return celt ? S_FALSE : S_OK; } static HRESULT WINAPI foldercoll_enumvariant_Reset(IEnumVARIANT *iface) @@ -698,8 +706,16 @@ static HRESULT WINAPI filecoll_enumvariant_Next(IEnumVARIANT *iface, ULONG celt, static HRESULT WINAPI filecoll_enumvariant_Skip(IEnumVARIANT *iface, ULONG celt) { struct enumvariant *This = impl_from_IEnumVARIANT(iface); - FIXME("(%p)->(%d): stub\n", This, celt); - return E_NOTIMPL; + HANDLE handle = This->data.u.filecoll.find; + WIN32_FIND_DATAW data; + + TRACE("(%p)->(%d)\n", This, celt); + + while (FindNextFileW(handle, &data) && celt) + if (is_file_data(&data)) + --celt; + + return celt ? S_FALSE : S_OK; } static HRESULT WINAPI filecoll_enumvariant_Reset(IEnumVARIANT *iface)

1 0

Sebastian Lackner : ntdll: Implement condition variable functions using keyed events.
by Alexandre Julliard Jan. 8, 2014

Jan. 8, 2014

Module: wine Branch: master Commit: 5472b9f9ca1a393c0153e256da67798a3afe53c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5472b9f9ca1a393c0153e256d… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Jan 5 03:48:34 2014 +0100 ntdll: Implement condition variable functions using keyed events. --- dlls/ntdll/ntdll.spec | 4 +++ dlls/ntdll/sync.c | 93 +++++++++++++++++++++++++++++++++++++++++++++++++ include/winternl.h | 6 +++- 3 files changed, 102 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 6418671..2e507bb 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -672,6 +672,7 @@ @ stdcall RtlInitUnicodeStringEx(ptr wstr) # @ stub RtlInitializeAtomPackage @ stdcall RtlInitializeBitMap(ptr long long) +@ stdcall RtlInitializeConditionVariable(ptr) @ stub RtlInitializeContext @ stdcall RtlInitializeCriticalSection(ptr) @ stdcall RtlInitializeCriticalSectionAndSpinCount(ptr long) @@ -867,6 +868,7 @@ @ stub RtlSetUserFlagsHeap @ stub RtlSetUserValueHeap @ stdcall RtlSizeHeap(long long ptr) +@ stdcall RtlSleepConditionVariableCS(ptr ptr ptr) @ stub RtlSplay @ stub RtlStartRXact # @ stub RtlStatMemoryStream @@ -932,6 +934,8 @@ # @ stub RtlValidateUnicodeString @ stdcall RtlVerifyVersionInfo(ptr long int64) @ stdcall -arch=x86_64 RtlVirtualUnwind(long long long ptr ptr ptr ptr ptr) +@ stdcall RtlWakeAllConditionVariable(ptr) +@ stdcall RtlWakeConditionVariable(ptr) @ stub RtlWalkFrameChain @ stdcall RtlWalkHeap(long ptr) @ stdcall RtlWow64EnableFsRedirection(long) diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index b05bd19..c94d9c4 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -63,6 +63,17 @@ WINE_DEFAULT_DEBUG_CHANNEL(ntdll); HANDLE keyed_event = NULL; +static inline int interlocked_dec_if_nonzero( int *dest ) +{ + int val, tmp; + for (val = *dest;; val = tmp) + { + if (!val || (tmp = interlocked_cmpxchg( dest, val - 1, val )) == val) + break; + } + return val; +} + /* creates a struct security_descriptor and contained information in one contiguous piece of memory */ NTSTATUS NTDLL_create_struct_sd(PSECURITY_DESCRIPTOR nt_sd, struct security_descriptor **server_sd, data_size_t *server_sd_len) @@ -1410,3 +1421,85 @@ void WINAPI RtlReleaseSRWLockShared( RTL_SRWLOCK *lock ) { FIXME( "%p stub\n", lock ); } + +/*********************************************************************** + * RtlInitializeConditionVariable (NTDLL.@) + * + * Initializes the condition variable with NULL. + * + * PARAMS + * variable [O] condition variable + * + * RETURNS + * Nothing. + */ +void WINAPI RtlInitializeConditionVariable( RTL_CONDITION_VARIABLE *variable ) +{ + variable->Ptr = NULL; +} + +/*********************************************************************** + * RtlWakeConditionVariable (NTDLL.@) + * + * Wakes up one thread waiting on the condition variable. + * + * PARAMS + * variable [I/O] condition variable to wake up. + * + * RETURNS + * Nothing. + * + * NOTES + * The calling thread does not have to own any lock in order to call + * this function. + */ +void WINAPI RtlWakeConditionVariable( RTL_CONDITION_VARIABLE *variable ) +{ + if (interlocked_dec_if_nonzero( (int *)&variable->Ptr )) + NtReleaseKeyedEvent( keyed_event, &variable->Ptr, FALSE, NULL ); +} + +/*********************************************************************** + * RtlWakeAllConditionVariable (NTDLL.@) + * + * See WakeConditionVariable, wakes up all waiting threads. + */ +void WINAPI RtlWakeAllConditionVariable( RTL_CONDITION_VARIABLE *variable ) +{ + int val = interlocked_xchg( (int *)&variable->Ptr, 0 ); + while (val-- > 0) + NtReleaseKeyedEvent( keyed_event, &variable->Ptr, FALSE, NULL ); +} + +/*********************************************************************** + * RtlSleepConditionVariableCS (NTDLL.@) + * + * Atomically releases the critical section and suspends the thread, + * waiting for a Wake(All)ConditionVariable event. Afterwards it enters + * the critical section again and returns. + * + * PARAMS + * variable [I/O] condition variable + * crit [I/O] critical section to leave temporarily + * timeout [I] timeout + * + * RETURNS + * see NtWaitForKeyedEvent for all possible return values. + */ +NTSTATUS WINAPI RtlSleepConditionVariableCS( RTL_CONDITION_VARIABLE *variable, RTL_CRITICAL_SECTION *crit, + const LARGE_INTEGER *timeout ) +{ + NTSTATUS status; + interlocked_xchg_add( (int *)&variable->Ptr, 1 ); + RtlLeaveCriticalSection( crit ); + + status = NtWaitForKeyedEvent( keyed_event, &variable->Ptr, FALSE, timeout ); + if (status != STATUS_SUCCESS) + { + if (!interlocked_dec_if_nonzero( (int *)&variable->Ptr )) + status = NtWaitForKeyedEvent( keyed_event, &variable->Ptr, FALSE, NULL ); + } + + RtlEnterCriticalSection( crit ); + return status; +} diff --git a/include/winternl.h b/include/winternl.h index d93b37a..c840732 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2418,10 +2418,11 @@ NTSYSAPI void WINAPI RtlInitAnsiString(PANSI_STRING,PCSZ); NTSYSAPI NTSTATUS WINAPI RtlInitAnsiStringEx(PANSI_STRING,PCSZ); NTSYSAPI void WINAPI RtlInitUnicodeString(PUNICODE_STRING,PCWSTR); NTSYSAPI NTSTATUS WINAPI RtlInitUnicodeStringEx(PUNICODE_STRING,PCWSTR); +NTSYSAPI void WINAPI RtlInitializeBitMap(PRTL_BITMAP,PULONG,ULONG); +NTSYSAPI void WINAPI RtlInitializeConditionVariable(RTL_CONDITION_VARIABLE *); NTSYSAPI NTSTATUS WINAPI RtlInitializeCriticalSection(RTL_CRITICAL_SECTION *); NTSYSAPI NTSTATUS WINAPI RtlInitializeCriticalSectionAndSpinCount(RTL_CRITICAL_SECTION *,ULONG); NTSYSAPI NTSTATUS WINAPI RtlInitializeCriticalSectionEx(RTL_CRITICAL_SECTION *,ULONG,ULONG); -NTSYSAPI void WINAPI RtlInitializeBitMap(PRTL_BITMAP,PULONG,ULONG); NTSYSAPI void WINAPI RtlInitializeHandleTable(ULONG,ULONG,RTL_HANDLE_TABLE *); NTSYSAPI void WINAPI RtlInitializeResource(LPRTL_RWLOCK); NTSYSAPI void WINAPI RtlInitializeSRWLock(RTL_SRWLOCK*); @@ -2501,6 +2502,7 @@ NTSYSAPI NTSTATUS WINAPI RtlSetSaclSecurityDescriptor(PSECURITY_DESCRIPTOR,BOOL NTSYSAPI NTSTATUS WINAPI RtlSetThreadErrorMode(DWORD,LPDWORD); NTSYSAPI NTSTATUS WINAPI RtlSetTimeZoneInformation(const RTL_TIME_ZONE_INFORMATION*); NTSYSAPI SIZE_T WINAPI RtlSizeHeap(HANDLE,ULONG,const void*); +NTSYSAPI NTSTATUS WINAPI RtlSleepConditionVariableCS(RTL_CONDITION_VARIABLE*,RTL_CRITICAL_SECTION*,const LARGE_INTEGER*); NTSYSAPI NTSTATUS WINAPI RtlStringFromGUID(REFGUID,PUNICODE_STRING); NTSYSAPI LPDWORD WINAPI RtlSubAuthoritySid(PSID,DWORD); NTSYSAPI LPBYTE WINAPI RtlSubAuthorityCountSid(PSID); @@ -2544,6 +2546,8 @@ NTSYSAPI BOOLEAN WINAPI RtlValidAcl(PACL); NTSYSAPI BOOLEAN WINAPI RtlValidSid(PSID); NTSYSAPI BOOLEAN WINAPI RtlValidateHeap(HANDLE,ULONG,LPCVOID); NTSYSAPI NTSTATUS WINAPI RtlVerifyVersionInfo(const RTL_OSVERSIONINFOEXW*,DWORD,DWORDLONG); +NTSYSAPI void WINAPI RtlWakeAllConditionVariable(RTL_CONDITION_VARIABLE *); +NTSYSAPI void WINAPI RtlWakeConditionVariable(RTL_CONDITION_VARIABLE *); NTSYSAPI NTSTATUS WINAPI RtlWalkHeap(HANDLE,PVOID); NTSYSAPI NTSTATUS WINAPI RtlWow64EnableFsRedirection(BOOLEAN); NTSYSAPI NTSTATUS WINAPI RtlWow64EnableFsRedirectionEx(ULONG,ULONG*);

1 0