January 2018 - Wine-Commits

Alexandre Julliard : include: Add a few more TEB structure definitions.
by Alexandre Julliard Jan. 22, 2018

Jan. 22, 2018

Module: wine Branch: master Commit: bd4f6f45413a26122ef2ca90097da93e55a81f63 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd4f6f45413a26122ef2ca90… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 22 16:24:50 2018 +0100 include: Add a few more TEB structure definitions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winternl.h | 45 +++++++++++++++++++++++++++++++++++++-------- 1 file changed, 37 insertions(+), 8 deletions(-) diff --git a/include/winternl.h b/include/winternl.h index 21353d8..52b19c2 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -230,6 +230,34 @@ typedef struct _ACTIVATION_CONTEXT_STACK LIST_ENTRY FrameListCache; } ACTIVATION_CONTEXT_STACK, *PACTIVATION_CONTEXT_STACK; +typedef struct _TEB_ACTIVE_FRAME_CONTEXT +{ + ULONG Flags; + const char *FrameName; +} TEB_ACTIVE_FRAME_CONTEXT, *PTEB_ACTIVE_FRAME_CONTEXT; + +typedef struct _TEB_ACTIVE_FRAME_CONTEXT_EX +{ + TEB_ACTIVE_FRAME_CONTEXT BasicContext; + const char *SourceLocation; +} TEB_ACTIVE_FRAME_CONTEXT_EX, *PTEB_ACTIVE_FRAME_CONTEXT_EX; + +typedef struct _TEB_ACTIVE_FRAME +{ + ULONG Flags; + struct _TEB_ACTIVE_FRAME *Previous; + TEB_ACTIVE_FRAME_CONTEXT *Context; +} TEB_ACTIVE_FRAME, *PTEB_ACTIVE_FRAME; + +typedef struct _TEB_ACTIVE_FRAME_EX +{ + TEB_ACTIVE_FRAME BasicFrame; + void *ExtensionIdentifier; +} TEB_ACTIVE_FRAME_EX, *PTEB_ACTIVE_FRAME_EX; + +#define TEB_ACTIVE_FRAME_CONTEXT_FLAG_EXTENDED 0x00000001 +#define TEB_ACTIVE_FRAME_FLAG_EXTENDED 0x00000001 + /*********************************************************************** * PEB data structure */ @@ -368,16 +396,17 @@ typedef struct _TEB ULONG WaitingOnLoaderLock; /* f84/1760 */ PVOID Reserved5[3]; /* f88/1768 */ PVOID *TlsExpansionSlots; /* f94/1780 */ - ULONG ImpersonationLocale; /* f98/1788 */ - ULONG IsImpersonating; /* f9c/178c */ - PVOID NlsCache; /* fa0/1790 */ - PVOID ShimData; /* fa4/1798 */ - ULONG HeapVirtualAffinity; /* fa8/17a0 */ - PVOID CurrentTransactionHandle; /* fac/17a8 */ - PVOID ActiveFrame; /* fb0/17b0 */ #ifdef _WIN64 - PVOID unknown[2]; /* 17b8 */ + PVOID DeallocationBStore; /* /1788 */ + PVOID BStoreLimit; /* /1790 */ #endif + ULONG ImpersonationLocale; /* f98/1798 */ + ULONG IsImpersonating; /* f9c/179c */ + PVOID NlsCache; /* fa0/17a0 */ + PVOID ShimData; /* fa4/17a8 */ + ULONG HeapVirtualAffinity; /* fa8/17b0 */ + PVOID CurrentTransactionHandle; /* fac/17b8 */ + TEB_ACTIVE_FRAME *ActiveFrame; /* fb0/17c0 */ PVOID *FlsSlots; /* fb4/17c8 */ } TEB, *PTEB;

1 0

Alexandre Julliard : include: Add missing CONTEXT_ALL definitions.
by Alexandre Julliard Jan. 22, 2018

Jan. 22, 2018

