- wine-devel - winehq.org

[PATCH v3] winex11.drv: Search for the drop target in a correct manner.
by John Found 24 May '19

24 May '19

Signed-off-by: John Found <johnfound(a)asm32.info> --- dlls/winex11.drv/xdnd.c | 54 +++++++++++++++++++++++++++++++++++------ 1 file changed, 46 insertions(+), 8 deletions(-) diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c index 2ab28e43bf..1f7f0d932b 100644 --- a/dlls/winex11.drv/xdnd.c +++ b/dlls/winex11.drv/xdnd.c @@ -254,6 +254,38 @@ void X11DRV_XDND_EnterEvent( HWND hWnd, XClientMessageEvent *event ) XFree(xdndtypes); } +/* Recursively searches for a window on given coordinates in a drag&drop specific manner. + * + * Don't use WindowFromPoint instead, because it omits the STATIC and transparent + * windows, but they can be a valid drop targets if have WS_EX_ACCEPTFILES set. + */ +static HWND window_from_point_dnd(HWND hwnd, POINT point) +{ + HWND child; + ScreenToClient(hwnd, &point); + while ((child = ChildWindowFromPointEx(hwnd, point, CWP_SKIPDISABLED | CWP_SKIPINVISIBLE)) && child != hwnd) + { + MapWindowPoints(hwnd, child, &point, 1); + hwnd = child; + } + + return hwnd; +} + +/* Returns the first window down the hierarchy that has WS_EX_ACCEPTFILES set or + * returns NULL, if such window does not exists. + */ +static HWND window_accepting_files(HWND hwnd) +{ + while (hwnd && !(GetWindowLongW(hwnd, GWL_EXSTYLE) & WS_EX_ACCEPTFILES)) + /* MUST to be GetParent, not GetAncestor, because the owner window + * (with WS_EX_ACCEPTFILES) of a window with WS_POPUP is a valid + * drop target. GetParent works exactly this way! + */ + hwnd = GetParent(hwnd); + return hwnd; +} + /************************************************************************** * X11DRV_XDND_PositionEvent * @@ -270,7 +302,7 @@ void X11DRV_XDND_PositionEvent( HWND hWnd, XClientMessageEvent *event ) HRESULT hr; XDNDxy = root_to_virtual_screen( event->data.l[2] >> 16, event->data.l[2] & 0xFFFF ); - targetWindow = WindowFromPoint(XDNDxy); + targetWindow = window_from_point_dnd(hWnd, XDNDxy); pointl.x = XDNDxy.x; pointl.y = XDNDxy.y; @@ -334,11 +366,15 @@ void X11DRV_XDND_PositionEvent( HWND hWnd, XClientMessageEvent *event ) if (XDNDAccepted) accept = 1; - else if ((GetWindowLongW( hWnd, GWL_EXSTYLE ) & WS_EX_ACCEPTFILES) && - X11DRV_XDND_HasHDROP()) + else { - accept = 1; - effect = DROPEFFECT_COPY; + /* fallback search for window able to accept these files. */ + + if (window_accepting_files(targetWindow) && X11DRV_XDND_HasHDROP()) + { + accept = 1; + effect = DROPEFFECT_COPY; + } } TRACE("actionRequested(%ld) accept(%d) chosen(0x%x) at x(%d),y(%d)\n", @@ -423,10 +459,12 @@ void X11DRV_XDND_DropEvent( HWND hWnd, XClientMessageEvent *event ) { /* Only send WM_DROPFILES if Drop didn't succeed or DROPEFFECT_NONE was set. * Doing both causes winamp to duplicate the dropped files (#29081) */ - if ((GetWindowLongW( hWnd, GWL_EXSTYLE ) & WS_EX_ACCEPTFILES) && - X11DRV_XDND_HasHDROP()) + + HWND hwnd_drop = window_accepting_files(window_from_point_dnd(hWnd, XDNDxy)); + + if (hwnd_drop && X11DRV_XDND_HasHDROP()) { - HRESULT hr = X11DRV_XDND_SendDropFiles( hWnd ); + HRESULT hr = X11DRV_XDND_SendDropFiles(hwnd_drop); if (SUCCEEDED(hr)) { accept = 1; -- 2.21.0

1 0

[PATCH] kernel32/tests: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 24 May '19

24 May '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/tests/path.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index 8f5508355b..f15cc09ee5 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -1922,7 +1922,7 @@ static void test_SearchPathA(void) ret = GetCurrentDirectoryA(MAX_PATH, curdirA); ok(ret, "failed to obtain working directory.\n"); sprintf(pathA, "%s\\%s", tmpdirA, kernel32A); - ret = SearchPathA(NULL, kernel32A, NULL, sizeof(path2A)/sizeof(CHAR), path2A, NULL); + ret = SearchPathA(NULL, kernel32A, NULL, ARRAY_SIZE(path2A), path2A, NULL); ok(ret && ret == strlen(path2A), "got %d\n", ret); bret = CopyFileA(path2A, pathA, FALSE); ok(bret != 0, "failed to copy test executable to temp directory, %u\n", GetLastError()); -- 2.20.1

1 0

[PATCH v2 1/2] winex11.drv: Activate window when restoring from iconic state.
by Zhiyi Zhang 24 May '19

24 May '19

Some games, e.g., Mirror's Edge waits for WM_ACTIVATE when restoring from iconic state. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v2: SetActiveWindow only when restoring from iconic state and window is visible. This doesn't break existing tests, see https://testbot.winehq.org/JobDetails.pl?Key=52779 I couldn't find a good way to test this because it manifests when clicking on the taskbar icon, rather via ShowWindow or WM_SYSCOMMAND message. But I do have some proves that activate messages are sent before WM_SYSCOMMAND SC_RESTORE. #1 Click on minimized notepad taskbar icon message trace by spy++ on Windows 10 1809 ---- Click happens ---- <000001> 00000000000203C4 S WM_WINDOWPOSCHANGING lpwp:00000012439BF540 <000002> 00000000000203C4 R WM_WINDOWPOSCHANGING <000003> 00000000000203C4 S WM_WINDOWPOSCHANGED lpwp:00000012439BF540 <000004> 00000000000203C4 R WM_WINDOWPOSCHANGED ---- Begin of activate messages ---- <000005> 00000000000203C4 S WM_ACTIVATEAPP fActive:True dwThreadID:00001758 <000006> 00000000000203C4 R WM_ACTIVATEAPP <000007> 00000000000203C4 S WM_NCACTIVATE fActive:True <000008> 00000000000203C4 R WM_NCACTIVATE <000009> 00000000000203C4 S WM_ACTIVATE fActive:WA_ACTIVE fMinimized:True hwndPrevious:(null) <000010> 00000000000203C4 R WM_ACTIVATE ---- WM_SYSCOMMAND SC_RESTORE ---- <000011> 00000000000203C4 P WM_SYSCOMMAND uCmdType:SC_RESTORE xPos:0 yPos:0 (used mnemonic) <000012> 00000000000203C4 S WM_QUERYOPEN <000013> 00000000000203C4 R WM_QUERYOPEN fOpenIsOk:True <000014> 00000000000203C4 S WM_WINDOWPOSCHANGING lpwp:00000012439BECA0 <000015> 00000000000203C4 S WM_GETMINMAXINFO lpmmi:00000012439BE530 <000016> 00000000000203C4 R WM_GETMINMAXINFO lpmmi:00000012439BE530 <000017> 00000000000203C4 R WM_WINDOWPOSCHANGING <000018> 00000000000203C4 S WM_NCCALCSIZE fCalcValidRects:True lpncsp:00000012439BEC70 <000019> 00000000000203C4 S message:0x0093 [Unknown] wParam:00000000 lParam:00000012439BE300 <000020> 00000000000203C4 R message:0x0093 [Unknown] lResult:00000001 <000021> 00000000000203C4 R WM_NCCALCSIZE fuValidRect:0000 lpncsp:00000012439BEC70 <000022> 00000000000203C4 S WM_NCPAINT hrgn:00000001 ... ... #2 The reason why Mirror's Edge doesn't handle WM_SYSCOMMAND SC_RESTORE Disassembly of the game win proc shows that the win proc return 0 directly when handling WM_SYSCOMMAND SC_RESTORE in fullscreen mode, instead of handing it to DefWindowProc or do any sort of processing. So this means it rely on the WM_ACTIVATE message before WM_SYSCOMMAND. dlls/winex11.drv/event.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 6054f645c4..5c465aa033 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -1266,6 +1266,8 @@ static void handle_wm_state_notify( HWND hwnd, XPropertyEvent *event, BOOL updat { TRACE( "restoring win %p/%lx\n", data->hwnd, data->whole_window ); release_win_data( data ); + if ((style & (WS_MINIMIZE | WS_VISIBLE)) == (WS_MINIMIZE | WS_VISIBLE)) + SetActiveWindow( hwnd ); SendMessageW( hwnd, WM_SYSCOMMAND, SC_RESTORE, 0 ); return; } -- 2.20.1

2 4

[PATCH] gdiplus: add version resource
by Louis Lenders 24 May '19

24 May '19

https://bugs.winehq.org/show_bug.cgi?id=47137 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- dlls/gdiplus/gdiplus.rc | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/gdiplus/gdiplus.rc b/dlls/gdiplus/gdiplus.rc index 5c7e2cfe97..6191c1ab15 100644 --- a/dlls/gdiplus/gdiplus.rc +++ b/dlls/gdiplus/gdiplus.rc @@ -18,6 +18,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WINE_FILEDESCRIPTION_STR "Wine gdiplus" +#define WINE_FILENAME_STR "gdiplus.dll" +#define WINE_FILEVERSION 6,1,7601,17514 +#define WINE_FILEVERSION_STR "6.1.7601.17514" +#define WINE_PRODUCTVERSION 6,1,7601,17514 +#define WINE_PRODUCTVERSION_STR "6.1.7601.17514" + +#include "wine/wine_common_ver.rc" + /* @makedep: gdiplus.manifest */ WINE_MANIFEST 24 gdiplus.manifest -- 2.20.1

3 2

[PATCH] mfplat: Add timestamp support for system time source.
by Nikolay Sivov 24 May '19

24 May '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/main.c | 81 +++++++++++++++----- dlls/mfplat/tests/mfplat.c | 152 +++++++++++++++++++++++++++++++++++++ 2 files changed, 216 insertions(+), 17 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 23f13afa3a..1009f4083b 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -18,6 +18,7 @@ #include <stdarg.h> #include <string.h> +#include <math.h> #define COBJMACROS #define NONAMELESSUNION @@ -57,9 +58,20 @@ struct system_time_source LONG refcount; MFCLOCK_STATE state; IMFClock *clock; + LONGLONG start_offset; + float rate; + int i_rate; CRITICAL_SECTION cs; }; +static void system_time_source_apply_rate(const struct system_time_source *source, LONGLONG *value) +{ + if (source->i_rate) + *value *= source->i_rate; + else + *value *= source->rate; +} + static struct system_time_source *impl_from_IMFPresentationTimeSource(IMFPresentationTimeSource *iface) { return CONTAINING_RECORD(iface, struct system_time_source, IMFPresentationTimeSource_iface); @@ -6736,11 +6748,26 @@ static HRESULT WINAPI system_time_source_GetClockCharacteristics(IMFPresentation static HRESULT WINAPI system_time_source_GetCorrelatedTime(IMFPresentationTimeSource *iface, DWORD reserved, LONGLONG *clock_time, MFTIME *system_time) { - FIXME("%p, %#x, %p, %p.\n", iface, reserved, clock_time, system_time); + struct system_time_source *source = impl_from_IMFPresentationTimeSource(iface); + HRESULT hr; - return E_NOTIMPL; -} + TRACE("%p, %#x, %p, %p.\n", iface, reserved, clock_time, system_time); + EnterCriticalSection(&source->cs); + if (SUCCEEDED(hr = IMFClock_GetCorrelatedTime(source->clock, 0, clock_time, system_time))) + { + if (source->state == MFCLOCK_STATE_RUNNING) + { + system_time_source_apply_rate(source, clock_time); + *clock_time += source->start_offset; + } + else + *clock_time = source->start_offset; + } + LeaveCriticalSection(&source->cs); + + return hr; +} static HRESULT WINAPI system_time_source_GetContinuityKey(IMFPresentationTimeSource *iface, DWORD *key) { @@ -6870,11 +6897,13 @@ static HRESULT WINAPI system_time_source_sink_OnClockStart(IMFClockStateSink *if TRACE("%p, %s, %s.\n", iface, wine_dbgstr_longlong(system_time), wine_dbgstr_longlong(start_offset)); EnterCriticalSection(&source->cs); - hr = system_time_source_change_state(source, CLOCK_CMD_START); + if (SUCCEEDED(hr = system_time_source_change_state(source, CLOCK_CMD_START))) + { + system_time_source_apply_rate(source, &system_time); + source->start_offset = -system_time + start_offset; + } LeaveCriticalSection(&source->cs); - /* FIXME: update timestamps */ - return hr; } @@ -6886,11 +6915,10 @@ static HRESULT WINAPI system_time_source_sink_OnClockStop(IMFClockStateSink *ifa TRACE("%p, %s.\n", iface, wine_dbgstr_longlong(system_time)); EnterCriticalSection(&source->cs); - hr = system_time_source_change_state(source, CLOCK_CMD_STOP); + if (SUCCEEDED(hr = system_time_source_change_state(source, CLOCK_CMD_STOP))) + source->start_offset = 0; LeaveCriticalSection(&source->cs); - /* FIXME: update timestamps */ - return hr; } @@ -6902,11 +6930,13 @@ static HRESULT WINAPI system_time_source_sink_OnClockPause(IMFClockStateSink *if TRACE("%p, %s.\n", iface, wine_dbgstr_longlong(system_time)); EnterCriticalSection(&source->cs); - hr = system_time_source_change_state(source, CLOCK_CMD_PAUSE); + if (SUCCEEDED(hr = system_time_source_change_state(source, CLOCK_CMD_PAUSE))) + { + system_time_source_apply_rate(source, &system_time); + source->start_offset += system_time; + } LeaveCriticalSection(&source->cs); - /* FIXME: update timestamps */ - return hr; } @@ -6918,19 +6948,34 @@ static HRESULT WINAPI system_time_source_sink_OnClockRestart(IMFClockStateSink * TRACE("%p, %s.\n", iface, wine_dbgstr_longlong(system_time)); EnterCriticalSection(&source->cs); - hr = system_time_source_change_state(source, CLOCK_CMD_RESTART); + if (SUCCEEDED(hr = system_time_source_change_state(source, CLOCK_CMD_RESTART))) + { + system_time_source_apply_rate(source, &system_time); + source->start_offset -= system_time; + } LeaveCriticalSection(&source->cs); - /* FIXME: update timestamps */ - return hr; } static HRESULT WINAPI system_time_source_sink_OnClockSetRate(IMFClockStateSink *iface, MFTIME system_time, float rate) { - FIXME("%p, %s, %f.\n", iface, wine_dbgstr_longlong(system_time), rate); + struct system_time_source *source = impl_from_IMFClockStateSink(iface); + double intpart; - return E_NOTIMPL; + TRACE("%p, %s, %f.\n", iface, wine_dbgstr_longlong(system_time), rate); + + if (rate == 0.0f) + return MF_E_UNSUPPORTED_RATE; + + modf(rate, &intpart); + + EnterCriticalSection(&source->cs); + source->rate = rate; + source->i_rate = rate == intpart ? rate : 0; + LeaveCriticalSection(&source->cs); + + return S_OK; } static const IMFClockStateSinkVtbl systemtimesourcesinkvtbl = @@ -6962,6 +7007,8 @@ HRESULT WINAPI MFCreateSystemTimeSource(IMFPresentationTimeSource **time_source) object->IMFPresentationTimeSource_iface.lpVtbl = &systemtimesourcevtbl; object->IMFClockStateSink_iface.lpVtbl = &systemtimesourcesinkvtbl; object->refcount = 1; + object->rate = 1.0f; + object->i_rate = 1; InitializeCriticalSection(&object->cs); if (FAILED(hr = create_system_clock(&object->clock))) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index e385987f33..295863716b 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -2675,6 +2675,158 @@ static void test_system_time_source(void) IMFClock_Release(clock); + /* Test returned time regarding specified rate and offset. */ + hr = IMFPresentationTimeSource_QueryInterface(time_source, &IID_IMFClockStateSink, (void **)&statesink); + ok(hr == S_OK, "Failed to get sink interface, hr %#x.\n", hr); + + hr = IMFPresentationTimeSource_GetState(time_source, 0, &state); + ok(hr == S_OK, "Failed to get state %#x.\n", hr); + ok(state == MFCLOCK_STATE_STOPPED, "Unexpected state %d.\n", state); + + hr = IMFPresentationTimeSource_GetCorrelatedTime(time_source, 0, &time, &systime); + ok(hr == S_OK, "Failed to get time %#x.\n", hr); + ok(time == 0, "Unexpected time stamp %s, %s.\n", wine_dbgstr_longlong(time), wine_dbgstr_longlong(systime)); + + hr = IMFClockStateSink_OnClockStart(statesink, 0, 0); + ok(hr == S_OK, "Failed to start source, hr %#x.\n", hr); + + hr = IMFPresentationTimeSource_GetCorrelatedTime(time_source, 0, &time, &systime); + ok(hr == S_OK, "Failed to get time %#x.\n", hr); + ok(time == systime, "Unexpected time stamp %s, %s.\n", wine_dbgstr_longlong(time), wine_dbgstr_longlong(systime)); + + hr = IMFClockStateSink_OnClockStart(statesink, 0, 1); + ok(hr == S_OK, "Failed to start source, hr %#x.\n", hr); + + hr = IMFPresentationTimeSource_GetCorrelatedTime(time_source, 0, &time, &systime); + ok(hr == S_OK, "Failed to get time %#x.\n", hr); + ok(time == systime + 1, "Unexpected time stamp %s, %s.\n", wine_dbgstr_longlong(time), + wine_dbgstr_longlong(systime)); + + hr = IMFClockStateSink_OnClockPause(statesink, 2); + ok(hr == S_OK, "Failed to pause source, hr %#x.\n", hr); + + hr = IMFPresentationTimeSource_GetCorrelatedTime(time_source, 0, &time, &systime); + ok(hr == S_OK, "Failed to get time %#x.\n", hr); + ok(time == 3, "Unexpected time stamp %s, %s.\n", wine_dbgstr_longlong(time), wine_dbgstr_longlong(systime)); + + hr = IMFClockStateSink_OnClockRestart(statesink, 5); + ok(hr == S_OK, "Failed to restart source, hr %#x.\n", hr); + + hr = IMFPresentationTimeSource_GetCorrelatedTime(time_source, 0, &time, &systime); + ok(hr == S_OK, "Failed to get time %#x.\n", hr); + ok(time == systime - 2, "Unexpected time stamp %s, %s.\n", wine_dbgstr_longlong(time), + wine_dbgstr_longlong(systime)); + + hr = IMFClockStateSink_OnClockPause(statesink, 0); + ok(hr == S_OK, "Failed to pause source, hr %#x.\n", hr); + + hr = IMFPresentationTimeSource_GetCorrelatedTime(time_source, 0, &time, &systime); + ok(hr == S_OK, "Failed to get time %#x.\n", hr); + ok(time == -2, "Unexpected time stamp %s, %s.\n", wine_dbgstr_longlong(time), + wine_dbgstr_longlong(systime)); + + hr = IMFClockStateSink_OnClockStop(statesink, 123); + ok(hr == S_OK, "Failed to stop source, hr %#x.\n", hr); + + hr = IMFPresentationTimeSource_GetCorrelatedTime(time_source, 0, &time, &systime); + ok(hr == S_OK, "Failed to get time %#x.\n", hr); + ok(time == 0, "Unexpected time stamp %s, %s.\n", wine_dbgstr_longlong(time), wine_dbgstr_longlong(systime)); + + /* Increased rate. */ + hr = IMFClockStateSink_OnClockSetRate(statesink, 0, 2.0f); + ok(hr == S_OK, "Failed to set rate, hr %#x.\n", hr); + + hr = IMFClockStateSink_OnClockStart(statesink, 0, 0); + ok(hr == S_OK, "Failed to start source, hr %#x.\n", hr); + + hr = IMFPresentationTimeSource_GetCorrelatedTime(time_source, 0, &time, &systime); + ok(hr == S_OK, "Failed to get time %#x.\n", hr); + ok(time == 2 * systime, "Unexpected time stamp %s, %s.\n", wine_dbgstr_longlong(time), + wine_dbgstr_longlong(2 * systime)); + + hr = IMFClockStateSink_OnClockStart(statesink, 0, 10); + ok(hr == S_OK, "Failed to start source, hr %#x.\n", hr); + + hr = IMFPresentationTimeSource_GetCorrelatedTime(time_source, 0, &time, &systime); + ok(hr == S_OK, "Failed to get time %#x.\n", hr); + ok(time == 2 * systime + 10, "Unexpected time stamp %s, %s.\n", wine_dbgstr_longlong(time), + wine_dbgstr_longlong(2 * systime)); + + hr = IMFClockStateSink_OnClockPause(statesink, 2); + ok(hr == S_OK, "Failed to pause source, hr %#x.\n", hr); + + hr = IMFPresentationTimeSource_GetCorrelatedTime(time_source, 0, &time, &systime); + ok(hr == S_OK, "Failed to get time %#x.\n", hr); + ok(time == 10 + 2 * 2, "Unexpected time stamp %s, %s.\n", wine_dbgstr_longlong(time), + wine_dbgstr_longlong(systime)); + + hr = IMFClockStateSink_OnClockRestart(statesink, 5); + ok(hr == S_OK, "Failed to restart source, hr %#x.\n", hr); + + hr = IMFPresentationTimeSource_GetCorrelatedTime(time_source, 0, &time, &systime); + ok(hr == S_OK, "Failed to get time %#x.\n", hr); + ok(time == 2 * systime + 14 - 5 * 2, "Unexpected time stamp %s, %s.\n", wine_dbgstr_longlong(time), + wine_dbgstr_longlong(systime)); + + hr = IMFClockStateSink_OnClockPause(statesink, 0); + ok(hr == S_OK, "Failed to pause source, hr %#x.\n", hr); + + hr = IMFPresentationTimeSource_GetCorrelatedTime(time_source, 0, &time, &systime); + ok(hr == S_OK, "Failed to get time %#x.\n", hr); + ok(time == 4, "Unexpected time stamp %s, %s.\n", wine_dbgstr_longlong(time), + wine_dbgstr_longlong(systime)); + + hr = IMFClockStateSink_OnClockStop(statesink, 123); + ok(hr == S_OK, "Failed to stop source, hr %#x.\n", hr); + + hr = IMFPresentationTimeSource_GetCorrelatedTime(time_source, 0, &time, &systime); + ok(hr == S_OK, "Failed to get time %#x.\n", hr); + ok(time == 0, "Unexpected time stamp %s, %s.\n", wine_dbgstr_longlong(time), wine_dbgstr_longlong(systime)); + IMFClockStateSink_Release(statesink); + + hr = IMFClockStateSink_OnClockStart(statesink, 10, 0); + ok(hr == S_OK, "Failed to start source, hr %#x.\n", hr); + + hr = IMFPresentationTimeSource_GetCorrelatedTime(time_source, 0, &time, &systime); + ok(hr == S_OK, "Failed to get time %#x.\n", hr); + ok(time == 2 * systime - 2 * 10, "Unexpected time stamp %s, %s.\n", wine_dbgstr_longlong(time), + wine_dbgstr_longlong(2 * systime)); + + hr = IMFClockStateSink_OnClockStop(statesink, 123); + ok(hr == S_OK, "Failed to stop source, hr %#x.\n", hr); + + hr = IMFClockStateSink_OnClockStart(statesink, 10, 20); + ok(hr == S_OK, "Failed to start source, hr %#x.\n", hr); + + hr = IMFPresentationTimeSource_GetCorrelatedTime(time_source, 0, &time, &systime); + ok(hr == S_OK, "Failed to get time %#x.\n", hr); + ok(time == 2 * systime, "Unexpected time stamp %s, %s.\n", wine_dbgstr_longlong(time), + wine_dbgstr_longlong(2 * systime)); + + hr = IMFClockStateSink_OnClockPause(statesink, 2); + ok(hr == S_OK, "Failed to pause source, hr %#x.\n", hr); + + hr = IMFPresentationTimeSource_GetCorrelatedTime(time_source, 0, &time, &systime); + ok(hr == S_OK, "Failed to get time %#x.\n", hr); + ok(time == 2 * 2, "Unexpected time stamp %s, %s.\n", wine_dbgstr_longlong(time), + wine_dbgstr_longlong(systime)); + + hr = IMFClockStateSink_OnClockRestart(statesink, 5); + ok(hr == S_OK, "Failed to restart source, hr %#x.\n", hr); + + hr = IMFPresentationTimeSource_GetCorrelatedTime(time_source, 0, &time, &systime); + ok(hr == S_OK, "Failed to get time %#x.\n", hr); + ok(time == 2 * systime + 4 - 5 * 2, "Unexpected time stamp %s, %s.\n", wine_dbgstr_longlong(time), + wine_dbgstr_longlong(systime)); + + hr = IMFClockStateSink_OnClockPause(statesink, 0); + ok(hr == S_OK, "Failed to pause source, hr %#x.\n", hr); + + hr = IMFPresentationTimeSource_GetCorrelatedTime(time_source, 0, &time, &systime); + ok(hr == S_OK, "Failed to get time %#x.\n", hr); + ok(time == -6, "Unexpected time stamp %s, %s.\n", wine_dbgstr_longlong(time), + wine_dbgstr_longlong(systime)); + IMFPresentationTimeSource_Release(time_source); } -- 2.20.1

1 0

[PATCH 1/2] kernel32/tests: Add NtAllocateVirtualMemory tests for ZeroBits behavior
by Rémi Bernon 24 May '19

24 May '19

The ZeroBits parameter doesn't behave as expected, and some 64bit code use it to allocate memory in the lower 32bit address space. The expected full behaviour is: * ZeroBits == 0: no constraint on address range * 0 < ZeroBits <= 15: returned address should have as many upper bits set to 0, starting at bit 31. In 64bit mode, upper 64bits should all be 0 as well. * 15 < ZeroBits <= 31: unsure, but probably same as ZeroBits == 15. * ZeroBits > 31: (64bit/WoW64 only) ZeroBits behaves as a bitmask, as if it was set to the number of leading 0 in the bitmask, works in the whole 64bit range. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/kernel32/tests/virtual.c | 72 +++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 474955630fd..c6a9f34954a 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -228,10 +228,12 @@ static void test_VirtualAllocEx(void) static void test_VirtualAlloc(void) { void *addr1, *addr2; + UINT_PTR mask; DWORD old_prot; MEMORY_BASIC_INFORMATION info; NTSTATUS status; SIZE_T size; + BOOL is_wow64; SetLastError(0xdeadbeef); addr1 = VirtualAlloc(0, 0, MEM_RESERVE, PAGE_NOACCESS); @@ -473,6 +475,76 @@ static void test_VirtualAlloc(void) ok(status == STATUS_INVALID_PARAMETER_3, "NtAllocateVirtualMemory returned %08x\n", status); if (status == STATUS_SUCCESS) ok(VirtualFree(addr2, 0, MEM_RELEASE), "VirtualFree failed\n"); + /* 1 zero bits should zero 63-31 upper bits */ + size = 0x1000; + addr2 = NULL; + mask = 0xffffffff8000ffffull; + status = pNtAllocateVirtualMemory(GetCurrentProcess(), &addr2, 1, &size, + MEM_RESERVE | MEM_COMMIT, PAGE_READWRITE); + ok((status == STATUS_SUCCESS || broken(status == STATUS_INVALID_PARAMETER_3) /* winxp */) + && ((uintptr_t)addr2 & mask) == 0, + "NtAllocateVirtualMemory returned %08x, addr2: %x, mask: %x\n", status, addr2, mask); + if (status == STATUS_SUCCESS) + { + size = 0; + status = pNtFreeVirtualMemory(GetCurrentProcess(), &addr2, &size, MEM_RELEASE); + ok(status == STATUS_SUCCESS, "pNtFreeVirtualMemory return %08x, addr2: %p\n", status, addr2); + } + + /* 2 zero bits should zero 63-31 upper bits */ + size = 0x1000; + addr2 = NULL; + mask = 0xffffffff8000ffffull; + status = pNtAllocateVirtualMemory(GetCurrentProcess(), &addr2, 2, &size, + MEM_RESERVE | MEM_COMMIT, PAGE_READWRITE); + ok(status == STATUS_SUCCESS && ((uintptr_t)addr2 & mask) == 0, + "NtAllocateVirtualMemory returned %08x, addr2: %x, mask: %x\n", status, addr2, mask); + if (status == STATUS_SUCCESS) + { + size = 0; + status = pNtFreeVirtualMemory(GetCurrentProcess(), &addr2, &size, MEM_RELEASE); + ok(status == STATUS_SUCCESS, "pNtFreeVirtualMemory return %08x, addr2: %p\n", status, addr2); + } + + /* 15 zero bits should zero 63-17 upper bits */ + size = 0x1000; + addr2 = NULL; + mask = 0xfffffffffff7ffffull; + status = pNtAllocateVirtualMemory(GetCurrentProcess(), &addr2, 15, &size, + MEM_RESERVE | MEM_COMMIT, PAGE_READWRITE); + ok((status == STATUS_SUCCESS || status == STATUS_NO_MEMORY) && ((uintptr_t)addr2 & mask) == 0, + "NtAllocateVirtualMemory returned %08x, addr2: %x, mask: %x\n", status, addr2, mask); + if (status == STATUS_SUCCESS) + { + size = 0; + status = pNtFreeVirtualMemory(GetCurrentProcess(), &addr2, &size, MEM_RELEASE); + ok(status == STATUS_SUCCESS, "pNtFreeVirtualMemory return %08x, addr2: %p\n", status, addr2); + } + + /* zero bits > 31 should be considered as bitmask on 64bit and WoW64 */ + size = 0x1000; + addr2 = NULL; + mask = 0xffffffff7000ffffull; + status = pNtAllocateVirtualMemory(GetCurrentProcess(), &addr2, 0x1fffffff, &size, + MEM_RESERVE | MEM_COMMIT, PAGE_READWRITE); + + if (sizeof(void *) == sizeof(int) && (!pIsWow64Process || + !pIsWow64Process( GetCurrentProcess(), &is_wow64 ) || !is_wow64)) + { + ok(status == STATUS_INVALID_PARAMETER_3, "NtAllocateVirtualMemory returned %08x\n", status); + } + else + { + ok(status == STATUS_SUCCESS && ((uintptr_t)addr2 & mask) == 0, + "NtAllocateVirtualMemory returned %08x, addr2: %x, mask: %x\n", status, addr2, mask); + if (status == STATUS_SUCCESS) + { + size = 0; + status = pNtFreeVirtualMemory(GetCurrentProcess(), &addr2, &size, MEM_RELEASE); + ok(status == STATUS_SUCCESS, "pNtFreeVirtualMemory return %08x, addr2: %p\n", status, addr2); + } + } + /* AT_ROUND_TO_PAGE flag is not supported for VirtualAlloc */ SetLastError(0xdeadbeef); addr2 = VirtualAlloc(addr1, 0x1000, MEM_RESERVE | MEM_COMMIT | AT_ROUND_TO_PAGE, PAGE_EXECUTE_READWRITE); -- 2.20.1

2 3

[PATCH 4/4] advapi32: Implement REG_MUI_STRING_TRUNCATE flag.
by Akihiro Sagawa 24 May '19

24 May '19

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/advapi32/registry.c | 21 ++++++++++++++++----- dlls/advapi32/tests/registry.c | 12 ++++++------ 2 files changed, 22 insertions(+), 11 deletions(-)

1 0

[PATCH 3/4] advapi32: Factor out load_mui_string().
by Akihiro Sagawa 24 May '19

24 May '19

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/advapi32/registry.c | 81 ++++++++++++++++++++++++++++++------------------ 1 file changed, 51 insertions(+), 30 deletions(-)

1 0

[PATCH 2/4] advapi32/tests: Add RegLoadMUIString tests with REG_MUI_STRING_TRUNCATE flag.
by Akihiro Sagawa 24 May '19

24 May '19

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/advapi32/tests/registry.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)

1 0

[PATCH 1/4] kernel32: Add traces to time zone functions.
by Akihiro Sagawa 24 May '19

24 May '19

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/kernel32/time.c | 7 +++++++ 1 file changed, 7 insertions(+)

1 0

[PATCH 1/3] kernelbase: Add remaining URL functions.
by Nikolay Sivov 24 May '19

24 May '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/kernelbase/kernelbase.spec | 12 +- dlls/kernelbase/path.c | 403 ++++++++++++++++++++++++++++++++ 2 files changed, 409 insertions(+), 6 deletions(-) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 193af89b43..7f48169745 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -771,7 +771,7 @@ @ stdcall GlobalMemoryStatusEx(ptr) kernel32.GlobalMemoryStatusEx # @ stub GuardCheckLongJumpTarget # @ stub HasPolicyForegroundProcessingCompletedInternal -@ stdcall HashData(ptr long ptr long) shlwapi.HashData +@ stdcall HashData(ptr long ptr long) @ stdcall HeapAlloc(long long long) kernel32.HeapAlloc @ stdcall HeapCompact(long long) kernel32.HeapCompact @ stdcall HeapCreate(long long long) kernel32.HeapCreate @@ -861,7 +861,7 @@ # @ stub IsDeveloperModePolicyApplied # @ stub IsEnclaveTypeSupported # @ stub IsGlobalizationUserSettingsKeyRedirected -@ stdcall IsInternetESCEnabled() shlwapi.IsInternetESCEnabled +@ stdcall IsInternetESCEnabled() @ stub IsNLSDefinedString @ stdcall IsNormalizedString(long wstr long) kernel32.IsNormalizedString # @ stub IsProcessCritical @@ -1632,8 +1632,8 @@ @ stdcall UrlApplySchemeW(wstr ptr ptr long) @ stdcall UrlCanonicalizeA(str ptr ptr long) @ stdcall UrlCanonicalizeW(wstr ptr ptr long) -@ stdcall UrlCombineA(str str ptr ptr long) shlwapi.UrlCombineA -@ stdcall UrlCombineW(wstr wstr ptr ptr long) shlwapi.UrlCombineW +@ stdcall UrlCombineA(str str ptr ptr long) +@ stdcall UrlCombineW(wstr wstr ptr ptr long) @ stdcall UrlCompareA(str str long) @ stdcall UrlCompareW(wstr wstr long) @ stdcall UrlCreateFromPathA(str ptr ptr long) @@ -1645,8 +1645,8 @@ @ stdcall UrlGetLocationW(wstr) @ stdcall UrlGetPartA(str ptr ptr long long) @ stdcall UrlGetPartW(wstr ptr ptr long long) -@ stdcall UrlHashA(str ptr long) shlwapi.UrlHashA -@ stdcall UrlHashW(wstr ptr long) shlwapi.UrlHashW +@ stdcall UrlHashA(str ptr long) +@ stdcall UrlHashW(wstr ptr long) @ stdcall UrlIsA(str long) @ stdcall UrlIsNoHistoryA(str) @ stdcall UrlIsNoHistoryW(wstr) diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index 76f8610956..767ae43d5a 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -36,6 +36,26 @@ WINE_DEFAULT_DEBUG_CHANNEL(path); static const char hexDigits[] = "0123456789ABCDEF"; +static const unsigned char hashdata_lookup[256] = +{ + 0x01, 0x0e, 0x6e, 0x19, 0x61, 0xae, 0x84, 0x77, 0x8a, 0xaa, 0x7d, 0x76, 0x1b, 0xe9, 0x8c, 0x33, + 0x57, 0xc5, 0xb1, 0x6b, 0xea, 0xa9, 0x38, 0x44, 0x1e, 0x07, 0xad, 0x49, 0xbc, 0x28, 0x24, 0x41, + 0x31, 0xd5, 0x68, 0xbe, 0x39, 0xd3, 0x94, 0xdf, 0x30, 0x73, 0x0f, 0x02, 0x43, 0xba, 0xd2, 0x1c, + 0x0c, 0xb5, 0x67, 0x46, 0x16, 0x3a, 0x4b, 0x4e, 0xb7, 0xa7, 0xee, 0x9d, 0x7c, 0x93, 0xac, 0x90, + 0xb0, 0xa1, 0x8d, 0x56, 0x3c, 0x42, 0x80, 0x53, 0x9c, 0xf1, 0x4f, 0x2e, 0xa8, 0xc6, 0x29, 0xfe, + 0xb2, 0x55, 0xfd, 0xed, 0xfa, 0x9a, 0x85, 0x58, 0x23, 0xce, 0x5f, 0x74, 0xfc, 0xc0, 0x36, 0xdd, + 0x66, 0xda, 0xff, 0xf0, 0x52, 0x6a, 0x9e, 0xc9, 0x3d, 0x03, 0x59, 0x09, 0x2a, 0x9b, 0x9f, 0x5d, + 0xa6, 0x50, 0x32, 0x22, 0xaf, 0xc3, 0x64, 0x63, 0x1a, 0x96, 0x10, 0x91, 0x04, 0x21, 0x08, 0xbd, + 0x79, 0x40, 0x4d, 0x48, 0xd0, 0xf5, 0x82, 0x7a, 0x8f, 0x37, 0x69, 0x86, 0x1d, 0xa4, 0xb9, 0xc2, + 0xc1, 0xef, 0x65, 0xf2, 0x05, 0xab, 0x7e, 0x0b, 0x4a, 0x3b, 0x89, 0xe4, 0x6c, 0xbf, 0xe8, 0x8b, + 0x06, 0x18, 0x51, 0x14, 0x7f, 0x11, 0x5b, 0x5c, 0xfb, 0x97, 0xe1, 0xcf, 0x15, 0x62, 0x71, 0x70, + 0x54, 0xe2, 0x12, 0xd6, 0xc7, 0xbb, 0x0d, 0x20, 0x5e, 0xdc, 0xe0, 0xd4, 0xf7, 0xcc, 0xc4, 0x2b, + 0xf9, 0xec, 0x2d, 0xf4, 0x6f, 0xb6, 0x99, 0x88, 0x81, 0x5a, 0xd9, 0xca, 0x13, 0xa5, 0xe7, 0x47, + 0xe6, 0x8e, 0x60, 0xe3, 0x3e, 0xb3, 0xf6, 0x72, 0xa2, 0x35, 0xa0, 0xd7, 0xcd, 0xb4, 0x2f, 0x6d, + 0x2c, 0x26, 0x1f, 0x95, 0x87, 0x00, 0xd8, 0x34, 0x3f, 0x17, 0x25, 0x45, 0x27, 0x75, 0x92, 0xb8, + 0xa3, 0xc8, 0xde, 0xeb, 0xf8, 0xf3, 0xdb, 0x0a, 0x98, 0x83, 0x7b, 0xe5, 0xcb, 0x4c, 0x78, 0xd1, +}; + struct parsed_url { const WCHAR *scheme; /* [out] start of scheme */ @@ -4699,3 +4719,386 @@ HRESULT WINAPI UrlCreateFromPathW(const WCHAR *path, WCHAR *url, DWORD *url_len, return hr; } + +HRESULT WINAPI UrlCombineA(const char *base, const char *relative, char *combined, DWORD *combined_len, DWORD flags) +{ + WCHAR *baseW, *relativeW, *combinedW; + DWORD len, len2; + HRESULT hr; + + TRACE("%s, %s, %d, %#x\n", debugstr_a(base), debugstr_a(relative), combined_len ? *combined_len : 0, flags); + + if (!base || !relative || !combined_len) + return E_INVALIDARG; + + baseW = heap_alloc(3 * INTERNET_MAX_URL_LENGTH * sizeof(WCHAR)); + relativeW = baseW + INTERNET_MAX_URL_LENGTH; + combinedW = relativeW + INTERNET_MAX_URL_LENGTH; + + MultiByteToWideChar(CP_ACP, 0, base, -1, baseW, INTERNET_MAX_URL_LENGTH); + MultiByteToWideChar(CP_ACP, 0, relative, -1, relativeW, INTERNET_MAX_URL_LENGTH); + len = *combined_len; + + hr = UrlCombineW(baseW, relativeW, combined ? combinedW : NULL, &len, flags); + if (hr != S_OK) + { + *combined_len = len; + heap_free(baseW); + return hr; + } + + len2 = WideCharToMultiByte(CP_ACP, 0, combinedW, len, NULL, 0, NULL, NULL); + if (len2 > *combined_len) + { + *combined_len = len2; + heap_free(baseW); + return E_POINTER; + } + WideCharToMultiByte(CP_ACP, 0, combinedW, len+1, combined, *combined_len + 1, NULL, NULL); + *combined_len = len2; + heap_free(baseW); + return S_OK; +} + +HRESULT WINAPI UrlCombineW(const WCHAR *baseW, const WCHAR *relativeW, WCHAR *combined, DWORD *combined_len, DWORD flags) +{ + static const WCHAR myfilestr[] = {'f','i','l','e',':','/','/','/','\0'}; + static const WCHAR fragquerystr[] = {'#','?',0}; + DWORD i, len, process_case = 0, myflags, sizeloc = 0; + LPWSTR work, preliminary, mbase, mrelative; + PARSEDURLW base, relative; + HRESULT hr; + + TRACE("%s, %s, %d, %#x\n", debugstr_w(baseW), debugstr_w(relativeW), combined_len ? *combined_len : 0, flags); + + if (!baseW || !relativeW || !combined_len) + return E_INVALIDARG; + + base.cbSize = sizeof(base); + relative.cbSize = sizeof(relative); + + /* Get space for duplicates of the input and the output */ + preliminary = heap_alloc(3 * INTERNET_MAX_URL_LENGTH * sizeof(WCHAR)); + mbase = preliminary + INTERNET_MAX_URL_LENGTH; + mrelative = mbase + INTERNET_MAX_URL_LENGTH; + *preliminary = '\0'; + + /* Canonicalize the base input prior to looking for the scheme */ + myflags = flags & (URL_DONT_SIMPLIFY | URL_UNESCAPE); + len = INTERNET_MAX_URL_LENGTH; + UrlCanonicalizeW(baseW, mbase, &len, myflags); + + /* Canonicalize the relative input prior to looking for the scheme */ + len = INTERNET_MAX_URL_LENGTH; + UrlCanonicalizeW(relativeW, mrelative, &len, myflags); + + /* See if the base has a scheme */ + if (ParseURLW(mbase, &base) != S_OK) + { + /* If base has no scheme return relative. */ + TRACE("no scheme detected in Base\n"); + process_case = 1; + } + else do + { + BOOL manual_search = FALSE; + + work = (LPWSTR)base.pszProtocol; + for (i = 0; i < base.cchProtocol; ++i) + work[i] = tolowerW(work[i]); + + /* mk is a special case */ + if (base.nScheme == URL_SCHEME_MK) + { + static const WCHAR wsz[] = {':',':',0}; + WCHAR *ptr = strstrW(base.pszSuffix, wsz); + if (ptr) + { + int delta; + + ptr += 2; + delta = ptr-base.pszSuffix; + base.cchProtocol += delta; + base.pszSuffix += delta; + base.cchSuffix -= delta; + } + } + else + { + /* get size of location field (if it exists) */ + work = (LPWSTR)base.pszSuffix; + sizeloc = 0; + if (*work++ == '/') + { + if (*work++ == '/') + { + /* At this point have start of location and + * it ends at next '/' or end of string. + */ + while (*work && (*work != '/')) work++; + sizeloc = (DWORD)(work - base.pszSuffix); + } + } + } + + /* If there is a '?', then the remaining part can only contain a + * query string or fragment, so start looking for the last leaf + * from the '?'. Otherwise, if there is a '#' and the characters + * immediately preceding it are ".htm[l]", then begin looking for + * the last leaf starting from the '#'. Otherwise the '#' is not + * meaningful and just start looking from the end. */ + if ((work = strpbrkW(base.pszSuffix + sizeloc, fragquerystr))) + { + static const WCHAR htmlW[] = {'.','h','t','m','l'}; + static const WCHAR htmW[] = {'.','h','t','m'}; + + if (*work == '?' || base.nScheme == URL_SCHEME_HTTP || base.nScheme == URL_SCHEME_HTTPS) + manual_search = TRUE; + else if (work - base.pszSuffix > ARRAY_SIZE(htmW)) + { + work -= ARRAY_SIZE(htmW); + if (!strncmpiW(work, htmW, ARRAY_SIZE(htmW))) + manual_search = TRUE; + work += ARRAY_SIZE(htmW); + } + + if (!manual_search && work - base.pszSuffix > ARRAY_SIZE(htmlW)) + { + work -= ARRAY_SIZE(htmlW); + if (!strncmpiW(work, htmlW, ARRAY_SIZE(htmlW))) + manual_search = TRUE; + work += ARRAY_SIZE(htmlW); + } + } + + if (manual_search) + { + /* search backwards starting from the current position */ + while (*work != '/' && work > base.pszSuffix + sizeloc) + --work; + base.cchSuffix = work - base.pszSuffix + 1; + } + else + { + /* search backwards starting from the end of the string */ + work = strrchrW((base.pszSuffix+sizeloc), '/'); + if (work) + { + len = (DWORD)(work - base.pszSuffix + 1); + base.cchSuffix = len; + } + else + base.cchSuffix = sizeloc; + } + + /* + * At this point: + * .pszSuffix points to location (starting with '//') + * .cchSuffix length of location (above) and rest less the last + * leaf (if any) + * sizeloc length of location (above) up to but not including + * the last '/' + */ + + if (ParseURLW(mrelative, &relative) != S_OK) + { + /* No scheme in relative */ + TRACE("no scheme detected in Relative\n"); + relative.pszSuffix = mrelative; /* case 3,4,5 depends on this */ + relative.cchSuffix = strlenW(mrelative); + if (*relativeW == ':') + { + /* Case that is either left alone or uses base. */ + if (flags & URL_PLUGGABLE_PROTOCOL) + { + process_case = 5; + break; + } + process_case = 1; + break; + } + if (isalnumW(*mrelative) && *(mrelative + 1) == ':') + { + /* case that becomes "file:///" */ + strcpyW(preliminary, myfilestr); + process_case = 1; + break; + } + if (*mrelative == '/' && *(mrelative+1) == '/') + { + /* Relative has location and the rest. */ + process_case = 3; + break; + } + if (*mrelative == '/') + { + /* Relative is root to location. */ + process_case = 4; + break; + } + if (*mrelative == '#') + { + if (!(work = strchrW(base.pszSuffix+base.cchSuffix, '#'))) + work = (LPWSTR)base.pszSuffix + strlenW(base.pszSuffix); + + memcpy(preliminary, base.pszProtocol, (work-base.pszProtocol)*sizeof(WCHAR)); + preliminary[work-base.pszProtocol] = '\0'; + process_case = 1; + break; + } + process_case = (*base.pszSuffix == '/' || base.nScheme == URL_SCHEME_MK) ? 5 : 3; + break; + } + else + { + work = (LPWSTR)relative.pszProtocol; + for (i = 0; i < relative.cchProtocol; ++i) + work[i] = tolowerW(work[i]); + } + + /* Handle cases where relative has scheme. */ + if ((base.cchProtocol == relative.cchProtocol) && !strncmpW(base.pszProtocol, relative.pszProtocol, base.cchProtocol)) + { + /* since the schemes are the same */ + if (*relative.pszSuffix == '/' && *(relative.pszSuffix+1) == '/') + { + /* Relative replaces location and what follows. */ + process_case = 3; + break; + } + if (*relative.pszSuffix == '/') + { + /* Relative is root to location */ + process_case = 4; + break; + } + /* replace either just location if base's location starts with a + * slash or otherwise everything */ + process_case = (*base.pszSuffix == '/') ? 5 : 1; + break; + } + + if (*relative.pszSuffix == '/' && *(relative.pszSuffix+1) == '/') + { + /* Relative replaces scheme, location, and following and handles PLUGGABLE */ + process_case = 2; + break; + } + process_case = 1; + break; + } while (FALSE); /* a little trick to allow easy exit from nested if's */ + + hr = S_OK; + switch (process_case) + { + case 1: + /* Return relative appended to whatever is in combined (which may the string "file:///" */ + strcatW(preliminary, mrelative); + break; + + case 2: + /* Relative replaces scheme and location */ + strcpyW(preliminary, mrelative); + break; + + case 3: + /* Return the base scheme with relative. Basically keeps the scheme and replaces the domain and following. */ + memcpy(preliminary, base.pszProtocol, (base.cchProtocol + 1)*sizeof(WCHAR)); + work = preliminary + base.cchProtocol + 1; + strcpyW(work, relative.pszSuffix); + break; + + case 4: + /* Return the base scheme and location but everything after the location is relative. (Replace document from root on.) */ + memcpy(preliminary, base.pszProtocol, (base.cchProtocol+1+sizeloc)*sizeof(WCHAR)); + work = preliminary + base.cchProtocol + 1 + sizeloc; + if (flags & URL_PLUGGABLE_PROTOCOL) + *(work++) = '/'; + strcpyW(work, relative.pszSuffix); + break; + + case 5: + /* Return the base without its document (if any) and append relative after its scheme. */ + memcpy(preliminary, base.pszProtocol, (base.cchProtocol + 1 + base.cchSuffix)*sizeof(WCHAR)); + work = preliminary + base.cchProtocol + 1 + base.cchSuffix - 1; + if (*work++ != '/') + *(work++) = '/'; + strcpyW(work, relative.pszSuffix); + break; + + default: + FIXME("Unexpected case %d.\n", process_case); + hr = E_INVALIDARG; + } + + if (hr == S_OK) + { + /* Reuse mrelative as temp storage as it's already allocated and not needed anymore */ + if (*combined_len == 0) + *combined_len = 1; + hr = UrlCanonicalizeW(preliminary, mrelative, combined_len, flags & ~URL_FILE_USE_PATHURL); + if (SUCCEEDED(hr) && combined) + lstrcpyW(combined, mrelative); + + TRACE("return-%d len=%d, %s\n", process_case, *combined_len, debugstr_w(combined)); + } + + heap_free(preliminary); + return hr; +} + +HRESULT WINAPI HashData(const unsigned char *src, DWORD src_len, unsigned char *dest, DWORD dest_len) +{ + INT src_count = src_len - 1, dest_count = dest_len - 1; + + if (!src || !dest) + return E_INVALIDARG; + + while (dest_count >= 0) + { + dest[dest_count] = (dest_count & 0xff); + dest_count--; + } + + while (src_count >= 0) + { + dest_count = dest_len - 1; + while (dest_count >= 0) + { + dest[dest_count] = hashdata_lookup[src[src_count] ^ dest[dest_count]]; + dest_count--; + } + src_count--; + } + + return S_OK; +} + +HRESULT WINAPI UrlHashA(const char *url, unsigned char *dest, DWORD dest_len) +{ + if (IsBadStringPtrA(url, -1) || IsBadWritePtr(dest, dest_len)) + return E_INVALIDARG; + + HashData((const BYTE *)url, (int)strlen(url), dest, dest_len); + return S_OK; +} + +HRESULT WINAPI UrlHashW(const WCHAR *url, unsigned char *dest, DWORD dest_len) +{ + char urlA[MAX_PATH]; + + TRACE("%s, %p, %d\n", debugstr_w(url), dest, dest_len); + + if (IsBadStringPtrW(url, -1) || IsBadWritePtr(dest, dest_len)) + return E_INVALIDARG; + + WideCharToMultiByte(CP_ACP, 0, url, -1, urlA, MAX_PATH, NULL, NULL); + HashData((const BYTE *)urlA, (int)strlen(urlA), dest, dest_len); + return S_OK; +} + +BOOL WINAPI IsInternetESCEnabled(void) +{ + FIXME(": stub\n"); + return FALSE; +} -- 2.20.1

1 2

[PATCH 3/3] server: Always block overlapped device requests until driver dispatches them.
by Jacek Caban 24 May '19

24 May '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/file.c | 2 +- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 18 ------------------ server/async.c | 21 +++++++++++++++++++++ server/device.c | 9 ++++++--- server/file.h | 1 + 5 files changed, 29 insertions(+), 22 deletions(-)

2 2

[PATCH v2 1/2] ntdll/directory: Add support for EXT4 case folding per directory
by Gabriel Ivăncescu 24 May '19

24 May '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47099 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- v2: Fix mistake with fstatat return value. This patch just adds support for the case-insensitive attribute on ext4 with newer kernels -- so it should be safe for upstream (barring stylistic and other changes). It has some conditional processing for perf reasons. Checking for the EXT4_CASEFOLD_FL attribute involves an ioctl, which operates on file descriptors, while all the former checks operated directly on the dir name (e.g. statfs). Obviously, it's best to avoid looking up the directory multiple times (also for correctness, so it refers to the same dir). So in the case that we *do* use a file descriptor, then use it (e.g. fstatfs) everywhere. However, to avoid a perf regression or downgrade on systems that don't support the EXT2_IOC_GETFLAGS ioctl (e.g. MacOS, FreeBSD), we continue using statfs and the like directly, this shaves off two syscalls (open/close). But in the case the EXT4_CASEFOLD_FL is not supported on Linux (i.e. on current kernels) or the directory doesn't have it (think of dirs outside drive_c), this will unfortunately involve a bit more syscalls now, because it has to open() and close() the fd. I'd really like if the fstatfs and fstatat can stay if we do use the fd, to somehow make it less impactful on current systems, so they won't have to lookup the directory again. So that's basically why the GET_DIR_CASE_SENSITIVITY_USE_FD constant is there. One last thing: as it is now, on Linux, we always set the EXT4_CASEFOLD_FL flag ourselves since it does no harm even if it's not supported. Thus, I can of course remove the .ciopfs old code and keep just the fstatat() call by assuming we always use fd on Linux, if you prefer it that way. I didn't remove it because I didn't want to "hardcode" this assumption, so I'm waiting for feedback. dlls/ntdll/directory.c | 66 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 63 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index bbdbbe9..e5fa48d 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -115,6 +115,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(file); /* just in case... */ #undef VFAT_IOCTL_READDIR_BOTH +#undef EXT2_IOC_GETFLAGS +#undef EXT4_CASEFOLD_FL #ifdef linux @@ -130,6 +132,12 @@ typedef struct /* Define the VFAT ioctl to get both short and long file names */ #define VFAT_IOCTL_READDIR_BOTH _IOR('r', 1, KERNEL_DIRENT [2] ) +/* Define the ext2 ioctl for handling extra attributes */ +#define EXT2_IOC_GETFLAGS _IOR('f', 1, long) + +/* Case-insensitivity attribute */ +#define EXT4_CASEFOLD_FL 0x40000000 + #ifndef O_DIRECTORY # define O_DIRECTORY 0200000 /* must be directory */ #endif @@ -977,6 +985,25 @@ static char *get_device_mount_point( dev_t dev ) } +/*********************************************************************** + * get_dir_case_sensitivity_ioctl + * + * Checks if the specified directory is case sensitive or not. Uses ioctl(2). + */ +static int get_dir_case_sensitivity_ioctl(int fd) +{ +#define GET_DIR_CASE_SENSITIVITY_USE_FD 1 +#if defined(EXT2_IOC_GETFLAGS) && defined(EXT4_CASEFOLD_FL) + int flags; + if (ioctl(fd, EXT2_IOC_GETFLAGS, &flags) != -1 && (flags & EXT4_CASEFOLD_FL)) + return FALSE; +#else +#undef GET_DIR_CASE_SENSITIVITY_USE_FD +#define GET_DIR_CASE_SENSITIVITY_USE_FD 0 +#endif + return -1; +} + #if defined(HAVE_GETATTRLIST) && defined(ATTR_VOL_CAPABILITIES) && \ defined(VOL_CAPABILITIES_FORMAT) && defined(VOL_CAP_FMT_CASE_SENSITIVE) @@ -1115,12 +1142,16 @@ static int get_dir_case_sensitivity_attr( const char *dir ) * Checks if the volume containing the specified directory is case * sensitive or not. Uses statfs(2) or statvfs(2). */ -static BOOLEAN get_dir_case_sensitivity_stat( const char *dir ) +static BOOLEAN get_dir_case_sensitivity_stat( const char *dir, int fd ) { #if defined(__APPLE__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) struct statfs stfs; +#if GET_DIR_CASE_SENSITIVITY_USE_FD + if (fstatfs( fd, &stfs ) == -1) return FALSE; +#else if (statfs( dir, &stfs ) == -1) return FALSE; +#endif /* Assume these file systems are always case insensitive on Mac OS. * For FreeBSD, only assume CIOPFS is case insensitive (AFAIK, Mac OS * is the only UNIX that supports case-insensitive lookup). @@ -1157,7 +1188,11 @@ static BOOLEAN get_dir_case_sensitivity_stat( const char *dir ) #elif defined(__NetBSD__) struct statvfs stfs; +#if GET_DIR_CASE_SENSITIVITY_USE_FD + if (fstatvfs( fd, &stfs ) == -1) return FALSE; +#else if (statvfs( dir, &stfs ) == -1) return FALSE; +#endif /* Only assume CIOPFS is case insensitive. */ if (strcmp( stfs.f_fstypename, "fusefs" ) || strncmp( stfs.f_mntfromname, "ciopfs", 5 )) @@ -1170,7 +1205,11 @@ static BOOLEAN get_dir_case_sensitivity_stat( const char *dir ) char *cifile; /* Only assume CIOPFS is case insensitive. */ +#if GET_DIR_CASE_SENSITIVITY_USE_FD + if (fstatfs( fd, &stfs ) == -1) return FALSE; +#else if (statfs( dir, &stfs ) == -1) return FALSE; +#endif if (stfs.f_type != 0x65735546 /* FUSE_SUPER_MAGIC */) return TRUE; /* Normally, we'd have to parse the mtab to find out exactly what @@ -1180,6 +1219,13 @@ static BOOLEAN get_dir_case_sensitivity_stat( const char *dir ) * This will break if somebody puts a file named ".ciopfs" in a non- * CIOPFS directory. */ + if (GET_DIR_CASE_SENSITIVITY_USE_FD) + { + if (fstatat( fd, ".ciopfs", &st, AT_NO_AUTOMOUNT ) == 0) + return FALSE; + return TRUE; + } + cifile = RtlAllocateHeap( GetProcessHeap(), 0, strlen( dir )+sizeof("/.ciopfs") ); if (!cifile) return TRUE; strcpy( cifile, dir ); @@ -1205,12 +1251,26 @@ static BOOLEAN get_dir_case_sensitivity_stat( const char *dir ) */ static BOOLEAN get_dir_case_sensitivity( const char *dir ) { + int case_sensitive, fd = -1; + #if defined(HAVE_GETATTRLIST) && defined(ATTR_VOL_CAPABILITIES) && \ defined(VOL_CAPABILITIES_FORMAT) && defined(VOL_CAP_FMT_CASE_SENSITIVE) - int case_sensitive = get_dir_case_sensitivity_attr( dir ); + case_sensitive = get_dir_case_sensitivity_attr( dir ); if (case_sensitive != -1) return case_sensitive; #endif - return get_dir_case_sensitivity_stat( dir ); + + if (GET_DIR_CASE_SENSITIVITY_USE_FD) + { + if ((fd = open(dir, O_RDONLY | O_NONBLOCK | O_LARGEFILE)) == -1) + return TRUE; + if ((case_sensitive = get_dir_case_sensitivity_ioctl(fd)) != -1) + goto end; + } + case_sensitive = get_dir_case_sensitivity_stat(dir, fd); + +end: + if (GET_DIR_CASE_SENSITIVITY_USE_FD) close(fd); + return case_sensitive; } -- 2.21.0

3 6

Syscall thunks in ntoskrnl
by Derek Lesho 24 May '19

24 May '19

Hello, I have written some prototype patches that allow EasyAntiCheat.sys's syscall scanner to succeed, but the aren't clean and I'd like some direction on which path I should take for the patch I end up submitting here. Somebody on github has gone through the effort of reverse engineering this check already, and you can find that code here: https://github.com/adrianyy/EACReversing/blob/master/EasyAntiCheat.sys/serv… As you can see, the driver reads a ntoskrnl's Zw* syscall export, replaces the syscall id operand with the one it found from reading ntdll, and scans the section for the right appropriate Zw function. For this to work, we need to have the ids from the syscall thunks that exist in ntdll (on staging from the fake-dlls patchset) match the ids in the thunks we add for the Zw* functions in ntoskrnl. There are a couple ways of doing this, at first I manually put in the assembly to see if it would work, and it did, but that's a clean solution. My current solution adds all Zw exports from ntdll.spec to ntoskrnl.exe.spec and has winebuild generate the exports in alphabetical order, but this solution requires that ntdll.spec and ntoskrnl.exe.spec be kept in sync, which I'm not sure is a good idea. Another solution I thought of is having a syscall table be read by winebuild, so that ntoskrnl and ntdll can export different syscall numbers and still share the same ids, but maybe this is over-engineering the problem. Thank you all for your input!

2 2

[PATCH v2 2/2] winemac.drv: Activate window when restoring from iconic state.
by Zhiyi Zhang 24 May '19

24 May '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winemac.drv/window.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index b7a09634ee..605c0c87f1 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -2452,6 +2452,7 @@ void macdrv_window_did_unminimize(HWND hwnd) { TRACE("restoring win %p/%p\n", hwnd, data->cocoa_window); release_win_data(data); + SetActiveWindow(hwnd); SendMessageW(hwnd, WM_SYSCOMMAND, SC_RESTORE, 0); return; } -- 2.20.1

1 0

[PATCH v3 1/8] gdi32/tests: Add D3DKMTOpenAdapterFromGdiDisplayName tests.
by Zhiyi Zhang 24 May '19

24 May '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v3: Fix a memory leak. Remove unnecessary function availability checks. Supersede 165111~165120 dlls/gdi32/tests/Makefile.in | 1 + dlls/gdi32/tests/driver.c | 105 +++++++++++++++++++++++++++++++++++ 2 files changed, 106 insertions(+) create mode 100644 dlls/gdi32/tests/driver.c diff --git a/dlls/gdi32/tests/Makefile.in b/dlls/gdi32/tests/Makefile.in index 90d7223f47..9d82c278e9 100644 --- a/dlls/gdi32/tests/Makefile.in +++ b/dlls/gdi32/tests/Makefile.in @@ -7,6 +7,7 @@ C_SRCS = \ clipping.c \ dc.c \ dib.c \ + driver.c \ font.c \ gdiobj.c \ generated.c \ diff --git a/dlls/gdi32/tests/driver.c b/dlls/gdi32/tests/driver.c new file mode 100644 index 0000000000..aa3044f824 --- /dev/null +++ b/dlls/gdi32/tests/driver.c @@ -0,0 +1,105 @@ +/* + * Unit test suite for kernel mode graphics driver + * + * Copyright 2019 Zhiyi Zhang + * + * 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 <stdarg.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" +#include "winternl.h" +#include "ddk/d3dkmthk.h" + +#include "wine/test.h" + +static const WCHAR display1W[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y','1',0}; + +static NTSTATUS (WINAPI *pD3DKMTCloseAdapter)(const D3DKMT_CLOSEADAPTER *); +static NTSTATUS (WINAPI *pD3DKMTOpenAdapterFromGdiDisplayName)(D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME *); + +static void test_D3DKMTOpenAdapterFromGdiDisplayName(void) +{ + D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME open_adapter_gdi_desc; + D3DKMT_CLOSEADAPTER close_adapter_desc; + DISPLAY_DEVICEW display_device = {sizeof(display_device)}; + NTSTATUS status; + DWORD i; + + /* STATUS_PROCEDURE_NOT_FOUND on vista~win7. We need to pass a valid parameter here to check for + * STATUS_PROCEDURE_NOT_FOUND because invalid parameter will return STATUS_UNSUCCESSFUL */ + lstrcpyW(open_adapter_gdi_desc.DeviceName, display1W); + if (!pD3DKMTOpenAdapterFromGdiDisplayName + || pD3DKMTOpenAdapterFromGdiDisplayName(&open_adapter_gdi_desc) == STATUS_PROCEDURE_NOT_FOUND) + { + skip("D3DKMTOpenAdapterFromGdiDisplayName() is unavailable.\n"); + return; + } + + close_adapter_desc.hAdapter = open_adapter_gdi_desc.hAdapter; + status = pD3DKMTCloseAdapter(&close_adapter_desc); + ok(status == STATUS_SUCCESS, "Got unexpected return code %#x.\n", status); + + /* Invalid parameters */ + status = pD3DKMTOpenAdapterFromGdiDisplayName(NULL); + ok(status == STATUS_UNSUCCESSFUL, "Got unexpected return code %#x.\n", status); + + memset(&open_adapter_gdi_desc, 0, sizeof(open_adapter_gdi_desc)); + status = pD3DKMTOpenAdapterFromGdiDisplayName(&open_adapter_gdi_desc); + ok(status == STATUS_UNSUCCESSFUL, "Got unexpected return code %#x.\n", status); + + /* Open adapter */ + for (i = 0; EnumDisplayDevicesW(NULL, i, &display_device, 0); ++i) + { + lstrcpyW(open_adapter_gdi_desc.DeviceName, display_device.DeviceName); + status = pD3DKMTOpenAdapterFromGdiDisplayName(&open_adapter_gdi_desc); + if (display_device.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP) + ok(status == STATUS_SUCCESS, "Got unexpected return code %#x.\n", status); + else + { + ok(status == STATUS_UNSUCCESSFUL, "Got unexpected return code %#x.\n", status); + continue; + } + + ok(open_adapter_gdi_desc.hAdapter, "Expect not null.\n"); + if (display_device.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE) + ok(open_adapter_gdi_desc.VidPnSourceId == 0, "Got unexpected value %#x.\n", + open_adapter_gdi_desc.VidPnSourceId); + else + ok(open_adapter_gdi_desc.VidPnSourceId, "Got unexpected value %#x.\n", open_adapter_gdi_desc.VidPnSourceId); + + close_adapter_desc.hAdapter = open_adapter_gdi_desc.hAdapter; + status = pD3DKMTCloseAdapter(&close_adapter_desc); + ok(status == STATUS_SUCCESS, "Got unexpected return code %#x.\n", status); + } +} + +START_TEST(driver) +{ + HMODULE gdi32 = LoadLibraryA("gdi32.dll"); + + pD3DKMTCloseAdapter = (void *)GetProcAddress(gdi32, "D3DKMTCloseAdapter"); + pD3DKMTOpenAdapterFromGdiDisplayName = (void *)GetProcAddress(gdi32, "D3DKMTOpenAdapterFromGdiDisplayName"); + + test_D3DKMTOpenAdapterFromGdiDisplayName(); + + FreeLibrary(gdi32); +} -- 2.20.1

2 1

[PATCH v4 7/7] gdi32/tests: Add D3DKMTSetVidPnSourceOwner tests.
by Huw Davies 24 May '19

24 May '19

From: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/tests/driver.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/dlls/gdi32/tests/driver.c b/dlls/gdi32/tests/driver.c index ef9a7ae855..d8ae0f89ce 100644 --- a/dlls/gdi32/tests/driver.c +++ b/dlls/gdi32/tests/driver.c @@ -590,6 +590,22 @@ static void test_D3DKMTCheckVidPnExclusiveOwnership(void) ok(status == STATUS_SUCCESS, "Got unexpected return code %#x.\n", status); } +static void test_D3DKMTSetVidPnSourceOwner(void) +{ + D3DKMT_SETVIDPNSOURCEOWNER set_owner_desc = {0}; + NTSTATUS status; + + if (!pD3DKMTSetVidPnSourceOwner || pD3DKMTSetVidPnSourceOwner(&set_owner_desc) == STATUS_PROCEDURE_NOT_FOUND) + { + skip("D3DKMTSetVidPnSourceOwner() is unavailable.\n"); + return; + } + + /* Invalid parameters */ + status = pD3DKMTSetVidPnSourceOwner(&set_owner_desc); + ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); +} + START_TEST(driver) { HMODULE gdi32 = GetModuleHandleA("gdi32.dll"); @@ -608,4 +624,5 @@ START_TEST(driver) test_D3DKMTCreateDevice(); test_D3DKMTDestroyDevice(); test_D3DKMTCheckVidPnExclusiveOwnership(); + test_D3DKMTSetVidPnSourceOwner(); } -- 2.18.0

1 0

[PATCH v4 6/7] gdi32/tests: Add D3DKMTCheckVidPnExclusiveOwnership tests.
by Huw Davies 24 May '19

24 May '19

From: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/tests/driver.c | 345 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 345 insertions(+) diff --git a/dlls/gdi32/tests/driver.c b/dlls/gdi32/tests/driver.c index 7d7fce3845..ef9a7ae855 100644 --- a/dlls/gdi32/tests/driver.c +++ b/dlls/gdi32/tests/driver.c @@ -33,11 +33,13 @@ static const WCHAR display1W[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y','1',0}; +static NTSTATUS (WINAPI *pD3DKMTCheckVidPnExclusiveOwnership)(const D3DKMT_CHECKVIDPNEXCLUSIVEOWNERSHIP *); static NTSTATUS (WINAPI *pD3DKMTCloseAdapter)(const D3DKMT_CLOSEADAPTER *); static NTSTATUS (WINAPI *pD3DKMTCreateDevice)(D3DKMT_CREATEDEVICE *); static NTSTATUS (WINAPI *pD3DKMTDestroyDevice)(const D3DKMT_DESTROYDEVICE *); static NTSTATUS (WINAPI *pD3DKMTOpenAdapterFromGdiDisplayName)(D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME *); static NTSTATUS (WINAPI *pD3DKMTOpenAdapterFromHdc)(D3DKMT_OPENADAPTERFROMHDC *); +static NTSTATUS (WINAPI *pD3DKMTSetVidPnSourceOwner)(const D3DKMT_SETVIDPNSOURCEOWNER *); static void test_D3DKMTOpenAdapterFromGdiDisplayName(void) { @@ -248,19 +250,362 @@ static void test_D3DKMTDestroyDevice(void) todo_wine ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); } +static void test_D3DKMTCheckVidPnExclusiveOwnership(void) +{ + static const DWORD timeout = 1000; + static const DWORD wait_step = 100; + D3DKMT_CREATEDEVICE create_device_desc, create_device_desc2; + D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME open_adapter_gdi_desc; + D3DKMT_CHECKVIDPNEXCLUSIVEOWNERSHIP check_owner_desc; + D3DKMT_DESTROYDEVICE destroy_device_desc; + D3DKMT_CLOSEADAPTER close_adapter_desc; + D3DKMT_VIDPNSOURCEOWNER_TYPE owner_type; + D3DKMT_SETVIDPNSOURCEOWNER set_owner_desc; + DWORD total_time; + NTSTATUS status; + INT i; + + /* Test cases using single device */ + static const struct test_data1 + { + D3DKMT_VIDPNSOURCEOWNER_TYPE owner_type; + NTSTATUS expected_set_status; + NTSTATUS expected_check_status; + } tests1[] = { + /* 0 */ + {-1, STATUS_SUCCESS, STATUS_SUCCESS}, + {D3DKMT_VIDPNSOURCEOWNER_UNOWNED, STATUS_SUCCESS, STATUS_SUCCESS}, + {-1, STATUS_SUCCESS, STATUS_SUCCESS}, + {D3DKMT_VIDPNSOURCEOWNER_SHARED, STATUS_GRAPHICS_VIDPN_SOURCE_IN_USE, STATUS_SUCCESS}, + {-1, STATUS_SUCCESS, STATUS_SUCCESS}, + {D3DKMT_VIDPNSOURCEOWNER_EXCLUSIVE, STATUS_SUCCESS, STATUS_GRAPHICS_PRESENT_OCCLUDED}, + {-1, STATUS_SUCCESS, STATUS_SUCCESS}, + {D3DKMT_VIDPNSOURCEOWNER_EXCLUSIVEGDI, STATUS_INVALID_PARAMETER, STATUS_SUCCESS}, + {-1, STATUS_SUCCESS, STATUS_SUCCESS}, + {D3DKMT_VIDPNSOURCEOWNER_EMULATED, STATUS_SUCCESS, STATUS_SUCCESS}, + /* 10 */ + {-1, STATUS_SUCCESS, STATUS_SUCCESS}, + {D3DKMT_VIDPNSOURCEOWNER_UNOWNED, STATUS_SUCCESS, STATUS_SUCCESS}, + {D3DKMT_VIDPNSOURCEOWNER_UNOWNED, STATUS_SUCCESS, STATUS_SUCCESS}, + {-1, STATUS_SUCCESS, STATUS_SUCCESS}, + {D3DKMT_VIDPNSOURCEOWNER_UNOWNED, STATUS_SUCCESS, STATUS_SUCCESS}, + {D3DKMT_VIDPNSOURCEOWNER_SHARED, STATUS_GRAPHICS_VIDPN_SOURCE_IN_USE, STATUS_SUCCESS}, + {-1, STATUS_SUCCESS, STATUS_SUCCESS}, + {D3DKMT_VIDPNSOURCEOWNER_UNOWNED, STATUS_SUCCESS, STATUS_SUCCESS}, + {D3DKMT_VIDPNSOURCEOWNER_EXCLUSIVE, STATUS_SUCCESS, STATUS_GRAPHICS_PRESENT_OCCLUDED}, + {-1, STATUS_SUCCESS, STATUS_SUCCESS}, + /* 20 */ + {D3DKMT_VIDPNSOURCEOWNER_UNOWNED, STATUS_SUCCESS, STATUS_SUCCESS}, + {D3DKMT_VIDPNSOURCEOWNER_EMULATED, STATUS_SUCCESS, STATUS_SUCCESS}, + {-1, STATUS_SUCCESS, STATUS_SUCCESS}, + {D3DKMT_VIDPNSOURCEOWNER_SHARED, STATUS_GRAPHICS_VIDPN_SOURCE_IN_USE, STATUS_SUCCESS}, + {D3DKMT_VIDPNSOURCEOWNER_UNOWNED, STATUS_SUCCESS, STATUS_SUCCESS}, + {-1, STATUS_SUCCESS, STATUS_SUCCESS}, + {D3DKMT_VIDPNSOURCEOWNER_SHARED, STATUS_GRAPHICS_VIDPN_SOURCE_IN_USE, STATUS_SUCCESS}, + {D3DKMT_VIDPNSOURCEOWNER_SHARED, STATUS_GRAPHICS_VIDPN_SOURCE_IN_USE, STATUS_SUCCESS}, + {-1, STATUS_SUCCESS, STATUS_SUCCESS}, + {D3DKMT_VIDPNSOURCEOWNER_SHARED, STATUS_GRAPHICS_VIDPN_SOURCE_IN_USE, STATUS_SUCCESS}, + /* 30 */ + {D3DKMT_VIDPNSOURCEOWNER_EXCLUSIVE, STATUS_SUCCESS, STATUS_GRAPHICS_PRESENT_OCCLUDED}, + {-1, STATUS_SUCCESS, STATUS_SUCCESS}, + {D3DKMT_VIDPNSOURCEOWNER_SHARED, STATUS_GRAPHICS_VIDPN_SOURCE_IN_USE, STATUS_SUCCESS}, + {D3DKMT_VIDPNSOURCEOWNER_EMULATED, STATUS_SUCCESS, STATUS_SUCCESS}, + {-1, STATUS_SUCCESS, STATUS_SUCCESS}, + {D3DKMT_VIDPNSOURCEOWNER_EXCLUSIVE, STATUS_SUCCESS, STATUS_GRAPHICS_PRESENT_OCCLUDED}, + {D3DKMT_VIDPNSOURCEOWNER_UNOWNED, STATUS_SUCCESS, STATUS_SUCCESS}, + {-1, STATUS_SUCCESS, STATUS_SUCCESS}, + {D3DKMT_VIDPNSOURCEOWNER_EXCLUSIVE, STATUS_SUCCESS, STATUS_GRAPHICS_PRESENT_OCCLUDED}, + {D3DKMT_VIDPNSOURCEOWNER_SHARED, STATUS_INVALID_PARAMETER, STATUS_GRAPHICS_PRESENT_OCCLUDED}, + /* 40 */ + {-1, STATUS_SUCCESS, STATUS_SUCCESS}, + {D3DKMT_VIDPNSOURCEOWNER_EXCLUSIVE, STATUS_SUCCESS, STATUS_GRAPHICS_PRESENT_OCCLUDED}, + {D3DKMT_VIDPNSOURCEOWNER_EXCLUSIVE, STATUS_SUCCESS, STATUS_GRAPHICS_PRESENT_OCCLUDED}, + {-1, STATUS_SUCCESS, STATUS_SUCCESS}, + {D3DKMT_VIDPNSOURCEOWNER_EXCLUSIVE, STATUS_SUCCESS, STATUS_GRAPHICS_PRESENT_OCCLUDED}, + {D3DKMT_VIDPNSOURCEOWNER_EMULATED, STATUS_INVALID_PARAMETER, STATUS_GRAPHICS_PRESENT_OCCLUDED}, + {-1, STATUS_SUCCESS, STATUS_SUCCESS}, + {D3DKMT_VIDPNSOURCEOWNER_EMULATED, STATUS_SUCCESS, STATUS_SUCCESS}, + {D3DKMT_VIDPNSOURCEOWNER_UNOWNED, STATUS_SUCCESS, STATUS_SUCCESS}, + {-1, STATUS_SUCCESS, STATUS_SUCCESS}, + /* 50 */ + {D3DKMT_VIDPNSOURCEOWNER_EMULATED, STATUS_SUCCESS, STATUS_SUCCESS}, + {D3DKMT_VIDPNSOURCEOWNER_SHARED, STATUS_GRAPHICS_VIDPN_SOURCE_IN_USE, STATUS_SUCCESS}, + {-1, STATUS_SUCCESS, STATUS_SUCCESS}, + {D3DKMT_VIDPNSOURCEOWNER_EMULATED, STATUS_SUCCESS, STATUS_SUCCESS}, + {D3DKMT_VIDPNSOURCEOWNER_EXCLUSIVE, STATUS_INVALID_PARAMETER, STATUS_SUCCESS}, + {-1, STATUS_SUCCESS, STATUS_SUCCESS}, + {D3DKMT_VIDPNSOURCEOWNER_EMULATED, STATUS_SUCCESS, STATUS_SUCCESS}, + {D3DKMT_VIDPNSOURCEOWNER_EMULATED, STATUS_SUCCESS, STATUS_SUCCESS}, + {-1, STATUS_SUCCESS, STATUS_SUCCESS}, + {D3DKMT_VIDPNSOURCEOWNER_EMULATED + 1, STATUS_INVALID_PARAMETER, STATUS_SUCCESS}, + }; + + /* Test cases using two devices consecutively */ + static const struct test_data2 + { + D3DKMT_VIDPNSOURCEOWNER_TYPE set_owner_type1; + D3DKMT_VIDPNSOURCEOWNER_TYPE set_owner_type2; + NTSTATUS expected_set_status1; + NTSTATUS expected_set_status2; + NTSTATUS expected_check_status; + } tests2[] = { + /* 0 */ + {D3DKMT_VIDPNSOURCEOWNER_UNOWNED, D3DKMT_VIDPNSOURCEOWNER_UNOWNED, STATUS_SUCCESS, STATUS_SUCCESS, STATUS_SUCCESS}, + {D3DKMT_VIDPNSOURCEOWNER_UNOWNED, D3DKMT_VIDPNSOURCEOWNER_SHARED, STATUS_SUCCESS, STATUS_GRAPHICS_VIDPN_SOURCE_IN_USE, STATUS_SUCCESS}, + {D3DKMT_VIDPNSOURCEOWNER_UNOWNED, D3DKMT_VIDPNSOURCEOWNER_EXCLUSIVE, STATUS_SUCCESS, STATUS_SUCCESS, STATUS_GRAPHICS_PRESENT_OCCLUDED}, + {D3DKMT_VIDPNSOURCEOWNER_UNOWNED, D3DKMT_VIDPNSOURCEOWNER_EMULATED, STATUS_SUCCESS, STATUS_SUCCESS, STATUS_SUCCESS}, + {D3DKMT_VIDPNSOURCEOWNER_SHARED, D3DKMT_VIDPNSOURCEOWNER_UNOWNED, STATUS_GRAPHICS_VIDPN_SOURCE_IN_USE, STATUS_SUCCESS, STATUS_SUCCESS}, + {D3DKMT_VIDPNSOURCEOWNER_SHARED, D3DKMT_VIDPNSOURCEOWNER_SHARED, STATUS_GRAPHICS_VIDPN_SOURCE_IN_USE, STATUS_GRAPHICS_VIDPN_SOURCE_IN_USE, STATUS_SUCCESS}, + {D3DKMT_VIDPNSOURCEOWNER_SHARED, D3DKMT_VIDPNSOURCEOWNER_EXCLUSIVE, STATUS_GRAPHICS_VIDPN_SOURCE_IN_USE, STATUS_SUCCESS, STATUS_GRAPHICS_PRESENT_OCCLUDED}, + {D3DKMT_VIDPNSOURCEOWNER_SHARED, D3DKMT_VIDPNSOURCEOWNER_EMULATED, STATUS_GRAPHICS_VIDPN_SOURCE_IN_USE, STATUS_SUCCESS, STATUS_SUCCESS}, + {D3DKMT_VIDPNSOURCEOWNER_EXCLUSIVE, D3DKMT_VIDPNSOURCEOWNER_UNOWNED, STATUS_SUCCESS, STATUS_SUCCESS, STATUS_GRAPHICS_PRESENT_OCCLUDED}, + {D3DKMT_VIDPNSOURCEOWNER_EXCLUSIVE, D3DKMT_VIDPNSOURCEOWNER_SHARED, STATUS_SUCCESS, STATUS_GRAPHICS_VIDPN_SOURCE_IN_USE, STATUS_GRAPHICS_PRESENT_OCCLUDED}, + /* 10 */ + {D3DKMT_VIDPNSOURCEOWNER_EXCLUSIVE, D3DKMT_VIDPNSOURCEOWNER_EXCLUSIVE, STATUS_SUCCESS, STATUS_GRAPHICS_VIDPN_SOURCE_IN_USE, STATUS_GRAPHICS_PRESENT_OCCLUDED}, + {D3DKMT_VIDPNSOURCEOWNER_EXCLUSIVE, D3DKMT_VIDPNSOURCEOWNER_EMULATED, STATUS_SUCCESS, STATUS_GRAPHICS_VIDPN_SOURCE_IN_USE, STATUS_GRAPHICS_PRESENT_OCCLUDED}, + {D3DKMT_VIDPNSOURCEOWNER_EMULATED, D3DKMT_VIDPNSOURCEOWNER_UNOWNED, STATUS_SUCCESS, STATUS_SUCCESS, STATUS_SUCCESS}, + {D3DKMT_VIDPNSOURCEOWNER_EMULATED, D3DKMT_VIDPNSOURCEOWNER_SHARED, STATUS_SUCCESS, STATUS_GRAPHICS_VIDPN_SOURCE_IN_USE, STATUS_SUCCESS}, + {D3DKMT_VIDPNSOURCEOWNER_EMULATED, D3DKMT_VIDPNSOURCEOWNER_EXCLUSIVE, STATUS_SUCCESS, STATUS_GRAPHICS_VIDPN_SOURCE_IN_USE, STATUS_SUCCESS}, + {D3DKMT_VIDPNSOURCEOWNER_EMULATED, D3DKMT_VIDPNSOURCEOWNER_EMULATED, STATUS_SUCCESS, STATUS_GRAPHICS_VIDPN_SOURCE_IN_USE, STATUS_SUCCESS}, + {-1, D3DKMT_VIDPNSOURCEOWNER_EXCLUSIVE, -1, STATUS_SUCCESS, STATUS_GRAPHICS_PRESENT_OCCLUDED}, + {D3DKMT_VIDPNSOURCEOWNER_EXCLUSIVE, -1, STATUS_SUCCESS, STATUS_SUCCESS, STATUS_GRAPHICS_PRESENT_OCCLUDED}, + }; + + if (!pD3DKMTCheckVidPnExclusiveOwnership || pD3DKMTCheckVidPnExclusiveOwnership(NULL) == STATUS_PROCEDURE_NOT_FOUND) + { + skip("D3DKMTCheckVidPnExclusiveOwnership() is unavailable.\n"); + return; + } + + /* Invalid parameters */ + status = pD3DKMTCheckVidPnExclusiveOwnership(NULL); + ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); + + memset(&check_owner_desc, 0, sizeof(check_owner_desc)); + status = pD3DKMTCheckVidPnExclusiveOwnership(&check_owner_desc); + ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); + + /* Test cases */ + lstrcpyW(open_adapter_gdi_desc.DeviceName, display1W); + status = pD3DKMTOpenAdapterFromGdiDisplayName(&open_adapter_gdi_desc); + ok(status == STATUS_SUCCESS, "Got unexpected return code %#x.\n", status); + + memset(&create_device_desc, 0, sizeof(create_device_desc)); + create_device_desc.hAdapter = open_adapter_gdi_desc.hAdapter; + status = pD3DKMTCreateDevice(&create_device_desc); + ok(status == STATUS_SUCCESS, "Got unexpected return code %#x.\n", status); + + check_owner_desc.hAdapter = open_adapter_gdi_desc.hAdapter; + check_owner_desc.VidPnSourceId = open_adapter_gdi_desc.VidPnSourceId; + for (i = 0; i < ARRAY_SIZE(tests1); ++i) + { + set_owner_desc.hDevice = create_device_desc.hDevice; + if (tests1[i].owner_type != -1) + { + owner_type = tests1[i].owner_type; + set_owner_desc.pType = &owner_type; + set_owner_desc.pVidPnSourceId = &open_adapter_gdi_desc.VidPnSourceId; + set_owner_desc.VidPnSourceCount = 1; + } + else + { + set_owner_desc.pType = NULL; + set_owner_desc.pVidPnSourceId = NULL; + set_owner_desc.VidPnSourceCount = 0; + } + status = pD3DKMTSetVidPnSourceOwner(&set_owner_desc); + ok(status == tests1[i].expected_set_status || + /* win8 doesn't support D3DKMT_VIDPNSOURCEOWNER_EMULATED */ + (status == STATUS_INVALID_PARAMETER && tests1[i].owner_type == D3DKMT_VIDPNSOURCEOWNER_EMULATED) + || (status == STATUS_SUCCESS && tests1[i].owner_type == D3DKMT_VIDPNSOURCEOWNER_EXCLUSIVE + && tests1[i - 1].owner_type == D3DKMT_VIDPNSOURCEOWNER_EMULATED), + "Got unexpected return code %#x at test %d.\n", status, i); + + status = pD3DKMTCheckVidPnExclusiveOwnership(&check_owner_desc); + /* If don't sleep, D3DKMTCheckVidPnExclusiveOwnership may get STATUS_GRAPHICS_PRESENT_UNOCCLUDED instead + * of STATUS_SUCCESS */ + if ((tests1[i].expected_check_status == STATUS_SUCCESS && status == STATUS_GRAPHICS_PRESENT_UNOCCLUDED)) + { + total_time = 0; + do + { + Sleep(wait_step); + total_time += wait_step; + status = pD3DKMTCheckVidPnExclusiveOwnership(&check_owner_desc); + } while (status == STATUS_GRAPHICS_PRESENT_UNOCCLUDED && total_time < timeout); + } + ok(status == tests1[i].expected_check_status + || (status == STATUS_GRAPHICS_PRESENT_OCCLUDED /* win8 */ + && tests1[i].owner_type == D3DKMT_VIDPNSOURCEOWNER_EXCLUSIVE + && tests1[i - 1].owner_type == D3DKMT_VIDPNSOURCEOWNER_EMULATED), + "Got unexpected return code %#x at test %d.\n", status, i); + } + + /* Set owner and unset owner using different devices */ + memset(&create_device_desc2, 0, sizeof(create_device_desc2)); + create_device_desc2.hAdapter = open_adapter_gdi_desc.hAdapter; + status = pD3DKMTCreateDevice(&create_device_desc2); + ok(status == STATUS_SUCCESS, "Got unexpected return code %#x.\n", status); + + /* Set owner with the first device */ + set_owner_desc.hDevice = create_device_desc.hDevice; + owner_type = D3DKMT_VIDPNSOURCEOWNER_EXCLUSIVE; + set_owner_desc.pType = &owner_type; + set_owner_desc.pVidPnSourceId = &open_adapter_gdi_desc.VidPnSourceId; + set_owner_desc.VidPnSourceCount = 1; + status = pD3DKMTSetVidPnSourceOwner(&set_owner_desc); + ok(status == STATUS_SUCCESS, "Got unexpected return code %#x.\n", status); + status = pD3DKMTCheckVidPnExclusiveOwnership(&check_owner_desc); + ok(status == STATUS_GRAPHICS_PRESENT_OCCLUDED, "Got unexpected return code %#x.\n", status); + + /* Unset owner with the second device */ + set_owner_desc.hDevice = create_device_desc2.hDevice; + set_owner_desc.pType = NULL; + set_owner_desc.pVidPnSourceId = NULL; + set_owner_desc.VidPnSourceCount = 0; + status = pD3DKMTSetVidPnSourceOwner(&set_owner_desc); + ok(status == STATUS_SUCCESS, "Got unexpected return code %#x.\n", status); + status = pD3DKMTCheckVidPnExclusiveOwnership(&check_owner_desc); + /* No effect */ + ok(status == STATUS_GRAPHICS_PRESENT_OCCLUDED, "Got unexpected return code %#x.\n", status); + + /* Unset owner with the first device */ + set_owner_desc.hDevice = create_device_desc.hDevice; + set_owner_desc.pType = NULL; + set_owner_desc.pVidPnSourceId = NULL; + set_owner_desc.VidPnSourceCount = 0; + status = pD3DKMTSetVidPnSourceOwner(&set_owner_desc); + ok(status == STATUS_SUCCESS, "Got unexpected return code %#x.\n", status); + status = pD3DKMTCheckVidPnExclusiveOwnership(&check_owner_desc); + /* Proves that the correct device is needed to unset owner */ + ok(status == STATUS_SUCCESS || status == STATUS_GRAPHICS_PRESENT_UNOCCLUDED, "Got unexpected return code %#x.\n", + status); + + /* Set owner with the first device, set owner again with the second device */ + for (i = 0; i < ARRAY_SIZE(tests2); ++i) + { + if (tests2[i].set_owner_type1 != -1) + { + set_owner_desc.hDevice = create_device_desc.hDevice; + owner_type = tests2[i].set_owner_type1; + set_owner_desc.pType = &owner_type; + set_owner_desc.pVidPnSourceId = &open_adapter_gdi_desc.VidPnSourceId; + set_owner_desc.VidPnSourceCount = 1; + /* If don't sleep, D3DKMTSetVidPnSourceOwner may return STATUS_OK for D3DKMT_VIDPNSOURCEOWNER_SHARED. + * Other owner type doesn't seems to be affected. */ + if (tests2[i].set_owner_type1 == D3DKMT_VIDPNSOURCEOWNER_SHARED) + Sleep(timeout); + status = pD3DKMTSetVidPnSourceOwner(&set_owner_desc); + ok(status == tests2[i].expected_set_status1 + || (status == STATUS_INVALID_PARAMETER /* win8 */ + && tests2[i].set_owner_type1 == D3DKMT_VIDPNSOURCEOWNER_EMULATED), + "Got unexpected return code %#x at test %d.\n", status, i); + } + + if (tests2[i].set_owner_type2 != -1) + { + set_owner_desc.hDevice = create_device_desc2.hDevice; + owner_type = tests2[i].set_owner_type2; + set_owner_desc.pType = &owner_type; + set_owner_desc.pVidPnSourceId = &open_adapter_gdi_desc.VidPnSourceId; + set_owner_desc.VidPnSourceCount = 1; + status = pD3DKMTSetVidPnSourceOwner(&set_owner_desc); + ok(status == tests2[i].expected_set_status2 + || (status == STATUS_INVALID_PARAMETER /* win8 */ + && tests2[i].set_owner_type2 == D3DKMT_VIDPNSOURCEOWNER_EMULATED) + || (status == STATUS_SUCCESS && tests2[i].set_owner_type1 == D3DKMT_VIDPNSOURCEOWNER_EMULATED + && tests2[i].set_owner_type2 == D3DKMT_VIDPNSOURCEOWNER_EXCLUSIVE), + "Got unexpected return code %#x at test %d.\n", status, i); + } + + status = pD3DKMTCheckVidPnExclusiveOwnership(&check_owner_desc); + if ((tests2[i].expected_check_status == STATUS_SUCCESS && status == STATUS_GRAPHICS_PRESENT_UNOCCLUDED)) + { + total_time = 0; + do + { + Sleep(wait_step); + total_time += wait_step; + status = pD3DKMTCheckVidPnExclusiveOwnership(&check_owner_desc); + } while (status == STATUS_GRAPHICS_PRESENT_UNOCCLUDED && total_time < timeout); + } + ok(status == tests2[i].expected_check_status + || (status == STATUS_GRAPHICS_PRESENT_OCCLUDED /* win8 */ + && tests2[i].set_owner_type2 == D3DKMT_VIDPNSOURCEOWNER_EXCLUSIVE + && tests2[i].set_owner_type1 == D3DKMT_VIDPNSOURCEOWNER_EMULATED), + "Got unexpected return code %#x at test %d.\n", status, i); + + /* Unset owner with first device */ + if (tests2[i].set_owner_type1 != -1) + { + set_owner_desc.hDevice = create_device_desc.hDevice; + set_owner_desc.pType = NULL; + set_owner_desc.pVidPnSourceId = NULL; + set_owner_desc.VidPnSourceCount = 0; + status = pD3DKMTSetVidPnSourceOwner(&set_owner_desc); + ok(status == STATUS_SUCCESS, "Got unexpected return code %#x at test %d.\n", status, i); + } + + /* Unset owner with second device */ + if (tests2[i].set_owner_type2 != -1) + { + set_owner_desc.hDevice = create_device_desc2.hDevice; + set_owner_desc.pType = NULL; + set_owner_desc.pVidPnSourceId = NULL; + set_owner_desc.VidPnSourceCount = 0; + status = pD3DKMTSetVidPnSourceOwner(&set_owner_desc); + ok(status == STATUS_SUCCESS, "Got unexpected return code %#x at test %d.\n", status, i); + } + } + + /* Destroy devices holding ownership */ + set_owner_desc.hDevice = create_device_desc.hDevice; + owner_type = D3DKMT_VIDPNSOURCEOWNER_EXCLUSIVE; + set_owner_desc.pType = &owner_type; + set_owner_desc.pVidPnSourceId = &open_adapter_gdi_desc.VidPnSourceId; + set_owner_desc.VidPnSourceCount = 1; + status = pD3DKMTSetVidPnSourceOwner(&set_owner_desc); + ok(status == STATUS_SUCCESS, "Got unexpected return code %#x.\n", status); + + destroy_device_desc.hDevice = create_device_desc.hDevice; + status = pD3DKMTDestroyDevice(&destroy_device_desc); + ok(status == STATUS_SUCCESS, "Got unexpected return code %#x.\n", status); + + set_owner_desc.hDevice = create_device_desc2.hDevice; + owner_type = D3DKMT_VIDPNSOURCEOWNER_EXCLUSIVE; + set_owner_desc.pType = &owner_type; + set_owner_desc.pVidPnSourceId = &open_adapter_gdi_desc.VidPnSourceId; + set_owner_desc.VidPnSourceCount = 1; + status = pD3DKMTSetVidPnSourceOwner(&set_owner_desc); + /* So ownership is released when device is destroyed. otherwise the return code should be + * STATUS_GRAPHICS_VIDPN_SOURCE_IN_USE */ + ok(status == STATUS_SUCCESS, "Got unexpected return code %#x.\n", status); + + destroy_device_desc.hDevice = create_device_desc2.hDevice; + status = pD3DKMTDestroyDevice(&destroy_device_desc); + ok(status == STATUS_SUCCESS, "Got unexpected return code %#x.\n", status); + + close_adapter_desc.hAdapter = open_adapter_gdi_desc.hAdapter; + status = pD3DKMTCloseAdapter(&close_adapter_desc); + ok(status == STATUS_SUCCESS, "Got unexpected return code %#x.\n", status); +} + START_TEST(driver) { HMODULE gdi32 = GetModuleHandleA("gdi32.dll"); + pD3DKMTCheckVidPnExclusiveOwnership = (void *)GetProcAddress(gdi32, "D3DKMTCheckVidPnExclusiveOwnership"); pD3DKMTCloseAdapter = (void *)GetProcAddress(gdi32, "D3DKMTCloseAdapter"); pD3DKMTCreateDevice = (void *)GetProcAddress(gdi32, "D3DKMTCreateDevice"); pD3DKMTDestroyDevice = (void *)GetProcAddress(gdi32, "D3DKMTDestroyDevice"); pD3DKMTOpenAdapterFromGdiDisplayName = (void *)GetProcAddress(gdi32, "D3DKMTOpenAdapterFromGdiDisplayName"); pD3DKMTOpenAdapterFromHdc = (void *)GetProcAddress(gdi32, "D3DKMTOpenAdapterFromHdc"); + pD3DKMTSetVidPnSourceOwner = (void *)GetProcAddress(gdi32, "D3DKMTSetVidPnSourceOwner"); test_D3DKMTOpenAdapterFromGdiDisplayName(); test_D3DKMTOpenAdapterFromHdc(); test_D3DKMTCloseAdapter(); test_D3DKMTCreateDevice(); test_D3DKMTDestroyDevice(); + test_D3DKMTCheckVidPnExclusiveOwnership(); } -- 2.18.0

