January 2013 - Wine-commits

Ken Thomases : winemac: Translate presence i n Windows task bar to participation in Exposé and window cycling.
by Alexandre Julliard 11 Jan '13

11 Jan '13

Module: wine Branch: master Commit: 15d4b2ab51a6b0c34334a95b98a36fd6e4fea2e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15d4b2ab51a6b0c34334a95b9… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Jan 11 06:20:40 2013 -0600 winemac: Translate presence in Windows task bar to participation in Exposé and window cycling. --- dlls/winemac.drv/cocoa_window.m | 12 ++++++++++++ dlls/winemac.drv/macdrv_cocoa.h | 2 ++ dlls/winemac.drv/window.c | 3 +++ 3 files changed, 17 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index e6ae103..9d359ff 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -156,6 +156,7 @@ static BOOL frame_intersects_screens(NSRect frame, NSArray* screens) - (void) setMacDrvState:(const struct macdrv_window_state*)state { NSInteger level; + NSWindowCollectionBehavior behavior; self.disabled = state->disabled; self.noActivate = state->no_activate; @@ -164,6 +165,17 @@ static BOOL frame_intersects_screens(NSRect frame, NSArray* screens) level = state->floating ? NSFloatingWindowLevel : NSNormalWindowLevel; if (level != [self level]) [self setLevel:level]; + + behavior = NSWindowCollectionBehaviorDefault; + if (state->excluded_by_expose) + behavior |= NSWindowCollectionBehaviorTransient; + else + behavior |= NSWindowCollectionBehaviorManaged; + if (state->excluded_by_cycle) + behavior |= NSWindowCollectionBehaviorIgnoresCycle; + else + behavior |= NSWindowCollectionBehaviorParticipatesInCycle; + [self setCollectionBehavior:behavior]; } /* Returns whether or not the window was ordered in, which depends on if diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index 86a49ce..fc2b0ac 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -129,6 +129,8 @@ struct macdrv_window_state { unsigned int disabled:1; unsigned int no_activate:1; unsigned int floating:1; + unsigned int excluded_by_expose:1; + unsigned int excluded_by_cycle:1; }; extern macdrv_window macdrv_create_cocoa_window(const struct macdrv_window_features* wf, diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 21c9e59..4344da5 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -104,6 +104,9 @@ static void get_cocoa_window_state(struct macdrv_win_data *data, state->disabled = (style & WS_DISABLED) != 0; state->no_activate = !can_activate_window(data->hwnd); state->floating = (ex_style & WS_EX_TOPMOST) != 0; + state->excluded_by_expose = state->excluded_by_cycle = + !(ex_style & WS_EX_APPWINDOW) && + (GetWindow(data->hwnd, GW_OWNER) || (ex_style & (WS_EX_TOOLWINDOW | WS_EX_NOACTIVATE))); }

1 0

Ken Thomases : winemac: Implement the Mac "Window" menu.
by Alexandre Julliard 11 Jan '13

11 Jan '13

Module: wine Branch: master Commit: b3f71fdeb101945ce6d971016278e1d8248035c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3f71fdeb101945ce6d971016… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Jan 11 06:21:06 2013 -0600 winemac: Implement the Mac "Window" menu. --- dlls/winemac.drv/cocoa_app.m | 11 +++++++++++ dlls/winemac.drv/cocoa_window.m | 26 ++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 28d2ad2..d869a05 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -51,7 +51,18 @@ [item setSubmenu:submenu]; [mainMenu addItem:item]; + submenu = [[[NSMenu alloc] initWithTitle:@"Window"] autorelease]; + [submenu addItemWithTitle:@"Minimize" action:@selector(performMiniaturize:) keyEquivalent:@""]; + [submenu addItemWithTitle:@"Zoom" action:@selector(performZoom:) keyEquivalent:@""]; + [submenu addItem:[NSMenuItem separatorItem]]; + [submenu addItemWithTitle:@"Bring All to Front" action:@selector(arrangeInFront:) keyEquivalent:@""]; + item = [[[NSMenuItem alloc] init] autorelease]; + [item setTitle:@"Window"]; + [item setSubmenu:submenu]; + [mainMenu addItem:item]; + [self setMainMenu:mainMenu]; + [self setWindowsMenu:submenu]; } } diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 9d359ff..49dd31b 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -172,9 +172,17 @@ static BOOL frame_intersects_screens(NSRect frame, NSArray* screens) else behavior |= NSWindowCollectionBehaviorManaged; if (state->excluded_by_cycle) + { behavior |= NSWindowCollectionBehaviorIgnoresCycle; + if ([self isVisible]) + [NSApp removeWindowsItem:self]; + } else + { behavior |= NSWindowCollectionBehaviorParticipatesInCycle; + if ([self isVisible]) + [NSApp addWindowsItem:self title:[self title] filename:NO]; + } [self setCollectionBehavior:behavior]; } @@ -196,6 +204,9 @@ static BOOL frame_intersects_screens(NSRect frame, NSArray* screens) [latentParentWindow addChildWindow:self ordered:NSWindowAbove]; self.latentParentWindow = nil; } + + if (![self isExcludedFromWindowsMenu]) + [NSApp addWindowsItem:self title:[self title] filename:NO]; } return on_screen; @@ -206,6 +217,7 @@ static BOOL frame_intersects_screens(NSRect frame, NSArray* screens) self.latentParentWindow = [self parentWindow]; [latentParentWindow removeChildWindow:self]; [self orderOut:nil]; + [NSApp removeWindowsItem:self]; } - (BOOL) setFrameIfOnScreen:(NSRect)contentRect @@ -277,6 +289,18 @@ static BOOL frame_intersects_screens(NSRect frame, NSArray* screens) return [self canBecomeKeyWindow]; } + - (BOOL) isExcludedFromWindowsMenu + { + return !([self collectionBehavior] & NSWindowCollectionBehaviorParticipatesInCycle); + } + + - (BOOL) validateMenuItem:(NSMenuItem *)menuItem + { + if ([menuItem action] == @selector(makeKeyAndOrderFront:)) + return [self isKeyWindow] || (!self.disabled && !self.noActivate); + return [super validateMenuItem:menuItem]; + } + /* * ---------- NSWindowDelegate methods ---------- @@ -372,6 +396,8 @@ void macdrv_set_cocoa_window_title(macdrv_window w, const unsigned short* title, titleString = @""; OnMainThreadAsync(^{ [window setTitle:titleString]; + if ([window isVisible] && ![window isExcludedFromWindowsMenu]) + [NSApp changeWindowsItem:window title:titleString filename:NO]; }); [pool release];

1 0

Rico Schüller : d3dx9: Add support for D3DFMT_A16B16G16R16F.
by Alexandre Julliard 11 Jan '13

11 Jan '13

Module: wine Branch: master Commit: 43f30fe8d6e405627ebfb642dc43de0bb65f8026 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43f30fe8d6e405627ebfb642d… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Jan 10 22:18:08 2013 +0100 d3dx9: Add support for D3DFMT_A16B16G16R16F. --- dlls/d3dx9_36/d3dx9_36_private.h | 3 ++ dlls/d3dx9_36/math.c | 2 +- dlls/d3dx9_36/tests/texture.c | 4 +- dlls/d3dx9_36/texture.c | 15 +++++++--- dlls/d3dx9_36/util.c | 55 +++++++++++++++++++------------------ 5 files changed, 44 insertions(+), 35 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=43f30fe8d6e405627ebfb…

1 0

Rico Schüller : d3dcompiler43/tests: Don' t use IUnknown_Release().
by Alexandre Julliard 11 Jan '13

11 Jan '13

Module: wine Branch: master Commit: b1126a8c30c2f70c68d11a027677d40fc9e16ec1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1126a8c30c2f70c68d11a027… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Jan 10 22:23:27 2013 +0100 d3dcompiler43/tests: Don't use IUnknown_Release(). --- dlls/d3dcompiler_43/tests/blob.c | 2 +- dlls/d3dcompiler_43/tests/hlsl.c | 56 +++++++++++++++++++------------------- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/dlls/d3dcompiler_43/tests/blob.c b/dlls/d3dcompiler_43/tests/blob.c index 6a4217e..ba69abf 100644 --- a/dlls/d3dcompiler_43/tests/blob.c +++ b/dlls/d3dcompiler_43/tests/blob.c @@ -64,7 +64,7 @@ static void test_create_blob(void) hr = D3DCreateBlob(0, &blob); ok(hr == S_OK, "D3DCreateBlob failed with %x\n", hr); - refcount = blob->lpVtbl->Release(blob); + refcount = ID3D10Blob_Release(blob); ok(!refcount, "ID3DBlob has %u references left\n", refcount); } diff --git a/dlls/d3dcompiler_43/tests/hlsl.c b/dlls/d3dcompiler_43/tests/hlsl.c index 1546bfe..c29d075 100644 --- a/dlls/d3dcompiler_43/tests/hlsl.c +++ b/dlls/d3dcompiler_43/tests/hlsl.c @@ -139,14 +139,14 @@ static IDirect3DDevice9 *init_d3d9(IDirect3DVertexDeclaration9 **vdeclaration, { skip("not compiling vertex shader due to lacking wine HLSL support!\n"); if (errors) - IUnknown_Release(errors); + ID3D10Blob_Release(errors); return NULL; } hr = IDirect3DDevice9_CreateVertexShader(device_ptr, ID3D10Blob_GetBufferPointer(compiled), vshader_passthru); ok(SUCCEEDED(hr), "IDirect3DDevice9_CreateVertexShader returned: %08x\n", hr); - IUnknown_Release(compiled); + ID3D10Blob_Release(compiled); return device_ptr; } @@ -184,7 +184,7 @@ static IDirect3DPixelShader9 *compile_pixel_shader9(IDirect3DDevice9 *device, co hr = IDirect3DDevice9_CreatePixelShader(device, ID3D10Blob_GetBufferPointer(compiled), &pshader); ok(SUCCEEDED(hr), "IDirect3DDevice9_CreatePixelShader returned: %08x\n", hr); - IUnknown_Release(compiled); + ID3D10Blob_Release(compiled); return pshader; } @@ -287,8 +287,8 @@ static void compute_shader_probe9(IDirect3DDevice9 *device, IDirect3DVertexShade hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(hr == D3D_OK, "IDirect3DDevice9_Present returned: %08x\n", hr); - IUnknown_Release(render_target); - IUnknown_Release(readback); + IDirect3DSurface9_Release(render_target); + IDirect3DSurface9_Release(readback); } /* Now the actual test functions */ @@ -321,8 +321,8 @@ static void test_swizzle(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 *quad_ compute_shader_probe9(device, vshader_passthru, pshader, quad_geometry, probes, sizeof(probes) / sizeof(*probes), 1, 1, __LINE__); - IUnknown_Release(constants); - IUnknown_Release(pshader); + ID3DXConstantTable_Release(constants); + IDirect3DPixelShader9_Release(pshader); } } @@ -364,8 +364,8 @@ static void test_math(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 *quad_geo compute_shader_probe9(device, vshader_passthru, pshader, quad_geometry, probes, sizeof(probes) / sizeof(*probes), 1, 1, __LINE__); - IUnknown_Release(constants); - IUnknown_Release(pshader); + ID3DXConstantTable_Release(constants); + IDirect3DPixelShader9_Release(pshader); } } @@ -418,8 +418,8 @@ static void test_conditionals(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 * compute_shader_probe9(device, vshader_passthru, pshader, quad_geometry, if_greater_probes, sizeof(if_greater_probes) / sizeof(*if_greater_probes), 32, 1, __LINE__); - IUnknown_Release(constants); - IUnknown_Release(pshader); + ID3DXConstantTable_Release(constants); + IDirect3DPixelShader9_Release(pshader); } pshader = compile_pixel_shader9(device, ternary_operator_shader, "ps_2_0", &constants); @@ -428,8 +428,8 @@ static void test_conditionals(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 * compute_shader_probe9(device, vshader_passthru, pshader, quad_geometry, ternary_operator_probes, sizeof(ternary_operator_probes) / sizeof(*ternary_operator_probes), 8, 1, __LINE__); - IUnknown_Release(constants); - IUnknown_Release(pshader); + ID3DXConstantTable_Release(constants); + IDirect3DPixelShader9_Release(pshader); } } @@ -477,8 +477,8 @@ static void test_float_vectors(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 compute_shader_probe9(device, vshader_passthru, pshader, quad_geometry, vec4_indexing_test1_probes, sizeof(vec4_indexing_test1_probes) / sizeof(*vec4_indexing_test1_probes), 1, 1, __LINE__); - IUnknown_Release(constants); - IUnknown_Release(pshader); + ID3DXConstantTable_Release(constants); + IDirect3DPixelShader9_Release(pshader); } pshader = compile_pixel_shader9(device, vec4_indexing_test2_shader, "ps_2_0", &constants); @@ -489,8 +489,8 @@ static void test_float_vectors(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 compute_shader_probe9(device, vshader_passthru, pshader, quad_geometry, vec4_indexing_test2_probes, sizeof(vec4_indexing_test2_probes) / sizeof(*vec4_indexing_test2_probes), 32, 1, __LINE__); - IUnknown_Release(constants); - IUnknown_Release(pshader); + ID3DXConstantTable_Release(constants); + IDirect3DPixelShader9_Release(pshader); } } @@ -551,8 +551,8 @@ static void test_trig(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 *quad_geo compute_shader_probe9(device, vshader_passthru, pshader, quad_geometry, sincos_probes, sizeof(sincos_probes) / sizeof(*sincos_probes), 32, 1, __LINE__); - IUnknown_Release(constants); - IUnknown_Release(pshader); + ID3DXConstantTable_Release(constants); + IDirect3DPixelShader9_Release(pshader); } } @@ -604,7 +604,7 @@ static void test_fail(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 *qquad_ge ok(errors != NULL, "No errors returned for a shader with undefined variables\n"); ok(compiled == NULL, "A shader blob was returned for a shader with undefined variables\n"); - IUnknown_Release(errors); + ID3D10Blob_Release(errors); errors = NULL; hr = D3DCompile(invalid_swizzle_shader, strlen(invalid_swizzle_shader), NULL, NULL, NULL, @@ -613,7 +613,7 @@ static void test_fail(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 *qquad_ge ok(errors != NULL, "No errors returned for a shader with an invalid swizzle mask\n"); ok(compiled == NULL, "A shader blob was returned for a shader with an invalid swizzle mask\n"); - IUnknown_Release(errors); + ID3D10Blob_Release(errors); errors = NULL; hr = D3DCompile(invalid_conversion_shader, strlen(invalid_conversion_shader), NULL, NULL, NULL, @@ -623,7 +623,7 @@ static void test_fail(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 *qquad_ge ok(errors != NULL, "No errors returned for a shader with invalid type conversions\n"); ok(compiled == NULL, "A shader blob was returned for a shader with invalid type conversions\n"); - IUnknown_Release(errors); + ID3D10Blob_Release(errors); errors = NULL; hr = D3DCompile(invalid_syntax_shader, strlen(invalid_syntax_shader), NULL, NULL, NULL, "test", @@ -633,7 +633,7 @@ static void test_fail(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 *qquad_ge ok(errors != NULL, "No errors returned for a shader with invalid syntax\n"); ok(compiled == NULL, "A shader blob was returned for a shader with invalid syntax\n"); - IUnknown_Release(errors); + ID3D10Blob_Release(errors); errors = NULL; hr = D3DCompile(invalid_identifiers_shader, strlen(invalid_identifiers_shader), NULL, NULL, @@ -645,7 +645,7 @@ static void test_fail(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 *qquad_ge ok(compiled == NULL, "A shader blob was returned for a shader with invalid variable and " "function names\n"); - IUnknown_Release(errors); + ID3D10Blob_Release(errors); } START_TEST(hlsl) @@ -679,16 +679,16 @@ START_TEST(hlsl) /* Reference counting sanity checks */ if (vshader_passthru) { - refcount = IUnknown_Release(vshader_passthru); + refcount = IDirect3DVertexShader9_Release(vshader_passthru); ok(!refcount, "Pass-through vertex shader has %u references left\n", refcount); } - refcount = IUnknown_Release(quad_geometry); + refcount = IDirect3DVertexBuffer9_Release(quad_geometry); ok(!refcount, "Vertex buffer has %u references left\n", refcount); - refcount = IUnknown_Release(vdeclaration); + refcount = IDirect3DVertexDeclaration9_Release(vdeclaration); ok(!refcount, "Vertex declaration has %u references left\n", refcount); - refcount = IUnknown_Release(device); + refcount = IDirect3DDevice9_Release(device); ok(!refcount, "Device has %u references left\n", refcount); }

1 0

Rico Schüller : d3dx9: Use lowercase hexadecimal values.
by Alexandre Julliard 11 Jan '13

11 Jan '13

Module: wine Branch: master Commit: c1d1d746142dafee149e7aa9575c54631592efc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1d1d746142dafee149e7aa95… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Jan 10 22:23:31 2013 +0100 d3dx9: Use lowercase hexadecimal values. --- dlls/d3dx9_36/shader.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 3e28a03..a0d36e2 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -597,9 +597,9 @@ static inline struct ID3DXConstantTableImpl *impl_from_ID3DXConstantTable(ID3DXC return CONTAINING_RECORD(iface, struct ID3DXConstantTableImpl, ID3DXConstantTable_iface); } -static inline int is_vertex_shader(DWORD version) +static inline BOOL is_vertex_shader(DWORD version) { - return (version & 0xFFFF0000) == 0xFFFE0000; + return (version & 0xffff0000) == 0xfffe0000; } static inline struct ctab_constant *constant_from_handle(D3DXHANDLE handle)

1 0

Nikolay Sivov : comctl32/listview: Always send LVN_ITEMCHANGING notification even if nothing changed.
by Alexandre Julliard 11 Jan '13

11 Jan '13

Module: wine Branch: master Commit: 7773d6b09591be22e7a3a284cd90435895707f17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7773d6b09591be22e7a3a284c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 11 02:36:39 2013 +0400 comctl32/listview: Always send LVN_ITEMCHANGING notification even if nothing changed. --- dlls/comctl32/listview.c | 20 ++++++----- dlls/comctl32/tests/listview.c | 77 ++++++++++++++++++++++++++++++++++++---- 2 files changed, 81 insertions(+), 16 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 49c326a..79d55da 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -4233,20 +4233,19 @@ static BOOL set_main_item(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem, BOOL if ((lpLVItem->mask & LVIF_TEXT) && textcmpWT(lpItem->hdr.pszText, lpLVItem->pszText, isW)) uChanged |= LVIF_TEXT; - TRACE("uChanged=0x%x\n", uChanged); - if (!uChanged) return TRUE; - *bChanged = TRUE; + TRACE("change mask=0x%x\n", uChanged); - ZeroMemory(&nmlv, sizeof(NMLISTVIEW)); + memset(&nmlv, 0, sizeof(NMLISTVIEW)); nmlv.iItem = lpLVItem->iItem; nmlv.uNewState = (item.state & ~stateMask) | (lpLVItem->state & stateMask); nmlv.uOldState = item.state; - nmlv.uChanged = uChanged; + nmlv.uChanged = uChanged ? uChanged : lpLVItem->mask; nmlv.lParam = item.lParam; - - /* send LVN_ITEMCHANGING notification, if the item is not being inserted */ - /* and we are _NOT_ virtual (LVS_OWNERDATA), and change notifications */ - /* are enabled */ + + /* Send LVN_ITEMCHANGING notification, if the item is not being inserted + and we are _NOT_ virtual (LVS_OWNERDATA), and change notifications + are enabled. Even nothing really changed we still need to send this, + in this case uChanged mask is just set to passed item mask. */ if(lpItem && !isNew && infoPtr->bDoChangeNotify) { HWND hwndSelf = infoPtr->hwndSelf; @@ -4257,6 +4256,9 @@ static BOOL set_main_item(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem, BOOL return FALSE; } + if (!uChanged) return TRUE; + *bChanged = TRUE; + /* copy information */ if (lpLVItem->mask & LVIF_TEXT) textsetptrT(&lpItem->hdr.pszText, lpLVItem->pszText, isW); diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 583645d..25321c3 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -3,7 +3,7 @@ * * Copyright 2006 Mike McCormack for CodeWeavers * Copyright 2007 George Gov - * Copyright 2009-2012 Nikolay Sivov + * Copyright 2009-2013 Nikolay Sivov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -52,6 +52,8 @@ static BOOL blockEdit; static BOOL g_block_hover; /* notification data for LVN_ITEMCHANGED */ static NMLISTVIEW g_nmlistview; +/* notification data for LVN_ITEMCHANGING */ +static NMLISTVIEW g_nmlistview_changing; /* format reported to control: -1 falls to defproc, anything else returned */ static INT notifyFormat; @@ -209,7 +211,7 @@ static const struct message ownerdata_deselect_all_parent_seq[] = { { 0 } }; -static const struct message select_all_parent_seq[] = { +static const struct message change_all_parent_seq[] = { { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGING }, { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGED }, @@ -227,6 +229,15 @@ static const struct message select_all_parent_seq[] = { { 0 } }; +static const struct message changing_all_parent_seq[] = { + { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGING }, + { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGING }, + { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGING }, + { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGING }, + { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGING }, + { 0 } +}; + static const struct message textcallback_set_again_parent_seq[] = { { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGING }, { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGED }, @@ -430,6 +441,12 @@ static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LP "BEGIN" : "END", pScroll->dx, pScroll->dy); } break; + case LVN_ITEMCHANGING: + { + NMLISTVIEW *nmlv = (NMLISTVIEW*)lParam; + g_nmlistview_changing = *nmlv; + } + break; case LVN_ITEMCHANGED: { NMLISTVIEW *nmlv = (NMLISTVIEW*)lParam; @@ -2169,9 +2186,8 @@ static void test_multiselect(void) item.stateMask = LVIS_SELECTED; SendMessageA(hwnd, LVM_SETITEMSTATE, task.initPos == -1 ? item_count-1 : task.initPos, (LPARAM)&item); - selected_count = (int)SendMessage(hwnd, LVM_GETSELECTEDCOUNT, 0, 0); - - ok(selected_count == 1, "There should be only one selected item at the beginning (is %d)\n",selected_count); + selected_count = SendMessageA(hwnd, LVM_GETSELECTEDCOUNT, 0, 0); + ok(selected_count == 1, "expected 1, got %d\n", selected_count); /* Set SHIFT key pressed */ GetKeyboardState(kstate); @@ -2220,16 +2236,62 @@ static void test_multiselect(void) r = SendMessageA(hwnd, LVM_SETITEMSTATE, -1, (LPARAM)&item); expect(TRUE, r); - ok_sequence(sequences, PARENT_SEQ_INDEX, select_all_parent_seq, + ok_sequence(sequences, PARENT_SEQ_INDEX, change_all_parent_seq, "select all notification", FALSE); + /* select all again (all selected already) */ + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + memset(&g_nmlistview_changing, 0xcc, sizeof(g_nmlistview_changing)); + + item.stateMask = LVIS_SELECTED; + item.state = LVIS_SELECTED; + r = SendMessageA(hwnd, LVM_SETITEMSTATE, -1, (LPARAM)&item); + expect(TRUE, r); + + ok(g_nmlistview_changing.uNewState == LVIS_SELECTED, "got 0x%x\n", g_nmlistview_changing.uNewState); + ok(g_nmlistview_changing.uOldState == LVIS_SELECTED, "got 0x%x\n", g_nmlistview_changing.uOldState); + ok(g_nmlistview_changing.uChanged == LVIF_STATE, "got 0x%x\n", g_nmlistview_changing.uChanged); + + ok_sequence(sequences, PARENT_SEQ_INDEX, changing_all_parent_seq, + "select all notification 2", FALSE); + /* deselect all items */ + flush_sequences(sequences, NUM_MSG_SEQUENCES); + item.state = 0; item.stateMask = LVIS_SELECTED; SendMessageA(hwnd, LVM_SETITEMSTATE, -1, (LPARAM)&item); + ok_sequence(sequences, PARENT_SEQ_INDEX, change_all_parent_seq, + "deselect all notification", FALSE); + + /* deselect all items again */ + flush_sequences(sequences, NUM_MSG_SEQUENCES); + item.state = 0; + item.stateMask = LVIS_SELECTED; + SendMessageA(hwnd, LVM_SETITEMSTATE, -1, (LPARAM)&item); + ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, "deselect all notification 2", TRUE); + + /* any non-zero state value does the same */ + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + memset(&g_nmlistview_changing, 0xcc, sizeof(g_nmlistview_changing)); + + item.stateMask = LVIS_SELECTED; + item.state = LVIS_CUT; + r = SendMessageA(hwnd, LVM_SETITEMSTATE, -1, (LPARAM)&item); + expect(TRUE, r); + + ok(g_nmlistview_changing.uNewState == 0, "got 0x%x\n", g_nmlistview_changing.uNewState); + ok(g_nmlistview_changing.uOldState == 0, "got 0x%x\n", g_nmlistview_changing.uOldState); + ok(g_nmlistview_changing.uChanged == LVIF_STATE, "got 0x%x\n", g_nmlistview_changing.uChanged); + + ok_sequence(sequences, PARENT_SEQ_INDEX, changing_all_parent_seq, + "set state all notification 3", FALSE); + SendMessage(hwnd, LVM_SETSELECTIONMARK, 0, -1); - for (i=0;i<3;i++) { + for (i = 0; i < 3; i++) { item.state = LVIS_SELECTED; item.stateMask = LVIS_SELECTED; SendMessageA(hwnd, LVM_SETITEMSTATE, i, (LPARAM)&item); @@ -5470,6 +5532,7 @@ START_TEST(listview) test_LVS_EX_TRANSPARENTBKGND(); test_LVS_EX_HEADERINALLVIEWS(); test_deleteitem(); + test_multiselect(); unload_v6_module(ctx_cookie, hCtx);

1 0

Nikolay Sivov : comctl32/listview: Add a special case for deselect all attempt when nothing is selected.
by Alexandre Julliard 11 Jan '13

11 Jan '13

Module: wine Branch: master Commit: b68e95abd86a3db26f873d37f6317f3ad68763c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b68e95abd86a3db26f873d37f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 11 03:06:27 2013 +0400 comctl32/listview: Add a special case for deselect all attempt when nothing is selected. --- dlls/comctl32/listview.c | 4 ++++ dlls/comctl32/tests/listview.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 79d55da..bb6d1b2 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -8857,6 +8857,10 @@ static BOOL LISTVIEW_SetItemState(LISTVIEW_INFO *infoPtr, INT nItem, const LVITE UINT oldstate = 0; BOOL notify; + /* special case optimization for recurring attemp to deselect all */ + if (lvItem.state == 0 && lvItem.stateMask == LVIS_SELECTED && !LISTVIEW_GetSelectedCount(infoPtr)) + return TRUE; + /* select all isn't allowed in LVS_SINGLESEL */ if ((lvItem.state & lvItem.stateMask & LVIS_SELECTED) && (infoPtr->dwStyle & LVS_SINGLESEL)) return FALSE; diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 25321c3..cff6e92 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -2271,7 +2271,7 @@ static void test_multiselect(void) item.state = 0; item.stateMask = LVIS_SELECTED; SendMessageA(hwnd, LVM_SETITEMSTATE, -1, (LPARAM)&item); - ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, "deselect all notification 2", TRUE); + ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, "deselect all notification 2", FALSE); /* any non-zero state value does the same */ flush_sequences(sequences, NUM_MSG_SEQUENCES); @@ -3111,7 +3111,7 @@ static void test_ownerdata(void) res = SendMessageA(hwnd, LVM_SETITEMSTATE, -1, (LPARAM)&item); expect(TRUE, res); - ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, "ownerdata deselect all notification", TRUE); + ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, "ownerdata deselect all notification", FALSE); /* select one, then deselect all */ item.stateMask = LVIS_SELECTED;

1 0

Ken Thomases : libwine: Use rpath-based install name and library references for libwine on Mac.
by Alexandre Julliard 11 Jan '13

11 Jan '13

Module: wine Branch: master Commit: f377591e98c490ca00e6479627832e41b2ad01b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f377591e98c490ca00e647962… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Jan 11 03:25:07 2013 -0600 libwine: Use rpath-based install name and library references for libwine on Mac. --- configure | 3 ++- configure.ac | 3 ++- libs/wine/Makefile.in | 6 +++--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/configure b/configure index 7a4b086..8394dea 100755 --- a/configure +++ b/configure @@ -6657,7 +6657,8 @@ fi LDDLLFLAGS="-bundle -multiply_defined suppress" LIBWINE_LDFLAGS="-multiply_defined suppress" LDSHARED="\$(CC) -dynamiclib" - LDRPATH_LOCAL="&& install_name_tool -change @executable_path/\`\$(RELPATH) \$(bindir) \$(libdir)\`/libwine.1.dylib @executable_path/\$(top_builddir)/libs/wine/libwine.1.dylib \$@ || \$(RM) \$@" + LDRPATH_INSTALL="-Wl,-rpath,@loader_path/\`\$(RELPATH) \$(bindir) \$(libdir)\`" + LDRPATH_LOCAL="-Wl,-rpath,@loader_path/\$(top_builddir)/libs/wine" COREFOUNDATIONLIB="-framework CoreFoundation" IOKITLIB="-framework IOKit -framework CoreFoundation" diff --git a/configure.ac b/configure.ac index a9fa02d..78d4f4b 100644 --- a/configure.ac +++ b/configure.ac @@ -723,7 +723,8 @@ case $host_os in LDDLLFLAGS="-bundle -multiply_defined suppress" LIBWINE_LDFLAGS="-multiply_defined suppress" LDSHARED="\$(CC) -dynamiclib" - LDRPATH_LOCAL="&& install_name_tool -change @executable_path/\`\$(RELPATH) \$(bindir) \$(libdir)\`/libwine.1.dylib @executable_path/\$(top_builddir)/libs/wine/libwine.1.dylib \$@ || \$(RM) \$@" + LDRPATH_INSTALL="-Wl,-rpath,@loader_path/\`\$(RELPATH) \$(bindir) \$(libdir)\`" + LDRPATH_LOCAL="-Wl,-rpath,@loader_path/\$(top_builddir)/libs/wine" dnl declare needed frameworks AC_SUBST(COREFOUNDATIONLIB,"-framework CoreFoundation") AC_SUBST(IOKITLIB,"-framework IOKit -framework CoreFoundation") diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in index a86e73b..b8c713a 100644 --- a/libs/wine/Makefile.in +++ b/libs/wine/Makefile.in @@ -128,13 +128,13 @@ libwine.a: wine.def libwine.dll: $(OBJS) wine.def Makefile.in $(DLLWRAP) --def $(srcdir)/wine.def -o $@ $(OBJS) $(EXTRALIBS) -DYLIB_LDFLAGS = -compatibility_version $(SOVERSION) -current_version $(VERSION) -Wl,-headerpad_max_install_names +DYLIB_LDFLAGS = -compatibility_version $(SOVERSION) -current_version $(VERSION) libwine.$(VERSION).dylib: $(OBJS) $(RELPATH) Makefile.in - $(LDSHARED) -install_name $(libdir)/$(DYNAME) $(DYLIB_LDFLAGS) $(OBJS) $(EXTRALIBS) $(LDFLAGS) $(LIBS) -o $@ + $(LDSHARED) -install_name @rpath/$(DYNAME) $(DYLIB_LDFLAGS) $(OBJS) $(EXTRALIBS) $(LDFLAGS) $(LIBS) -o $@ libwine.$(SOVERSION).dylib: libwine.$(VERSION).dylib - cp -p libwine.$(VERSION).dylib $@ && install_name_tool -id @executable_path/`$(RELPATH) $(bindir) $(libdir)`/$(DYNAME) $@ || $(RM) $@ + $(RM) $@ && $(LN_S) libwine.$(VERSION).dylib $@ libwine.dylib: libwine.$(SOVERSION).dylib $(RM) $@ && $(LN_S) libwine.$(SOVERSION).dylib $@

1 0

Jacek Caban : mshtml: Added support for non-integer values in get_nsstyle_pixel_val.
by Alexandre Julliard 10 Jan '13

10 Jan '13

Module: wine Branch: master Commit: b93e29f0ee0006e4469782db740f20cdae6b5be2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b93e29f0ee0006e4469782db7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 10 14:20:16 2013 +0100 mshtml: Added support for non-integer values in get_nsstyle_pixel_val. --- dlls/mshtml/htmlstyle.c | 7 ++++++- dlls/mshtml/tests/style.c | 11 +++++++++++ 2 files changed, 17 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 2cf252d..8d3148c 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -664,9 +664,14 @@ static HRESULT get_nsstyle_pixel_val(HTMLStyle *This, styleid_t sid, LONG *p) if(value) { *p = strtolW(value, &ptr, 10); + if(*ptr == '.') { + /* Skip all digits. We have tests showing that we should not round the value. */ + while(isdigitW(*++ptr)); + } + if(*ptr && strcmpW(ptr, pxW)) { nsAString_Finish(&str_value); - FIXME("only px values are currently supported\n"); + FIXME("%s: only px values are currently supported\n", debugstr_w(value)); hres = E_NOTIMPL; } }else { diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index 8ec69a6..3e2ef89 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -961,6 +961,17 @@ static void test_body_style(IHTMLStyle *style) ok(!strcmp_wa(V_BSTR(&v), "3px"), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = a2bstr("4.99"); + hres = IHTMLStyle_put_left(style, v); + ok(hres == S_OK, "put_left failed: %08x\n", hres); + VariantClear(&v); + + l = 0xdeadbeef; + hres = IHTMLStyle_get_pixelLeft(style, &l); + ok(hres == S_OK, "get_pixelLeft failed: %08x\n", hres); + ok(l == 4, "pixelLeft = %d\n", l); + V_VT(&v) = VT_NULL; hres = IHTMLStyle_put_left(style, v); ok(hres == S_OK, "put_left failed: %08x\n", hres);

1 0

Alexandre Julliard : configure: Try readelf before ldd to determine a library soname.
by Alexandre Julliard 10 Jan '13

10 Jan '13

Module: wine Branch: master Commit: 0874734ecbd6d137705f5322482ba5e17416eeb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0874734ecbd6d137705f53224… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 10 17:52:11 2013 +0100 configure: Try readelf before ldd to determine a library soname. --- aclocal.m4 | 14 ++- configure | 272 ++++++++++++++++++++++++++++++++++++++++++++++++++------- configure.ac | 2 +- 3 files changed, 248 insertions(+), 40 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0874734ecbd6d137705f5…

1 0