October 2015 - Wine-commits

Ken Thomases : winemac: Use a snapshot of an owned window when a zero-sized owner window is minimized.
by Alexandre Julliard 23 Oct '15

23 Oct '15

Module: wine Branch: master Commit: 496b001ae0bf62e0967855d89a1b6b00da0dc440 URL: http://source.winehq.org/git/wine.git/?a=commit;h=496b001ae0bf62e0967855d89… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Oct 23 02:48:34 2015 -0500 winemac: Use a snapshot of an owned window when a zero-sized owner window is minimized. Some apps create a zero-sized window as their "main" window and then create all of the other top-level windows as owned windows with that main window as the owner. The user interacts with these owned windows. When the user attempts to minimize one of these owned windows, the app instead minimizes the zero-sized owner window. When an owner window is minimized, all of its owned windows are hidden. The Mac driver faithfully carries out these window operations. The only visible windows are hidden and the zero-sized window is minimized. This results in an invisible animation of the window down to a slot in the Dock - a slot which appears mostly empty. The invisible window thumbnail is badged with the app icon, but it still looks strange. On Windows, the Alt-Tab switcher uses the image of the owned window to represent the zero-sized owner. This commit attempts to do something similar. It takes over drawing of the Dock icon for minimized, zero-sized window. It grabs a snapshot of one of the owned windows and draws the app badge onto it. Since the owned windows are hidden before the zero-sized owner is minimized and we can't take snapshots of hidden windows, we use heuristics to guess when it may be useful to grab the snapshot. If the user minimizes an owned window from the Cocoa side, we grab that window's snapshot. If an owned window is being hidden and no snapshot has been taken recently, we grab its snapshot on the theory that this may be the beginning of hiding all of the owned windows before minimizing the owner. Unfortunately, this doesn't address the invisible animations when minimizing and unminimizing the zero-sized owner window. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_window.h | 2 + dlls/winemac.drv/cocoa_window.m | 114 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 116 insertions(+) diff --git a/dlls/winemac.drv/cocoa_window.h b/dlls/winemac.drv/cocoa_window.h index f5ff3b7..9553b92 100644 --- a/dlls/winemac.drv/cocoa_window.h +++ b/dlls/winemac.drv/cocoa_window.h @@ -73,6 +73,8 @@ NSPoint dragStartPosition; NSPoint dragWindowStartPosition; + NSTimeInterval lastDockIconSnapshot; + BOOL ignore_windowDeminiaturize; BOOL ignore_windowResize; BOOL fakingClose; diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 35488b0..0dd6a6f 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -1265,6 +1265,10 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif if ([self isMiniaturized]) pendingMinimize = TRUE; + WineWindow* parent = (WineWindow*)self.parentWindow; + if ([parent isKindOfClass:[WineWindow class]]) + [parent grabDockIconSnapshotFromWindow:self force:NO]; + [self becameIneligibleParentOrChild]; if ([self isMiniaturized]) { @@ -1569,6 +1573,109 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif } } + - (BOOL) isEmptyShaped + { + return (self.shapeData.length == sizeof(CGRectZero) && !memcmp(self.shapeData.bytes, &CGRectZero, sizeof(CGRectZero))); + } + + - (BOOL) canProvideSnapshot + { + return (self.windowNumber > 0 && ![self isEmptyShaped]); + } + + - (void) grabDockIconSnapshotFromWindow:(WineWindow*)window force:(BOOL)force + { + if (![self isEmptyShaped]) + return; + + NSTimeInterval now = [[NSProcessInfo processInfo] systemUptime]; + if (!force && now < lastDockIconSnapshot + 1) + return; + + if (window) + { + if (![window canProvideSnapshot]) + return; + } + else + { + CGFloat bestArea; + for (WineWindow* childWindow in self.childWindows) + { + if (![childWindow isKindOfClass:[WineWindow class]] || ![childWindow canProvideSnapshot]) + continue; + + NSSize size = childWindow.frame.size; + CGFloat area = size.width * size.height; + if (!window || area > bestArea) + { + window = childWindow; + bestArea = area; + } + } + + if (!window) + return; + } + + const void* windowID = (const void*)(CGWindowID)window.windowNumber; + CFArrayRef windowIDs = CFArrayCreate(NULL, &windowID, 1, NULL); + CGImageRef windowImage = CGWindowListCreateImageFromArray(CGRectNull, windowIDs, kCGWindowImageBoundsIgnoreFraming); + CFRelease(windowIDs); + if (!windowImage) + return; + + NSImage* appImage = [NSApp applicationIconImage]; + if (!appImage) + appImage = [NSImage imageNamed:NSImageNameApplicationIcon]; + + NSImage* dockIcon = [[[NSImage alloc] initWithSize:NSMakeSize(256, 256)] autorelease]; + [dockIcon lockFocus]; + + CGContextRef cgcontext = [[NSGraphicsContext currentContext] graphicsPort]; + + CGRect rect = CGRectMake(8, 8, 240, 240); + size_t width = CGImageGetWidth(windowImage); + size_t height = CGImageGetHeight(windowImage); + if (width > height) + { + rect.size.height *= height / (double)width; + rect.origin.y += (CGRectGetWidth(rect) - CGRectGetHeight(rect)) / 2; + } + else if (width != height) + { + rect.size.width *= width / (double)height; + rect.origin.x += (CGRectGetHeight(rect) - CGRectGetWidth(rect)) / 2; + } + + CGContextDrawImage(cgcontext, rect, windowImage); + [appImage drawInRect:NSMakeRect(156, 4, 96, 96)]; + + [dockIcon unlockFocus]; + + CGImageRelease(windowImage); + + NSImageView* imageView = (NSImageView*)self.dockTile.contentView; + if (![imageView isKindOfClass:[NSImageView class]]) + { + imageView = [[[NSImageView alloc] initWithFrame:NSMakeRect(0, 0, 256, 256)] autorelease]; + imageView.imageScaling = NSImageScaleProportionallyUpOrDown; + self.dockTile.contentView = imageView; + } + imageView.image = dockIcon; + [self.dockTile display]; + lastDockIconSnapshot = now; + } + + - (void) checkEmptyShaped + { + if (self.dockTile.contentView && ![self isEmptyShaped]) + { + self.dockTile.contentView = nil; + lastDockIconSnapshot = 0; + } + } + /* * ---------- NSWindow method overrides ---------- @@ -1766,6 +1873,10 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif macdrv_event* event = macdrv_create_event(WINDOW_MINIMIZE_REQUESTED, self); [queue postEvent:event]; macdrv_release_event(event); + + WineWindow* parent = (WineWindow*)self.parentWindow; + if ([parent isKindOfClass:[WineWindow class]]) + [parent grabDockIconSnapshotFromWindow:self force:YES]; } - (void) toggleFullScreen:(id)sender @@ -2123,6 +2234,7 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif - (void)windowWillMiniaturize:(NSNotification *)notification { [self becameIneligibleParentOrChild]; + [self grabDockIconSnapshotFromWindow:nil force:NO]; } - (NSSize) windowWillResize:(NSWindow*)sender toSize:(NSSize)frameSize @@ -2584,6 +2696,7 @@ void macdrv_set_window_shape(macdrv_window w, const CGRect *rects, int count) { window.shape = nil; window.shapeData = nil; + [window checkEmptyShaped]; } else { @@ -2598,6 +2711,7 @@ void macdrv_set_window_shape(macdrv_window w, const CGRect *rects, int count) [path appendBezierPathWithRect:NSRectFromCGRect(rects[i])]; window.shape = path; window.shapeData = [NSData dataWithBytes:rects length:length]; + [window checkEmptyShaped]; } } });