1 0

[PATCH v4 5/7] gdi32/tests: Add D3DKMTDestroyDevice tests.
by Huw Davies 24 May '19

24 May '19

From: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/tests/driver.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/dlls/gdi32/tests/driver.c b/dlls/gdi32/tests/driver.c index 97b7ed7cbd..7d7fce3845 100644 --- a/dlls/gdi32/tests/driver.c +++ b/dlls/gdi32/tests/driver.c @@ -228,6 +228,26 @@ static void test_D3DKMTCreateDevice(void) ok(status == STATUS_SUCCESS, "Got unexpected return code %#x.\n", status); } +static void test_D3DKMTDestroyDevice(void) +{ + D3DKMT_DESTROYDEVICE destroy_device_desc; + NTSTATUS status; + + if (!pD3DKMTDestroyDevice || pD3DKMTDestroyDevice(NULL) == STATUS_PROCEDURE_NOT_FOUND) + { + skip("D3DKMTDestroyDevice() is unavailable.\n"); + return; + } + + /* Invalid parameters */ + status = pD3DKMTDestroyDevice(NULL); + todo_wine ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); + + memset(&destroy_device_desc, 0, sizeof(destroy_device_desc)); + status = pD3DKMTDestroyDevice(&destroy_device_desc); + todo_wine ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); +} + START_TEST(driver) { HMODULE gdi32 = GetModuleHandleA("gdi32.dll"); @@ -242,4 +262,5 @@ START_TEST(driver) test_D3DKMTOpenAdapterFromHdc(); test_D3DKMTCloseAdapter(); test_D3DKMTCreateDevice(); + test_D3DKMTDestroyDevice(); } -- 2.18.0

