wine-commits April 2013

wine-commits@winehq.org

2 participants
579 discussions

Henri Verbeet : wined3d: Introduce a wined3d_vertex_pipe_ops structure.
by Alexandre Julliard 25 Apr '13

25 Apr '13

Module: wine Branch: master Commit: 471991eb9a56858b585a48b9a85d7663eb63699e URL: http://source.winehq.org/git/wine.git/?a=commit;h=471991eb9a56858b585a48b9a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 25 12:16:47 2013 +0200 wined3d: Introduce a wined3d_vertex_pipe_ops structure. --- dlls/wined3d/arb_program_shader.c | 23 +++++++++- dlls/wined3d/device.c | 13 ++++-- dlls/wined3d/directx.c | 39 +++++------------ dlls/wined3d/glsl_shader.c | 26 ++++++++++-- dlls/wined3d/shader.c | 21 ++++++++- dlls/wined3d/state.c | 84 ++++++++++++++++++++++++++++--------- dlls/wined3d/wined3d_private.h | 32 +++++++++++++- 7 files changed, 174 insertions(+), 64 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=471991eb9a56858b585a4…

1 0

Henri Verbeet : winex11: Move the desktop process check from X11DRV_ClipCursor() to grab_clipping_window().
by Alexandre Julliard 25 Apr '13

25 Apr '13