1 0

Dmitry Timoshkov : ole32: Print a FIXME when the "CONTENTS" stream refers to unsupported format.
by Alexandre Julliard 23 Oct '15

23 Oct '15

Module: wine Branch: master Commit: 1b580e70e990330a409a032c3f0758603e5d1ee7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b580e70e990330a409a032c3… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Oct 22 18:08:37 2015 +0800 ole32: Print a FIXME when the "CONTENTS" stream refers to unsupported format. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/datacache.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index 8bb4ed8..caabd10 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -1333,7 +1333,10 @@ static HRESULT parse_contents_stream( DataCache *This, IStorage *stg, IStream *s if (IsEqualCLSID( &stat.clsid, &CLSID_Picture_Dib )) fmt = &static_dib_fmt; else + { + FIXME("unsupported format %s\n", debugstr_guid( &stat.clsid )); return E_FAIL; + } return add_cache_entry( This, fmt, stm, contents_stream ); }

1 0

Henri Verbeet : d2d1: Properly handle collinear edges in d2d_cdt_cut_edges ().
by Alexandre Julliard 23 Oct '15

23 Oct '15

Module: wine Branch: master Commit: c125612cbbda881b8194e46b08718ef1b284429c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c125612cbbda881b8194e46b0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 23 13:46:23 2015 +0200 d2d1: Properly handle collinear edges in d2d_cdt_cut_edges(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/geometry.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index 3919080..198e5d6 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -1314,6 +1314,7 @@ static void d2d_cdt_cut_edges(struct d2d_cdt *cdt, struct d2d_cdt_edge_ref *end_ const struct d2d_cdt_edge_ref *base_edge, size_t start_vertex, size_t end_vertex) { struct d2d_cdt_edge_ref next; + float ccw; d2d_cdt_edge_next_left(cdt, &next, base_edge); if (d2d_cdt_edge_destination(cdt, &next) == end_vertex) @@ -1322,7 +1323,14 @@ static void d2d_cdt_cut_edges(struct d2d_cdt *cdt, struct d2d_cdt_edge_ref *end_ return; } - if (d2d_cdt_ccw(cdt, d2d_cdt_edge_destination(cdt, &next), end_vertex, start_vertex) > 0.0f) + ccw = d2d_cdt_ccw(cdt, d2d_cdt_edge_destination(cdt, &next), end_vertex, start_vertex); + if (ccw == 0.0f) + { + *end_edge = next; + return; + } + + if (ccw > 0.0f) d2d_cdt_edge_next_left(cdt, &next, &next); d2d_cdt_edge_sym(&next, &next); @@ -1333,7 +1341,7 @@ static void d2d_cdt_cut_edges(struct d2d_cdt *cdt, struct d2d_cdt_edge_ref *end_ static BOOL d2d_cdt_insert_segment(struct d2d_cdt *cdt, struct d2d_geometry *geometry, const struct d2d_cdt_edge_ref *origin, struct d2d_cdt_edge_ref *edge, size_t end_vertex) { - struct d2d_cdt_edge_ref base_edge, current, next, target; + struct d2d_cdt_edge_ref base_edge, current, new_origin, next, target; for (current = *origin;; current = next) { @@ -1362,7 +1370,10 @@ static BOOL d2d_cdt_insert_segment(struct d2d_cdt *cdt, struct d2d_geometry *geo if (!d2d_cdt_fixup(cdt, &base_edge)) return FALSE; - return TRUE; + if (d2d_cdt_edge_origin(cdt, edge) == end_vertex) + return TRUE; + new_origin = *edge; + return d2d_cdt_insert_segment(cdt, geometry, &new_origin, edge, end_vertex); } if (next.idx == origin->idx)

1 0

Henri Verbeet : d2d1: Properly handle collinear edges in d2d_cdt_insert_segment().
by Alexandre Julliard 23 Oct '15

23 Oct '15

Module: wine Branch: master Commit: a84658f928c27b94fa0e9ba7c50d84a7813d566b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a84658f928c27b94fa0e9ba7c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 23 13:46:24 2015 +0200 d2d1: Properly handle collinear edges in d2d_cdt_insert_segment(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/geometry.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index 198e5d6..ed69a1e 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -1342,17 +1342,30 @@ static BOOL d2d_cdt_insert_segment(struct d2d_cdt *cdt, struct d2d_geometry *geo const struct d2d_cdt_edge_ref *origin, struct d2d_cdt_edge_ref *edge, size_t end_vertex) { struct d2d_cdt_edge_ref base_edge, current, new_origin, next, target; + size_t current_destination, current_origin; for (current = *origin;; current = next) { d2d_cdt_edge_next_origin(cdt, &next, &current); - if (d2d_cdt_edge_destination(cdt, &current) == end_vertex) + current_destination = d2d_cdt_edge_destination(cdt, &current); + if (current_destination == end_vertex) { d2d_cdt_edge_sym(edge, &current); return TRUE; } + current_origin = d2d_cdt_edge_origin(cdt, &current); + if (d2d_cdt_ccw(cdt, end_vertex, current_origin, current_destination) == 0.0f + && (cdt->vertices[current_destination].x > cdt->vertices[current_origin].x) + == (cdt->vertices[end_vertex].x > cdt->vertices[current_origin].x) + && (cdt->vertices[current_destination].y > cdt->vertices[current_origin].y) + == (cdt->vertices[end_vertex].y > cdt->vertices[current_origin].y)) + { + d2d_cdt_edge_sym(&new_origin, &current); + return d2d_cdt_insert_segment(cdt, geometry, &new_origin, edge, end_vertex); + } + if (d2d_cdt_rightof(cdt, end_vertex, &next) && d2d_cdt_leftof(cdt, end_vertex, &current)) { d2d_cdt_edge_next_left(cdt, &base_edge, &current);

1 0

Henri Verbeet : d3d9/tests: Introduce a helper function to test for WARP.
by Alexandre Julliard 23 Oct '15

23 Oct '15

Module: wine Branch: master Commit: e855837abb5ac963a3a972842281793d15f938fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=e855837abb5ac963a3a972842… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 23 13:46:25 2015 +0200 d3d9/tests: Introduce a helper function to test for WARP. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index be276ee..55140c6 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -75,6 +75,11 @@ static BOOL color_match(D3DCOLOR c1, D3DCOLOR c2, BYTE max_diff) return TRUE; } +static BOOL adapter_is_warp(const D3DADAPTER_IDENTIFIER9 *identifier) +{ + return !strcmp(identifier->Driver, "d3d10warp.dll"); +} + /* Locks a given surface and returns the color at (x,y). It's the caller's * responsibility to only pass in lockable surfaces and valid x,y coordinates */ static DWORD getPixelColorFromSurface(IDirect3DSurface9 *surface, UINT x, UINT y) @@ -7207,7 +7212,7 @@ static void pretransformed_varying_test(void) hr = IDirect3D9_GetAdapterIdentifier(d3d, D3DADAPTER_DEFAULT, 0, &identifier); ok(SUCCEEDED(hr), "Failed to get adapter identifier, hr %#x.\n", hr); - warp = !strcmp(identifier.Description, "Microsoft Basic Render Driver"); + warp = adapter_is_warp(&identifier); hr = IDirect3DDevice9_CreateVertexDeclaration(device, decl_elements, &decl); ok(hr == D3D_OK, "IDirect3DDevice9_CreateVertexDeclaration returned %08x\n", hr); @@ -7718,7 +7723,7 @@ static void test_vshader_input(void) hr = IDirect3D9_GetAdapterIdentifier(d3d, D3DADAPTER_DEFAULT, 0, &identifier); ok(SUCCEEDED(hr), "Failed to get adapter identifier, hr %#x.\n", hr); - warp = !strcmp(identifier.Description, "Microsoft Basic Render Driver"); + warp = adapter_is_warp(&identifier); hr = IDirect3DDevice9_CreateVertexDeclaration(device, decl_elements_twotexcrd, &decl_twotexcrd); ok(hr == D3D_OK, "IDirect3DDevice9_CreateVertexDeclaration returned %08x\n", hr); @@ -20176,7 +20181,7 @@ static void test_uninitialized_varyings(void) hr = IDirect3D9_GetAdapterIdentifier(d3d, D3DADAPTER_DEFAULT, 0, &identifier); ok(SUCCEEDED(hr), "Failed to get adapter identifier, hr %#x.\n", hr); - warp = !strcmp(identifier.Description, "Microsoft Basic Render Driver"); + warp = adapter_is_warp(&identifier); hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); ok(SUCCEEDED(hr), "Failed to get caps, hr %#x.\n", hr);

1 0

Henri Verbeet : d3d8/tests: Introduce a helper function to test for WARP.
by Alexandre Julliard 23 Oct '15

23 Oct '15

Module: wine Branch: master Commit: f8d78b0d927c1cae4c5075c64d980c306fb3ed87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8d78b0d927c1cae4c5075c64… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 23 13:46:26 2015 +0200 d3d8/tests: Introduce a helper function to test for WARP. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/visual.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 088fe76..1e2b16b 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -52,6 +52,11 @@ static BOOL color_match(D3DCOLOR c1, D3DCOLOR c2, BYTE max_diff) return TRUE; } +static BOOL adapter_is_warp(const D3DADAPTER_IDENTIFIER8 *identifier) +{ + return !strcmp(identifier->Driver, "d3d10warp.dll"); +} + struct surface_readback { IDirect3DSurface8 *surface; @@ -8178,7 +8183,7 @@ static void test_uninitialized_varyings(void) hr = IDirect3D8_GetAdapterIdentifier(d3d, D3DADAPTER_DEFAULT, 0, &identifier); ok(SUCCEEDED(hr), "Failed to get adapter identifier, hr %#x.\n", hr); - warp = !strcmp(identifier.Driver, "d3d10warp.dll"); + warp = adapter_is_warp(&identifier); hr = IDirect3DDevice8_GetDeviceCaps(device, &caps); ok(SUCCEEDED(hr), "Failed to get caps, hr %#x.\n", hr);

1 0

Nikolay Sivov : include: Fix a couple of logical processor info structures.
by Alexandre Julliard 23 Oct '15

23 Oct '15

Module: wine Branch: master Commit: 75286b0ac7e72d375e1edb2fe7f858699cd80b50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75286b0ac7e72d375e1edb2fe… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 22 17:39:56 2015 +0300 include: Fix a couple of logical processor info structures. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winnt.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index ded01f6..c7874dd 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -5822,12 +5822,12 @@ typedef struct _PROCESSOR_NUMBER typedef struct _PROCESSOR_RELATIONSHIP { BYTE Flags; - BYTE Reserved[21]; + BYTE EfficiencyClass; + BYTE Reserved[20]; WORD GroupCount; GROUP_AFFINITY GroupMask[ANYSIZE_ARRAY]; } PROCESSOR_RELATIONSHIP, *PPROCESSOR_RELATIONSHIP; - typedef struct _NUMA_NODE_RELATIONSHIP { DWORD NodeNumber; @@ -5840,6 +5840,7 @@ typedef struct _CACHE_RELATIONSHIP BYTE Level; BYTE Associativity; WORD LineSize; + DWORD CacheSize; PROCESSOR_CACHE_TYPE Type; BYTE Reserved[20]; GROUP_AFFINITY GroupMask;

1 0

Bruno Jesus : msvfw32: When no fccHandler is specified return the first valid codec.
by Alexandre Julliard 23 Oct '15

23 Oct '15

Module: wine Branch: master Commit: a90ed505a756fa7309717bc2095f54800f539e59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a90ed505a756fa7309717bc20… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri Oct 23 00:04:13 2015 +0800 msvfw32: When no fccHandler is specified return the first valid codec. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvfw32/msvideo_main.c | 25 +++++++++++++++++++++++-- dlls/msvfw32/tests/msvfw.c | 2 -- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/dlls/msvfw32/msvideo_main.c b/dlls/msvfw32/msvideo_main.c index c48479d..4f1a2bf 100644 --- a/dlls/msvfw32/msvideo_main.c +++ b/dlls/msvfw32/msvideo_main.c @@ -436,6 +436,27 @@ HIC VFWAPI ICOpen(DWORD fccType, DWORD fccHandler, UINT wMode) TRACE("(%s,%s,0x%08x)\n", wine_dbgstr_fcc(fccType), wine_dbgstr_fcc(fccHandler), wMode); + if (!fccHandler) /* No specific handler, return the first valid for wMode */ + { + HIC local; + ICINFO info; + DWORD loop = 0; + info.dwSize = sizeof(info); + while(ICInfo(fccType, loop++, &info)) + { + /* Ensure fccHandler is not 0x0 because we will recurse on ICOpen */ + if(!info.fccHandler) + continue; + local = ICOpen(fccType, info.fccHandler, wMode); + if (local != 0) + { + TRACE("Returning %s as defult handler for %s\n", + wine_dbgstr_fcc(info.fccHandler), wine_dbgstr_fcc(fccType)); + return local; + } + } + } + /* Check if there is a registered driver that matches */ driver = reg_driver_list; while(driver) @@ -448,7 +469,7 @@ HIC VFWAPI ICOpen(DWORD fccType, DWORD fccHandler, UINT wMode) driver = driver->next; if (driver && driver->proc) - /* The driver has been registered at runtime with its driverproc */ + /* The driver has been registered at runtime with its driverproc */ return ICOpenFunction(fccType, fccHandler, wMode, driver->proc); /* Well, lParam2 is in fact a LPVIDEO_OPEN_PARMS, but it has the @@ -478,7 +499,7 @@ HIC VFWAPI ICOpen(DWORD fccType, DWORD fccHandler, UINT wMode) codecname[9] = '\0'; hdrv = OpenDriver(codecname, drv32W, (LPARAM)&icopen); - if (!hdrv) + if (!hdrv) return 0; } else { /* The driver has been registered at runtime with its name */ diff --git a/dlls/msvfw32/tests/msvfw.c b/dlls/msvfw32/tests/msvfw.c index a9c4053..95f28f3 100644 --- a/dlls/msvfw32/tests/msvfw.c +++ b/dlls/msvfw32/tests/msvfw.c @@ -31,7 +31,6 @@ static void test_OpenCase(void) ICINFO info; /* Check if default handler works */ h = ICOpen(mmioFOURCC('v','i','d','c'),0,ICMODE_DECOMPRESS); -todo_wine ok(0!=h,"ICOpen(vidc.0) failed\n"); if (h) { info.dwSize = sizeof(info); @@ -41,7 +40,6 @@ todo_wine ok(ICClose(h)==ICERR_OK,"ICClose failed\n"); } h = ICOpen(mmioFOURCC('v','i','d','c'),0,ICMODE_COMPRESS); -todo_wine ok(0!=h || broken(h == 0),"ICOpen(vidc.0) failed\n"); /* Not present in Win8 */ if (h) { info.dwSize = sizeof(info);

1 0

Thomas Pointhuber : combase: Implement WindowsSubstring.
by Alexandre Julliard 23 Oct '15

23 Oct '15

Module: wine Branch: master Commit: 3ba2d995c855de5f3fb164ccdd2a1bdcdb1a3c95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ba2d995c855de5f3fb164ccd… Author: Thomas Pointhuber <thomas.pointhuber(a)gmx.at> Date: Fri Oct 23 03:22:40 2015 +0200 combase: Implement WindowsSubstring. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-winrt-string-l1-1-0.spec | 2 +- dlls/combase/combase.spec | 2 +- dlls/combase/string.c | 19 +++++++++++++++++++ include/winerror.h | 1 + 4 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-core-winrt-string-l1-1-0/api-ms-win-core-winrt-string-l1-1-0.spec b/dlls/api-ms-win-core-winrt-string-l1-1-0/api-ms-win-core-winrt-string-l1-1-0.spec index 2361a1d..825980d 100644 --- a/dlls/api-ms-win-core-winrt-string-l1-1-0/api-ms-win-core-winrt-string-l1-1-0.spec +++ b/dlls/api-ms-win-core-winrt-string-l1-1-0/api-ms-win-core-winrt-string-l1-1-0.spec @@ -21,7 +21,7 @@ @ stdcall WindowsPromoteStringBuffer(ptr ptr) combase.WindowsPromoteStringBuffer @ stub WindowsReplaceString @ stdcall WindowsStringHasEmbeddedNull(ptr ptr) combase.WindowsStringHasEmbeddedNull -@ stub WindowsSubstring +@ stdcall WindowsSubstring(ptr long ptr) combase.WindowsSubstring @ stub WindowsSubstringWithSpecifiedLength @ stub WindowsTrimStringEnd @ stub WindowsTrimStringStart diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index 90f6c9d..bf8607a 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -302,7 +302,7 @@ @ stdcall WindowsPromoteStringBuffer(ptr ptr) @ stub WindowsReplaceString @ stdcall WindowsStringHasEmbeddedNull(ptr ptr) -@ stub WindowsSubstring +@ stdcall WindowsSubstring(ptr long ptr) @ stub WindowsSubstringWithSpecifiedLength @ stub WindowsTrimStringEnd @ stub WindowsTrimStringStart diff --git a/dlls/combase/string.c b/dlls/combase/string.c index 7054af6..33e5100 100644 --- a/dlls/combase/string.c +++ b/dlls/combase/string.c @@ -255,6 +255,25 @@ HRESULT WINAPI WindowsStringHasEmbeddedNull(HSTRING str, BOOL *out) } /*********************************************************************** + * WindowsSubstring (combase.@) + */ +HRESULT WINAPI WindowsSubstring(HSTRING str, UINT32 start, HSTRING *out) +{ + struct hstring_private *priv = impl_from_HSTRING(str); + UINT32 len = WindowsGetStringLen(str); + if (out == NULL) + return E_INVALIDARG; + if (start > len) + return E_BOUNDS; + if (start == len) + { + *out = NULL; + return S_OK; + } + return WindowsCreateString(&priv->buffer[start], len - start, out); +} + +/*********************************************************************** * WindowsIsStringEmpty (combase.@) */ BOOL WINAPI WindowsIsStringEmpty(HSTRING str) diff --git a/include/winerror.h b/include/winerror.h index c524798..e9cc7be 100644 --- a/include/winerror.h +++ b/include/winerror.h @@ -2092,6 +2092,7 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned int x) #define S_FALSE _HRESULT_TYPEDEF_(1) #define E_PENDING _HRESULT_TYPEDEF_(0x8000000A) +#define E_BOUNDS _HRESULT_TYPEDEF_(0x8000000B) #define E_NOTIMPL _HRESULT_TYPEDEF_(0x80004001)

1 0

Thomas Pointhuber : combase/tests: Add tests for WindowsSubstring.
by Alexandre Julliard 23 Oct '15

23 Oct '15

Module: wine Branch: master Commit: ae8be1f84ceb106314fbb67a3914d9fc1b550b91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae8be1f84ceb106314fbb67a3… Author: Thomas Pointhuber <thomas.pointhuber(a)gmx.at> Date: Fri Oct 23 03:23:02 2015 +0200 combase/tests: Add tests for WindowsSubstring. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/tests/string.c | 60 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/dlls/combase/tests/string.c b/dlls/combase/tests/string.c index 72eaa84..a6b02c6 100644 --- a/dlls/combase/tests/string.c +++ b/dlls/combase/tests/string.c @@ -38,6 +38,7 @@ static BOOL (WINAPI *pWindowsIsStringEmpty)(HSTRING); static HRESULT (WINAPI *pWindowsPreallocateStringBuffer)(UINT32, WCHAR **, HSTRING_BUFFER *); static HRESULT (WINAPI *pWindowsPromoteStringBuffer)(HSTRING_BUFFER, HSTRING *); static HRESULT (WINAPI *pWindowsStringHasEmbeddedNull)(HSTRING, BOOL *); +static HRESULT (WINAPI *pWindowsSubstring)(HSTRING, UINT32, HSTRING *); #define SET(x) p##x = (void*)GetProcAddress(hmod, #x) @@ -60,6 +61,7 @@ static BOOL init_functions(void) SET(WindowsPreallocateStringBuffer); SET(WindowsPromoteStringBuffer); SET(WindowsStringHasEmbeddedNull); + SET(WindowsSubstring); return TRUE; } @@ -92,6 +94,7 @@ static void _check_string(int line, HSTRING str, LPCWSTR content, UINT32 length, static const WCHAR input_string[] = { 'a', 'b', 'c', 'd', 'e', 'f', '\0', '\0' }; static const WCHAR input_empty_string[] = { '\0' }; static const WCHAR input_embed_null[] = { 'a', '\0', 'c', '\0', 'e', 'f', '\0' }; +static const WCHAR output_substring[] = { 'c', 'd', 'e', 'f', '\0' }; static void test_create_delete(void) { @@ -236,6 +239,62 @@ static void test_string_buffer(void) ok(pWindowsDeleteString(str) == S_OK, "Failed to delete string\n"); } +static void test_substring(void) +{ + HSTRING str, substr; + HSTRING_HEADER header; + + /* Test substring of string buffers */ + ok(pWindowsCreateString(input_string, 6, &str) == S_OK, "Failed to create string\n"); + ok(pWindowsSubstring(str, 2, &substr) == S_OK, "Failed to create substring\n"); + check_string(substr, output_substring, 4, FALSE); + ok(pWindowsDeleteString(substr) == S_OK, "Failed to delete string\n"); + ok(pWindowsDeleteString(str) == S_OK, "Failed to delete string\n"); + + /* Test duplication of string using substring */ + ok(pWindowsCreateString(input_string, 6, &str) == S_OK, "Failed to create string\n"); + ok(pWindowsSubstring(str, 0, &substr) == S_OK, "Failed to create substring\n"); + ok(str != substr, "Duplicated string didn't create new string\n"); + check_string(substr, input_string, 6, FALSE); + ok(pWindowsDeleteString(substr) == S_OK, "Failed to delete string\n"); + ok(pWindowsDeleteString(str) == S_OK, "Failed to delete string\n"); + + /* Test substring of string reference */ + ok(pWindowsCreateStringReference(input_string, 6, &header, &str) == S_OK, "Failed to create string ref\n"); + ok(pWindowsSubstring(str, 2, &substr) == S_OK, "Failed to create substring of string ref\n"); + check_string(substr, output_substring, 4, FALSE); + ok(pWindowsDeleteString(substr) == S_OK, "Failed to delete string\n"); + ok(pWindowsDeleteString(str) == S_OK, "Failed to delete string ref\n"); + + /* Test duplication of string reference using substring */ + ok(pWindowsCreateStringReference(input_string, 6, &header, &str) == S_OK, "Failed to create string ref\n"); + ok(pWindowsSubstring(str, 0, &substr) == S_OK, "Failed to create substring of string ref\n"); + ok(str != substr, "Duplicated string ref didn't create new string\n"); + check_string(substr, input_string, 6, FALSE); + ok(pWindowsDeleteString(substr) == S_OK, "Failed to delete string\n"); + ok(pWindowsDeleteString(str) == S_OK, "Failed to delete string\n"); + + /* Test get substring of empty string */ + ok(pWindowsSubstring(NULL, 0, &substr) == S_OK, "Failed to duplicate NULL string\n"); + ok(substr == NULL, "Substring created new string\n"); + + /* Test get empty substring of string */ + ok(pWindowsCreateString(input_string, 6, &str) == S_OK, "Failed to create string\n"); + ok(pWindowsSubstring(str, 6, &substr) == S_OK, "Failed to create substring\n"); + ok(substr == NULL, "Substring created new string\n"); + ok(pWindowsDeleteString(str) == S_OK, "Failed to delete string\n"); + + /* Test handling of using too high start index */ + ok(pWindowsCreateString(input_string, 6, &str) == S_OK, "Failed to create string\n"); + ok(pWindowsSubstring(str, 7, &substr) == E_BOUNDS, "Incorrect error handling\n"); + ok(pWindowsDeleteString(str) == S_OK, "Failed to delete string\n"); + + /* Test handling of a NULL string */ + ok(pWindowsCreateString(input_string, 6, &str) == S_OK, "Failed to create string\n"); + ok(pWindowsSubstring(str, 7, NULL) == E_INVALIDARG, "Incorrect error handling\n"); + ok(pWindowsDeleteString(str) == S_OK, "Failed to delete string\n"); +} + START_TEST(string) { if (!init_functions()) @@ -244,4 +303,5 @@ START_TEST(string) test_duplicate(); test_access(); test_string_buffer(); + test_substring(); }

1 0