1 0

[PATCH v4 4/7] gdi32/tests: Add D3DKMTCreateDevice tests.
by Huw Davies 24 May '19

24 May '19

From: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/tests/driver.c | 52 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/dlls/gdi32/tests/driver.c b/dlls/gdi32/tests/driver.c index 204ecb0fbe..97b7ed7cbd 100644 --- a/dlls/gdi32/tests/driver.c +++ b/dlls/gdi32/tests/driver.c @@ -34,6 +34,8 @@ static const WCHAR display1W[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y','1',0}; static NTSTATUS (WINAPI *pD3DKMTCloseAdapter)(const D3DKMT_CLOSEADAPTER *); +static NTSTATUS (WINAPI *pD3DKMTCreateDevice)(D3DKMT_CREATEDEVICE *); +static NTSTATUS (WINAPI *pD3DKMTDestroyDevice)(const D3DKMT_DESTROYDEVICE *); static NTSTATUS (WINAPI *pD3DKMTOpenAdapterFromGdiDisplayName)(D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME *); static NTSTATUS (WINAPI *pD3DKMTOpenAdapterFromHdc)(D3DKMT_OPENADAPTERFROMHDC *); @@ -179,15 +181,65 @@ static void test_D3DKMTCloseAdapter(void) todo_wine ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); } +static void test_D3DKMTCreateDevice(void) +{ + D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME open_adapter_gdi_desc; + D3DKMT_CREATEDEVICE create_device_desc; + D3DKMT_CLOSEADAPTER close_adapter_desc; + D3DKMT_DESTROYDEVICE destroy_device_desc; + NTSTATUS status; + + if (!pD3DKMTCreateDevice || pD3DKMTCreateDevice(NULL) == STATUS_PROCEDURE_NOT_FOUND) + { + skip("D3DKMTCreateDevice() or D3DKMTDestroyDevice() is unavailable.\n"); + return; + } + + /* Invalid parameters */ + status = pD3DKMTCreateDevice(NULL); + ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); + + memset(&create_device_desc, 0, sizeof(create_device_desc)); + status = pD3DKMTCreateDevice(&create_device_desc); + ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); + + lstrcpyW(open_adapter_gdi_desc.DeviceName, display1W); + status = pD3DKMTOpenAdapterFromGdiDisplayName(&open_adapter_gdi_desc); + ok(status == STATUS_SUCCESS, "Got unexpected return code %#x.\n", status); + + /* Create device */ + create_device_desc.hAdapter = open_adapter_gdi_desc.hAdapter; + status = pD3DKMTCreateDevice(&create_device_desc); + ok(status == STATUS_SUCCESS, "Got unexpected return code %#x.\n", status); + ok(create_device_desc.hDevice, "Expect not null.\n"); + ok(create_device_desc.pCommandBuffer == NULL, "Expect null.\n"); + ok(create_device_desc.CommandBufferSize == 0, "Got wrong value %#x.\n", create_device_desc.CommandBufferSize); + ok(create_device_desc.pAllocationList == NULL, "Expect null.\n"); + ok(create_device_desc.AllocationListSize == 0, "Got wrong value %#x.\n", create_device_desc.AllocationListSize); + ok(create_device_desc.pPatchLocationList == NULL, "Expect null.\n"); + ok(create_device_desc.PatchLocationListSize == 0, "Got wrong value %#x.\n", create_device_desc.PatchLocationListSize); + + destroy_device_desc.hDevice = create_device_desc.hDevice; + status = pD3DKMTDestroyDevice(&destroy_device_desc); + ok(status == STATUS_SUCCESS, "Got unexpected return code %#x.\n", status); + + close_adapter_desc.hAdapter = open_adapter_gdi_desc.hAdapter; + status = pD3DKMTCloseAdapter(&close_adapter_desc); + ok(status == STATUS_SUCCESS, "Got unexpected return code %#x.\n", status); +} + START_TEST(driver) { HMODULE gdi32 = GetModuleHandleA("gdi32.dll"); pD3DKMTCloseAdapter = (void *)GetProcAddress(gdi32, "D3DKMTCloseAdapter"); + pD3DKMTCreateDevice = (void *)GetProcAddress(gdi32, "D3DKMTCreateDevice"); + pD3DKMTDestroyDevice = (void *)GetProcAddress(gdi32, "D3DKMTDestroyDevice"); pD3DKMTOpenAdapterFromGdiDisplayName = (void *)GetProcAddress(gdi32, "D3DKMTOpenAdapterFromGdiDisplayName"); pD3DKMTOpenAdapterFromHdc = (void *)GetProcAddress(gdi32, "D3DKMTOpenAdapterFromHdc"); test_D3DKMTOpenAdapterFromGdiDisplayName(); test_D3DKMTOpenAdapterFromHdc(); test_D3DKMTCloseAdapter(); + test_D3DKMTCreateDevice(); } -- 2.18.0

1 0

[PATCH v4 3/7] gdi32/tests: Add D3DKMTCloseAdapter tests.
by Huw Davies 24 May '19

24 May '19

From: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/tests/driver.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/dlls/gdi32/tests/driver.c b/dlls/gdi32/tests/driver.c index 30b02073ac..204ecb0fbe 100644 --- a/dlls/gdi32/tests/driver.c +++ b/dlls/gdi32/tests/driver.c @@ -159,6 +159,26 @@ static void test_D3DKMTOpenAdapterFromHdc(void) } } +static void test_D3DKMTCloseAdapter(void) +{ + D3DKMT_CLOSEADAPTER close_adapter_desc; + NTSTATUS status; + + if (!pD3DKMTCloseAdapter || pD3DKMTCloseAdapter(NULL) == STATUS_PROCEDURE_NOT_FOUND) + { + win_skip("D3DKMTCloseAdapter() is unavailable.\n"); + return; + } + + /* Invalid parameters */ + status = pD3DKMTCloseAdapter(NULL); + todo_wine ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); + + memset(&close_adapter_desc, 0, sizeof(close_adapter_desc)); + status = pD3DKMTCloseAdapter(&close_adapter_desc); + todo_wine ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); +} + START_TEST(driver) { HMODULE gdi32 = GetModuleHandleA("gdi32.dll"); @@ -169,4 +189,5 @@ START_TEST(driver) test_D3DKMTOpenAdapterFromGdiDisplayName(); test_D3DKMTOpenAdapterFromHdc(); + test_D3DKMTCloseAdapter(); } -- 2.18.0

1 0

[PATCH v4 2/7] gdi32/tests: Add D3DKMTOpenAdapterFromHdc tests.
by Huw Davies 24 May '19

24 May '19

