April 2019 - Wine-Devel - list.winehq.org

[PATCH 01/10] ntoskrnl.exe: Implement PsLookupThreadByThreadId.
by Derek Lesho April 10, 2019

April 10, 2019

Signed-off-by: Derek Lesho <dereklesho52(a)Gmail.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 20 ++++++++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index f5dee07e2f..770bdfd4fa 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3245,6 +3245,26 @@ NTSTATUS WINAPI PsLookupProcessByProcessId(HANDLE processid, PEPROCESS *process) } +/***************************************************** + * PsLookupThreadByThreadId (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI PsLookupThreadByThreadId(HANDLE threadid, PETHREAD *thread) +{ + NTSTATUS status; + HANDLE hThread = OpenThread( THREAD_ALL_ACCESS, FALSE, HandleToUlong(threadid) ); + + if (!hThread) + return STATUS_INVALID_PARAMETER; + + status = kernel_object_from_handle( hThread, PsThreadType, (void**)thread ); + + ObReferenceObject( *thread ); + + NtClose( hThread ); + return status; +} + + /***************************************************** * IoSetThreadHardErrorMode (NTOSKRNL.EXE.@) */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 43f47470a9..601506246e 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -913,7 +913,7 @@ @ stub PsJobType @ stdcall PsLookupProcessByProcessId(ptr ptr) @ stub PsLookupProcessThreadByCid -@ stub PsLookupThreadByThreadId +@ stdcall PsLookupThreadByThreadId(ptr ptr) @ extern PsProcessType @ stub PsReferenceImpersonationToken @ stub PsReferencePrimaryToken -- 2.20.1

3 43

[PATCH] winejoystick.drv: Removed support for linux kernels older than 2.2
by Alistair Leslie-Hughes April 9, 2019

April 9, 2019

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/winejoystick.drv/joystick_linux.c | 62 +------------------------- 1 file changed, 2 insertions(+), 60 deletions(-) diff --git a/dlls/winejoystick.drv/joystick_linux.c b/dlls/winejoystick.drv/joystick_linux.c index 287f4be60d..85ad2fe1f3 100644 --- a/dlls/winejoystick.drv/joystick_linux.c +++ b/dlls/winejoystick.drv/joystick_linux.c @@ -38,7 +38,7 @@ #include "config.h" #include "wine/port.h" -#ifdef HAVE_LINUX_JOYSTICK_H +#ifdef HAVE_LINUX_22_JOYSTICK_API #ifdef HAVE_UNISTD_H # include <unistd.h> @@ -174,11 +174,7 @@ static int JSTCK_OpenDevice(WINE_JSTCK* jstick) return -1; last_attempt = now; -#ifdef HAVE_LINUX_22_JOYSTICK_API flags = O_RDONLY | O_NONBLOCK; -#else - flags = O_RDONLY; -#endif /* The first joystick may not be at /dev/input/js0, find the correct * first or second device. For example the driver for XBOX 360 wireless @@ -203,10 +199,9 @@ static int JSTCK_OpenDevice(WINE_JSTCK* jstick) close(fd); } -#ifdef HAVE_LINUX_22_JOYSTICK_API if (jstick->dev > 0) ioctl(jstick->dev, JSIOCGAXMAP, jstick->axesMap); -#endif + return jstick->dev; } @@ -217,21 +212,16 @@ static int JSTCK_OpenDevice(WINE_JSTCK* jstick) LRESULT driver_joyGetDevCaps(DWORD_PTR dwDevID, LPJOYCAPSW lpCaps, DWORD dwSize) { WINE_JSTCK* jstck; -#ifdef HAVE_LINUX_22_JOYSTICK_API int dev; char nrOfAxes; char nrOfButtons; char identString[MAXPNAMELEN]; int i; int driverVersion; -#else -static const WCHAR ini[] = {'W','i','n','e',' ','J','o','y','s','t','i','c','k',' ','D','r','i','v','e','r',0}; -#endif if ((jstck = JSTCK_drvGet(dwDevID)) == NULL) return MMSYSERR_NODRIVER; -#ifdef HAVE_LINUX_22_JOYSTICK_API if ((dev = JSTCK_OpenDevice(jstck)) < 0) return JOYERR_PARMS; ioctl(dev, JSIOCGAXES, &nrOfAxes); ioctl(dev, JSIOCGBUTTONS, &nrOfButtons); @@ -310,33 +300,6 @@ static const WCHAR ini[] = {'W','i','n','e',' ','J','o','y','s','t','i','c','k', } } } -#else - lpCaps->wMid = MM_MICROSOFT; - lpCaps->wPid = MM_PC_JOYSTICK; - strcpyW(lpCaps->szPname, ini); /* joystick product name */ - lpCaps->wXmin = 0; - lpCaps->wXmax = 0xFFFF; - lpCaps->wYmin = 0; - lpCaps->wYmax = 0xFFFF; - lpCaps->wZmin = 0; - lpCaps->wZmax = 0; - lpCaps->wNumButtons = 2; - if (dwSize == sizeof(JOYCAPSW)) { - /* complete 95 structure */ - lpCaps->wRmin = 0; - lpCaps->wRmax = 0; - lpCaps->wUmin = 0; - lpCaps->wUmax = 0; - lpCaps->wVmin = 0; - lpCaps->wVmax = 0; - lpCaps->wCaps = 0; - lpCaps->wMaxAxes = 2; - lpCaps->wNumAxes = 2; - lpCaps->wMaxButtons = 4; - lpCaps->szRegKey[0] = 0; - lpCaps->szOEMVxD[0] = 0; - } -#endif return JOYERR_NOERROR; } @@ -348,19 +311,13 @@ LRESULT driver_joyGetPosEx(DWORD_PTR dwDevID, LPJOYINFOEX lpInfo) { WINE_JSTCK* jstck; int dev; -#ifdef HAVE_LINUX_22_JOYSTICK_API struct js_event ev; -#else - struct js_status js; - int dev_stat; -#endif if ((jstck = JSTCK_drvGet(dwDevID)) == NULL) return MMSYSERR_NODRIVER; if ((dev = JSTCK_OpenDevice(jstck)) < 0) return JOYERR_PARMS; -#ifdef HAVE_LINUX_22_JOYSTICK_API while ((read(dev, &ev, sizeof(struct js_event))) > 0) { if (ev.type == (JS_EVENT_AXIS)) { switch (jstck->axesMap[ev.number]) { @@ -467,21 +424,6 @@ LRESULT driver_joyGetPosEx(DWORD_PTR dwDevID, LPJOYINFOEX lpInfo) lpInfo->dwPOV = JOY_POVCENTERED; /* Center */ } -#else - dev_stat = read(dev, &js, sizeof(js)); - if (dev_stat != sizeof(js)) { - return JOYERR_UNPLUGGED; /* FIXME: perhaps wrong, but what should I return else ? */ - } - js.x = js.x<<8; - js.y = js.y<<8; - if (lpInfo->dwFlags & JOY_RETURNX) - lpInfo->dwXpos = js.x; /* FIXME: perhaps multiply it somehow ? */ - if (lpInfo->dwFlags & JOY_RETURNY) - lpInfo->dwYpos = js.y; - if (lpInfo->dwFlags & JOY_RETURNBUTTONS) - lpInfo->dwButtons = js.buttons; -#endif - TRACE("x: %d, y: %d, z: %d, r: %d, u: %d, v: %d, buttons: 0x%04x, flags: 0x%04x (fd %d)\n", lpInfo->dwXpos, lpInfo->dwYpos, lpInfo->dwZpos, lpInfo->dwRpos, lpInfo->dwUpos, lpInfo->dwVpos, -- 2.20.1

1 0

[PATCH] winex11: Implement PK_CHANGE for wintab
by Alistair Leslie-Hughes April 9, 2019

April 9, 2019