Module: wine Branch: master Commit: c3d78af9bb6ce09838f3a30f8df9279376c7dd3b URL: https://source.winehq.org/git/wine.git/?a=commit;h=c3d78af9bb6ce09838f3a30f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 22 15:49:31 2018 +0100 include: Add missing CONTEXT_ALL definitions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winnt.h | 61 ++++++++++++++++++++++++++------------------------------- 1 file changed, 28 insertions(+), 33 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index 1fb09b3..a9d718a 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -914,42 +914,42 @@ typedef struct _FLOATING_SAVE_AREA typedef struct _CONTEXT { - DWORD ContextFlags; + DWORD ContextFlags; /* 000 */ /* These are selected by CONTEXT_DEBUG_REGISTERS */ - DWORD Dr0; - DWORD Dr1; - DWORD Dr2; - DWORD Dr3; - DWORD Dr6; - DWORD Dr7; + DWORD Dr0; /* 004 */ + DWORD Dr1; /* 008 */ + DWORD Dr2; /* 00c */ + DWORD Dr3; /* 010 */ + DWORD Dr6; /* 014 */ + DWORD Dr7; /* 018 */ /* These are selected by CONTEXT_FLOATING_POINT */ - FLOATING_SAVE_AREA FloatSave; + FLOATING_SAVE_AREA FloatSave; /* 01c */ /* These are selected by CONTEXT_SEGMENTS */ - DWORD SegGs; - DWORD SegFs; - DWORD SegEs; - DWORD SegDs; + DWORD SegGs; /* 08c */ + DWORD SegFs; /* 090 */ + DWORD SegEs; /* 094 */ + DWORD SegDs; /* 098 */ /* These are selected by CONTEXT_INTEGER */ - DWORD Edi; - DWORD Esi; - DWORD Ebx; - DWORD Edx; - DWORD Ecx; - DWORD Eax; + DWORD Edi; /* 09c */ + DWORD Esi; /* 0a0 */ + DWORD Ebx; /* 0a4 */ + DWORD Edx; /* 0a8 */ + DWORD Ecx; /* 0ac */ + DWORD Eax; /* 0b0 */ /* These are selected by CONTEXT_CONTROL */ - DWORD Ebp; - DWORD Eip; - DWORD SegCs; - DWORD EFlags; - DWORD Esp; - DWORD SegSs; - - BYTE ExtendedRegisters[MAXIMUM_SUPPORTED_EXTENSION]; + DWORD Ebp; /* 0b4 */ + DWORD Eip; /* 0b8 */ + DWORD SegCs; /* 0bc */ + DWORD EFlags; /* 0c0 */ + DWORD Esp; /* 0c4 */ + DWORD SegSs; /* 0c8 */ + + BYTE ExtendedRegisters[MAXIMUM_SUPPORTED_EXTENSION]; /* 0xcc */ } CONTEXT; #define CONTEXT_X86 0x00010000 @@ -1643,6 +1643,7 @@ typedef struct _CONTEXT #define CONTEXT_DEBUG_REGISTERS (CONTEXT_ARM | 0x00000008) #define CONTEXT_FULL (CONTEXT_CONTROL | CONTEXT_INTEGER) +#define CONTEXT_ALL (CONTEXT_CONTROL | CONTEXT_INTEGER | CONTEXT_FLOATING_POINT | CONTEXT_DEBUG_REGISTERS) #define EXCEPTION_READ_FAULT 0 #define EXCEPTION_WRITE_FAULT 1 @@ -1742,13 +1743,6 @@ PRUNTIME_FUNCTION WINAPI RtlLookupFunctionEntry(ULONG_PTR,DWORD*,UNWIND_HISTORY_ #endif /* __arm__ */ #ifdef __aarch64__ -/* - * FIXME: - * - * There is not yet an official CONTEXT structure defined for the AArch64 - * architecture, so I just made one up. - * - */ #define CONTEXT_ARM64 0x400000 #define CONTEXT_CONTROL (CONTEXT_ARM64 | 0x00000001) @@ -1757,6 +1751,7 @@ PRUNTIME_FUNCTION WINAPI RtlLookupFunctionEntry(ULONG_PTR,DWORD*,UNWIND_HISTORY_ #define CONTEXT_DEBUG_REGISTERS (CONTEXT_ARM64 | 0x00000008) #define CONTEXT_FULL (CONTEXT_CONTROL | CONTEXT_INTEGER) +#define CONTEXT_ALL (CONTEXT_CONTROL | CONTEXT_INTEGER | CONTEXT_FLOATING_POINT | CONTEXT_DEBUG_REGISTERS) #define EXCEPTION_READ_FAULT 0 #define EXCEPTION_WRITE_FAULT 1

1 0

Nikolay Sivov : user32/edit: Fix EM_SETWORDBREAKPROC return value.
by Alexandre Julliard Jan. 22, 2018

Jan. 22, 2018