From: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/tests/driver.c | 71 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) diff --git a/dlls/gdi32/tests/driver.c b/dlls/gdi32/tests/driver.c index 0e1fddc5e8..30b02073ac 100644 --- a/dlls/gdi32/tests/driver.c +++ b/dlls/gdi32/tests/driver.c @@ -35,6 +35,7 @@ static const WCHAR display1W[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y' static NTSTATUS (WINAPI *pD3DKMTCloseAdapter)(const D3DKMT_CLOSEADAPTER *); static NTSTATUS (WINAPI *pD3DKMTOpenAdapterFromGdiDisplayName)(D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME *); +static NTSTATUS (WINAPI *pD3DKMTOpenAdapterFromHdc)(D3DKMT_OPENADAPTERFROMHDC *); static void test_D3DKMTOpenAdapterFromGdiDisplayName(void) { @@ -90,12 +91,82 @@ static void test_D3DKMTOpenAdapterFromGdiDisplayName(void) } } +static void test_D3DKMTOpenAdapterFromHdc(void) +{ + DISPLAY_DEVICEW display_device = {sizeof(display_device)}; + D3DKMT_OPENADAPTERFROMHDC open_adapter_hdc_desc; + D3DKMT_CLOSEADAPTER close_adapter_desc; + INT adapter_count = 0; + NTSTATUS status; + HDC hdc; + DWORD i; + + if (!pD3DKMTOpenAdapterFromHdc || pD3DKMTOpenAdapterFromHdc(NULL) == STATUS_PROCEDURE_NOT_FOUND) + { + skip("D3DKMTOpenAdapterFromHdc() is unavailable.\n"); + return; + } + + /* Invalid parameters */ + status = pD3DKMTOpenAdapterFromHdc(NULL); + todo_wine ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); + + memset(&open_adapter_hdc_desc, 0, sizeof(open_adapter_hdc_desc)); + status = pD3DKMTOpenAdapterFromHdc(&open_adapter_hdc_desc); + todo_wine ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); + + /* Open adapter */ + for (i = 0; EnumDisplayDevicesW(NULL, i, &display_device, 0); ++i) + { + if (!(display_device.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP)) + continue; + + adapter_count++; + + hdc = CreateDCW(0, display_device.DeviceName, 0, NULL); + open_adapter_hdc_desc.hDc = hdc; + status = pD3DKMTOpenAdapterFromHdc(&open_adapter_hdc_desc); + todo_wine ok(status == STATUS_SUCCESS, "Got unexpected return code %#x.\n", status); + todo_wine ok(open_adapter_hdc_desc.hAdapter, "Expect not null.\n"); + if (display_device.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE) + ok(open_adapter_hdc_desc.VidPnSourceId == 0, "Got unexpected value %#x.\n", + open_adapter_hdc_desc.VidPnSourceId); + else + todo_wine ok(open_adapter_hdc_desc.VidPnSourceId, "Got unexpected value %#x.\n", + open_adapter_hdc_desc.VidPnSourceId); + DeleteDC(hdc); + + if (status == STATUS_SUCCESS) + { + close_adapter_desc.hAdapter = open_adapter_hdc_desc.hAdapter; + status = pD3DKMTCloseAdapter(&close_adapter_desc); + ok(status == STATUS_SUCCESS, "Got unexpected return code %#x.\n", status); + } + } + + /* HDC covering more than two adapters is invalid for D3DKMTOpenAdapterFromHdc */ + hdc = GetDC(0); + open_adapter_hdc_desc.hDc = hdc; + status = pD3DKMTOpenAdapterFromHdc(&open_adapter_hdc_desc); + ReleaseDC(0, hdc); + todo_wine ok(status == (adapter_count > 1 ? STATUS_INVALID_PARAMETER : STATUS_SUCCESS), + "Got unexpected return code %#x.\n", status); + if (status == STATUS_SUCCESS) + { + close_adapter_desc.hAdapter = open_adapter_hdc_desc.hAdapter; + status = pD3DKMTCloseAdapter(&close_adapter_desc); + ok(status == STATUS_SUCCESS, "Got unexpected return code %#x.\n", status); + } +} + START_TEST(driver) { HMODULE gdi32 = GetModuleHandleA("gdi32.dll"); pD3DKMTCloseAdapter = (void *)GetProcAddress(gdi32, "D3DKMTCloseAdapter"); pD3DKMTOpenAdapterFromGdiDisplayName = (void *)GetProcAddress(gdi32, "D3DKMTOpenAdapterFromGdiDisplayName"); + pD3DKMTOpenAdapterFromHdc = (void *)GetProcAddress(gdi32, "D3DKMTOpenAdapterFromHdc"); test_D3DKMTOpenAdapterFromGdiDisplayName(); + test_D3DKMTOpenAdapterFromHdc(); } -- 2.18.0

1 0

[PATCH v4 1/7] gdi32/tests: Add D3DKMTOpenAdapterFromGdiDisplayName tests.
by Huw Davies 24 May '19

24 May '19

From: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/tests/Makefile.in | 1 + dlls/gdi32/tests/driver.c | 101 +++++++++++++++++++++++++++++++++++ 2 files changed, 102 insertions(+) create mode 100644 dlls/gdi32/tests/driver.c diff --git a/dlls/gdi32/tests/Makefile.in b/dlls/gdi32/tests/Makefile.in index 90d7223f47..9d82c278e9 100644 --- a/dlls/gdi32/tests/Makefile.in +++ b/dlls/gdi32/tests/Makefile.in @@ -7,6 +7,7 @@ C_SRCS = \ clipping.c \ dc.c \ dib.c \ + driver.c \ font.c \ gdiobj.c \ generated.c \ diff --git a/dlls/gdi32/tests/driver.c b/dlls/gdi32/tests/driver.c new file mode 100644 index 0000000000..0e1fddc5e8 --- /dev/null +++ b/dlls/gdi32/tests/driver.c @@ -0,0 +1,101 @@ +/* + * Unit test suite for kernel mode graphics driver + * + * Copyright 2019 Zhiyi Zhang + * + * 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 <stdarg.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" +#include "winternl.h" +#include "ddk/d3dkmthk.h" + +#include "wine/test.h" + +static const WCHAR display1W[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y','1',0}; + +static NTSTATUS (WINAPI *pD3DKMTCloseAdapter)(const D3DKMT_CLOSEADAPTER *); +static NTSTATUS (WINAPI *pD3DKMTOpenAdapterFromGdiDisplayName)(D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME *); + +static void test_D3DKMTOpenAdapterFromGdiDisplayName(void) +{ + D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME open_adapter_gdi_desc; + D3DKMT_CLOSEADAPTER close_adapter_desc; + DISPLAY_DEVICEW display_device = {sizeof(display_device)}; + NTSTATUS status; + DWORD i; + + lstrcpyW(open_adapter_gdi_desc.DeviceName, display1W); + if (!pD3DKMTOpenAdapterFromGdiDisplayName + || pD3DKMTOpenAdapterFromGdiDisplayName(&open_adapter_gdi_desc) == STATUS_PROCEDURE_NOT_FOUND) + { + skip("D3DKMTOpenAdapterFromGdiDisplayName() is unavailable.\n"); + return; + } + + close_adapter_desc.hAdapter = open_adapter_gdi_desc.hAdapter; + status = pD3DKMTCloseAdapter(&close_adapter_desc); + ok(status == STATUS_SUCCESS, "Got unexpected return code %#x.\n", status); + + /* Invalid parameters */ + status = pD3DKMTOpenAdapterFromGdiDisplayName(NULL); + ok(status == STATUS_UNSUCCESSFUL, "Got unexpected return code %#x.\n", status); + + memset(&open_adapter_gdi_desc, 0, sizeof(open_adapter_gdi_desc)); + status = pD3DKMTOpenAdapterFromGdiDisplayName(&open_adapter_gdi_desc); + ok(status == STATUS_UNSUCCESSFUL, "Got unexpected return code %#x.\n", status); + + /* Open adapter */ + for (i = 0; EnumDisplayDevicesW(NULL, i, &display_device, 0); ++i) + { + lstrcpyW(open_adapter_gdi_desc.DeviceName, display_device.DeviceName); + status = pD3DKMTOpenAdapterFromGdiDisplayName(&open_adapter_gdi_desc); + if (display_device.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP) + ok(status == STATUS_SUCCESS, "Got unexpected return code %#x.\n", status); + else + { + ok(status == STATUS_UNSUCCESSFUL, "Got unexpected return code %#x.\n", status); + continue; + } + + ok(open_adapter_gdi_desc.hAdapter, "Expect not null.\n"); + if (display_device.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE) + ok(open_adapter_gdi_desc.VidPnSourceId == 0, "Got unexpected value %#x.\n", + open_adapter_gdi_desc.VidPnSourceId); + else + ok(open_adapter_gdi_desc.VidPnSourceId, "Got unexpected value %#x.\n", open_adapter_gdi_desc.VidPnSourceId); + + close_adapter_desc.hAdapter = open_adapter_gdi_desc.hAdapter; + status = pD3DKMTCloseAdapter(&close_adapter_desc); + ok(status == STATUS_SUCCESS, "Got unexpected return code %#x.\n", status); + } +} + +START_TEST(driver) +{ + HMODULE gdi32 = GetModuleHandleA("gdi32.dll"); + + pD3DKMTCloseAdapter = (void *)GetProcAddress(gdi32, "D3DKMTCloseAdapter"); + pD3DKMTOpenAdapterFromGdiDisplayName = (void *)GetProcAddress(gdi32, "D3DKMTOpenAdapterFromGdiDisplayName"); + + test_D3DKMTOpenAdapterFromGdiDisplayName(); +} -- 2.18.0

1 0

[PATCH] include: Add Helicopter DI defines
by Alistair Leslie-Hughes 24 May '19

24 May '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/dinput.h | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/include/dinput.h b/include/dinput.h index beb81a7..cd49675 100644 --- a/include/dinput.h +++ b/include/dinput.h @@ -2194,6 +2194,30 @@ extern const DIDATAFORMAT c_dfDIJoystick2; #define DIBUTTON_ANY(instance) (0xFF004400 | (instance)) +#define DIVIRTUAL_FLYING_HELICOPTER 0x06000000 +#define DIBUTTON_FLYINGH_MENU 0x060004fd +#define DIBUTTON_FLYINGH_FIRE 0x06001401 +#define DIBUTTON_FLYINGH_WEAPONS 0x06001402 +#define DIBUTTON_FLYINGH_TARGET 0x06001403 +#define DIBUTTON_FLYINGH_DEVICE 0x060044fe +#define DIBUTTON_FLYINGH_PAUSE 0x060044fc +#define DIHATSWITCH_FLYINGH_GLANCE 0x06004601 +#define DIBUTTON_FLYINGH_FIRESECONDARY 0x06004c07 +#define DIBUTTON_FLYINGH_COUNTER 0x06005404 +#define DIBUTTON_FLYINGH_VIEW 0x06006405 +#define DIBUTTON_FLYINGH_GEAR 0x06006406 +#define DIAXIS_FLYINGH_BANK 0x06008a01 +#define DIAXIS_FLYINGH_PITCH 0x06010a02 +#define DIAXIS_FLYINGH_COLLECTIVE 0x06018a03 +#define DIAXIS_FLYINGH_TORQUE 0x06025a04 +#define DIAXIS_FLYINGH_THROTTLE 0x0603da05 +#define DIBUTTON_FLYINGH_FASTER_LINK 0x0603dce0 +#define DIBUTTON_FLYINGH_SLOWER_LINK 0x0603dce8 +#define DIBUTTON_FLYINGH_GLANCE_LEFT_LINK 0x0607c4e4 +#define DIBUTTON_FLYINGH_GLANCE_RIGHT_LINK 0x0607c4ec +#define DIBUTTON_FLYINGH_GLANCE_UP_LINK 0x0607c4e0 +#define DIBUTTON_FLYINGH_GLANCE_DOWN_LINK 0x0607c4e8 + /***************************************************************************** * IDirectInputA interface */ -- 1.9.1

1 0

[PATCH v6 2/7] winex11.drv: Initialize GPU registry data.
by Zhiyi Zhang 24 May '19