Based off a patch by Eriks Dobelis. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/winex11.drv/wintab.c | 39 +++++++++++++++++++++++++++++++++++++++ dlls/wintab32/context.c | 1 + 2 files changed, 40 insertions(+) diff --git a/dlls/winex11.drv/wintab.c b/dlls/winex11.drv/wintab.c index 48fcb22100..a777b7ccd2 100644 --- a/dlls/winex11.drv/wintab.c +++ b/dlls/winex11.drv/wintab.c @@ -267,6 +267,7 @@ static int proximity_out_type; static HWND hwndTabletDefault; static WTPACKET gMsgPacket; static DWORD gSerial; +static WTPACKET last_packet; /* Reference: http://www.wacomeng.com/devsupport/ibmpc/gddevpc.html * @@ -839,6 +840,40 @@ static int cursor_from_device(DWORD deviceid, LPWTI_CURSORS_INFO *cursorp) return -1; } +static DWORD get_changed_state( WTPACKET *pkt) +{ + DWORD change = 0; + + if (pkt->pkX != last_packet.pkX) + change |= PK_X; + if (pkt->pkY != last_packet.pkY) + change |= PK_Y; + if (pkt->pkZ != last_packet.pkZ) + change |= PK_Z; + if (pkt->pkSerialNumber != last_packet.pkSerialNumber) + change |= PK_SERIAL_NUMBER; + if (pkt->pkTime != last_packet.pkTime) + change |= PK_TIME; + if (pkt->pkNormalPressure != last_packet.pkNormalPressure) + change |= PK_NORMAL_PRESSURE; + if (pkt->pkTangentPressure != last_packet.pkTangentPressure) + change |= PK_TANGENT_PRESSURE; + if (pkt->pkCursor != last_packet.pkCursor) + change |= PK_CURSOR; + if (pkt->pkButtons != last_packet.pkButtons) + change |= PK_BUTTONS; + if (pkt->pkOrientation.orAzimuth != last_packet.pkOrientation.orAzimuth || + pkt->pkOrientation.orAltitude != last_packet.pkOrientation.orAltitude || + pkt->pkOrientation.orTwist != last_packet.pkOrientation.orTwist) + change |= PK_ORIENTATION; + if (pkt->pkRotation.roPitch != last_packet.pkRotation.roPitch || + pkt->pkRotation.roRoll != last_packet.pkRotation.roRoll || + pkt->pkRotation.roYaw != last_packet.pkRotation.roYaw) + change |= PK_ROTATION; + + return change; +} + static BOOL motion_event( HWND hwnd, XEvent *event ) { XDeviceMotionEvent *motion = (XDeviceMotionEvent *)event; @@ -865,7 +900,9 @@ static BOOL motion_event( HWND hwnd, XEvent *event ) * (gMsgPacket.pkStatus & TPS_INVERT?-1:1)); gMsgPacket.pkNormalPressure = motion->axis_data[2]; gMsgPacket.pkButtons = get_button_state(curnum); + gMsgPacket.pkChanged = get_changed_state(&gMsgPacket); SendMessageW(hwndTabletDefault,WT_PACKET,gMsgPacket.pkSerialNumber,(LPARAM)hwnd); + memcpy(&last_packet, &gMsgPacket, sizeof(WTPACKET)); return TRUE; } @@ -895,7 +932,9 @@ static BOOL button_event( HWND hwnd, XEvent *event ) * (gMsgPacket.pkStatus & TPS_INVERT?-1:1)); gMsgPacket.pkNormalPressure = button->axis_data[2]; gMsgPacket.pkButtons = get_button_state(curnum); + gMsgPacket.pkChanged = get_changed_state(&gMsgPacket); SendMessageW(hwndTabletDefault,WT_PACKET,gMsgPacket.pkSerialNumber,(LPARAM)hwnd); + memcpy(&last_packet, &gMsgPacket, sizeof(WTPACKET)); return TRUE; } diff --git a/dlls/wintab32/context.c b/dlls/wintab32/context.c index 2993c4707e..095e2580f3 100644 --- a/dlls/wintab32/context.c +++ b/dlls/wintab32/context.c @@ -215,6 +215,7 @@ LPOPENCONTEXT AddPacketToContextQueue(LPWTPACKET packet, HWND hwnd) packet->pkContext = ptr->handle; /* translate packet data to the context */ + packet->pkChanged = packet->pkChanged & ptr->context.lcPktData; /* Scale as per documentation */ packet->pkY = ScaleForContext(packet->pkY, ptr->context.lcInOrgY, -- 2.20.1

1 0

[PATCH 1/5] ntoskrnl.exe: Implement ExGetExclusiveWaiterCount().
by Zebediah Figura April 9, 2019

April 9, 2019

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- dlls/ntoskrnl.exe/sync.c | 19 +++++++++++++++++++ include/ddk/wdm.h | 1 + 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 2d1c82663d..bdf2a4463c 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -146,7 +146,7 @@ @ stub ExFreeToPagedLookasideList @ stub ExGetCurrentProcessorCounts @ stub ExGetCurrentProcessorCpuUsage -@ stub ExGetExclusiveWaiterCount +@ stdcall ExGetExclusiveWaiterCount(ptr) @ stub ExGetPreviousMode @ stub ExGetSharedWaiterCount @ stdcall ExInitializeNPagedLookasideList(ptr ptr ptr long long long long) diff --git a/dlls/ntoskrnl.exe/sync.c b/dlls/ntoskrnl.exe/sync.c index c8cae7dd89..823ff2b587 100644 --- a/dlls/ntoskrnl.exe/sync.c +++ b/dlls/ntoskrnl.exe/sync.c @@ -1087,3 +1087,22 @@ void WINAPI ExReleaseResourceLite( ERESOURCE *resource ) { ExReleaseResourceForThreadLite( resource, (ERESOURCE_THREAD)KeGetCurrentThread() ); } + +/*********************************************************************** + * ExGetExclusiveWaiterCount (NTOSKRNL.EXE.@) + */ +ULONG WINAPI ExGetExclusiveWaiterCount( ERESOURCE *resource ) +{ + ULONG count; + KIRQL irql; + + TRACE("resource %p.\n", resource); + + KeAcquireSpinLock( &resource->SpinLock, &irql ); + + count = resource->NumberOfExclusiveWaiters; + + KeReleaseSpinLock( &resource->SpinLock, irql ); + + return count; +} diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 41c462f4a7..241f6d695e 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1524,6 +1524,7 @@ void WINAPI ExDeleteNPagedLookasideList(PNPAGED_LOOKASIDE_LIST); NTSTATUS WINAPI ExDeleteResourceLite(ERESOURCE*); void WINAPI ExFreePool(PVOID); void WINAPI ExFreePoolWithTag(PVOID,ULONG); +ULONG WINAPI ExGetExclusiveWaiterCount(ERESOURCE*); void WINAPI ExInitializeNPagedLookasideList(PNPAGED_LOOKASIDE_LIST,PALLOCATE_FUNCTION,PFREE_FUNCTION,ULONG,SIZE_T,ULONG,USHORT); NTSTATUS WINAPI ExInitializeResourceLite(ERESOURCE*); PSLIST_ENTRY WINAPI ExInterlockedPopEntrySList(PSLIST_HEADER,PKSPIN_LOCK); -- 2.21.0

2 7

[PATCH 2/3] ntdll: Translate signal to trap when trap code is 0 on ARM
by André Hentschel April 9, 2019

April 9, 2019

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46187 Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/ntdll/signal_arm.c | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index db9cb80f336..5db3c51301f 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -142,10 +142,24 @@ struct UNWIND_INFO * * Get the trap code for a signal. */ -static inline enum arm_trap_code get_trap_code( const ucontext_t *sigcontext ) +static inline enum arm_trap_code get_trap_code( int signal, const ucontext_t *sigcontext ) { #ifdef TRAP_sig - return TRAP_sig(sigcontext); + enum arm_trap_code trap = TRAP_sig(sigcontext); + if (trap) + return trap; + /* trap is 0 on arm64 kernel */ + switch (signal) + { + case SIGILL: + return TRAP_ARM_PRIVINFLT; + case SIGSEGV: + return TRAP_ARM_PAGEFLT; + case SIGBUS: + return TRAP_ARM_ALIGNFLT; + default: + return trap; + } #else return TRAP_ARM_UNKNOWN; /* unknown trap code */ #endif @@ -718,7 +732,7 @@ static void segv_handler( int signal, siginfo_t *info, void *ucontext ) ucontext_t *context = ucontext; /* check for page fault inside the thread stack */ - if (get_trap_code(context) == TRAP_ARM_PAGEFLT && + if (get_trap_code(signal, context) == TRAP_ARM_PAGEFLT && (char *)info->si_addr >= (char *)NtCurrentTeb()->DeallocationStack && (char *)info->si_addr < (char *)NtCurrentTeb()->Tib.StackBase && virtual_handle_stack_fault( info->si_addr )) @@ -735,7 +749,7 @@ static void segv_handler( int signal, siginfo_t *info, void *ucontext ) rec = setup_exception( context, raise_segv_exception ); if (rec->ExceptionCode == EXCEPTION_STACK_OVERFLOW) return; - switch(get_trap_code(context)) + switch(get_trap_code(signal, context)) { case TRAP_ARM_PRIVINFLT: /* Invalid opcode exception */ rec->ExceptionCode = EXCEPTION_ILLEGAL_INSTRUCTION; @@ -756,7 +770,7 @@ static void segv_handler( int signal, siginfo_t *info, void *ucontext ) rec->ExceptionInformation[1] = 0xffffffff; break; default: - ERR("Got unexpected trap %d\n", get_trap_code(context)); + ERR("Got unexpected trap %d\n", get_trap_code(signal, context)); rec->ExceptionCode = EXCEPTION_ILLEGAL_INSTRUCTION; break; } -- 2.17.1

1 0

[PATCH 1/3] include: Fix vararg standard call types for ARM
by André Hentschel April 9, 2019

April 9, 2019

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- include/basetyps.h | 4 ++-- include/winnt.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/basetyps.h b/include/basetyps.h index d55005fbd79..b7a77e2c31c 100644 --- a/include/basetyps.h +++ b/include/basetyps.h @@ -27,9 +27,9 @@ #endif #define STDMETHODCALLTYPE __stdcall -#define STDMETHODVCALLTYPE __cdecl +#define STDMETHODVCALLTYPE WINAPIV #define STDAPICALLTYPE __stdcall -#define STDAPIVCALLTYPE __cdecl +#define STDAPIVCALLTYPE WINAPIV #define STDAPI EXTERN_C HRESULT STDAPICALLTYPE #define STDAPI_(t) EXTERN_C t STDAPICALLTYPE #define STDMETHODIMP HRESULT STDMETHODCALLTYPE diff --git a/include/winnt.h b/include/winnt.h index 29a7372c89e..9e5b3d08f0f 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -413,9 +413,9 @@ extern "C++" { \ #endif #define STDMETHODCALLTYPE __stdcall -#define STDMETHODVCALLTYPE __cdecl +#define STDMETHODVCALLTYPE WINAPIV #define STDAPICALLTYPE __stdcall -#define STDAPIVCALLTYPE __cdecl +#define STDAPIVCALLTYPE WINAPIV #define STDAPI EXTERN_C HRESULT STDAPICALLTYPE #define STDAPI_(type) EXTERN_C type STDAPICALLTYPE -- 2.17.1

1 0

[PATCH] gdi32/tests: Avoid the comma separator
by Michael Stefaniuc April 9, 2019

April 9, 2019

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/gdi32/tests/bitmap.c | 156 +++++++++++++++++++------------------- dlls/gdi32/tests/pen.c | 2 +- 2 files changed, 79 insertions(+), 79 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 4622de9c93..d651765006 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -3161,57 +3161,57 @@ static void test_StretchBlt(void) DeleteObject(hBrush); /* Top-down to top-down tests */ - srcBuffer[0] = 0xCAFED00D, srcBuffer[1] = 0xFEEDFACE; - srcBuffer[16] = 0xFEDCBA98, srcBuffer[17] = 0x76543210; + srcBuffer[0] = 0xCAFED00D; srcBuffer[1] = 0xFEEDFACE; + srcBuffer[16] = 0xFEDCBA98; srcBuffer[17] = 0x76543210; memset( expected, 0, get_dib_image_size( &biDst ) ); - expected[0] = 0xCAFED00D, expected[1] = 0xFEEDFACE; - expected[16] = 0xFEDCBA98, expected[17] = 0x76543210; + expected[0] = 0xCAFED00D; expected[1] = 0xFEEDFACE; + expected[16] = 0xFEDCBA98; expected[17] = 0x76543210; check_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, 0, 0, 2, 2, 0, 0, 2, 2, expected, __LINE__); - expected[0] = 0xCAFED00D, expected[1] = 0x00000000; - expected[16] = 0x00000000, expected[17] = 0x00000000; + expected[0] = 0xCAFED00D; expected[1] = 0x00000000; + expected[16] = 0x00000000; expected[17] = 0x00000000; check_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, 0, 0, 1, 1, 0, 0, 1, 1, expected, __LINE__); - expected[0] = 0xCAFED00D, expected[1] = 0xCAFED00D; - expected[16] = 0xCAFED00D, expected[17] = 0xCAFED00D; + expected[0] = 0xCAFED00D; expected[1] = 0xCAFED00D; + expected[16] = 0xCAFED00D; expected[17] = 0xCAFED00D; check_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, 0, 0, 2, 2, 0, 0, 1, 1, expected, __LINE__); /* This is an example of the dst width (height) == 1 exception, explored below */ - expected[0] = 0xCAFED00D, expected[1] = 0x00000000; - expected[16] = 0x00000000, expected[17] = 0x00000000; + expected[0] = 0xCAFED00D; expected[1] = 0x00000000; + expected[16] = 0x00000000; expected[17] = 0x00000000; check_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, 0, 0, 1, 1, 0, 0, 2, 2, expected, __LINE__); - expected[0] = 0x76543210, expected[1] = 0xFEDCBA98; - expected[16] = 0xFEEDFACE, expected[17] = 0xCAFED00D; + expected[0] = 0x76543210; expected[1] = 0xFEDCBA98; + expected[16] = 0xFEEDFACE; expected[17] = 0xCAFED00D; check_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, 0, 0, 2, 2, 1, 1, -2, -2, expected, __LINE__); - expected[0] = 0x76543210, expected[1] = 0xFEDCBA98; - expected[16] = 0xFEEDFACE, expected[17] = 0xCAFED00D; + expected[0] = 0x76543210; expected[1] = 0xFEDCBA98; + expected[16] = 0xFEEDFACE; expected[17] = 0xCAFED00D; check_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, 1, 1, -2, -2, 0, 0, 2, 2, expected, __LINE__); - expected[0] = 0xCAFED00D, expected[1] = 0x00000000; - expected[16] = 0x00000000, expected[17] = 0x00000000; + expected[0] = 0xCAFED00D; expected[1] = 0x00000000; + expected[16] = 0x00000000; expected[17] = 0x00000000; todo_wine check_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, 1, 1, -2, -2, 1, 1, -2, -2, expected, __LINE__); - expected[0] = 0x00000000, expected[1] = 0x00000000; - expected[16] = 0x00000000, expected[17] = 0xCAFED00D, expected[18] = 0xFEEDFACE; - expected[32] = 0x00000000, expected[33] = 0xFEDCBA98, expected[34] = 0x76543210; + expected[0] = 0x00000000; expected[1] = 0x00000000; + expected[16] = 0x00000000; expected[17] = 0xCAFED00D; expected[18] = 0xFEEDFACE; + expected[32] = 0x00000000; expected[33] = 0xFEDCBA98; expected[34] = 0x76543210; check_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, 1, 1, 2, 2, 0, 0, 2, 2, expected, __LINE__); /* when dst width is 1 merge src width - 1 pixels */ memset( srcBuffer, 0, get_dib_image_size( &biSrc ) ); - srcBuffer[0] = 0x0000ff00, srcBuffer[1] = 0x0000f0f0, srcBuffer[2] = 0x0000cccc, srcBuffer[3] = 0x0000aaaa; - srcBuffer[16] = 0xFEDCBA98, srcBuffer[17] = 0x76543210; + srcBuffer[0] = 0x0000ff00; srcBuffer[1] = 0x0000f0f0; srcBuffer[2] = 0x0000cccc; srcBuffer[3] = 0x0000aaaa; + srcBuffer[16] = 0xFEDCBA98; srcBuffer[17] = 0x76543210; memset( expected, 0, get_dib_image_size( &biDst ) ); expected[0] = srcBuffer[0]; @@ -3232,7 +3232,7 @@ static void test_StretchBlt(void) 0, 0, 1, 1, 2, 0, -2, 1, expected, __LINE__); /* when dst width > 1 behaviour reverts to what one would expect */ - expected[0] = srcBuffer[0] & srcBuffer[1], expected[1] = srcBuffer[2] & srcBuffer[3]; + expected[0] = srcBuffer[0] & srcBuffer[1]; expected[1] = srcBuffer[2] & srcBuffer[3]; check_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, 0, 0, 2, 1, 0, 0, 4, 1, expected, __LINE__); @@ -3254,21 +3254,21 @@ static void test_StretchBlt(void) /* the destination rectangle doesn't fit in the device area */ memset( expected, 0, get_dib_image_size( &biDst ) ); - expected[17] = 0x76543210, expected[18] = 0xfedcba98; - expected[32] = 0x0000cccc, expected[33] = 0x0000f0f0, expected[34] = 0x0000ff00; + expected[17] = 0x76543210; expected[18] = 0xfedcba98; + expected[32] = 0x0000cccc; expected[33] = 0x0000f0f0; expected[34] = 0x0000ff00; check_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, 2, 2, -8, -8, 0, 0, 8, 8, expected, __LINE__); /* the source rectangle doesn't fit in the device area */ memset( expected, 0, get_dib_image_size( &biDst ) ); - expected[102] = 0x76543210, expected[103] = 0xfedcba98; - expected[117] = 0x0000cccc, expected[118] = 0x0000f0f0, expected[119] = 0x0000ff00; + expected[102] = 0x76543210; expected[103] = 0xfedcba98; + expected[117] = 0x0000cccc; expected[118] = 0x0000f0f0; expected[119] = 0x0000ff00; check_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, 0, 0, 8, 8, 2, 2, -8, -8, expected, __LINE__); memset( expected, 0, get_dib_image_size( &biDst ) ); - expected[85] = 0x76543210, expected[86] = 0xfedcba98; - expected[99] = 0x0000aaaa, expected[100] = 0x0000cccc, expected[101] = 0x0000f0f0, expected[102] = 0x0000ff00; + expected[85] = 0x76543210; expected[86] = 0xfedcba98; + expected[99] = 0x0000aaaa; expected[100] = 0x0000cccc; expected[101] = 0x0000f0f0; expected[102] = 0x0000ff00; check_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, 8, 8, -18, -18, 0, 0, 18, 18, expected, __LINE__); @@ -3277,8 +3277,8 @@ static void test_StretchBlt(void) /* Top-down to bottom-up tests */ memset( srcBuffer, 0, get_dib_image_size( &biSrc ) ); - srcBuffer[0] = 0xCAFED00D, srcBuffer[1] = 0xFEEDFACE; - srcBuffer[16] = 0xFEDCBA98, srcBuffer[17] = 0x76543210; + srcBuffer[0] = 0xCAFED00D; srcBuffer[1] = 0xFEEDFACE; + srcBuffer[16] = 0xFEDCBA98; srcBuffer[17] = 0x76543210; biDst.bmiHeader.biHeight = 16; bmpDst = CreateDIBSection(hdcScreen, &biDst, DIB_RGB_COLORS, (void**)&dstBuffer, @@ -3287,13 +3287,13 @@ static void test_StretchBlt(void) memset( expected, 0, get_dib_image_size( &biDst ) ); - expected[224] = 0xFEDCBA98, expected[225] = 0x76543210; - expected[240] = 0xCAFED00D, expected[241] = 0xFEEDFACE; + expected[224] = 0xFEDCBA98; expected[225] = 0x76543210; + expected[240] = 0xCAFED00D; expected[241] = 0xFEEDFACE; check_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, 0, 0, 2, 2, 0, 0, 2, 2, expected, __LINE__); - expected[224] = 0xFEEDFACE, expected[225] = 0xCAFED00D; - expected[240] = 0x76543210, expected[241] = 0xFEDCBA98; + expected[224] = 0xFEEDFACE; expected[225] = 0xCAFED00D; + expected[240] = 0x76543210; expected[241] = 0xFEDCBA98; check_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, 0, 0, 2, 2, 1, 1, -2, -2, expected, __LINE__); @@ -3304,19 +3304,19 @@ static void test_StretchBlt(void) biSrc.bmiHeader.biHeight = 16; bmpSrc = CreateDIBSection(hdcScreen, &biSrc, DIB_RGB_COLORS, (void**)&srcBuffer, NULL, 0); - srcBuffer[224] = 0xCAFED00D, srcBuffer[225] = 0xFEEDFACE; - srcBuffer[240] = 0xFEDCBA98, srcBuffer[241] = 0x76543210; + srcBuffer[224] = 0xCAFED00D; srcBuffer[225] = 0xFEEDFACE; + srcBuffer[240] = 0xFEDCBA98; srcBuffer[241] = 0x76543210; oldSrc = SelectObject(hdcSrc, bmpSrc); memset( expected, 0, get_dib_image_size( &biDst ) ); - expected[224] = 0xCAFED00D, expected[225] = 0xFEEDFACE; - expected[240] = 0xFEDCBA98, expected[241] = 0x76543210; + expected[224] = 0xCAFED00D; expected[225] = 0xFEEDFACE; + expected[240] = 0xFEDCBA98; expected[241] = 0x76543210; check_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, 0, 0, 2, 2, 0, 0, 2, 2, expected, __LINE__); - expected[224] = 0x76543210, expected[225] = 0xFEDCBA98; - expected[240] = 0xFEEDFACE, expected[241] = 0xCAFED00D; + expected[224] = 0x76543210; expected[225] = 0xFEDCBA98; + expected[240] = 0xFEEDFACE; expected[241] = 0xCAFED00D; check_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, 0, 0, 2, 2, 1, 1, -2, -2, expected, __LINE__); @@ -3330,13 +3330,13 @@ static void test_StretchBlt(void) oldDst = SelectObject(hdcDst, bmpDst); memset( expected, 0, get_dib_image_size( &biDst ) ); - expected[0] = 0xFEDCBA98, expected[1] = 0x76543210; - expected[16] = 0xCAFED00D, expected[17] = 0xFEEDFACE; + expected[0] = 0xFEDCBA98; expected[1] = 0x76543210; + expected[16] = 0xCAFED00D; expected[17] = 0xFEEDFACE; check_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, 0, 0, 2, 2, 0, 0, 2, 2, expected, __LINE__); - expected[0] = 0xFEEDFACE, expected[1] = 0xCAFED00D; - expected[16] = 0x76543210, expected[17] = 0xFEDCBA98; + expected[0] = 0xFEEDFACE; expected[1] = 0xCAFED00D; + expected[16] = 0x76543210; expected[17] = 0xFEDCBA98; check_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, 0, 0, 2, 2, 1, 1, -2, -2, expected, __LINE__); @@ -3349,26 +3349,26 @@ static void test_StretchBlt(void) oldSrc = SelectObject(hdcSrc, bmpSrc); memset( expected, 0, get_dib_image_size( &biDst ) ); - expected[0] = 0xFEEDFACE, expected[1] = 0xCAFED00D; - expected[2] = 0x76543210, expected[3] = 0xFEDCBA98; + expected[0] = 0xFEEDFACE; expected[1] = 0xCAFED00D; + expected[2] = 0x76543210; expected[3] = 0xFEDCBA98; memcpy(dstBuffer, expected, 4 * sizeof(*dstBuffer)); StretchBlt(hdcSrc, 0, 0, 4, 1, hdcDst, 0, 0, 4, 1, SRCCOPY ); memset(dstBuffer, 0x55, 4 * sizeof(*dstBuffer)); StretchBlt(hdcDst, 0, 0, 4, 1, hdcSrc, 0, 0, 4, 1, SRCCOPY ); - expected[0] = 0x00EDFACE, expected[1] = 0x00FED00D; - expected[2] = 0x00543210, expected[3] = 0x00DCBA98; + expected[0] = 0x00EDFACE; expected[1] = 0x00FED00D; + expected[2] = 0x00543210; expected[3] = 0x00DCBA98; ok(!memcmp(dstBuffer, expected, 16), "StretchBlt expected { %08X, %08X, %08X, %08X } got { %08X, %08X, %08X, %08X }\n", expected[0], expected[1], expected[2], expected[3], dstBuffer[0], dstBuffer[1], dstBuffer[2], dstBuffer[3] ); - expected[0] = 0xFEEDFACE, expected[1] = 0xCAFED00D; - expected[2] = 0x76543210, expected[3] = 0xFEDCBA98; + expected[0] = 0xFEEDFACE; expected[1] = 0xCAFED00D; + expected[2] = 0x76543210; expected[3] = 0xFEDCBA98; memcpy(srcBuffer, expected, 4 * sizeof(*dstBuffer)); memset(dstBuffer, 0x55, 4 * sizeof(*dstBuffer)); StretchBlt(hdcDst, 0, 0, 4, 1, hdcSrc, 0, 0, 4, 1, SRCCOPY ); - expected[0] = 0x00EDFACE, expected[1] = 0x00D00DFE; - expected[2] = 0x0010CAFE, expected[3] = 0x00765432; + expected[0] = 0x00EDFACE; expected[1] = 0x00D00DFE; + expected[2] = 0x0010CAFE; expected[3] = 0x00765432; ok(!memcmp(dstBuffer, expected, 16), "StretchBlt expected { %08X, %08X, %08X, %08X } got { %08X, %08X, %08X, %08X }\n", expected[0], expected[1], expected[2], expected[3], @@ -3530,71 +3530,71 @@ static void test_StretchDIBits(void) DeleteObject(hBrush); /* Top-down destination tests */ - srcBuffer[0] = 0xCAFED00D, srcBuffer[1] = 0xFEEDFACE; - srcBuffer[2] = 0xFEDCBA98, srcBuffer[3] = 0x76543210; + srcBuffer[0] = 0xCAFED00D; srcBuffer[1] = 0xFEEDFACE; + srcBuffer[2] = 0xFEDCBA98; srcBuffer[3] = 0x76543210; - expected[0] = 0xCAFED00D, expected[1] = 0xFEEDFACE; - expected[2] = 0xFEDCBA98, expected[3] = 0x76543210; + expected[0] = 0xCAFED00D; expected[1] = 0xFEEDFACE; + expected[2] = 0xFEDCBA98; expected[3] = 0x76543210; ret = check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer, 0, 0, 2, 2, 0, 0, 2, 2, expected, __LINE__); ok( ret == 2, "got ret %d\n", ret ); - expected[0] = 0xCAFED00D, expected[1] = 0x00000000; - expected[2] = 0x00000000, expected[3] = 0x00000000; + expected[0] = 0xCAFED00D; expected[1] = 0x00000000; + expected[2] = 0x00000000; expected[3] = 0x00000000; ret = check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer, 0, 0, 1, 1, 0, 0, 1, 1, expected, __LINE__); todo_wine ok( ret == 1, "got ret %d\n", ret ); - expected[0] = 0xFEDCBA98, expected[1] = 0xFEDCBA98; - expected[2] = 0xFEDCBA98, expected[3] = 0xFEDCBA98; + expected[0] = 0xFEDCBA98; expected[1] = 0xFEDCBA98; + expected[2] = 0xFEDCBA98; expected[3] = 0xFEDCBA98; ret = check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer, 0, 0, 2, 2, 0, 0, 1, 1, expected, __LINE__); ok( ret == 2, "got ret %d\n", ret ); - expected[0] = 0x42441000, expected[1] = 0x00000000; - expected[2] = 0x00000000, expected[3] = 0x00000000; + expected[0] = 0x42441000; expected[1] = 0x00000000; + expected[2] = 0x00000000; expected[3] = 0x00000000; ret = check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer, 0, 0, 1, 1, 0, 0, 2, 2, expected, __LINE__); ok( ret == 2, "got ret %d\n", ret ); - expected[0] = 0x00000000, expected[1] = 0x00000000; - expected[2] = 0x00000000, expected[3] = 0x00000000; + expected[0] = 0x00000000; expected[1] = 0x00000000; + expected[2] = 0x00000000; expected[3] = 0x00000000; ret = check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer, 0, 0, 2, 2, 1, 1, -2, -2, expected, __LINE__); ok( ret == 0, "got ret %d\n", ret ); - expected[0] = 0x00000000, expected[1] = 0x00000000; - expected[2] = 0x00000000, expected[3] = 0x00000000; + expected[0] = 0x00000000; expected[1] = 0x00000000; + expected[2] = 0x00000000; expected[3] = 0x00000000; ret = check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer, 0, 0, 2, 2, 1, 1, -2, -2, expected, __LINE__); ok( ret == 0, "got ret %d\n", ret ); - expected[0] = 0x00000000, expected[1] = 0x00000000; - expected[2] = 0x00000000, expected[3] = 0x00000000; + expected[0] = 0x00000000; expected[1] = 0x00000000; + expected[2] = 0x00000000; expected[3] = 0x00000000; ret = check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer, 1, 1, -2, -2, 1, 1, -2, -2, expected, __LINE__); ok( ret == 0, "got ret %d\n", ret ); - expected[0] = 0x00000000, expected[1] = 0x00000000; - expected[2] = 0x00000000, expected[3] = 0xCAFED00D; + expected[0] = 0x00000000; expected[1] = 0x00000000; + expected[2] = 0x00000000; expected[3] = 0xCAFED00D; ret = check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer, 1, 1, 2, 2, 0, 0, 2, 2, expected, __LINE__); ok( ret == 2, "got ret %d\n", ret ); - expected[0] = 0x00000000, expected[1] = 0x00000000; - expected[2] = 0x00000000, expected[3] = 0x00000000; + expected[0] = 0x00000000; expected[1] = 0x00000000; + expected[2] = 0x00000000; expected[3] = 0x00000000; ret = check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer, 2, 2, 4, 4, 0, 0, 2, 2, expected, __LINE__); ok( ret == 2, "got ret %d\n", ret ); - expected[0] = 0x00000000, expected[1] = 0x00000000; - expected[2] = 0x00000000, expected[3] = 0x00000000; + expected[0] = 0x00000000; expected[1] = 0x00000000; + expected[2] = 0x00000000; expected[3] = 0x00000000; ret = check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer, -4, -4, 4, 4, 0, 0, 4, 4, expected, __LINE__); ok( ret == 2, "got ret %d\n", ret ); - expected[0] = 0x00000000, expected[1] = 0x00000000; - expected[2] = 0xFEEDFACE, expected[3] = 0x00000000; + expected[0] = 0x00000000; expected[1] = 0x00000000; + expected[2] = 0xFEEDFACE; expected[3] = 0x00000000; ret = check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer, 1, 1, -2, -2, 1, 1, 2, 2, expected, __LINE__); ok( ret == 2, "got ret %d\n", ret ); @@ -3608,8 +3608,8 @@ static void test_StretchDIBits(void) NULL, 0); oldDst = SelectObject(hdcDst, bmpDst); - expected[0] = 0xFEDCBA98, expected[1] = 0x76543210; - expected[2] = 0xCAFED00D, expected[3] = 0xFEEDFACE; + expected[0] = 0xFEDCBA98; expected[1] = 0x76543210; + expected[2] = 0xCAFED00D; expected[3] = 0xFEEDFACE; check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer, 0, 0, 2, 2, 0, 0, 2, 2, expected, __LINE__); diff --git a/dlls/gdi32/tests/pen.c b/dlls/gdi32/tests/pen.c index badc585f57..530272ea79 100644 --- a/dlls/gdi32/tests/pen.c +++ b/dlls/gdi32/tests/pen.c @@ -78,7 +78,7 @@ static void test_logpen(void) /********************** cosmetic pens **********************/ /* CreatePenIndirect behaviour */ - lp.lopnStyle = pen[i].style, + lp.lopnStyle = pen[i].style; lp.lopnWidth.x = pen[i].width; lp.lopnWidth.y = 11; /* just in case */ lp.lopnColor = pen[i].color; -- 2.20.1

