March 2015 - Wine-commits - list.winehq.org

Hans Leidekker : msi: Skip files from the original media if a patch is applied.
by Alexandre Julliard 25 Mar '15

25 Mar '15

Module: wine Branch: master Commit: 19e51936e0d7c37e201b45a1fbce007ca4808f86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19e51936e0d7c37e201b45a1f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 25 14:33:26 2015 +0100 msi: Skip files from the original media if a patch is applied. --- dlls/msi/files.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 36e91ca..4337d51 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -77,6 +77,11 @@ static msi_file_state calculate_install_state( MSIPACKAGE *package, MSIFILE *fil TRACE("skipping %s (not scheduled for install)\n", debugstr_w(file->File)); return msifs_skipped; } + if (!list_empty( &package->patches ) && file->disk_id < MSI_INITIAL_MEDIA_TRANSFORM_DISKID) + { + TRACE("skipping %s (not part of patch)\n", debugstr_w(file->File)); + return msifs_skipped; + } if ((comp->assembly && !comp->assembly->application && !comp->assembly->installed) || GetFileAttributesW( file->TargetPath ) == INVALID_FILE_ATTRIBUTES) {

1 0

Hans Leidekker : msi: Check file state before installing global assemblies.
by Alexandre Julliard 25 Mar '15

25 Mar '15

Module: wine Branch: master Commit: c66f9bef6073ad77f75ec4db7afa0d1c712020ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=c66f9bef6073ad77f75ec4db7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 25 14:33:48 2015 +0100 msi: Check file state before installing global assemblies. --- dlls/msi/files.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 4337d51..40cc3f6 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -340,7 +340,6 @@ WCHAR *msi_resolve_file_source( MSIPACKAGE *package, MSIFILE *file ) UINT ACTION_InstallFiles(MSIPACKAGE *package) { MSIMEDIAINFO *mi; - MSICOMPONENT *comp; UINT rc = ERROR_SUCCESS; MSIFILE *file; @@ -418,18 +417,19 @@ UINT ACTION_InstallFiles(MSIPACKAGE *package) goto done; } } - LIST_FOR_EACH_ENTRY( comp, &package->components, MSICOMPONENT, entry ) + LIST_FOR_EACH_ENTRY( file, &package->files, MSIFILE, entry ) { - comp->Action = msi_get_component_action( package, comp ); - if (comp->Action == INSTALLSTATE_LOCAL && comp->assembly && !comp->assembly->installed) + MSICOMPONENT *comp = file->Component; + + if (!comp->assembly || (file->state != msifs_missing && file->state != msifs_overwrite)) + continue; + + rc = msi_install_assembly( package, comp ); + if (rc != ERROR_SUCCESS) { - rc = msi_install_assembly( package, comp ); - if (rc != ERROR_SUCCESS) - { - ERR("Failed to install assembly\n"); - rc = ERROR_INSTALL_FAILURE; - break; - } + ERR("Failed to install assembly\n"); + rc = ERROR_INSTALL_FAILURE; + break; } }

1 0

Michael Müller : netprofm: Add stubbed IConnectionPoint interface.
by Alexandre Julliard 25 Mar '15

25 Mar '15

Module: wine Branch: master Commit: 8e999722043527c85c1df565515fb4ad5e2beac6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e999722043527c85c1df5655… Author: Michael Müller <michael(a)fds-team.de> Date: Wed Mar 25 11:55:13 2015 +0100 netprofm: Add stubbed IConnectionPoint interface. --- dlls/netprofm/list.c | 170 ++++++++++++++++++++++++++++++++++++++++++++++++- include/netlistmgr.idl | 13 ++++ 2 files changed, 181 insertions(+), 2 deletions(-) diff --git a/dlls/netprofm/list.c b/dlls/netprofm/list.c index b9ab1cc..783b9cd 100644 --- a/dlls/netprofm/list.c +++ b/dlls/netprofm/list.c @@ -1,5 +1,6 @@ /* * Copyright 2014 Hans Leidekker for CodeWeavers + * Copyright 2015 Michael Müller * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -26,6 +27,7 @@ #include "objbase.h" #include "ocidl.h" #include "netlistmgr.h" +#include "olectl.h" #include "wine/debug.h" #include "netprofm_private.h" @@ -40,6 +42,14 @@ struct list_manager LONG refs; }; +struct connection_point +{ + IConnectionPoint IConnectionPoint_iface; + IConnectionPointContainer *container; + LONG refs; + IID iid; +}; + static inline struct list_manager *impl_from_IConnectionPointContainer(IConnectionPointContainer *iface) { return CONTAINING_RECORD(iface, struct list_manager, IConnectionPointContainer_iface); @@ -51,6 +61,151 @@ static inline struct list_manager *impl_from_INetworkCostManager( return CONTAINING_RECORD( iface, struct list_manager, INetworkCostManager_iface ); } +static inline struct connection_point *impl_from_IConnectionPoint( + IConnectionPoint *iface ) +{ + return CONTAINING_RECORD( iface, struct connection_point, IConnectionPoint_iface ); +} + +static HRESULT WINAPI connection_point_QueryInterface( + IConnectionPoint *iface, + REFIID riid, + void **obj ) +{ + struct connection_point *cp = impl_from_IConnectionPoint( iface ); + TRACE( "%p, %s, %p\n", cp, debugstr_guid(riid), obj ); + + if (IsEqualGUID( riid, &IID_IConnectionPoint ) || + IsEqualGUID( riid, &IID_IUnknown )) + { + *obj = iface; + } + else + { + FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); + return E_NOINTERFACE; + } + IConnectionPoint_AddRef( iface ); + return S_OK; +} + +static ULONG WINAPI connection_point_AddRef( + IConnectionPoint *iface ) +{ + struct connection_point *cp = impl_from_IConnectionPoint( iface ); + return InterlockedIncrement( &cp->refs ); +} + +static ULONG WINAPI connection_point_Release( + IConnectionPoint *iface ) +{ + struct connection_point *cp = impl_from_IConnectionPoint( iface ); + LONG refs = InterlockedDecrement( &cp->refs ); + if (!refs) + { + TRACE( "destroying %p\n", cp ); + IConnectionPointContainer_Release( cp->container ); + HeapFree( GetProcessHeap(), 0, cp ); + } + return refs; +} + +static HRESULT WINAPI connection_point_GetConnectionInterface( + IConnectionPoint *iface, + IID *iid ) +{ + struct connection_point *cp = impl_from_IConnectionPoint( iface ); + TRACE( "%p, %p\n", cp, iid ); + + if (!iid) + return E_POINTER; + + memcpy( iid, &cp->iid, sizeof(*iid) ); + return S_OK; +} + +static HRESULT WINAPI connection_point_GetConnectionPointContainer( + IConnectionPoint *iface, + IConnectionPointContainer **container ) +{ + struct connection_point *cp = impl_from_IConnectionPoint( iface ); + TRACE( "%p, %p\n", cp, container ); + + if (!container) + return E_POINTER; + + IConnectionPointContainer_AddRef( cp->container ); + *container = cp->container; + return S_OK; +} + +static HRESULT WINAPI connection_point_Advise( + IConnectionPoint *iface, + IUnknown *sink, + DWORD *cookie ) +{ + struct connection_point *cp = impl_from_IConnectionPoint( iface ); + FIXME( "%p, %p, %p - stub\n", cp, sink, cookie ); + + if (!sink || !cookie) + return E_POINTER; + + return CONNECT_E_CANNOTCONNECT; +} + +static HRESULT WINAPI connection_point_Unadvise( + IConnectionPoint *iface, + DWORD cookie ) +{ + struct connection_point *cp = impl_from_IConnectionPoint( iface ); + FIXME( "%p, %d - stub\n", cp, cookie ); + + return E_POINTER; +} + +static HRESULT WINAPI connection_point_EnumConnections( + IConnectionPoint *iface, + IEnumConnections **connections ) +{ + struct connection_point *cp = impl_from_IConnectionPoint( iface ); + FIXME( "%p, %p - stub\n", cp, connections ); + + return E_NOTIMPL; +} + +static const IConnectionPointVtbl connection_point_vtbl = +{ + connection_point_QueryInterface, + connection_point_AddRef, + connection_point_Release, + connection_point_GetConnectionInterface, + connection_point_GetConnectionPointContainer, + connection_point_Advise, + connection_point_Unadvise, + connection_point_EnumConnections +}; + +static HRESULT connection_point_create( + IConnectionPoint **obj, + REFIID riid, + IConnectionPointContainer *container ) +{ + struct connection_point *cp; + TRACE( "%p, %s, %p\n", obj, debugstr_guid(riid), container ); + + if (!(cp = HeapAlloc( GetProcessHeap(), 0, sizeof(*cp) ))) return E_OUTOFMEMORY; + cp->IConnectionPoint_iface.lpVtbl = &connection_point_vtbl; + cp->container = container; + cp->refs = 1; + + memcpy( &cp->iid, riid, sizeof(*riid) ); + IConnectionPointContainer_AddRef( container ); + + *obj = &cp->IConnectionPoint_iface; + TRACE( "returning iface %p\n", *obj ); + return S_OK; +} + static HRESULT WINAPI cost_manager_QueryInterface( INetworkCostManager *iface, REFIID riid, @@ -328,8 +483,19 @@ static HRESULT WINAPI ConnectionPointContainer_FindConnectionPoint(IConnectionPo REFIID riid, IConnectionPoint **cp) { struct list_manager *This = impl_from_IConnectionPointContainer( iface ); - FIXME("(%p)->(%s %p): stub\n", This, debugstr_guid(riid), cp); - return E_NOTIMPL; + + TRACE( "%p, %s, %p\n", This, debugstr_guid(riid), cp ); + + if (!riid || !cp) + return E_POINTER; + + if (IsEqualGUID( riid, &IID_INetworkListManagerEvents )) + return connection_point_create( cp, riid, iface ); + + FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); + + *cp = NULL; + return E_NOINTERFACE; } static const struct IConnectionPointContainerVtbl cpc_vtbl = diff --git a/include/netlistmgr.idl b/include/netlistmgr.idl index 5be6e28..5d2c811 100644 --- a/include/netlistmgr.idl +++ b/include/netlistmgr.idl @@ -29,6 +29,7 @@ interface INetwork; interface INetworkConnection; interface INetworkCostManager; interface INetworkListManager; +interface INetworkListManagerEvents; typedef [v1_enum] enum NLM_CONNECTIVITY { @@ -145,3 +146,15 @@ interface INetworkListManager : IDispatch uuid(dcb00c01-570f-4a9b-8d69-199fdba5723b) ] coclass NetworkListManager { interface INetworkListManager; } + +[ + object, + oleautomation, + pointer_default(unique), + uuid(DCB00001-570F-4A9B-8D69-199FDBA5723B) +] +interface INetworkListManagerEvents : IUnknown +{ + HRESULT ConnectivityChanged( + [in] NLM_CONNECTIVITY newConnectivity); +}

1 0

Michael Müller : netprofm/tests: Add tests for ConnectionPointContainer::FindConnectionPoint.
by Alexandre Julliard 25 Mar '15

25 Mar '15

Module: wine Branch: master Commit: d07f76e39affdbe29f8733ffb1087d400b305a53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d07f76e39affdbe29f8733ffb… Author: Michael Müller <michael(a)fds-team.de> Date: Wed Mar 25 12:03:48 2015 +0100 netprofm/tests: Add tests for ConnectionPointContainer::FindConnectionPoint. The refcounting is also tested because some apps depend on that. --- dlls/netprofm/tests/list.c | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/dlls/netprofm/tests/list.c b/dlls/netprofm/tests/list.c index ce4891a..06a8086 100644 --- a/dlls/netprofm/tests/list.c +++ b/dlls/netprofm/tests/list.c @@ -27,12 +27,15 @@ static void test_INetworkListManager( void ) { - IConnectionPointContainer *cpc; + IConnectionPointContainer *cpc, *cpc2; INetworkListManager *mgr; INetworkCostManager *cost_mgr; NLM_CONNECTIVITY connectivity; VARIANT_BOOL connected; + IConnectionPoint *pt; HRESULT hr; + ULONG ref1, ref2; + IID iid; hr = CoCreateInstance( &CLSID_NetworkListManager, NULL, CLSCTX_INPROC_SERVER, &IID_INetworkListManager, (void **)&mgr ); @@ -78,8 +81,31 @@ static void test_INetworkListManager( void ) hr = INetworkListManager_QueryInterface( mgr, &IID_IConnectionPointContainer, (void**)&cpc ); ok( hr == S_OK, "got %08x\n", hr ); + + ref1 = IConnectionPointContainer_AddRef( cpc ); + + hr = IConnectionPointContainer_FindConnectionPoint( cpc, &IID_INetworkListManagerEvents, &pt ); + ok( hr == S_OK, "got %08x\n", hr ); + + ref2 = IConnectionPointContainer_AddRef( cpc ); + ok( ref2 == ref1 + 2, "Expected refcount %d, got %d\n", ref1 + 2, ref2 ); + + IConnectionPointContainer_Release( cpc ); IConnectionPointContainer_Release( cpc ); + hr = IConnectionPoint_GetConnectionPointContainer( pt, &cpc2 ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( cpc2 == cpc, "Expected cpc2 == %p, but got %p\n", cpc, cpc2 ); + IConnectionPointContainer_Release( cpc2 ); + + memset( &iid, 0, sizeof(iid) ); + hr = IConnectionPoint_GetConnectionInterface( pt, &iid ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !memcmp( &iid, &IID_INetworkListManagerEvents, sizeof(iid) ), + "Expected iid to be IID_INetworkListManagerEvents\n" ); + + IConnectionPoint_Release( pt ); + IConnectionPointContainer_Release( cpc ); INetworkListManager_Release( mgr ); }

1 0

Jacek Caban : d3d11sdklayers.idl: Added ID3D11Debug declaration.
by Alexandre Julliard 25 Mar '15

25 Mar '15

Module: wine Branch: master Commit: a79621a689e637273acb6f8f1350b7c11107d839 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a79621a689e637273acb6f8f1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 25 15:24:04 2015 +0100 d3d11sdklayers.idl: Added ID3D11Debug declaration. --- include/d3d11sdklayers.idl | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/include/d3d11sdklayers.idl b/include/d3d11sdklayers.idl index e74922a..638e53c 100644 --- a/include/d3d11sdklayers.idl +++ b/include/d3d11sdklayers.idl @@ -1184,6 +1184,11 @@ typedef enum D3D11_MESSAGE_ID { D3D11_MESSAGE_ID_D3D11_1_MESSAGES_END } D3D11_MESSAGE_ID; +typedef enum D3D11_RLDO_FLAGS { + D3D11_RLDO_SUMMARY = 1, + D3D11_RLDO_DETAIL = 2 +} D3D11_RLDO_FLAGS; + typedef struct D3D11_MESSAGE { D3D11_MESSAGE_CATEGORY Category; D3D11_MESSAGE_SEVERITY Severity; @@ -1210,6 +1215,24 @@ cpp_quote("#define D3D11_INFO_QUEUE_DEFAULT_MESSAGE_COUNT_LIMIT 1024") [ object, + uuid(79cf2233-7536-4948-9d36-1e4692dc5760), + local, + pointer_default(unique) +] +interface ID3D11Debug : IUnknown { + HRESULT SetFeatureMask(UINT Mask); + UINT GetFeatureMask(); + HRESULT SetPresentPerRenderOpDelay(UINT Milliseconds); + UINT GetPresentPerRenderOpDelay(); + HRESULT SetSwapChain(IDXGISwapChain *pSwapChain); + HRESULT GetSwapChain(IDXGISwapChain **ppSwapChain); + HRESULT ValidateContext(ID3D11DeviceContext *pContext); + HRESULT ReportLiveDeviceObjects(D3D11_RLDO_FLAGS Flags); + HRESULT ValidateContextForDispatch(ID3D11DeviceContext *pContext); +} + +[ + object, uuid(6543dbb6-1b48-42f5-ab82-e97ec74326f6), local, pointer_default(unique)

1 0

Jacek Caban : dxgi1_2.idl: Added IDXGIAdapter2 declaration.
by Alexandre Julliard 25 Mar '15

25 Mar '15

Module: wine Branch: master Commit: 3c5387da058f893c4337cebd073e6aa210d6e431 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c5387da058f893c4337cebd0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 25 15:24:18 2015 +0100 dxgi1_2.idl: Added IDXGIAdapter2 declaration. --- include/dxgi1_2.idl | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/include/dxgi1_2.idl b/include/dxgi1_2.idl index 775b81c..92f9c0e 100644 --- a/include/dxgi1_2.idl +++ b/include/dxgi1_2.idl @@ -190,3 +190,45 @@ interface IDXGIFactory2 : IDXGIFactory1 [in] IDXGIOutput *pRestrictToOutput, [out] IDXGISwapChain1 **ppSwapChain); } + +typedef enum DXGI_GRAPHICS_PREEMPTION_GRANULARITY { + DXGI_GRAPHICS_PREEMPTION_DMA_BUFFER_BOUNDARY, + DXGI_GRAPHICS_PREEMPTION_PRIMITIVE_BOUNDARY, + DXGI_GRAPHICS_PREEMPTION_TRIANGLE_BOUNDARY, + DXGI_GRAPHICS_PREEMPTION_PIXEL_BOUNDARY, + DXGI_GRAPHICS_PREEMPTION_INSTRUCTION_BOUNDARY +} DXGI_GRAPHICS_PREEMPTION_GRANULARITY; + +typedef enum DXGI_COMPUTE_PREEMPTION_GRANULARITY { + DXGI_COMPUTE_PREEMPTION_DMA_BUFFER_BOUNDARY, + DXGI_COMPUTE_PREEMPTION_DISPATCH_BOUNDARY, + DXGI_COMPUTE_PREEMPTION_THREAD_GROUP_BOUNDARY, + DXGI_COMPUTE_PREEMPTION_THREAD_BOUNDARY, + DXGI_COMPUTE_PREEMPTION_INSTRUCTION_BOUNDARY +} DXGI_COMPUTE_PREEMPTION_GRANULARITY; + +typedef struct DXGI_ADAPTER_DESC2 { + WCHAR Description[128]; + UINT VendorId; + UINT DeviceId; + UINT SubSysId; + UINT Revision; + SIZE_T DedicatedVideoMemory; + SIZE_T DedicatedSystemMemory; + SIZE_T SharedSystemMemory; + LUID AdapterLuid; + UINT Flags; + DXGI_GRAPHICS_PREEMPTION_GRANULARITY GraphicsPreemptionGranularity; + DXGI_COMPUTE_PREEMPTION_GRANULARITY ComputePreemptionGranularity; +} DXGI_ADAPTER_DESC2; + +[ + object, + uuid(0aa1ae0a-fa0e-4b84-8644-e05ff8e5acb5), + local, + pointer_default(unique) +] +interface IDXGIAdapter2 : IDXGIAdapter1 +{ + HRESULT GetDesc2([out] DXGI_ADAPTER_DESC2 *pDesc); +}

1 0

Nikolay Sivov : comctl32: Claim success in InitializeFlatSB().
by Alexandre Julliard 25 Mar '15

25 Mar '15

Module: wine Branch: master Commit: 524f6860d40c9564fba62357288fdfa31389882c URL: http://source.winehq.org/git/wine.git/?a=commit;h=524f6860d40c9564fba623572… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 25 00:07:06 2015 +0300 comctl32: Claim success in InitializeFlatSB(). --- dlls/comctl32/flatsb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/flatsb.c b/dlls/comctl32/flatsb.c index 174e22d..66e25c3 100644 --- a/dlls/comctl32/flatsb.c +++ b/dlls/comctl32/flatsb.c @@ -63,7 +63,7 @@ typedef struct BOOL WINAPI InitializeFlatSB(HWND hwnd) { TRACE("[%p]\n", hwnd); - return FALSE; + return TRUE; } /***********************************************************************

1 0

Nikolay Sivov : comctl32/tests: Listview doesn't subclass its header.
by Alexandre Julliard 25 Mar '15

25 Mar '15

Module: wine Branch: master Commit: 59cb4ff6f3fe167d8fa78811bec7c787881bb1d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59cb4ff6f3fe167d8fa78811b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 25 08:51:51 2015 +0300 comctl32/tests: Listview doesn't subclass its header. --- dlls/comctl32/tests/listview.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 3d439df..8ce1cfe 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -5644,6 +5644,30 @@ static void test_insertitem(void) DestroyWindow(hwnd); } +static void test_header_proc(void) +{ + HWND hwnd, header, hdr; + WNDPROC proc1, proc2; + + hwnd = create_listview_control(LVS_REPORT); + + header = (HWND)SendMessageA(hwnd, LVM_GETHEADER, 0, 0); + ok(header != NULL, "got %p\n", header); + + hdr = CreateWindowExA(0, WC_HEADERA, NULL, + WS_BORDER|WS_VISIBLE|HDS_BUTTONS|HDS_HORZ, + 0, 0, 0, 0, + NULL, NULL, NULL, NULL); + ok(hdr != NULL, "got %p\n", hdr); + + proc1 = (WNDPROC)GetWindowLongPtrW(header, GWLP_WNDPROC); + proc2 = (WNDPROC)GetWindowLongPtrW(hdr, GWLP_WNDPROC); + ok(proc1 == proc2, "got %p, expected %p\n", proc1, proc2); + + DestroyWindow(hdr); + DestroyWindow(hwnd); +} + START_TEST(listview) { HMODULE hComctl32; @@ -5712,6 +5736,7 @@ START_TEST(listview) test_imagelists(); test_deleteitem(); test_insertitem(); + test_header_proc(); if (!load_v6_module(&ctx_cookie, &hCtx)) { @@ -5729,6 +5754,7 @@ START_TEST(listview) test_deleteitem(); test_multiselect(); test_insertitem(); + test_header_proc(); unload_v6_module(ctx_cookie, hCtx);

1 0

Nikolay Sivov : taskmgr: Simplify setting extended style for a list.
by Alexandre Julliard 25 Mar '15

25 Mar '15

Module: wine Branch: master Commit: 66722487a7d3755d7facaff53283ee4a5634b00e URL: http://source.winehq.org/git/wine.git/?a=commit;h=66722487a7d3755d7facaff53… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 25 10:06:59 2015 +0300 taskmgr: Simplify setting extended style for a list. --- programs/taskmgr/procpage.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/programs/taskmgr/procpage.c b/programs/taskmgr/procpage.c index 3161399..1b0aacd 100644 --- a/programs/taskmgr/procpage.c +++ b/programs/taskmgr/procpage.c @@ -445,7 +445,6 @@ ProcessPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) int nXDifference; int nYDifference; int cx, cy; - DWORD extended_styles; switch (message) { case WM_INITDIALOG: @@ -467,11 +466,9 @@ ProcessPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) hProcessPageEndProcessButton = GetDlgItem(hDlg, IDC_ENDPROCESS); hProcessPageShowAllProcessesButton = GetDlgItem(hDlg, IDC_SHOWALLPROCESSES); - /* - * Set the extended window styles for the list control - */ - extended_styles = SendMessageW(hProcessPageListCtrl, LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0); - SendMessageW(hProcessPageListCtrl, LVM_SETEXTENDEDLISTVIEWSTYLE, 0, extended_styles | LVS_EX_FULLROWSELECT | LVS_EX_HEADERDRAGDROP); + /* Enable manual column reordering, set full select */ + SendMessageW(hProcessPageListCtrl, LVM_SETEXTENDEDLISTVIEWSTYLE, LVS_EX_FULLROWSELECT|LVS_EX_HEADERDRAGDROP, + LVS_EX_FULLROWSELECT|LVS_EX_HEADERDRAGDROP); AddColumns();

1 0

Jinhui Chen : winex11.drv: Fix row-resize/col-resize mapping to X cursor.
by Alexandre Julliard 25 Mar '15

25 Mar '15

Module: wine Branch: master Commit: 366ed5495c33e1a8b1c60a8445093f70eae34a38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=366ed5495c33e1a8b1c60a844… Author: Jinhui Chen <chenjh_06(a)hotmail.com> Date: Wed Mar 25 10:36:08 2015 +0300 winex11.drv: Fix row-resize/col-resize mapping to X cursor. --- dlls/winex11.drv/mouse.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 5f5bdeb..0858f2e 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -815,10 +815,10 @@ static const struct system_cursors comctl32_cursors[] = { 102, "move" }, { 104, "copy" }, { 105, "left_ptr" }, - { 106, "row-resize" }, - { 107, "row-resize" }, + { 106, "col-resize" }, + { 107, "col-resize" }, { 108, "hand2" }, - { 135, "col-resize" }, + { 135, "row-resize" }, { 0 } }; @@ -876,7 +876,7 @@ static const struct cursor_font_fallback fallbacks[] = { "circle", XC_circle }, { "clock", XC_clock }, { "coffee_mug", XC_coffee_mug }, - { "col-resize", XC_sb_v_double_arrow }, + { "col-resize", XC_sb_h_double_arrow }, { "cross", XC_cross }, { "cross_reverse", XC_cross_reverse }, { "crosshair", XC_crosshair }, @@ -913,7 +913,7 @@ static const struct cursor_font_fallback fallbacks[] = { "right_side", XC_right_side }, { "right_tee", XC_right_tee }, { "rightbutton", XC_rightbutton }, - { "row-resize", XC_sb_h_double_arrow }, + { "row-resize", XC_sb_v_double_arrow }, { "rtl_logo", XC_rtl_logo }, { "sailboat", XC_sailboat }, { "sb_down_arrow", XC_sb_down_arrow },

1 0