24 May '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/Makefile.in | 2 +- dlls/winex11.drv/display.c | 172 +++++++++++++++++++++++++++++++++++ dlls/winex11.drv/x11drv.h | 22 +++++ dlls/winex11.drv/xinerama.c | 25 +++++ 4 files changed, 220 insertions(+), 1 deletion(-) diff --git a/dlls/winex11.drv/Makefile.in b/dlls/winex11.drv/Makefile.in index 9ca2fc6efe..72ab1bb77b 100644 --- a/dlls/winex11.drv/Makefile.in +++ b/dlls/winex11.drv/Makefile.in @@ -1,5 +1,5 @@ MODULE = winex11.drv -IMPORTS = uuid user32 gdi32 advapi32 +IMPORTS = uuid user32 gdi32 advapi32 ntoskrnl setupapi DELAYIMPORTS = comctl32 ole32 shell32 imm32 EXTRAINCL = $(X_CFLAGS) EXTRALIBS = $(X_LIBS) $(X_EXTRA_LIBS) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index 7d81de09ac..c45a0a4657 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -26,11 +26,43 @@ #include "winbase.h" #include "winuser.h" #include "winreg.h" +#include "initguid.h" +#include "devguid.h" +#include "devpkey.h" +#include "setupapi.h" +#define WIN32_NO_STATUS +#include "winternl.h" +#include "ddk/ntddk.h" #include "wine/debug.h" +#include "wine/unicode.h" #include "x11drv.h" WINE_DEFAULT_DEBUG_CHANNEL(x11drv); +static const WCHAR driver_descW[] = {'D','r','i','v','e','r','D','e','s','c',0}; +static const WCHAR graphics_driverW[] = {'G','r','a','p','h','i','c','s','D','r','i','v','e','r',0}; +static const WCHAR video_idW[] = {'V','i','d','e','o','I','D',0}; +static const WCHAR guid_fmtW[] = { + '{','%','0','8','x','-','%','0','4','x','-','%','0','4','x','-','%','0','2','x','%','0','2','x','-', + '%','0','2','x','%','0','2','x','%','0','2','x','%','0','2','x','%','0','2','x','%','0','2','x','}',0}; +static const WCHAR gpu_instance_fmtW[] = { + 'P','C','I','\\', + 'V','E','N','_','%','0','4','X','&', + 'D','E','V','_','%','0','4','X','&', + 'S','U','B','S','Y','S','_','%','0','8','X','&', + 'R','E','V','_','%','0','2','X','\\', + '%','0','8','X',0}; +static const WCHAR gpu_hardware_id_fmtW[] = { + 'P','C','I','\\', + 'V','E','N','_','%','0','4','X','&', + 'D','E','V','_','%','0','4','X','&', + 'S','U','B','S','Y','S','_','0','0','0','0','0','0','0','0','&', + 'R','E','V','_','0','0',0}; +static const WCHAR winex11_drvW[] = { + 'C',':','\\', + 'W','i','n','d','o','w','s','\\', + 'S','y','s','t','e','m','3','2','\\', + 'w','i','n','e','x','1','1','.','d','r','v',0}; static const WCHAR video_keyW[] = { 'H','A','R','D','W','A','R','E','\\', 'D','E','V','I','C','E','M','A','P','\\', @@ -47,8 +79,125 @@ void X11DRV_DisplayDevices_SetHandler(const struct x11drv_display_device_handler } } +/* Initialize a GPU instance */ +static BOOL X11DRV_InitGpu(HDEVINFO devinfo, const struct x11drv_gpu *gpu, INT gpu_index) +{ + static const BOOL present = TRUE; + SP_DEVINFO_DATA device_data = {sizeof(device_data)}; + WCHAR instanceW[MAX_PATH]; + WCHAR bufferW[1024]; + HKEY hkey = NULL; + GUID guid; + INT written; + DWORD size; + BOOL ret = FALSE; + + sprintfW(instanceW, gpu_instance_fmtW, gpu->vendor_id, gpu->device_id, gpu->subsys_id, gpu->revision_id, gpu_index); + if (!SetupDiOpenDeviceInfoW(devinfo, instanceW, NULL, 0, &device_data)) + { + SetupDiCreateDeviceInfoW(devinfo, instanceW, &GUID_DEVCLASS_DISPLAY, gpu->name, NULL, 0, &device_data); + if (!SetupDiRegisterDeviceInfo(devinfo, &device_data, 0, NULL, NULL, NULL)) + goto fail; + } + + /* Write HaredwareID registry property */ + written = sprintfW(bufferW, gpu_hardware_id_fmtW, gpu->vendor_id, gpu->device_id); + bufferW[written + 1] = 0; + if (!SetupDiSetDeviceRegistryPropertyW(devinfo, &device_data, SPDRP_HARDWAREID, (const BYTE *)bufferW, + (written + 2) * sizeof(WCHAR))) + goto fail; + + /* Write DEVPKEY_Device_IsPresent property */ + if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &DEVPKEY_Device_IsPresent, DEVPROP_TYPE_BOOLEAN, + (const BYTE *)&present, sizeof(present), 0)) + goto fail; + + /* Open driver key. + * This is where HKLM\System\CurrentControlSet\Control\Video\{GPU GUID}\{Adapter Index} links to */ + hkey = SetupDiOpenDevRegKey(devinfo, &device_data, DICS_FLAG_GLOBAL, 0, DIREG_DRV, KEY_ALL_ACCESS); + if (hkey == INVALID_HANDLE_VALUE) + hkey = SetupDiCreateDevRegKeyW(devinfo, &device_data, DICS_FLAG_GLOBAL, 0, DIREG_DRV, NULL, NULL); + + /* Write GraphicsDriver value */ + if (RegSetValueExW(hkey, graphics_driverW, 0, REG_SZ, (const BYTE *)winex11_drvW, sizeof(winex11_drvW))) + goto fail; + + /* Write DriverDesc value */ + if (RegSetValueExW(hkey, driver_descW, 0, REG_SZ, (const BYTE *)gpu->name, + (strlenW(gpu->name) + 1) * sizeof(WCHAR))) + goto fail; + RegCloseKey(hkey); + hkey = NULL; + + /* Write GUID in VideoID in .../instance/Device Parameters, reuse the GUID if it's existent */ + hkey = SetupDiOpenDevRegKey(devinfo, &device_data, DICS_FLAG_GLOBAL, 0, DIREG_DEV, KEY_ALL_ACCESS); + if (hkey == INVALID_HANDLE_VALUE) + hkey = SetupDiCreateDevRegKeyW(devinfo, &device_data, DICS_FLAG_GLOBAL, 0, DIREG_DEV, NULL, NULL); + + size = sizeof(bufferW); + bufferW[0] = 0; + if (RegQueryValueExW(hkey, video_idW, 0, NULL, (BYTE *)bufferW, &size)) + { + ExUuidCreate(&guid); + sprintfW(bufferW, guid_fmtW, guid.Data1, guid.Data2, guid.Data3, guid.Data4[0], guid.Data4[1], guid.Data4[2], + guid.Data4[3], guid.Data4[4], guid.Data4[5], guid.Data4[6], guid.Data4[7]); + if (RegSetValueExW(hkey, video_idW, 0, REG_SZ, (const BYTE *)bufferW, (strlenW(bufferW) + 1) * sizeof(WCHAR))) + goto fail; + } + + ret = TRUE; +fail: + RegCloseKey(hkey); + if (!ret) + ERR("Failed to initialize GPU\n"); + return ret; +} + +static void prepare_devices(void) +{ + static const BOOL not_present = FALSE; + SP_DEVINFO_DATA device_data = {sizeof(device_data)}; + HDEVINFO devinfo; + DWORD i = 0; + + /* Set all GPUs as not present. We can't simply delete them because we need to keep the GUID consistent with + * each initialization run. We clean up non present GPUs at the end of initialization */ + devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_DISPLAY, NULL, NULL, 0); + while (SetupDiEnumDeviceInfo(devinfo, i++, &device_data)) + { + if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &DEVPKEY_Device_IsPresent, DEVPROP_TYPE_BOOLEAN, + (const BYTE *)&not_present, sizeof(not_present), 0)) + ERR("Failed to set GPU present property\n"); + } + SetupDiDestroyDeviceInfoList(devinfo); +} + +static void cleanup_devices(void) +{ + SP_DEVINFO_DATA device_data = {sizeof(device_data)}; + HDEVINFO devinfo; + DWORD type; + DWORD i = 0; + BOOL present; + + devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_DISPLAY, NULL, NULL, 0); + while (SetupDiEnumDeviceInfo(devinfo, i++, &device_data)) + { + present = FALSE; + SetupDiGetDevicePropertyW(devinfo, &device_data, &DEVPKEY_Device_IsPresent, &type, (BYTE *)&present, + sizeof(present), NULL, 0); + if (!present && !SetupDiRemoveDevice(devinfo, &device_data)) + ERR("Failed to remove GPU\n"); + } + SetupDiDestroyDeviceInfoList(devinfo); +} + void X11DRV_DisplayDevices_Init(void) { + struct x11drv_gpu *gpus = NULL; + INT gpu_count; + INT gpu; + HDEVINFO gpu_devinfo = NULL; HKEY video_hkey = NULL; DWORD disposition = 0; BOOL success = FALSE; @@ -66,9 +215,32 @@ void X11DRV_DisplayDevices_Init(void) goto fail; } + /* FIXME: + * Currently SetupDiGetClassDevsW with DIGCF_PRESENT is unsupported, So we need to clean up not present devices in + * case application use SetupDiGetClassDevsW to enumerate devices. Wrong devices could exist in registry as a result + * of prefix copying or having devices unplugged. But then we couldn't simply delete GPUs because we need to retain + * the same GUID for the same GPU. */ + prepare_devices(); + + gpu_devinfo = SetupDiCreateDeviceInfoList(&GUID_DEVCLASS_DISPLAY, NULL); + + /* Initialize GPUs */ + if (!handler.pGetGpus(&gpus, &gpu_count)) + goto fail; + + for (gpu = 0; gpu < gpu_count; gpu++) + { + if (!X11DRV_InitGpu(gpu_devinfo, &gpus[gpu], gpu)) + goto fail; + } + success = TRUE; fail: + cleanup_devices(); + SetupDiDestroyDeviceInfoList(gpu_devinfo); RegCloseKey(video_hkey); + if (gpus) + handler.pFreeGpus(gpus); if (!success) ERR("Failed to initialize display devices\n"); } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index fbc5a104f6..e50158d282 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -667,6 +667,20 @@ void X11DRV_XRandR_Init(void) DECLSPEC_HIDDEN; /* X11 display device handler. Used to initialize display device registry data */ +/* Represent a physical GPU in the PCI slots */ +struct x11drv_gpu +{ + /* ID to uniquely identify a GPU in handler */ + ULONG_PTR id; + /* Name */ + WCHAR name[128]; + /* PCI ID */ + UINT vendor_id; + UINT device_id; + UINT subsys_id; + UINT revision_id; +}; + /* Required functions for display device registry initialization */ struct x11drv_display_device_handler { @@ -675,6 +689,14 @@ struct x11drv_display_device_handler /* Higher priority can override handlers with lower proprity */ INT priority; + + /* pGetGpus will be called to get a list of GPUs. First GPU has to be where the primary adapter is. + * + * Return FALSE on failure with parameters unchanged */ + BOOL (*pGetGpus)(struct x11drv_gpu **gpus, int *count); + + /* pFreeGpus will be called to free a GPU list from pGetGpus */ + void (*pFreeGpus)(struct x11drv_gpu *gpus); }; extern void X11DRV_DisplayDevices_SetHandler(const struct x11drv_display_device_handler *handler) DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/xinerama.c b/dlls/winex11.drv/xinerama.c index 35dd36049b..520f59f93d 100644 --- a/dlls/winex11.drv/xinerama.c +++ b/dlls/winex11.drv/xinerama.c @@ -201,6 +201,29 @@ RECT get_primary_monitor_rect(void) return get_primary()->rcMonitor; } +static BOOL xinerama_get_gpus( struct x11drv_gpu **new_gpus, int *count ) +{ + static const WCHAR wine_gpuW[] = {'W','i','n','e',' ','G','P','U',0}; + struct x11drv_gpu *gpus; + + /* Xinerama has no support for GPU, faking one */ + gpus = heap_calloc( 1, sizeof(*gpus) ); + if (!gpus) + return FALSE; + + strcpyW( gpus[0].name, wine_gpuW ); + + *new_gpus = gpus; + *count = 1; + + return TRUE; +} + +static void xinerama_free_gpus( struct x11drv_gpu *gpus ) +{ + heap_free( gpus ); +} + void xinerama_init( unsigned int width, unsigned int height ) { struct x11drv_display_device_handler handler; @@ -239,6 +262,8 @@ void xinerama_init( unsigned int width, unsigned int height ) strcpy( handler.name, "Xinerama" ); handler.priority = 100; + handler.pGetGpus = xinerama_get_gpus; + handler.pFreeGpus = xinerama_free_gpus; X11DRV_DisplayDevices_SetHandler( &handler ); TRACE( "virtual size: %s primary: %s\n", -- 2.20.1

3 4

[PATCH] gdiplus: Created ADD_GTCTO environment variable that increases thread suspension time out.
by Vanida Plamondon 24 May '19

24 May '19

This patch was made as using an environment variable instead of a registry entry because it addresses unwanted/bugged behaviour. I could be wrong about that. With ADD_GTCTO=5000, Magic the Gathering: Arena's updater/ downloader completes without issue. It should work for other outdated unity-build games that suffer the same issue. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45546 Signed-off-by: Vanida Plamondon <vanida.plamondon(a)gmail.com> --- v1: Created ADD_GTCTO environment variable --- dlls/ntdll/thread.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 46de839400..09aa94ba65 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -23,6 +23,7 @@ #include <assert.h> #include <stdarg.h> +#include <stdlib.h> #include <limits.h> #include <sys/types.h> #ifdef HAVE_SYS_MMAN_H @@ -772,7 +773,11 @@ NTSTATUS set_thread_context( HANDLE handle, const context_t *context, BOOL *self NTSTATUS get_thread_context( HANDLE handle, context_t *context, unsigned int flags, BOOL *self ) { NTSTATUS ret; - DWORD dummy, i; + DWORD dummy, i, gtcto; + + /* get the ADD_GTCTO value, if any */ + const char *add_gtcto = getenv( "ADD_GTCTO" ); + gtcto = add_gtcto ? ( DWORD ) ( atol( add_gtcto) + 100 ) : 100; SERVER_START_REQ( get_thread_context ) { @@ -787,7 +792,7 @@ NTSTATUS get_thread_context( HANDLE handle, context_t *context, unsigned int fla if (ret == STATUS_PENDING) { - for (i = 0; i < 100; i++) + for (i = 0; i < gtcto; i++) { SERVER_START_REQ( get_thread_context ) { -- 2.20.1

2 1

[PATCH 1/4] setupapi/tests: Clean up and expand tests for SetupCopyOEMInf().
by Zebediah Figura 23 May '19

23 May '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/setupapi/tests/misc.c | 298 ++++++++++++++++++------------------- 1 file changed, 142 insertions(+), 156 deletions(-) diff --git a/dlls/setupapi/tests/misc.c b/dlls/setupapi/tests/misc.c index 9143cd4bd33..157edd82a7c 100644 --- a/dlls/setupapi/tests/misc.c +++ b/dlls/setupapi/tests/misc.c @@ -45,27 +45,19 @@ static CHAR CURR_DIR[MAX_PATH]; */ static BOOL (WINAPI *pSetupGetFileCompressionInfoExA)(PCSTR, PSTR, DWORD, PDWORD, PDWORD, PDWORD, PUINT); -static BOOL (WINAPI *pSetupCopyOEMInfA)(PCSTR, PCSTR, DWORD, DWORD, PSTR, DWORD, PDWORD, PSTR *); static BOOL (WINAPI *pSetupQueryInfOriginalFileInformationA)(PSP_INF_INFORMATION, UINT, PSP_ALTPLATFORM_INFO, PSP_ORIGINAL_FILE_INFO_A); -static BOOL (WINAPI *pSetupUninstallOEMInfA)(PCSTR, DWORD, PVOID); -static void create_inf_file(LPCSTR filename) +static void create_file(const char *name, const char *data) { - DWORD dwNumberOfBytesWritten; - HANDLE hf = CreateFileA(filename, GENERIC_WRITE, 0, NULL, - CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + HANDLE file; + DWORD size; + BOOL ret; - static const char data[] = - "[Version]\n" - "Signature=\"$Chicago$\"\n" - "AdvancedINF=2.5\n" - "[DefaultInstall]\n" - "RegisterOCXs=RegisterOCXsSection\n" - "[RegisterOCXsSection]\n" - "%%11%%\\ole32.dll\n"; - - WriteFile(hf, data, sizeof(data) - 1, &dwNumberOfBytesWritten, NULL); - CloseHandle(hf); + file = CreateFileA(name, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); + ok(file != INVALID_HANDLE_VALUE, "Failed to create %s, error %u.\n", name, GetLastError()); + ret = WriteFile(file, data, strlen(data), &size, NULL); + ok(ret && size == strlen(data), "Failed to write %s, error %u.\n", name, GetLastError()); + CloseHandle(file); } static void get_temp_filename(LPSTR path) @@ -84,19 +76,13 @@ static BOOL file_exists(LPSTR path) return GetFileAttributesA(path) != INVALID_FILE_ATTRIBUTES; } -static BOOL check_format(LPSTR path, LPSTR inf) +static BOOL is_in_inf_dir(const char *path) { - CHAR check[MAX_PATH]; - BOOL res; - - static const CHAR format[] = "\\INF\\oem"; - - GetWindowsDirectoryA(check, MAX_PATH); - strcat(check, format); - res = CompareStringA(LOCALE_SYSTEM_DEFAULT, NORM_IGNORECASE, check, -1, path, strlen(check)) == CSTR_EQUAL && - path[strlen(check)] != '\\'; + char expect[MAX_PATH]; - return (!inf) ? res : res && (inf == path + strlen(check) - 3); + GetWindowsDirectoryA(expect, sizeof(expect)); + strcat(expect, "\\inf\\"); + return !strncasecmp(path, expect, strrchr(path, '\\') - path); } static void test_original_file_name(LPCSTR original, LPCSTR dest) @@ -143,32 +129,39 @@ static void test_original_file_name(LPCSTR original, LPCSTR dest) static void test_SetupCopyOEMInf(void) { - CHAR toolong[MAX_PATH * 2]; - CHAR path[MAX_PATH], dest[MAX_PATH]; - CHAR tmpfile[MAX_PATH], dest_save[MAX_PATH]; - LPSTR inf = NULL; + char path[MAX_PATH * 2], dest[MAX_PATH], tmpfile[MAX_PATH], orig_dest[MAX_PATH]; + char *filepart, pnf[MAX_PATH]; DWORD size; BOOL res; + static const char inf_data1[] = + "[Version]\n" + "Signature=\"$Chicago$\"\n" + "; This is a WINE test INF file\n"; + + static const char inf_data2[] = + "[Version]\n" + "Signature=\"$Chicago$\"\n" + "; This is another WINE test INF file\n"; + /* try NULL SourceInfFileName */ SetLastError(0xdeadbeef); - res = pSetupCopyOEMInfA(NULL, NULL, 0, SP_COPY_NOOVERWRITE, NULL, 0, NULL, NULL); + res = SetupCopyOEMInfA(NULL, NULL, 0, SP_COPY_NOOVERWRITE, NULL, 0, NULL, NULL); ok(res == FALSE, "Expected FALSE, got %d\n", res); ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); /* try empty SourceInfFileName */ SetLastError(0xdeadbeef); - res = pSetupCopyOEMInfA("", NULL, 0, SP_COPY_NOOVERWRITE, NULL, 0, NULL, NULL); + res = SetupCopyOEMInfA("", NULL, 0, SP_COPY_NOOVERWRITE, NULL, 0, NULL, NULL); ok(res == FALSE, "Expected FALSE, got %d\n", res); ok(GetLastError() == ERROR_FILE_NOT_FOUND || - GetLastError() == ERROR_BAD_PATHNAME || /* Win98 */ GetLastError() == ERROR_INVALID_PARAMETER, /* Vista, W2K8 */ "Unexpected error : %d\n", GetLastError()); /* try a relative nonexistent SourceInfFileName */ SetLastError(0xdeadbeef); - res = pSetupCopyOEMInfA("nonexistent", NULL, 0, SP_COPY_NOOVERWRITE, NULL, 0, NULL, NULL); + res = SetupCopyOEMInfA("nonexistent", NULL, 0, SP_COPY_NOOVERWRITE, NULL, 0, NULL, NULL); ok(res == FALSE, "Expected FALSE, got %d\n", res); ok(GetLastError() == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); @@ -177,30 +170,18 @@ static void test_SetupCopyOEMInf(void) strcpy(path, CURR_DIR); strcat(path, "\\nonexistent"); SetLastError(0xdeadbeef); - res = pSetupCopyOEMInfA(path, NULL, 0, SP_COPY_NOOVERWRITE, NULL, 0, NULL, NULL); + res = SetupCopyOEMInfA(path, NULL, 0, SP_COPY_NOOVERWRITE, NULL, 0, NULL, NULL); ok(res == FALSE, "Expected FALSE, got %d\n", res); ok(GetLastError() == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); - /* try a long SourceInfFileName */ - memset(toolong, 'a', MAX_PATH * 2); - toolong[MAX_PATH * 2 - 1] = '\0'; - SetLastError(0xdeadbeef); - res = pSetupCopyOEMInfA(toolong, NULL, 0, SP_COPY_NOOVERWRITE, NULL, 0, NULL, NULL); - ok(res == FALSE, "Expected FALSE, got %d\n", res); - ok(GetLastError() == ERROR_FILE_NOT_FOUND || - GetLastError() == ERROR_FILENAME_EXCED_RANGE, /* Win98 */ - "Expected ERROR_FILE_NOT_FOUND or ERROR_FILENAME_EXCED_RANGE, got %d\n", GetLastError()); - get_temp_filename(tmpfile); - create_inf_file(tmpfile); + create_file(tmpfile, inf_data1); /* try a relative SourceInfFileName */ SetLastError(0xdeadbeef); - res = pSetupCopyOEMInfA(tmpfile, NULL, 0, SP_COPY_NOOVERWRITE, NULL, 0, NULL, NULL); - ok(res == FALSE || - broken(res == TRUE), /* Win98 */ - "Expected FALSE, got %d\n", res); + res = SetupCopyOEMInfA(tmpfile, NULL, 0, SP_COPY_NOOVERWRITE, NULL, 0, NULL, NULL); + ok(res == FALSE, "Expected FALSE, got %d\n", res); if (GetLastError() == ERROR_WRONG_INF_TYPE || GetLastError() == ERROR_UNSUPPORTED_TYPE /* Win7 */) { /* FIXME: @@ -212,152 +193,169 @@ static void test_SetupCopyOEMInf(void) return; } - ok(GetLastError() == ERROR_FILE_NOT_FOUND || - broken(GetLastError() == ERROR_SUCCESS), /* Win98 */ - "Expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); + ok(GetLastError() == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); ok(file_exists(tmpfile), "Expected tmpfile to exist\n"); /* try SP_COPY_REPLACEONLY, dest does not exist */ SetLastError(0xdeadbeef); - res = pSetupCopyOEMInfA(path, NULL, SPOST_NONE, SP_COPY_REPLACEONLY, NULL, 0, NULL, NULL); + res = SetupCopyOEMInfA(path, NULL, SPOST_NONE, SP_COPY_REPLACEONLY, NULL, 0, NULL, NULL); ok(res == FALSE, "Expected FALSE, got %d\n", res); ok(GetLastError() == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); ok(file_exists(tmpfile), "Expected source inf to exist\n"); - /* try an absolute SourceInfFileName, without DestinationInfFileName */ + /* Test a successful call. */ strcpy(path, CURR_DIR); strcat(path, "\\"); strcat(path, tmpfile); SetLastError(0xdeadbeef); - res = pSetupCopyOEMInfA(path, NULL, SPOST_NONE, 0, NULL, 0, NULL, NULL); + res = SetupCopyOEMInfA(path, NULL, SPOST_NONE, 0, dest, sizeof(dest), NULL, NULL); if (!res && GetLastError() == ERROR_ACCESS_DENIED) { skip("SetupCopyOEMInfA() failed on insufficient permissions\n"); + DeleteFileA(tmpfile); return; } ok(res == TRUE, "Expected TRUE, got %d\n", res); ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", GetLastError()); - ok(file_exists(path), "Expected source inf to exist\n"); + ok(file_exists(path), "Expected source inf to exist.\n"); + ok(file_exists(dest), "Expected dest file to exist.\n"); + ok(is_in_inf_dir(dest), "Got unexpected path '%s'.\n", dest); + strcpy(orig_dest, dest); + + /* Existing INF files are checked for a match. */ + SetLastError(0xdeadbeef); + res = SetupCopyOEMInfA(path, NULL, SPOST_NONE, 0, dest, sizeof(dest), NULL, NULL); + ok(res == TRUE, "Expected TRUE, got %d\n", res); + ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", GetLastError()); + ok(file_exists(path), "Expected source inf to exist.\n"); + ok(file_exists(dest), "Expected dest file to exist.\n"); +todo_wine + ok(!strcmp(orig_dest, dest), "Expected '%s', got '%s'.\n", orig_dest, dest); /* try SP_COPY_REPLACEONLY, dest exists */ SetLastError(0xdeadbeef); - res = pSetupCopyOEMInfA(path, NULL, SPOST_NONE, SP_COPY_REPLACEONLY, NULL, 0, NULL, NULL); + res = SetupCopyOEMInfA(path, NULL, SPOST_NONE, SP_COPY_REPLACEONLY, dest, sizeof(dest), NULL, NULL); ok(res == TRUE, "Expected TRUE, got %d\n", res); ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", GetLastError()); - ok(file_exists(path), "Expected source inf to exist\n"); + ok(file_exists(path), "Expected source inf to exist.\n"); + ok(file_exists(dest), "Expected dest file to exist.\n"); +todo_wine + ok(!strcmp(orig_dest, dest), "Expected '%s', got '%s'.\n", orig_dest, dest); - /* try SP_COPY_NOOVERWRITE */ + strcpy(dest, "aaa"); SetLastError(0xdeadbeef); - res = pSetupCopyOEMInfA(path, NULL, SPOST_NONE, SP_COPY_NOOVERWRITE, NULL, 0, NULL, NULL); + res = SetupCopyOEMInfA(path, NULL, SPOST_NONE, SP_COPY_NOOVERWRITE, dest, sizeof(dest), NULL, NULL); ok(res == FALSE, "Expected FALSE, got %d\n", res); ok(GetLastError() == ERROR_FILE_EXISTS, "Expected ERROR_FILE_EXISTS, got %d\n", GetLastError()); +todo_wine + ok(!strcmp(orig_dest, dest), "Expected '%s', got '%s'.\n", orig_dest, dest); - /* get the DestinationInfFileName */ SetLastError(0xdeadbeef); - res = pSetupCopyOEMInfA(path, NULL, SPOST_NONE, 0, dest, MAX_PATH, NULL, NULL); + res = SetupCopyOEMInfA(path, NULL, SPOST_NONE, 0, NULL, 0, NULL, NULL); ok(res == TRUE, "Expected TRUE, got %d\n", res); ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", GetLastError()); - ok(strlen(dest) != 0, "Expected a non-zero length string\n"); - ok(file_exists(dest), "Expected destination inf to exist\n"); - ok(check_format(dest, NULL), "Expected %%windir%%\\inf\\OEMx.inf, got %s\n", dest); - ok(file_exists(path), "Expected source inf to exist\n"); + ok(file_exists(path), "Expected source inf to exist.\n"); + ok(file_exists(orig_dest), "Expected dest file to exist.\n"); - strcpy(dest_save, dest); - DeleteFileA(dest_save); - - /* get the DestinationInfFileName, DestinationInfFileNameSize is too small - * - inf is still copied - */ strcpy(dest, "aaa"); size = 0; SetLastError(0xdeadbeef); - res = pSetupCopyOEMInfA(path, NULL, SPOST_NONE, 0, dest, 5, &size, NULL); + res = SetupCopyOEMInfA(path, NULL, SPOST_NONE, 0, dest, 5, &size, NULL); ok(res == FALSE, "Expected FALSE, got %d\n", res); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); ok(file_exists(path), "Expected source inf to exist\n"); - ok(file_exists(dest_save), "Expected dest inf to exist\n"); + ok(file_exists(orig_dest), "Expected dest inf to exist\n"); ok(!strcmp(dest, "aaa"), "Expected dest to be unchanged\n"); - ok(size == strlen(dest_save) + 1, "Expected size to be lstrlen(dest_save) + 1\n"); +todo_wine + ok(size == strlen(orig_dest) + 1, "Expected size %d, got %d.\n", strlen(orig_dest) + 1, size); - /* get the DestinationInfFileName and DestinationInfFileNameSize */ SetLastError(0xdeadbeef); - res = pSetupCopyOEMInfA(path, NULL, SPOST_NONE, 0, dest, MAX_PATH, &size, NULL); + res = SetupCopyOEMInfA(path, NULL, SPOST_NONE, 0, dest, sizeof(dest), &size, NULL); ok(res == TRUE, "Expected TRUE, got %d\n", res); ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", GetLastError()); - ok(lstrlenA(dest) + 1 == size, "Expected sizes to match, got (%d, %d)\n", lstrlenA(dest), size); - ok(file_exists(dest), "Expected destination inf to exist\n"); - ok(check_format(dest, NULL), "Expected %%windir%%\\inf\\OEMx.inf, got %s\n", dest); - ok(file_exists(path), "Expected source inf to exist\n"); - ok(size == lstrlenA(dest_save) + 1, "Expected size to be lstrlen(dest_save) + 1\n"); +todo_wine + ok(!strcmp(orig_dest, dest), "Expected '%s', got '%s'.\n", orig_dest, dest); + ok(size == strlen(dest) + 1, "Expected size %d, got %d.\n", strlen(dest) + 1, size); test_original_file_name(strrchr(path, '\\') + 1, dest); - /* get the DestinationInfFileName, DestinationInfFileNameSize, and DestinationInfFileNameComponent */ SetLastError(0xdeadbeef); - res = pSetupCopyOEMInfA(path, NULL, SPOST_NONE, 0, dest, MAX_PATH, &size, &inf); + res = SetupCopyOEMInfA(path, NULL, SPOST_NONE, 0, dest, sizeof(dest), NULL, &filepart); ok(res == TRUE, "Expected TRUE, got %d\n", res); ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", GetLastError()); - ok(lstrlenA(dest) + 1 == size, "Expected sizes to match, got (%d, %d)\n", lstrlenA(dest), size); - ok(file_exists(dest), "Expected destination inf to exist\n"); - ok((inf && inf[0] != 0) || - broken(!inf), /* Win98 */ - "Expected inf to point to the filename\n"); - ok(check_format(dest, inf), "Expected %%windir%%\\inf\\OEMx.inf, got %s\n", dest); - ok(file_exists(path), "Expected source inf to exist\n"); - ok(size == lstrlenA(dest_save) + 1, "Expected size to be lstrlen(dest_save) + 1\n"); +todo_wine + ok(!strcmp(orig_dest, dest), "Expected '%s', got '%s'.\n", orig_dest, dest); + ok(filepart == strrchr(dest, '\\') + 1, "Got unexpected file part %s.\n", filepart); - /* try SP_COPY_DELETESOURCE */ SetLastError(0xdeadbeef); - res = pSetupCopyOEMInfA(path, NULL, SPOST_NONE, SP_COPY_DELETESOURCE, NULL, 0, NULL, NULL); + res = SetupCopyOEMInfA(path, NULL, SPOST_NONE, SP_COPY_DELETESOURCE, NULL, 0, NULL, NULL); ok(res == TRUE, "Expected TRUE, got %d\n", res); ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", GetLastError()); ok(!file_exists(path), "Expected source inf to not exist\n"); - if (pSetupUninstallOEMInfA) - { - char pnf[MAX_PATH]; - char *pnffile; - char *destfile = strrchr(dest, '\\') + 1; - - strcpy(pnf, dest); - *(strrchr(pnf, '.') + 1) = 'p'; - pnffile = strrchr(pnf, '\\') + 1; - - SetLastError(0xdeadbeef); - res = pSetupUninstallOEMInfA(destfile, 0, NULL); - if(!res) - res = pSetupUninstallOEMInfA(pnffile, 0, NULL); - ok(res, "Failed to uninstall '%s'/'%s' : %d\n", destfile, - pnffile, GetLastError()); - todo_wine ok(!file_exists(dest), "Expected inf '%s' to not exist\n", dest); - if(file_exists(dest)) - { - SetLastError(0xdeadbeef); - res = DeleteFileA(dest); - ok(res, "Failed to delete file '%s' : %d\n", dest, GetLastError()); - } - ok(!file_exists(pnf), "Expected pnf '%s' to not exist\n", pnf); - if(file_exists(pnf)) - { - SetLastError(0xdeadbeef); - res = DeleteFileA(pnf); - ok(res, "Failed to delete file '%s' : %d\n", pnf, GetLastError()); - } - } - else - { - /* Win9x/WinMe */ - SetLastError(0xdeadbeef); - res = DeleteFileA(dest); - ok(res, "Failed to delete file '%s' : %d\n", dest, GetLastError()); - - /* On WinMe we also need to remove the .pnf file */ - *(strrchr(dest, '.') + 1) = 'p'; - DeleteFileA(dest); - } + strcpy(pnf, dest); + *(strrchr(pnf, '.') + 1) = 'p'; + + res = SetupUninstallOEMInfA(strrchr(dest, '\\') + 1, 0, NULL); + ok(res, "Failed to uninstall '%s', error %u.\n", dest, GetLastError()); + todo_wine ok(!file_exists(dest), "Expected inf '%s' to not exist\n", dest); + DeleteFileA(dest); + ok(!file_exists(pnf), "Expected pnf '%s' to not exist\n", pnf); + + create_file(tmpfile, inf_data1); + SetLastError(0xdeadbeef); + res = SetupCopyOEMInfA(path, NULL, SPOST_NONE, 0, dest, sizeof(dest), NULL, NULL); + ok(res == TRUE, "Expected TRUE, got %d\n", res); + ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", GetLastError()); + ok(is_in_inf_dir(dest), "Got unexpected path '%s'.\n", dest); + strcpy(orig_dest, dest); + + create_file(tmpfile, inf_data2); + SetLastError(0xdeadbeef); + res = SetupCopyOEMInfA(path, NULL, SPOST_NONE, 0, dest, sizeof(dest), NULL, NULL); + ok(res == TRUE, "Expected TRUE, got %d\n", res); + ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", GetLastError()); + ok(is_in_inf_dir(dest), "Got unexpected path '%s'.\n", dest); + ok(strcmp(dest, orig_dest), "Expected INF files to be copied to differnet paths.\n"); + + res = SetupUninstallOEMInfA(strrchr(dest, '\\') + 1, 0, NULL); + ok(res, "Failed to uninstall '%s', error %u.\n", dest, GetLastError()); + todo_wine ok(!file_exists(dest), "Expected inf '%s' to not exist\n", dest); + DeleteFileA(dest); + strcpy(pnf, dest); + *(strrchr(pnf, '.') + 1) = 'p'; + ok(!file_exists(pnf), "Expected pnf '%s' to not exist\n", pnf); + + res = SetupUninstallOEMInfA(strrchr(orig_dest, '\\') + 1, 0, NULL); + ok(res, "Failed to uninstall '%s', error %u.\n", orig_dest, GetLastError()); + todo_wine ok(!file_exists(orig_dest), "Expected inf '%s' to not exist\n", dest); + DeleteFileA(orig_dest); + strcpy(pnf, dest); + *(strrchr(pnf, '.') + 1) = 'p'; + ok(!file_exists(pnf), "Expected pnf '%s' to not exist\n", pnf); + + GetWindowsDirectoryA(orig_dest, sizeof(orig_dest)); + strcat(orig_dest, "\\inf\\"); + strcat(orig_dest, tmpfile); + res = CopyFileA(tmpfile, orig_dest, TRUE); +todo_wine + ok(res, "Failed to copy file, error %u.\n", GetLastError()); + SetLastError(0xdeadbeef); + res = SetupCopyOEMInfA(path, NULL, SPOST_NONE, 0, dest, sizeof(dest), NULL, NULL); + ok(res == TRUE, "Expected TRUE, got %d\n", res); + ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", GetLastError()); +todo_wine + ok(!strcasecmp(dest, orig_dest), "Expected '%s', got '%s'.\n", orig_dest, dest); + + /* Since it wasn't actually installed, SetupUninstallOEMInf would fail here. */ + res = DeleteFileA(dest); + ok(res, "Failed to delete '%s', error %u.\n", tmpfile, GetLastError()); + + res = DeleteFileA(tmpfile); + ok(res, "Failed to delete '%s', error %u.\n", tmpfile, GetLastError()); } static void create_source_file(LPSTR filename, const BYTE *data, DWORD size) @@ -716,12 +714,12 @@ static void test_SetupUninstallOEMInf(void) BOOL ret; SetLastError(0xdeadbeef); - ret = pSetupUninstallOEMInfA(NULL, 0, NULL); + ret = SetupUninstallOEMInfA(NULL, 0, NULL); ok(!ret, "Expected failure\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %08x\n", GetLastError()); SetLastError(0xdeadbeef); - ret = pSetupUninstallOEMInfA("", 0, NULL); + ret = SetupUninstallOEMInfA("", 0, NULL); todo_wine { ok(!ret, "Expected failure\n"); @@ -729,7 +727,7 @@ static void test_SetupUninstallOEMInf(void) } SetLastError(0xdeadbeef); - ret = pSetupUninstallOEMInfA("nonexistent.inf", 0, NULL); + ret = SetupUninstallOEMInfA("nonexistent.inf", 0, NULL); todo_wine { ok(!ret, "Expected failure\n"); @@ -835,17 +833,11 @@ START_TEST(misc) HMODULE hsetupapi = GetModuleHandleA("setupapi.dll"); pSetupGetFileCompressionInfoExA = (void*)GetProcAddress(hsetupapi, "SetupGetFileCompressionInfoExA"); - pSetupCopyOEMInfA = (void*)GetProcAddress(hsetupapi, "SetupCopyOEMInfA"); pSetupQueryInfOriginalFileInformationA = (void*)GetProcAddress(hsetupapi, "SetupQueryInfOriginalFileInformationA"); - pSetupUninstallOEMInfA = (void*)GetProcAddress(hsetupapi, "SetupUninstallOEMInfA"); GetCurrentDirectoryA(MAX_PATH, CURR_DIR); - if (pSetupCopyOEMInfA) - test_SetupCopyOEMInf(); - else - win_skip("SetupCopyOEMInfA is not available\n"); - + test_SetupCopyOEMInf(); test_SetupGetFileCompressionInfo(); if (pSetupGetFileCompressionInfoExA) @@ -854,14 +846,8 @@ START_TEST(misc) win_skip("SetupGetFileCompressionInfoExA is not available\n"); test_SetupDecompressOrCopyFile(); - - if (pSetupUninstallOEMInfA) - test_SetupUninstallOEMInf(); - else - win_skip("SetupUninstallOEMInfA is not available\n"); - + test_SetupUninstallOEMInf(); test_defaultcallback(); - test_SetupLogError(); test_CM_Get_Version(); } -- 2.21.0

1 3

[PATCH] ntdll: Created ADD_GTCTO environment variable that increases thread suspension time out.
by Vanida Plamondon 23 May '19

23 May '19

This patch was made as using an environment variable instead of a registry entry because it addresses unwanted/bugged behaviour. I could be wrong about that. With ADD_GTCTO=5000, Magic the Gathering: Arena's updater/ downloader completes without issue. It should work for other outdated unity-build games that suffer the same issue. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45546 Signed-off-by: Vanida Plamondon <vanida.plamondon(a)gmail.com> --- v1: Created ADD_GTCTO environment variable --- dlls/ntdll/thread.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 46de839400..09aa94ba65 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -23,6 +23,7 @@ #include <assert.h> #include <stdarg.h> +#include <stdlib.h> #include <limits.h> #include <sys/types.h> #ifdef HAVE_SYS_MMAN_H @@ -772,7 +773,11 @@ NTSTATUS set_thread_context( HANDLE handle, const context_t *context, BOOL *self NTSTATUS get_thread_context( HANDLE handle, context_t *context, unsigned int flags, BOOL *self ) { NTSTATUS ret; - DWORD dummy, i; + DWORD dummy, i, gtcto; + + /* get the ADD_GTCTO value, if any */ + const char *add_gtcto = getenv( "ADD_GTCTO" ); + gtcto = add_gtcto ? ( DWORD ) ( atol( add_gtcto) + 100 ) : 100; SERVER_START_REQ( get_thread_context ) { @@ -787,7 +792,7 @@ NTSTATUS get_thread_context( HANDLE handle, context_t *context, unsigned int fla if (ret == STATUS_PENDING) { - for (i = 0; i < 100; i++) + for (i = 0; i < gtcto; i++) { SERVER_START_REQ( get_thread_context ) { -- 2.20.1

1 0

[PATCH 1/5] strmbase: Use an unsigned int for the GetPin() callback.
by Zebediah Figura 23 May '19

23 May '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/evr/evr.c | 4 ++-- dlls/qcap/audiorecord.c | 5 ++--- dlls/qcap/avico.c | 15 ++++----------- dlls/qcap/avimux.c | 15 ++++++++------- dlls/qcap/smartteefilter.c | 18 +++++------------- dlls/qcap/vfwcapture.c | 4 ++-- dlls/qedit/samplegrabber.c | 6 +++--- dlls/quartz/filesource.c | 6 ++---- dlls/quartz/parser.c | 14 +++++--------- dlls/strmbase/filter.c | 2 +- dlls/strmbase/renderer.c | 4 ++-- dlls/strmbase/transform.c | 4 ++-- dlls/winegstreamer/gstdemux.c | 10 ++++------ dlls/wineqtdecoder/qtsplitter.c | 2 +- include/wine/strmbase.h | 2 +- 15 files changed, 44 insertions(+), 67 deletions(-) diff --git a/dlls/evr/evr.c b/dlls/evr/evr.c index 01e4ee4598..493696f465 100644 --- a/dlls/evr/evr.c +++ b/dlls/evr/evr.c @@ -191,9 +191,9 @@ static const IBaseFilterVtbl basefilter_vtbl = BaseFilterImpl_QueryVendorInfo }; -static IPin* WINAPI filter_GetPin(BaseFilter *iface, int position) +static IPin * WINAPI filter_GetPin(BaseFilter *iface, unsigned int index) { - FIXME("(%p, %d): stub!\n", iface, position); + FIXME("iface %p, index %u, stub!\n", iface, index); return NULL; } diff --git a/dlls/qcap/audiorecord.c b/dlls/qcap/audiorecord.c index 373bc9a025..1e5aa43cfb 100644 --- a/dlls/qcap/audiorecord.c +++ b/dlls/qcap/audiorecord.c @@ -171,10 +171,9 @@ static const IBaseFilterVtbl AudioRecordVtbl = { BaseFilterImpl_QueryVendorInfo }; -static IPin* WINAPI AudioRecord_GetPin(BaseFilter *iface, int pos) +static IPin * WINAPI AudioRecord_GetPin(BaseFilter *iface, unsigned int index) { - AudioRecord *This = impl_from_BaseFilter(iface); - FIXME("(%p, %d): stub\n", This, pos); + FIXME("iface %p, index %u, stub!\n", iface, index); return NULL; } diff --git a/dlls/qcap/avico.c b/dlls/qcap/avico.c index 5ea4016a65..770790da1c 100644 --- a/dlls/qcap/avico.c +++ b/dlls/qcap/avico.c @@ -244,24 +244,17 @@ static const IBaseFilterVtbl AVICompressorVtbl = { AVICompressor_QueryVendorInfo }; -static IPin* WINAPI AVICompressor_GetPin(BaseFilter *iface, int pos) +static IPin * WINAPI AVICompressor_GetPin(BaseFilter *iface, unsigned int index) { AVICompressor *This = impl_from_BaseFilter(iface); IPin *ret; - TRACE("(%p)->(%d)\n", This, pos); - - switch(pos) { - case 0: + if (index == 0) ret = &This->in->pin.IPin_iface; - break; - case 1: + else if (index == 1) ret = &This->out->pin.IPin_iface; - break; - default: - TRACE("No pin %d\n", pos); + else return NULL; - }; IPin_AddRef(ret); return ret; diff --git a/dlls/qcap/avimux.c b/dlls/qcap/avimux.c index ff45fb0112..ccec60c0b5 100644 --- a/dlls/qcap/avimux.c +++ b/dlls/qcap/avimux.c @@ -116,18 +116,19 @@ static inline AviMux* impl_from_BaseFilter(BaseFilter *filter) return CONTAINING_RECORD(filter, AviMux, filter); } -static IPin* WINAPI AviMux_GetPin(BaseFilter *iface, int pos) +static IPin * WINAPI AviMux_GetPin(BaseFilter *iface, unsigned int index) { AviMux *This = impl_from_BaseFilter(iface); - TRACE("(%p)->(%d)\n", This, pos); - - if(pos == 0) { + if (!index) + { IPin_AddRef(&This->out->pin.pin.IPin_iface); return &This->out->pin.pin.IPin_iface; - }else if(pos>0 && pos<=This->input_pin_no) { - IPin_AddRef(&This->in[pos-1]->pin.pin.IPin_iface); - return &This->in[pos-1]->pin.pin.IPin_iface; + } + else if (index <= This->input_pin_no) + { + IPin_AddRef(&This->in[index - 1]->pin.pin.IPin_iface); + return &This->in[index - 1]->pin.pin.IPin_iface; } return NULL; diff --git a/dlls/qcap/smartteefilter.c b/dlls/qcap/smartteefilter.c index cbcbc455ed..e16d08a759 100644 --- a/dlls/qcap/smartteefilter.c +++ b/dlls/qcap/smartteefilter.c @@ -199,27 +199,19 @@ static const IBaseFilterVtbl SmartTeeFilterVtbl = { BaseFilterImpl_QueryVendorInfo }; -static IPin* WINAPI SmartTeeFilter_GetPin(BaseFilter *iface, int pos) +static IPin * WINAPI SmartTeeFilter_GetPin(BaseFilter *iface, unsigned int index) { SmartTeeFilter *This = impl_from_BaseFilter(iface); IPin *ret; - TRACE("(%p)->(%d)\n", This, pos); - - switch(pos) { - case 0: + if (index == 0) ret = &This->input->pin.IPin_iface; - break; - case 1: + else if (index == 1) ret = &This->capture->pin.IPin_iface; - break; - case 2: + else if (index == 2) ret = &This->preview->pin.IPin_iface; - break; - default: - TRACE("No pin %d\n", pos); + else return NULL; - } IPin_AddRef(ret); return ret; diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index feb9c08e85..54d9e59786 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -192,11 +192,11 @@ static const IUnknownVtbl unknown_inner_vtbl = unknown_inner_Release, }; -static IPin* WINAPI VfwCapture_GetPin(BaseFilter *iface, int pos) +static IPin * WINAPI VfwCapture_GetPin(BaseFilter *iface, unsigned int index) { VfwCapture *This = impl_from_BaseFilter(iface); - if (pos >= 1 || pos < 0) + if (index >= 1) return NULL; IPin_AddRef(This->pOutputPin); diff --git a/dlls/qedit/samplegrabber.c b/dlls/qedit/samplegrabber.c index bc91f72af1..cbaca69962 100644 --- a/dlls/qedit/samplegrabber.c +++ b/dlls/qedit/samplegrabber.c @@ -339,14 +339,14 @@ static const IUnknownVtbl samplegrabber_vtbl = SampleGrabber_Release, }; -static IPin *WINAPI SampleGrabber_GetPin(BaseFilter *iface, int pos) +static IPin * WINAPI SampleGrabber_GetPin(BaseFilter *iface, unsigned int index) { SG_Impl *This = impl_from_BaseFilter(iface); IPin *pin; - if (pos == 0) + if (index == 0) pin = &This->pin_in.IPin_iface; - else if (pos == 1) + else if (index == 1) pin = &This->pin_out.IPin_iface; else return NULL; diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index a331d3359a..f3a2c43c63 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -392,13 +392,11 @@ HRESULT GetClassMediaFile(IAsyncReader * pReader, LPCOLESTR pszFileName, GUID * return hr; } -static IPin* WINAPI AsyncReader_GetPin(BaseFilter *iface, int pos) +static IPin * WINAPI AsyncReader_GetPin(BaseFilter *iface, unsigned int index) { AsyncReader *This = impl_from_BaseFilter(iface); - TRACE("%p->(%d)\n", This, pos); - - if (pos >= 1 || !This->pOutputPin) + if (index >= 1 || !This->pOutputPin) return NULL; IPin_AddRef(This->pOutputPin); diff --git a/dlls/quartz/parser.c b/dlls/quartz/parser.c index 2af8a1ff6d..e21908504a 100644 --- a/dlls/quartz/parser.c +++ b/dlls/quartz/parser.c @@ -62,19 +62,15 @@ static inline ParserImpl *impl_from_BaseFilter( BaseFilter *iface ) return CONTAINING_RECORD(iface, ParserImpl, filter); } -/* FIXME: WRONG */ -static IPin* WINAPI Parser_GetPin(BaseFilter *iface, int pos) +static IPin * WINAPI Parser_GetPin(BaseFilter *iface, unsigned int index) { - ParserImpl *This = impl_from_BaseFilter(iface); + ParserImpl *filter = impl_from_BaseFilter(iface); - TRACE("%p->(%x)\n", This, pos); - - /* Input pin also has a pin, hence the > and not >= */ - if (pos > This->cStreams || pos < 0) + if (index > filter->cStreams) return NULL; - IPin_AddRef(This->ppPins[pos]); - return This->ppPins[pos]; + IPin_AddRef(filter->ppPins[index]); + return filter->ppPins[index]; } static const BaseFilterFuncTable BaseFuncTable = { diff --git a/dlls/strmbase/filter.c b/dlls/strmbase/filter.c index 8bec368c15..c554097814 100644 --- a/dlls/strmbase/filter.c +++ b/dlls/strmbase/filter.c @@ -137,10 +137,10 @@ HRESULT WINAPI BaseFilterImpl_EnumPins(IBaseFilter *iface, IEnumPins **enum_pins HRESULT WINAPI BaseFilterImpl_FindPin(IBaseFilter *iface, const WCHAR *id, IPin **ret) { BaseFilter *This = impl_from_IBaseFilter(iface); + unsigned int i; PIN_INFO info; HRESULT hr; IPin *pin; - int i; TRACE("(%p)->(%s, %p)\n", This, debugstr_w(id), ret); diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index c6c7978235..cf6643befe 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -183,11 +183,11 @@ static const IPinVtbl BaseRenderer_InputPin_Vtbl = BaseInputPinImpl_NewSegment }; -static IPin* WINAPI BaseRenderer_GetPin(BaseFilter *iface, int pos) +static IPin * WINAPI BaseRenderer_GetPin(BaseFilter *iface, unsigned int index) { BaseRenderer *This = impl_from_BaseFilter(iface); - if (pos >= 1 || pos < 0) + if (index >= 1) return NULL; IPin_AddRef(&This->pInputPin->pin.IPin_iface); diff --git a/dlls/strmbase/transform.c b/dlls/strmbase/transform.c index b8eb60ce2e..8f156ae3de 100644 --- a/dlls/strmbase/transform.c +++ b/dlls/strmbase/transform.c @@ -128,11 +128,11 @@ static HRESULT WINAPI TransformFilter_Output_GetMediaType(BasePin *This, int iPo return S_OK; } -static IPin *WINAPI TransformFilter_GetPin(BaseFilter *iface, int index) +static IPin *WINAPI TransformFilter_GetPin(BaseFilter *iface, unsigned int index) { TransformFilter *filter = impl_from_BaseFilter(iface); - if (index >= 2 || index < 0) + if (index >= 2) return NULL; IPin_AddRef(filter->ppPins[index]); diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 3653f647c4..3e660216e8 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1192,20 +1192,18 @@ static inline GSTOutPin *impl_from_IMediaSeeking( IMediaSeeking *iface ) return CONTAINING_RECORD(iface, GSTOutPin, seek.IMediaSeeking_iface); } -static IPin* WINAPI GST_GetPin(BaseFilter *base, int pos) +static IPin* WINAPI GST_GetPin(BaseFilter *base, unsigned int index) { GSTImpl *This = impl_from_IBaseFilter(&base->IBaseFilter_iface); IPin *pin; - TRACE("%p: Asking for pos %x\n", This, pos); - - if (pos > This->cStreams || pos < 0) + if (index > This->cStreams) return NULL; - if (!pos) + if (!index) pin = &This->pInputPin.pin.IPin_iface; else - pin = &This->ppPins[pos - 1]->pin.pin.IPin_iface; + pin = &This->ppPins[index - 1]->pin.pin.IPin_iface; IPin_AddRef(pin); return pin; diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index 651a4a8c6b..6fd4554056 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -202,7 +202,7 @@ static inline QTSplitter *impl_from_IBaseFilter( IBaseFilter *iface ) * Base Filter */ -static IPin * WINAPI QT_GetPin(BaseFilter *base, int index) +static IPin * WINAPI QT_GetPin(BaseFilter *base, unsigned int index) { QTSplitter *filter = impl_from_BaseFilter(base); diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 2f150e8c48..c10e6e2123 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -168,7 +168,7 @@ typedef struct BaseFilter const struct BaseFilterFuncTable* pFuncsTable; } BaseFilter; -typedef IPin* (WINAPI *BaseFilter_GetPin)(BaseFilter* iface, int iPosition); +typedef IPin * (WINAPI *BaseFilter_GetPin)(BaseFilter *iface, unsigned int index); typedef struct BaseFilterFuncTable { /* Required */ -- 2.21.0

1 4

[PATCH] po: Update Finnish translation.
by Lauri Kenttä 23 May '19

23 May '19

Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> --- po/fi.po | 44 +++++++++++++------------------------------- 1 file changed, 13 insertions(+), 31 deletions(-) diff --git a/po/fi.po b/po/fi.po index 13840425d0..37811c3eec 100644 --- a/po/fi.po +++ b/po/fi.po @@ -6809,10 +6809,8 @@ msgid "Begin request has already been made.\n" msgstr "Aloituspyyntö on jo tehty.\n" #: mferror.mc:599 -#, fuzzy -#| msgid "Object is not initialized.\n" msgid "Sink has not been finalized.\n" -msgstr "Objektia ei ole alustettu.\n" +msgstr "Ulostuloa ei ole viimeistelty.\n" #: mferror.mc:32 msgid "Media Foundation platform is not initialized.\n" @@ -7087,68 +7085,52 @@ msgid "Unsupported media source characteristics.\n" msgstr "Medialähteen ominaisuuksia ei tueta.\n" #: mferror.mc:536 -#, fuzzy -#| msgid "Rate change was preempted.\n" msgid "Stream sink was removed.\n" -msgstr "Nopeuden vaihto sivuutettiin.\n" +msgstr "Virtaulostulo poistettiin.\n" #: mferror.mc:543 msgid "Stream sinks are out of sync.\n" -msgstr "" +msgstr "Virtaulostulojen ajoitus ei täsmää.\n" #: mferror.mc:550 -#, fuzzy -#| msgid "Media stream has no duration set.\n" msgid "Media sink stream sinks set is fixed.\n" -msgstr "Mediavirralla ei ole kestoa.\n" +msgstr "Mediaulostulon virtaulostuloja ei voi muuttaa.\n" #: mferror.mc:557 -#, fuzzy -#| msgid "Domain already exists.\n" msgid "Stream sink already exists.\n" -msgstr "Toimialue on jo olemassa.\n" +msgstr "Virtaulostulo on jo olemassa.\n" #: mferror.mc:564 -#, fuzzy -#| msgid "Operation was cancelled.\n" msgid "Sample allocation was canceled.\n" -msgstr "Toimenpide keskeytettiin.\n" +msgstr "Näytteen varaaminen keskeytettiin.\n" #: mferror.mc:571 -#, fuzzy -#| msgid "Directory is not empty.\n" msgid "Sample allocator is empty.\n" -msgstr "Hakemisto ei ole tyhjä.\n" +msgstr "Näytteenvaraaja on tyhjä.\n" #: mferror.mc:578 -#, fuzzy -#| msgid "Clock state was already set.\n" msgid "Sink was already stopped.\n" -msgstr "Kellon tila oli jo asetettu.\n" +msgstr "Ulostulo oli jo pysäytetty.\n" #: mferror.mc:585 msgid "Bitrate was unknown for ASF file sink.\n" -msgstr "" +msgstr "ASF-tiedoston siirtonopeus (bitrate) oli tuntematon.\n" #: mferror.mc:592 -#, fuzzy -#| msgid "No media streams were selected.\n" msgid "No streams were selected for the sink.\n" -msgstr "Mediavirtoja ei ole valittu.\n" +msgstr "Ulostulolle ei ole valittu mediavirtoja.\n" #: mferror.mc:606 -#, fuzzy -#| msgid "File name is too long.\n" msgid "Metadata was too long.\n" -msgstr "Tiedostonimi on liian pitkä.\n" +msgstr "Metatieto on liian pitkä.\n" #: mferror.mc:613 msgid "No samples were processed by the sink.\n" -msgstr "" +msgstr "Ulostulo ei käsitellyt näytteitä.\n" #: mferror.mc:620 msgid "Sink was not provided with required headers.\n" -msgstr "" +msgstr "Ulostulolle ei annettu tarvittavia otsikoita.\n" #: mferror.mc:627 msgid "Optional node is invalid.\n" -- 2.21.0

1 0

Re: [PATCH] gdiplus: add version resource
by Louis Lenders 23 May '19

23 May '19

>> Is there a specific reason not to use latest versions? As we ''mimic'' win7 by default I chose this one. That`s the only reason. 2019-05-23 19:02 GMT+02:00, Louis Lenders <xerox.xerox2000x(a)gmail.com>: > As we ''mimic'' win7 by default I chose this one. That`s the only reason. > > 2019-05-23 17:38 GMT+02:00, Zhiyi Zhang <zzhang(a)codeweavers.com>: >> >> >> On 5/23/19 11:23 PM, Louis Lenders wrote: >>> >>> https://bugs.winehq.org/show_bug.cgi?id=47137 >>> >>> >>> >>> Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> >>> --- >>> dlls/gdiplus/gdiplus.rc | 9 +++++++++ >>> 1 file changed, 9 insertions(+) >>> >>> diff --git a/dlls/gdiplus/gdiplus.rc b/dlls/gdiplus/gdiplus.rc >>> index 5c7e2cfe97..6191c1ab15 100644 >>> --- a/dlls/gdiplus/gdiplus.rc >>> +++ b/dlls/gdiplus/gdiplus.rc >>> @@ -18,6 +18,15 @@ >>> * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA >>> 02110-1301, >>> USA >>> */ >>> >>> +#define WINE_FILEDESCRIPTION_STR "Wine gdiplus" >>> +#define WINE_FILENAME_STR "gdiplus.dll" >>> +#define WINE_FILEVERSION 6,1,7601,17514 >>> +#define WINE_FILEVERSION_STR "6.1.7601.17514" >>> +#define WINE_PRODUCTVERSION 6,1,7601,17514 >>> +#define WINE_PRODUCTVERSION_STR "6.1.7601.17514" >> Is there a specific reason not to use latest versions? >> >>> + >>> +#include "wine/wine_common_ver.rc" >>> + >>> /* @makedep: gdiplus.manifest */ >>> WINE_MANIFEST 24 gdiplus.manifest >>> >> >> >

1 0

[PATCH 2/3] server: Store pending flag in async object.
by Jacek Caban 23 May '19

23 May '19

Instead of abusing direct_result. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- server/async.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)

2 1

[PATCH 1/3] ntdll: Introduce wait_async helper.
by Jacek Caban 23 May '19

23 May '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/file.c | 36 ++++++++++-------------------------- 1 file changed, 10 insertions(+), 26 deletions(-)

1 0

[PATCHv2] xaudio2: Use new features from FAudio 19.06 (but keep compatibility for <=19.05)
by elee＠codeweavers.com 23 May '19