1 0

[PATCH] winex11.drv: Recreate gl_drawable for top-level windows as non-top level when clipping for child windows is required
by Micah N Gorrell April 9, 2019

April 9, 2019

Prevent creating a gl_drawable for a window as type DC_GL_WINDOW if the window has children since DC_GL_WINDOW does not support clipping. If a parent window is encountered of type DC_GL_WINDOW then recreate the gl_drawable. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=15232 Signed-off-by: Micah N Gorrell <mgorrell(a)crossover.com> --- dlls/winex11.drv/opengl.c | 23 +++++++++++++++-------- dlls/winex11.drv/window.c | 13 ++++++++++++- dlls/winex11.drv/x11drv.h | 2 +- 3 files changed, 28 insertions(+), 10 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 13a1da32ea..0d4fb521c4 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1328,7 +1328,7 @@ static GLXContext create_glxcontext(Display *display, struct wgl_context *contex /*********************************************************************** * create_gl_drawable */ -static struct gl_drawable *create_gl_drawable( HWND hwnd, const struct wgl_pixel_format *format ) +static struct gl_drawable *create_gl_drawable( HWND hwnd, const struct wgl_pixel_format *format, BOOL have_child ) { struct gl_drawable *gl, *prev; XVisualInfo *visual = format->visual; @@ -1349,7 +1349,7 @@ static struct gl_drawable *create_gl_drawable( HWND hwnd, const struct wgl_pixel gl->format = format; gl->ref = 1; - if (GetAncestor( hwnd, GA_PARENT ) == GetDesktopWindow()) /* top-level window */ + if (!have_child && !GetWindow( hwnd, GW_CHILD ) && GetAncestor( hwnd, GA_PARENT ) == GetDesktopWindow()) /* childless top-level window */ { gl->type = DC_GL_WINDOW; gl->window = create_client_window( hwnd, visual ); @@ -1412,7 +1412,7 @@ static BOOL set_win_format( HWND hwnd, const struct wgl_pixel_format *format ) if (!format->visual) return FALSE; - if (!(gl = create_gl_drawable( hwnd, format ))) return FALSE; + if (!(gl = create_gl_drawable( hwnd, format, FALSE ))) return FALSE; TRACE( "created GL drawable %lx for win %p %s\n", gl->drawable, hwnd, debugstr_fbconfig( format->fbconfig )); @@ -1471,7 +1471,7 @@ static BOOL set_pixel_format(HDC hdc, int format, BOOL allow_change) /*********************************************************************** * sync_gl_drawable */ -void sync_gl_drawable( HWND hwnd ) +void sync_gl_drawable( HWND hwnd, BOOL have_child ) { struct gl_drawable *old, *new; @@ -1479,8 +1479,11 @@ void sync_gl_drawable( HWND hwnd ) switch (old->type) { + case DC_GL_WINDOW: + if (!have_child) break; /* Still a childless top-level window */ + /* fall through */ case DC_GL_PIXMAP_WIN: - if (!(new = create_gl_drawable( hwnd, old->format ))) break; + if (!(new = create_gl_drawable( hwnd, old->format, have_child ))) break; mark_drawable_dirty( old, new ); XFlush( gdi_display ); TRACE( "Recreated GL drawable %lx to replace %lx\n", new->drawable, old->drawable ); @@ -1517,7 +1520,7 @@ void set_gl_drawable_parent( HWND hwnd, HWND parent ) return; } - if ((new = create_gl_drawable( hwnd, old->format ))) + if ((new = create_gl_drawable( hwnd, old->format, FALSE ))) { mark_drawable_dirty( old, new ); release_gl_drawable( new ); @@ -3304,9 +3307,13 @@ static BOOL glxdrv_wglSwapBuffers( HDC hdc ) } pglXSwapBuffers(gdi_display, gl->drawable); break; + case DC_GL_WINDOW: case DC_GL_CHILD_WIN: if (ctx) sync_context( ctx ); - escape.gl_drawable = gl->window; + if (gl->type == DC_GL_CHILD_WIN) + { + escape.gl_drawable = gl->window; + } /* fall through */ default: if (escape.gl_drawable && pglXSwapBuffersMscOML) @@ -3362,7 +3369,7 @@ struct opengl_funcs *get_glx_driver( UINT version ) return NULL; } -void sync_gl_drawable( HWND hwnd ) +void sync_gl_drawable( HWND hwnd, HWND child ) { } diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 7a3b340e19..97dee523c9 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1874,6 +1874,11 @@ static struct x11drv_win_data *X11DRV_create_win_data( HWND hwnd, const RECT *wi if (GetWindowThreadProcessId( hwnd, NULL ) != GetCurrentThreadId()) return NULL; + /* Recreate the parent gl_drawable now that we know there are child windows + * that will need clipping support. + */ + sync_gl_drawable( parent, TRUE ); + display = thread_init_display(); init_clip_window(); /* make sure the clip window is initialized in this thread */ @@ -2206,6 +2211,12 @@ void CDECL X11DRV_SetParent( HWND hwnd, HWND parent, HWND old_parent ) done: release_win_data( data ); set_gl_drawable_parent( hwnd, parent ); + + /* Recreate the parent gl_drawable now that we know there are child windows + * that will need clipping support. + */ + sync_gl_drawable( parent, TRUE ); + fetch_icon_data( hwnd, 0, 0 ); } @@ -2369,7 +2380,7 @@ void CDECL X11DRV_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flags data->client_rect.bottom - data->client_rect.top != old_client_rect.bottom - old_client_rect.top)); release_win_data( data ); - if (needs_resize) sync_gl_drawable( hwnd ); + if (needs_resize) sync_gl_drawable( hwnd, FALSE ); return; } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index a0308b0675..71c1f3877d 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -583,7 +583,7 @@ extern void release_win_data( struct x11drv_win_data *data ) DECLSPEC_HIDDEN; extern Window X11DRV_get_whole_window( HWND hwnd ) DECLSPEC_HIDDEN; extern XIC X11DRV_get_ic( HWND hwnd ) DECLSPEC_HIDDEN; -extern void sync_gl_drawable( HWND hwnd ) DECLSPEC_HIDDEN; +extern void sync_gl_drawable( HWND hwnd, BOOL have_child ) DECLSPEC_HIDDEN; extern void set_gl_drawable_parent( HWND hwnd, HWND parent ) DECLSPEC_HIDDEN; extern void destroy_gl_drawable( HWND hwnd ) DECLSPEC_HIDDEN; extern void wine_vk_surface_destroy( HWND hwnd ) DECLSPEC_HIDDEN; -- 2.21.0

1 0

[PATCH v2] sxs: Implement SxsLookupClrGuid and add tests
by Fabian Maurer April 9, 2019

April 9, 2019

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=43270 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/sxs/sxs.c | 148 +++++++++++++++++++ dlls/sxs/sxs.spec | 1 + dlls/sxs/tests/Makefile.in | 8 +- dlls/sxs/tests/comtest_dll.manifest | 16 ++ dlls/sxs/tests/comtest_exe.manifest | 11 ++ dlls/sxs/tests/interfaces.idl | 33 +++++ dlls/sxs/tests/resource.rc | 27 ++++ dlls/sxs/tests/sxs.c | 220 ++++++++++++++++++++++++++++ 8 files changed, 462 insertions(+), 2 deletions(-) create mode 100644 dlls/sxs/tests/comtest_dll.manifest create mode 100644 dlls/sxs/tests/comtest_exe.manifest create mode 100644 dlls/sxs/tests/interfaces.idl create mode 100644 dlls/sxs/tests/resource.rc create mode 100644 dlls/sxs/tests/sxs.c diff --git a/dlls/sxs/sxs.c b/dlls/sxs/sxs.c index 06e6672dbf..7eec772de1 100644 --- a/dlls/sxs/sxs.c +++ b/dlls/sxs/sxs.c @@ -23,6 +23,10 @@ #include "windef.h" #include "winbase.h" +#include "wine/heap.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(sxs); /*********************************************************************** * DllMain (SXS.@) @@ -40,3 +44,147 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) } return TRUE; } + +typedef struct _SXS_GUID_INFORMATION_CLR +{ + DWORD cbSize; + DWORD dwFlags; + PCWSTR pcwszRuntimeVersion; + PCWSTR pcwszTypeName; + PCWSTR pcwszAssemblyIdentity; +} SXS_GUID_INFORMATION_CLR, *PSXS_GUID_INFORMATION_CLR; + +#define SXS_GUID_INFORMATION_CLR_FLAG_IS_SURROGATE 0x1 +#define SXS_GUID_INFORMATION_CLR_FLAG_IS_CLASS 0x2 + +#define SXS_LOOKUP_CLR_GUID_USE_ACTCTX 0x00000001 +#define SXS_LOOKUP_CLR_GUID_FIND_SURROGATE 0x00010000 +#define SXS_LOOKUP_CLR_GUID_FIND_CLR_CLASS 0x00020000 + +struct comclassredirect_data +{ + ULONG size; + BYTE res; + BYTE miscmask; + BYTE res1[2]; + DWORD model; + GUID clsid; + GUID alias; + GUID clsid2; + GUID tlbid; + ULONG name_len; + ULONG name_offset; + ULONG progid_len; + ULONG progid_offset; + ULONG clrdata_len; + ULONG clrdata_offset; + DWORD miscstatus; + DWORD miscstatuscontent; + DWORD miscstatusthumbnail; + DWORD miscstatusicon; + DWORD miscstatusdocprint; +}; + +struct clrclass_data +{ + ULONG size; + DWORD res[2]; + ULONG module_len; + ULONG module_offset; + ULONG name_len; + ULONG name_offset; + ULONG version_len; + ULONG version_offset; + DWORD res2[2]; +}; + +BOOL WINAPI SxsLookupClrGuid(DWORD flags, GUID *clsid, HANDLE actctx, void *buffer, SIZE_T buffer_len, SIZE_T *buffer_len_required) +{ + ACTCTX_SECTION_KEYED_DATA guid_info = { sizeof(ACTCTX_SECTION_KEYED_DATA) }; + ACTIVATION_CONTEXT_ASSEMBLY_DETAILED_INFORMATION *assembly_info; + SIZE_T bytes_assembly_info; + struct comclassredirect_data *redirect_data; + struct clrclass_data *class_data; + int len_version = 0, len_name, len_identity; + const void *ptr_name, *ptr_version, *ptr_identity; + SXS_GUID_INFORMATION_CLR *ret = buffer; + char *ret_strings; + + TRACE("(%x, %s, %p, %p, %08lx, %p): stub\n", flags, wine_dbgstr_guid(clsid), actctx, buffer, buffer_len, buffer_len_required); + + if (flags & (~SXS_LOOKUP_CLR_GUID_FIND_CLR_CLASS)) + FIXME("Ignored flags: %x\n", flags & (~SXS_LOOKUP_CLR_GUID_FIND_CLR_CLASS)); + + if (!FindActCtxSectionGuid(FIND_ACTCTX_SECTION_KEY_RETURN_HACTCTX, 0, ACTIVATION_CONTEXT_SECTION_COM_SERVER_REDIRECTION, clsid, &guid_info)) + { + SetLastError(ERROR_NOT_FOUND); + return FALSE; + } + + QueryActCtxW(0, guid_info.hActCtx, &guid_info.ulAssemblyRosterIndex, + AssemblyDetailedInformationInActivationContext, NULL, 0, &bytes_assembly_info); + if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) + { + ERR("QueryActCtxW failed: %d!\n", GetLastError()); + ReleaseActCtx(guid_info.hActCtx); + return FALSE; + } + assembly_info = heap_alloc(bytes_assembly_info); + if(!QueryActCtxW(0, guid_info.hActCtx, &guid_info.ulAssemblyRosterIndex, + AssemblyDetailedInformationInActivationContext, assembly_info, bytes_assembly_info, &bytes_assembly_info)) + { + ERR("QueryActCtxW failed: %d!\n", GetLastError()); + heap_free(assembly_info); + ReleaseActCtx(guid_info.hActCtx); + return FALSE; + } + + redirect_data = guid_info.lpData; + class_data = (void *)((char*)redirect_data + redirect_data->clrdata_offset); + + ptr_identity = assembly_info->lpAssemblyEncodedAssemblyIdentity; + ptr_name = (char *)class_data + class_data->name_offset; + ptr_version = (char *)class_data + class_data->version_offset; + + len_identity = assembly_info->ulEncodedAssemblyIdentityLength + sizeof(WCHAR); + len_name = class_data->name_len + sizeof(WCHAR); + if (class_data->version_len > 0) + len_version = class_data->version_len + sizeof(WCHAR); + + *buffer_len_required = sizeof(SXS_GUID_INFORMATION_CLR) + len_identity + len_version + len_name; + if (!buffer || buffer_len < *buffer_len_required) + { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + heap_free(assembly_info); + ReleaseActCtx(guid_info.hActCtx); + return FALSE; + } + + ret->cbSize = sizeof(SXS_GUID_INFORMATION_CLR); + ret->dwFlags = SXS_GUID_INFORMATION_CLR_FLAG_IS_CLASS; + + /* Copy strings into buffer */ + ret_strings = (char *)ret + sizeof(SXS_GUID_INFORMATION_CLR); + + memcpy(ret_strings, ptr_identity, len_identity); + ret->pcwszAssemblyIdentity = (WCHAR *)ret_strings; + ret_strings += len_identity; + + memcpy(ret_strings, ptr_name, len_name); + ret->pcwszTypeName = (WCHAR *)ret_strings; + ret_strings += len_name; + + if (len_version > 0) + { + memcpy(ret_strings, ptr_version, len_version); + ret->pcwszRuntimeVersion = (WCHAR *)ret_strings; + } + else + ret->pcwszRuntimeVersion = NULL; + + SetLastError(0); + + ReleaseActCtx(guid_info.hActCtx); + heap_free(assembly_info); + return TRUE; +} diff --git a/dlls/sxs/sxs.spec b/dlls/sxs/sxs.spec index 2a27313427..138d68f7d7 100644 --- a/dlls/sxs/sxs.spec +++ b/dlls/sxs/sxs.spec @@ -1,2 +1,3 @@ @ stdcall CreateAssemblyCache(ptr long) @ stdcall CreateAssemblyNameObject(ptr wstr long ptr) +@ stdcall SxsLookupClrGuid(long ptr ptr ptr long ptr) diff --git a/dlls/sxs/tests/Makefile.in b/dlls/sxs/tests/Makefile.in index 34609a14ae..46b5485d29 100644 --- a/dlls/sxs/tests/Makefile.in +++ b/dlls/sxs/tests/Makefile.in @@ -1,6 +1,10 @@ TESTDLL = sxs.dll -IMPORTS = sxs +IMPORTS = sxs shlwapi C_SRCS = \ cache.c \ - name.c + name.c \ + sxs.c + +RC_SRCS = resource.rc +IDL_SRCS = interfaces.idl \ No newline at end of file diff --git a/dlls/sxs/tests/comtest_dll.manifest b/dlls/sxs/tests/comtest_dll.manifest new file mode 100644 index 0000000000..ef6924de9e --- /dev/null +++ b/dlls/sxs/tests/comtest_dll.manifest @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + <assemblyIdentity + name="comtest" + version="1.0.0.0" + type="win32" + /> + <clrClass + clsid="{2e106e50-e7a4-4489-8538-83643f100fdc}" + threadingModel="Both" + name="DLL.Test" + runtimeVersion="v4.0.0.0"> + </clrClass> + <file name="comtest.dll"> + </file> +</assembly> diff --git a/dlls/sxs/tests/comtest_exe.manifest b/dlls/sxs/tests/comtest_exe.manifest new file mode 100644 index 0000000000..bc9ce4c045 --- /dev/null +++ b/dlls/sxs/tests/comtest_exe.manifest @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + <dependency> + <dependentAssembly> + <assemblyIdentity + name="comtest" + version="1.0.0.0" + type="win32"/> + </dependentAssembly> + </dependency> +</assembly> diff --git a/dlls/sxs/tests/interfaces.idl b/dlls/sxs/tests/interfaces.idl new file mode 100644 index 0000000000..9e64988197 --- /dev/null +++ b/dlls/sxs/tests/interfaces.idl @@ -0,0 +1,33 @@ +/* + * Copyright 2018 Fabian Maurer + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "unknwn.idl" + +[ + object, + uuid(1dbc4491-080d-45c5-a15d-1e3c4610bdd9), + local +] +interface ITest : IUnknown { + HRESULT Func([in, out] int *i); +}; + +[ + uuid(2e106e50-e7a4-4489-8538-83643f100fdc), +] +coclass Test { interface ITest; }; diff --git a/dlls/sxs/tests/resource.rc b/dlls/sxs/tests/resource.rc new file mode 100644 index 0000000000..dd2c25bf37 --- /dev/null +++ b/dlls/sxs/tests/resource.rc @@ -0,0 +1,27 @@ +/* + * Resources for sxs test suite. + * + * Copyright 2018 Fabian Maurer + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "windef.h" + +/* @makedep: comtest_exe.manifest */ +comtest_exe.manifest RCDATA comtest_exe.manifest + +/* @makedep: comtest_dll.manifest */ +comtest_dll.manifest RCDATA comtest_dll.manifest diff --git a/dlls/sxs/tests/sxs.c b/dlls/sxs/tests/sxs.c new file mode 100644 index 0000000000..5c8d69fd60 --- /dev/null +++ b/dlls/sxs/tests/sxs.c @@ -0,0 +1,220 @@ +/* + * Copyright 2018 Fabian Maurer + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdio.h> + +#define COBJMACROS + +#include <windows.h> +#include <winsxs.h> +#include <corerror.h> +#include "shlwapi.h" + +#include "wine/test.h" +#include "wine/heap.h" + +#include "initguid.h" +#include "interfaces.h" + +#define SXS_LOOKUP_CLR_GUID_USE_ACTCTX 0x00000001 +#define SXS_LOOKUP_CLR_GUID_FIND_SURROGATE 0x00010000 +#define SXS_LOOKUP_CLR_GUID_FIND_CLR_CLASS 0x00020000 +#define SXS_LOOKUP_CLR_GUID_FIND_ANY (SXS_LOOKUP_CLR_GUID_FIND_SURROGATE | SXS_LOOKUP_CLR_GUID_FIND_CLR_CLASS) + +#define SXS_GUID_INFORMATION_CLR_FLAG_IS_SURROGATE 0x00000001 +#define SXS_GUID_INFORMATION_CLR_FLAG_IS_CLASS 0x00000002 + +typedef struct _SXS_GUID_INFORMATION_CLR +{ + DWORD cbSize; + DWORD dwFlags; + PCWSTR pcwszRuntimeVersion; + PCWSTR pcwszTypeName; + PCWSTR pcwszAssemblyIdentity; +} SXS_GUID_INFORMATION_CLR; + +/* Defined in sxs.dll, but not found in any header */ +BOOL WINAPI SxsLookupClrGuid(DWORD flags, GUID *clsid, HANDLE actctx, void *buffer, SIZE_T buffer_len, SIZE_T *buffer_len_required); + +static BOOL write_resource_file(const char *path_tmp, const char *name_res, const char *name_file, char *path_file) +{ + HRSRC rsrc; + void *rsrc_data; + DWORD rsrc_size; + BOOL ret; + HANDLE hfile; + + rsrc = FindResourceA(GetModuleHandleA(NULL), name_res, (LPCSTR)RT_RCDATA); + if (!rsrc) return FALSE; + + rsrc_data = LockResource(LoadResource(GetModuleHandleA(NULL), rsrc)); + if (!rsrc_data) return FALSE; + + rsrc_size = SizeofResource(GetModuleHandleA(NULL), rsrc); + if (!rsrc_size) return FALSE; + + strcpy(path_file, path_tmp); + PathAppendA(path_file, name_file); + hfile = CreateFileA(path_file, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0); + if (hfile == INVALID_HANDLE_VALUE) return FALSE; + + ret = WriteFile(hfile, rsrc_data, rsrc_size, &rsrc_size, NULL); + + CloseHandle(hfile); + return ret; +} + +static void run_test(void) +{ + SIZE_T buffer_size; + BOOL ret; + SXS_GUID_INFORMATION_CLR *info; + WCHAR expected_type_name[] = {'D','L','L','.','T','e','s','t',0}; + WCHAR expected_runtime_version[] = {'v','4','.','0','.','0','.','0',0}; + WCHAR expected_assembly_identity[] = {'c','o','m','t','e','s','t',',','t','y','p','e','=','"','w','i','n','3','2','"',',','v','e','r','s','i','o','n','=','"','1','.','0','.','0','.','0','"',0}; + + ret = SxsLookupClrGuid(SXS_LOOKUP_CLR_GUID_FIND_CLR_CLASS, (GUID*)&CLSID_Test, NULL, NULL, 0, &buffer_size); + ok(ret == FALSE, "Got %d\n", ret); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Got %d\n", GetLastError()); + + info = heap_alloc(buffer_size); + ret = SxsLookupClrGuid(SXS_LOOKUP_CLR_GUID_FIND_CLR_CLASS, (GUID*)&CLSID_Test, NULL, info, buffer_size, &buffer_size); + ok(ret == TRUE, "Got %d\n", ret); + ok(GetLastError() == 0, "Got %d\n", GetLastError()); + + ok(info->dwFlags == SXS_GUID_INFORMATION_CLR_FLAG_IS_CLASS, "Got %d\n", info->dwFlags); + ok(lstrcmpW(info->pcwszTypeName, expected_type_name) == 0, "Got %s\n", wine_dbgstr_w(info->pcwszTypeName)); + ok(lstrcmpW(info->pcwszAssemblyIdentity, expected_assembly_identity) == 0, "Got %s\n", wine_dbgstr_w(info->pcwszAssemblyIdentity)); + ok(lstrcmpW(info->pcwszRuntimeVersion, expected_runtime_version) == 0, "Got %s\n", wine_dbgstr_w(info->pcwszRuntimeVersion)); + + heap_free(info); +} + +static void prepare_and_run_test(void) +{ + char path_tmp[MAX_PATH] = {0}; + char path_manifest_dll[MAX_PATH] = {0}; + char path_manifest_exe[MAX_PATH] = {0}; + BOOL success; + ACTCTXA context = {0}; + ULONG_PTR cookie; + HANDLE handle_context = 0; + + GetTempPathA(MAX_PATH, path_tmp); + + if (!write_resource_file(path_tmp, "comtest_exe.manifest", "exe.manifest", path_manifest_exe)) + { + ok(0, "Failed to create file for testing\n"); + goto cleanup; + } + + if (!write_resource_file(path_tmp, "comtest_dll.manifest", "comtest.manifest", path_manifest_dll)) + { + ok(0, "Failed to create file for testing\n"); + goto cleanup; + } + + context.cbSize = sizeof(ACTCTXA); + context.lpSource = path_manifest_exe; + context.lpAssemblyDirectory = path_tmp; + context.dwFlags = ACTCTX_FLAG_ASSEMBLY_DIRECTORY_VALID; + + handle_context = CreateActCtxA(&context); + ok(handle_context != NULL && handle_context != INVALID_HANDLE_VALUE, "CreateActCtxA failed: %d\n", GetLastError()); + + if (handle_context == NULL || handle_context == INVALID_HANDLE_VALUE) + { + ok(0, "Failed to create activation context\n"); + goto cleanup; + } + + success = ActivateActCtx(handle_context, &cookie); + ok(success, "ActivateActCtx failed: %d\n", GetLastError()); + + run_test(); + +cleanup: + if (handle_context != NULL && handle_context != INVALID_HANDLE_VALUE) + { + success = DeactivateActCtx(0, cookie); + ok(success, "DeactivateActCtx failed: %d\n", GetLastError()); + ReleaseActCtx(handle_context); + } + if (*path_manifest_exe) + { + success = DeleteFileA(path_manifest_exe); + ok(success, "DeleteFileA failed: %d\n", GetLastError()); + } + if(*path_manifest_dll) + { + success = DeleteFileA(path_manifest_dll); + ok(success, "DeleteFileA failed: %d\n", GetLastError()); + } +} + +static void run_child_process(void) +{ + char cmdline[MAX_PATH]; + char exe[MAX_PATH]; + char **argv; + PROCESS_INFORMATION pi; + STARTUPINFOA si = { 0 }; + BOOL ret; + + winetest_get_mainargs(&argv); + + if (strstr(argv[0], ".exe")) + sprintf(exe, "%s", argv[0]); + else + sprintf(exe, "%s.exe", argv[0]); + sprintf(cmdline, "\"%s\" %s %s", argv[0], argv[1], "subtest"); + + si.cb = sizeof(si); + ret = CreateProcessA(exe, cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + ok(ret, "Could not create process: %u\n", GetLastError()); + + winetest_wait_child_process(pi.hProcess); + + CloseHandle(pi.hThread); + CloseHandle(pi.hProcess); +} + +static void test_SxsLookupClrGuid(void) +{ + SIZE_T buffer_size; + BOOL ret; + + ret = SxsLookupClrGuid(SXS_LOOKUP_CLR_GUID_FIND_CLR_CLASS, (GUID*)&CLSID_Test, NULL, NULL, 0, &buffer_size); + ok(ret == FALSE, "Expected FALSE, got %d\n", ret); + ok(GetLastError() == ERROR_NOT_FOUND, "Expected ERROR_NOT_FOUND, got %d\n", GetLastError()); + + run_child_process(); +} + +START_TEST(sxs) +{ + char **argv; + int argc = winetest_get_mainargs(&argv); + if (argc > 2) + { + prepare_and_run_test(); + return; + } + + test_SxsLookupClrGuid(); +} -- 2.21.0

1 0

[PATCH] d3dx9_36: Don't use strcasecmp.
by Piotr Caban April 9, 2019

April 9, 2019

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/d3dx9_36/effect.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)

2 3