wine-commits January 2014

wine-commits@winehq.org

3 participants
814 discussions

Martin Storsjo : api-ms-win-core-errorhandling-l1-1-1: Add stub dll.
by Alexandre Julliard 08 Jan '14

08 Jan '14

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-debug-l1-1-1: Add stub dll.
by Alexandre Julliard 08 Jan '14

08 Jan '14

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-processthreads-l1-1-1: Add stub dll.
by Alexandre Julliard 08 Jan '14

08 Jan '14

Module: wine Branch: master Commit: 7918f968f17bc73e7a0c60024826b930fac8dd73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7918f968f17bc73e7a0c60024… Author: Martin Storsjo <martin(a)martin.st> Date: Wed Jan 8 14:48:21 2014 +0200 api-ms-win-core-processthreads-l1-1-1: Add stub dll. --- configure | 2 + configure.ac | 1 + .../Makefile.in | 1 + .../api-ms-win-core-processthreads-l1-1-1.spec | 63 ++++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 68 insertions(+) diff --git a/configure b/configure index b1449ac..5eae8a0 100755 --- a/configure +++ b/configure @@ -855,6 +855,7 @@ enable_advpack enable_amstream 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_winrt_error_l1_1_0 enable_api_ms_win_core_winrt_string_l1_1_0 enable_api_ms_win_downlevel_advapi32_l1_1_0 @@ -16566,6 +16567,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-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 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 10e9921..58ebafc 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-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-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-processthreads-l1-1-1/Makefile.in b/dlls/api-ms-win-core-processthreads-l1-1-1/Makefile.in new file mode 100644 index 0000000..590aac8 --- /dev/null +++ b/dlls/api-ms-win-core-processthreads-l1-1-1/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-processthreads-l1-1-1.dll diff --git a/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec b/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec new file mode 100644 index 0000000..c9054d20 --- /dev/null +++ b/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec @@ -0,0 +1,63 @@ +@ stdcall CreateProcessA(str str ptr ptr long long ptr str ptr ptr) kernel32.CreateProcessA +@ stub CreateProcessAsUserW +@ stdcall CreateProcessW(wstr wstr ptr ptr long long ptr wstr ptr ptr) kernel32.CreateProcessW +@ stdcall CreateRemoteThread(long ptr long ptr long long ptr) kernel32.CreateRemoteThread +@ stub CreateRemoteThreadEx +@ stdcall CreateThread(ptr long ptr long long ptr) kernel32.CreateThread +@ stub DeleteProcThreadAttributeList +@ stdcall ExitProcess(long) kernel32.ExitProcess +@ stdcall ExitThread(long) kernel32.ExitThread +@ stdcall FlushInstructionCache(long long long) kernel32.FlushInstructionCache +@ stdcall FlushProcessWriteBuffers() kernel32.FlushProcessWriteBuffers +@ stdcall -norelay GetCurrentProcess() kernel32.GetCurrentProcess +@ stdcall -norelay GetCurrentProcessId() kernel32.GetCurrentProcessId +@ stdcall GetCurrentProcessorNumber() kernel32.GetCurrentProcessorNumber +@ stub GetCurrentProcessorNumberEx +@ stdcall -norelay GetCurrentThread() kernel32.GetCurrentThread +@ stdcall -norelay GetCurrentThreadId() kernel32.GetCurrentThreadId +@ stub GetCurrentThreadStackLimits +@ stdcall GetExitCodeProcess(long ptr) kernel32.GetExitCodeProcess +@ stdcall GetExitCodeThread(long ptr) kernel32.GetExitCodeThread +@ stdcall GetPriorityClass(long) kernel32.GetPriorityClass +@ stdcall GetProcessHandleCount(long ptr) kernel32.GetProcessHandleCount +@ stdcall GetProcessId(long) kernel32.GetProcessId +@ stub GetProcessIdOfThread +@ stub GetProcessMitigationPolicy +@ stdcall GetProcessTimes(long ptr ptr ptr ptr) kernel32.GetProcessTimes +@ stdcall GetProcessVersion(long) kernel32.GetProcessVersion +@ stdcall GetStartupInfoW(ptr) kernel32.GetStartupInfoW +@ stdcall GetThreadContext(long ptr) kernel32.GetThreadContext +@ stdcall GetThreadId(ptr) kernel32.GetThreadId +@ stub GetThreadIdealProcessorEx +@ stdcall GetThreadPriority(long) kernel32.GetThreadPriority +@ stdcall GetThreadPriorityBoost(long ptr) kernel32.GetThreadPriorityBoost +@ stdcall GetThreadTimes(long ptr ptr ptr ptr) kernel32.GetThreadTimes +@ stub InitializeProcThreadAttributeList +@ stdcall IsProcessorFeaturePresent(long) kernel32.IsProcessorFeaturePresent +@ stdcall OpenProcess(long long long) kernel32.OpenProcess +@ stub OpenProcessToken +@ stdcall OpenThread(long long long) kernel32.OpenThread +@ stub OpenThreadToken +@ stdcall ProcessIdToSessionId(long ptr) kernel32.ProcessIdToSessionId +@ stub QueryProcessAffinityUpdateMode +@ stdcall QueueUserAPC(ptr long long) kernel32.QueueUserAPC +@ stdcall ResumeThread(long) kernel32.ResumeThread +@ stdcall SetPriorityClass(long long) kernel32.SetPriorityClass +@ stub SetProcessAffinityUpdateMode +@ stub SetProcessMitigationPolicy +@ stdcall SetProcessShutdownParameters(long long) kernel32.SetProcessShutdownParameters +@ stdcall SetThreadContext(long ptr) kernel32.SetThreadContext +@ stub SetThreadIdealProcessorEx +@ stdcall SetThreadPriority(long long) kernel32.SetThreadPriority +@ stdcall SetThreadPriorityBoost(long long) kernel32.SetThreadPriorityBoost +@ stdcall SetThreadStackGuarantee(ptr) kernel32.SetThreadStackGuarantee +@ stub SetThreadToken +@ stdcall SuspendThread(long) kernel32.SuspendThread +@ stdcall SwitchToThread() kernel32.SwitchToThread +@ stdcall TerminateProcess(long long) kernel32.TerminateProcess +@ stdcall TerminateThread(long long) kernel32.TerminateThread +@ stdcall TlsAlloc() kernel32.TlsAlloc +@ stdcall TlsFree(long) kernel32.TlsFree +@ stdcall TlsGetValue(long) kernel32.TlsGetValue +@ stdcall TlsSetValue(long ptr) kernel32.TlsSetValue +@ stub UpdateProcThreadAttribute diff --git a/tools/make_specfiles b/tools/make_specfiles index dbfa5e3..89c8f9f 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -136,6 +136,7 @@ my @dll_groups = "kernel32", "api-ms-win-downlevel-normaliz-l1-1-0", "api-ms-win-core-processthreads-l1-1-0", + "api-ms-win-core-processthreads-l1-1-1", ], [ "ole32",

1 0

Vincent Povirk : explorer: Default to showing the systray if the desktop is named "shell".
by Alexandre Julliard 08 Jan '14

08 Jan '14

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

Vincent Povirk : explorer: Add a registry setting to always show the systray.
by Alexandre Julliard 08 Jan '14

08 Jan '14

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 run dialog to start menu.
by Alexandre Julliard 08 Jan '14

08 Jan '14

1 0

Vincent Povirk : explorer: Add a start menu.
by Alexandre Julliard 08 Jan '14

08 Jan '14

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 08 Jan '14

08 Jan '14

1 0

Sergey Guralnik : winedump: Get rid of the MAKE_DLL_RULES in the Makefile.in template.
by Alexandre Julliard 08 Jan '14

08 Jan '14

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@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 08 Jan '14

08 Jan '14

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

← Newer
1
...
61
62
63
64
65
66
67
...
82
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2014