Module: wine Branch: master Commit: 6aa853ae393ed0155607333e9640183bc736a74c URL: https://source.winehq.org/git/wine.git/?a=commit;h=6aa853ae393ed0155607333e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 22 16:54:16 2018 +0300 user32/edit: Fix EM_SETWORDBREAKPROC return value. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/edit.c | 32 ++++++++++++++++++++++++++++++++ dlls/user32/edit.c | 1 + dlls/user32/tests/edit.c | 32 ++++++++++++++++++++++++++++++++ 3 files changed, 65 insertions(+) diff --git a/dlls/comctl32/tests/edit.c b/dlls/comctl32/tests/edit.c index 7711683..262ea72 100644 --- a/dlls/comctl32/tests/edit.c +++ b/dlls/comctl32/tests/edit.c @@ -2982,6 +2982,37 @@ static void test_EM_GETLINE(void) } } +static int CALLBACK test_wordbreak_procA(char *text, int current, int length, int code) +{ + return -1; +} + +static void test_wordbreak_proc(void) +{ + EDITWORDBREAKPROCA proc; + LRESULT ret; + HWND hwnd; + + hwnd = create_editcontrol(ES_AUTOHSCROLL | ES_AUTOVSCROLL, 0); + + proc = (void *)SendMessageA(hwnd, EM_GETWORDBREAKPROC, 0, 0); + ok(proc == NULL, "Unexpected wordbreak proc %p.\n", proc); + + ret = SendMessageA(hwnd, EM_SETWORDBREAKPROC, 0, (LPARAM)test_wordbreak_procA); + ok(ret == 1, "Unexpected return value %ld.\n", ret); + + proc = (void *)SendMessageA(hwnd, EM_GETWORDBREAKPROC, 0, 0); + ok(proc == test_wordbreak_procA, "Unexpected wordbreak proc %p.\n", proc); + + ret = SendMessageA(hwnd, EM_SETWORDBREAKPROC, 0, 0); + ok(ret == 1, "Unexpected return value %ld.\n", ret); + + proc = (void *)SendMessageA(hwnd, EM_GETWORDBREAKPROC, 0, 0); + ok(proc == NULL, "Unexpected wordbreak proc %p.\n", proc); + + DestroyWindow(hwnd); +} + START_TEST(edit) { ULONG_PTR ctx_cookie; @@ -3022,6 +3053,7 @@ START_TEST(edit) test_EM_GETHANDLE(); test_paste(); test_EM_GETLINE(); + test_wordbreak_proc(); UnregisterWindowClasses(); diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 114d842..5e161c5 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -4839,6 +4839,7 @@ LRESULT EditWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, B case EM_SETWORDBREAKPROC: EDIT_EM_SetWordBreakProc(es, (void *)lParam); + result = 1; break; case EM_GETWORDBREAKPROC: diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index de8a349..01418bf 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -2999,6 +2999,37 @@ static void test_EM_GETLINE(void) } } +static int CALLBACK test_wordbreak_procA(char *text, int current, int length, int code) +{ + return -1; +} + +static void test_wordbreak_proc(void) +{ + EDITWORDBREAKPROCA proc; + LRESULT ret; + HWND hwnd; + + hwnd = create_editcontrol(ES_AUTOHSCROLL | ES_AUTOVSCROLL, 0); + + proc = (void *)SendMessageA(hwnd, EM_GETWORDBREAKPROC, 0, 0); + ok(proc == NULL, "Unexpected wordbreak proc %p.\n", proc); + + ret = SendMessageA(hwnd, EM_SETWORDBREAKPROC, 0, (LPARAM)test_wordbreak_procA); + ok(ret == 1, "Unexpected return value %ld.\n", ret); + + proc = (void *)SendMessageA(hwnd, EM_GETWORDBREAKPROC, 0, 0); + ok(proc == test_wordbreak_procA, "Unexpected wordbreak proc %p.\n", proc); + + ret = SendMessageA(hwnd, EM_SETWORDBREAKPROC, 0, 0); + ok(ret == 1, "Unexpected return value %ld.\n", ret); + + proc = (void *)SendMessageA(hwnd, EM_GETWORDBREAKPROC, 0, 0); + ok(proc == NULL, "Unexpected wordbreak proc %p.\n", proc); + + DestroyWindow(hwnd); +} + START_TEST(edit) { BOOL b; @@ -3034,6 +3065,7 @@ START_TEST(edit) test_EM_GETHANDLE(); test_paste(); test_EM_GETLINE(); + test_wordbreak_proc(); UnregisterWindowClasses(); }

1 0

Alexandre Julliard : ntdll: Implement RtlPushFrame, RtlPopFrame and RtlGetFrame.
by Alexandre Julliard Jan. 22, 2018

Jan. 22, 2018

