December 2013 - Wine-commits

Ken Thomases : winemac: While a window is being dragged, suppress mouse events and disable cursor clipping and warping.
by Alexandre Julliard 12 Dec '13

12 Dec '13

Module: wine Branch: master Commit: b3cc34e5b0a3e40288e7b9888773dc6aeb6dd37d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3cc34e5b0a3e40288e7b9888… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Dec 11 12:50:47 2013 -0600 winemac: While a window is being dragged, suppress mouse events and disable cursor clipping and warping. --- dlls/winemac.drv/cocoa_app.h | 2 ++ dlls/winemac.drv/cocoa_app.m | 39 +++++++++++++++++++++++++++++++++++---- 2 files changed, 37 insertions(+), 4 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.h b/dlls/winemac.drv/cocoa_app.h index 07a4bc8..cf168c1 100644 --- a/dlls/winemac.drv/cocoa_app.h +++ b/dlls/winemac.drv/cocoa_app.h @@ -89,6 +89,8 @@ enum { NSImage* applicationIcon; BOOL beenActive; + + NSMutableSet* windowsBeingDragged; } @property (nonatomic) CGEventSourceKeyboardType keyboardType; diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index c9f51d6..857c019 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -154,6 +154,8 @@ int macdrv_err_on; warpRecords = [[NSMutableArray alloc] init]; + windowsBeingDragged = [[NSMutableSet alloc] init]; + if (!requests || !requestsManipQueue || !eventQueues || !eventQueuesLock || !keyWindows || !originalDisplayModes || !latentDisplayModes || !warpRecords) { @@ -173,6 +175,7 @@ int macdrv_err_on; - (void) dealloc { + [windowsBeingDragged release]; [cursor release]; [screenFrameCGRects release]; [applicationIcon release]; @@ -1258,7 +1261,9 @@ int macdrv_err_on; { BOOL ret; - if (clippingCursor) + if ([windowsBeingDragged count]) + ret = FALSE; + else if (clippingCursor) { [self clipCursorLocation:&pos]; @@ -1335,7 +1340,7 @@ int macdrv_err_on; - (void) updateCursorClippingState { - if (clippingCursor && [NSApp isActive]) + if (clippingCursor && [NSApp isActive] && ![windowsBeingDragged count]) [self activateCursorClipping]; else [self deactivateCursorClipping]; @@ -1395,7 +1400,9 @@ int macdrv_err_on; WineWindow* targetWindow; BOOL drag = [anEvent type] != NSMouseMoved; - if (mouseCaptureWindow) + if ([windowsBeingDragged count]) + targetWindow = nil; + else if (mouseCaptureWindow) targetWindow = mouseCaptureWindow; else if (drag) targetWindow = (WineWindow*)[anEvent window]; @@ -1620,7 +1627,9 @@ int macdrv_err_on; } } - if (mouseCaptureWindow) + if ([windowsBeingDragged count]) + window = nil; + else if (mouseCaptureWindow) window = mouseCaptureWindow; if ([window isKindOfClass:[WineWindow class]]) @@ -1861,6 +1870,26 @@ int macdrv_err_on; [window postKeyEvent:anEvent]; } } + else if (type == NSAppKitDefined) + { + short subtype = [anEvent subtype]; + + // These subtypes are not documented but they appear to mean + // "a window is being dragged" and "a window is no longer being + // dragged", respectively. + if (subtype == 20 || subtype == 21) + { + WineWindow* window = (WineWindow*)[anEvent window]; + if ([window isKindOfClass:[WineWindow class]]) + { + if (subtype == 20) + [windowsBeingDragged addObject:window]; + else + [windowsBeingDragged removeObject:window]; + [self updateCursorClippingState]; + } + } + } return ret; } @@ -1917,6 +1946,8 @@ int macdrv_err_on; [self updateFullscreenWindows]; }); } + [windowsBeingDragged removeObject:window]; + [self updateCursorClippingState]; }]; [nc addObserver:self

1 0

Ken Thomases : winemac: Send WM_{ENTER, EXIT}SIZEMOVE before/ after window dragging and run an internal event loop during.
by Alexandre Julliard 12 Dec '13

12 Dec '13

Module: wine Branch: master Commit: f068e329c1fe45a6a55c7a3ea013740dbb4f41db URL: http://source.winehq.org/git/wine.git/?a=commit;h=f068e329c1fe45a6a55c7a3ea… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Dec 11 12:50:55 2013 -0600 winemac: Send WM_{ENTER, EXIT}SIZEMOVE before/after window dragging and run an internal event loop during. This simulates some of what would happen if user32 were managing the drag. The click in the caption would cause WM_SYSCOMMAND/SC_MOVE. The processing of that message is synchronous and doesn't return until the move is complete. Some games require that "blocking" in the internal event loop to prevent them from misbehaving during the drag. --- dlls/winemac.drv/cocoa_app.m | 13 +++++++ dlls/winemac.drv/event.c | 13 ++++++- dlls/winemac.drv/macdrv.h | 3 ++ dlls/winemac.drv/macdrv_cocoa.h | 2 + dlls/winemac.drv/window.c | 73 +++++++++++++++++++++++++++++++++++++- 5 files changed, 101 insertions(+), 3 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 857c019..ce43e27 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -1882,11 +1882,24 @@ int macdrv_err_on; WineWindow* window = (WineWindow*)[anEvent window]; if ([window isKindOfClass:[WineWindow class]]) { + macdrv_event* event; + int eventType; + if (subtype == 20) + { [windowsBeingDragged addObject:window]; + eventType = WINDOW_DRAG_BEGIN; + } else + { [windowsBeingDragged removeObject:window]; + eventType = WINDOW_DRAG_END; + } [self updateCursorClippingState]; + + event = macdrv_create_event(eventType, window); + [window.queue postEvent:event]; + macdrv_release_event(event); } } } diff --git a/dlls/winemac.drv/event.c b/dlls/winemac.drv/event.c index 77df582..13f55f5 100644 --- a/dlls/winemac.drv/event.c +++ b/dlls/winemac.drv/event.c @@ -51,6 +51,8 @@ static const char *dbgstr_event(int type) "WINDOW_BROUGHT_FORWARD", "WINDOW_CLOSE_REQUESTED", "WINDOW_DID_UNMINIMIZE", + "WINDOW_DRAG_BEGIN", + "WINDOW_DRAG_END", "WINDOW_FRAME_CHANGED", "WINDOW_GOT_FOCUS", "WINDOW_LOST_FOCUS", @@ -114,6 +116,8 @@ static macdrv_event_mask get_event_mask(DWORD mask) event_mask |= event_mask_for_type(QUERY_EVENT); event_mask |= event_mask_for_type(RELEASE_CAPTURE); event_mask |= event_mask_for_type(WINDOW_BROUGHT_FORWARD); + event_mask |= event_mask_for_type(WINDOW_DRAG_BEGIN); + event_mask |= event_mask_for_type(WINDOW_DRAG_END); event_mask |= event_mask_for_type(WINDOW_MINIMIZE_REQUESTED); event_mask |= event_mask_for_type(WINDOW_RESIZE_ENDED); } @@ -243,6 +247,12 @@ void macdrv_handle_event(const macdrv_event *event) case WINDOW_DID_UNMINIMIZE: macdrv_window_did_unminimize(hwnd); break; + case WINDOW_DRAG_BEGIN: + macdrv_window_drag_begin(hwnd); + break; + case WINDOW_DRAG_END: + macdrv_window_drag_end(hwnd); + break; case WINDOW_FRAME_CHANGED: macdrv_window_frame_changed(hwnd, event); break; @@ -307,7 +317,8 @@ DWORD CDECL macdrv_MsgWaitForMultipleObjectsEx(DWORD count, const HANDLE *handle } if (data->current_event && data->current_event->type != QUERY_EVENT && - data->current_event->type != APP_QUIT_REQUESTED) + data->current_event->type != APP_QUIT_REQUESTED && + data->current_event->type != WINDOW_DRAG_BEGIN) event_mask = 0; /* don't process nested events */ if (process_events(data->queue, event_mask)) ret = count - 1; diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index 32a342b..2234cca 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -140,6 +140,7 @@ struct macdrv_win_data unsigned int ulw_layered : 1; /* has UpdateLayeredWindow() been called for window? */ unsigned int per_pixel_alpha : 1; /* is window using per-pixel alpha? */ unsigned int minimized : 1; /* is window minimized? */ + unsigned int being_dragged : 1; /* is window being dragged under Cocoa's control? */ struct window_surface *surface; struct window_surface *unminimized_surface; }; @@ -167,6 +168,8 @@ extern void macdrv_window_minimize_requested(HWND hwnd) DECLSPEC_HIDDEN; extern void macdrv_window_did_unminimize(HWND hwnd) DECLSPEC_HIDDEN; extern void macdrv_window_brought_forward(HWND hwnd) DECLSPEC_HIDDEN; extern void macdrv_window_resize_ended(HWND hwnd) DECLSPEC_HIDDEN; +extern void macdrv_window_drag_begin(HWND hwnd) DECLSPEC_HIDDEN; +extern void macdrv_window_drag_end(HWND hwnd) DECLSPEC_HIDDEN; extern BOOL query_resize_start(HWND hwnd) DECLSPEC_HIDDEN; extern BOOL query_min_max_info(HWND hwnd) DECLSPEC_HIDDEN; diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index f7ffc50..5073db8 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -191,6 +191,8 @@ enum { WINDOW_BROUGHT_FORWARD, WINDOW_CLOSE_REQUESTED, WINDOW_DID_UNMINIMIZE, + WINDOW_DRAG_BEGIN, + WINDOW_DRAG_END, WINDOW_FRAME_CHANGED, WINDOW_GOT_FOCUS, WINDOW_LOST_FOCUS, diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 6360c32..bd710ce 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -1681,6 +1681,7 @@ void macdrv_window_frame_changed(HWND hwnd, const macdrv_event *event) HWND parent; UINT flags = SWP_NOACTIVATE | SWP_NOZORDER; int width, height; + BOOL being_dragged; if (!hwnd) return; if (!(data = get_win_data(hwnd))) return; @@ -1719,16 +1720,17 @@ void macdrv_window_frame_changed(HWND hwnd, const macdrv_event *event) TRACE("%p resizing from (%dx%d) to (%dx%d)\n", hwnd, data->window_rect.right - data->window_rect.left, data->window_rect.bottom - data->window_rect.top, width, height); + being_dragged = data->being_dragged; release_win_data(data); if (event->window_frame_changed.fullscreen) flags |= SWP_NOSENDCHANGING; if (!(flags & SWP_NOSIZE) || !(flags & SWP_NOMOVE)) { - if (!event->window_frame_changed.in_resize) + if (!event->window_frame_changed.in_resize && !being_dragged) SendMessageW(hwnd, WM_ENTERSIZEMOVE, 0, 0); SetWindowPos(hwnd, 0, rect.left, rect.top, width, height, flags); - if (!event->window_frame_changed.in_resize) + if (!event->window_frame_changed.in_resize && !being_dragged) SendMessageW(hwnd, WM_EXITSIZEMOVE, 0, 0); } } @@ -1916,6 +1918,73 @@ void macdrv_window_resize_ended(HWND hwnd) } +/*********************************************************************** + * macdrv_window_drag_begin + * + * Handler for WINDOW_DRAG_BEGIN events. + */ +void macdrv_window_drag_begin(HWND hwnd) +{ + struct macdrv_win_data *data; + MSG msg; + + TRACE("win %p\n", hwnd); + + if (!(data = get_win_data(hwnd))) return; + if (data->being_dragged) goto done; + + data->being_dragged = 1; + release_win_data(data); + + SendMessageW(hwnd, WM_ENTERSIZEMOVE, 0, 0); + + while (GetMessageW(&msg, 0, 0, 0)) + { + if (!CallMsgFilterW(&msg, MSGF_SIZE) && msg.message != WM_KEYDOWN && + msg.message != WM_MOUSEMOVE && msg.message != WM_LBUTTONDOWN && msg.message != WM_LBUTTONUP) + { + TranslateMessage(&msg); + DispatchMessageW(&msg); + } + + if (msg.message == WM_EXITSIZEMOVE) break; + } + + TRACE("done\n"); + + if ((data = get_win_data(hwnd))) + data->being_dragged = 0; + +done: + release_win_data(data); +} + + +/*********************************************************************** + * macdrv_window_drag_end + * + * Handler for WINDOW_DRAG_END events. + */ +void macdrv_window_drag_end(HWND hwnd) +{ + struct macdrv_win_data *data; + BOOL being_dragged; + + TRACE("win %p\n", hwnd); + + if (!(data = get_win_data(hwnd))) return; + being_dragged = data->being_dragged; + release_win_data(data); + + if (being_dragged) + { + /* Post this rather than sending it, so that the message loop in + macdrv_window_drag_begin() will see it. */ + PostMessageW(hwnd, WM_EXITSIZEMOVE, 0, 0); + } +} + + struct quit_info { HWND *wins; UINT capacity;

1 0

Andrew Eikum : dinput: Fix logging typos.
by Alexandre Julliard 12 Dec '13

12 Dec '13

Module: wine Branch: master Commit: 46cb582a71a0342f6a049c183512a1c9c6fc90cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=46cb582a71a0342f6a049c183… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Dec 11 16:10:59 2013 -0600 dinput: Fix logging typos. --- dlls/dinput/joystick_linuxinput.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 3bf922f..76adabc 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -205,19 +205,19 @@ static void find_joydevs(void) if (ioctl(fd, EVIOCGBIT(0, sizeof(joydev.evbits)), joydev.evbits) == -1) { - WARN("ioct(EVIOCGBIT, 0) failed: %d %s\n", errno, strerror(errno)); + WARN("ioctl(EVIOCGBIT, 0) failed: %d %s\n", errno, strerror(errno)); close(fd); continue; } if (ioctl(fd, EVIOCGBIT(EV_ABS, sizeof(joydev.absbits)), joydev.absbits) == -1) { - WARN("ioct(EVIOCGBIT, EV_ABS) failed: %d %s\n", errno, strerror(errno)); + WARN("ioctl(EVIOCGBIT, EV_ABS) failed: %d %s\n", errno, strerror(errno)); close(fd); continue; } if (ioctl(fd, EVIOCGBIT(EV_KEY, sizeof(joydev.keybits)), joydev.keybits) == -1) { - WARN("ioct(EVIOCGBIT, EV_KEY) failed: %d %s\n", errno, strerror(errno)); + WARN("ioctl(EVIOCGBIT, EV_KEY) failed: %d %s\n", errno, strerror(errno)); close(fd); continue; } @@ -296,7 +296,7 @@ static void find_joydevs(void) } if (ioctl(fd, EVIOCGID, &device_id) == -1) - WARN("ioct(EVIOCGBIT, EV_ABS) failed: %d %s\n", errno, strerror(errno)); + WARN("ioctl(EVIOCGID) failed: %d %s\n", errno, strerror(errno)); else { joydev.vendor_id = device_id.vendor;

1 0

Dmitry Timoshkov : msiexec: Make sure that SERVICE_STOPPED status is really sent to SCM.
by Alexandre Julliard 12 Dec '13

12 Dec '13

Module: wine Branch: master Commit: 2fe08ed67fdba9922e79108176d55c6506818f81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fe08ed67fdba9922e7910817… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Dec 12 14:39:56 2013 +0900 msiexec: Make sure that SERVICE_STOPPED status is really sent to SCM. --- programs/msiexec/service.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/msiexec/service.c b/programs/msiexec/service.c index fdd29bd..59dfd0e 100644 --- a/programs/msiexec/service.c +++ b/programs/msiexec/service.c @@ -92,7 +92,7 @@ static void WINAPI ServiceCtrlHandler(DWORD code) UpdateSCMStatus(SERVICE_STOP_PENDING, NO_ERROR, 0); KillService(); state = SERVICE_STOPPED; - return; + break; default: fprintf(stderr, "Unhandled service control code: %d\n", code); break;

1 0

Henri Verbeet : wined3d: Fix the source swizzle for WINED3DSIH_LOG and WINED3DSIH_LOGP.
by Alexandre Julliard 12 Dec '13

12 Dec '13

Module: wine Branch: master Commit: 27dc41d0dc31f02476a008cbe1a517bc9a425a30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27dc41d0dc31f02476a008cbe… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Dec 12 10:23:29 2013 +0100 wined3d: Fix the source swizzle for WINED3DSIH_LOG and WINED3DSIH_LOGP. --- dlls/d3d8/tests/visual.c | 22 ++++++++-------------- dlls/wined3d/glsl_shader.c | 2 +- 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index f7afd74..7b6c178 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -1774,16 +1774,15 @@ static void test_scalar_instructions(IDirect3DDevice8 *device) const char *name; const DWORD *byte_code; D3DCOLOR color; - BOOL todo; } test_data[] = { - {"rcp_test", rcp_test, D3DCOLOR_ARGB(0x00, 0x80, 0x80, 0x80), FALSE}, - {"rsq_test", rsq_test, D3DCOLOR_ARGB(0x00, 0xb4, 0xb4, 0xb4), FALSE}, - {"exp_test", exp_test, D3DCOLOR_ARGB(0x00, 0x40, 0x40, 0x40), FALSE}, - {"expp_test", expp_test, D3DCOLOR_ARGB(0x00, 0x40, 0x40, 0x40), FALSE}, - {"log_test", log_test, D3DCOLOR_ARGB(0x00, 0xff, 0xff, 0xff), TRUE}, - {"logp_test", logp_test, D3DCOLOR_ARGB(0x00, 0xff, 0xff, 0xff), TRUE}, + {"rcp_test", rcp_test, D3DCOLOR_ARGB(0x00, 0x80, 0x80, 0x80)}, + {"rsq_test", rsq_test, D3DCOLOR_ARGB(0x00, 0xb4, 0xb4, 0xb4)}, + {"exp_test", exp_test, D3DCOLOR_ARGB(0x00, 0x40, 0x40, 0x40)}, + {"expp_test", expp_test, D3DCOLOR_ARGB(0x00, 0x40, 0x40, 0x40)}, + {"log_test", log_test, D3DCOLOR_ARGB(0x00, 0xff, 0xff, 0xff)}, + {"logp_test", logp_test, D3DCOLOR_ARGB(0x00, 0xff, 0xff, 0xff)}, }; unsigned int i; DWORD shader; @@ -1808,13 +1807,8 @@ static void test_scalar_instructions(IDirect3DDevice8 *device) ok(SUCCEEDED(hr), "%s: Failed to end scene, hr %#x.\n", test_data[i].name, hr); color = getPixelColor(device, 320, 240); - if (test_data[i].todo) - todo_wine ok(color_match(color, test_data[i].color, 4), - "%s: Got unexpected color 0x%08x, expected 0x%08x.\n", - test_data[i].name, color, test_data[i].color); - else - ok(color_match(color, test_data[i].color, 4), "%s: Got unexpected color 0x%08x, expected 0x%08x.\n", - test_data[i].name, color, test_data[i].color); + ok(color_match(color, test_data[i].color, 4), "%s: Got unexpected color 0x%08x, expected 0x%08x.\n", + test_data[i].name, color, test_data[i].color); hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "%s: Failed to present, hr %#x.\n", test_data[i].name, hr); diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index f778217..8fdbb68 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2601,7 +2601,7 @@ static void shader_glsl_log(const struct wined3d_shader_instruction *ins) dst_write_mask = shader_glsl_append_dst(buffer, ins); dst_size = shader_glsl_get_write_mask_size(dst_write_mask); - shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_0, &src0_param); + shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_3, &src0_param); if (dst_size > 1) {

1 0

Henri Verbeet : ddraw: Keep a reference to the palette in the surface.
by Alexandre Julliard 12 Dec '13

12 Dec '13

Module: wine Branch: master Commit: 1f0bb534ec24fa7d11fb6cd2030505a76a2495ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f0bb534ec24fa7d11fb6cd20… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Dec 12 10:23:30 2013 +0100 ddraw: Keep a reference to the palette in the surface. --- dlls/ddraw/ddraw_private.h | 1 + dlls/ddraw/palette.c | 4 +- dlls/ddraw/surface.c | 105 ++++++++++++---------------------------- dlls/wined3d/palette.c | 18 ++----- dlls/wined3d/wined3d.spec | 3 +- dlls/wined3d/wined3d_private.h | 1 - include/wine/wined3d.h | 3 +- 7 files changed, 40 insertions(+), 95 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1f0bb534ec24fa7d11fb6…

1 0

Henri Verbeet : ddraw: Don' t set the palette on attached backbuffers in ddraw_surface7_SetPalette().
by Alexandre Julliard 12 Dec '13

12 Dec '13

Module: wine Branch: master Commit: 9651079ff9bd32547408d1b7b7e0e14ff994371e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9651079ff9bd32547408d1b7b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Dec 12 10:23:31 2013 +0100 ddraw: Don't set the palette on attached backbuffers in ddraw_surface7_SetPalette(). Tests show this is just wrong. This patch fixes a regression introduced by commit 74e3f516bc331205474835811d3984b9c53b0f35. --- dlls/ddraw/surface.c | 29 ----------------------------- 1 files changed, 0 insertions(+), 29 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 6ed335e..a29f068 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -4695,7 +4695,6 @@ static HRESULT WINAPI ddraw_surface7_SetPalette(IDirectDrawSurface7 *iface, IDir struct ddraw_surface *surface = impl_from_IDirectDrawSurface7(iface); struct ddraw_palette *palette_impl = unsafe_impl_from_IDirectDrawPalette(palette); struct ddraw_palette *prev; - HRESULT hr; TRACE("iface %p, palette %p.\n", iface, palette); @@ -4721,34 +4720,6 @@ static HRESULT WINAPI ddraw_surface7_SetPalette(IDirectDrawSurface7 *iface, IDir wined3d_surface_set_palette(surface->ddraw->wined3d_frontbuffer, palette_impl ? palette_impl->wineD3DPalette : NULL); - /* If this is a front buffer, also update the back buffers - * TODO: How do things work for palettized cube textures? */ - if (surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_FRONTBUFFER) - { - /* For primary surfaces the tree is just a list, so the simpler scheme fits too */ - DDSCAPS2 caps2 = { DDSCAPS_FLIP, 0, 0, 0 }; - struct ddraw_surface *current = surface; - - for (;;) - { - IDirectDrawSurface7 *attach; - - if (FAILED(hr = ddraw_surface7_GetAttachedSurface(&current->IDirectDrawSurface7_iface, &caps2, &attach))) - break; - - current = impl_from_IDirectDrawSurface7(attach); - if (current == surface) - { - ddraw_surface7_Release(attach); - break; - } - - TRACE("Setting palette on %p.\n", attach); - ddraw_surface7_SetPalette(attach, palette); - ddraw_surface7_Release(attach); - } - } - wined3d_mutex_unlock(); return DD_OK;

1 0

Henri Verbeet : ddraw: Store the palette flags in the ddraw palette.
by Alexandre Julliard 12 Dec '13

12 Dec '13

Module: wine Branch: master Commit: bf7f80f4b343fa014f56acd049fb5a473a531b5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf7f80f4b343fa014f56acd04… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Dec 12 10:23:32 2013 +0100 ddraw: Store the palette flags in the ddraw palette. --- dlls/ddraw/ddraw_private.h | 5 ++--- dlls/ddraw/palette.c | 17 ++--------------- dlls/wined3d/palette.c | 7 ------- dlls/wined3d/wined3d.spec | 1 - include/wine/wined3d.h | 1 - 5 files changed, 4 insertions(+), 27 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index ce08db7..b24376d 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -379,9 +379,8 @@ struct ddraw_palette LONG ref; struct wined3d_palette *wineD3DPalette; - - /* IDirectDrawPalette fields */ - IUnknown *ifaceToRelease; + IUnknown *ifaceToRelease; + DWORD flags; }; static inline struct ddraw_palette *impl_from_IDirectDrawPalette(IDirectDrawPalette *iface) diff --git a/dlls/ddraw/palette.c b/dlls/ddraw/palette.c index 5e53af5..0c9534d 100644 --- a/dlls/ddraw/palette.c +++ b/dlls/ddraw/palette.c @@ -130,20 +130,6 @@ static HRESULT WINAPI ddraw_palette_Initialize(IDirectDrawPalette *iface, return DDERR_ALREADYINITIALIZED; } -/***************************************************************************** - * IDirectDrawPalette::GetCaps - * - * Returns the palette description - * - * Params: - * Caps: Address to store the caps at - * - * Returns: - * D3D_OK on success - * DDERR_INVALIDPARAMS if Caps is NULL - * For more details, see IWineD3DPalette::GetCaps - * - *****************************************************************************/ static HRESULT WINAPI ddraw_palette_GetCaps(IDirectDrawPalette *iface, DWORD *caps) { struct ddraw_palette *palette = impl_from_IDirectDrawPalette(iface); @@ -151,7 +137,7 @@ static HRESULT WINAPI ddraw_palette_GetCaps(IDirectDrawPalette *iface, DWORD *ca TRACE("iface %p, caps %p.\n", iface, caps); wined3d_mutex_lock(); - *caps = wined3d_palette_get_flags(palette->wineD3DPalette); + *caps = palette->flags; wined3d_mutex_unlock(); return D3D_OK; @@ -257,6 +243,7 @@ HRESULT ddraw_palette_init(struct ddraw_palette *palette, palette->IDirectDrawPalette_iface.lpVtbl = &ddraw_palette_vtbl; palette->ref = 1; + palette->flags = flags; if (FAILED(hr = wined3d_palette_create(ddraw->wined3d_device, flags, entries, &palette->wineD3DPalette))) { diff --git a/dlls/wined3d/palette.c b/dlls/wined3d/palette.c index 20ff3f9..555a962 100644 --- a/dlls/wined3d/palette.c +++ b/dlls/wined3d/palette.c @@ -145,13 +145,6 @@ HRESULT CDECL wined3d_palette_set_entries(struct wined3d_palette *palette, return WINED3D_OK; } -DWORD CDECL wined3d_palette_get_flags(const struct wined3d_palette *palette) -{ - TRACE("palette %p.\n", palette); - - return palette->flags; -} - static HRESULT wined3d_palette_init(struct wined3d_palette *palette, struct wined3d_device *device, DWORD flags, const PALETTEENTRY *entries) { diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index c3bf2d1..bbd5775 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -159,7 +159,6 @@ @ cdecl wined3d_palette_create(ptr long ptr ptr) @ cdecl wined3d_palette_decref(ptr) @ cdecl wined3d_palette_get_entries(ptr long long long ptr) -@ cdecl wined3d_palette_get_flags(ptr) @ cdecl wined3d_palette_incref(ptr) @ cdecl wined3d_palette_set_entries(ptr long long long ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index bd41e8a..1c85396 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2239,7 +2239,6 @@ HRESULT __cdecl wined3d_palette_create(struct wined3d_device *device, DWORD flag ULONG __cdecl wined3d_palette_decref(struct wined3d_palette *palette); HRESULT __cdecl wined3d_palette_get_entries(const struct wined3d_palette *palette, DWORD flags, DWORD start, DWORD count, PALETTEENTRY *entries); -DWORD __cdecl wined3d_palette_get_flags(const struct wined3d_palette *palette); ULONG __cdecl wined3d_palette_incref(struct wined3d_palette *palette); HRESULT __cdecl wined3d_palette_set_entries(struct wined3d_palette *palette, DWORD flags, DWORD start, DWORD count, const PALETTEENTRY *entries);

1 0

Henri Verbeet : ddraw: Set DDPCAPS_PRIMARYSURFACE when attaching a palette to the primary surface .
by Alexandre Julliard 12 Dec '13

12 Dec '13

Module: wine Branch: master Commit: d5863f7f407b3fb5b8f5b5e32b42daccb34dc33e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5863f7f407b3fb5b8f5b5e32… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Dec 12 10:23:33 2013 +0100 ddraw: Set DDPCAPS_PRIMARYSURFACE when attaching a palette to the primary surface. --- dlls/ddraw/surface.c | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index a29f068..09dbb9c 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -4708,6 +4708,17 @@ static HRESULT WINAPI ddraw_surface7_SetPalette(IDirectDrawSurface7 *iface, IDir wined3d_mutex_lock(); prev = surface->palette; + if (surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) + { + if (prev) + prev->flags &= ~DDPCAPS_PRIMARYSURFACE; + if (palette_impl) + palette_impl->flags |= DDPCAPS_PRIMARYSURFACE; + /* Update the wined3d frontbuffer if this is the primary. */ + if (surface->ddraw->wined3d_frontbuffer) + wined3d_surface_set_palette(surface->ddraw->wined3d_frontbuffer, + palette_impl ? palette_impl->wineD3DPalette : NULL); + } if (palette_impl) IDirectDrawPalette_AddRef(&palette_impl->IDirectDrawPalette_iface); if (prev) @@ -4715,11 +4726,6 @@ static HRESULT WINAPI ddraw_surface7_SetPalette(IDirectDrawSurface7 *iface, IDir surface->palette = palette_impl; wined3d_surface_set_palette(surface->wined3d_surface, palette_impl ? palette_impl->wineD3DPalette : NULL); - /* Update the wined3d frontbuffer if this is the primary. */ - if ((surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) && surface->ddraw->wined3d_frontbuffer) - wined3d_surface_set_palette(surface->ddraw->wined3d_frontbuffer, - palette_impl ? palette_impl->wineD3DPalette : NULL); - wined3d_mutex_unlock(); return DD_OK;

1 0

Dmitry Timoshkov : crypt32: Add support for decoding serial number property in the certificate attributes .
by Alexandre Julliard 12 Dec '13

12 Dec '13

Module: wine Branch: master Commit: ba1b572da28e5bb0059446043f474960d510ea90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba1b572da28e5bb0059446043… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Dec 11 17:16:15 2013 +0900 crypt32: Add support for decoding serial number property in the certificate attributes. --- dlls/crypt32/oid.c | 2 ++ dlls/crypt32/str.c | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/oid.c b/dlls/crypt32/oid.c index 4c3f95f..d5c2953 100644 --- a/dlls/crypt32/oid.c +++ b/dlls/crypt32/oid.c @@ -1107,6 +1107,7 @@ static const WCHAR SpcFinancialCriteria[] = { 'S','p','c','F','i','n','a','n','c static const WCHAR SpcMinimalCriteria[] = { 'S','p','c','M','i','n','i','m','a','l','C','r','i','t','e','r','i','a',0 }; static const WCHAR Email[] = { 'E','m','a','i','l',0 }; static const WCHAR GN[] = { 'G','N',0 }; +static const WCHAR SERIALNUMBER[] = { 'S','E','R','I','A','L','N','U','M','B','E','R',0 }; static const DWORD noNullFlag = CRYPT_OID_NO_NULL_ALGORITHM_PARA_FLAG; static const DWORD mosaicFlags = CRYPT_OID_INHIBIT_SIGNATURE_FORMAT_FLAG | @@ -1226,6 +1227,7 @@ static const struct OIDInfoConstructor { { 5, szOID_TELEPHONE_NUMBER, 0, Phone, &printableStringBlob }, { 5, szOID_X21_ADDRESS, 0, X21Address, &numericStringBlob }, { 5, szOID_DN_QUALIFIER, 0, dnQualifier, NULL }, + { 5, szOID_DEVICE_SERIAL_NUMBER, 0, SERIALNUMBER, NULL }, { 6, szOID_AUTHORITY_KEY_IDENTIFIER2, 0, (LPCWSTR)IDS_AUTHORITY_KEY_ID, NULL }, { 6, szOID_AUTHORITY_KEY_IDENTIFIER, 0, (LPCWSTR)IDS_AUTHORITY_KEY_ID, NULL }, diff --git a/dlls/crypt32/str.c b/dlls/crypt32/str.c index 6d406d2..cf29c6f 100644 --- a/dlls/crypt32/str.c +++ b/dlls/crypt32/str.c @@ -457,7 +457,7 @@ DWORD WINAPI CertNameToStrA(DWORD dwCertEncodingType, PCERT_NAME_BLOB pName, for (j = 0; (!psz || ret < csz) && j < rdn->cRDNAttr; j++) { DWORD chars; - char prefixBuf[10]; /* big enough for GivenName */ + char prefixBuf[13]; /* big enough for SERIALNUMBER */ LPCSTR prefix = NULL; if ((dwStrType & 0x000000ff) == CERT_OID_NAME_STR)

1 0