November 2013 - Wine-Commits

Ken Thomases : winemac: Allow ordering a window into Cocoa' s window list even if it's positioned outside of the desktop.
by Alexandre Julliard Nov. 15, 2013

Nov. 15, 2013

Module: wine Branch: master Commit: 784a91390eb64bf0e6cf3a27be9becff7ad5787f URL: http://source.winehq.org/git/wine.git/?a=commit;h=784a91390eb64bf0e6cf3a27b… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Nov 14 20:52:04 2013 -0600 winemac: Allow ordering a window into Cocoa's window list even if it's positioned outside of the desktop. Some programs minimize windows which are outside of the desktop. The Mac driver had been leaving such windows ordered out, which prevented them from minimizing and appearing on the Dock. That, in turn, made it difficult for the user to restore them. --- dlls/winemac.drv/cocoa_window.m | 64 +++++++++++--------------------------- dlls/winemac.drv/macdrv_cocoa.h | 4 +- dlls/winemac.drv/window.c | 20 ++++++------ 3 files changed, 31 insertions(+), 57 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index dbac40a..f7c2cd0 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -1045,11 +1045,10 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif /* Returns whether or not the window was ordered in, which depends on if its frame intersects any screen. */ - - (BOOL) orderBelow:(WineWindow*)prev orAbove:(WineWindow*)next activate:(BOOL)activate + - (void) orderBelow:(WineWindow*)prev orAbove:(WineWindow*)next activate:(BOOL)activate { WineApplicationController* controller = [WineApplicationController sharedController]; - BOOL on_screen = frame_intersects_screens([self frame], [NSScreen screens]); - if (on_screen && ![self isMiniaturized]) + if (![self isMiniaturized]) { BOOL needAdjustWindowLevels = FALSE; BOOL wasVisible = [self isVisible]; @@ -1128,8 +1127,6 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif if (![self isExcludedFromWindowsMenu]) [NSApp addWindowsItem:self title:[self title] filename:NO]; } - - return on_screen; } - (void) doOrderOut @@ -1173,24 +1170,12 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif } } - - (BOOL) setFrameIfOnScreen:(NSRect)contentRect + - (void) setFrameFromWine:(NSRect)contentRect { - NSArray* screens = [NSScreen screens]; - BOOL on_screen = [self isOrderedIn]; - - if (![screens count]) return on_screen; - /* Origin is (left, top) in a top-down space. Need to convert it to (left, bottom) in a bottom-up space. */ [[WineApplicationController sharedController] flipRect:&contentRect]; - if (on_screen) - { - on_screen = frame_intersects_screens(contentRect, screens); - if (!on_screen) - [self doOrderOut]; - } - /* The back end is establishing a new window size and position. It's not interested in any stale events regarding those that may be sitting in the queue. */ @@ -1219,7 +1204,7 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif [self updateFullscreen]; - if (on_screen) + if ([self isOrderedIn]) { /* In case Cocoa adjusted the frame we tried to set, generate a frame-changed event. The back end will ignore it if nothing actually changed. */ @@ -1227,8 +1212,6 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif } } } - - return on_screen; } - (void) setMacDrvParentWindow:(WineWindow*)parent @@ -1415,8 +1398,10 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif // If a window is sized to completely cover a screen, then it's in // full-screen mode. In that case, we don't allow NSWindow to constrain // it. + NSArray* screens = [NSScreen screens]; NSRect contentRect = [self contentRectForFrameRect:frameRect]; - if (!screen_covered_by_rect(contentRect, [NSScreen screens])) + if (!screen_covered_by_rect(contentRect, screens) && + frame_intersects_screens(frameRect, screens)) frameRect = [super constrainFrameRect:frameRect toScreen:screen]; return frameRect; } @@ -2042,23 +2027,19 @@ void macdrv_set_cocoa_window_title(macdrv_window w, const unsigned short* title, * non-NULL, it is ordered below that window. Else, if next is non-NULL, * it is ordered above that window. Otherwise, it is ordered to the * front. - * - * Returns true if the window has actually been ordered onto the screen - * (i.e. if its frame intersects with a screen). Otherwise, false. */ -int macdrv_order_cocoa_window(macdrv_window w, macdrv_window prev, - macdrv_window next, int activate) +void macdrv_order_cocoa_window(macdrv_window w, macdrv_window p, + macdrv_window n, int activate) { WineWindow* window = (WineWindow*)w; - __block BOOL on_screen; + WineWindow* prev = (WineWindow*)p; + WineWindow* next = (WineWindow*)n; - OnMainThread(^{ - on_screen = [window orderBelow:(WineWindow*)prev - orAbove:(WineWindow*)next - activate:activate]; + OnMainThreadAsync(^{ + [window orderBelow:prev + orAbove:next + activate:activate]; }); - - return on_screen; } /*********************************************************************** @@ -2078,22 +2059,15 @@ void macdrv_hide_cocoa_window(macdrv_window w) /*********************************************************************** * macdrv_set_cocoa_window_frame * - * Move a Cocoa window. If the window has been moved out of the bounds - * of the desktop, it is ordered out. (This routine won't ever order a - * window in, though.) - * - * Returns true if the window is on screen; false otherwise. + * Move a Cocoa window. */ -int macdrv_set_cocoa_window_frame(macdrv_window w, const CGRect* new_frame) +void macdrv_set_cocoa_window_frame(macdrv_window w, const CGRect* new_frame) { WineWindow* window = (WineWindow*)w; - __block BOOL on_screen; - OnMainThread(^{ - on_screen = [window setFrameIfOnScreen:NSRectFromCGRect(*new_frame)]; + OnMainThreadAsync(^{ + [window setFrameFromWine:NSRectFromCGRect(*new_frame)]; }); - - return on_screen; } /*********************************************************************** diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index e0c4f29..b452461 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -381,10 +381,10 @@ extern void macdrv_set_cocoa_window_state(macdrv_window w, const struct macdrv_window_state* state) DECLSPEC_HIDDEN; extern void macdrv_set_cocoa_window_title(macdrv_window w, const UniChar* title, size_t length) DECLSPEC_HIDDEN; -extern int macdrv_order_cocoa_window(macdrv_window w, macdrv_window prev, +extern void macdrv_order_cocoa_window(macdrv_window w, macdrv_window prev, macdrv_window next, int activate) DECLSPEC_HIDDEN; extern void macdrv_hide_cocoa_window(macdrv_window w) DECLSPEC_HIDDEN; -extern int macdrv_set_cocoa_window_frame(macdrv_window w, const CGRect* new_frame) DECLSPEC_HIDDEN; +extern void macdrv_set_cocoa_window_frame(macdrv_window w, const CGRect* new_frame) DECLSPEC_HIDDEN; extern void macdrv_get_cocoa_window_frame(macdrv_window w, CGRect* out_frame) DECLSPEC_HIDDEN; extern void macdrv_set_cocoa_parent_window(macdrv_window w, macdrv_window parent) DECLSPEC_HIDDEN; extern void macdrv_set_window_surface(macdrv_window w, void *surface, pthread_mutex_t *mutex) DECLSPEC_HIDDEN; diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 3d92481..eac333a 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -729,6 +729,7 @@ static void show_window(struct macdrv_win_data *data) macdrv_window prev_window = NULL; macdrv_window next_window = NULL; BOOL activate = FALSE; + HWND hwndFocus; /* find window that this one must be after */ prev = GetWindow(data->hwnd, GW_HWNDPREV); @@ -749,15 +750,14 @@ static void show_window(struct macdrv_win_data *data) if (!prev_window) activate = activate_on_focus_time && (GetTickCount() - activate_on_focus_time < 2000); - data->on_screen = macdrv_order_cocoa_window(data->cocoa_window, prev_window, next_window, activate); - if (data->on_screen) - { - HWND hwndFocus = GetFocus(); - if (hwndFocus && (data->hwnd == hwndFocus || IsChild(data->hwnd, hwndFocus))) - macdrv_SetFocus(hwndFocus); - if (activate) - activate_on_focus_time = 0; - } + macdrv_order_cocoa_window(data->cocoa_window, prev_window, next_window, activate); + data->on_screen = TRUE; + + hwndFocus = GetFocus(); + if (hwndFocus && (data->hwnd == hwndFocus || IsChild(data->hwnd, hwndFocus))) + macdrv_SetFocus(hwndFocus); + if (activate) + activate_on_focus_time = 0; } @@ -857,7 +857,7 @@ static void sync_window_position(struct macdrv_win_data *data, UINT swp_flags, c if (frame.size.width < 1 || frame.size.height < 1) frame.size.width = frame.size.height = 1; - data->on_screen = macdrv_set_cocoa_window_frame(data->cocoa_window, &frame); + macdrv_set_cocoa_window_frame(data->cocoa_window, &frame); if (old_window_rect && old_whole_rect && (IsRectEmpty(old_window_rect) != IsRectEmpty(&data->window_rect) || old_window_rect->left - old_whole_rect->left != data->window_rect.left - data->whole_rect.left ||

1 0

Daniel Lehman : oleaut32: Return FALSE from SystemTimeToVariantTime if day > 31 or year is negative.
by Alexandre Julliard Nov. 15, 2013

Nov. 15, 2013

Module: wine Branch: master Commit: 8306518424a24a19c9c88d87f98fd3ac0024415a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8306518424a24a19c9c88d87f… Author: Daniel Lehman <dlehman(a)esri.com> Date: Mon Jan 30 11:12:54 2012 -0800 oleaut32: Return FALSE from SystemTimeToVariantTime if day > 31 or year is negative. --- dlls/oleaut32/tests/vartest.c | 4 ++++ dlls/oleaut32/variant.c | 4 ++++ 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index a91eb7e..bc8c4ba 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -1727,6 +1727,10 @@ static void test_SystemTimeToVariantTime(void) ST2DT(2,1,1980,0,0,0,0,TRUE,29222.0); ST2DT(0,1,1980,0,0,0,0,TRUE,29220.0); /* Rolls back to 31 Dec 1899 */ ST2DT(1,13,1980,0,0,0,0,FALSE,29587.0); /* Fails on invalid month */ + ST2DT(32,1,1980,0,0,0,0,FALSE,0.0); /* Fails on invalid day */ + ST2DT(1,1,-1,0,0,0,0,FALSE,0.0); /* Fails on invalid year */ + ST2DT(1,1,10000,0,0,0,0,FALSE,0.0); /* Fails on invalid year */ + ST2DT(1,1,9999,0,0,0,0,TRUE,2958101.0); /* 9999 is last valid year */ ST2DT(31,12,90,0,0,0,0,TRUE,33238.0); /* 30 <= year < 100 is 1900+year */ ST2DT(1,1,30,0,0,0,0,TRUE,10959.0); /* 30 <= year < 100 is 1900+year */ ST2DT(1,1,29,0,0,0,0,TRUE,47119.0); /* 0 <= year < 30 is 2000+year */ diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index c343578..d4c6f6c 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -1312,6 +1312,10 @@ INT WINAPI SystemTimeToVariantTime(LPSYSTEMTIME lpSt, double *pDateOut) if (lpSt->wMonth > 12) return FALSE; + if (lpSt->wDay > 31) + return FALSE; + if ((short)lpSt->wYear < 0) + return FALSE; ud.st = *lpSt; return VarDateFromUdate(&ud, 0, pDateOut) == S_OK;

