January 2014 - Wine-Commits

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