23 May '19

From: Ethan Lee <elee(a)codeweavers.com> Signed-off-by: Ethan Lee <elee(a)codeweavers.com> --- configure.ac | 4 ++++ dlls/xaudio2_7/x3daudio.c | 6 ++++++ dlls/xaudio2_7/xaudio_dll.c | 6 +++++- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index ae8e85b356..c477796caf 100644 --- a/configure.ac +++ b/configure.ac @@ -1690,6 +1690,10 @@ then WINE_PACKAGE_FLAGS(FAUDIO,[faudio],[-lFAudio],,, [AC_CHECK_HEADERS([FAudio.h], [WINE_CHECK_SONAME(FAudio,FAudioCreate,,,[$FAUDIO_LIBS],[[libFAudio*]])])]) + WINE_CHECK_LIB_FUNCS(\ + FAudio_CommitOperationSet \ + F3DAudioInitialize8, + [$FAUDIO_LIBS]) fi WINE_NOTICE_WITH(faudio,[test "x$ac_cv_lib_soname_FAudio" = "x"], [libFAudio ${notice_platform}development files not found, XAudio2 won't be supported.]) diff --git a/dlls/xaudio2_7/x3daudio.c b/dlls/xaudio2_7/x3daudio.c index ee3367e092..5bc7c8473c 100644 --- a/dlls/xaudio2_7/x3daudio.c +++ b/dlls/xaudio2_7/x3daudio.c @@ -17,6 +17,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "config.h" + #include <stdarg.h> #include "windef.h" @@ -51,8 +53,12 @@ HRESULT CDECL X3DAudioInitialize(UINT32 chanmask, float speedofsound, X3DAUDIO_HANDLE handle) { TRACE("0x%x, %f, %p\n", chanmask, speedofsound, handle); +#ifdef HAVE_F3DAUDIOINITIALIZE8 + return F3DAudioInitialize8(chanmask, speedofsound, handle); +#else F3DAudioInitialize(chanmask, speedofsound, handle); return S_OK; +#endif } #endif /* XAUDIO2_VER >= 8 */ diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index da21cc0353..70889176a4 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -1796,9 +1796,13 @@ static HRESULT WINAPI IXAudio2Impl_CommitChanges(IXAudio2 *iface, { IXAudio2Impl *This = impl_from_IXAudio2(iface); - TRACE("(%p)->(0x%x): stub!\n", This, operationSet); + TRACE("(%p)->(0x%x)\n", This, operationSet); +#ifdef HAVE_FAUDIO_COMMITOPERATIONSET + return FAudio_CommitOperationSet(This->faudio, operationSet); +#else return FAudio_CommitChanges(This->faudio); +#endif } static void WINAPI IXAudio2Impl_GetPerformanceData(IXAudio2 *iface, -- 2.21.0

3 2

[PATCH v3 8/8] gdi32/tests: Add D3DKMTCheckOcclusion tests.
by Zhiyi Zhang 23 May '19

23 May '19

Mostly to show that D3DKMTCheckOcclusion is mainly composed of ownership checks rather than actually window occlusion. Also composition status doesn't affect its behavior despite MSDN say so. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/gdi32/tests/driver.c | 206 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 206 insertions(+) diff --git a/dlls/gdi32/tests/driver.c b/dlls/gdi32/tests/driver.c index e46ec7bb80..14b7409060 100644 --- a/dlls/gdi32/tests/driver.c +++ b/dlls/gdi32/tests/driver.c @@ -27,12 +27,14 @@ #include "wingdi.h" #include "winuser.h" #include "winternl.h" +#include "dwmapi.h" #include "ddk/d3dkmthk.h" #include "wine/test.h" static const WCHAR display1W[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y','1',0}; +static NTSTATUS (WINAPI *pD3DKMTCheckOcclusion)(const D3DKMT_CHECKOCCLUSION *); static NTSTATUS (WINAPI *pD3DKMTCheckVidPnExclusiveOwnership)(const D3DKMT_CHECKVIDPNEXCLUSIVEOWNERSHIP *); static NTSTATUS (WINAPI *pD3DKMTCloseAdapter)(const D3DKMT_CLOSEADAPTER *); static NTSTATUS (WINAPI *pD3DKMTCreateDevice)(D3DKMT_CREATEDEVICE *); @@ -40,6 +42,7 @@ static NTSTATUS (WINAPI *pD3DKMTDestroyDevice)(const D3DKMT_DESTROYDEVICE *); static NTSTATUS (WINAPI *pD3DKMTOpenAdapterFromGdiDisplayName)(D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME *); static NTSTATUS (WINAPI *pD3DKMTOpenAdapterFromHdc)(D3DKMT_OPENADAPTERFROMHDC *); static NTSTATUS (WINAPI *pD3DKMTSetVidPnSourceOwner)(const D3DKMT_SETVIDPNSOURCEOWNER *); +static HRESULT (WINAPI *pDwmEnableComposition)(UINT); static void test_D3DKMTOpenAdapterFromGdiDisplayName(void) { @@ -615,10 +618,208 @@ static void test_D3DKMTSetVidPnSourceOwner(void) ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); } +static void test_D3DKMTCheckOcclusion(void) +{ + DISPLAY_DEVICEW display_device = {sizeof(display_device)}; + D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME open_adapter_gdi_desc; + D3DKMT_CHECKVIDPNEXCLUSIVEOWNERSHIP check_owner_desc; + D3DKMT_SETVIDPNSOURCEOWNER set_owner_desc; + D3DKMT_DESTROYDEVICE destroy_device_desc; + D3DKMT_VIDPNSOURCEOWNER_TYPE owner_type; + D3DKMT_CLOSEADAPTER close_adapter_desc; + D3DKMT_CREATEDEVICE create_device_desc; + D3DKMT_CHECKOCCLUSION occlusion_desc; + NTSTATUS expected_occlusion, status; + INT i, adapter_count = 0; + HWND hwnd, hwnd2; + HRESULT hr; + + if (!pD3DKMTCheckOcclusion || pD3DKMTCheckOcclusion(NULL) == STATUS_PROCEDURE_NOT_FOUND) + { + skip("D3DKMTCheckOcclusion() is unavailable.\n"); + return; + } + + /* NULL parameter check */ + status = pD3DKMTCheckOcclusion(NULL); + ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); + + occlusion_desc.hWnd = NULL; + status = pD3DKMTCheckOcclusion(&occlusion_desc); + ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); + + hwnd = CreateWindowA("static", "static1", WS_OVERLAPPEDWINDOW | WS_VISIBLE, 0, 0, 200, 200, 0, 0, 0, 0); + ok(hwnd != NULL, "Failed to create window.\n"); + + occlusion_desc.hWnd = hwnd; + status = pD3DKMTCheckOcclusion(&occlusion_desc); + ok(status == STATUS_SUCCESS, "Got unexpected return code %#x.\n", status); + + /* Minimized state doesn't affect D3DKMTCheckOcclusion */ + ShowWindow(hwnd, SW_MINIMIZE); + occlusion_desc.hWnd = hwnd; + status = pD3DKMTCheckOcclusion(&occlusion_desc); + ok(status == STATUS_SUCCESS, "Got unexpected return code %#x.\n", status); + ShowWindow(hwnd, SW_SHOWNORMAL); + + /* Invisible state doesn't affect D3DKMTCheckOcclusion */ + ShowWindow(hwnd, SW_HIDE); + occlusion_desc.hWnd = hwnd; + status = pD3DKMTCheckOcclusion(&occlusion_desc); + ok(status == STATUS_SUCCESS, "Got unexpected return code %#x.\n", status); + ShowWindow(hwnd, SW_SHOW); + + /* hwnd2 covers hwnd */ + hwnd2 = CreateWindowA("static", "static2", WS_OVERLAPPEDWINDOW | WS_VISIBLE, 100, 100, 200, 200, 0, 0, 0, 0); + ok(hwnd2 != NULL, "Failed to create window.\n"); + + occlusion_desc.hWnd = hwnd; + status = pD3DKMTCheckOcclusion(&occlusion_desc); + ok(status == STATUS_SUCCESS, "Got unexpected return code %#x.\n", status); + + occlusion_desc.hWnd = hwnd2; + status = pD3DKMTCheckOcclusion(&occlusion_desc); + ok(status == STATUS_SUCCESS, "Got unexpected return code %#x.\n", status); + + /* Composition doesn't affect D3DKMTCheckOcclusion */ + if (pDwmEnableComposition) + { + hr = pDwmEnableComposition(DWM_EC_DISABLECOMPOSITION); + ok(hr == S_OK, "Failed to disable composition.\n"); + + occlusion_desc.hWnd = hwnd; + status = pD3DKMTCheckOcclusion(&occlusion_desc); + /* This result means that D3DKMTCheckOcclusion doesn't check composition status despite MSDN says it will */ + ok(status == STATUS_SUCCESS, "Got unexpected return code %#x.\n", status); + + occlusion_desc.hWnd = hwnd2; + status = pD3DKMTCheckOcclusion(&occlusion_desc); + ok(status == STATUS_SUCCESS, "Got unexpected return code %#x.\n", status); + + ShowWindow(hwnd, SW_MINIMIZE); + occlusion_desc.hWnd = hwnd; + status = pD3DKMTCheckOcclusion(&occlusion_desc); + ok(status == STATUS_SUCCESS, "Got unexpected return code %#x.\n", status); + ShowWindow(hwnd, SW_SHOWNORMAL); + + ShowWindow(hwnd, SW_HIDE); + occlusion_desc.hWnd = hwnd; + status = pD3DKMTCheckOcclusion(&occlusion_desc); + ok(status == STATUS_SUCCESS, "Got unexpected return code %#x.\n", status); + ShowWindow(hwnd, SW_SHOW); + + hr = pDwmEnableComposition(DWM_EC_ENABLECOMPOSITION); + ok(hr == S_OK, "Failed to enable composition.\n"); + } + else + skip("Skip testing composition.\n"); + + if (!(pD3DKMTCheckVidPnExclusiveOwnership && pD3DKMTCloseAdapter && pD3DKMTCreateDevice && pD3DKMTDestroyDevice + && pD3DKMTOpenAdapterFromGdiDisplayName && pD3DKMTSetVidPnSourceOwner)) + { + skip("Required functions are unavailable.\n"); + DestroyWindow(hwnd2); + goto done; + } + + lstrcpyW(open_adapter_gdi_desc.DeviceName, display1W); + status = pD3DKMTOpenAdapterFromGdiDisplayName(&open_adapter_gdi_desc); + ok(status == STATUS_SUCCESS, "Got unexpected return code %#x.\n", status); + + memset(&create_device_desc, 0, sizeof(create_device_desc)); + create_device_desc.hAdapter = open_adapter_gdi_desc.hAdapter; + status = pD3DKMTCreateDevice(&create_device_desc); + ok(status == STATUS_SUCCESS, "Got unexpected return code %#x.\n", status); + + check_owner_desc.hAdapter = open_adapter_gdi_desc.hAdapter; + check_owner_desc.VidPnSourceId = open_adapter_gdi_desc.VidPnSourceId; + status = pD3DKMTCheckVidPnExclusiveOwnership(&check_owner_desc); + ok(status == STATUS_SUCCESS, "Got unexpected return code %#x.\n", status); + + /* Test D3DKMTCheckOcclusion relationship with video present source owner */ + set_owner_desc.hDevice = create_device_desc.hDevice; + owner_type = D3DKMT_VIDPNSOURCEOWNER_EXCLUSIVE; + set_owner_desc.pType = &owner_type; + set_owner_desc.pVidPnSourceId = &open_adapter_gdi_desc.VidPnSourceId; + set_owner_desc.VidPnSourceCount = 1; + status = pD3DKMTSetVidPnSourceOwner(&set_owner_desc); + ok(status == STATUS_SUCCESS, "Got unexpected return code %#x.\n", status); + + for (i = 0; EnumDisplayDevicesW(NULL, i, &display_device, 0); ++i) + { + if ((display_device.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP)) + adapter_count++; + } + /* STATUS_GRAPHICS_PRESENT_OCCLUDED on single monitor system. STATUS_SUCCESS on multiple monitor system. */ + expected_occlusion = adapter_count > 1 ? STATUS_SUCCESS : STATUS_GRAPHICS_PRESENT_OCCLUDED; + + occlusion_desc.hWnd = hwnd; + status = pD3DKMTCheckOcclusion(&occlusion_desc); + ok(status == expected_occlusion, "Got unexpected return code %#x.\n", status); + + /* Note hwnd2 is not actually occluded but D3DKMTCheckOcclusion reports STATUS_GRAPHICS_PRESENT_OCCLUDED as well */ + SetWindowPos(hwnd2, HWND_TOP, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE); + ShowWindow(hwnd2, SW_SHOW); + occlusion_desc.hWnd = hwnd2; + status = pD3DKMTCheckOcclusion(&occlusion_desc); + ok(status == expected_occlusion, "Got unexpected return code %#x.\n", status); + + /* Now hwnd is HWND_TOPMOST. Still reports STATUS_GRAPHICS_PRESENT_OCCLUDED */ + ok(SetWindowPos(hwnd, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE), "Failed to SetWindowPos.\n"); + ok(GetWindowLongW(hwnd, GWL_EXSTYLE) & WS_EX_TOPMOST, "No WS_EX_TOPMOST style.\n"); + occlusion_desc.hWnd = hwnd; + status = pD3DKMTCheckOcclusion(&occlusion_desc); + ok(status == expected_occlusion, "Got unexpected return code %#x.\n", status); + + DestroyWindow(hwnd2); + occlusion_desc.hWnd = hwnd; + status = pD3DKMTCheckOcclusion(&occlusion_desc); + ok(status == expected_occlusion, "Got unexpected return code %#x.\n", status); + + check_owner_desc.hAdapter = open_adapter_gdi_desc.hAdapter; + check_owner_desc.VidPnSourceId = open_adapter_gdi_desc.VidPnSourceId; + status = pD3DKMTCheckVidPnExclusiveOwnership(&check_owner_desc); + ok(status == STATUS_GRAPHICS_PRESENT_OCCLUDED, "Got unexpected return code %#x.\n", status); + + /* Unset video present source owner */ + set_owner_desc.hDevice = create_device_desc.hDevice; + set_owner_desc.pType = NULL; + set_owner_desc.pVidPnSourceId = NULL; + set_owner_desc.VidPnSourceCount = 0; + status = pD3DKMTSetVidPnSourceOwner(&set_owner_desc); + ok(status == STATUS_SUCCESS, "Got unexpected return code %#x.\n", status); + + occlusion_desc.hWnd = hwnd; + status = pD3DKMTCheckOcclusion(&occlusion_desc); + ok(status == STATUS_SUCCESS, "Got unexpected return code %#x.\n", status); + + check_owner_desc.hAdapter = open_adapter_gdi_desc.hAdapter; + check_owner_desc.VidPnSourceId = open_adapter_gdi_desc.VidPnSourceId; + status = pD3DKMTCheckVidPnExclusiveOwnership(&check_owner_desc); + /* D3DKMTCheckVidPnExclusiveOwnership gets STATUS_GRAPHICS_PRESENT_UNOCCLUDED sometimes and with some delay, + * it will always return STATUS_SUCCESS. So there are some timing issues here. */ + ok(status == STATUS_SUCCESS || status == STATUS_GRAPHICS_PRESENT_UNOCCLUDED, "Got unexpected return code %#x.\n", status); + + destroy_device_desc.hDevice = create_device_desc.hDevice; + status = pD3DKMTDestroyDevice(&destroy_device_desc); + ok(status == STATUS_SUCCESS, "Got unexpected return code %#x.\n", status); + +done: + if (pD3DKMTCloseAdapter) + { + close_adapter_desc.hAdapter = open_adapter_gdi_desc.hAdapter; + status = pD3DKMTCloseAdapter(&close_adapter_desc); + ok(status == STATUS_SUCCESS, "Got unexpected return code %#x.\n", status); + } + DestroyWindow(hwnd); +} + START_TEST(driver) { HMODULE gdi32 = LoadLibraryA("gdi32.dll"); + HMODULE dwmapi = LoadLibraryA("dwmapi.dll"); + pD3DKMTCheckOcclusion = (void *)GetProcAddress(gdi32, "D3DKMTCheckOcclusion"); pD3DKMTCheckVidPnExclusiveOwnership = (void *)GetProcAddress(gdi32, "D3DKMTCheckVidPnExclusiveOwnership"); pD3DKMTCloseAdapter = (void *)GetProcAddress(gdi32, "D3DKMTCloseAdapter"); pD3DKMTCreateDevice = (void *)GetProcAddress(gdi32, "D3DKMTCreateDevice"); @@ -627,6 +828,10 @@ START_TEST(driver) pD3DKMTOpenAdapterFromHdc = (void *)GetProcAddress(gdi32, "D3DKMTOpenAdapterFromHdc"); pD3DKMTSetVidPnSourceOwner = (void *)GetProcAddress(gdi32, "D3DKMTSetVidPnSourceOwner"); + if (dwmapi) + pDwmEnableComposition = (void *)GetProcAddress(dwmapi, "DwmEnableComposition"); + + test_D3DKMTCheckOcclusion(); test_D3DKMTCheckVidPnExclusiveOwnership(); test_D3DKMTCloseAdapter(); test_D3DKMTCreateDevice(); @@ -636,4 +841,5 @@ START_TEST(driver) test_D3DKMTSetVidPnSourceOwner(); FreeLibrary(gdi32); + FreeLibrary(dwmapi); } -- 2.20.1

1 0

[PATCH v3 7/8] gdi32/tests: Add D3DKMTSetVidPnSourceOwner tests.
by Zhiyi Zhang 23 May '19

23 May '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/gdi32/tests/driver.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/dlls/gdi32/tests/driver.c b/dlls/gdi32/tests/driver.c index becb25deea..e46ec7bb80 100644 --- a/dlls/gdi32/tests/driver.c +++ b/dlls/gdi32/tests/driver.c @@ -592,6 +592,29 @@ static void test_D3DKMTCheckVidPnExclusiveOwnership(void) ok(status == STATUS_SUCCESS, "Got unexpected return code %#x.\n", status); } +static void test_D3DKMTSetVidPnSourceOwner(void) +{ + D3DKMT_SETVIDPNSOURCEOWNER set_owner_desc = {0}; + NTSTATUS status; + + if (!pD3DKMTSetVidPnSourceOwner || pD3DKMTSetVidPnSourceOwner(&set_owner_desc) == STATUS_PROCEDURE_NOT_FOUND) + { + skip("D3DKMTSetVidPnSourceOwner() is unavailable.\n"); + return; + } + + /* Invalid parameters */ + /* Crash on windows */ + if (0) + { + status = pD3DKMTSetVidPnSourceOwner(NULL); + ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); + } + + status = pD3DKMTSetVidPnSourceOwner(&set_owner_desc); + ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); +} + START_TEST(driver) { HMODULE gdi32 = LoadLibraryA("gdi32.dll"); @@ -610,6 +633,7 @@ START_TEST(driver) test_D3DKMTDestroyDevice(); test_D3DKMTOpenAdapterFromGdiDisplayName(); test_D3DKMTOpenAdapterFromHdc(); + test_D3DKMTSetVidPnSourceOwner(); FreeLibrary(gdi32); } -- 2.20.1

1 0

[PATCH v3 6/8] gdi32/tests: Add D3DKMTCheckVidPnExclusiveOwnership tests.
by Zhiyi Zhang 23 May '19