1 0

Henri Verbeet : wined3d: Set the surface container in surface_init().
by Alexandre Julliard Nov. 15, 2013

Nov. 15, 2013

Module: wine Branch: master Commit: 42f6ca821ce4bbdd474f29703673a3bb47a73428 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42f6ca821ce4bbdd474f29703… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Nov 15 08:24:33 2013 +0100 wined3d: Set the surface container in surface_init(). --- dlls/ddraw/surface.c | 15 +++------------ dlls/wined3d/surface.c | 24 +++++++++++++----------- dlls/wined3d/texture.c | 6 ++---- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 19 insertions(+), 28 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 60f7dad..958abd7 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -484,8 +484,7 @@ static void ddraw_surface_cleanup(struct ddraw_surface *surface) surface, surface->ref7, surface->ref4, surface->ref3, surface->ref2, surface->ref1); } - if (surface->wined3d_texture - && !(surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_TEXTURE)) + if (surface->wined3d_texture) wined3d_texture_decref(surface->wined3d_texture); if (surface->wined3d_surface) wined3d_surface_decref(surface->wined3d_surface); @@ -508,11 +507,7 @@ ULONG ddraw_surface_release_iface(struct ddraw_surface *This) wined3d_mutex_unlock(); return iface_count; } - /* If it's a texture, destroy the wined3d texture. */ - if (This->surface_desc.ddsCaps.dwCaps & DDSCAPS_TEXTURE) - wined3d_texture_decref(This->wined3d_texture); - else - ddraw_surface_cleanup(This); + ddraw_surface_cleanup(This); wined3d_mutex_unlock(); if (release_iface) @@ -5579,12 +5574,8 @@ static const struct wined3d_parent_ops ddraw_surface_wined3d_parent_ops = static void STDMETHODCALLTYPE ddraw_texture_wined3d_object_destroyed(void *parent) { - struct ddraw_texture *texture = parent; - - TRACE("texture %p.\n", texture); + TRACE("parent %p.\n", parent); - if (texture->surface_desc.ddsCaps.dwCaps & DDSCAPS_TEXTURE) - ddraw_surface_cleanup(texture->root); HeapFree(GetProcessHeap(), 0, parent); } diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 3c45780..e30d6b4 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -6766,9 +6766,10 @@ cpu: return surface_cpu_blt(dst_surface, &dst_rect, src_surface, &src_rect, flags, fx, filter); } -static HRESULT surface_init(struct wined3d_surface *surface, const struct wined3d_resource_desc *desc, - struct wined3d_device *device, DWORD flags) +static HRESULT surface_init(struct wined3d_surface *surface, struct wined3d_texture *container, + const struct wined3d_resource_desc *desc, DWORD flags) { + struct wined3d_device *device = container->resource.device; const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; const struct wined3d_format *format = wined3d_get_format(gl_info, desc->format); UINT multisample_quality = desc->multisample_quality; @@ -6830,9 +6831,7 @@ static HRESULT surface_init(struct wined3d_surface *surface, const struct wined3 return hr; } - /* "Standalone" surface. */ - surface_set_container(surface, NULL); - + surface_set_container(surface, container); list_init(&surface->overlays); /* Flags */ @@ -6866,6 +6865,7 @@ static HRESULT surface_init(struct wined3d_surface *surface, const struct wined3 if (FAILED(hr)) { ERR("Private setup failed, returning %#x\n", hr); + surface_set_container(surface, NULL); surface_cleanup(surface); return hr; } @@ -6883,34 +6883,36 @@ static HRESULT surface_init(struct wined3d_surface *surface, const struct wined3 return hr; } -HRESULT CDECL wined3d_surface_create(struct wined3d_device *device, void *container_parent, +HRESULT CDECL wined3d_surface_create(struct wined3d_texture *container, const struct wined3d_resource_desc *desc, DWORD flags, struct wined3d_surface **surface) { + struct wined3d_device_parent *device_parent = container->resource.device->device_parent; const struct wined3d_parent_ops *parent_ops; struct wined3d_surface *object; void *parent; HRESULT hr; - TRACE("device %p, container_parent %p, width %u, height %u, format %s, usage %s (%#x), " + TRACE("container %p, width %u, height %u, format %s, usage %s (%#x), " "pool %s, multisample_type %#x, multisample_quality %u, flags %#x, surface %p.\n", - device, container_parent, desc->width, desc->height, debug_d3dformat(desc->format), + container, desc->width, desc->height, debug_d3dformat(desc->format), debug_d3dusage(desc->usage), desc->usage, debug_d3dpool(desc->pool), desc->multisample_type, desc->multisample_quality, flags, surface); if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) return E_OUTOFMEMORY; - if (FAILED(hr = surface_init(object, desc, device, flags))) + if (FAILED(hr = surface_init(object, container, desc, flags))) { WARN("Failed to initialize surface, returning %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); return hr; } - if (FAILED(hr = device->device_parent->ops->surface_created(device->device_parent, - container_parent, object, &parent, &parent_ops))) + if (FAILED(hr = device_parent->ops->surface_created(device_parent, + wined3d_texture_get_parent(container), object, &parent, &parent_ops))) { WARN("Failed to create surface parent, hr %#x.\n", hr); + surface_set_container(object, NULL); wined3d_surface_decref(object); return hr; } diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index da48100..a6a9dbf 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -860,14 +860,13 @@ static HRESULT cubetexture_init(struct wined3d_texture *texture, const struct wi UINT idx = j * texture->level_count + i; struct wined3d_surface *surface; - if (FAILED(hr = wined3d_surface_create(device, parent, &surface_desc, surface_flags, &surface))) + if (FAILED(hr = wined3d_surface_create(texture, &surface_desc, surface_flags, &surface))) { WARN("Failed to create surface, hr %#x.\n", hr); wined3d_texture_cleanup(texture); return hr; } - surface_set_container(surface, texture); surface_set_texture_target(surface, cube_targets[j], i); texture->sub_resources[idx] = &surface->resource; TRACE("Created surface level %u @ %p.\n", i, surface); @@ -1015,14 +1014,13 @@ static HRESULT texture_init(struct wined3d_texture *texture, const struct wined3 { struct wined3d_surface *surface; - if (FAILED(hr = wined3d_surface_create(device, parent, &surface_desc, surface_flags, &surface))) + if (FAILED(hr = wined3d_surface_create(texture, &surface_desc, surface_flags, &surface))) { WARN("Failed to create surface, hr %#x.\n", hr); wined3d_texture_cleanup(texture); return hr; } - surface_set_container(surface, texture); surface_set_texture_target(surface, texture->target, i); texture->sub_resources[i] = &surface->resource; TRACE("Created surface level %u @ %p.\n", i, surface); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8a11f30..3c39ee1 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2273,7 +2273,7 @@ void surface_update_draw_binding(struct wined3d_surface *surface) DECLSPEC_HIDDE HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const POINT *dst_point, struct wined3d_surface *src_surface, const RECT *src_rect) DECLSPEC_HIDDEN; void surface_validate_location(struct wined3d_surface *surface, DWORD location) DECLSPEC_HIDDEN; -HRESULT CDECL wined3d_surface_create(struct wined3d_device *device, void *container_parent, +HRESULT CDECL wined3d_surface_create(struct wined3d_texture *container, const struct wined3d_resource_desc *desc, DWORD flags, struct wined3d_surface **surface) DECLSPEC_HIDDEN; void get_drawable_size_swapchain(const struct wined3d_context *context, UINT *width, UINT *height) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Pass a wined3d_resource_desc structure to surface_init().
by Alexandre Julliard Nov. 15, 2013

Nov. 15, 2013

Module: wine Branch: master Commit: bb00811d60225848437ca1d0c6eb4842f63a1d67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb00811d60225848437ca1d0c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Nov 15 08:24:32 2013 +0100 wined3d: Pass a wined3d_resource_desc structure to surface_init(). --- dlls/wined3d/surface.c | 52 ++++++++++++++++++--------------------- dlls/wined3d/texture.c | 8 +---- dlls/wined3d/wined3d_private.h | 6 +--- 3 files changed, 28 insertions(+), 38 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bb00811d60225848437ca…

1 0

Frédéric Delanoy : imm32: Use BOOL type where appropriate.
by Alexandre Julliard Nov. 15, 2013

Nov. 15, 2013

Module: wine Branch: master Commit: bf34d0c3af8232042748c399cbd1adfcdc7d0ff0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf34d0c3af8232042748c399c… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Nov 15 02:44:42 2013 +0100 imm32: Use BOOL type where appropriate. --- dlls/imm32/imm.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 35c16f0..5991b8b 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -2086,11 +2086,11 @@ BOOL WINAPI ImmRegisterWordW( */ BOOL WINAPI ImmReleaseContext(HWND hWnd, HIMC hIMC) { - static int shown = 0; + static BOOL shown = FALSE; if (!shown) { FIXME("(%p, %p): stub\n", hWnd, hIMC); - shown = 1; + shown = TRUE; } return TRUE; }

1 0

Rico Schüller : d3d10/tests: Remove some device creation traces.
by Alexandre Julliard Nov. 15, 2013

Nov. 15, 2013

Module: wine Branch: master Commit: 3b13f08537bae7bf93f8bc8a8f6fe010c19c825b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b13f08537bae7bf93f8bc8a8… Author: Rico Schüller <kgbricola(a)web.de> Date: Fri Nov 15 09:46:02 2013 +0100 d3d10/tests: Remove some device creation traces. --- dlls/d3d10/tests/device.c | 6 ------ dlls/d3d10/tests/effect.c | 6 ------ 2 files changed, 0 insertions(+), 12 deletions(-) diff --git a/dlls/d3d10/tests/device.c b/dlls/d3d10/tests/device.c index 9ad742f..d5393a9 100644 --- a/dlls/d3d10/tests/device.c +++ b/dlls/d3d10/tests/device.c @@ -26,17 +26,11 @@ static ID3D10Device *create_device(void) ID3D10Device *device; if (SUCCEEDED(D3D10CreateDevice(NULL, D3D10_DRIVER_TYPE_HARDWARE, NULL, 0, D3D10_SDK_VERSION, &device))) - { - trace("Created a HW device\n"); return device; - } trace("Failed to create a HW device, trying REF\n"); if (SUCCEEDED(D3D10CreateDevice(NULL, D3D10_DRIVER_TYPE_REFERENCE, NULL, 0, D3D10_SDK_VERSION, &device))) - { - trace("Created a REF device\n"); return device; - } trace("Failed to create a device, returning NULL\n"); return NULL; diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index fa24596..e16d458 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -28,17 +28,11 @@ static ID3D10Device *create_device(void) ID3D10Device *device; if (SUCCEEDED(D3D10CreateDevice(NULL, D3D10_DRIVER_TYPE_HARDWARE, NULL, 0, D3D10_SDK_VERSION, &device))) - { - trace("Created a HW device\n"); return device; - } trace("Failed to create a HW device, trying REF\n"); if (SUCCEEDED(D3D10CreateDevice(NULL, D3D10_DRIVER_TYPE_REFERENCE, NULL, 0, D3D10_SDK_VERSION, &device))) - { - trace("Created a REF device\n"); return device; - } trace("Failed to create a device, returning NULL\n"); return NULL;

1 0

Jacek Caban : mshtml: Added IHTMLSelectElement:: multiple property implementation.
by Alexandre Julliard Nov. 14, 2013

Nov. 14, 2013

Module: wine Branch: master Commit: eebc40f2b3935819584a20187af2e6f782270838 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eebc40f2b3935819584a20187… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 14 16:17:02 2013 +0100 mshtml: Added IHTMLSelectElement::multiple property implementation. --- dlls/mshtml/htmlselect.c | 21 +++++++++++++++++---- dlls/mshtml/tests/dom.c | 25 +++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlselect.c b/dlls/mshtml/htmlselect.c index 0f1ad8c..aef0bf0 100644 --- a/dlls/mshtml/htmlselect.c +++ b/dlls/mshtml/htmlselect.c @@ -156,15 +156,28 @@ static HRESULT WINAPI HTMLSelectElement_get_size(IHTMLSelectElement *iface, LONG static HRESULT WINAPI HTMLSelectElement_put_multiple(IHTMLSelectElement *iface, VARIANT_BOOL v) { HTMLSelectElement *This = impl_from_IHTMLSelectElement(iface); - FIXME("(%p)->(%x)\n", This, v); - return E_NOTIMPL; + nsresult nsres; + + TRACE("(%p)->(%x)\n", This, v); + + nsres = nsIDOMHTMLSelectElement_SetMultiple(This->nsselect, !!v); + assert(nsres == NS_OK); + return S_OK; } static HRESULT WINAPI HTMLSelectElement_get_multiple(IHTMLSelectElement *iface, VARIANT_BOOL *p) { HTMLSelectElement *This = impl_from_IHTMLSelectElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + cpp_bool val; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMHTMLSelectElement_GetMultiple(This->nsselect, &val); + assert(nsres == NS_OK); + + *p = val ? VARIANT_TRUE : VARIANT_FALSE; + return S_OK; } static HRESULT WINAPI HTMLSelectElement_put_name(IHTMLSelectElement *iface, BSTR v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index e43c754..cf72873 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -1943,6 +1943,28 @@ static void _test_select_type(unsigned line, IHTMLSelectElement *select, const c SysFreeString(type); } +#define test_select_multiple(s,t) _test_select_multiple(__LINE__,s,t) +static void _test_select_multiple(unsigned line, IHTMLSelectElement *select, VARIANT_BOOL exmultiple) +{ + VARIANT_BOOL b = 100; + HRESULT hres; + + hres = IHTMLSelectElement_get_multiple(select, &b); + ok_(__FILE__,line) (hres == S_OK, "get_multiple failed: %08x\n", hres); + ok_(__FILE__,line) (b == exmultiple, "multiple=%x, expected %x\n", b, exmultiple); +} + +#define test_select_set_multiple(s,v) _test_select_set_multiple(__LINE__,s,v) +static void _test_select_set_multiple(unsigned line, IHTMLSelectElement *select, VARIANT_BOOL val) +{ + HRESULT hres; + + hres = IHTMLSelectElement_put_multiple(select, val); + ok_(__FILE__,line) (hres == S_OK, "put_multiple failed: %08x\n", hres); + + _test_select_multiple(line, select, val); +} + #define test_range_text(r,t) _test_range_text(__LINE__,r,t) static void _test_range_text(unsigned line, IHTMLTxtRange *range, const char *extext) { @@ -4212,6 +4234,9 @@ static void test_select_elem(IHTMLSelectElement *select) ok(iface_cmp((IUnknown*)disp, (IUnknown*)disp2), "disp != disp2\n"); IDispatch_Release(disp2); IDispatch_Release(disp); + + test_select_multiple(select, VARIANT_FALSE); + test_select_set_multiple(select, VARIANT_TRUE); } static void test_form_item(IHTMLElement *elem)

1 0

Rico Schüller : d3d10: Fix a comment.
by Alexandre Julliard Nov. 14, 2013

Nov. 14, 2013

Module: wine Branch: master Commit: dee50ab8b4807db1344d9e3c19fae54a7d3e23c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dee50ab8b4807db1344d9e3c1… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Nov 14 12:15:30 2013 +0100 d3d10: Fix a comment. --- dlls/d3d10/shader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10/shader.c b/dlls/d3d10/shader.c index 19ca5b4..a6a9a30 100644 --- a/dlls/d3d10/shader.c +++ b/dlls/d3d10/shader.c @@ -130,7 +130,7 @@ const struct ID3D10ShaderReflectionVtbl d3d10_shader_reflection_vtbl = d3d10_shader_reflection_QueryInterface, d3d10_shader_reflection_AddRef, d3d10_shader_reflection_Release, - /* ID3D10Effect methods */ + /* ID3D10ShaderReflection methods */ d3d10_shader_reflection_GetDesc, d3d10_shader_reflection_GetConstantBufferByIndex, d3d10_shader_reflection_GetConstantBufferByName,

1 0

Frédéric Delanoy : comctl32/tests: Use BOOL type where appropriate.
by Alexandre Julliard Nov. 14, 2013

Nov. 14, 2013

Module: wine Branch: master Commit: fdb5e13f18aa7056c8490eaad2ced348a33145ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdb5e13f18aa7056c8490eaad… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Nov 14 10:44:27 2013 +0100 comctl32/tests: Use BOOL type where appropriate. --- dlls/comctl32/tests/imagelist.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index 0ea27f6..e11ee1d 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -134,7 +134,7 @@ static HWND create_a_window(void) char className[] = "bmwnd"; char winName[] = "Test Bitmap"; HWND hWnd; - static int registered = 0; + static BOOL registered = FALSE; if (!registered) { @@ -152,7 +152,7 @@ static HWND create_a_window(void) cls.lpszClassName = className; RegisterClassA (&cls); - registered = 1; + registered = TRUE; } /* Setup window */

1 0

Francois Gouget : mshtml: Add a trailing '\n' to a TRACE().
by Alexandre Julliard Nov. 14, 2013

Nov. 14, 2013

Module: wine Branch: master Commit: 2de28eb64b11c61375af3a338d19d8f04c1867bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=2de28eb64b11c61375af3a338… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Nov 14 10:02:33 2013 +0100 mshtml: Add a trailing '\n' to a TRACE(). --- dlls/mshtml/htmlbody.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c index 2b98cf4..fcd8766 100644 --- a/dlls/mshtml/htmlbody.c +++ b/dlls/mshtml/htmlbody.c @@ -656,7 +656,7 @@ static HRESULT WINAPI HTMLBodyElement_get_scroll(IHTMLBodyElement *iface, BSTR * }else if(!strcmpW(overflow, hiddenW)) { ret = noW; }else { - TRACE("Defaulting %s to NULL", debugstr_w(overflow)); + TRACE("Defaulting %s to NULL\n", debugstr_w(overflow)); *p = NULL; return S_OK; }

1 0