Module: wine Branch: master Commit: 3e80093410bee590fe3ffdf730e7ac2368f223a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e80093410bee590fe3ffdf7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 22 16:25:22 2018 +0100 ntdll: Implement RtlPushFrame, RtlPopFrame and RtlGetFrame. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 6 +++--- dlls/ntdll/thread.c | 28 ++++++++++++++++++++++++++++ include/winternl.h | 3 +++ 3 files changed, 34 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 097140f..035fad2 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -649,7 +649,7 @@ @ stub RtlGetElementGenericTable # @ stub RtlGetElementGenericTableAvl # @ stub RtlGetFirstRange -# @ stub RtlGetFrame +@ stdcall RtlGetFrame() @ stdcall RtlGetFullPathName_U(wstr long ptr ptr) @ stdcall RtlGetGroupSecurityDescriptor(ptr ptr ptr) @ stdcall RtlGetLastNtStatus() @@ -796,12 +796,12 @@ @ stdcall RtlOpenCurrentUser(long ptr) @ stdcall RtlPcToFileHeader(ptr ptr) @ stdcall RtlPinAtomInAtomTable(ptr long) -# @ stub RtlPopFrame +@ stdcall RtlPopFrame(ptr) @ stdcall RtlPrefixString(ptr ptr long) @ stdcall RtlPrefixUnicodeString(ptr ptr long) @ stub RtlPropertySetNameToGuid @ stub RtlProtectHeap -# @ stub RtlPushFrame +@ stdcall RtlPushFrame(ptr) @ stdcall RtlQueryAtomInAtomTable(ptr long ptr ptr ptr ptr) @ stdcall RtlQueryDepthSList(ptr) @ stdcall RtlQueryDynamicTimeZoneInformation(ptr) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 66beeb0..b36b265 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -804,6 +804,34 @@ NTSTATUS WINAPI NtQueueApcThread( HANDLE handle, PNTAPCFUNC func, ULONG_PTR arg1 } +/****************************************************************************** + * RtlPushFrame (NTDLL.@) + */ +void WINAPI RtlPushFrame( TEB_ACTIVE_FRAME *frame ) +{ + frame->Previous = NtCurrentTeb()->ActiveFrame; + NtCurrentTeb()->ActiveFrame = frame; +} + + +/****************************************************************************** + * RtlPopFrame (NTDLL.@) + */ +void WINAPI RtlPopFrame( TEB_ACTIVE_FRAME *frame ) +{ + NtCurrentTeb()->ActiveFrame = frame->Previous; +} + + +/****************************************************************************** + * RtlGetFrame (NTDLL.@) + */ +TEB_ACTIVE_FRAME * WINAPI RtlGetFrame(void) +{ + return NtCurrentTeb()->ActiveFrame; +} + + /*********************************************************************** * set_thread_context */ diff --git a/include/winternl.h b/include/winternl.h index 52b19c2..4c02873 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2592,6 +2592,7 @@ NTSYSAPI NTSTATUS WINAPI RtlGetControlSecurityDescriptor(PSECURITY_DESCRIPTOR, NTSYSAPI ULONG WINAPI RtlGetCurrentDirectory_U(ULONG, LPWSTR); NTSYSAPI PEB * WINAPI RtlGetCurrentPeb(void); NTSYSAPI NTSTATUS WINAPI RtlGetDaclSecurityDescriptor(PSECURITY_DESCRIPTOR,PBOOLEAN,PACL *,PBOOLEAN); +NTSYSAPI TEB_ACTIVE_FRAME * WINAPI RtlGetFrame(void); NTSYSAPI ULONG WINAPI RtlGetFullPathName_U(PCWSTR,ULONG,PWSTR,PWSTR*); NTSYSAPI NTSTATUS WINAPI RtlGetGroupSecurityDescriptor(PSECURITY_DESCRIPTOR,PSID *,PBOOLEAN); NTSYSAPI NTSTATUS WINAPI RtlGetLastNtStatus(void); @@ -2659,8 +2660,10 @@ NTSYSAPI NTSTATUS WINAPI RtlOemToUnicodeN(LPWSTR,DWORD,LPDWORD,LPCSTR,DWORD); NTSYSAPI NTSTATUS WINAPI RtlOpenCurrentUser(ACCESS_MASK,PHANDLE); NTSYSAPI PVOID WINAPI RtlPcToFileHeader(PVOID,PVOID*); NTSYSAPI NTSTATUS WINAPI RtlPinAtomInAtomTable(RTL_ATOM_TABLE,RTL_ATOM); +NTSYSAPI void WINAPI RtlPopFrame(TEB_ACTIVE_FRAME*); NTSYSAPI BOOLEAN WINAPI RtlPrefixString(const STRING*,const STRING*,BOOLEAN); NTSYSAPI BOOLEAN WINAPI RtlPrefixUnicodeString(const UNICODE_STRING*,const UNICODE_STRING*,BOOLEAN); +NTSYSAPI void WINAPI RtlPushFrame(TEB_ACTIVE_FRAME*); NTSYSAPI NTSTATUS WINAPI RtlQueryAtomInAtomTable(RTL_ATOM_TABLE,RTL_ATOM,ULONG*,ULONG*,WCHAR*,ULONG*); NTSYSAPI NTSTATUS WINAPI RtlQueryDynamicTimeZoneInformation(RTL_DYNAMIC_TIME_ZONE_INFORMATION*); NTSYSAPI NTSTATUS WINAPI RtlQueryEnvironmentVariable_U(PWSTR,PUNICODE_STRING,PUNICODE_STRING);

1 0

Lucian Poston : d2d1: Implement ID2D1Factory1.
by Alexandre Julliard Jan. 22, 2018

Jan. 22, 2018

Module: wine Branch: master Commit: 9d9fbc0e4adbaadf92d740cf588db412ea2f633d URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d9fbc0e4adbaadf92d740cf… Author: Lucian Poston <lucian.poston(a)gmail.com> Date: Mon Jan 22 15:58:45 2018 +0330 d2d1: Implement ID2D1Factory1. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/d2d1_private.h | 2 +- dlls/d2d1/factory.c | 182 ++++++++++++++++++++++++++++++++++++----------- dlls/uuid/d2d.c | 2 +- include/Makefile.in | 1 + include/d2d1_1.idl | 136 +++++++++++++++++++++++++++++++++++ 5 files changed, 279 insertions(+), 44 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9d9fbc0e4adbaadf92d7…