Module: wine Branch: master Commit: 76bbf106a28c4caa82873e8450bde7d4adc765bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=76bbf106a28c4caa82873e845… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 25 09:59:42 2013 +0200 winex11: Move the desktop process check from X11DRV_ClipCursor() to grab_clipping_window(). We don't want to clip in the desktop process, but we still need it to call ungrab_clipping_window() if the process that was previously clipping didn't. This can happen for example when fullscreen clipping is enabled, but the corresponding window isn't explicitly destroyed before process exit. --- dlls/winex11.drv/mouse.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index de6672e..168914f 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -362,6 +362,9 @@ static BOOL grab_clipping_window( const RECT *clip ) Window clip_window; HWND msg_hwnd = 0; + if (GetWindowThreadProcessId( GetDesktopWindow(), NULL ) == GetCurrentThreadId()) + return TRUE; /* don't clip in the desktop process */ + if (!data) return FALSE; if (!(clip_window = init_clip_window())) return TRUE; @@ -1378,9 +1381,6 @@ BOOL CDECL X11DRV_ClipCursor( LPCRECT clip ) { if (!clip) clip = &virtual_screen_rect; - if (GetWindowThreadProcessId( GetDesktopWindow(), NULL ) == GetCurrentThreadId()) - return TRUE; /* don't clip in the desktop process */ - if (grab_pointer) { HWND foreground = GetForegroundWindow();

1 0

Dmitry Timoshkov : kernel32: Test LdrShutdownProcess behaviour only after NtTerminateProcess(0) call.
by Alexandre Julliard 25 Apr '13

25 Apr '13

Module: wine Branch: master Commit: e54c49d940996b03602f47622e41baf8f30d9dd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e54c49d940996b03602f47622… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Apr 25 16:37:06 2013 +0900 kernel32: Test LdrShutdownProcess behaviour only after NtTerminateProcess(0) call. --- dlls/kernel32/tests/loader.c | 92 ++++++++++++++--------------------------- 1 files changed, 32 insertions(+), 60 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 6291d9c..5c05d9b 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -1119,11 +1119,16 @@ static BOOL WINAPI dll_entry_point(HINSTANCE hinst, DWORD reason, LPVOID param) trace("dll: %p, DLL_PROCESS_DETACH, %p\n", hinst, param); + if (test_dll_phase == 0 || test_dll_phase == 3) + ok(param != NULL, "dll: param %p\n", param); + else + ok(!param, "dll: param %p\n", param); + if (test_dll_phase == 0) expected_code = 195; else if (test_dll_phase == 3) expected_code = 196; else expected_code = STILL_ACTIVE; - if (test_dll_phase == 3 || test_dll_phase == 4) + if (test_dll_phase == 3) { ret = pRtlDllShutdownInProgress(); ok(ret, "RtlDllShutdownInProgress returned %d\n", ret); @@ -1184,8 +1189,7 @@ static BOOL WINAPI dll_entry_point(HINSTANCE hinst, DWORD reason, LPVOID param) noop_thread_started = 0; SetLastError(0xdeadbeef); handle = CreateThread(NULL, 0, noop_thread_proc, &noop_thread_started, 0, &ret); - /* manual call to LdrShutdownProcess doesn't prevent thread creation */ - if (param && test_dll_phase != 4) + if (param) { ok(!handle || broken(handle != 0) /* before win7 */, "CreateThread should fail\n"); if (!handle) @@ -1199,18 +1203,10 @@ static BOOL WINAPI dll_entry_point(HINSTANCE hinst, DWORD reason, LPVOID param) } else { - /* FIXME: remove once Wine is fixed */ - if (test_dll_phase == 4) todo_wine - { - ok(handle != 0, "CreateThread error %d\n", GetLastError()); - } - else - { ok(handle != 0, "CreateThread error %d\n", GetLastError()); ret = WaitForSingleObject(handle, 1000); ok(ret == WAIT_TIMEOUT, "expected WAIT_TIMEOUT, got %#x\n", ret); ok(!noop_thread_started || broken(noop_thread_started) /* XP64 */, "thread shouldn't start yet\n"); - } CloseHandle(handle); } @@ -1221,8 +1217,7 @@ static BOOL WINAPI dll_entry_point(HINSTANCE hinst, DWORD reason, LPVOID param) noop_thread_started = 0; SetLastError(0xdeadbeef); handle = CreateRemoteThread(process, NULL, 0, noop_thread_proc, &noop_thread_started, 0, &ret); - /* manual call to LdrShutdownProcess doesn't prevent thread creation */ - if (param && test_dll_phase != 4) + if (param) { ok(!handle || broken(handle != 0) /* before win7 */, "CreateRemoteThread should fail\n"); if (!handle) @@ -1236,18 +1231,10 @@ static BOOL WINAPI dll_entry_point(HINSTANCE hinst, DWORD reason, LPVOID param) } else { - /* FIXME: remove once Wine is fixed */ - if (test_dll_phase == 4) todo_wine - { - ok(handle != 0, "CreateRemoteThread error %d\n", GetLastError()); - } - else - { ok(handle != 0, "CreateRemoteThread error %d\n", GetLastError()); ret = WaitForSingleObject(handle, 1000); ok(ret == WAIT_TIMEOUT, "expected WAIT_TIMEOUT, got %#x\n", ret); ok(!noop_thread_started || broken(noop_thread_started) /* XP64 */, "thread shouldn't start yet\n"); - } CloseHandle(handle); } @@ -1277,8 +1264,7 @@ static BOOL WINAPI dll_entry_point(HINSTANCE hinst, DWORD reason, LPVOID param) ret = FreeLibrary(handle); ok(ret, "FreeLibrary error %d\n", GetLastError()); handle = GetModuleHandle("winver.exe"); - /* manual call to LdrShutdownProcess doesn't prevent module unloading */ - if (param && test_dll_phase != 4) + if (param) ok(handle != 0, "winver.exe should not be unloaded\n"); else todo_wine @@ -1450,6 +1436,9 @@ static void child_process(const char *dll_name, DWORD target_offset) ret = pRtlDllShutdownInProgress(); ok(!ret, "RtlDllShutdownInProgress returned %d\n", ret); + hmod = GetModuleHandle(dll_name); + ok(hmod != 0, "DLL should not be unloaded\n"); + SetLastError(0xdeadbeef); thread = CreateThread(NULL, 0, noop_thread_proc, &dummy, 0, &ret); todo_wine @@ -1463,6 +1452,14 @@ todo_wine CloseHandle(thread); } + trace("call LdrShutdownProcess()\n"); + pLdrShutdownProcess(); + + ret = pRtlDllShutdownInProgress(); + ok(ret, "RtlDllShutdownInProgress returned %d\n", ret); + + hmod = GetModuleHandle(dll_name); + ok(hmod != 0, "DLL should not be unloaded\n"); break; case 1: @@ -1471,7 +1468,14 @@ todo_wine ok(!ret, "RtlDllShutdownInProgress returned %d\n", ret); trace("call FreeLibrary(%p)\n", hmod); - FreeLibrary(hmod); + SetLastError(0xdeadbeef); + ret = FreeLibrary(hmod); + ok(ret, "FreeLibrary error %d\n", GetLastError()); + hmod = GetModuleHandle(dll_name); + ok(!hmod, "DLL should be unloaded\n"); + + if (test_dll_phase == 2) + ok(0, "FreeLibrary+ExitProcess should never return\n"); ret = pRtlDllShutdownInProgress(); ok(!ret, "RtlDllShutdownInProgress returned %d\n", ret); @@ -1484,41 +1488,27 @@ todo_wine CloseHandle(stop_event); break; - case 4: - ret = pRtlDllShutdownInProgress(); - ok(!ret, "RtlDllShutdownInProgress returned %d\n", ret); - - trace("call LdrShutdownProcess()\n"); - pLdrShutdownProcess(); - - ret = pRtlDllShutdownInProgress(); - ok(ret, "RtlDllShutdownInProgress returned %d\n", ret); - - break; - default: assert(0); break; } - Sleep(100); - if (test_dll_phase == 0) expected_code = 195; else if (test_dll_phase == 3) expected_code = 196; else expected_code = STILL_ACTIVE; if (expected_code == STILL_ACTIVE) { - ret = WaitForSingleObject(attached_thread[0], 0); + ret = WaitForSingleObject(attached_thread[0], 100); ok(ret == WAIT_TIMEOUT, "expected WAIT_TIMEOUT, got %#x\n", ret); - ret = WaitForSingleObject(attached_thread[1], 0); + ret = WaitForSingleObject(attached_thread[1], 100); ok(ret == WAIT_TIMEOUT, "expected WAIT_TIMEOUT, got %#x\n", ret); } else { - ret = WaitForSingleObject(attached_thread[0], 50); + ret = WaitForSingleObject(attached_thread[0], 100); ok(ret == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %#x\n", ret); - ret = WaitForSingleObject(attached_thread[1], 50); + ret = WaitForSingleObject(attached_thread[1], 100); ok(ret == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %#x\n", ret); } @@ -1703,24 +1693,6 @@ static void test_ExitProcess(void) CloseHandle(pi.hThread); CloseHandle(pi.hProcess); - /* phase 4 */ - *child_failures = -1; - sprintf(cmdline, "\"%s\" loader %s %u 4", argv[0], dll_name, target_offset); - ret = CreateProcess(argv[0], cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); - ok(ret, "CreateProcess(%s) error %d\n", cmdline, GetLastError()); - ret = WaitForSingleObject(pi.hProcess, 30000); - ok(ret == WAIT_OBJECT_0, "child process failed to terminate\n"); - GetExitCodeProcess(pi.hProcess, &ret); -todo_wine - ok(ret == 0 || broken(ret == 195) /* before win7 */, "expected exit code 0, got %u\n", ret); - if (*child_failures) - { - trace("%d failures in child process\n", *child_failures); - winetest_add_failures(*child_failures); - } - CloseHandle(pi.hThread); - CloseHandle(pi.hProcess); - ret = DeleteFile(dll_name); ok(ret, "DeleteFile error %d\n", GetLastError()); }

1 0

Ken Thomases : winemac: Fix an off-by-one error in macdrv_wglChoosePixelFormatARB().
by Alexandre Julliard 25 Apr '13

25 Apr '13

Module: wine Branch: master Commit: a34168edaaffbe722a74299120d86c84eab2eaf2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a34168edaaffbe722a7429912… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Apr 24 20:18:43 2013 -0500 winemac: Fix an off-by-one error in macdrv_wglChoosePixelFormatARB(). --- dlls/winemac.drv/opengl.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index e72281a..5f269fc 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -1917,8 +1917,8 @@ static BOOL macdrv_wglChoosePixelFormatARB(HDC hdc, const int *piAttribIList, else if (accum_bits || accum_red_bits || accum_green_bits || accum_blue_bits || accum_alpha_bits) continue; - piFormats[found++] = i; - TRACE("match: pixel format %d %s\n", i, debugstr_pf(&pixel_formats[i])); + piFormats[found++] = i + 1; + TRACE("match: pixel format %d %s\n", i + 1, debugstr_pf(&pixel_formats[i])); } cant_match:

1 0

Ken Thomases : winemac: Improve logging from wglChoosePixelFormatARB() and wglGetPixelFormatAttribivARB().
by Alexandre Julliard 25 Apr '13

25 Apr '13

Module: wine Branch: master Commit: dfa2ba390d44639dfcb3159b0a0c749e0603f689 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfa2ba390d44639dfcb3159b0… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Apr 24 20:18:29 2013 -0500 winemac: Improve logging from wglChoosePixelFormatARB() and wglGetPixelFormatAttribivARB(). --- dlls/winemac.drv/opengl.c | 143 ++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 141 insertions(+), 2 deletions(-) diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index 095514b..e72281a 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -240,6 +240,116 @@ static int nb_formats, nb_displayable_formats; static void *opengl_handle; +static const char* debugstr_attrib(int attrib, int value) +{ + static const struct { + int attrib; + const char *name; + } attrib_names[] = { +#define ATTRIB(a) { a, #a } + ATTRIB(WGL_ACCELERATION_ARB), + ATTRIB(WGL_ACCUM_ALPHA_BITS_ARB), + ATTRIB(WGL_ACCUM_BITS_ARB), + ATTRIB(WGL_ACCUM_BLUE_BITS_ARB), + ATTRIB(WGL_ACCUM_GREEN_BITS_ARB), + ATTRIB(WGL_ACCUM_RED_BITS_ARB), + ATTRIB(WGL_ALPHA_BITS_ARB), + ATTRIB(WGL_ALPHA_SHIFT_ARB), + ATTRIB(WGL_AUX_BUFFERS_ARB), + ATTRIB(WGL_BIND_TO_TEXTURE_RECTANGLE_RGB_NV), + ATTRIB(WGL_BIND_TO_TEXTURE_RECTANGLE_RGBA_NV), + ATTRIB(WGL_BIND_TO_TEXTURE_RGB_ARB), + ATTRIB(WGL_BIND_TO_TEXTURE_RGBA_ARB), + ATTRIB(WGL_BLUE_BITS_ARB), + ATTRIB(WGL_BLUE_SHIFT_ARB), + ATTRIB(WGL_COLOR_BITS_ARB), + ATTRIB(WGL_DEPTH_BITS_ARB), + ATTRIB(WGL_DOUBLE_BUFFER_ARB), + ATTRIB(WGL_DRAW_TO_BITMAP_ARB), + ATTRIB(WGL_DRAW_TO_PBUFFER_ARB), + ATTRIB(WGL_DRAW_TO_WINDOW_ARB), + ATTRIB(WGL_FRAMEBUFFER_SRGB_CAPABLE_ARB), + ATTRIB(WGL_GREEN_BITS_ARB), + ATTRIB(WGL_GREEN_SHIFT_ARB), + ATTRIB(WGL_NEED_PALETTE_ARB), + ATTRIB(WGL_NEED_SYSTEM_PALETTE_ARB), + ATTRIB(WGL_NUMBER_OVERLAYS_ARB), + ATTRIB(WGL_NUMBER_PIXEL_FORMATS_ARB), + ATTRIB(WGL_NUMBER_UNDERLAYS_ARB), + ATTRIB(WGL_PIXEL_TYPE_ARB), + ATTRIB(WGL_RED_BITS_ARB), + ATTRIB(WGL_RED_SHIFT_ARB), + ATTRIB(WGL_SAMPLE_BUFFERS_ARB), + ATTRIB(WGL_SAMPLES_ARB), + ATTRIB(WGL_SHARE_ACCUM_ARB), + ATTRIB(WGL_SHARE_DEPTH_ARB), + ATTRIB(WGL_SHARE_STENCIL_ARB), + ATTRIB(WGL_STENCIL_BITS_ARB), + ATTRIB(WGL_STEREO_ARB), + ATTRIB(WGL_SUPPORT_GDI_ARB), + ATTRIB(WGL_SUPPORT_OPENGL_ARB), + ATTRIB(WGL_SWAP_LAYER_BUFFERS_ARB), + ATTRIB(WGL_SWAP_METHOD_ARB), + ATTRIB(WGL_TRANSPARENT_ALPHA_VALUE_ARB), + ATTRIB(WGL_TRANSPARENT_ARB), + ATTRIB(WGL_TRANSPARENT_BLUE_VALUE_ARB), + ATTRIB(WGL_TRANSPARENT_GREEN_VALUE_ARB), + ATTRIB(WGL_TRANSPARENT_INDEX_VALUE_ARB), + ATTRIB(WGL_TRANSPARENT_RED_VALUE_ARB), +#undef ATTRIB + }; + int i; + const char *attrib_name = NULL; + const char *value_name = NULL; + + for (i = 0; i < sizeof(attrib_names) / sizeof(attrib_names[0]); i++) + { + if (attrib_names[i].attrib == attrib) + { + attrib_name = attrib_names[i].name; + break; + } + } + + if (!attrib_name) + attrib_name = wine_dbg_sprintf("Attrib 0x%04x", attrib); + + switch (attrib) + { + case WGL_ACCELERATION_ARB: + switch (value) + { + case WGL_FULL_ACCELERATION_ARB: value_name = "WGL_FULL_ACCELERATION_ARB"; break; + case WGL_GENERIC_ACCELERATION_ARB: value_name = "WGL_GENERIC_ACCELERATION_ARB"; break; + case WGL_NO_ACCELERATION_ARB: value_name = "WGL_NO_ACCELERATION_ARB"; break; + } + break; + case WGL_PIXEL_TYPE_ARB: + switch (value) + { + case WGL_TYPE_COLORINDEX_ARB: value_name = "WGL_TYPE_COLORINDEX_ARB"; break; + case WGL_TYPE_RGBA_ARB: value_name = "WGL_TYPE_RGBA_ARB"; break; + case WGL_TYPE_RGBA_FLOAT_ARB: value_name = "WGL_TYPE_RGBA_FLOAT_ARB"; break; + case WGL_TYPE_RGBA_UNSIGNED_FLOAT_EXT: value_name = "WGL_TYPE_RGBA_UNSIGNED_FLOAT_EXT"; break; + } + break; + case WGL_SWAP_METHOD_ARB: + switch (value) + { + case WGL_SWAP_COPY_ARB: value_name = "WGL_SWAP_COPY_ARB"; break; + case WGL_SWAP_EXCHANGE_ARB: value_name = "WGL_SWAP_EXCHANGE_ARB"; break; + case WGL_SWAP_UNDEFINED_ARB: value_name = "WGL_SWAP_UNDEFINED_ARB"; break; + } + break; + } + + if (!value_name) + value_name = wine_dbg_sprintf("%d / 0x%04x", value, value); + + return wine_dbg_sprintf("%40s: %s", attrib_name, value_name); +} + + static BOOL get_renderer_property(CGLRendererInfoObj renderer_info, GLint renderer_index, CGLRendererProperty property, GLint *value) { @@ -1530,6 +1640,8 @@ static BOOL macdrv_wglChoosePixelFormatARB(HDC hdc, const int *piAttribIList, int attr = iptr[0]; int value = iptr[1]; + TRACE("%s\n", debugstr_attrib(attr, value)); + switch (attr) { case WGL_DRAW_TO_WINDOW_ARB: @@ -1724,11 +1836,36 @@ static BOOL macdrv_wglChoosePixelFormatARB(HDC hdc, const int *piAttribIList, break; default: - WARN("invalid attribute %x\n", iptr[0]); + WARN("invalid attribute %s\n", debugstr_attrib(attr, value)); return GL_FALSE; } } + TRACE("required: w/p/a %s/%s/%s col/r/g/b/a %d%s/%d/%d/%d/%d srgb %d ac %d/%d/%d/%d/%d dp/stn/ax/b/db/str %u/%u/%u/%s/%s/%s samp %u/%u\n", + valid.window ? (pf.window ? "1" : "0") : "?", + valid.pbuffer ? (pf.pbuffer ? "1" : "0") : "?", + valid.accelerated ? (pf.accelerated ? "1" : "0") : "?", + color_bits, + float_color == -1 ? "?" : float_color ? "f" : "", + red_bits, + green_bits, + blue_bits, + alpha_bits, + (int)srgb, + accum_bits, + accum_red_bits, + accum_green_bits, + accum_blue_bits, + accum_alpha_bits, + pf.depth_bits, + pf.stencil_bits, + pf.aux_buffers, + valid.backing_store ? (pf.backing_store ? "1" : "0") : "?", + valid.double_buffer ? (pf.double_buffer ? "1" : "0") : "?", + valid.stereo ? (pf.stereo ? "1" : "0") : "?", + pf.sample_buffers, + pf.samples); + for (i = 0; i < nb_formats && found < nMaxFormats; i++) { const struct color_mode *mode; @@ -1781,6 +1918,7 @@ static BOOL macdrv_wglChoosePixelFormatARB(HDC hdc, const int *piAttribIList, continue; piFormats[found++] = i; + TRACE("match: pixel format %d %s\n", i, debugstr_pf(&pixel_formats[i])); } cant_match: @@ -2021,6 +2159,7 @@ static BOOL macdrv_wglGetPixelFormatAttribivARB(HDC hdc, int iPixelFormat, int i if (nAttributes == 1 && piAttributes[0] == WGL_NUMBER_PIXEL_FORMATS_ARB) { piValues[0] = nb_formats; + TRACE("%s\n", debugstr_attrib(piAttributes[0], piValues[0])); return GL_TRUE; } @@ -2285,7 +2424,7 @@ static BOOL macdrv_wglGetPixelFormatAttribivARB(HDC hdc, int iPixelFormat, int i return GL_FALSE; } - TRACE("piAttributes[%d] (%x) -> %x\n", i, piAttributes[i], piValues[i]); + TRACE("%s\n", debugstr_attrib(piAttributes[i], piValues[i])); } return GL_TRUE;

1 0

Ken Thomases : winemac: If an app opens a window shortly after its systray icon is clicked, activate it.
by Alexandre Julliard 25 Apr '13

25 Apr '13

Module: wine Branch: master Commit: 1c7a2ba33b8601ee2758a55f97f40d10bbc35a5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c7a2ba33b8601ee2758a55f9… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Apr 24 16:10:10 2013 -0500 winemac: If an app opens a window shortly after its systray icon is clicked, activate it. The Mac driver doesn't normally steal focus, but a click on the systray icon counts as the user giving permission. --- dlls/winemac.drv/cocoa_window.m | 8 +++++--- dlls/winemac.drv/macdrv.h | 1 + dlls/winemac.drv/macdrv_cocoa.h | 2 +- dlls/winemac.drv/systray.c | 8 ++++++++ dlls/winemac.drv/window.c | 10 +++++++++- 5 files changed, 24 insertions(+), 5 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index e89dee5..65d7bc5 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -856,7 +856,7 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) macdrv_release_event(event); } - - (void) makeFocused + - (void) makeFocused:(BOOL)activate { WineApplicationController* controller = [WineApplicationController sharedController]; NSArray* screens; @@ -889,6 +889,8 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) if (front && [front levelWhenActive] > [self levelWhenActive]) [self setLevelWhenActive:[front levelWhenActive]]; } + if (activate) + [NSApp activateIgnoringOtherApps:YES]; [self orderFront:nil]; [controller wineWindow:self ordered:NSWindowAbove relativeTo:nil]; causing_becomeKeyWindow = TRUE; @@ -1804,12 +1806,12 @@ void macdrv_window_use_per_pixel_alpha(macdrv_window w, int use_per_pixel_alpha) * orders it front and, if its frame was not within the desktop bounds, * Cocoa will typically move it on-screen. */ -void macdrv_give_cocoa_window_focus(macdrv_window w) +void macdrv_give_cocoa_window_focus(macdrv_window w, int activate) { WineWindow* window = (WineWindow*)w; OnMainThread(^{ - [window makeFocused]; + [window makeFocused:activate]; }); } diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index bdbe8d1..aec7a02 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -88,6 +88,7 @@ enum macdrv_window_messages WM_MACDRV_UPDATE_DESKTOP_RECT, WM_MACDRV_RESET_DEVICE_METRICS, WM_MACDRV_DISPLAYCHANGE, + WM_MACDRV_ACTIVATE_ON_FOLLOWING_FOCUS, }; struct macdrv_thread_data diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index 2c0ee9d..39f229d 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -353,7 +353,7 @@ extern void macdrv_set_window_color_key(macdrv_window w, CGFloat keyRed, CGFloat CGFloat keyBlue) DECLSPEC_HIDDEN; extern void macdrv_clear_window_color_key(macdrv_window w) DECLSPEC_HIDDEN; extern void macdrv_window_use_per_pixel_alpha(macdrv_window w, int use_per_pixel_alpha) DECLSPEC_HIDDEN; -extern void macdrv_give_cocoa_window_focus(macdrv_window w) DECLSPEC_HIDDEN; +extern void macdrv_give_cocoa_window_focus(macdrv_window w, int activate) DECLSPEC_HIDDEN; extern macdrv_view macdrv_create_view(macdrv_window w, CGRect rect) DECLSPEC_HIDDEN; extern void macdrv_dispose_view(macdrv_view v) DECLSPEC_HIDDEN; extern void macdrv_set_view_window_and_frame(macdrv_view v, macdrv_window w, CGRect rect) DECLSPEC_HIDDEN; diff --git a/dlls/winemac.drv/systray.c b/dlls/winemac.drv/systray.c index b45e311..dc0f99b 100644 --- a/dlls/winemac.drv/systray.c +++ b/dlls/winemac.drv/systray.c @@ -325,6 +325,14 @@ void macdrv_status_item_clicked(const macdrv_event *event) { UINT down; + if (!SendMessageW(icon->owner, WM_MACDRV_ACTIVATE_ON_FOLLOWING_FOCUS, 0, 0) && + GetLastError() == ERROR_INVALID_WINDOW_HANDLE) + { + WARN("window %p was destroyed, removing icon 0x%x\n", icon->owner, icon->id); + delete_icon(icon); + return; + } + if (event->status_item_clicked.count == 1) { down = WM_LBUTTONDOWN; diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 987aa34..3353749 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -42,6 +42,8 @@ static CRITICAL_SECTION win_data_section = { &critsect_debug, -1, 0, 0, 0, 0 }; static CFMutableDictionaryRef win_datas; +DWORD activate_on_focus_time; + void CDECL macdrv_SetFocus(HWND hwnd); @@ -855,8 +857,9 @@ void CDECL macdrv_SetFocus(HWND hwnd) if (data->cocoa_window && data->on_screen) { + BOOL activate = activate_on_focus_time && (GetTickCount() - activate_on_focus_time < 2000); /* Set Mac focus */ - macdrv_give_cocoa_window_focus(data->cocoa_window); + macdrv_give_cocoa_window_focus(data->cocoa_window, activate); } release_win_data(data); @@ -1226,6 +1229,11 @@ LRESULT CDECL macdrv_WindowMessage(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) } SendMessageW(hwnd, WM_DISPLAYCHANGE, wp, lp); return 0; + case WM_MACDRV_ACTIVATE_ON_FOLLOWING_FOCUS: + activate_on_focus_time = GetTickCount(); + if (!activate_on_focus_time) activate_on_focus_time = 1; + TRACE("WM_MACDRV_ACTIVATE_ON_FOLLOWING_FOCUS time %u\n", activate_on_focus_time); + break; } FIXME("unrecognized window msg %x hwnd %p wp %lx lp %lx\n", msg, hwnd, wp, lp);

1 0

Jacek Caban : winegecko.php: Added 2.21-beta1 release.
by Alexandre Julliard 25 Apr '13

25 Apr '13

Module: tools Branch: master Commit: a6611c31119e427cf892c3c7defad77e945d6d97 URL: http://source.winehq.org/git/tools.git/?a=commit;h=a6611c31119e427cf892c3c7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 25 11:58:59 2013 +0200 winegecko.php: Added 2.21-beta1 release. --- winegecko.php | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/winegecko.php b/winegecko.php index 8f4186e..34f0f36 100644 --- a/winegecko.php +++ b/winegecko.php @@ -72,7 +72,9 @@ $aFileSizes = array( '1.8-x86'=>17774592, '1.8-x86_64'=>18238976, '1.9-x86'=>19060224, - '1.9-x86_64'=>19622400 + '1.9-x86_64'=>19622400, + '2.21-beta1-x86'=>20875264, + '2.21-beta1-x86_64'=>21648896 ); // Exact size of the file:

1 0

Sergey Guralnik : extrac32: Add /D switch support.
by Alexandre Julliard 24 Apr '13

24 Apr '13

Module: wine Branch: master Commit: 9d08045ad1f8766aeee18c9c0d83647fff3515b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d08045ad1f8766aeee18c9c0… Author: Sergey Guralnik <serhio(a)etersoft.ru> Date: Mon Apr 22 10:43:17 2013 +0300 extrac32: Add /D switch support. --- programs/extrac32/extrac32.c | 46 ++++++++++++++++++++++++++++++++--------- 1 files changed, 36 insertions(+), 10 deletions(-) diff --git a/programs/extrac32/extrac32.c b/programs/extrac32/extrac32.c index 2126c04..63205e8 100644 --- a/programs/extrac32/extrac32.c +++ b/programs/extrac32/extrac32.c @@ -31,6 +31,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(extrac32); static BOOL force_mode; +static BOOL show_content; static void create_target_directory(LPWSTR Target) { @@ -56,12 +57,37 @@ static UINT WINAPI ExtCabCallback(PVOID Context, UINT Notification, UINT_PTR Par { case SPFILENOTIFY_FILEINCABINET: pInfo = (FILE_IN_CABINET_INFO_W*)Param1; - lstrcpyW(pInfo->FullTargetName, (LPCWSTR)Context); - lstrcatW(pInfo->FullTargetName, pInfo->NameInCabinet); - /* SetupIterateCabinet() doesn't create full path to target by itself, - so we should do it manually */ - create_target_directory(pInfo->FullTargetName); - return FILEOP_DOIT; + if(show_content) + { + FILETIME ft; + SYSTEMTIME st; + CHAR date[12], time[12], buf[2 * MAX_PATH]; + int count; + DWORD dummy; + + /* DosDate and DosTime already represented at local time */ + DosDateTimeToFileTime(pInfo->DosDate, pInfo->DosTime, &ft); + FileTimeToSystemTime(&ft, &st); + GetDateFormatA(0, 0, &st, "MM'-'dd'-'yyyy", date, sizeof date); + GetTimeFormatA(0, 0, &st, "HH':'mm':'ss", time, sizeof time); + count = wsprintfA(buf, "%s %s %c%c%c%c %15u %S\n", date, time, + pInfo->DosAttribs & FILE_ATTRIBUTE_ARCHIVE ? 'A' : '-', + pInfo->DosAttribs & FILE_ATTRIBUTE_HIDDEN ? 'H' : '-', + pInfo->DosAttribs & FILE_ATTRIBUTE_READONLY ? 'R' : '-', + pInfo->DosAttribs & FILE_ATTRIBUTE_SYSTEM ? 'S' : '-', + pInfo->FileSize, pInfo->NameInCabinet); + WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), buf, count, &dummy, NULL); + return FILEOP_SKIP; + } + else + { + lstrcpyW(pInfo->FullTargetName, (LPCWSTR)Context); + lstrcatW(pInfo->FullTargetName, pInfo->NameInCabinet); + /* SetupIterateCabinet() doesn't create full path to target by itself, + so we should do it manually */ + create_target_directory(pInfo->FullTargetName); + return FILEOP_DOIT; + } case SPFILENOTIFY_FILEEXTRACTED: pFilePaths = (FILEPATHS_W*)Param1; WINE_TRACE("Extracted %s\n", wine_dbgstr_w(pFilePaths->Target)); @@ -281,14 +307,14 @@ int PASCAL wWinMain(HINSTANCE hInstance, HINSTANCE prev, LPWSTR cmdline, int sho /* Copy file */ copy_file(cabfile, path); break; + case 'D': + /* Display CAB archive */ + show_content = TRUE; + /* Fall through */ case 'E': /* Extract CAB archive */ extract(cabfile, path); break; - case 'D': - /* Display CAB archive */ - WINE_FIXME("/D not implemented\n"); - break; } return 0; }

1 0

Alistair Leslie-Hughes : oledb32: Implement DataConvert DBTYPE_BOOL-> VARIANT.
by Alexandre Julliard 24 Apr '13

24 Apr '13

Module: wine Branch: master Commit: b4b45471ca988fa6a75967a1ffbef71cc8cf70ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4b45471ca988fa6a75967a1f… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Apr 18 14:36:34 2013 +1000 oledb32: Implement DataConvert DBTYPE_BOOL->VARIANT. --- dlls/oledb32/convert.c | 5 +++++ dlls/oledb32/tests/convert.c | 11 +++++++++++ 2 files changed, 16 insertions(+), 0 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index f2c4c29..07b9342 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -752,6 +752,11 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, switch(src_type) { + case DBTYPE_BOOL: + V_VT(v) = VT_BOOL; + V_BOOL(v) = *(VARIANT_BOOL*)src; + hr = S_OK; + break; case DBTYPE_I4: V_VT(v) = VT_I4; V_I4(v) = *(signed int*)src; diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index 51dc0f6..58b6965 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -2564,6 +2564,7 @@ static void test_converttovar(void) DATE date; INT i4; LARGE_INTEGER i8; + VARIANT_BOOL boolean = VARIANT_TRUE; hr = CoCreateInstance(&CLSID_OLEDB_CONVERSIONLIBRARY, NULL, CLSCTX_INPROC_SERVER, &IID_IDataConvert, (void**)&convert); if(FAILED(hr)) @@ -2617,6 +2618,16 @@ static void test_converttovar(void) V_VT(&dst) = VT_EMPTY; dst_len = 0; dst_status = DBSTATUS_S_DEFAULT; + hr = IDataConvert_DataConvert(convert, DBTYPE_BOOL, DBTYPE_VARIANT, sizeof(boolean), &dst_len, &boolean, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == sizeof(dst), "got %ld\n", dst_len); + ok(V_VT(&dst) == VT_BOOL, "got %d\n", V_VT(&dst)); + ok(V_BOOL(&dst) == VARIANT_TRUE, "got %d\n", V_BOOL(&dst)); + + V_VT(&dst) = VT_EMPTY; + dst_len = 0; + dst_status = DBSTATUS_S_DEFAULT; i4 = 123; hr = IDataConvert_DataConvert(convert, DBTYPE_I4, DBTYPE_VARIANT, sizeof(i4), &dst_len, &i4, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); ok(hr == S_OK, "got %08x\n", hr);

1 0

Piotr Caban : wininet: Load persistent cookies from other paths in get_cookie function.
by Alexandre Julliard 24 Apr '13

24 Apr '13

Module: wine Branch: master Commit: 103693e43b97d9133ab8d0f9b5cacc8f7c540b81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=103693e43b97d9133ab8d0f9b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Apr 24 15:43:31 2013 +0200 wininet: Load persistent cookies from other paths in get_cookie function. --- dlls/wininet/cookie.c | 29 +++++++++++++++++++++++++++-- 1 files changed, 27 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c index 61aa53b..d20ad26 100644 --- a/dlls/wininet/cookie.c +++ b/dlls/wininet/cookie.c @@ -533,8 +533,11 @@ static void COOKIE_deleteDomain(cookie_domain *deadDomain) DWORD get_cookie(const WCHAR *host, const WCHAR *path, WCHAR *cookie_data, DWORD *size) { + static const WCHAR empty_path[] = { '/',0 }; + unsigned cnt = 0, len, name_len, domain_count = 0, cookie_count = 0; - WCHAR *ptr = cookie_data; + WCHAR *ptr, subpath[INTERNET_MAX_PATH_LENGTH]; + const WCHAR *p; cookie_domain *domain; FILETIME tm; @@ -542,8 +545,30 @@ DWORD get_cookie(const WCHAR *host, const WCHAR *path, WCHAR *cookie_data, DWORD EnterCriticalSection(&cookie_cs); - load_persistent_cookie(host, path); + len = strlenW(host); + p = host+len; + while(p>host && p[-1]!='.') p--; + while(p != host) { + p--; + while(p>host && p[-1]!='.') p--; + if(p == host) break; + + load_persistent_cookie(p, empty_path); + } + + len = strlenW(path); + assert(len+1 < INTERNET_MAX_PATH_LENGTH); + memcpy(subpath, path, (len+1)*sizeof(WCHAR)); + ptr = subpath+len; + do { + *ptr = 0; + load_persistent_cookie(host, subpath); + + ptr--; + while(ptr>subpath && ptr[-1]!='/') ptr--; + }while(ptr != subpath); + ptr = cookie_data; LIST_FOR_EACH_ENTRY(domain, &domain_list, cookie_domain, entry) { struct list *cursor, *cursor2;

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
58
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2013