23 May '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/gdi32/tests/driver.c | 345 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 345 insertions(+) diff --git a/dlls/gdi32/tests/driver.c b/dlls/gdi32/tests/driver.c index 87cd76adcc..becb25deea 100644 --- a/dlls/gdi32/tests/driver.c +++ b/dlls/gdi32/tests/driver.c @@ -33,11 +33,13 @@ static const WCHAR display1W[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y','1',0}; +static NTSTATUS (WINAPI *pD3DKMTCheckVidPnExclusiveOwnership)(const D3DKMT_CHECKVIDPNEXCLUSIVEOWNERSHIP *); static NTSTATUS (WINAPI *pD3DKMTCloseAdapter)(const D3DKMT_CLOSEADAPTER *); static NTSTATUS (WINAPI *pD3DKMTCreateDevice)(D3DKMT_CREATEDEVICE *); static NTSTATUS (WINAPI *pD3DKMTDestroyDevice)(const D3DKMT_DESTROYDEVICE *); static NTSTATUS (WINAPI *pD3DKMTOpenAdapterFromGdiDisplayName)(D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME *); static NTSTATUS (WINAPI *pD3DKMTOpenAdapterFromHdc)(D3DKMT_OPENADAPTERFROMHDC *); +static NTSTATUS (WINAPI *pD3DKMTSetVidPnSourceOwner)(const D3DKMT_SETVIDPNSOURCEOWNER *); static void test_D3DKMTOpenAdapterFromGdiDisplayName(void) { @@ -250,16 +252,359 @@ static void test_D3DKMTDestroyDevice(void) todo_wine ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); } +static void test_D3DKMTCheckVidPnExclusiveOwnership(void) +{ + static const DWORD timeout = 1000; + static const DWORD wait_step = 100; + D3DKMT_CREATEDEVICE create_device_desc, create_device_desc2; + D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME open_adapter_gdi_desc; + D3DKMT_CHECKVIDPNEXCLUSIVEOWNERSHIP check_owner_desc; + D3DKMT_DESTROYDEVICE destroy_device_desc; + D3DKMT_CLOSEADAPTER close_adapter_desc; + D3DKMT_VIDPNSOURCEOWNER_TYPE owner_type; + D3DKMT_SETVIDPNSOURCEOWNER set_owner_desc; + DWORD total_time; + NTSTATUS status; + INT i; + + /* Test cases using single device */ + static const struct test_data1 + { + D3DKMT_VIDPNSOURCEOWNER_TYPE owner_type; + NTSTATUS expected_set_status; + NTSTATUS expected_check_status; + } tests1[] = { + /* 0 */ + {-1, STATUS_SUCCESS, STATUS_SUCCESS}, + {D3DKMT_VIDPNSOURCEOWNER_UNOWNED, STATUS_SUCCESS, STATUS_SUCCESS}, + {-1, STATUS_SUCCESS, STATUS_SUCCESS}, + {D3DKMT_VIDPNSOURCEOWNER_SHARED, STATUS_GRAPHICS_VIDPN_SOURCE_IN_USE, STATUS_SUCCESS}, + {-1, STATUS_SUCCESS, STATUS_SUCCESS}, + {D3DKMT_VIDPNSOURCEOWNER_EXCLUSIVE, STATUS_SUCCESS, STATUS_GRAPHICS_PRESENT_OCCLUDED}, + {-1, STATUS_SUCCESS, STATUS_SUCCESS}, + {D3DKMT_VIDPNSOURCEOWNER_EXCLUSIVEGDI, STATUS_INVALID_PARAMETER, STATUS_SUCCESS}, + {-1, STATUS_SUCCESS, STATUS_SUCCESS}, + {D3DKMT_VIDPNSOURCEOWNER_EMULATED, STATUS_SUCCESS, STATUS_SUCCESS}, + /* 10 */ + {-1, STATUS_SUCCESS, STATUS_SUCCESS}, + {D3DKMT_VIDPNSOURCEOWNER_UNOWNED, STATUS_SUCCESS, STATUS_SUCCESS}, + {D3DKMT_VIDPNSOURCEOWNER_UNOWNED, STATUS_SUCCESS, STATUS_SUCCESS}, + {-1, STATUS_SUCCESS, STATUS_SUCCESS}, + {D3DKMT_VIDPNSOURCEOWNER_UNOWNED, STATUS_SUCCESS, STATUS_SUCCESS}, + {D3DKMT_VIDPNSOURCEOWNER_SHARED, STATUS_GRAPHICS_VIDPN_SOURCE_IN_USE, STATUS_SUCCESS}, + {-1, STATUS_SUCCESS, STATUS_SUCCESS}, + {D3DKMT_VIDPNSOURCEOWNER_UNOWNED, STATUS_SUCCESS, STATUS_SUCCESS}, + {D3DKMT_VIDPNSOURCEOWNER_EXCLUSIVE, STATUS_SUCCESS, STATUS_GRAPHICS_PRESENT_OCCLUDED}, + {-1, STATUS_SUCCESS, STATUS_SUCCESS}, + /* 20 */ + {D3DKMT_VIDPNSOURCEOWNER_UNOWNED, STATUS_SUCCESS, STATUS_SUCCESS}, + {D3DKMT_VIDPNSOURCEOWNER_EMULATED, STATUS_SUCCESS, STATUS_SUCCESS}, + {-1, STATUS_SUCCESS, STATUS_SUCCESS}, + {D3DKMT_VIDPNSOURCEOWNER_SHARED, STATUS_GRAPHICS_VIDPN_SOURCE_IN_USE, STATUS_SUCCESS}, + {D3DKMT_VIDPNSOURCEOWNER_UNOWNED, STATUS_SUCCESS, STATUS_SUCCESS}, + {-1, STATUS_SUCCESS, STATUS_SUCCESS}, + {D3DKMT_VIDPNSOURCEOWNER_SHARED, STATUS_GRAPHICS_VIDPN_SOURCE_IN_USE, STATUS_SUCCESS}, + {D3DKMT_VIDPNSOURCEOWNER_SHARED, STATUS_GRAPHICS_VIDPN_SOURCE_IN_USE, STATUS_SUCCESS}, + {-1, STATUS_SUCCESS, STATUS_SUCCESS}, + {D3DKMT_VIDPNSOURCEOWNER_SHARED, STATUS_GRAPHICS_VIDPN_SOURCE_IN_USE, STATUS_SUCCESS}, + /* 30 */ + {D3DKMT_VIDPNSOURCEOWNER_EXCLUSIVE, STATUS_SUCCESS, STATUS_GRAPHICS_PRESENT_OCCLUDED}, + {-1, STATUS_SUCCESS, STATUS_SUCCESS}, + {D3DKMT_VIDPNSOURCEOWNER_SHARED, STATUS_GRAPHICS_VIDPN_SOURCE_IN_USE, STATUS_SUCCESS}, + {D3DKMT_VIDPNSOURCEOWNER_EMULATED, STATUS_SUCCESS, STATUS_SUCCESS}, + {-1, STATUS_SUCCESS, STATUS_SUCCESS}, + {D3DKMT_VIDPNSOURCEOWNER_EXCLUSIVE, STATUS_SUCCESS, STATUS_GRAPHICS_PRESENT_OCCLUDED}, + {D3DKMT_VIDPNSOURCEOWNER_UNOWNED, STATUS_SUCCESS, STATUS_SUCCESS}, + {-1, STATUS_SUCCESS, STATUS_SUCCESS}, + {D3DKMT_VIDPNSOURCEOWNER_EXCLUSIVE, STATUS_SUCCESS, STATUS_GRAPHICS_PRESENT_OCCLUDED}, + {D3DKMT_VIDPNSOURCEOWNER_SHARED, STATUS_INVALID_PARAMETER, STATUS_GRAPHICS_PRESENT_OCCLUDED}, + /* 40 */ + {-1, STATUS_SUCCESS, STATUS_SUCCESS}, + {D3DKMT_VIDPNSOURCEOWNER_EXCLUSIVE, STATUS_SUCCESS, STATUS_GRAPHICS_PRESENT_OCCLUDED}, + {D3DKMT_VIDPNSOURCEOWNER_EXCLUSIVE, STATUS_SUCCESS, STATUS_GRAPHICS_PRESENT_OCCLUDED}, + {-1, STATUS_SUCCESS, STATUS_SUCCESS}, + {D3DKMT_VIDPNSOURCEOWNER_EXCLUSIVE, STATUS_SUCCESS, STATUS_GRAPHICS_PRESENT_OCCLUDED}, + {D3DKMT_VIDPNSOURCEOWNER_EMULATED, STATUS_INVALID_PARAMETER, STATUS_GRAPHICS_PRESENT_OCCLUDED}, + {-1, STATUS_SUCCESS, STATUS_SUCCESS}, + {D3DKMT_VIDPNSOURCEOWNER_EMULATED, STATUS_SUCCESS, STATUS_SUCCESS}, + {D3DKMT_VIDPNSOURCEOWNER_UNOWNED, STATUS_SUCCESS, STATUS_SUCCESS}, + {-1, STATUS_SUCCESS, STATUS_SUCCESS}, + /* 50 */ + {D3DKMT_VIDPNSOURCEOWNER_EMULATED, STATUS_SUCCESS, STATUS_SUCCESS}, + {D3DKMT_VIDPNSOURCEOWNER_SHARED, STATUS_GRAPHICS_VIDPN_SOURCE_IN_USE, STATUS_SUCCESS}, + {-1, STATUS_SUCCESS, STATUS_SUCCESS}, + {D3DKMT_VIDPNSOURCEOWNER_EMULATED, STATUS_SUCCESS, STATUS_SUCCESS}, + {D3DKMT_VIDPNSOURCEOWNER_EXCLUSIVE, STATUS_INVALID_PARAMETER, STATUS_SUCCESS}, + {-1, STATUS_SUCCESS, STATUS_SUCCESS}, + {D3DKMT_VIDPNSOURCEOWNER_EMULATED, STATUS_SUCCESS, STATUS_SUCCESS}, + {D3DKMT_VIDPNSOURCEOWNER_EMULATED, STATUS_SUCCESS, STATUS_SUCCESS}, + {-1, STATUS_SUCCESS, STATUS_SUCCESS}, + {D3DKMT_VIDPNSOURCEOWNER_EMULATED + 1, STATUS_INVALID_PARAMETER, STATUS_SUCCESS}, + }; + + /* Test cases using two devices consecutively */ + static const struct test_data2 + { + D3DKMT_VIDPNSOURCEOWNER_TYPE set_owner_type1; + D3DKMT_VIDPNSOURCEOWNER_TYPE set_owner_type2; + NTSTATUS expected_set_status1; + NTSTATUS expected_set_status2; + NTSTATUS expected_check_status; + } tests2[] = { + /* 0 */ + {D3DKMT_VIDPNSOURCEOWNER_UNOWNED, D3DKMT_VIDPNSOURCEOWNER_UNOWNED, STATUS_SUCCESS, STATUS_SUCCESS, STATUS_SUCCESS}, + {D3DKMT_VIDPNSOURCEOWNER_UNOWNED, D3DKMT_VIDPNSOURCEOWNER_SHARED, STATUS_SUCCESS, STATUS_GRAPHICS_VIDPN_SOURCE_IN_USE, STATUS_SUCCESS}, + {D3DKMT_VIDPNSOURCEOWNER_UNOWNED, D3DKMT_VIDPNSOURCEOWNER_EXCLUSIVE, STATUS_SUCCESS, STATUS_SUCCESS, STATUS_GRAPHICS_PRESENT_OCCLUDED}, + {D3DKMT_VIDPNSOURCEOWNER_UNOWNED, D3DKMT_VIDPNSOURCEOWNER_EMULATED, STATUS_SUCCESS, STATUS_SUCCESS, STATUS_SUCCESS}, + {D3DKMT_VIDPNSOURCEOWNER_SHARED, D3DKMT_VIDPNSOURCEOWNER_UNOWNED, STATUS_GRAPHICS_VIDPN_SOURCE_IN_USE, STATUS_SUCCESS, STATUS_SUCCESS}, + {D3DKMT_VIDPNSOURCEOWNER_SHARED, D3DKMT_VIDPNSOURCEOWNER_SHARED, STATUS_GRAPHICS_VIDPN_SOURCE_IN_USE, STATUS_GRAPHICS_VIDPN_SOURCE_IN_USE, STATUS_SUCCESS}, + {D3DKMT_VIDPNSOURCEOWNER_SHARED, D3DKMT_VIDPNSOURCEOWNER_EXCLUSIVE, STATUS_GRAPHICS_VIDPN_SOURCE_IN_USE, STATUS_SUCCESS, STATUS_GRAPHICS_PRESENT_OCCLUDED}, + {D3DKMT_VIDPNSOURCEOWNER_SHARED, D3DKMT_VIDPNSOURCEOWNER_EMULATED, STATUS_GRAPHICS_VIDPN_SOURCE_IN_USE, STATUS_SUCCESS, STATUS_SUCCESS}, + {D3DKMT_VIDPNSOURCEOWNER_EXCLUSIVE, D3DKMT_VIDPNSOURCEOWNER_UNOWNED, STATUS_SUCCESS, STATUS_SUCCESS, STATUS_GRAPHICS_PRESENT_OCCLUDED}, + {D3DKMT_VIDPNSOURCEOWNER_EXCLUSIVE, D3DKMT_VIDPNSOURCEOWNER_SHARED, STATUS_SUCCESS, STATUS_GRAPHICS_VIDPN_SOURCE_IN_USE, STATUS_GRAPHICS_PRESENT_OCCLUDED}, + /* 10 */ + {D3DKMT_VIDPNSOURCEOWNER_EXCLUSIVE, D3DKMT_VIDPNSOURCEOWNER_EXCLUSIVE, STATUS_SUCCESS, STATUS_GRAPHICS_VIDPN_SOURCE_IN_USE, STATUS_GRAPHICS_PRESENT_OCCLUDED}, + {D3DKMT_VIDPNSOURCEOWNER_EXCLUSIVE, D3DKMT_VIDPNSOURCEOWNER_EMULATED, STATUS_SUCCESS, STATUS_GRAPHICS_VIDPN_SOURCE_IN_USE, STATUS_GRAPHICS_PRESENT_OCCLUDED}, + {D3DKMT_VIDPNSOURCEOWNER_EMULATED, D3DKMT_VIDPNSOURCEOWNER_UNOWNED, STATUS_SUCCESS, STATUS_SUCCESS, STATUS_SUCCESS}, + {D3DKMT_VIDPNSOURCEOWNER_EMULATED, D3DKMT_VIDPNSOURCEOWNER_SHARED, STATUS_SUCCESS, STATUS_GRAPHICS_VIDPN_SOURCE_IN_USE, STATUS_SUCCESS}, + {D3DKMT_VIDPNSOURCEOWNER_EMULATED, D3DKMT_VIDPNSOURCEOWNER_EXCLUSIVE, STATUS_SUCCESS, STATUS_GRAPHICS_VIDPN_SOURCE_IN_USE, STATUS_SUCCESS}, + {D3DKMT_VIDPNSOURCEOWNER_EMULATED, D3DKMT_VIDPNSOURCEOWNER_EMULATED, STATUS_SUCCESS, STATUS_GRAPHICS_VIDPN_SOURCE_IN_USE, STATUS_SUCCESS}, + {-1, D3DKMT_VIDPNSOURCEOWNER_EXCLUSIVE, -1, STATUS_SUCCESS, STATUS_GRAPHICS_PRESENT_OCCLUDED}, + {D3DKMT_VIDPNSOURCEOWNER_EXCLUSIVE, -1, STATUS_SUCCESS, STATUS_SUCCESS, STATUS_GRAPHICS_PRESENT_OCCLUDED}, + }; + + if (!pD3DKMTCheckVidPnExclusiveOwnership || pD3DKMTCheckVidPnExclusiveOwnership(NULL) == STATUS_PROCEDURE_NOT_FOUND) + { + skip("D3DKMTCheckVidPnExclusiveOwnership() is unavailable.\n"); + return; + } + + /* Invalid parameters */ + status = pD3DKMTCheckVidPnExclusiveOwnership(NULL); + ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); + + memset(&check_owner_desc, 0, sizeof(check_owner_desc)); + status = pD3DKMTCheckVidPnExclusiveOwnership(&check_owner_desc); + ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); + + /* Test cases */ + lstrcpyW(open_adapter_gdi_desc.DeviceName, display1W); + status = pD3DKMTOpenAdapterFromGdiDisplayName(&open_adapter_gdi_desc); + ok(status == STATUS_SUCCESS, "Got unexpected return code %#x.\n", status); + + memset(&create_device_desc, 0, sizeof(create_device_desc)); + create_device_desc.hAdapter = open_adapter_gdi_desc.hAdapter; + status = pD3DKMTCreateDevice(&create_device_desc); + ok(status == STATUS_SUCCESS, "Got unexpected return code %#x.\n", status); + + check_owner_desc.hAdapter = open_adapter_gdi_desc.hAdapter; + check_owner_desc.VidPnSourceId = open_adapter_gdi_desc.VidPnSourceId; + for (i = 0; i < ARRAY_SIZE(tests1); ++i) + { + set_owner_desc.hDevice = create_device_desc.hDevice; + if (tests1[i].owner_type != -1) + { + owner_type = tests1[i].owner_type; + set_owner_desc.pType = &owner_type; + set_owner_desc.pVidPnSourceId = &open_adapter_gdi_desc.VidPnSourceId; + set_owner_desc.VidPnSourceCount = 1; + } + else + { + set_owner_desc.pType = NULL; + set_owner_desc.pVidPnSourceId = NULL; + set_owner_desc.VidPnSourceCount = 0; + } + status = pD3DKMTSetVidPnSourceOwner(&set_owner_desc); + ok(status == tests1[i].expected_set_status || + /* win8 doesn't support D3DKMT_VIDPNSOURCEOWNER_EMULATED */ + (status == STATUS_INVALID_PARAMETER && tests1[i].owner_type == D3DKMT_VIDPNSOURCEOWNER_EMULATED) + || (status == STATUS_SUCCESS && tests1[i].owner_type == D3DKMT_VIDPNSOURCEOWNER_EXCLUSIVE + && tests1[i - 1].owner_type == D3DKMT_VIDPNSOURCEOWNER_EMULATED), + "Got unexpected return code %#x at test %d.\n", status, i); + + status = pD3DKMTCheckVidPnExclusiveOwnership(&check_owner_desc); + /* If don't sleep, D3DKMTCheckVidPnExclusiveOwnership may get STATUS_GRAPHICS_PRESENT_UNOCCLUDED instead + * of STATUS_SUCCESS */ + if ((tests1[i].expected_check_status == STATUS_SUCCESS && status == STATUS_GRAPHICS_PRESENT_UNOCCLUDED)) + { + total_time = 0; + do + { + Sleep(wait_step); + total_time += wait_step; + status = pD3DKMTCheckVidPnExclusiveOwnership(&check_owner_desc); + } while (status == STATUS_GRAPHICS_PRESENT_UNOCCLUDED && total_time < timeout); + } + ok(status == tests1[i].expected_check_status + || (status == STATUS_GRAPHICS_PRESENT_OCCLUDED /* win8 */ + && tests1[i].owner_type == D3DKMT_VIDPNSOURCEOWNER_EXCLUSIVE + && tests1[i - 1].owner_type == D3DKMT_VIDPNSOURCEOWNER_EMULATED), + "Got unexpected return code %#x at test %d.\n", status, i); + } + + /* Set owner and unset owner using different devices */ + memset(&create_device_desc2, 0, sizeof(create_device_desc2)); + create_device_desc2.hAdapter = open_adapter_gdi_desc.hAdapter; + status = pD3DKMTCreateDevice(&create_device_desc2); + ok(status == STATUS_SUCCESS, "Got unexpected return code %#x.\n", status); + + /* Set owner with the first device */ + set_owner_desc.hDevice = create_device_desc.hDevice; + owner_type = D3DKMT_VIDPNSOURCEOWNER_EXCLUSIVE; + set_owner_desc.pType = &owner_type; + set_owner_desc.pVidPnSourceId = &open_adapter_gdi_desc.VidPnSourceId; + set_owner_desc.VidPnSourceCount = 1; + status = pD3DKMTSetVidPnSourceOwner(&set_owner_desc); + ok(status == STATUS_SUCCESS, "Got unexpected return code %#x.\n", status); + status = pD3DKMTCheckVidPnExclusiveOwnership(&check_owner_desc); + ok(status == STATUS_GRAPHICS_PRESENT_OCCLUDED, "Got unexpected return code %#x.\n", status); + + /* Unset owner with the second device */ + set_owner_desc.hDevice = create_device_desc2.hDevice; + set_owner_desc.pType = NULL; + set_owner_desc.pVidPnSourceId = NULL; + set_owner_desc.VidPnSourceCount = 0; + status = pD3DKMTSetVidPnSourceOwner(&set_owner_desc); + ok(status == STATUS_SUCCESS, "Got unexpected return code %#x.\n", status); + status = pD3DKMTCheckVidPnExclusiveOwnership(&check_owner_desc); + /* No effect */ + ok(status == STATUS_GRAPHICS_PRESENT_OCCLUDED, "Got unexpected return code %#x.\n", status); + + /* Unset owner with the first device */ + set_owner_desc.hDevice = create_device_desc.hDevice; + set_owner_desc.pType = NULL; + set_owner_desc.pVidPnSourceId = NULL; + set_owner_desc.VidPnSourceCount = 0; + status = pD3DKMTSetVidPnSourceOwner(&set_owner_desc); + ok(status == STATUS_SUCCESS, "Got unexpected return code %#x.\n", status); + status = pD3DKMTCheckVidPnExclusiveOwnership(&check_owner_desc); + /* Proves that the correct device is needed to unset owner */ + ok(status == STATUS_SUCCESS || status == STATUS_GRAPHICS_PRESENT_UNOCCLUDED, "Got unexpected return code %#x.\n", + status); + + /* Set owner with the first device, set owner again with the second device */ + for (i = 0; i < ARRAY_SIZE(tests2); ++i) + { + if (tests2[i].set_owner_type1 != -1) + { + set_owner_desc.hDevice = create_device_desc.hDevice; + owner_type = tests2[i].set_owner_type1; + set_owner_desc.pType = &owner_type; + set_owner_desc.pVidPnSourceId = &open_adapter_gdi_desc.VidPnSourceId; + set_owner_desc.VidPnSourceCount = 1; + /* If don't sleep, D3DKMTSetVidPnSourceOwner may return STATUS_OK for D3DKMT_VIDPNSOURCEOWNER_SHARED. + * Other owner type doesn't seems to be affected. */ + if (tests2[i].set_owner_type1 == D3DKMT_VIDPNSOURCEOWNER_SHARED) + Sleep(timeout); + status = pD3DKMTSetVidPnSourceOwner(&set_owner_desc); + ok(status == tests2[i].expected_set_status1 + || (status == STATUS_INVALID_PARAMETER /* win8 */ + && tests2[i].set_owner_type1 == D3DKMT_VIDPNSOURCEOWNER_EMULATED), + "Got unexpected return code %#x at test %d.\n", status, i); + } + + if (tests2[i].set_owner_type2 != -1) + { + set_owner_desc.hDevice = create_device_desc2.hDevice; + owner_type = tests2[i].set_owner_type2; + set_owner_desc.pType = &owner_type; + set_owner_desc.pVidPnSourceId = &open_adapter_gdi_desc.VidPnSourceId; + set_owner_desc.VidPnSourceCount = 1; + status = pD3DKMTSetVidPnSourceOwner(&set_owner_desc); + ok(status == tests2[i].expected_set_status2 + || (status == STATUS_INVALID_PARAMETER /* win8 */ + && tests2[i].set_owner_type2 == D3DKMT_VIDPNSOURCEOWNER_EMULATED) + || (status == STATUS_SUCCESS && tests2[i].set_owner_type1 == D3DKMT_VIDPNSOURCEOWNER_EMULATED + && tests2[i].set_owner_type2 == D3DKMT_VIDPNSOURCEOWNER_EXCLUSIVE), + "Got unexpected return code %#x at test %d.\n", status, i); + } + + status = pD3DKMTCheckVidPnExclusiveOwnership(&check_owner_desc); + if ((tests2[i].expected_check_status == STATUS_SUCCESS && status == STATUS_GRAPHICS_PRESENT_UNOCCLUDED)) + { + total_time = 0; + do + { + Sleep(wait_step); + total_time += wait_step; + status = pD3DKMTCheckVidPnExclusiveOwnership(&check_owner_desc); + } while (status == STATUS_GRAPHICS_PRESENT_UNOCCLUDED && total_time < timeout); + } + ok(status == tests2[i].expected_check_status + || (status == STATUS_GRAPHICS_PRESENT_OCCLUDED /* win8 */ + && tests2[i].set_owner_type2 == D3DKMT_VIDPNSOURCEOWNER_EXCLUSIVE + && tests2[i].set_owner_type1 == D3DKMT_VIDPNSOURCEOWNER_EMULATED), + "Got unexpected return code %#x at test %d.\n", status, i); + + /* Unset owner with first device */ + if (tests2[i].set_owner_type1 != -1) + { + set_owner_desc.hDevice = create_device_desc.hDevice; + set_owner_desc.pType = NULL; + set_owner_desc.pVidPnSourceId = NULL; + set_owner_desc.VidPnSourceCount = 0; + status = pD3DKMTSetVidPnSourceOwner(&set_owner_desc); + ok(status == STATUS_SUCCESS, "Got unexpected return code %#x at test %d.\n", status, i); + } + + /* Unset owner with second device */ + if (tests2[i].set_owner_type2 != -1) + { + set_owner_desc.hDevice = create_device_desc2.hDevice; + set_owner_desc.pType = NULL; + set_owner_desc.pVidPnSourceId = NULL; + set_owner_desc.VidPnSourceCount = 0; + status = pD3DKMTSetVidPnSourceOwner(&set_owner_desc); + ok(status == STATUS_SUCCESS, "Got unexpected return code %#x at test %d.\n", status, i); + } + } + + /* Destroy devices holding ownership */ + set_owner_desc.hDevice = create_device_desc.hDevice; + owner_type = D3DKMT_VIDPNSOURCEOWNER_EXCLUSIVE; + set_owner_desc.pType = &owner_type; + set_owner_desc.pVidPnSourceId = &open_adapter_gdi_desc.VidPnSourceId; + set_owner_desc.VidPnSourceCount = 1; + status = pD3DKMTSetVidPnSourceOwner(&set_owner_desc); + ok(status == STATUS_SUCCESS, "Got unexpected return code %#x.\n", status); + + destroy_device_desc.hDevice = create_device_desc.hDevice; + status = pD3DKMTDestroyDevice(&destroy_device_desc); + ok(status == STATUS_SUCCESS, "Got unexpected return code %#x.\n", status); + + set_owner_desc.hDevice = create_device_desc2.hDevice; + owner_type = D3DKMT_VIDPNSOURCEOWNER_EXCLUSIVE; + set_owner_desc.pType = &owner_type; + set_owner_desc.pVidPnSourceId = &open_adapter_gdi_desc.VidPnSourceId; + set_owner_desc.VidPnSourceCount = 1; + status = pD3DKMTSetVidPnSourceOwner(&set_owner_desc); + /* So ownership is released when device is destroyed. otherwise the return code should be + * STATUS_GRAPHICS_VIDPN_SOURCE_IN_USE */ + ok(status == STATUS_SUCCESS, "Got unexpected return code %#x.\n", status); + + destroy_device_desc.hDevice = create_device_desc2.hDevice; + status = pD3DKMTDestroyDevice(&destroy_device_desc); + ok(status == STATUS_SUCCESS, "Got unexpected return code %#x.\n", status); + + close_adapter_desc.hAdapter = open_adapter_gdi_desc.hAdapter; + status = pD3DKMTCloseAdapter(&close_adapter_desc); + ok(status == STATUS_SUCCESS, "Got unexpected return code %#x.\n", status); +} + START_TEST(driver) { HMODULE gdi32 = LoadLibraryA("gdi32.dll"); + pD3DKMTCheckVidPnExclusiveOwnership = (void *)GetProcAddress(gdi32, "D3DKMTCheckVidPnExclusiveOwnership"); pD3DKMTCloseAdapter = (void *)GetProcAddress(gdi32, "D3DKMTCloseAdapter"); pD3DKMTCreateDevice = (void *)GetProcAddress(gdi32, "D3DKMTCreateDevice"); pD3DKMTDestroyDevice = (void *)GetProcAddress(gdi32, "D3DKMTDestroyDevice"); pD3DKMTOpenAdapterFromGdiDisplayName = (void *)GetProcAddress(gdi32, "D3DKMTOpenAdapterFromGdiDisplayName"); pD3DKMTOpenAdapterFromHdc = (void *)GetProcAddress(gdi32, "D3DKMTOpenAdapterFromHdc"); + pD3DKMTSetVidPnSourceOwner = (void *)GetProcAddress(gdi32, "D3DKMTSetVidPnSourceOwner"); + test_D3DKMTCheckVidPnExclusiveOwnership(); test_D3DKMTCloseAdapter(); test_D3DKMTCreateDevice(); test_D3DKMTDestroyDevice(); -- 2.20.1

1 0

[PATCH v3 5/8] gdi32/tests: Add D3DKMTDestroyDevice tests.
by Zhiyi Zhang 23 May '19

23 May '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/gdi32/tests/driver.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/dlls/gdi32/tests/driver.c b/dlls/gdi32/tests/driver.c index 7c2cf53a06..87cd76adcc 100644 --- a/dlls/gdi32/tests/driver.c +++ b/dlls/gdi32/tests/driver.c @@ -230,6 +230,26 @@ static void test_D3DKMTCreateDevice(void) ok(status == STATUS_SUCCESS, "Got unexpected return code %#x.\n", status); } +static void test_D3DKMTDestroyDevice(void) +{ + D3DKMT_DESTROYDEVICE destroy_device_desc; + NTSTATUS status; + + if (!pD3DKMTDestroyDevice || pD3DKMTDestroyDevice(NULL) == STATUS_PROCEDURE_NOT_FOUND) + { + skip("D3DKMTDestroyDevice() is unavailable.\n"); + return; + } + + /* Invalid parameters */ + status = pD3DKMTDestroyDevice(NULL); + todo_wine ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); + + memset(&destroy_device_desc, 0, sizeof(destroy_device_desc)); + status = pD3DKMTDestroyDevice(&destroy_device_desc); + todo_wine ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); +} + START_TEST(driver) { HMODULE gdi32 = LoadLibraryA("gdi32.dll"); @@ -242,6 +262,7 @@ START_TEST(driver) test_D3DKMTCloseAdapter(); test_D3DKMTCreateDevice(); + test_D3DKMTDestroyDevice(); test_D3DKMTOpenAdapterFromGdiDisplayName(); test_D3DKMTOpenAdapterFromHdc(); -- 2.20.1

1 0

[PATCH v3 4/8] gdi32/tests: Add D3DKMTCreateDevice tests.
by Zhiyi Zhang 23 May '19

23 May '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/gdi32/tests/driver.c | 52 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/dlls/gdi32/tests/driver.c b/dlls/gdi32/tests/driver.c index b51d7dbb04..7c2cf53a06 100644 --- a/dlls/gdi32/tests/driver.c +++ b/dlls/gdi32/tests/driver.c @@ -34,6 +34,8 @@ static const WCHAR display1W[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y','1',0}; static NTSTATUS (WINAPI *pD3DKMTCloseAdapter)(const D3DKMT_CLOSEADAPTER *); +static NTSTATUS (WINAPI *pD3DKMTCreateDevice)(D3DKMT_CREATEDEVICE *); +static NTSTATUS (WINAPI *pD3DKMTDestroyDevice)(const D3DKMT_DESTROYDEVICE *); static NTSTATUS (WINAPI *pD3DKMTOpenAdapterFromGdiDisplayName)(D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME *); static NTSTATUS (WINAPI *pD3DKMTOpenAdapterFromHdc)(D3DKMT_OPENADAPTERFROMHDC *); @@ -181,15 +183,65 @@ static void test_D3DKMTCloseAdapter(void) todo_wine ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); } +static void test_D3DKMTCreateDevice(void) +{ + D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME open_adapter_gdi_desc; + D3DKMT_CREATEDEVICE create_device_desc; + D3DKMT_CLOSEADAPTER close_adapter_desc; + D3DKMT_DESTROYDEVICE destroy_device_desc; + NTSTATUS status; + + if (!pD3DKMTCreateDevice || pD3DKMTCreateDevice(NULL) == STATUS_PROCEDURE_NOT_FOUND || !pD3DKMTDestroyDevice) + { + skip("D3DKMTCreateDevice() or D3DKMTDestroyDevice() is unavailable.\n"); + return; + } + + /* Invalid parameters */ + status = pD3DKMTCreateDevice(NULL); + ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); + + memset(&create_device_desc, 0, sizeof(create_device_desc)); + status = pD3DKMTCreateDevice(&create_device_desc); + ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); + + lstrcpyW(open_adapter_gdi_desc.DeviceName, display1W); + status = pD3DKMTOpenAdapterFromGdiDisplayName(&open_adapter_gdi_desc); + ok(status == STATUS_SUCCESS, "Got unexpected return code %#x.\n", status); + + /* Create device */ + create_device_desc.hAdapter = open_adapter_gdi_desc.hAdapter; + status = pD3DKMTCreateDevice(&create_device_desc); + ok(status == STATUS_SUCCESS, "Got unexpected return code %#x.\n", status); + ok(create_device_desc.hDevice, "Expect not null.\n"); + ok(create_device_desc.pCommandBuffer == NULL, "Expect null.\n"); + ok(create_device_desc.CommandBufferSize == 0, "Got wrong value %#x.\n", create_device_desc.CommandBufferSize); + ok(create_device_desc.pAllocationList == NULL, "Expect null.\n"); + ok(create_device_desc.AllocationListSize == 0, "Got wrong value %#x.\n", create_device_desc.AllocationListSize); + ok(create_device_desc.pPatchLocationList == NULL, "Expect null.\n"); + ok(create_device_desc.PatchLocationListSize == 0, "Got wrong value %#x.\n", create_device_desc.PatchLocationListSize); + + destroy_device_desc.hDevice = create_device_desc.hDevice; + status = pD3DKMTDestroyDevice(&destroy_device_desc); + ok(status == STATUS_SUCCESS, "Got unexpected return code %#x.\n", status); + + close_adapter_desc.hAdapter = open_adapter_gdi_desc.hAdapter; + status = pD3DKMTCloseAdapter(&close_adapter_desc); + ok(status == STATUS_SUCCESS, "Got unexpected return code %#x.\n", status); +} + START_TEST(driver) { HMODULE gdi32 = LoadLibraryA("gdi32.dll"); pD3DKMTCloseAdapter = (void *)GetProcAddress(gdi32, "D3DKMTCloseAdapter"); + pD3DKMTCreateDevice = (void *)GetProcAddress(gdi32, "D3DKMTCreateDevice"); + pD3DKMTDestroyDevice = (void *)GetProcAddress(gdi32, "D3DKMTDestroyDevice"); pD3DKMTOpenAdapterFromGdiDisplayName = (void *)GetProcAddress(gdi32, "D3DKMTOpenAdapterFromGdiDisplayName"); pD3DKMTOpenAdapterFromHdc = (void *)GetProcAddress(gdi32, "D3DKMTOpenAdapterFromHdc"); test_D3DKMTCloseAdapter(); + test_D3DKMTCreateDevice(); test_D3DKMTOpenAdapterFromGdiDisplayName(); test_D3DKMTOpenAdapterFromHdc(); -- 2.20.1

1 0

[PATCH v3 3/8] gdi32/tests: Add D3DKMTCloseAdapter tests.
by Zhiyi Zhang 23 May '19

23 May '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/gdi32/tests/driver.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/dlls/gdi32/tests/driver.c b/dlls/gdi32/tests/driver.c index 6f5d728e15..b51d7dbb04 100644 --- a/dlls/gdi32/tests/driver.c +++ b/dlls/gdi32/tests/driver.c @@ -161,6 +161,26 @@ static void test_D3DKMTOpenAdapterFromHdc(void) } } +static void test_D3DKMTCloseAdapter(void) +{ + D3DKMT_CLOSEADAPTER close_adapter_desc; + NTSTATUS status; + + if (!pD3DKMTCloseAdapter || pD3DKMTCloseAdapter(NULL) == STATUS_PROCEDURE_NOT_FOUND) + { + win_skip("D3DKMTCloseAdapter() is unavailable.\n"); + return; + } + + /* Invalid parameters */ + status = pD3DKMTCloseAdapter(NULL); + todo_wine ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); + + memset(&close_adapter_desc, 0, sizeof(close_adapter_desc)); + status = pD3DKMTCloseAdapter(&close_adapter_desc); + todo_wine ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); +} + START_TEST(driver) { HMODULE gdi32 = LoadLibraryA("gdi32.dll"); @@ -169,6 +189,7 @@ START_TEST(driver) pD3DKMTOpenAdapterFromGdiDisplayName = (void *)GetProcAddress(gdi32, "D3DKMTOpenAdapterFromGdiDisplayName"); pD3DKMTOpenAdapterFromHdc = (void *)GetProcAddress(gdi32, "D3DKMTOpenAdapterFromHdc"); + test_D3DKMTCloseAdapter(); test_D3DKMTOpenAdapterFromGdiDisplayName(); test_D3DKMTOpenAdapterFromHdc(); -- 2.20.1

1 0

[PATCH v3 2/8] gdi32/tests: Add D3DKMTOpenAdapterFromHdc tests.
by Zhiyi Zhang 23 May '19

23 May '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/gdi32/tests/driver.c | 71 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) diff --git a/dlls/gdi32/tests/driver.c b/dlls/gdi32/tests/driver.c index aa3044f824..6f5d728e15 100644 --- a/dlls/gdi32/tests/driver.c +++ b/dlls/gdi32/tests/driver.c @@ -35,6 +35,7 @@ static const WCHAR display1W[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y' static NTSTATUS (WINAPI *pD3DKMTCloseAdapter)(const D3DKMT_CLOSEADAPTER *); static NTSTATUS (WINAPI *pD3DKMTOpenAdapterFromGdiDisplayName)(D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME *); +static NTSTATUS (WINAPI *pD3DKMTOpenAdapterFromHdc)(D3DKMT_OPENADAPTERFROMHDC *); static void test_D3DKMTOpenAdapterFromGdiDisplayName(void) { @@ -92,14 +93,84 @@ static void test_D3DKMTOpenAdapterFromGdiDisplayName(void) } } +static void test_D3DKMTOpenAdapterFromHdc(void) +{ + DISPLAY_DEVICEW display_device = {sizeof(display_device)}; + D3DKMT_OPENADAPTERFROMHDC open_adapter_hdc_desc; + D3DKMT_CLOSEADAPTER close_adapter_desc; + INT adapter_count = 0; + NTSTATUS status; + HDC hdc; + DWORD i; + + if (!pD3DKMTOpenAdapterFromHdc || pD3DKMTOpenAdapterFromHdc(NULL) == STATUS_PROCEDURE_NOT_FOUND) + { + skip("D3DKMTOpenAdapterFromHdc() is unavailable.\n"); + return; + } + + /* Invalid parameters */ + status = pD3DKMTOpenAdapterFromHdc(NULL); + todo_wine ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); + + memset(&open_adapter_hdc_desc, 0, sizeof(open_adapter_hdc_desc)); + status = pD3DKMTOpenAdapterFromHdc(&open_adapter_hdc_desc); + todo_wine ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); + + /* Open adapter */ + for (i = 0; EnumDisplayDevicesW(NULL, i, &display_device, 0); ++i) + { + if (!(display_device.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP)) + continue; + + adapter_count++; + + hdc = CreateDCW(0, display_device.DeviceName, 0, NULL); + open_adapter_hdc_desc.hDc = hdc; + status = pD3DKMTOpenAdapterFromHdc(&open_adapter_hdc_desc); + todo_wine ok(status == STATUS_SUCCESS, "Got unexpected return code %#x.\n", status); + todo_wine ok(open_adapter_hdc_desc.hAdapter, "Expect not null.\n"); + if (display_device.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE) + ok(open_adapter_hdc_desc.VidPnSourceId == 0, "Got unexpected value %#x.\n", + open_adapter_hdc_desc.VidPnSourceId); + else + todo_wine ok(open_adapter_hdc_desc.VidPnSourceId, "Got unexpected value %#x.\n", + open_adapter_hdc_desc.VidPnSourceId); + DeleteDC(hdc); + + if (status == STATUS_SUCCESS) + { + close_adapter_desc.hAdapter = open_adapter_hdc_desc.hAdapter; + status = pD3DKMTCloseAdapter(&close_adapter_desc); + ok(status == STATUS_SUCCESS, "Got unexpected return code %#x.\n", status); + } + } + + /* HDC covering more than two adapters is invalid for D3DKMTOpenAdapterFromHdc */ + hdc = GetDC(0); + open_adapter_hdc_desc.hDc = hdc; + status = pD3DKMTOpenAdapterFromHdc(&open_adapter_hdc_desc); + ReleaseDC(0, hdc); + todo_wine ok(status == (adapter_count > 1 ? STATUS_INVALID_PARAMETER : STATUS_SUCCESS), + "Got unexpected return code %#x.\n", status); + if (status == STATUS_SUCCESS) + { + close_adapter_desc.hAdapter = open_adapter_hdc_desc.hAdapter; + status = pD3DKMTCloseAdapter(&close_adapter_desc); + ok(status == STATUS_SUCCESS, "Got unexpected return code %#x.\n", status); + } +} + START_TEST(driver) { HMODULE gdi32 = LoadLibraryA("gdi32.dll"); pD3DKMTCloseAdapter = (void *)GetProcAddress(gdi32, "D3DKMTCloseAdapter"); pD3DKMTOpenAdapterFromGdiDisplayName = (void *)GetProcAddress(gdi32, "D3DKMTOpenAdapterFromGdiDisplayName"); + pD3DKMTOpenAdapterFromHdc = (void *)GetProcAddress(gdi32, "D3DKMTOpenAdapterFromHdc"); test_D3DKMTOpenAdapterFromGdiDisplayName(); + test_D3DKMTOpenAdapterFromHdc(); FreeLibrary(gdi32); } -- 2.20.1

1 0

[PATCH v2 03/10] gdi32/tests: Add D3DKMTOpenAdapterFromGdiDisplayName tests.
by Zhiyi Zhang 23 May '19

23 May '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/gdi32/tests/Makefile.in | 1 + dlls/gdi32/tests/driver.c | 101 +++++++++++++++++++++++++++++++++++ 2 files changed, 102 insertions(+) create mode 100644 dlls/gdi32/tests/driver.c diff --git a/dlls/gdi32/tests/Makefile.in b/dlls/gdi32/tests/Makefile.in index 90d7223f47..9d82c278e9 100644 --- a/dlls/gdi32/tests/Makefile.in +++ b/dlls/gdi32/tests/Makefile.in @@ -7,6 +7,7 @@ C_SRCS = \ clipping.c \ dc.c \ dib.c \ + driver.c \ font.c \ gdiobj.c \ generated.c \ diff --git a/dlls/gdi32/tests/driver.c b/dlls/gdi32/tests/driver.c new file mode 100644 index 0000000000..57b158f16b --- /dev/null +++ b/dlls/gdi32/tests/driver.c @@ -0,0 +1,101 @@ +/* + * Unit test suite for kernel mode graphics driver + * + * Copyright 2019 Zhiyi Zhang + * + * 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 <stdarg.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" +#include "winternl.h" +#include "ddk/d3dkmthk.h" + +#include "wine/test.h" + +static const WCHAR display1W[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y','1',0}; + +static NTSTATUS (WINAPI *pD3DKMTCloseAdapter)(const D3DKMT_CLOSEADAPTER *); +static NTSTATUS (WINAPI *pD3DKMTOpenAdapterFromGdiDisplayName)(D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME *); + +static void test_D3DKMTOpenAdapterFromGdiDisplayName(void) +{ + D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME open_adapter_gdi_desc; + D3DKMT_CLOSEADAPTER close_adapter_desc; + DISPLAY_DEVICEW display_device = {sizeof(display_device)}; + NTSTATUS status; + DWORD i; + + /* STATUS_PROCEDURE_NOT_FOUND on vista~win7 */ + lstrcpyW(open_adapter_gdi_desc.DeviceName, display1W); + if (!pD3DKMTOpenAdapterFromGdiDisplayName + || pD3DKMTOpenAdapterFromGdiDisplayName(&open_adapter_gdi_desc) == STATUS_PROCEDURE_NOT_FOUND + || !pD3DKMTCloseAdapter) + { + skip("Required functions are unavailable.\n"); + return; + } + + /* Invalid parameters */ + status = pD3DKMTOpenAdapterFromGdiDisplayName(NULL); + ok(status == STATUS_UNSUCCESSFUL, "Got unexpected return code %#x.\n", status); + + memset(&open_adapter_gdi_desc, 0, sizeof(open_adapter_gdi_desc)); + status = pD3DKMTOpenAdapterFromGdiDisplayName(&open_adapter_gdi_desc); + ok(status == STATUS_UNSUCCESSFUL, "Got unexpected return code %#x.\n", status); + + /* Open adapter */ + for (i = 0; EnumDisplayDevicesW(NULL, i, &display_device, 0); ++i) + { + lstrcpyW(open_adapter_gdi_desc.DeviceName, display_device.DeviceName); + status = pD3DKMTOpenAdapterFromGdiDisplayName(&open_adapter_gdi_desc); + if (display_device.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP) + ok(status == STATUS_SUCCESS, "Got unexpected return code %#x.\n", status); + else + { + ok(status == STATUS_UNSUCCESSFUL, "Got unexpected return code %#x.\n", status); + continue; + } + + ok(open_adapter_gdi_desc.hAdapter, "Expect not null.\n"); + if (display_device.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE) + ok(open_adapter_gdi_desc.VidPnSourceId == 0, "Got unexpected value %#x.\n", + open_adapter_gdi_desc.VidPnSourceId); + else + ok(open_adapter_gdi_desc.VidPnSourceId, "Got unexpected value %#x.\n", open_adapter_gdi_desc.VidPnSourceId); + + close_adapter_desc.hAdapter = open_adapter_gdi_desc.hAdapter; + status = pD3DKMTCloseAdapter(&close_adapter_desc); + ok(status == STATUS_SUCCESS, "Got unexpected return code %#x.\n", status); + } +} + +START_TEST(driver) +{ + HMODULE gdi32 = LoadLibraryA("gdi32.dll"); + + pD3DKMTCloseAdapter = (void *)GetProcAddress(gdi32, "D3DKMTCloseAdapter"); + pD3DKMTOpenAdapterFromGdiDisplayName = (void *)GetProcAddress(gdi32, "D3DKMTOpenAdapterFromGdiDisplayName"); + + test_D3DKMTOpenAdapterFromGdiDisplayName(); + + FreeLibrary(gdi32); +} -- 2.20.1

2 3

[PATCH 1/3] kernelbase: Add more URL API functions from shlwapi.
by Nikolay Sivov 23 May '19