1 0

Józef Kucia : dxgi: Implement dxgi_swapchain_GetFullscreenDesc().
by Alexandre Julliard Jan. 22, 2018

Jan. 22, 2018

Module: wine Branch: master Commit: 05b11380e8fa3e11f8b8813f048e1aa1e820c459 URL: https://source.winehq.org/git/wine.git/?a=commit;h=05b11380e8fa3e11f8b8813f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jan 22 14:11:55 2018 +0100 dxgi: Implement dxgi_swapchain_GetFullscreenDesc(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/swapchain.c | 25 +++++++++++++++++++++++-- dlls/dxgi/tests/device.c | 7 +++++++ 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index fe7e5cc..8e7dccb 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -465,9 +465,30 @@ static HRESULT STDMETHODCALLTYPE dxgi_swapchain_GetDesc1(IDXGISwapChain1 *iface, static HRESULT STDMETHODCALLTYPE dxgi_swapchain_GetFullscreenDesc(IDXGISwapChain1 *iface, DXGI_SWAP_CHAIN_FULLSCREEN_DESC *desc) { - FIXME("iface %p, desc %p stub!\n", iface, desc); + struct dxgi_swapchain *swapchain = impl_from_IDXGISwapChain1(iface); + struct wined3d_swapchain_desc wined3d_desc; - return E_NOTIMPL; + TRACE("iface %p, desc %p.\n", iface, desc); + + if (!desc) + { + WARN("Invalid pointer.\n"); + return E_INVALIDARG; + } + + wined3d_mutex_lock(); + wined3d_swapchain_get_desc(swapchain->wined3d_swapchain, &wined3d_desc); + wined3d_mutex_unlock(); + + FIXME("Ignoring ScanlineOrdering and Scaling.\n"); + + desc->RefreshRate.Numerator = wined3d_desc.refresh_rate; + desc->RefreshRate.Denominator = 1; + desc->ScanlineOrdering = DXGI_MODE_SCANLINE_ORDER_UNSPECIFIED; + desc->Scaling = DXGI_MODE_SCALING_UNSPECIFIED; + desc->Windowed = wined3d_desc.windowed; + + return S_OK; } static HRESULT STDMETHODCALLTYPE dxgi_swapchain_GetHwnd(IDXGISwapChain1 *iface, HWND *hwnd) diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index ea10ff5..899a063 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -868,6 +868,7 @@ static void test_create_swapchain(void) struct swapchain_fullscreen_state initial_state, expected_state; unsigned int i, expected_width, expected_height; DXGI_SWAP_CHAIN_DESC creation_desc, result_desc; + DXGI_SWAP_CHAIN_FULLSCREEN_DESC fullscreen_desc; DXGI_SWAP_CHAIN_DESC1 swapchain_desc; IDXGIDevice *device, *bgra_device; ULONG refcount, expected_refcount; @@ -978,6 +979,12 @@ static void test_create_swapchain(void) "Got unexpected scaling %#x.\n", swapchain_desc.Scaling); ok(swapchain_desc.AlphaMode == DXGI_ALPHA_MODE_IGNORE, "Got unexpected alpha mode %#x.\n", swapchain_desc.AlphaMode); + hr = IDXGISwapChain1_GetFullscreenDesc(swapchain1, NULL); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = IDXGISwapChain1_GetFullscreenDesc(swapchain1, &fullscreen_desc); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(fullscreen_desc.Windowed == creation_desc.Windowed, + "Got unexpected windowed %#x.\n", fullscreen_desc.Windowed); hr = IDXGISwapChain1_GetHwnd(swapchain1, &window); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); ok(window == creation_desc.OutputWindow, "Got unexpected window %p.\n", window);

1 0

Alexandre Julliard : ntdll: Store the context on the thread stack after the initial suspend.
by Alexandre Julliard Jan. 22, 2018

Jan. 22, 2018

Module: wine Branch: master Commit: a83532d8dd5e99226dbccf0398083b052f033b9a URL: https://source.winehq.org/git/wine.git/?a=commit;h=a83532d8dd5e99226dbccf03… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 22 15:14:56 2018 +0100 ntdll: Store the context on the thread stack after the initial suspend. The initial stack pointer may have been modified during suspend. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/process.c | 22 ++++++++---- dlls/ntdll/signal_arm.c | 63 ++++++++++++++++++++++++-------- dlls/ntdll/signal_i386.c | 84 ++++++++++++++++++++++++++++++------------- dlls/ntdll/signal_x86_64.c | 68 ++++++++++++++++++++++++++--------- 4 files changed, 174 insertions(+), 63 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a83532d8dd5e99226dbc…

1 0

Huw Davies : ole32: Implement saving of view cache entries.
by Alexandre Julliard Jan. 22, 2018

Jan. 22, 2018

Module: wine Branch: master Commit: 47967b7c0871c409c49ca93b308335fdb20d684c URL: https://source.winehq.org/git/wine.git/?a=commit;h=47967b7c0871c409c49ca93b… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jan 22 08:54:11 2018 +0000 ole32: Implement saving of view cache entries. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/datacache.c | 23 +++++++++++++++++++++-- dlls/ole32/tests/ole2.c | 19 +++++++++++++------ 2 files changed, 34 insertions(+), 8 deletions(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index 4ba0826..e2ff928 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -506,7 +506,9 @@ static HRESULT write_clipformat(IStream *stream, CLIPFORMAT clipformat) HRESULT hr; char format_name[256]; - if (clipformat < 0xc000) + if (clipformat == 0) + length = 0; + else if (clipformat < 0xc000) length = -1; else { @@ -515,8 +517,9 @@ static HRESULT write_clipformat(IStream *stream, CLIPFORMAT clipformat) if (length) length++; } hr = IStream_Write(stream, &length, sizeof(length), NULL); - if (FAILED(hr)) + if (FAILED(hr) || clipformat == 0) return hr; + if (clipformat < 0xc000) { DWORD cf = clipformat; @@ -993,6 +996,19 @@ static HRESULT save_emf(DataCacheEntry *entry, BOOL contents, IStream *stream) return hr; } +static HRESULT save_view_cache(DataCacheEntry *entry, IStream *stream) +{ + HRESULT hr; + PresentationDataHeader header; + + init_stream_header(entry, &header); + hr = write_clipformat(stream, entry->fmtetc.cfFormat); + if (SUCCEEDED(hr)) + hr = IStream_Write(stream, &header, FIELD_OFFSET(PresentationDataHeader, unknown7), NULL); + + return hr; +} + static const WCHAR CONTENTS[] = {'C','O','N','T','E','N','T','S',0}; static HRESULT create_stream(DataCacheEntry *cache_entry, IStorage *storage, BOOL contents, IStream **stream) @@ -1037,6 +1053,9 @@ static HRESULT DataCacheEntry_Save(DataCacheEntry *cache_entry, IStorage *storag case CF_ENHMETAFILE: hr = save_emf(cache_entry, contents, stream); break; + case 0: + hr = save_view_cache(cache_entry, stream); + break; default: FIXME("got unsupported clipboard format %x\n", cache_entry->fmtetc.cfFormat); } diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index fe45c6a..7fcb1aa 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -3986,13 +3986,18 @@ static void check_storage_contents(IStorage *stg, const struct storage_def *stg_ hr = IStorage_OpenStream(stg, stat.pwcsName, NULL, STGM_READ | STGM_SHARE_EXCLUSIVE, 0, &stream); ok(hr == S_OK, "unexpected %#x\n", hr); - if (!memcmp(name, "\2OlePres", 7)) + if (!memcmp(name, "\2OlePres", 8)) { + ULONG header_size = sizeof(header); + clipformat = read_clipformat(stream); - hr = IStream_Read(stream, &header, sizeof(header), &bytes); + if (clipformat == 0) /* view cache */ + header_size = FIELD_OFFSET(PresentationDataHeader, unknown7); + + hr = IStream_Read(stream, &header, header_size, &bytes); ok(hr == S_OK, "unexpected %#x\n", hr); - ok(bytes >= 24, "read %u bytes\n", bytes); + ok(bytes == header_size, "read %u bytes, expected %u\n", bytes, header_size); if (winetest_debug > 1) trace("header: tdSize %#x, dvAspect %#x, lindex %#x, advf %#x, unknown7 %#x, dwObjectExtentX %#x, dwObjectExtentY %#x, dwSize %#x\n", @@ -4228,12 +4233,14 @@ static void test_data_cache_save_data(void) { CF_DIB, 0, DVASPECT_CONTENT, -1, TYMED_HGLOBAL }, { CF_METAFILEPICT, 0, DVASPECT_CONTENT, -1, TYMED_MFPICT }, { CF_ENHMETAFILE, 0, DVASPECT_CONTENT, -1, TYMED_ENHMF }, + { 0, 0, DVASPECT_DOCPRINT, -1, TYMED_HGLOBAL }, }, - 3, 3, &CLSID_WineTest, + 4, 3, &CLSID_WineTest, { - &CLSID_WineTestOld, 3, { { "\2OlePres000", CF_DIB, DVASPECT_CONTENT, 0, NULL, 0 }, + &CLSID_WineTestOld, 4, { { "\2OlePres000", CF_DIB, DVASPECT_CONTENT, 0, NULL, 0 }, { "\2OlePres001", CF_METAFILEPICT, DVASPECT_CONTENT, 0, NULL, 0 }, - { "\2OlePres002", CF_ENHMETAFILE, DVASPECT_CONTENT, 0, NULL, 0 } } + { "\2OlePres002", CF_ENHMETAFILE, DVASPECT_CONTENT, 0, NULL, 0 }, + { "\2OlePres003", 0, DVASPECT_DOCPRINT, 0, NULL, 0 } } } }, /* without setting data */

1 0

Nikolay Sivov : ole2disp: Implement SafeArrayDestroyData().
by Alexandre Julliard Jan. 22, 2018

Jan. 22, 2018

Module: wine Branch: master Commit: da3b5129a58309cb7435fc74a65bcbd9e4d7f366 URL: https://source.winehq.org/git/wine.git/?a=commit;h=da3b5129a58309cb7435fc74… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jan 21 19:55:39 2018 +0300 ole2disp: Implement SafeArrayDestroyData(). Based on patch by Vijay Kiran Kamuju. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole2disp.dll16/ole2disp.c | 19 +++++++++++++++++++ dlls/ole2disp.dll16/ole2disp.dll16.spec | 2 +- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/dlls/ole2disp.dll16/ole2disp.c b/dlls/ole2disp.dll16/ole2disp.c index 98aca3d..b981485 100644 --- a/dlls/ole2disp.dll16/ole2disp.c +++ b/dlls/ole2disp.dll16/ole2disp.c @@ -270,6 +270,25 @@ HRESULT WINAPI SafeArrayDestroyDescriptor16(SEGPTR s) return S_OK; } +/****************************************************************************** + * SafeArrayDestroyData [OLE2DISP.41] + */ +HRESULT WINAPI SafeArrayDestroyData16(SAFEARRAY16 *sa) +{ + TRACE("%p\n", sa); + + if (!sa) + return S_OK; + + if (sa->cLocks) + return DISP_E_ARRAYISLOCKED; + + if (!(sa->fFeatures & FADF_STATIC)) + safearray_free(sa->pvData); + + return S_OK; +} + /* This implementation of the BSTR API is 16-bit only. It represents BSTR as a 16:16 far pointer, and the strings as ISO-8859 */ diff --git a/dlls/ole2disp.dll16/ole2disp.dll16.spec b/dlls/ole2disp.dll16/ole2disp.dll16.spec index 7b00ac3..57d2254 100644 --- a/dlls/ole2disp.dll16/ole2disp.dll16.spec +++ b/dlls/ole2disp.dll16/ole2disp.dll16.spec @@ -38,7 +38,7 @@ 38 pascal SafeArrayAllocDescriptor(word ptr) SafeArrayAllocDescriptor16 39 pascal SafeArrayAllocData(ptr) SafeArrayAllocData16 40 pascal SafeArrayDestroyDescriptor(segptr) SafeArrayDestroyDescriptor16 -41 stub SAFEARRAYDESTROYDATA +41 pascal SafeArrayDestroyData(ptr) SafeArrayDestroyData16 42 stub SAFEARRAYREDIM 43 stub VARI2FROMI4 44 stub VARI2FROMR4

1 0

Nikolay Sivov : shell32: Reduce code duplication in GetCommandString().
by Alexandre Julliard Jan. 22, 2018

Jan. 22, 2018

Module: wine Branch: master Commit: ce5fb75f7f920cabf7c3ae7efae6fe5d076848ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce5fb75f7f920cabf7c3ae7e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jan 21 19:53:05 2018 +0300 shell32: Reduce code duplication in GetCommandString(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shlview_cmenu.c | 167 ++++++++++++++++++------------------------- 1 file changed, 68 insertions(+), 99 deletions(-) diff --git a/dlls/shell32/shlview_cmenu.c b/dlls/shell32/shlview_cmenu.c index 5c5ba1b..3f09413 100644 --- a/dlls/shell32/shlview_cmenu.c +++ b/dlls/shell32/shlview_cmenu.c @@ -471,111 +471,80 @@ static HRESULT WINAPI ItemMenu_InvokeCommand( return S_OK; } -static HRESULT WINAPI ItemMenu_GetCommandString( - IContextMenu3 *iface, - UINT_PTR idCommand, - UINT uFlags, - UINT* lpReserved, - LPSTR lpszName, - UINT uMaxNameLen) +static HRESULT WINAPI ItemMenu_GetCommandString(IContextMenu3 *iface, UINT_PTR cmdid, UINT flags, + UINT *reserved, LPSTR name, UINT maxlen) { - ContextMenu *This = impl_from_IContextMenu3(iface); - HRESULT hr = E_INVALIDARG; + static const WCHAR openW[] = {'o','p','e','n',0}; + static const WCHAR exploreW[] = {'e','x','p','l','o','r','e',0}; + static const WCHAR cutW[] = {'c','u','t',0}; + static const WCHAR copyW[] = {'c','o','p','y',0}; + static const WCHAR linkW[] = {'l','i','n','k',0}; + static const WCHAR deleteW[] = {'d','e','l','e','t','e',0}; + static const WCHAR propertiesW[] = {'p','r','o','p','e','r','t','i','e','s',0}; + static const WCHAR renameW[] = {'r','e','n','a','m','e',0}; + ContextMenu *This = impl_from_IContextMenu3(iface); + const WCHAR *cmdW = NULL; + HRESULT hr = S_OK; - TRACE("(%p)->(%lx flags=%x %p name=%p len=%x)\n", This, idCommand, uFlags, lpReserved, lpszName, uMaxNameLen); + TRACE("(%p)->(%lx, %#x, %p, %p, %u)\n", This, cmdid, flags, reserved, name, maxlen); - switch(uFlags) - { - case GCS_HELPTEXTA: - case GCS_HELPTEXTW: - hr = E_NOTIMPL; - break; + switch (flags) + { + case GCS_HELPTEXTA: + case GCS_HELPTEXTW: + hr = E_NOTIMPL; + break; + + case GCS_VERBA: + case GCS_VERBW: + switch (cmdid) + { + case FCIDM_SHVIEW_OPEN: + cmdW = openW; + break; + case FCIDM_SHVIEW_EXPLORE: + cmdW = exploreW; + break; + case FCIDM_SHVIEW_CUT: + cmdW = cutW; + break; + case FCIDM_SHVIEW_COPY: + cmdW = copyW; + break; + case FCIDM_SHVIEW_CREATELINK: + cmdW = linkW; + break; + case FCIDM_SHVIEW_DELETE: + cmdW = deleteW; + break; + case FCIDM_SHVIEW_PROPERTIES: + cmdW = propertiesW; + break; + case FCIDM_SHVIEW_RENAME: + cmdW = renameW; + break; + } - case GCS_VERBA: - switch(idCommand) - { - case FCIDM_SHVIEW_OPEN: - strcpy(lpszName, "open"); - hr = S_OK; - break; - case FCIDM_SHVIEW_EXPLORE: - strcpy(lpszName, "explore"); - hr = S_OK; - break; - case FCIDM_SHVIEW_CUT: - strcpy(lpszName, "cut"); - hr = S_OK; - break; - case FCIDM_SHVIEW_COPY: - strcpy(lpszName, "copy"); - hr = S_OK; - break; - case FCIDM_SHVIEW_CREATELINK: - strcpy(lpszName, "link"); - hr = S_OK; - break; - case FCIDM_SHVIEW_DELETE: - strcpy(lpszName, "delete"); - hr = S_OK; - break; - case FCIDM_SHVIEW_PROPERTIES: - strcpy(lpszName, "properties"); - hr = S_OK; - break; - case FCIDM_SHVIEW_RENAME: - strcpy(lpszName, "rename"); - hr = S_OK; - break; - } - break; + if (!cmdW) + { + hr = E_INVALIDARG; + break; + } - /* NT 4.0 with IE 3.0x or no IE will always call This with GCS_VERBW. In This - case, you need to do the lstrcpyW to the pointer passed.*/ - case GCS_VERBW: - switch(idCommand) - { - case FCIDM_SHVIEW_OPEN: - MultiByteToWideChar(CP_ACP, 0, "open", -1, (LPWSTR)lpszName, uMaxNameLen); - hr = S_OK; - break; - case FCIDM_SHVIEW_EXPLORE: - MultiByteToWideChar(CP_ACP, 0, "explore", -1, (LPWSTR)lpszName, uMaxNameLen); - hr = S_OK; - break; - case FCIDM_SHVIEW_CUT: - MultiByteToWideChar(CP_ACP, 0, "cut", -1, (LPWSTR)lpszName, uMaxNameLen); - hr = S_OK; - break; - case FCIDM_SHVIEW_COPY: - MultiByteToWideChar(CP_ACP, 0, "copy", -1, (LPWSTR)lpszName, uMaxNameLen); - hr = S_OK; - break; - case FCIDM_SHVIEW_CREATELINK: - MultiByteToWideChar(CP_ACP, 0, "link", -1, (LPWSTR)lpszName, uMaxNameLen); - hr = S_OK; - break; - case FCIDM_SHVIEW_DELETE: - MultiByteToWideChar(CP_ACP, 0, "delete", -1, (LPWSTR)lpszName, uMaxNameLen); - hr = S_OK; - break; - case FCIDM_SHVIEW_PROPERTIES: - MultiByteToWideChar(CP_ACP, 0, "properties", -1, (LPWSTR)lpszName, uMaxNameLen); - hr = S_OK; - break; - case FCIDM_SHVIEW_RENAME: - MultiByteToWideChar( CP_ACP, 0, "rename", -1, (LPWSTR)lpszName, uMaxNameLen ); - hr = S_OK; - break; - } - break; + if (flags == GCS_VERBA) + WideCharToMultiByte(CP_ACP, 0, cmdW, -1, name, maxlen, NULL, NULL); + else + lstrcpynW((WCHAR *)name, cmdW, maxlen); - case GCS_VALIDATEA: - case GCS_VALIDATEW: - hr = S_OK; - break; - } - TRACE("-- (%p)->(name=%s)\n", This, lpszName); - return hr; + TRACE("name %s\n", flags == GCS_VERBA ? debugstr_a(name) : debugstr_w((WCHAR *)name)); + break; + + case GCS_VALIDATEA: + case GCS_VALIDATEW: + break; + } + + return hr; } /**************************************************************************

1 0