23 May '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/kernelbase/Makefile.in | 2 +- dlls/kernelbase/kernelbase.spec | 34 +- dlls/kernelbase/path.c | 838 ++++++++++++++++++++++++++++++++ 3 files changed, 856 insertions(+), 18 deletions(-) diff --git a/dlls/kernelbase/Makefile.in b/dlls/kernelbase/Makefile.in index dcb03b4fdc..373f79d293 100644 --- a/dlls/kernelbase/Makefile.in +++ b/dlls/kernelbase/Makefile.in @@ -1,5 +1,5 @@ MODULE = kernelbase.dll -IMPORTS = uuid +IMPORTS = uuid advapi32 C_SRCS = \ main.c \ diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index f9f9f2487b..e2bee49112 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1628,31 +1628,31 @@ # @ stub UpdatePackageStatus # @ stub UpdatePackageStatusForUser @ stdcall UpdateProcThreadAttribute(ptr long long ptr long ptr ptr) kernel32.UpdateProcThreadAttribute -@ stdcall UrlApplySchemeA(str ptr ptr long) shlwapi.UrlApplySchemeA -@ stdcall UrlApplySchemeW(wstr ptr ptr long) shlwapi.UrlApplySchemeW +@ stdcall UrlApplySchemeA(str ptr ptr long) +@ stdcall UrlApplySchemeW(wstr ptr ptr long) @ stdcall UrlCanonicalizeA(str ptr ptr long) @ stdcall UrlCanonicalizeW(wstr ptr ptr long) @ stdcall UrlCombineA(str str ptr ptr long) shlwapi.UrlCombineA @ stdcall UrlCombineW(wstr wstr ptr ptr long) shlwapi.UrlCombineW -@ stdcall UrlCompareA(str str long) shlwapi.UrlCompareA -@ stdcall UrlCompareW(wstr wstr long) shlwapi.UrlCompareW -@ stdcall UrlCreateFromPathA(str ptr ptr long) shlwapi.UrlCreateFromPathA -@ stdcall UrlCreateFromPathW(wstr ptr ptr long) shlwapi.UrlCreateFromPathW +@ stdcall UrlCompareA(str str long) +@ stdcall UrlCompareW(wstr wstr long) +@ stdcall UrlCreateFromPathA(str ptr ptr long) +@ stdcall UrlCreateFromPathW(wstr ptr ptr long) @ stdcall UrlEscapeA(str ptr ptr long) @ stdcall UrlEscapeW(wstr ptr ptr long) -@ stdcall UrlFixupW(wstr wstr long) shlwapi.UrlFixupW -@ stdcall UrlGetLocationA(str) shlwapi.UrlGetLocationA -@ stdcall UrlGetLocationW(wstr) shlwapi.UrlGetLocationW -@ stdcall UrlGetPartA(str ptr ptr long long) shlwapi.UrlGetPartA -@ stdcall UrlGetPartW(wstr ptr ptr long long) shlwapi.UrlGetPartW +@ stdcall UrlFixupW(wstr wstr long) +@ stdcall UrlGetLocationA(str) +@ stdcall UrlGetLocationW(wstr) +@ stdcall UrlGetPartA(str ptr ptr long long) +@ stdcall UrlGetPartW(wstr ptr ptr long long) @ stdcall UrlHashA(str ptr long) shlwapi.UrlHashA @ stdcall UrlHashW(wstr ptr long) shlwapi.UrlHashW -@ stdcall UrlIsA(str long) shlwapi.UrlIsA -@ stdcall UrlIsNoHistoryA(str) shlwapi.UrlIsNoHistoryA -@ stdcall UrlIsNoHistoryW(wstr) shlwapi.UrlIsNoHistoryW -@ stdcall UrlIsOpaqueA(str) shlwapi.UrlIsOpaqueA -@ stdcall UrlIsOpaqueW(wstr) shlwapi.UrlIsOpaqueW -@ stdcall UrlIsW(wstr long) shlwapi.UrlIsW +@ stdcall UrlIsA(str long) +@ stdcall UrlIsNoHistoryA(str) +@ stdcall UrlIsNoHistoryW(wstr) +@ stdcall UrlIsOpaqueA(str) +@ stdcall UrlIsOpaqueW(wstr) +@ stdcall UrlIsW(wstr long) @ stdcall UrlUnescapeA(str ptr ptr long) @ stdcall UrlUnescapeW(wstr ptr ptr long) @ stdcall VerFindFileA(long str str str ptr ptr ptr ptr) version.VerFindFileA diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index b81e0bad8c..1a88f20e70 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -36,6 +36,30 @@ WINE_DEFAULT_DEBUG_CHANNEL(path); static const char hexDigits[] = "0123456789ABCDEF"; +struct parsed_url +{ + const WCHAR *scheme; /* [out] start of scheme */ + DWORD scheme_len; /* [out] size of scheme (until colon) */ + const WCHAR *username; /* [out] start of Username */ + DWORD username_len; /* [out] size of Username (until ":" or "@") */ + const WCHAR *password; /* [out] start of Password */ + DWORD password_len; /* [out] size of Password (until "@") */ + const WCHAR *hostname; /* [out] start of Hostname */ + DWORD hostname_len; /* [out] size of Hostname (until ":" or "/") */ + const WCHAR *port; /* [out] start of Port */ + DWORD port_len; /* [out] size of Port (until "/" or eos) */ + const WCHAR *query; /* [out] start of Query */ + DWORD query_len; /* [out] size of Query (until eos) */ +}; + +enum url_scan_type +{ + SCHEME, + HOST, + PORT, + USERPASS, +}; + static WCHAR *heap_strdupAtoW(const char *str) { WCHAR *ret = NULL; @@ -3724,3 +3748,817 @@ HRESULT WINAPI UrlCanonicalizeW(const WCHAR *src_url, WCHAR *canonicalized, DWOR return hr; } + +HRESULT WINAPI UrlApplySchemeA(const char *url, char *out, DWORD *out_len, DWORD flags) +{ + LPWSTR inW, outW; + HRESULT hr; + DWORD len; + + TRACE("%s, %p, %p:out size %d, %#x\n", wine_dbgstr_a(url), out, out_len, out_len ? *out_len : 0, flags); + + if (!url || !out || !out_len) + return E_INVALIDARG; + + inW = heap_alloc(2 * INTERNET_MAX_URL_LENGTH * sizeof(WCHAR)); + outW = inW + INTERNET_MAX_URL_LENGTH; + + MultiByteToWideChar(CP_ACP, 0, url, -1, inW, INTERNET_MAX_URL_LENGTH); + len = INTERNET_MAX_URL_LENGTH; + + hr = UrlApplySchemeW(inW, outW, &len, flags); + if (hr != S_OK) + { + heap_free(inW); + return hr; + } + + len = WideCharToMultiByte(CP_ACP, 0, outW, -1, NULL, 0, NULL, NULL); + if (len > *out_len) + { + hr = E_POINTER; + goto cleanup; + } + + WideCharToMultiByte(CP_ACP, 0, outW, -1, out, *out_len, NULL, NULL); + len--; + +cleanup: + *out_len = len; + heap_free(inW); + return hr; +} + +static HRESULT url_guess_scheme(const WCHAR *url, WCHAR *out, DWORD *out_len) +{ + WCHAR reg_path[MAX_PATH], value[MAX_PATH], data[MAX_PATH]; + DWORD value_len, data_len, dwType, i; + WCHAR Wxx, Wyy; + HKEY newkey; + INT index; + BOOL j; + + MultiByteToWideChar(CP_ACP, 0, + "Software\\Microsoft\\Windows\\CurrentVersion\\URL\\Prefixes", 1, reg_path, MAX_PATH); + RegOpenKeyExW(HKEY_LOCAL_MACHINE, reg_path, 0, 1, &newkey); + index = 0; + while (value_len = data_len = MAX_PATH, + RegEnumValueW(newkey, index, value, &value_len, 0, &dwType, (LPVOID)data, &data_len) == 0) + { + TRACE("guess %d %s is %s\n", index, wine_dbgstr_w(value), wine_dbgstr_w(data)); + + j = FALSE; + for (i = 0; i < value_len; ++i) + { + Wxx = url[i]; + Wyy = value[i]; + /* remember that TRUE is not-equal */ + j = ChrCmpIW(Wxx, Wyy); + if (j) break; + } + if ((i == value_len) && !j) + { + if (strlenW(data) + strlenW(url) + 1 > *out_len) + { + *out_len = strlenW(data) + strlenW(url) + 1; + RegCloseKey(newkey); + return E_POINTER; + } + strcpyW(out, data); + strcatW(out, url); + *out_len = strlenW(out); + TRACE("matched and set to %s\n", wine_dbgstr_w(out)); + RegCloseKey(newkey); + return S_OK; + } + index++; + } + RegCloseKey(newkey); + return E_FAIL; +} + +static HRESULT url_create_from_path(const WCHAR *path, WCHAR *url, DWORD *url_len) +{ + static const WCHAR file_colonW[] = {'f','i','l','e',':',0}; + static const WCHAR three_slashesW[] = {'/','/','/',0}; + PARSEDURLW parsed_url; + WCHAR *new_url; + DWORD needed; + HRESULT hr; + + parsed_url.cbSize = sizeof(parsed_url); + if (ParseURLW(path, &parsed_url) == S_OK) + { + if (parsed_url.nScheme != URL_SCHEME_INVALID && parsed_url.cchProtocol > 1) + { + needed = strlenW(path); + if (needed >= *url_len) + { + *url_len = needed + 1; + return E_POINTER; + } + else + { + *url_len = needed; + return S_FALSE; + } + } + } + + new_url = heap_alloc((strlenW(path) + 9) * sizeof(WCHAR)); /* "file:///" + path length + 1 */ + strcpyW(new_url, file_colonW); + if (isalphaW(path[0]) && path[1] == ':') + strcatW(new_url, three_slashesW); + strcatW(new_url, path); + hr = UrlEscapeW(new_url, url, url_len, URL_ESCAPE_PERCENT); + heap_free(new_url); + return hr; +} + +static HRESULT url_apply_default_scheme(const WCHAR *url, WCHAR *out, DWORD *length) +{ + static const WCHAR prefix_keyW[] = + {'S','o','f','t','w','a','r','e', + '\\','M','i','c','r','o','s','o','f','t', + '\\','W','i','n','d','o','w','s', + '\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n', + '\\','U','R','L', + '\\','D','e','f','a','u','l','t','P','r','e','f','i','x',0}; + DWORD data_len, dwType; + WCHAR data[MAX_PATH]; + HKEY newkey; + + /* get and prepend default */ + RegOpenKeyExW(HKEY_LOCAL_MACHINE, prefix_keyW, 0, 1, &newkey); + data_len = sizeof(data); + RegQueryValueExW(newkey, NULL, 0, &dwType, (BYTE *)data, &data_len); + RegCloseKey(newkey); + if (strlenW(data) + strlenW(url) + 1 > *length) + { + *length = strlenW(data) + strlenW(url) + 1; + return E_POINTER; + } + strcpyW(out, data); + strcatW(out, url); + *length = strlenW(out); + TRACE("used default %s\n", wine_dbgstr_w(out)); + return S_OK; +} + +HRESULT WINAPI UrlApplySchemeW(const WCHAR *url, WCHAR *out, DWORD *length, DWORD flags) +{ + PARSEDURLW in_scheme; + DWORD res1; + HRESULT hr; + + TRACE("%s, %p, %p:out size %d, %#x\n", wine_dbgstr_w(url), out, length, length ? *length : 0, flags); + + if (!url || !out || !length) + return E_INVALIDARG; + + if (flags & URL_APPLY_GUESSFILE) + { + if (*length > 1 && ':' == url[1]) + { + res1 = *length; + hr = url_create_from_path(url, out, &res1); + if (hr == S_OK || hr == E_POINTER) + { + *length = res1; + return hr; + } + else if (hr == S_FALSE) + { + return hr; + } + } + } + + in_scheme.cbSize = sizeof(in_scheme); + /* See if the base has a scheme */ + res1 = ParseURLW(url, &in_scheme); + if (res1) + { + /* no scheme in input, need to see if we need to guess */ + if (flags & URL_APPLY_GUESSSCHEME) + { + if ((hr = url_guess_scheme(url, out, length)) != E_FAIL) + return hr; + } + } + + /* If we are here, then either invalid scheme, + * or no scheme and can't/failed guess. + */ + if ((((res1 == 0) && (flags & URL_APPLY_FORCEAPPLY)) || ((res1 != 0)) ) && (flags & URL_APPLY_DEFAULT)) + return url_apply_default_scheme(url, out, length); + + return S_FALSE; +} + +INT WINAPI UrlCompareA(const char *url1, const char *url2, BOOL ignore_slash) +{ + INT ret, len, len1, len2; + + if (!ignore_slash) + return strcmp(url1, url2); + len1 = strlen(url1); + if (url1[len1-1] == '/') len1--; + len2 = strlen(url2); + if (url2[len2-1] == '/') len2--; + if (len1 == len2) + return strncmp(url1, url2, len1); + len = min(len1, len2); + ret = strncmp(url1, url2, len); + if (ret) return ret; + if (len1 > len2) return 1; + return -1; +} + +INT WINAPI UrlCompareW(const WCHAR *url1, const WCHAR *url2, BOOL ignore_slash) +{ + size_t len, len1, len2; + INT ret; + + if (!ignore_slash) + return strcmpW(url1, url2); + len1 = strlenW(url1); + if (url1[len1-1] == '/') len1--; + len2 = strlenW(url2); + if (url2[len2-1] == '/') len2--; + if (len1 == len2) + return strncmpW(url1, url2, len1); + len = min(len1, len2); + ret = strncmpW(url1, url2, len); + if (ret) return ret; + if (len1 > len2) return 1; + return -1; +} + +HRESULT WINAPI UrlFixupW(const WCHAR *url, WCHAR *translatedUrl, DWORD maxChars) +{ + DWORD srcLen; + + FIXME("%s, %p, %d stub\n", wine_dbgstr_w(url), translatedUrl, maxChars); + + if (!url) + return E_FAIL; + + srcLen = lstrlenW(url) + 1; + + /* For now just copy the URL directly */ + lstrcpynW(translatedUrl, url, (maxChars < srcLen) ? maxChars : srcLen); + + return S_OK; +} + +const char * WINAPI UrlGetLocationA(const char *url) +{ + PARSEDURLA base; + + base.cbSize = sizeof(base); + if (ParseURLA(url, &base) != S_OK) return NULL; /* invalid scheme */ + + /* if scheme is file: then never return pointer */ + if (!strncmp(base.pszProtocol, "file", min(4, base.cchProtocol)) == 0) + return NULL; + + /* Look for '#' and return its addr */ + return strchr(base.pszSuffix, '#'); +} + +const WCHAR * WINAPI UrlGetLocationW(const WCHAR *url) +{ + static const WCHAR fileW[] = {'f','i','l','e','\0'}; + PARSEDURLW base; + + base.cbSize = sizeof(base); + if (ParseURLW(url, &base) != S_OK) return NULL; /* invalid scheme */ + + /* if scheme is file: then never return pointer */ + if (!strncmpW(base.pszProtocol, fileW, min(4, base.cchProtocol))) + return NULL; + + /* Look for '#' and return its addr */ + return strchrW(base.pszSuffix, '#'); +} + +HRESULT WINAPI UrlGetPartA(const char *url, char *out, DWORD *out_len, DWORD part, DWORD flags) +{ + LPWSTR inW, outW; + DWORD len, len2; + HRESULT hr; + + if (!url || !out || !out_len || !*out_len) + return E_INVALIDARG; + + inW = heap_alloc(2 * INTERNET_MAX_URL_LENGTH * sizeof(WCHAR)); + outW = inW + INTERNET_MAX_URL_LENGTH; + + MultiByteToWideChar(CP_ACP, 0, url, -1, inW, INTERNET_MAX_URL_LENGTH); + + len = INTERNET_MAX_URL_LENGTH; + hr = UrlGetPartW(inW, outW, &len, part, flags); + if (FAILED(hr)) + { + heap_free(inW); + return hr; + } + + len2 = WideCharToMultiByte(CP_ACP, 0, outW, len, NULL, 0, NULL, NULL); + if (len2 > *out_len) + { + *out_len = len2 + 1; + heap_free(inW); + return E_POINTER; + } + len2 = WideCharToMultiByte(CP_ACP, 0, outW, len + 1, out, *out_len, NULL, NULL); + *out_len = len2 - 1; + heap_free(inW); + return hr; +} + +static const WCHAR * scan_url(const WCHAR *start, DWORD *size, enum url_scan_type type) +{ + static DWORD alwayszero = 0; + BOOL cont = TRUE; + + *size = 0; + + switch (type) + { + case SCHEME: + while (cont) + { + if ((islowerW(*start) && isalphaW(*start)) || + isdigitW(*start) || *start == '+' || *start == '-' || *start == '.') + { + start++; + (*size)++; + } + else + cont = FALSE; + } + if (*start != ':') + *size = 0; + break; + + case USERPASS: + while (cont) + { + if (isalphaW(*start) || + isdigitW(*start) || + /* user/password only characters */ + (*start == ';') || + (*start == '?') || + (*start == '&') || + (*start == '=') || + /* *extra* characters */ + (*start == '!') || + (*start == '*') || + (*start == '\'') || + (*start == '(') || + (*start == ')') || + (*start == ',') || + /* *safe* characters */ + (*start == '$') || + (*start == '_') || + (*start == '+') || + (*start == '-') || + (*start == '.') || + (*start == ' ')) + { + start++; + (*size)++; + } + else if (*start == '%') + { + if (isxdigitW(*(start + 1)) && isxdigitW(*(start + 2))) + { + start += 3; + *size += 3; + } + else + cont = FALSE; + } else + cont = FALSE; + } + break; + + case PORT: + while (cont) + { + if (isdigitW(*start)) + { + start++; + (*size)++; + } + else + cont = FALSE; + } + break; + + case HOST: + while (cont) + { + if (isalnumW(*start) || *start == '-' || *start == '.' || *start == ' ' || *start == '*') + { + start++; + (*size)++; + } + else + cont = FALSE; + } + break; + + default: + FIXME("unknown type %d\n", type); + return (LPWSTR)&alwayszero; + } + + return start; +} + +static LONG parse_url(const WCHAR *url, struct parsed_url *pl) +{ + const WCHAR *work; + + memset(pl, 0, sizeof(*pl)); + pl->scheme = url; + work = scan_url(pl->scheme, &pl->scheme_len, SCHEME); + if (!*work || (*work != ':')) goto ErrorExit; + work++; + if ((*work != '/') || (*(work+1) != '/')) goto SuccessExit; + + pl->username = work + 2; + work = scan_url(pl->username, &pl->username_len, USERPASS); + if (*work == ':' ) + { + /* parse password */ + work++; + pl->password = work; + work = scan_url(pl->password, &pl->password_len, USERPASS); + if (*work != '@') + { + /* what we just parsed must be the hostname and port + * so reset pointers and clear then let it parse */ + pl->username_len = pl->password_len = 0; + work = pl->username - 1; + pl->username = pl->password = 0; + } + } + else if (*work == '@') + { + /* no password */ + pl->password_len = 0; + pl->password = 0; + } + else if (!*work || *work == '/' || *work == '.') + { + /* what was parsed was hostname, so reset pointers and let it parse */ + pl->username_len = pl->password_len = 0; + work = pl->username - 1; + pl->username = pl->password = 0; + } + else goto ErrorExit; + + /* now start parsing hostname or hostnumber */ + work++; + pl->hostname = work; + work = scan_url(pl->hostname, &pl->hostname_len, HOST); + if (*work == ':') + { + /* parse port */ + work++; + pl->port = work; + work = scan_url(pl->port, &pl->port_len, PORT); + } + if (*work == '/') + { + /* see if query string */ + pl->query = strchrW(work, '?'); + if (pl->query) pl->query_len = strlenW(pl->query); + } + SuccessExit: + TRACE("parse successful: scheme=%p(%d), user=%p(%d), pass=%p(%d), host=%p(%d), port=%p(%d), query=%p(%d)\n", + pl->scheme, pl->scheme_len, pl->username, pl->username_len, pl->password, pl->password_len, pl->hostname, + pl->hostname_len, pl->port, pl->port_len, pl->query, pl->query_len); + + return S_OK; + + ErrorExit: + FIXME("failed to parse %s\n", debugstr_w(url)); + return E_INVALIDARG; +} + +HRESULT WINAPI UrlGetPartW(const WCHAR *url, WCHAR *out, DWORD *out_len, DWORD part, DWORD flags) +{ + DWORD scheme, size, schsize; + LPCWSTR addr, schaddr; + struct parsed_url pl; + HRESULT hr; + + TRACE("%s, %p, %p(%d), %#x, %#x\n", wine_dbgstr_w(url), out, out_len, *out_len, part, flags); + + if (!url || !out || !out_len || !*out_len) + return E_INVALIDARG; + + *out = '\0'; + + addr = strchrW(url, ':'); + if (!addr) + scheme = URL_SCHEME_UNKNOWN; + else + scheme = get_scheme_code(url, addr - url); + + hr = parse_url(url, &pl); + + switch (part) + { + case URL_PART_SCHEME: + if (!pl.scheme_len) + { + *out_len = 0; + return S_FALSE; + } + addr = pl.scheme; + size = pl.scheme_len; + break; + + case URL_PART_HOSTNAME: + switch (scheme) + { + case URL_SCHEME_FTP: + case URL_SCHEME_HTTP: + case URL_SCHEME_GOPHER: + case URL_SCHEME_TELNET: + case URL_SCHEME_FILE: + case URL_SCHEME_HTTPS: + break; + default: + *out_len = 0; + return E_FAIL; + } + + if (scheme == URL_SCHEME_FILE && (!pl.hostname_len || (pl.hostname_len == 1 && *(pl.hostname + 1) == ':'))) + { + *out_len = 0; + return S_FALSE; + } + + if (!pl.hostname_len) + { + *out_len = 0; + return S_FALSE; + } + addr = pl.hostname; + size = pl.hostname_len; + break; + + case URL_PART_USERNAME: + if (!pl.username_len) + { + *out_len = 0; + return S_FALSE; + } + addr = pl.username; + size = pl.username_len; + break; + + case URL_PART_PASSWORD: + if (!pl.password_len) + { + *out_len = 0; + return S_FALSE; + } + addr = pl.password; + size = pl.password_len; + break; + + case URL_PART_PORT: + if (!pl.port_len) + { + *out_len = 0; + return S_FALSE; + } + addr = pl.port; + size = pl.port_len; + break; + + case URL_PART_QUERY: + if (!pl.query_len) + { + *out_len = 0; + return S_FALSE; + } + addr = pl.query; + size = pl.query_len; + break; + + default: + *out_len = 0; + return E_INVALIDARG; + } + + if (flags == URL_PARTFLAG_KEEPSCHEME) + { + if (!pl.scheme || !pl.scheme_len) + { + *out_len = 0; + return E_FAIL; + } + schaddr = pl.scheme; + schsize = pl.scheme_len; + if (*out_len < schsize + size + 2) + { + *out_len = schsize + size + 2; + return E_POINTER; + } + memcpy(out, schaddr, schsize*sizeof(WCHAR)); + out[schsize] = ':'; + memcpy(out + schsize+1, addr, size*sizeof(WCHAR)); + out[schsize+1+size] = 0; + *out_len = schsize + 1 + size; + } + else + { + if (*out_len < size + 1) + { + *out_len = size + 1; + return E_POINTER; + } + memcpy(out, addr, size*sizeof(WCHAR)); + out[size] = 0; + *out_len = size; + } + TRACE("len=%d %s\n", *out_len, wine_dbgstr_w(out)); + + return hr; +} + +BOOL WINAPI UrlIsA(const char *url, URLIS Urlis) +{ + const char *last; + PARSEDURLA base; + + TRACE("%s, %d\n", debugstr_a(url), Urlis); + + if (!url) + return FALSE; + + switch (Urlis) { + + case URLIS_OPAQUE: + base.cbSize = sizeof(base); + if (ParseURLA(url, &base) != S_OK) return FALSE; /* invalid scheme */ + switch (base.nScheme) + { + case URL_SCHEME_MAILTO: + case URL_SCHEME_SHELL: + case URL_SCHEME_JAVASCRIPT: + case URL_SCHEME_VBSCRIPT: + case URL_SCHEME_ABOUT: + return TRUE; + } + return FALSE; + + case URLIS_FILEURL: + return (CompareStringA(LOCALE_INVARIANT, NORM_IGNORECASE, url, 5, "file:", 5) == CSTR_EQUAL); + + case URLIS_DIRECTORY: + last = url + strlen(url) - 1; + return (last >= url && (*last == '/' || *last == '\\' )); + + case URLIS_URL: + return PathIsURLA(url); + + case URLIS_NOHISTORY: + case URLIS_APPLIABLE: + case URLIS_HASQUERY: + default: + FIXME("(%s %d): stub\n", debugstr_a(url), Urlis); + } + + return FALSE; +} + +BOOL WINAPI UrlIsW(const WCHAR *url, URLIS Urlis) +{ + static const WCHAR file_colon[] = {'f','i','l','e',':',0}; + const WCHAR *last; + PARSEDURLW base; + + TRACE("%s, %d\n", debugstr_w(url), Urlis); + + if (!url) + return FALSE; + + switch (Urlis) + { + case URLIS_OPAQUE: + base.cbSize = sizeof(base); + if (ParseURLW(url, &base) != S_OK) return FALSE; /* invalid scheme */ + switch (base.nScheme) + { + case URL_SCHEME_MAILTO: + case URL_SCHEME_SHELL: + case URL_SCHEME_JAVASCRIPT: + case URL_SCHEME_VBSCRIPT: + case URL_SCHEME_ABOUT: + return TRUE; + } + return FALSE; + + case URLIS_FILEURL: + return (CompareStringW(LOCALE_INVARIANT, NORM_IGNORECASE, url, 5, file_colon, 5) == CSTR_EQUAL); + + case URLIS_DIRECTORY: + last = url + strlenW(url) - 1; + return (last >= url && (*last == '/' || *last == '\\')); + + case URLIS_URL: + return PathIsURLW(url); + + case URLIS_NOHISTORY: + case URLIS_APPLIABLE: + case URLIS_HASQUERY: + default: + FIXME("(%s %d): stub\n", debugstr_w(url), Urlis); + } + + return FALSE; +} + +BOOL WINAPI UrlIsOpaqueA(const char *url) +{ + return UrlIsA(url, URLIS_OPAQUE); +} + +BOOL WINAPI UrlIsOpaqueW(const WCHAR *url) +{ + return UrlIsW(url, URLIS_OPAQUE); +} + +BOOL WINAPI UrlIsNoHistoryA(const char *url) +{ + return UrlIsA(url, URLIS_NOHISTORY); +} + +BOOL WINAPI UrlIsNoHistoryW(const WCHAR *url) +{ + return UrlIsW(url, URLIS_NOHISTORY); +} + +HRESULT WINAPI UrlCreateFromPathA(const char *path, char *url, DWORD *url_len, DWORD reserved) +{ + WCHAR bufW[INTERNET_MAX_URL_LENGTH]; + DWORD lenW = ARRAY_SIZE(bufW), lenA; + UNICODE_STRING pathW; + WCHAR *urlW = bufW; + HRESULT hr; + + if (!RtlCreateUnicodeStringFromAsciiz(&pathW, path)) + return E_INVALIDARG; + + if ((hr = UrlCreateFromPathW(pathW.Buffer, urlW, &lenW, reserved)) == E_POINTER) + { + urlW = heap_alloc(lenW * sizeof(WCHAR)); + hr = UrlCreateFromPathW(pathW.Buffer, urlW, &lenW, reserved); + } + + if (SUCCEEDED(hr)) + { + RtlUnicodeToMultiByteSize(&lenA, urlW, lenW * sizeof(WCHAR)); + if (*url_len > lenA) + { + RtlUnicodeToMultiByteN(url, *url_len - 1, &lenA, urlW, lenW * sizeof(WCHAR)); + url[lenA] = 0; + *url_len = lenA; + } + else + { + *url_len = lenA + 1; + hr = E_POINTER; + } + } + if (urlW != bufW) + heap_free(urlW); + RtlFreeUnicodeString(&pathW); + return hr; +} + +HRESULT WINAPI UrlCreateFromPathW(const WCHAR *path, WCHAR *url, DWORD *url_len, DWORD reserved) +{ + HRESULT hr; + + TRACE("%s, %p, %p, %#x\n", debugstr_w(path), url, url_len, reserved); + + if (reserved || !url || !url_len) + return E_INVALIDARG; + + hr = url_create_from_path(path, url, url_len); + if (hr == S_FALSE) + strcpyW(url, path); + + return hr; +} -- 2.20.1

1 2

ddraw: Set ddsOldCaps
by David Adam 23 May '19

23 May '19

This patch is from Michael Muller.

2 1

[PATCH 1/6] setupapi: Implement SetupDiInstallDriverFiles().
by Zebediah Figura 23 May '19

23 May '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/setupapi/devinst.c | 43 ++++++++++++++++++++++++++++++++++++- dlls/setupapi/setupapi.spec | 2 +- 2 files changed, 43 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 71311238c3..41573908ac 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -3715,9 +3715,10 @@ BOOL WINAPI SetupDiCallClassInstaller(DI_FUNCTION function, HDEVINFO devinfo, SP return SetupDiSelectBestCompatDrv(devinfo, device_data); case DIF_REGISTER_COINSTALLERS: return SetupDiRegisterCoDeviceInstallers(devinfo, device_data); + case DIF_INSTALLDEVICEFILES: + return SetupDiInstallDriverFiles(devinfo, device_data); case DIF_FINISHINSTALL_ACTION: case DIF_INSTALLDEVICE: - case DIF_INSTALLDEVICEFILES: case DIF_INSTALLINTERFACES: case DIF_PROPERTYCHANGE: case DIF_SELECTDEVICE: @@ -4593,3 +4594,43 @@ BOOL WINAPI SetupDiSelectBestCompatDrv(HDEVINFO devinfo, SP_DEVINFO_DATA *device return TRUE; } + +/*********************************************************************** + * SetupDiInstallDriverFiles (SETUPAPI.@) + */ +BOOL WINAPI SetupDiInstallDriverFiles(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data) +{ + WCHAR section[LINE_LEN], section_ext[LINE_LEN]; + struct device *device; + struct driver *driver; + void *callback_ctx; + INFCONTEXT ctx; + HINF hinf; + + TRACE("devinfo %p, device_data %p.\n", devinfo, device_data); + + if (!(device = get_device(devinfo, device_data))) + return FALSE; + + if (!(driver = device->selected_driver)) + { + ERR("No driver selected for device %p.\n", devinfo); + SetLastError(ERROR_NO_DRIVER_SELECTED); + return FALSE; + } + + if ((hinf = SetupOpenInfFileW(driver->inf_path, NULL, INF_STYLE_WIN4, NULL)) == INVALID_HANDLE_VALUE) + return FALSE; + + SetupFindFirstLineW(hinf, driver->mfg_key, driver->description, &ctx); + SetupGetStringFieldW(&ctx, 1, section, ARRAY_SIZE(section), NULL); + SetupDiGetActualSectionToInstallW(hinf, section, section_ext, ARRAY_SIZE(section_ext), NULL, NULL); + + callback_ctx = SetupInitDefaultQueueCallback(NULL); + SetupInstallFromInfSectionW(NULL, hinf, section_ext, SPINST_FILES, NULL, NULL, + SP_COPY_NEWER_ONLY, SetupDefaultQueueCallbackW, callback_ctx, NULL, NULL); + SetupTermDefaultQueueCallback(callback_ctx); + + SetupCloseInfFile(hinf); + return TRUE; +} diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 892a8031bf..9ecff232d8 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -368,7 +368,7 @@ @ stdcall SetupDiInstallClassW(long wstr long ptr) @ stub SetupDiInstallDevice @ stdcall SetupDiInstallDeviceInterfaces(ptr ptr) -@ stub SetupDiInstallDriverFiles +@ stdcall SetupDiInstallDriverFiles(ptr ptr) @ stdcall SetupDiLoadClassIcon(ptr ptr ptr) @ stub SetupDiMoveDuplicateDevice @ stdcall SetupDiOpenClassRegKey(ptr long) -- 2.21.0

2 8

[PATCH] setupapi: Correct function parameter for CM_Set_Class_Registry_PropertyA/W
by Fabian Maurer 23 May '19

23 May '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47249 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/setupapi/stubs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index e6d1f1a0ce..47dca6c150 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -513,7 +513,7 @@ CONFIGRET WINAPI CM_Reenumerate_DevNode_Ex(DEVINST dnDevInst, ULONG ulFlags, HMA /*********************************************************************** * CM_Set_Class_Registry_PropertyA (SETUPAPI.@) */ -CONFIGRET WINAPI CM_Set_Class_Registry_PropertyA(LPGUID class, ULONG prop, PVOID buf, ULONG len, +CONFIGRET WINAPI CM_Set_Class_Registry_PropertyA(LPGUID class, ULONG prop, LPCVOID buf, ULONG len, ULONG flags, HMACHINE machine) { FIXME("%p %u %p %u 0x%08x %p: stub\n", class, prop, buf, len, flags, machine); @@ -523,7 +523,7 @@ CONFIGRET WINAPI CM_Set_Class_Registry_PropertyA(LPGUID class, ULONG prop, PVOID /*********************************************************************** * CM_Set_Class_Registry_PropertyW (SETUPAPI.@) */ -CONFIGRET WINAPI CM_Set_Class_Registry_PropertyW(LPGUID class, ULONG prop, PVOID buf, ULONG len, +CONFIGRET WINAPI CM_Set_Class_Registry_PropertyW(LPGUID class, ULONG prop, LPCVOID buf, ULONG len, ULONG flags, HMACHINE machine) { FIXME("%p %u %p %u 0x%08x %p: stub\n", class, prop, buf, len, flags, machine); -- 2.21.0

1 0

[PATCH 1/5] qcap/smartteefilter: Use strmbase_filter_cleanup().
by Zebediah Figura 23 May '19

23 May '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/qcap/smartteefilter.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/qcap/smartteefilter.c b/dlls/qcap/smartteefilter.c index 268e7a2209..cbcbc455ed 100644 --- a/dlls/qcap/smartteefilter.c +++ b/dlls/qcap/smartteefilter.c @@ -104,7 +104,7 @@ static ULONG WINAPI Unknown_AddRef(IUnknown *iface) static ULONG WINAPI Unknown_Release(IUnknown *iface) { SmartTeeFilter *This = impl_from_IUnknown(iface); - ULONG ref = BaseFilterImpl_Release(&This->filter.IBaseFilter_iface); + ULONG ref = InterlockedDecrement(&This->filter.refCount); TRACE("(%p)->() ref=%d\n", This, ref); @@ -115,6 +115,7 @@ static ULONG WINAPI Unknown_Release(IUnknown *iface) BaseOutputPinImpl_Release(&This->capture->pin.IPin_iface); if(This->preview) BaseOutputPinImpl_Release(&This->preview->pin.IPin_iface); + strmbase_filter_cleanup(&This->filter); CoTaskMemFree(This); } return ref; @@ -597,8 +598,8 @@ IUnknown* WINAPI QCAP_createSmartTeeFilter(IUnknown *outer, HRESULT *phr) This = CoTaskMemAlloc(sizeof(*This)); if (This == NULL) { - hr = E_OUTOFMEMORY; - goto end; + *phr = E_OUTOFMEMORY; + return NULL; } memset(This, 0, sizeof(*This)); This->IUnknown_iface.lpVtbl = &UnknownVtbl; @@ -638,8 +639,7 @@ end: else return (IUnknown*)&This->filter.IBaseFilter_iface; } else { - if (This) - IBaseFilter_Release(&This->filter.IBaseFilter_iface); + strmbase_filter_cleanup(&This->filter); return NULL; } } -- 2.21.0

1 4

[PATCH] po: Update Lithuanian translation
by Aurimas Fišeras 22 May '19

22 May '19

1 0

[PATCH v2 1/6] setupapi: Implement SetupDiRegisterCoDeviceInstallers().
by Zebediah Figura 22 May '19

22 May '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/setupapi/devinst.c | 51 +++++++++++++++++++++++++++++++++++++---- 1 file changed, 47 insertions(+), 4 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 1db2e52399..d2921bcf44 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -108,6 +108,7 @@ struct driver { WCHAR inf_path[MAX_PATH]; WCHAR manufacturer[LINE_LEN]; + WCHAR mfg_key[LINE_LEN]; WCHAR description[LINE_LEN]; }; @@ -4117,12 +4118,53 @@ BOOL WINAPI SetupDiInstallDeviceInterfaces(HDEVINFO dev, PSP_DEVINFO_DATA info_d /*********************************************************************** * SetupDiRegisterCoDeviceInstallers (SETUPAPI.@) */ -BOOL WINAPI SetupDiRegisterCoDeviceInstallers(HDEVINFO dev, PSP_DEVINFO_DATA info_data) +BOOL WINAPI SetupDiRegisterCoDeviceInstallers(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data) { - FIXME("%p, %p stub\n", dev, info_data); + static const WCHAR coinstallersW[] = {'.','C','o','I','n','s','t','a','l','l','e','r','s',0}; + WCHAR coinst_key[LINE_LEN], coinst_key_ext[LINE_LEN]; + struct device *device; + struct driver *driver; + void *callback_ctx; + HKEY driver_key; + INFCONTEXT ctx; + HINF hinf; + LONG l; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + TRACE("devinfo %p, device_data %p.\n", devinfo, device_data); + + if (!(device = get_device(devinfo, device_data))) + return FALSE; + + if (!(driver = device->selected_driver)) + { + ERR("No driver selected for device %p.\n", devinfo); + SetLastError(ERROR_NO_DRIVER_SELECTED); + return FALSE; + } + + if ((hinf = SetupOpenInfFileW(driver->inf_path, NULL, INF_STYLE_WIN4, NULL)) == INVALID_HANDLE_VALUE) + return FALSE; + + SetupFindFirstLineW(hinf, driver->mfg_key, driver->description, &ctx); + SetupGetStringFieldW(&ctx, 1, coinst_key, ARRAY_SIZE(coinst_key), NULL); + SetupDiGetActualSectionToInstallW(hinf, coinst_key, coinst_key_ext, ARRAY_SIZE(coinst_key_ext), NULL, NULL); + strcatW(coinst_key_ext, coinstallersW); + + if ((l = create_driver_key(device, &driver_key))) + { + SetLastError(l); + SetupCloseInfFile(hinf); + return FALSE; + } + + callback_ctx = SetupInitDefaultQueueCallback(NULL); + SetupInstallFromInfSectionW(NULL, hinf, coinst_key_ext, SPINST_ALL, driver_key, NULL, + SP_COPY_NEWER_ONLY, SetupDefaultQueueCallbackW, callback_ctx, NULL, NULL); + SetupTermDefaultQueueCallback(callback_ctx); + + RegCloseKey(driver_key); + SetupCloseInfFile(hinf); + return TRUE; } /* Check whether the given hardware or compatible ID matches any of the device's @@ -4231,6 +4273,7 @@ static void enum_compat_drivers_from_file(struct device *device, const WCHAR *pa device->drivers = heap_realloc(device->drivers, count * sizeof(*device->drivers)); strcpyW(device->drivers[count - 1].inf_path, path); strcpyW(device->drivers[count - 1].manufacturer, mfg_name); + strcpyW(device->drivers[count - 1].mfg_key, mfg_key_ext); SetupGetStringFieldW(&ctx, 0, device->drivers[count - 1].description, ARRAY_SIZE(device->drivers[count - 1].description), NULL); -- 2.21.0

2 9

context.c:111: Context_Release: Assertion `ref >= 0' failed.
by Hin-Tak Leung 22 May '19

22 May '19

Trying to install the windows version of intel performance primitive, and got ... 002b:fixme:cryptasn:CRYPT_AsnDecodeAltNameEntry 0: stub 002b:fixme:cryptasn:CRYPT_AsnDecodeAltNameEntry 0: stub 002b:fixme:cryptasn:CRYPT_AsnDecodeAltNameEntry 0: stub 002b:fixme:cryptasn:CRYPT_AsnDecodeAltNameEntry 0: stub oads\Intel\w_ipp_2019.3.203\install.exe: context.c:111: Context_Release: Assertion `ref >= 0' failed. ... I think it is refering to dlls/crypt32/context.c which has a Context_Release around line 110. I think I'll just file a bug... just in case somebody has a quick answer.

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel