- wine-devel - winehq.org

[PATCH 2/5] wined3d: Refactor wined3d_get_adapter_mode_count() to wined3d_output_get_mode_count().
by Zhiyi Zhang 04 Mar '20

04 Mar '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/d3d8/directx.c | 8 ++++++-- dlls/d3d9/directx.c | 20 ++++++++++++++------ dlls/dxgi/output.c | 4 +--- dlls/wined3d/directx.c | 21 +++++++++------------ dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 4 ++-- 6 files changed, 33 insertions(+), 26 deletions(-) diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index 7e9b72eea30..b78b119d22c 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -134,12 +134,16 @@ static HRESULT WINAPI d3d8_GetAdapterIdentifier(IDirect3D8 *iface, UINT adapter, static UINT WINAPI d3d8_GetAdapterModeCount(IDirect3D8 *iface, UINT adapter) { struct d3d8 *d3d8 = impl_from_IDirect3D8(iface); - UINT count; + unsigned int output_idx, count; TRACE("iface %p, adapter %u.\n", iface, adapter); + output_idx = adapter; + if (output_idx >= d3d8->wined3d_output_count) + return 0; + wined3d_mutex_lock(); - count = wined3d_get_adapter_mode_count(d3d8->wined3d, adapter, + count = wined3d_output_get_mode_count(d3d8->wined3d_outputs[output_idx], WINED3DFMT_UNKNOWN, WINED3D_SCANLINE_ORDERING_UNKNOWN); wined3d_mutex_unlock(); diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index 00632019c7d..83bb3d8217c 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -149,20 +149,24 @@ static HRESULT WINAPI d3d9_GetAdapterIdentifier(IDirect3D9Ex *iface, UINT adapte static UINT WINAPI d3d9_GetAdapterModeCount(IDirect3D9Ex *iface, UINT adapter, D3DFORMAT format) { struct d3d9 *d3d9 = impl_from_IDirect3D9Ex(iface); - UINT ret; + unsigned int output_idx, count; TRACE("iface %p, adapter %u, format %#x.\n", iface, adapter, format); + output_idx = adapter; + if (output_idx >= d3d9->wined3d_output_count) + return 0; + /* Others than that not supported by d3d9, but reported by wined3d for ddraw. Filter them out. */ if (format != D3DFMT_X8R8G8B8 && format != D3DFMT_R5G6B5) return 0; wined3d_mutex_lock(); - ret = wined3d_get_adapter_mode_count(d3d9->wined3d, adapter, + count = wined3d_output_get_mode_count(d3d9->wined3d_outputs[output_idx], wined3dformat_from_d3dformat(format), WINED3D_SCANLINE_ORDERING_UNKNOWN); wined3d_mutex_unlock(); - return ret; + return count; } static HRESULT WINAPI d3d9_EnumAdapterModes(IDirect3D9Ex *iface, UINT adapter, @@ -440,19 +444,23 @@ static UINT WINAPI d3d9_GetAdapterModeCountEx(IDirect3D9Ex *iface, UINT adapter, const D3DDISPLAYMODEFILTER *filter) { struct d3d9 *d3d9 = impl_from_IDirect3D9Ex(iface); - UINT ret; + unsigned int output_idx, count; TRACE("iface %p, adapter %u, filter %p.\n", iface, adapter, filter); + output_idx = adapter; + if (output_idx >= d3d9->wined3d_output_count) + return 0; + if (filter->Format != D3DFMT_X8R8G8B8 && filter->Format != D3DFMT_R5G6B5) return 0; wined3d_mutex_lock(); - ret = wined3d_get_adapter_mode_count(d3d9->wined3d, adapter, + count = wined3d_output_get_mode_count(d3d9->wined3d_outputs[output_idx], wined3dformat_from_d3dformat(filter->Format), filter->ScanLineOrdering); wined3d_mutex_unlock(); - return ret; + return count; } static HRESULT WINAPI d3d9_EnumAdapterModesEx(IDirect3D9Ex *iface, diff --git a/dlls/dxgi/output.c b/dlls/dxgi/output.c index 063d72e13fa..fe8dd7b5c0a 100644 --- a/dlls/dxgi/output.c +++ b/dlls/dxgi/output.c @@ -107,7 +107,6 @@ static HRESULT dxgi_output_get_display_mode_list(struct dxgi_output *output, enum wined3d_format_id wined3d_format; struct wined3d_display_mode mode; unsigned int i, max_count; - struct wined3d *wined3d; HRESULT hr; if (!mode_count) @@ -122,8 +121,7 @@ static HRESULT dxgi_output_get_display_mode_list(struct dxgi_output *output, wined3d_format = wined3dformat_from_dxgi_format(format); wined3d_mutex_lock(); - wined3d = output->adapter->factory->wined3d; - max_count = wined3d_get_adapter_mode_count(wined3d, output->adapter->ordinal, + max_count = wined3d_output_get_mode_count(output->wined3d_output, wined3d_format, WINED3D_SCANLINE_ORDERING_UNKNOWN); if (!modes) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 87beb98b3f4..614a6eea8d7 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -952,7 +952,7 @@ HRESULT CDECL wined3d_get_output_desc(const struct wined3d *wined3d, unsigned in of the same bpp but different resolutions */ /* Note: dx9 supplies a format. Calls from d3d8 supply WINED3DFMT_UNKNOWN */ -UINT CDECL wined3d_get_adapter_mode_count(const struct wined3d *wined3d, UINT adapter_idx, +unsigned int CDECL wined3d_output_get_mode_count(const struct wined3d_output *output, enum wined3d_format_id format_id, enum wined3d_scanline_ordering scanline_ordering) { const struct wined3d_adapter *adapter; @@ -962,20 +962,17 @@ UINT CDECL wined3d_get_adapter_mode_count(const struct wined3d *wined3d, UINT ad UINT format_bits; DEVMODEW mode; - TRACE("wined3d %p, adapter_idx %u, format %s, scanline_ordering %#x.\n", - wined3d, adapter_idx, debug_d3dformat(format_id), scanline_ordering); + TRACE("output %p, format %s, scanline_ordering %#x.\n", + output, debug_d3dformat(format_id), scanline_ordering); - if (adapter_idx >= wined3d->adapter_count) - return 0; - - adapter = wined3d->adapters[adapter_idx]; + adapter = output->adapter; format = wined3d_get_format(adapter, format_id, WINED3D_BIND_RENDER_TARGET); format_bits = format->byte_count * CHAR_BIT; memset(&mode, 0, sizeof(mode)); mode.dmSize = sizeof(mode); - while (EnumDisplaySettingsExW(adapter->device_name, j++, &mode, 0)) + while (EnumDisplaySettingsExW(output->device_name, j++, &mode, 0)) { if (mode.dmFields & DM_DISPLAYFLAGS) { @@ -999,7 +996,7 @@ UINT CDECL wined3d_get_adapter_mode_count(const struct wined3d *wined3d, UINT ad } } - TRACE("Returning %u matching modes (out of %u total) for adapter %u.\n", i, j, adapter_idx); + TRACE("Returning %u matching modes (out of %u total) for output %p.\n", i, j, output); return i; } @@ -1093,10 +1090,10 @@ HRESULT CDECL wined3d_find_closest_matching_adapter_mode(const struct wined3d *w TRACE("wined3d %p, adapter_idx %u, mode %p.\n", wined3d, adapter_idx, mode); - if (!(mode_count = wined3d_get_adapter_mode_count(wined3d, adapter_idx, + if (!(mode_count = wined3d_output_get_mode_count(&wined3d->adapters[0]->outputs[0], mode->format_id, WINED3D_SCANLINE_ORDERING_UNKNOWN))) { - WARN("Adapter has 0 matching modes.\n"); + WARN("Output has 0 matching modes.\n"); return E_FAIL; } @@ -1831,7 +1828,7 @@ HRESULT CDECL wined3d_check_device_type(const struct wined3d *wined3d, UINT adap if (!windowed) { /* If the requested display format is not available, don't continue. */ - if (!wined3d_get_adapter_mode_count(wined3d, adapter_idx, + if (!wined3d_output_get_mode_count(&wined3d->adapters[0]->outputs[0], display_format, WINED3D_SCANLINE_ORDERING_UNKNOWN)) { TRACE("No available modes for display format %s.\n", debug_d3dformat(display_format)); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index b8d93ef2393..ca626638338 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -14,7 +14,6 @@ @ cdecl wined3d_get_adapter_count(ptr) @ cdecl wined3d_get_adapter_display_mode(ptr long ptr ptr) @ cdecl wined3d_get_adapter_identifier(ptr long long ptr) -@ cdecl wined3d_get_adapter_mode_count(ptr long long long) @ cdecl wined3d_get_adapter_raster_status(ptr long ptr) @ cdecl wined3d_get_device_caps(ptr long long ptr) @ cdecl wined3d_get_output_desc(ptr long ptr) @@ -194,6 +193,7 @@ @ cdecl wined3d_device_validate_device(ptr ptr) @ cdecl wined3d_output_get_mode(ptr long long long ptr) +@ cdecl wined3d_output_get_mode_count(ptr long long) @ cdecl wined3d_output_release_ownership(ptr) @ cdecl wined3d_output_take_ownership(ptr long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 0bd8cbdddbc..9600bf63ee7 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2267,8 +2267,6 @@ HRESULT __cdecl wined3d_get_adapter_display_mode(const struct wined3d *wined3d, struct wined3d_display_mode *mode, enum wined3d_display_rotation *rotation); HRESULT __cdecl wined3d_get_adapter_identifier(const struct wined3d *wined3d, UINT adapter_idx, DWORD flags, struct wined3d_adapter_identifier *identifier); -UINT __cdecl wined3d_get_adapter_mode_count(const struct wined3d *wined3d, UINT adapter_idx, - enum wined3d_format_id format_id, enum wined3d_scanline_ordering scanline_ordering); HRESULT __cdecl wined3d_get_adapter_raster_status(const struct wined3d *wined3d, UINT adapter_idx, struct wined3d_raster_status *raster_status); HRESULT __cdecl wined3d_get_device_caps(const struct wined3d *wined3d, unsigned int adapter_idx, @@ -2557,6 +2555,8 @@ HRESULT __cdecl wined3d_device_validate_device(const struct wined3d_device *devi HRESULT __cdecl wined3d_output_get_mode(const struct wined3d_output *output, enum wined3d_format_id format_id, enum wined3d_scanline_ordering scanline_ordering, unsigned int mode_idx, struct wined3d_display_mode *mode); +unsigned int __cdecl wined3d_output_get_mode_count(const struct wined3d_output *output, + enum wined3d_format_id format_id, enum wined3d_scanline_ordering scanline_ordering); void __cdecl wined3d_output_release_ownership(const struct wined3d_output *output); HRESULT __cdecl wined3d_output_take_ownership(const struct wined3d_output *output, BOOL exclusive); -- 2.20.1

1 0

[PATCH 1/2] mf: Implement MFGetSupportedMimeTypes()/MFGetSupportedSchemes().
by Nikolay Sivov 04 Mar '20

04 Mar '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/Makefile.in | 2 +- dlls/mf/main.c | 119 ++++++++++++++++++++++++++++++++++++++++++-- dlls/mf/mf.spec | 2 +- dlls/mf/tests/mf.c | 34 +++++++++++++ include/mfidl.idl | 1 + 5 files changed, 153 insertions(+), 5 deletions(-) diff --git a/dlls/mf/Makefile.in b/dlls/mf/Makefile.in index d23349c9cf..fe156e43ab 100644 --- a/dlls/mf/Makefile.in +++ b/dlls/mf/Makefile.in @@ -1,6 +1,6 @@ MODULE = mf.dll IMPORTLIB = mf -IMPORTS = mfplat ole32 uuid mfuuid +IMPORTS = advapi32 mfplat ole32 uuid mfuuid EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/mf/main.c b/dlls/mf/main.c index 5d645db200..1700b179e5 100644 --- a/dlls/mf/main.c +++ b/dlls/mf/main.c @@ -1081,14 +1081,127 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) return TRUE; } +static HRESULT prop_string_vector_append(PROPVARIANT *vector, unsigned int *count, BOOL unique, const WCHAR *str) +{ + WCHAR *ptrW; + int len, i; + + if (unique) + { + for (i = 0; i < vector->calpwstr.cElems; ++i) + { + if (!lstrcmpW(vector->calpwstr.pElems[i], str)) + return S_OK; + } + } + + if (!vector->calpwstr.cElems || *count > vector->calpwstr.cElems - 1) + { + unsigned int new_count; + WCHAR **ptr; + + new_count = *count ? *count * 2 : 10; + ptr = CoTaskMemRealloc(vector->calpwstr.pElems, new_count * sizeof(*vector->calpwstr.pElems)); + if (!ptr) + return E_OUTOFMEMORY; + vector->calpwstr.pElems = ptr; + *count = new_count; + } + + len = lstrlenW(str); + if (!(vector->calpwstr.pElems[vector->calpwstr.cElems] = ptrW = CoTaskMemAlloc((len + 1) * sizeof(WCHAR)))) + return E_OUTOFMEMORY; + + lstrcpyW(ptrW, str); + vector->calpwstr.cElems++; + + return S_OK; +} + +static int __cdecl qsort_string_compare(const void *a, const void *b) +{ + return lstrcmpW(a, b); +} + +static HRESULT mf_get_handler_strings(const WCHAR *path, WCHAR filter, unsigned int maxlen, PROPVARIANT *dst) +{ + static const HKEY hkey_roots[2] = { HKEY_CURRENT_USER, HKEY_LOCAL_MACHINE }; + HRESULT hr = S_OK; + int i, index; + WCHAR *buffW; + + buffW = heap_calloc(maxlen, sizeof(*buffW)); + if (!buffW) + return E_OUTOFMEMORY; + + memset(dst, 0, sizeof(*dst)); + dst->vt = VT_VECTOR | VT_LPWSTR; + + for (i = 0; i < ARRAY_SIZE(hkey_roots); ++i) + { + unsigned int count; + DWORD size; + HKEY hkey; + + if (RegOpenKeyW(hkey_roots[i], path, &hkey)) + continue; + + index = 0; + size = maxlen; + count = dst->calpwstr.cElems; + while (!RegEnumKeyExW(hkey, index++, buffW, &size, NULL, NULL, NULL, NULL)) + { + if (filter && !wcschr(buffW, filter)) + continue; + if (FAILED(hr = prop_string_vector_append(dst, &count, i > 0, buffW))) + break; + size = maxlen; + } + + /* Sort last pass results. */ + qsort(&dst->calpwstr.pElems[count], dst->calpwstr.cElems - count, sizeof(*dst->calpwstr.pElems), + qsort_string_compare); + + RegCloseKey(hkey); + } + + if (FAILED(hr)) + PropVariantClear(dst); + + heap_free(buffW); + + return hr; +} + /*********************************************************************** * MFGetSupportedMimeTypes (mf.@) */ -HRESULT WINAPI MFGetSupportedMimeTypes(PROPVARIANT *array) +HRESULT WINAPI MFGetSupportedMimeTypes(PROPVARIANT *dst) { - FIXME("(%p) stub\n", array); + unsigned int maxlen; - return E_NOTIMPL; + TRACE("%p.\n", dst); + + if (!dst) + return E_POINTER; + + /* According to RFC4288 it's 127/127 characters. */ + maxlen = 127 /* type */ + 1 /* / */ + 127 /* subtype */ + 1; + return mf_get_handler_strings(L"Software\\Microsoft\\Windows Media Foundation\\ByteStreamHandlers", '/', + maxlen, dst); +} + +/*********************************************************************** + * MFGetSupportedSchemes (mf.@) + */ +HRESULT WINAPI MFGetSupportedSchemes(PROPVARIANT *dst) +{ + TRACE("%p.\n", dst); + + if (!dst) + return E_POINTER; + + return mf_get_handler_strings(L"Software\\Microsoft\\Windows Media Foundation\\SchemeHandlers", 0, 64, dst); } /*********************************************************************** diff --git a/dlls/mf/mf.spec b/dlls/mf/mf.spec index e396d01519..29676005ad 100644 --- a/dlls/mf/mf.spec +++ b/dlls/mf/mf.spec @@ -74,7 +74,7 @@ @ stub MFGetMultipleServiceProviders @ stdcall MFGetService(ptr ptr ptr ptr) @ stdcall MFGetSupportedMimeTypes(ptr) -@ stub MFGetSupportedSchemes +@ stdcall MFGetSupportedSchemes(ptr) @ stub MFGetTopoNodeCurrentType @ stub MFReadSequencerSegmentOffset @ stub MFRequireProtectedEnvironment diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 5a690880d1..aa72e71292 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -2719,6 +2719,38 @@ static void test_MFCreateSimpleTypeHandler(void) IMFMediaTypeHandler_Release(handler); } +static void test_MFGetSupportedMimeTypes(void) +{ + PROPVARIANT value; + HRESULT hr; + + hr = MFGetSupportedMimeTypes(NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + value.vt = VT_EMPTY; + hr = MFGetSupportedMimeTypes(&value); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(value.vt == (VT_VECTOR | VT_LPWSTR), "Unexpected value type %#x.\n", value.vt); + + PropVariantClear(&value); +} + +static void test_MFGetSupportedSchemes(void) +{ + PROPVARIANT value; + HRESULT hr; + + hr = MFGetSupportedSchemes(NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + value.vt = VT_EMPTY; + hr = MFGetSupportedSchemes(&value); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(value.vt == (VT_VECTOR | VT_LPWSTR), "Unexpected value type %#x.\n", value.vt); + + PropVariantClear(&value); +} + START_TEST(mf) { test_topology(); @@ -2734,4 +2766,6 @@ START_TEST(mf) test_sar(); test_evr(); test_MFCreateSimpleTypeHandler(); + test_MFGetSupportedMimeTypes(); + test_MFGetSupportedSchemes(); } diff --git a/include/mfidl.idl b/include/mfidl.idl index fa3a2d132a..e27294d488 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -595,6 +595,7 @@ cpp_quote("HRESULT WINAPI MFCreateTopoLoader(IMFTopoLoader **loader);") cpp_quote("HRESULT WINAPI MFCreateVideoRendererActivate(HWND hwnd, IMFActivate **activate);") cpp_quote("HRESULT WINAPI MFEnumDeviceSources(IMFAttributes *attributes, IMFActivate ***sources, UINT32 *count);") cpp_quote("HRESULT WINAPI MFGetSupportedMimeTypes(PROPVARIANT *array);") +cpp_quote("HRESULT WINAPI MFGetSupportedSchemes(PROPVARIANT *array);") cpp_quote("HRESULT WINAPI MFGetService(IUnknown *object, REFGUID service, REFIID iid, void **obj);") cpp_quote("MFTIME WINAPI MFGetSystemTime(void);") cpp_quote("HRESULT WINAPI MFShutdownObject(IUnknown *object);") -- 2.25.1

1 1

[PATCH v4 2/2] kernelbase: Implement SetConsoleScreenBufferInfoEx().
by Aaro Altonen 04 Mar '20

04 Mar '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47288 Signed-off-by: Aaro Altonen <a.altonen(a)hotmail.com> --- v2: - Removed an unnecessary check and added a print (thanks Gijs) --- dlls/kernel32/tests/console.c | 10 +++++----- dlls/kernelbase/console.c | 33 ++++++++++++++++++++++++++++++--- 2 files changed, 35 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 8f19161c9c..9698f11779 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -3167,24 +3167,24 @@ static void test_SetConsoleScreenBufferInfoEx(HANDLE std_output) SetLastError(0xdeadbeef); ret = pSetConsoleScreenBufferInfoEx(NULL, &info); ok(!ret, "got %d, expected zero\n", ret); - todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); SetLastError(0xdeadbeef); ret = pSetConsoleScreenBufferInfoEx(std_output, &info); - todo_wine ok(ret, "got %d, expected one\n", ret); - todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + ok(ret, "got %d, expected one\n", ret); + ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); SetLastError(0xdeadbeef); ret = pSetConsoleScreenBufferInfoEx(std_input, &info); ok(!ret, "got %d, expected zero\n", ret); - todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE || GetLastError() == ERROR_ACCESS_DENIED, + ok(GetLastError() == ERROR_INVALID_HANDLE || GetLastError() == ERROR_ACCESS_DENIED, "got %u, expected 5 or 6\n", GetLastError()); info.cbSize = 0; SetLastError(0xdeadbeef); ret = pSetConsoleScreenBufferInfoEx(std_output, &info); ok(!ret, "got %d, expected zero\n", ret); - todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); CloseHandle(std_input); } diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index 91e8129fbe..8ce9252413 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -1146,9 +1146,36 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetConsoleOutputCP( UINT cp ) BOOL WINAPI DECLSPEC_HOTPATCH SetConsoleScreenBufferInfoEx( HANDLE handle, CONSOLE_SCREEN_BUFFER_INFOEX *info ) { - FIXME( "(%p %p): stub!\n", handle, info ); - SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); - return FALSE; + BOOL ret; + + TRACE("(%p, %p)\n", handle, info); + + if (info->cbSize != sizeof(CONSOLE_SCREEN_BUFFER_INFOEX)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + SERVER_START_REQ(set_console_output_info) + { + req->handle = console_handle_unmap(handle); + req->width = info->dwSize.X; + req->height = info->dwSize.Y; + req->cursor_x = info->dwCursorPosition.X; + req->cursor_y = info->dwCursorPosition.Y; + req->attr = info->wAttributes; + req->win_left = info->srWindow.Left; + req->win_top = info->srWindow.Top; + req->win_right = info->srWindow.Right; + req->win_bottom = info->srWindow.Bottom; + req->popup_attr = info->wPopupAttributes; + req->max_width = min(info->dwMaximumWindowSize.X, info->dwSize.X); + req->max_height = min(info->dwMaximumWindowSize.Y, info->dwSize.Y); + ret = !wine_server_call_err(req); + } + SERVER_END_REQ; + + return ret; } -- 2.25.1

1 0

[PATCH v4 1/2] kernel32/tests: Add tests for SetConsoleScreenBufferInfoEx().
by Aaro Altonen 04 Mar '20

04 Mar '20

Signed-off-by: Aaro Altonen <a.altonen(a)hotmail.com> --- v2: - Fix code formatting and a typo v3: - Use GetConsoleScreenBufferInfoEx() to get valid console info before running any tests v4: - Get GetConsoleScreenBufferInfoEx() using GetHandle(). Directly calling GetConsoleScreenBufferInfoEx() on XP caused problems because it does not exist which caused XP tests to time out --- dlls/kernel32/tests/console.c | 48 +++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 5f8003760d..8f19161c9c 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -3142,6 +3142,53 @@ static void test_GetConsoleScreenBufferInfoEx(HANDLE std_output) ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); } +static void test_SetConsoleScreenBufferInfoEx(HANDLE std_output) +{ + BOOL ret; + HANDLE hmod; + HANDLE std_input = CreateFileA("CONIN$", GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0); + BOOL (WINAPI *pSetConsoleScreenBufferInfoEx)(HANDLE, CONSOLE_SCREEN_BUFFER_INFOEX *); + BOOL (WINAPI *pGetConsoleScreenBufferInfoEx)(HANDLE, CONSOLE_SCREEN_BUFFER_INFOEX *); + CONSOLE_SCREEN_BUFFER_INFOEX info; + + hmod = GetModuleHandleA("kernel32.dll"); + pSetConsoleScreenBufferInfoEx = (void *)GetProcAddress(hmod, "SetConsoleScreenBufferInfoEx"); + pGetConsoleScreenBufferInfoEx = (void *)GetProcAddress(hmod, "GetConsoleScreenBufferInfoEx"); + if (!pSetConsoleScreenBufferInfoEx || !pGetConsoleScreenBufferInfoEx) + { + win_skip("SetConsoleScreenBufferInfoEx is not available\n"); + return; + } + + memset(&info, 0, sizeof(CONSOLE_SCREEN_BUFFER_INFOEX)); + info.cbSize = sizeof(CONSOLE_SCREEN_BUFFER_INFOEX); + pGetConsoleScreenBufferInfoEx(std_output, &info); + + SetLastError(0xdeadbeef); + ret = pSetConsoleScreenBufferInfoEx(NULL, &info); + ok(!ret, "got %d, expected zero\n", ret); + todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = pSetConsoleScreenBufferInfoEx(std_output, &info); + todo_wine ok(ret, "got %d, expected one\n", ret); + todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = pSetConsoleScreenBufferInfoEx(std_input, &info); + ok(!ret, "got %d, expected zero\n", ret); + todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE || GetLastError() == ERROR_ACCESS_DENIED, + "got %u, expected 5 or 6\n", GetLastError()); + + info.cbSize = 0; + SetLastError(0xdeadbeef); + ret = pSetConsoleScreenBufferInfoEx(std_output, &info); + ok(!ret, "got %d, expected zero\n", ret); + todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); + + CloseHandle(std_input); +} + static void test_AttachConsole_child(DWORD console_pid) { HANDLE pipe_in, pipe_out; @@ -3398,5 +3445,6 @@ START_TEST(console) test_GetConsoleFontInfo(hConOut); test_SetConsoleFont(hConOut); test_GetConsoleScreenBufferInfoEx(hConOut); + test_SetConsoleScreenBufferInfoEx(hConOut); test_AttachConsole(hConOut); } -- 2.25.1

1 0

[PATCH] po: Update Lithuanian translation
by Aurimas Fišeras 04 Mar '20

04 Mar '20

1 0

[PATCH v2 1/2] kernel32/tests: Add some tests for hard links.
by Zebediah Figura 04 Mar '20

04 Mar '20

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- v2: fix a test failure with Windows XP dlls/kernel32/tests/file.c | 82 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 110082a9c4f..1f704337877 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -117,6 +117,13 @@ static void InitFunctionPointers(void) pFindFirstStreamW = (void *)GetProcAddress(hkernel32, "FindFirstStreamW"); } +static void create_file( const char *path ) +{ + FILE *f = fopen( path, "wb" ); + fputs( path, f ); + fclose( f ); +} + static void test__hread( void ) { HFILE filehandle; @@ -5510,6 +5517,80 @@ static void test_SetFileTime(void) CloseHandle(hfile); } +static void test_hard_link(void) +{ + char cwd[MAX_PATH], temp_dir[MAX_PATH], name_buffer[200], buffer[20]; + FILE_NAME_INFORMATION *name_info = (FILE_NAME_INFORMATION *)name_buffer; + IO_STATUS_BLOCK io; + NTSTATUS status; + HANDLE file; + DWORD size; + BOOL ret; + + GetCurrentDirectoryA( sizeof(cwd), cwd ); + GetTempPathA( sizeof(temp_dir), temp_dir ); + SetCurrentDirectoryA( temp_dir ); + + ret = CreateDirectoryA( "winetest_dir1", NULL ); + ok(ret, "failed to create directory, error %u\n", GetLastError()); + ret = CreateDirectoryA( "winetest_dir2", NULL ); + ok(ret, "failed to create directory, error %u\n", GetLastError()); + create_file( "winetest_file1" ); + create_file( "winetest_file2" ); + + ret = CreateHardLinkA( "winetest_file3", "winetest_file1", NULL ); + ok(ret, "got error %u\n", GetLastError()); + + file = CreateFileA( "winetest_file3", FILE_READ_DATA, 0, NULL, OPEN_EXISTING, 0, NULL ); + ok(file != INVALID_HANDLE_VALUE, "got error %u\n", GetLastError()); + + status = NtQueryInformationFile( file, &io, name_buffer, sizeof(name_buffer), FileNameInformation ); + ok(!status, "got status %#x\n", status); + ok(!wcsncmp(name_info->FileName + (name_info->FileNameLength / sizeof(WCHAR)) - wcslen(L"\\winetest_file3"), + L"\\winetest_file3", wcslen(L"\\winetest_file3")), "got name %s\n", + debugstr_wn(name_info->FileName, name_info->FileNameLength / sizeof(WCHAR))); + + ret = ReadFile( file, buffer, sizeof(buffer), &size, NULL ); + ok(ret, "got error %u\n", GetLastError()); + ok(!memcmp( buffer, "winetest_file1", size ), "got file contents %s\n", debugstr_an( buffer, size )); + + CloseHandle( file ); + + ret = DeleteFileA( "winetest_file3" ); + ok(ret, "failed to delete file, error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = CreateHardLinkA( "winetest_file2", "winetest_file1", NULL ); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_ALREADY_EXISTS, "got error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = CreateHardLinkA( "winetest_file3", "winetest_dir1", NULL ); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_ACCESS_DENIED, "got error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = CreateHardLinkA( "winetest_dir2", "winetest_dir1", NULL ); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_ACCESS_DENIED + || GetLastError() == ERROR_ALREADY_EXISTS /* XP */, "got error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = CreateHardLinkA( "winetest_dir1", "winetest_file1", NULL ); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_ALREADY_EXISTS, "got error %u\n", GetLastError()); + + ret = RemoveDirectoryA( "winetest_dir1" ); + ok(ret, "failed to remove directory, error %u\n", GetLastError()); + ret = RemoveDirectoryA( "winetest_dir2" ); + ok(ret, "failed to remove directory, error %u\n", GetLastError()); + ret = DeleteFileA( "winetest_file1" ); + ok(ret, "failed to delete file, error %u\n", GetLastError()); + ret = DeleteFileA( "winetest_file2" ); + ok(ret, "failed to delete file, error %u\n", GetLastError()); + SetCurrentDirectoryA( cwd ); +} + START_TEST(file) { char temp_path[MAX_PATH]; @@ -5584,4 +5665,5 @@ START_TEST(file) test_find_file_stream(); test_SetFileTime(); test_ReOpenFile(); + test_hard_link(); } -- 2.25.1

1 1

[PATCH v2] comctl32/tests: Remove duplicate line in imagelist.c.
by Ziqing Hui 04 Mar '20

04 Mar '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/comctl32/tests/imagelist.c | 1 - 1 file changed, 1 deletion(-)

1 0

[PATCH] comctl32/tests: Remove duplicate line in imagelist.c
by Ziqing Hui 04 Mar '20

04 Mar '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/comctl32/tests/imagelist.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index aa563574ed..d4da38b151 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -2460,7 +2460,6 @@ static void init_functions(void) X(ImageList_AddMasked); X(ImageList_DrawIndirect); X(ImageList_SetImageCount); - X(ImageList_SetImageCount); X2(ImageList_SetColorTable, 390); X(ImageList_GetFlags); X(ImageList_BeginDrag); -- 2.17.1

2 3

[PATCH 1/2] kernel32/tests: Add some tests for hard links.
by Zebediah Figura 04 Mar '20

04 Mar '20

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/kernel32/tests/file.c | 81 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 110082a9c4f..ff8bf05e43b 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -117,6 +117,13 @@ static void InitFunctionPointers(void) pFindFirstStreamW = (void *)GetProcAddress(hkernel32, "FindFirstStreamW"); } +static void create_file( const char *path ) +{ + FILE *f = fopen( path, "wb" ); + fputs( path, f ); + fclose( f ); +} + static void test__hread( void ) { HFILE filehandle; @@ -5510,6 +5517,79 @@ static void test_SetFileTime(void) CloseHandle(hfile); } +static void test_hard_link(void) +{ + char cwd[MAX_PATH], temp_dir[MAX_PATH], name_buffer[200], buffer[20]; + FILE_NAME_INFORMATION *name_info = (FILE_NAME_INFORMATION *)name_buffer; + IO_STATUS_BLOCK io; + NTSTATUS status; + HANDLE file; + DWORD size; + BOOL ret; + + GetCurrentDirectoryA( sizeof(cwd), cwd ); + GetTempPathA( sizeof(temp_dir), temp_dir ); + SetCurrentDirectoryA( temp_dir ); + + ret = CreateDirectoryA( "winetest_dir1", NULL ); + ok(ret, "failed to create directory, error %u\n", GetLastError()); + ret = CreateDirectoryA( "winetest_dir2", NULL ); + ok(ret, "failed to create directory, error %u\n", GetLastError()); + create_file( "winetest_file1" ); + create_file( "winetest_file2" ); + + ret = CreateHardLinkA( "winetest_file3", "winetest_file1", NULL ); + ok(ret, "got error %u\n", GetLastError()); + + file = CreateFileA( "winetest_file3", FILE_READ_DATA, 0, NULL, OPEN_EXISTING, 0, NULL ); + ok(file != INVALID_HANDLE_VALUE, "got error %u\n", GetLastError()); + + status = NtQueryInformationFile( file, &io, name_buffer, sizeof(name_buffer), FileNameInformation ); + ok(!status, "got status %#x\n", status); + ok(!wcsncmp(name_info->FileName + (name_info->FileNameLength / sizeof(WCHAR)) - wcslen(L"\\winetest_file3"), + L"\\winetest_file3", wcslen(L"\\winetest_file3")), "got name %s\n", + debugstr_wn(name_info->FileName, name_info->FileNameLength / sizeof(WCHAR))); + + ret = ReadFile( file, buffer, sizeof(buffer), &size, NULL ); + ok(ret, "got error %u\n", GetLastError()); + ok(!memcmp( buffer, "winetest_file1", size ), "got file contents %s\n", debugstr_an( buffer, size )); + + CloseHandle( file ); + + ret = DeleteFileA( "winetest_file3" ); + ok(ret, "failed to delete file, error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = CreateHardLinkA( "winetest_file2", "winetest_file1", NULL ); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_ALREADY_EXISTS, "got error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = CreateHardLinkA( "winetest_file3", "winetest_dir1", NULL ); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_ACCESS_DENIED, "got error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = CreateHardLinkA( "winetest_dir2", "winetest_dir1", NULL ); + ok(!ret, "expected failure\n"); + todo_wine ok(GetLastError() == ERROR_ACCESS_DENIED, "got error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = CreateHardLinkA( "winetest_dir1", "winetest_file1", NULL ); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_ALREADY_EXISTS, "got error %u\n", GetLastError()); + + ret = RemoveDirectoryA( "winetest_dir1" ); + ok(ret, "failed to remove directory, error %u\n", GetLastError()); + ret = RemoveDirectoryA( "winetest_dir2" ); + ok(ret, "failed to remove directory, error %u\n", GetLastError()); + ret = DeleteFileA( "winetest_file1" ); + ok(ret, "failed to delete file, error %u\n", GetLastError()); + ret = DeleteFileA( "winetest_file2" ); + ok(ret, "failed to delete file, error %u\n", GetLastError()); + SetCurrentDirectoryA( cwd ); +} + START_TEST(file) { char temp_path[MAX_PATH]; @@ -5584,4 +5664,5 @@ START_TEST(file) test_find_file_stream(); test_SetFileTime(); test_ReOpenFile(); + test_hard_link(); } -- 2.25.1

2 2

[PATCH 1/5] amstream: Implement IAMMultiMediaStream::EnumMediaStreams().
by Zebediah Figura 03 Mar '20

03 Mar '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/amstream/multimedia.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/amstream/multimedia.c b/dlls/amstream/multimedia.c index 515c713b32..c3c806b36f 100644 --- a/dlls/amstream/multimedia.c +++ b/dlls/amstream/multimedia.c @@ -125,13 +125,13 @@ static HRESULT WINAPI multimedia_stream_GetMediaStream(IAMMultiMediaStream *ifac } static HRESULT WINAPI multimedia_stream_EnumMediaStreams(IAMMultiMediaStream *iface, - LONG Index, IMediaStream **ppMediaStream) + LONG index, IMediaStream **stream) { - struct multimedia_stream *This = impl_from_IAMMultiMediaStream(iface); + struct multimedia_stream *mmstream = impl_from_IAMMultiMediaStream(iface); - FIXME("(%p/%p)->(%d,%p) stub!\n", This, iface, Index, ppMediaStream); + TRACE("mmstream %p, index %d, stream %p.\n", mmstream, index, stream); - return E_NOTIMPL; + return IMediaStreamFilter_EnumMediaStreams(mmstream->filter, index, stream); } static HRESULT WINAPI multimedia_stream_GetState(IAMMultiMediaStream *iface, STREAM_STATE *pCurrentState) -- 2.25.1

1 4

About GSoC
by Alex 03 Mar '20

03 Mar '20

So, I have this idea of replacing Winetricks with something more beautiful, responsive and functional. I have been developing Wineglass independently as an elementaryOS app (https://github.com/aggalex/Wineglass) and I want to expand it and integrate it with wine in a much better way. If possible, could you inform me about wine's GSoC program? Do you believe such a project is suitable for wine and GSoC?

3 3

[PATCH 00/12] [RFC] d2d1: Implement cubic bezier filling.
by Connor McAdams 03 Mar '20

03 Mar '20

This patch series implements cubic bezier filling. Looking for feedback on any obvious issues/tests that should be created. Connor McAdams (12): d2d1: Store cubic bezier control points. d2d1: Add cubic bezier bounds functions. d2d1: Update bezier-bezier intersect functions. d2d1: Update bezier-line intersection for cubics. d2d1: Update apply_intersections for cubic beziers. d2d1: Update path geometry Simplify for cubic beziers. d2d1: Add functions for cubic bezier triangulation. d2d1: Add function for getting figure orientation. d2d1: Add cubic bezier fill side detection. d2d1: Update bezier overlap checking for cubics. d2d1: Add cubic bezier texture coordinate functions. d2d1: Render cubic beziers. dlls/d2d1/d2d1_private.h | 2 +- dlls/d2d1/device.c | 350 ++++----- dlls/d2d1/geometry.c | 1467 +++++++++++++++++++++++++++++++++----- 3 files changed, 1458 insertions(+), 361 deletions(-) -- 2.20.1

3 21

[PATCH 1/3] gdiplus/tests: Use much smaller fudge factor in test_widen_cap.
by Jeff Smith 03 Mar '20

03 Mar '20

Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> --- dlls/gdiplus/tests/graphicspath.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/tests/graphicspath.c b/dlls/gdiplus/tests/graphicspath.c index aabacef3aa..8c025a4eca 100644 --- a/dlls/gdiplus/tests/graphicspath.c +++ b/dlls/gdiplus/tests/graphicspath.c @@ -75,7 +75,8 @@ typedef struct int todo; } path_test_t; -static void ok_path(GpPath* path, const path_test_t *expected, INT expected_size, BOOL todo_size) +#define ok_path(a,b,c,d) ok_path_fudge(a,b,c,d,2.0) +static void ok_path_fudge(GpPath* path, const path_test_t *expected, INT expected_size, BOOL todo_size, REAL fudge) { BYTE * types; INT size, idx = 0, eidx = 0, numskip; @@ -104,8 +105,8 @@ static void ok_path(GpPath* path, const path_test_t *expected, INT expected_size /* We allow a few pixels fudge in matching X and Y coordinates to account for imprecision in * floating point to integer conversion */ BOOL match = (types[idx] == expected[eidx].type) && - fabs(points[idx].X - expected[eidx].X) <= 2.0 && - fabs(points[idx].Y - expected[eidx].Y) <= 2.0; + fabs(points[idx].X - expected[eidx].X) <= fudge && + fabs(points[idx].Y - expected[eidx].Y) <= fudge; stringify_point_type(expected[eidx].type, ename); stringify_point_type(types[idx], name); @@ -1416,7 +1417,7 @@ static void test_widen_cap(void) status = GdipWidenPath(path, pen, NULL, FlatnessDefault); expect(Ok, status); - ok_path(path, caps[i].expected, caps[i].expected_size, caps[i].todo_size); + ok_path_fudge(path, caps[i].expected, caps[i].expected_size, caps[i].todo_size, 0.000005); } GdipDeletePen(pen); -- 2.23.0

2 5

[PATCH 1/5] d3dcompiler/tests: Add some more tests for return statements.
by Zebediah Figura 03 Mar '20

03 Mar '20

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/d3dcompiler_43/tests/hlsl_d3d9.c | 68 ++++++++++++++++++++++++++- 1 file changed, 67 insertions(+), 1 deletion(-) diff --git a/dlls/d3dcompiler_43/tests/hlsl_d3d9.c b/dlls/d3dcompiler_43/tests/hlsl_d3d9.c index 9bf3784c1da..062ef0a84a9 100644 --- a/dlls/d3dcompiler_43/tests/hlsl_d3d9.c +++ b/dlls/d3dcompiler_43/tests/hlsl_d3d9.c @@ -604,6 +604,56 @@ static void test_comma(void) release_test_context(&test_context); } +static void test_return(void) +{ + struct test_context test_context; + ID3D10Blob *ps_code = NULL; + struct vec4 v; + + static const char *void_source = + "void main(float x : TEXCOORD0, out float4 ret : COLOR)\n" + "{\n" + " ret = float4(0.1, 0.2, 0.3, 0.4);\n" + " return;\n" + " ret = float4(0.5, 0.6, 0.7, 0.8);\n" + "}"; + + static const char *implicit_conversion_source = + "float4 main(float x : TEXCOORD0) : COLOR\n" + "{\n" + " return float2x2(0.4, 0.3, 0.2, 0.1);\n" + "}"; + + if (!init_test_context(&test_context)) + return; + + todo_wine ps_code = compile_shader(void_source, "ps_2_0"); + if (ps_code) + { + draw_quad(test_context.device, ps_code); + + v = get_color_vec4(test_context.device, 0, 0); + ok(compare_vec4(&v, 0.1f, 0.2f, 0.3f, 0.4f, 0), + "Got unexpected value {%.8e, %.8e, %.8e, %.8e}.\n", v.x, v.y, v.z, v.w); + + ID3D10Blob_Release(ps_code); + } + + todo_wine ps_code = compile_shader(implicit_conversion_source, "ps_2_0"); + if (ps_code) + { + draw_quad(test_context.device, ps_code); + + v = get_color_vec4(test_context.device, 0, 0); + ok(compare_vec4(&v, 0.4f, 0.3f, 0.2f, 0.1f, 0), + "Got unexpected value {%.8e, %.8e, %.8e, %.8e}.\n", v.x, v.y, v.z, v.w); + + ID3D10Blob_Release(ps_code); + } + + release_test_context(&test_context); +} + static void test_fail(void) { static const char *tests[] = @@ -650,6 +700,21 @@ static void test_fail(void) " struct {} x = {};\n" " return y;\n" "}", + + "float4 test(float2 pos : TEXCOORD0) : SV_TARGET\n" + "{\n" + " return;\n" + "}", + + "void test(float2 pos : TEXCOORD0)\n" + "{\n" + " return pos;\n" + "}", + + "float4 test(float2 pos : TEXCOORD0) : SV_TARGET\n" + "{\n" + " return pos;\n" + "}", }; static const char *targets[] = {"ps_2_0", "ps_3_0", "ps_4_0"}; @@ -665,7 +730,7 @@ static void test_fail(void) compiled = errors = NULL; hr = ppD3DCompile(tests[i], strlen(tests[i]), NULL, NULL, NULL, "test", targets[j], 0, 0, &compiled, &errors); todo_wine ok(hr == E_FAIL, "Test %u, target %s, got unexpected hr %#x.\n", i, targets[j], hr); - todo_wine_if (i == 1) ok(!!errors, "Test %u, target %s, expected non-NULL error blob.\n", i, targets[j]); + todo_wine_if (i == 1 || i >= 8) ok(!!errors, "Test %u, target %s, expected non-NULL error blob.\n", i, targets[j]); ok(!compiled, "Test %u, target %s, expected no compiled shader blob.\n", i, targets[j]); if (errors) ID3D10Blob_Release(errors); @@ -710,5 +775,6 @@ START_TEST(hlsl_d3d9) test_float_vectors(); test_trig(); test_comma(); + test_return(); test_fail(); } -- 2.25.1

4 13

[PATCH resend] include: Make SHCNF_FLUSHNOWAIT value more explicit.
by Serge Gautherie 03 Mar '20

03 Mar '20

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- * Addendum to 5f884d19c69b8a857083c013e5aecf6031d7bf70. * S2003R2 P.SDK still had '2'. '3' came later (Vista or 7?). --- include/shlobj.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/shlobj.h b/include/shlobj.h index d309446..e5f6692 100644 --- a/include/shlobj.h +++ b/include/shlobj.h @@ -1362,7 +1362,7 @@ typedef struct _SHChangeNotifyEntry #define SHCNF_PRINTERW 0x0006 #define SHCNF_TYPE 0x00FF #define SHCNF_FLUSH 0x1000 -#define SHCNF_FLUSHNOWAIT 0x3000 +#define SHCNF_FLUSHNOWAIT (0x2000 | SHCNF_FLUSH) #define SHCNF_NOTIFYRECURSIVE 0x10000 #define SHCNF_PATH WINELIB_NAME_AW(SHCNF_PATH) -- 2.10.0.windows.1

1 0

[PATCH] localui: Fix and improve some parameters of XcvDataW() calls.
by Serge Gautherie 03 Mar '20

03 Mar '20

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- Follow up to a59d6387b6734cf0acb187e9c178d7c540751cae. --- dlls/localui/localui.c | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/dlls/localui/localui.c b/dlls/localui/localui.c index ab8f5c9..04a3b20 100644 --- a/dlls/localui/localui.c +++ b/dlls/localui/localui.c @@ -107,7 +107,6 @@ static BOOL dlg_configure_com(HANDLE hXcv, HWND hWnd, PCWSTR pPortName) COMMCONFIG cfg; LPWSTR shortname; DWORD status; - DWORD dummy; DWORD len; BOOL res; @@ -119,12 +118,11 @@ static BOOL dlg_configure_com(HANDLE hXcv, HWND hWnd, PCWSTR pPortName) shortname[len-1] = '\0'; /* get current settings */ - len = FIELD_OFFSET(COMMCONFIG, wcProviderData[1]); status = ERROR_SUCCESS; res = XcvDataW( hXcv, cmd_GetDefaultCommConfigW, (PBYTE) shortname, (lstrlenW(shortname) +1) * sizeof(WCHAR), - (PBYTE) &cfg, len, &len, &status); + (PBYTE) &cfg, sizeof(cfg), &len, &status); if (res && (status == ERROR_SUCCESS)) { /* display the Dialog */ @@ -133,8 +131,8 @@ static BOOL dlg_configure_com(HANDLE hXcv, HWND hWnd, PCWSTR pPortName) status = ERROR_SUCCESS; /* set new settings */ res = XcvDataW(hXcv, cmd_SetDefaultCommConfigW, - (PBYTE) &cfg, len, - (PBYTE) &dummy, 0, &len, &status); + (PBYTE) &cfg, sizeof(cfg), + NULL, 0, &len, &status); } } HeapFree(GetProcessHeap(), 0, shortname); @@ -267,7 +265,6 @@ static INT_PTR CALLBACK dlgproc_addport(HWND hwnd, UINT msg, WPARAM wparam, LPAR { addportui_t * data; DWORD status; - DWORD dummy; DWORD len; DWORD res; @@ -294,7 +291,7 @@ static INT_PTR CALLBACK dlgproc_addport(HWND hwnd, UINT msg, WPARAM wparam, LPAR status = ERROR_SUCCESS; res = XcvDataW( data->hXcv, cmd_PortIsValidW, (PBYTE) data->portname, (lstrlenW(data->portname) + 1) * sizeof(WCHAR), - (PBYTE) &dummy, 0, &len, &status); + NULL, 0, &len, &status); TRACE("got %u with status %u\n", res, status); if (res && (status == ERROR_SUCCESS)) { @@ -342,7 +339,6 @@ static INT_PTR CALLBACK dlgproc_lptconfig(HWND hwnd, UINT msg, WPARAM wparam, LP lptconfig_t * data; WCHAR bufferW[16]; DWORD status; - DWORD dummy; DWORD len; DWORD res; @@ -357,7 +353,7 @@ static INT_PTR CALLBACK dlgproc_lptconfig(HWND hwnd, UINT msg, WPARAM wparam, LP data->value = 45; status = ERROR_SUCCESS; res = XcvDataW( data->hXcv, cmd_GetTransmissionRetryTimeoutW, - (PBYTE) &dummy, 0, + NULL, 0, (PBYTE) &data->value, sizeof(data->value), &len, &status); TRACE("got %u with status %u\n", res, status); @@ -380,10 +376,11 @@ static INT_PTR CALLBACK dlgproc_lptconfig(HWND hwnd, UINT msg, WPARAM wparam, LP /* native localui.dll use the same limits */ if ((res > 0) && (res < 1000000) && status) { swprintf(bufferW, ARRAY_SIZE(bufferW), fmt_uW, res); + status = ERROR_SUCCESS; res = XcvDataW( data->hXcv, cmd_ConfigureLPTPortCommandOKW, (PBYTE) bufferW, (lstrlenW(bufferW) +1) * sizeof(WCHAR), - (PBYTE) &dummy, 0, &len, &status); + NULL, 0, &len, &status); TRACE("got %u with status %u\n", res, status); EndDialog(hwnd, TRUE); @@ -501,7 +498,6 @@ static BOOL WINAPI localui_AddPortUI(PCWSTR pName, HWND hWnd, PCWSTR pMonitorNam addportui_t data; HANDLE hXcv; DWORD needed; - DWORD dummy; DWORD status; DWORD res = FALSE; @@ -520,9 +516,10 @@ static BOOL WINAPI localui_AddPortUI(PCWSTR pName, HWND hWnd, PCWSTR pMonitorNam if (ppPortName) *ppPortName = NULL; if (res) { + status = ERROR_SUCCESS; res = XcvDataW(hXcv, cmd_AddPortW, (PBYTE) data.portname, (lstrlenW(data.portname)+1) * sizeof(WCHAR), - (PBYTE) &dummy, 0, &needed, &status); + NULL, 0, &needed, &status); TRACE("got %u with status %u\n", res, status); if (res && (status == ERROR_SUCCESS) && ppPortName) { @@ -620,7 +617,6 @@ static BOOL WINAPI localui_ConfigurePortUI(PCWSTR pName, HWND hWnd, PCWSTR pPort static BOOL WINAPI localui_DeletePortUI(PCWSTR pName, HWND hWnd, PCWSTR pPortName) { HANDLE hXcv; - DWORD dummy; DWORD needed; DWORD status; @@ -635,7 +631,7 @@ static BOOL WINAPI localui_DeletePortUI(PCWSTR pName, HWND hWnd, PCWSTR pPortNam /* native localui tests here for LPT / COM - Ports and failed with ERROR_NOT_SUPPORTED. */ if (XcvDataW(hXcv, cmd_DeletePortW, (LPBYTE) pPortName, - (lstrlenW(pPortName)+1) * sizeof(WCHAR), (LPBYTE) &dummy, 0, &needed, &status)) { + (lstrlenW(pPortName) + 1) * sizeof(WCHAR), NULL, 0, &needed, &status)) { ClosePrinter(hXcv); if (status != ERROR_SUCCESS) SetLastError(status); -- 2.10.0.windows.1

1 0

[PATCH v2 5/5] d3d9: Enumerate wined3d outputs in d3d9_init().
by Zhiyi Zhang 03 Mar '20

03 Mar '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/d3d9/d3d9_private.h | 2 ++ dlls/d3d9/directx.c | 51 +++++++++++++++++++++++++++++----------- 2 files changed, 39 insertions(+), 14 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index bc9a3b98b2e..a9f3f47596c 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -66,6 +66,8 @@ struct d3d9 IDirect3D9Ex IDirect3D9Ex_iface; LONG refcount; struct wined3d *wined3d; + struct wined3d_output **wined3d_outputs; + unsigned int wined3d_output_count; BOOL extended; }; diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index effaf3be25d..3e9fabf758b 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -85,6 +85,7 @@ static ULONG WINAPI d3d9_Release(IDirect3D9Ex *iface) wined3d_decref(d3d9->wined3d); wined3d_mutex_unlock(); + heap_free(d3d9->wined3d_outputs); heap_free(d3d9); } @@ -108,22 +109,10 @@ static HRESULT WINAPI d3d9_RegisterSoftwareDevice(IDirect3D9Ex *iface, void *ini static UINT WINAPI d3d9_GetAdapterCount(IDirect3D9Ex *iface) { struct d3d9 *d3d9 = impl_from_IDirect3D9Ex(iface); - struct wined3d_adapter *wined3d_adapter; - unsigned int adapter_idx, adapter_count; - unsigned int output_count = 0; TRACE("iface %p.\n", iface); - wined3d_mutex_lock(); - adapter_count = wined3d_get_adapter_count(d3d9->wined3d); - for (adapter_idx = 0; adapter_idx < adapter_count; ++adapter_idx) - { - wined3d_adapter = wined3d_get_adapter(d3d9->wined3d, adapter_idx); - output_count += wined3d_adapter_get_output_count(wined3d_adapter); - } - wined3d_mutex_unlock(); - - return output_count; + return d3d9->wined3d_output_count; } static HRESULT WINAPI d3d9_GetAdapterIdentifier(IDirect3D9Ex *iface, UINT adapter, @@ -601,6 +590,8 @@ BOOL d3d9_init(struct d3d9 *d3d9, BOOL extended) | WINED3D_SRGB_READ_WRITE_CONTROL | WINED3D_LEGACY_UNBOUND_RESOURCE_COLOR | WINED3D_NO_PRIMITIVE_RESTART | WINED3D_LEGACY_CUBEMAP_FILTERING | WINED3D_NORMALIZED_DEPTH_BIAS; + unsigned int adapter_idx, output_idx, adapter_count, output_count = 0; + struct wined3d_adapter *wined3d_adapter; if (!extended) flags |= WINED3D_VIDMEM_ACCOUNTING; @@ -612,9 +603,41 @@ BOOL d3d9_init(struct d3d9 *d3d9, BOOL extended) wined3d_mutex_lock(); d3d9->wined3d = wined3d_create(flags); - wined3d_mutex_unlock(); if (!d3d9->wined3d) + { + wined3d_mutex_unlock(); return FALSE; + } + + adapter_count = wined3d_get_adapter_count(d3d9->wined3d); + for (adapter_idx = 0; adapter_idx < adapter_count; ++adapter_idx) + { + wined3d_adapter = wined3d_get_adapter(d3d9->wined3d, adapter_idx); + output_count += wined3d_adapter_get_output_count(wined3d_adapter); + } + + d3d9->wined3d_outputs = heap_calloc(output_count, sizeof(*d3d9->wined3d_outputs)); + if (!d3d9->wined3d_outputs) + { + wined3d_decref(d3d9->wined3d); + wined3d_mutex_unlock(); + return FALSE; + } + + d3d9->wined3d_output_count = 0; + for (adapter_idx = 0; adapter_idx < adapter_count; ++adapter_idx) + { + wined3d_adapter = wined3d_get_adapter(d3d9->wined3d, adapter_idx); + output_count = wined3d_adapter_get_output_count(wined3d_adapter); + for (output_idx = 0; output_idx < output_count; ++output_idx) + { + d3d9->wined3d_outputs[d3d9->wined3d_output_count] = + wined3d_adapter_get_output(wined3d_adapter, output_idx); + ++d3d9->wined3d_output_count; + } + } + + wined3d_mutex_unlock(); d3d9->extended = extended; return TRUE; -- 2.20.1

2 1

[PATCH v2 4/5] d3d8: Enumerate wined3d outputs in d3d8_init().
by Zhiyi Zhang 03 Mar '20

03 Mar '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/d3d8/d3d8_private.h | 2 ++ dlls/d3d8/directx.c | 50 +++++++++++++++++++++++++++++----------- 2 files changed, 38 insertions(+), 14 deletions(-) diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index 9bf92af7c9f..e49087fcd5d 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -57,6 +57,8 @@ struct d3d8 IDirect3D8 IDirect3D8_iface; LONG refcount; struct wined3d *wined3d; + struct wined3d_output **wined3d_outputs; + unsigned int wined3d_output_count; }; BOOL d3d8_init(struct d3d8 *d3d8) DECLSPEC_HIDDEN; diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index ab3a9e6810f..0f283b55354 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -70,6 +70,7 @@ static ULONG WINAPI d3d8_Release(IDirect3D8 *iface) wined3d_decref(d3d8->wined3d); wined3d_mutex_unlock(); + heap_free(d3d8->wined3d_outputs); heap_free(d3d8); } @@ -93,22 +94,10 @@ static HRESULT WINAPI d3d8_RegisterSoftwareDevice(IDirect3D8 *iface, void *init_ static UINT WINAPI d3d8_GetAdapterCount(IDirect3D8 *iface) { struct d3d8 *d3d8 = impl_from_IDirect3D8(iface); - struct wined3d_adapter *wined3d_adapter; - unsigned int adapter_idx, adapter_count; - unsigned int output_count = 0; TRACE("iface %p.\n", iface); - wined3d_mutex_lock(); - adapter_count = wined3d_get_adapter_count(d3d8->wined3d); - for (adapter_idx = 0; adapter_idx < adapter_count; ++adapter_idx) - { - wined3d_adapter = wined3d_get_adapter(d3d8->wined3d, adapter_idx); - output_count += wined3d_adapter_get_output_count(wined3d_adapter); - } - wined3d_mutex_unlock(); - - return output_count; + return d3d8->wined3d_output_count; } static HRESULT WINAPI d3d8_GetAdapterIdentifier(IDirect3D8 *iface, UINT adapter, @@ -425,15 +414,48 @@ BOOL d3d8_init(struct d3d8 *d3d8) | WINED3D_HANDLE_RESTORE | WINED3D_PIXEL_CENTER_INTEGER | WINED3D_LEGACY_UNBOUND_RESOURCE_COLOR | WINED3D_NO_PRIMITIVE_RESTART | WINED3D_LEGACY_CUBEMAP_FILTERING; + unsigned int adapter_idx, output_idx, adapter_count, output_count = 0; + struct wined3d_adapter *wined3d_adapter; d3d8->IDirect3D8_iface.lpVtbl = &d3d8_vtbl; d3d8->refcount = 1; wined3d_mutex_lock(); d3d8->wined3d = wined3d_create(flags); - wined3d_mutex_unlock(); if (!d3d8->wined3d) + { + wined3d_mutex_unlock(); return FALSE; + } + adapter_count = wined3d_get_adapter_count(d3d8->wined3d); + for (adapter_idx = 0; adapter_idx < adapter_count; ++adapter_idx) + { + wined3d_adapter = wined3d_get_adapter(d3d8->wined3d, adapter_idx); + output_count += wined3d_adapter_get_output_count(wined3d_adapter); + } + + d3d8->wined3d_outputs = heap_calloc(output_count, sizeof(*d3d8->wined3d_outputs)); + if (!d3d8->wined3d_outputs) + { + wined3d_decref(d3d8->wined3d); + wined3d_mutex_unlock(); + return FALSE; + } + + d3d8->wined3d_output_count = 0; + for (adapter_idx = 0; adapter_idx < adapter_count; ++adapter_idx) + { + wined3d_adapter = wined3d_get_adapter(d3d8->wined3d, adapter_idx); + output_count = wined3d_adapter_get_output_count(wined3d_adapter); + for (output_idx = 0; output_idx < output_count; ++output_idx) + { + d3d8->wined3d_outputs[d3d8->wined3d_output_count] = + wined3d_adapter_get_output(wined3d_adapter, output_idx); + ++d3d8->wined3d_output_count; + } + } + + wined3d_mutex_unlock(); return TRUE; } -- 2.20.1

2 1

[PATCH v2 3/5] wined3d: Introduce wined3d_adapter_get_output().
by Zhiyi Zhang 03 Mar '20

03 Mar '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/ddraw/main.c | 41 ++++++++++++++++++++----- dlls/dxgi/adapter.c | 2 +- dlls/dxgi/dxgi_private.h | 4 ++- dlls/dxgi/output.c | 21 ++++++------- dlls/wined3d/directx.c | 55 +++++++++++++++++++++++----------- dlls/wined3d/wined3d.spec | 2 +- dlls/wined3d/wined3d_private.h | 2 +- include/wine/wined3d.h | 3 +- 8 files changed, 88 insertions(+), 42 deletions(-) diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index 5236b39b643..dee93de123e 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -57,12 +57,15 @@ static void ddraw_enumerate_secondary_devices(struct wined3d *wined3d, LPDDENUMC void *context) { struct wined3d_adapter_identifier adapter_id; + struct wined3d_adapter *wined3d_adapter; struct wined3d_output_desc output_desc; + unsigned int interface_count = 0; + unsigned int adapter_idx = 0; + unsigned int output_idx; BOOL cont_enum = TRUE; - HRESULT hr = S_OK; - UINT adapter = 0; + HRESULT hr; - for (adapter = 0; SUCCEEDED(hr) && cont_enum; adapter++) + while (cont_enum && (wined3d_adapter = wined3d_get_adapter(wined3d, adapter_idx))) { char DriverName[512] = "", DriverDescription[512] = ""; @@ -73,16 +76,38 @@ static void ddraw_enumerate_secondary_devices(struct wined3d *wined3d, LPDDENUMC adapter_id.device_name_size = sizeof(DriverName); adapter_id.description = DriverDescription; adapter_id.description_size = sizeof(DriverDescription); + wined3d_mutex_lock(); - if (SUCCEEDED(hr = wined3d_get_adapter_identifier(wined3d, adapter, 0x0, &adapter_id))) - hr = wined3d_get_output_desc(wined3d, adapter, &output_desc); - wined3d_mutex_unlock(); - if (SUCCEEDED(hr)) + if (FAILED(hr = wined3d_get_adapter_identifier(wined3d, adapter_idx, 0x0, &adapter_id))) { - TRACE("Interface %d: %s\n", adapter, wine_dbgstr_guid(&adapter_id.device_identifier)); + WARN("Failed to get adapter identifier, hr %#x.\n", hr); + wined3d_mutex_unlock(); + break; + } + wined3d_mutex_unlock(); + + for (output_idx = 0; cont_enum && wined3d_adapter_get_output(wined3d_adapter, output_idx); + ++output_idx) + { + wined3d_mutex_lock(); + if (FAILED(hr = wined3d_get_output_desc(wined3d, output_idx, &output_desc))) + { + WARN("Failed to get output description, hr %#x.\n", hr); + wined3d_mutex_unlock(); + break; + } + wined3d_mutex_unlock(); + + TRACE("Interface %u: %s\n", interface_count++, + wine_dbgstr_guid(&adapter_id.device_identifier)); cont_enum = callback(&adapter_id.device_identifier, adapter_id.description, adapter_id.device_name, context, output_desc.monitor); } + + if (FAILED(hr)) + break; + + ++adapter_idx; } } diff --git a/dlls/dxgi/adapter.c b/dlls/dxgi/adapter.c index ccc37e0980b..8d2879e4129 100644 --- a/dlls/dxgi/adapter.c +++ b/dlls/dxgi/adapter.c @@ -139,7 +139,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_EnumOutputs(IWineDXGIAdapter *ifac return DXGI_ERROR_NOT_FOUND; } - if (FAILED(hr = dxgi_output_create(adapter, &output_object))) + if (FAILED(hr = dxgi_output_create(adapter, output_idx, &output_object))) { *output = NULL; return hr; diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index 56939e2aaa6..117fe5e692c 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -144,11 +144,13 @@ struct dxgi_output { IDXGIOutput4 IDXGIOutput4_iface; LONG refcount; + struct wined3d_output *wined3d_output; struct wined3d_private_store private_store; struct dxgi_adapter *adapter; }; -HRESULT dxgi_output_create(struct dxgi_adapter *adapter, struct dxgi_output **output) DECLSPEC_HIDDEN; +HRESULT dxgi_output_create(struct dxgi_adapter *adapter, unsigned int output_idx, + struct dxgi_output **output) DECLSPEC_HIDDEN; struct dxgi_output *unsafe_impl_from_IDXGIOutput(IDXGIOutput *iface) DECLSPEC_HIDDEN; /* IDXGIAdapter */ diff --git a/dlls/dxgi/output.c b/dlls/dxgi/output.c index a2331358e69..866bcb2f7fa 100644 --- a/dlls/dxgi/output.c +++ b/dlls/dxgi/output.c @@ -365,8 +365,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_WaitForVBlank(IDXGIOutput4 *iface) static HRESULT STDMETHODCALLTYPE dxgi_output_TakeOwnership(IDXGIOutput4 *iface, IUnknown *device, BOOL exclusive) { struct dxgi_output *output = impl_from_IDXGIOutput4(iface); - struct wined3d_output *wined3d_output; - HRESULT hr = DXGI_ERROR_INVALID_CALL; + HRESULT hr; TRACE("iface %p, device %p, exclusive %d.\n", iface, device, exclusive); @@ -374,9 +373,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_TakeOwnership(IDXGIOutput4 *iface, return DXGI_ERROR_INVALID_CALL; wined3d_mutex_lock(); - if ((wined3d_output = wined3d_get_adapter_output(output->adapter->factory->wined3d, - output->adapter->ordinal))) - hr = wined3d_output_take_ownership(wined3d_output, exclusive); + hr = wined3d_output_take_ownership(output->wined3d_output, exclusive); wined3d_mutex_unlock(); return hr; @@ -385,14 +382,11 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_TakeOwnership(IDXGIOutput4 *iface, static void STDMETHODCALLTYPE dxgi_output_ReleaseOwnership(IDXGIOutput4 *iface) { struct dxgi_output *output = impl_from_IDXGIOutput4(iface); - struct wined3d_output *wined3d_output; TRACE("iface %p.\n", iface); wined3d_mutex_lock(); - if ((wined3d_output = wined3d_get_adapter_output(output->adapter->factory->wined3d, - output->adapter->ordinal))) - wined3d_output_release_ownership(wined3d_output); + wined3d_output_release_ownership(output->wined3d_output); wined3d_mutex_unlock(); } @@ -581,20 +575,23 @@ struct dxgi_output *unsafe_impl_from_IDXGIOutput(IDXGIOutput *iface) return CONTAINING_RECORD(iface, struct dxgi_output, IDXGIOutput4_iface); } -static void dxgi_output_init(struct dxgi_output *output, struct dxgi_adapter *adapter) +static void dxgi_output_init(struct dxgi_output *output, unsigned int output_idx, + struct dxgi_adapter *adapter) { output->IDXGIOutput4_iface.lpVtbl = &dxgi_output_vtbl; output->refcount = 1; + output->wined3d_output = wined3d_adapter_get_output(adapter->wined3d_adapter, output_idx); wined3d_private_store_init(&output->private_store); output->adapter = adapter; IWineDXGIAdapter_AddRef(&output->adapter->IWineDXGIAdapter_iface); } -HRESULT dxgi_output_create(struct dxgi_adapter *adapter, struct dxgi_output **output) +HRESULT dxgi_output_create(struct dxgi_adapter *adapter, unsigned int output_idx, + struct dxgi_output **output) { if (!(*output = heap_alloc_zero(sizeof(**output)))) return E_OUTOFMEMORY; - dxgi_output_init(*output, adapter); + dxgi_output_init(*output, output_idx, adapter); return S_OK; } diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 95d1caed4d5..cf8616310fc 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -155,7 +155,11 @@ UINT64 adapter_adjust_memory(struct wined3d_adapter *adapter, INT64 amount) void wined3d_adapter_cleanup(struct wined3d_adapter *adapter) { - wined3d_output_cleanup(&adapter->output); + unsigned int output_idx; + + for (output_idx = 0; output_idx < adapter->output_count; ++output_idx) + wined3d_output_cleanup(&adapter->outputs[output_idx]); + heap_free(adapter->outputs); heap_free(adapter->formats); } @@ -883,6 +887,17 @@ UINT CDECL wined3d_get_adapter_count(const struct wined3d *wined3d) return wined3d->adapter_count; } +struct wined3d_output * CDECL wined3d_adapter_get_output(const struct wined3d_adapter *adapter, + unsigned int idx) +{ + TRACE("adapter %p, idx %u.\n", adapter, idx); + + if (idx >= adapter->output_count) + return NULL; + + return &adapter->outputs[idx]; +} + unsigned int CDECL wined3d_adapter_get_output_count(const struct wined3d_adapter *adapter) { TRACE("adapter %p, reporting %u outputs.\n", adapter, adapter->output_count); @@ -930,16 +945,6 @@ HRESULT CDECL wined3d_get_output_desc(const struct wined3d *wined3d, unsigned in return WINED3D_OK; } -struct wined3d_output * CDECL wined3d_get_adapter_output(const struct wined3d *wined3d, unsigned int adapter_idx) -{ - TRACE("wined3d %p, adapter_idx %u.\n", wined3d, adapter_idx); - - if (adapter_idx >= wined3d->adapter_count) - return NULL; - - return &wined3d->adapters[adapter_idx]->output; -} - /* FIXME: GetAdapterModeCount and EnumAdapterModes currently only returns modes of the same bpp but different resolutions */ @@ -2828,26 +2833,35 @@ BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, unsigned int ordinal, const struct wined3d_adapter_ops *adapter_ops) { DISPLAY_DEVICEW display_device; + unsigned int output_idx; + BOOL ret = FALSE; HRESULT hr; adapter->ordinal = ordinal; + adapter->output_count = 0; display_device.cb = sizeof(display_device); EnumDisplayDevicesW(NULL, ordinal, &display_device, 0); TRACE("Display device: %s.\n", debugstr_w(display_device.DeviceName)); strcpyW(adapter->device_name, display_device.DeviceName); - if (FAILED(hr = wined3d_output_init(&adapter->output, adapter->device_name))) + + if (!(adapter->outputs = heap_calloc(1, sizeof(*adapter->outputs)))) + { + ERR("Failed to allocate outputs.\n"); + return FALSE; + } + + if (FAILED(hr = wined3d_output_init(&adapter->outputs[0], adapter->device_name))) { ERR("Failed to initialise output, hr %#x.\n", hr); - return FALSE; + goto done; } adapter->output_count = 1; if (!AllocateLocallyUniqueId(&adapter->luid)) { ERR("Failed to set adapter LUID (%#x).\n", GetLastError()); - wined3d_output_cleanup(&adapter->output); - return FALSE; + goto done; } TRACE("Allocated LUID %08x:%08x for adapter %p.\n", adapter->luid.HighPart, adapter->luid.LowPart, adapter); @@ -2857,8 +2871,15 @@ BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, unsigned int ordinal, adapter->formats = NULL; adapter->adapter_ops = adapter_ops; - - return TRUE; + ret = TRUE; +done: + if (!ret) + { + for (output_idx = 0; output_idx < adapter->output_count; ++output_idx) + wined3d_output_cleanup(&adapter->outputs[output_idx]); + heap_free(adapter->outputs); + } + return ret; } static struct wined3d_adapter *wined3d_adapter_create(unsigned int ordinal, DWORD wined3d_creation_flags) diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index b0eb60327f1..b2f88039fad 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -16,7 +16,6 @@ @ cdecl wined3d_get_adapter_display_mode(ptr long ptr ptr) @ cdecl wined3d_get_adapter_identifier(ptr long long ptr) @ cdecl wined3d_get_adapter_mode_count(ptr long long long) -@ cdecl wined3d_get_adapter_output(ptr long ptr) @ cdecl wined3d_get_adapter_raster_status(ptr long ptr) @ cdecl wined3d_get_device_caps(ptr long long ptr) @ cdecl wined3d_get_output_desc(ptr long ptr) @@ -26,6 +25,7 @@ @ cdecl wined3d_set_adapter_display_mode(ptr long ptr) @ cdecl wined3d_unregister_windows(ptr) +@ cdecl wined3d_adapter_get_output(ptr long) @ cdecl wined3d_adapter_get_output_count(ptr) @ cdecl wined3d_blend_state_create(ptr ptr ptr ptr ptr) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6f60d8d65a8..9c2125798bc 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2913,7 +2913,7 @@ struct wined3d_adapter struct wined3d_gl_info gl_info; struct wined3d_d3d_info d3d_info; struct wined3d_driver_info driver_info; - struct wined3d_output output; + struct wined3d_output *outputs; unsigned int output_count; UINT64 vram_bytes_used; GUID driver_uuid; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 54af2e4785e..bc09f969be6 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2272,7 +2272,6 @@ HRESULT __cdecl wined3d_get_adapter_identifier(const struct wined3d *wined3d, UI DWORD flags, struct wined3d_adapter_identifier *identifier); UINT __cdecl wined3d_get_adapter_mode_count(const struct wined3d *wined3d, UINT adapter_idx, enum wined3d_format_id format_id, enum wined3d_scanline_ordering scanline_ordering); -struct wined3d_output * __cdecl wined3d_get_adapter_output(const struct wined3d *wined3d, unsigned int adapter_idx); HRESULT __cdecl wined3d_get_adapter_raster_status(const struct wined3d *wined3d, UINT adapter_idx, struct wined3d_raster_status *raster_status); HRESULT __cdecl wined3d_get_device_caps(const struct wined3d *wined3d, unsigned int adapter_idx, @@ -2287,6 +2286,8 @@ HRESULT __cdecl wined3d_set_adapter_display_mode(struct wined3d *wined3d, UINT adapter_idx, const struct wined3d_display_mode *mode); void __cdecl wined3d_unregister_windows(struct wined3d *wined3d); +struct wined3d_output * __cdecl wined3d_adapter_get_output(const struct wined3d_adapter *adapter, + unsigned int idx); unsigned int __cdecl wined3d_adapter_get_output_count(const struct wined3d_adapter *adapter); HRESULT __cdecl wined3d_buffer_create(struct wined3d_device *device, const struct wined3d_buffer_desc *desc, -- 2.20.1

2 1

[PATCH v2 2/5] wined3d: Introduce wined3d_adapter_get_output_count().
by Zhiyi Zhang 03 Mar '20

03 Mar '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/d3d8/directx.c | 13 ++++++++++--- dlls/d3d9/directx.c | 13 ++++++++++--- dlls/dxgi/adapter.c | 5 ++++- dlls/dxgi/dxgi_private.h | 1 + dlls/wined3d/directx.c | 8 ++++++++ dlls/wined3d/wined3d.spec | 2 ++ dlls/wined3d/wined3d_private.h | 1 + include/wine/wined3d.h | 2 ++ 8 files changed, 38 insertions(+), 7 deletions(-) diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index d1f8872d12e..ab3a9e6810f 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -93,15 +93,22 @@ static HRESULT WINAPI d3d8_RegisterSoftwareDevice(IDirect3D8 *iface, void *init_ static UINT WINAPI d3d8_GetAdapterCount(IDirect3D8 *iface) { struct d3d8 *d3d8 = impl_from_IDirect3D8(iface); - UINT count; + struct wined3d_adapter *wined3d_adapter; + unsigned int adapter_idx, adapter_count; + unsigned int output_count = 0; TRACE("iface %p.\n", iface); wined3d_mutex_lock(); - count = wined3d_get_adapter_count(d3d8->wined3d); + adapter_count = wined3d_get_adapter_count(d3d8->wined3d); + for (adapter_idx = 0; adapter_idx < adapter_count; ++adapter_idx) + { + wined3d_adapter = wined3d_get_adapter(d3d8->wined3d, adapter_idx); + output_count += wined3d_adapter_get_output_count(wined3d_adapter); + } wined3d_mutex_unlock(); - return count; + return output_count; } static HRESULT WINAPI d3d8_GetAdapterIdentifier(IDirect3D8 *iface, UINT adapter, diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index b552c3b910c..effaf3be25d 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -108,15 +108,22 @@ static HRESULT WINAPI d3d9_RegisterSoftwareDevice(IDirect3D9Ex *iface, void *ini static UINT WINAPI d3d9_GetAdapterCount(IDirect3D9Ex *iface) { struct d3d9 *d3d9 = impl_from_IDirect3D9Ex(iface); - UINT ret; + struct wined3d_adapter *wined3d_adapter; + unsigned int adapter_idx, adapter_count; + unsigned int output_count = 0; TRACE("iface %p.\n", iface); wined3d_mutex_lock(); - ret = wined3d_get_adapter_count(d3d9->wined3d); + adapter_count = wined3d_get_adapter_count(d3d9->wined3d); + for (adapter_idx = 0; adapter_idx < adapter_count; ++adapter_idx) + { + wined3d_adapter = wined3d_get_adapter(d3d9->wined3d, adapter_idx); + output_count += wined3d_adapter_get_output_count(wined3d_adapter); + } wined3d_mutex_unlock(); - return ret; + return output_count; } static HRESULT WINAPI d3d9_GetAdapterIdentifier(IDirect3D9Ex *iface, UINT adapter, diff --git a/dlls/dxgi/adapter.c b/dlls/dxgi/adapter.c index 7cdf7bd0d69..ccc37e0980b 100644 --- a/dlls/dxgi/adapter.c +++ b/dlls/dxgi/adapter.c @@ -124,6 +124,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_EnumOutputs(IWineDXGIAdapter *ifac { struct dxgi_adapter *adapter = impl_from_IWineDXGIAdapter(iface); struct dxgi_output *output_object; + unsigned int output_count; HRESULT hr; TRACE("iface %p, output_idx %u, output %p.\n", iface, output_idx, output); @@ -131,7 +132,8 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_EnumOutputs(IWineDXGIAdapter *ifac if (!output) return E_INVALIDARG; - if (output_idx > 0) + output_count = wined3d_adapter_get_output_count(adapter->wined3d_adapter); + if (output_idx >= output_count) { *output = NULL; return DXGI_ERROR_NOT_FOUND; @@ -450,6 +452,7 @@ static void dxgi_adapter_init(struct dxgi_adapter *adapter, struct dxgi_factory { adapter->IWineDXGIAdapter_iface.lpVtbl = &dxgi_adapter_vtbl; adapter->refcount = 1; + adapter->wined3d_adapter = wined3d_get_adapter(factory->wined3d, ordinal); wined3d_private_store_init(&adapter->private_store); adapter->ordinal = ordinal; adapter->factory = factory; diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index 5b934498349..56939e2aaa6 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -156,6 +156,7 @@ struct dxgi_adapter { IWineDXGIAdapter IWineDXGIAdapter_iface; LONG refcount; + struct wined3d_adapter *wined3d_adapter; struct wined3d_private_store private_store; UINT ordinal; struct dxgi_factory *factory; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index f710e85687f..95d1caed4d5 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -883,6 +883,13 @@ UINT CDECL wined3d_get_adapter_count(const struct wined3d *wined3d) return wined3d->adapter_count; } +unsigned int CDECL wined3d_adapter_get_output_count(const struct wined3d_adapter *adapter) +{ + TRACE("adapter %p, reporting %u outputs.\n", adapter, adapter->output_count); + + return adapter->output_count; +} + HRESULT CDECL wined3d_register_software_device(struct wined3d *wined3d, void *init_function) { FIXME("wined3d %p, init_function %p stub!\n", wined3d, init_function); @@ -2834,6 +2841,7 @@ BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, unsigned int ordinal, ERR("Failed to initialise output, hr %#x.\n", hr); return FALSE; } + adapter->output_count = 1; if (!AllocateLocallyUniqueId(&adapter->luid)) { diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 0c30ffeac24..b0eb60327f1 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -26,6 +26,8 @@ @ cdecl wined3d_set_adapter_display_mode(ptr long ptr) @ cdecl wined3d_unregister_windows(ptr) +@ cdecl wined3d_adapter_get_output_count(ptr) + @ cdecl wined3d_blend_state_create(ptr ptr ptr ptr ptr) @ cdecl wined3d_blend_state_decref(ptr) @ cdecl wined3d_blend_state_get_parent(ptr) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 744e647008e..6f60d8d65a8 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2914,6 +2914,7 @@ struct wined3d_adapter struct wined3d_d3d_info d3d_info; struct wined3d_driver_info driver_info; struct wined3d_output output; + unsigned int output_count; UINT64 vram_bytes_used; GUID driver_uuid; GUID device_uuid; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 2841aa2f2e9..54af2e4785e 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2287,6 +2287,8 @@ HRESULT __cdecl wined3d_set_adapter_display_mode(struct wined3d *wined3d, UINT adapter_idx, const struct wined3d_display_mode *mode); void __cdecl wined3d_unregister_windows(struct wined3d *wined3d); +unsigned int __cdecl wined3d_adapter_get_output_count(const struct wined3d_adapter *adapter); + HRESULT __cdecl wined3d_buffer_create(struct wined3d_device *device, const struct wined3d_buffer_desc *desc, const struct wined3d_sub_resource_data *data, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_buffer **buffer); -- 2.20.1

2 1

[PATCH v2 1/5] wined3d: Introduce wined3d_get_adapter().
by Zhiyi Zhang 03 Mar '20

03 Mar '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v2: Style changes. Supersede 179851~179855 dlls/wined3d/directx.c | 10 ++++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 3 +++ 3 files changed, 14 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 4d6f63c2ffb..f710e85687f 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -865,6 +865,16 @@ enum wined3d_pci_device wined3d_gpu_from_feature_level(enum wined3d_pci_vendor * return device_id; } +struct wined3d_adapter * CDECL wined3d_get_adapter(const struct wined3d *wined3d, unsigned int idx) +{ + TRACE("wined3d %p, idx %u.\n", wined3d, idx); + + if (idx >= wined3d->adapter_count) + return NULL; + + return wined3d->adapters[idx]; +} + UINT CDECL wined3d_get_adapter_count(const struct wined3d *wined3d) { TRACE("wined3d %p, reporting %u adapters.\n", diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 8538b3dcd6e..0c30ffeac24 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -11,6 +11,7 @@ @ cdecl wined3d_decref(ptr) @ cdecl wined3d_enum_adapter_modes(ptr long long long long ptr) @ cdecl wined3d_find_closest_matching_adapter_mode(ptr long ptr) +@ cdecl wined3d_get_adapter(ptr long) @ cdecl wined3d_get_adapter_count(ptr) @ cdecl wined3d_get_adapter_display_mode(ptr long ptr ptr) @ cdecl wined3d_get_adapter_identifier(ptr long long ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 908a1c92668..2841aa2f2e9 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2178,6 +2178,7 @@ struct wined3d_parent_ops }; struct wined3d; +struct wined3d_adapter; struct wined3d_blend_state; struct wined3d_buffer; struct wined3d_device; @@ -2262,6 +2263,8 @@ HRESULT __cdecl wined3d_enum_adapter_modes(const struct wined3d *wined3d, UINT a UINT mode_idx, struct wined3d_display_mode *mode); HRESULT __cdecl wined3d_find_closest_matching_adapter_mode(const struct wined3d *wined3d, unsigned int adapter_idx, struct wined3d_display_mode *mode); +struct wined3d_adapter * __cdecl wined3d_get_adapter(const struct wined3d *wined3d, + unsigned int idx); UINT __cdecl wined3d_get_adapter_count(const struct wined3d *wined3d); HRESULT __cdecl wined3d_get_adapter_display_mode(const struct wined3d *wined3d, UINT adapter_idx, struct wined3d_display_mode *mode, enum wined3d_display_rotation *rotation); -- 2.20.1

2 1

[PATCH 1/6] ddraw: Retrieve the material from the primary stateblock.
by Zebediah Figura 03 Mar '20

03 Mar '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ddraw/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 7acc8e0db0..fa79a98777 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -5495,7 +5495,7 @@ static HRESULT d3d_device7_GetMaterial(IDirect3DDevice7 *iface, D3DMATERIAL7 *ma wined3d_mutex_lock(); /* Note: D3DMATERIAL7 is compatible with struct wined3d_material. */ - wined3d_device_get_material(device->wined3d_device, (struct wined3d_material *)material); + memcpy(material, &wined3d_stateblock_get_state(device->state)->material, sizeof(*material)); wined3d_mutex_unlock(); return D3D_OK; -- 2.25.0

2 11

[PATCH resend 2/2] d3d9: Avoid a dead assignment in d3d9_device_SetStreamSource() (Coverity).
by Henri Verbeet 03 Mar '20

03 Mar '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d9/device.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 8d85a43523c..a651a63f02e 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3688,17 +3688,18 @@ static HRESULT WINAPI d3d9_device_SetStreamSource(IDirect3DDevice9Ex *iface, const struct wined3d_stream_state *stream; state = wined3d_stateblock_get_state(device->state); stream = &state->streams[stream_idx]; - wined3d_buffer = stream->buffer; offset = stream->offset; stride = stream->stride; - } - - if (!buffer_impl) wined3d_buffer = NULL; + } else if (buffer_impl->draw_buffer) + { wined3d_buffer = buffer_impl->draw_buffer; + } else + { wined3d_buffer = buffer_impl->wined3d_buffer; + } hr = wined3d_stateblock_set_stream_source(device->update_state, stream_idx, wined3d_buffer, offset, stride); if (SUCCEEDED(hr) && !device->recording) -- 2.20.1

1 0

[PATCH resend 1/2] d3d8: Avoid checking the stage index in d3d8_device_GetTextureStageState() (Coverity).
by Henri Verbeet 03 Mar '20

03 Mar '20

The correct limit for d3d8 would be WINED3D_MAX_TEXTURES, since that's the size of the "texture_states" array. However, the original code didn't check the stage index at all, so simply remove it. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- Resending, since the mailing list appears to have eaten some mail yesterday. dlls/d3d8/device.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 9793eda0c36..2850b93fd1d 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2250,13 +2250,6 @@ static HRESULT WINAPI d3d8_device_GetTextureStageState(IDirect3DDevice8 *iface, TRACE("iface %p, stage %u, state %#x, value %p.\n", iface, stage, state, value); - if (stage >= WINED3D_MAX_FRAGMENT_SAMPLERS) - { - WARN("Invalid stage %u.\n", stage); - *value = 0; - return D3D_OK; - } - if (state >= ARRAY_SIZE(tss_lookup)) { WARN("Invalid state %#x.\n", state); -- 2.20.1

1 0

[PATCH v3 2/2] kernelbase: Implement SetConsoleScreenBufferInfoEx().
by Aaro Altonen 03 Mar '20

03 Mar '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47288 Signed-off-by: Aaro Altonen <a.altonen(a)hotmail.com> --- v2: - Removed an unnecessary check and added a print (thanks Gijs) --- dlls/kernel32/tests/console.c | 10 +++++----- dlls/kernelbase/console.c | 33 ++++++++++++++++++++++++++++++--- 2 files changed, 35 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 50f1cd5ee4..7112e6d580 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -3165,24 +3165,24 @@ static void test_SetConsoleScreenBufferInfoEx(HANDLE std_output) SetLastError(0xdeadbeef); ret = pSetConsoleScreenBufferInfoEx(NULL, &info); ok(!ret, "got %d, expected zero\n", ret); - todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); SetLastError(0xdeadbeef); ret = pSetConsoleScreenBufferInfoEx(std_output, &info); - todo_wine ok(ret, "got %d, expected one\n", ret); - todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + ok(ret, "got %d, expected one\n", ret); + ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); SetLastError(0xdeadbeef); ret = pSetConsoleScreenBufferInfoEx(std_input, &info); ok(!ret, "got %d, expected zero\n", ret); - todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE || GetLastError() == ERROR_ACCESS_DENIED, + ok(GetLastError() == ERROR_INVALID_HANDLE || GetLastError() == ERROR_ACCESS_DENIED, "got %u, expected 5 or 6\n", GetLastError()); info.cbSize = 0; SetLastError(0xdeadbeef); ret = pSetConsoleScreenBufferInfoEx(std_output, &info); ok(!ret, "got %d, expected zero\n", ret); - todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); CloseHandle(std_input); } diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index 91e8129fbe..8ce9252413 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -1146,9 +1146,36 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetConsoleOutputCP( UINT cp ) BOOL WINAPI DECLSPEC_HOTPATCH SetConsoleScreenBufferInfoEx( HANDLE handle, CONSOLE_SCREEN_BUFFER_INFOEX *info ) { - FIXME( "(%p %p): stub!\n", handle, info ); - SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); - return FALSE; + BOOL ret; + + TRACE("(%p, %p)\n", handle, info); + + if (info->cbSize != sizeof(CONSOLE_SCREEN_BUFFER_INFOEX)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + SERVER_START_REQ(set_console_output_info) + { + req->handle = console_handle_unmap(handle); + req->width = info->dwSize.X; + req->height = info->dwSize.Y; + req->cursor_x = info->dwCursorPosition.X; + req->cursor_y = info->dwCursorPosition.Y; + req->attr = info->wAttributes; + req->win_left = info->srWindow.Left; + req->win_top = info->srWindow.Top; + req->win_right = info->srWindow.Right; + req->win_bottom = info->srWindow.Bottom; + req->popup_attr = info->wPopupAttributes; + req->max_width = min(info->dwMaximumWindowSize.X, info->dwSize.X); + req->max_height = min(info->dwMaximumWindowSize.Y, info->dwSize.Y); + ret = !wine_server_call_err(req); + } + SERVER_END_REQ; + + return ret; } -- 2.25.1

2 1

[PATCH] stdio.h: Fix calling convention of variadic inline functions.
by Jacek Caban 03 Mar '20

03 Mar '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48697 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/msvcrt/corecrt_wstdio.h | 2 +- include/msvcrt/stdio.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)

1 0

[PATCH v3 1/2] kernel32/tests: Add tests for SetConsoleScreenBufferInfoEx().
by Aaro Altonen 03 Mar '20

03 Mar '20

Signed-off-by: Aaro Altonen <a.altonen(a)hotmail.com> --- v2: - Fix code formatting and a typo v3: - Use GetConsoleScreenBufferInfoEx() to get valid console info before running any tests --- dlls/kernel32/tests/console.c | 46 +++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 5f8003760d..50f1cd5ee4 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -3142,6 +3142,51 @@ static void test_GetConsoleScreenBufferInfoEx(HANDLE std_output) ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); } +static void test_SetConsoleScreenBufferInfoEx(HANDLE std_output) +{ + BOOL ret; + HANDLE hmod; + HANDLE std_input = CreateFileA("CONIN$", GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0); + BOOL (WINAPI *pSetConsoleScreenBufferInfoEx)(HANDLE, CONSOLE_SCREEN_BUFFER_INFOEX *); + CONSOLE_SCREEN_BUFFER_INFOEX info; + + hmod = GetModuleHandleA("kernel32.dll"); + pSetConsoleScreenBufferInfoEx = (void *)GetProcAddress(hmod, "SetConsoleScreenBufferInfoEx"); + if (!pSetConsoleScreenBufferInfoEx) + { + win_skip("SetConsoleScreenBufferInfoEx is not available\n"); + return; + } + + memset(&info, 0, sizeof(CONSOLE_SCREEN_BUFFER_INFOEX)); + info.cbSize = sizeof(CONSOLE_SCREEN_BUFFER_INFOEX); + GetConsoleScreenBufferInfoEx(std_output, &info); + + SetLastError(0xdeadbeef); + ret = pSetConsoleScreenBufferInfoEx(NULL, &info); + ok(!ret, "got %d, expected zero\n", ret); + todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = pSetConsoleScreenBufferInfoEx(std_output, &info); + todo_wine ok(ret, "got %d, expected one\n", ret); + todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = pSetConsoleScreenBufferInfoEx(std_input, &info); + ok(!ret, "got %d, expected zero\n", ret); + todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE || GetLastError() == ERROR_ACCESS_DENIED, + "got %u, expected 5 or 6\n", GetLastError()); + + info.cbSize = 0; + SetLastError(0xdeadbeef); + ret = pSetConsoleScreenBufferInfoEx(std_output, &info); + ok(!ret, "got %d, expected zero\n", ret); + todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); + + CloseHandle(std_input); +} + static void test_AttachConsole_child(DWORD console_pid) { HANDLE pipe_in, pipe_out; @@ -3398,5 +3443,6 @@ START_TEST(console) test_GetConsoleFontInfo(hConOut); test_SetConsoleFont(hConOut); test_GetConsoleScreenBufferInfoEx(hConOut); + test_SetConsoleScreenBufferInfoEx(hConOut); test_AttachConsole(hConOut); } -- 2.25.1

2 1

[PATCH] winetest: Build with msvcrt.dll.
by Jacek Caban 03 Mar '20

03 Mar '20

Allows running tests on Windows without ucrtbase.dll. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/winetest/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[PATCH v2 1/5] d3dx9: Implement ID3DXFont_PreloadText.
by Sven Baars 03 Mar '20

03 Mar '20

Based on a patch by Tony Wasserka. Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> --- dlls/d3dx9_36/font.c | 56 +++++++++++++++++++++++++++++++++++--- dlls/d3dx9_36/tests/core.c | 2 -- 2 files changed, 52 insertions(+), 6 deletions(-) diff --git a/dlls/d3dx9_36/font.c b/dlls/d3dx9_36/font.c index 9196295637..8d2d6c8c44 100644 --- a/dlls/d3dx9_36/font.c +++ b/dlls/d3dx9_36/font.c @@ -420,14 +420,62 @@ static HRESULT WINAPI ID3DXFontImpl_PreloadGlyphs(ID3DXFont *iface, UINT first, static HRESULT WINAPI ID3DXFontImpl_PreloadTextA(ID3DXFont *iface, const char *string, INT count) { - FIXME("iface %p, string %s, count %d stub!\n", iface, debugstr_a(string), count); - return E_NOTIMPL; + WCHAR *wstr; + HRESULT hr; + int countW; + + TRACE("iface %p, string %s, count %d.\n", iface, debugstr_a(string), count); + + if (!string && !count) + return D3D_OK; + + if (!string) + return D3DERR_INVALIDCALL; + + countW = MultiByteToWideChar(CP_ACP, 0, string, count < 0 ? -1 : count, NULL, 0); + + wstr = heap_alloc(countW * sizeof(*wstr)); + if (!wstr) + return E_OUTOFMEMORY; + + MultiByteToWideChar(CP_ACP, 0, string, count < 0 ? -1 : count, wstr, countW); + + hr = ID3DXFont_PreloadTextW(iface, wstr, count); + + heap_free(wstr); + + return hr; } static HRESULT WINAPI ID3DXFontImpl_PreloadTextW(ID3DXFont *iface, const WCHAR *string, INT count) { - FIXME("iface %p, string %s, count %d stub!\n", iface, debugstr_w(string), count); - return E_NOTIMPL; + struct d3dx_font *font = impl_from_ID3DXFont(iface); + WORD *indices; + int i; + + TRACE("iface %p, string %s, count %d.\n", iface, debugstr_w(string), count); + + if (!string && !count) + return D3D_OK; + + if (!string) + return D3DERR_INVALIDCALL; + + if (count < 0) + count = lstrlenW(string); + + indices = heap_alloc(count * sizeof(*indices)); + if (!indices) + return E_OUTOFMEMORY; + + GetGlyphIndicesW(font->hdc, string, count, indices, 0); + + for (i = 0; i < count; ++i) + ID3DXFont_PreloadGlyphs(iface, indices[i], indices[i]); + + heap_free(indices); + + return D3D_OK; } static INT WINAPI ID3DXFontImpl_DrawTextA(ID3DXFont *iface, ID3DXSprite *sprite, diff --git a/dlls/d3dx9_36/tests/core.c b/dlls/d3dx9_36/tests/core.c index b8e680d1c5..662483b687 100644 --- a/dlls/d3dx9_36/tests/core.c +++ b/dlls/d3dx9_36/tests/core.c @@ -504,7 +504,6 @@ static void test_ID3DXFont(IDirect3DDevice9 *device) DEFAULT_QUALITY, DEFAULT_PITCH, "Tahoma", &font); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - todo_wine { hr = ID3DXFont_PreloadTextA(font, NULL, -1); ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); hr = ID3DXFont_PreloadTextA(font, NULL, 0); @@ -530,7 +529,6 @@ static void test_ID3DXFont(IDirect3DDevice9 *device) ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = ID3DXFont_PreloadTextW(font, L"", -1); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - } check_release((IUnknown*)font, 0); -- 2.24.0

3 7

[PATCH v5 1/5] d3d10: Implement scalar effect variable set methods.
by Connor McAdams 03 Mar '20

03 Mar '20

Implement SetFloat/SetFloatArray, SetInt/SetIntArray, and SetBool/SetBoolArray methods for the scalar effect variable interface. Signed-off-by: Connor McAdams <conmanx360(a)gmail.com> --- v5: Added correct behavior when Get/Set methods are called for types different than the variable type, i.e SetInt on a Float variable and vice versa. dlls/d3d10/effect.c | 187 +++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 175 insertions(+), 12 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 3ee9bf7a35..42311bd1fe 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -4212,8 +4212,146 @@ static const struct ID3D10EffectConstantBufferVtbl d3d10_effect_constant_buffer_ d3d10_effect_constant_buffer_GetTextureBuffer, }; + +static BOOL get_variable_as_bool(void *in_data, D3D10_SHADER_VARIABLE_TYPE in_type) +{ + switch (in_type) + { + case D3D10_SVT_FLOAT: + case D3D10_SVT_INT: + case D3D10_SVT_BOOL: + if (*(DWORD *)in_data) + return -1; + break; + + default: + break; + } + + return FALSE; +} + +static int get_variable_as_int(void *in_data, D3D10_SHADER_VARIABLE_TYPE in_type) +{ + switch (in_type) + { + case D3D10_SVT_FLOAT: + return (int)(*(float *)in_data); + + case D3D10_SVT_INT: + return *(int *)in_data; + + case D3D10_SVT_BOOL: + return get_variable_as_bool(in_data, in_type); + + default: + return 0; + } +} + +static float get_variable_as_float(void *in_data, D3D10_SHADER_VARIABLE_TYPE in_type) +{ + switch (in_type) + { + case D3D10_SVT_FLOAT: + return *(float *)in_data; + + case D3D10_SVT_INT: + return (float)(*(int *)in_data); + + case D3D10_SVT_BOOL: + return (float)get_variable_as_bool(in_data, in_type); + + default: + return 0.0f; + } +} + +static void write_variable(BYTE *out_data, D3D_SHADER_VARIABLE_TYPE out_type, BYTE *in_data, + D3D_SHADER_VARIABLE_TYPE in_type, unsigned int col_count) +{ + unsigned int i; + + for (i = 0; i < col_count; i++, out_data += 4, in_data += 4) + { + if (out_type == in_type) + *(DWORD *)out_data = *(DWORD *)in_data; + else + { + switch (out_type) + { + case D3D10_SVT_FLOAT: + *(float *)out_data = get_variable_as_float(in_data, in_type); + break; + + case D3D10_SVT_INT: + *(int *)out_data = get_variable_as_int(in_data, in_type); + break; + + case D3D10_SVT_BOOL: + *(BOOL *)out_data = get_variable_as_bool(in_data, in_type); + break; + + default: + *(DWORD *)out_data = 0; + break; + } + } + } +} + +static void write_variable_to_buffer(struct d3d10_effect_variable *variable, void *data, + D3D_SHADER_VARIABLE_TYPE in_type) +{ + BYTE *buf = variable->buffer->u.buffer.local_buffer + variable->buffer_offset; + + write_variable(buf, variable->type->basetype, data, in_type, variable->type->column_count); + + variable->buffer->u.buffer.changed = TRUE; +} + +static void write_variable_array_to_buffer(struct d3d10_effect_variable *variable, void *data, + D3D_SHADER_VARIABLE_TYPE in_type, unsigned int offset, unsigned int count) +{ + BYTE *buf = variable->buffer->u.buffer.local_buffer + variable->buffer_offset; + BYTE *cur_element = data; + unsigned int element_size, i; + + if (!variable->type->element_count) + { + write_variable_to_buffer(variable, data, in_type); + return; + } + + if (offset >= variable->type->element_count) + return; + + if (count > variable->type->element_count - offset) + count = variable->type->element_count - offset; + + element_size = variable->type->elementtype->size_packed; + if (offset) + buf += variable->type->stride * offset; + + for (i = 0; i < count; i++) + { + write_variable(buf, variable->type->basetype, cur_element, in_type, + variable->type->column_count); + + cur_element += element_size; + buf += variable->type->stride; + } + + variable->buffer->u.buffer.changed = TRUE; +} + /* ID3D10EffectVariable methods */ +static inline struct d3d10_effect_variable *impl_from_ID3D10EffectScalarVariable(ID3D10EffectScalarVariable *iface) +{ + return CONTAINING_RECORD(iface, struct d3d10_effect_variable, ID3D10EffectVariable_iface); +} + static BOOL STDMETHODCALLTYPE d3d10_effect_scalar_variable_IsValid(ID3D10EffectScalarVariable *iface) { TRACE("iface %p\n", iface); @@ -4370,9 +4508,12 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_scalar_variable_GetRawValue(ID3D10 static HRESULT STDMETHODCALLTYPE d3d10_effect_scalar_variable_SetFloat(ID3D10EffectScalarVariable *iface, float value) { - FIXME("iface %p, value %.8e stub!\n", iface, value); + struct d3d10_effect_variable *effect_var = impl_from_ID3D10EffectScalarVariable(iface); - return E_NOTIMPL; + TRACE("iface %p, value %.8e.\n", iface, value); + write_variable_to_buffer(effect_var, &value, D3D10_SVT_FLOAT); + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d10_effect_scalar_variable_GetFloat(ID3D10EffectScalarVariable *iface, @@ -4383,12 +4524,22 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_scalar_variable_GetFloat(ID3D10Eff return E_NOTIMPL; } +/* + * According to MSDN, array writing functions for Scalar/Vector effect + * variables have offset go unused. Testing has revealed that this is + * true for Scalar variables, but not for vectors. So, in the case of + * Scalar variables, just pass 0 as the offset argument of + * write_variable_array_to_buffer. + */ static HRESULT STDMETHODCALLTYPE d3d10_effect_scalar_variable_SetFloatArray(ID3D10EffectScalarVariable *iface, float *values, UINT offset, UINT count) { - FIXME("iface %p, values %p, offset %u, count %u stub!\n", iface, values, offset, count); + struct d3d10_effect_variable *effect_var = impl_from_ID3D10EffectScalarVariable(iface); - return E_NOTIMPL; + TRACE("iface %p, values %p, offset %u, count %u.\n", iface, values, offset, count); + write_variable_array_to_buffer(effect_var, values, D3D10_SVT_FLOAT, 0, count); + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d10_effect_scalar_variable_GetFloatArray(ID3D10EffectScalarVariable *iface, @@ -4402,9 +4553,12 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_scalar_variable_GetFloatArray(ID3D static HRESULT STDMETHODCALLTYPE d3d10_effect_scalar_variable_SetInt(ID3D10EffectScalarVariable *iface, int value) { - FIXME("iface %p, value %d stub!\n", iface, value); + struct d3d10_effect_variable *effect_var = impl_from_ID3D10EffectScalarVariable(iface); - return E_NOTIMPL; + TRACE("iface %p, value %d.\n", iface, value); + write_variable_to_buffer(effect_var, &value, D3D10_SVT_INT); + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d10_effect_scalar_variable_GetInt(ID3D10EffectScalarVariable *iface, @@ -4418,9 +4572,12 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_scalar_variable_GetInt(ID3D10Effec static HRESULT STDMETHODCALLTYPE d3d10_effect_scalar_variable_SetIntArray(ID3D10EffectScalarVariable *iface, int *values, UINT offset, UINT count) { - FIXME("iface %p, values %p, offset %u, count %u stub!\n", iface, values, offset, count); + struct d3d10_effect_variable *effect_var = impl_from_ID3D10EffectScalarVariable(iface); - return E_NOTIMPL; + TRACE("iface %p, values %p, offset %u, count %u.\n", iface, values, offset, count); + write_variable_array_to_buffer(effect_var, values, D3D10_SVT_INT, 0, count); + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d10_effect_scalar_variable_GetIntArray(ID3D10EffectScalarVariable *iface, @@ -4434,9 +4591,12 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_scalar_variable_GetIntArray(ID3D10 static HRESULT STDMETHODCALLTYPE d3d10_effect_scalar_variable_SetBool(ID3D10EffectScalarVariable *iface, BOOL value) { - FIXME("iface %p, value %d stub!\n", iface, value); + struct d3d10_effect_variable *effect_var = impl_from_ID3D10EffectScalarVariable(iface); - return E_NOTIMPL; + TRACE("iface %p, value %d.\n", iface, value); + write_variable_to_buffer(effect_var, &value, D3D10_SVT_BOOL); + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d10_effect_scalar_variable_GetBool(ID3D10EffectScalarVariable *iface, @@ -4450,9 +4610,12 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_scalar_variable_GetBool(ID3D10Effe static HRESULT STDMETHODCALLTYPE d3d10_effect_scalar_variable_SetBoolArray(ID3D10EffectScalarVariable *iface, BOOL *values, UINT offset, UINT count) { - FIXME("iface %p, values %p, offset %u, count %u stub!\n", iface, values, offset, count); + struct d3d10_effect_variable *effect_var = impl_from_ID3D10EffectScalarVariable(iface); - return E_NOTIMPL; + TRACE("iface %p, values %p, offset %u, count %u.\n", iface, values, offset, count); + write_variable_array_to_buffer(effect_var, values, D3D10_SVT_BOOL, 0, count); + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d10_effect_scalar_variable_GetBoolArray(ID3D10EffectScalarVariable *iface, -- 2.20.1

2 7

[PATCH 2/4] winegcc: Return build_tool_name result as strarray.
by Jacek Caban 03 Mar '20

03 Mar '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- tools/winegcc/winegcc.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-)

1 0

[PATCH 1/4] winegcc: Lookup PATH in find_binary and don't try to run binaries that can't be found.
by Jacek Caban 03 Mar '20

03 Mar '20

Based on winebuild. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- I'm resending the series because patch 2 got lost by the mailing list yesterday. tools/winegcc/utils.c | 44 +++++++++++++++++++++++++++++++++++------ tools/winegcc/winegcc.c | 7 ++++++- 2 files changed, 44 insertions(+), 7 deletions(-)

1 0

[v2 PATCH 5/5] mfplat: Implement transform activation object.
by Nikolay Sivov 03 Mar '20

03 Mar '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v2: reset transform pointer on shutdown. Thanks, Alexandre. dlls/mfplat/main.c | 59 ++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 54 insertions(+), 5 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index a1314f6eb3..09d6a63bba 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -109,6 +109,7 @@ struct transform_activate struct attributes attributes; IMFActivate IMFActivate_iface; IClassFactory *factory; + IMFTransform *transform; }; struct system_clock @@ -198,6 +199,8 @@ static ULONG WINAPI transform_activate_Release(IMFActivate *iface) clear_attributes_object(&activate->attributes); if (activate->factory) IClassFactory_Release(activate->factory); + if (activate->transform) + IMFTransform_Release(activate->transform); heap_free(activate); } @@ -482,21 +485,67 @@ static HRESULT WINAPI transform_activate_CopyAllItems(IMFActivate *iface, IMFAtt static HRESULT WINAPI transform_activate_ActivateObject(IMFActivate *iface, REFIID riid, void **obj) { - FIXME("%p, %s, %p.\n", iface, debugstr_guid(riid), obj); + struct transform_activate *activate = impl_from_IMFActivate(iface); + CLSID clsid; + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj); + + EnterCriticalSection(&activate->attributes.cs); + + if (!activate->transform) + { + if (activate->factory) + { + if (FAILED(hr = IClassFactory_CreateInstance(activate->factory, NULL, &IID_IMFTransform, + (void **)&activate->transform))) + { + hr = MF_E_INVALIDREQUEST; + } + } + else + { + if (SUCCEEDED(hr = attributes_GetGUID(&activate->attributes, &MFT_TRANSFORM_CLSID_Attribute, &clsid))) + { + if (FAILED(hr = CoCreateInstance(&clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IMFTransform, + (void **)&activate->transform))) + { + hr = MF_E_INVALIDREQUEST; + } + } + } + } + + if (activate->transform) + hr = IMFTransform_QueryInterface(activate->transform, riid, obj); + + LeaveCriticalSection(&activate->attributes.cs); + + return hr; } static HRESULT WINAPI transform_activate_ShutdownObject(IMFActivate *iface) { - FIXME("%p.\n", iface); + struct transform_activate *activate = impl_from_IMFActivate(iface); - return E_NOTIMPL; + TRACE("%p.\n", iface); + + EnterCriticalSection(&activate->attributes.cs); + + if (activate->transform) + { + IMFTransform_Release(activate->transform); + activate->transform = NULL; + } + + LeaveCriticalSection(&activate->attributes.cs); + + return S_OK; } static HRESULT WINAPI transform_activate_DetachObject(IMFActivate *iface) { - FIXME("%p.\n", iface); + TRACE("%p.\n", iface); return E_NOTIMPL; } -- 2.25.1

1 0

[PATCH] include: Make SHCNF_FLUSHNOWAIT value more explicit.
by Serge Gautherie 03 Mar '20

03 Mar '20

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- * Addendum to 5f884d19c69b8a857083c013e5aecf6031d7bf70. * S2003R2 P.SDK still had '2'. '3' came later (Win10?). --- include/shlobj.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/shlobj.h b/include/shlobj.h index d309446..e5f6692 100644 --- a/include/shlobj.h +++ b/include/shlobj.h @@ -1362,7 +1362,7 @@ typedef struct _SHChangeNotifyEntry #define SHCNF_PRINTERW 0x0006 #define SHCNF_TYPE 0x00FF #define SHCNF_FLUSH 0x1000 -#define SHCNF_FLUSHNOWAIT 0x3000 +#define SHCNF_FLUSHNOWAIT (0x2000 | SHCNF_FLUSH) #define SHCNF_NOTIFYRECURSIVE 0x10000 #define SHCNF_PATH WINELIB_NAME_AW(SHCNF_PATH) -- 2.10.0.windows.1

1 0

[PATCH 1/5] mfplat: Implement MFTEnumEx().
by Nikolay Sivov 03 Mar '20

03 Mar '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/main.c | 457 ++++++++++++++++++++++++++++++------- dlls/mfplat/mfplat.spec | 1 + dlls/mfplat/tests/mfplat.c | 17 +- include/mfapi.h | 2 + 4 files changed, 391 insertions(+), 86 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index ef0db5a276..45cddd42cc 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -85,7 +85,7 @@ static CRITICAL_SECTION local_handlers_section = { NULL, -1, 0, 0, 0, 0 }; static struct list local_scheme_handlers = LIST_INIT(local_scheme_handlers); static struct list local_bytestream_handlers = LIST_INIT(local_bytestream_handlers); -struct local_mft +struct mft_registration { struct list entry; IClassFactory *factory; @@ -107,6 +107,7 @@ struct transform_activate { struct attributes attributes; IMFActivate IMFActivate_iface; + IClassFactory *factory; }; struct system_clock @@ -194,6 +195,8 @@ static ULONG WINAPI transform_activate_Release(IMFActivate *iface) if (!refcount) { clear_attributes_object(&activate->attributes); + if (activate->factory) + IClassFactory_Release(activate->factory); heap_free(activate); } @@ -537,13 +540,11 @@ static const IMFActivateVtbl transform_activate_vtbl = transform_activate_DetachObject, }; -HRESULT WINAPI MFCreateTransformActivate(IMFActivate **activate) +static HRESULT create_transform_activate(IClassFactory *factory, IMFActivate **activate) { struct transform_activate *object; HRESULT hr; - TRACE("%p.\n", activate); - object = heap_alloc_zero(sizeof(*object)); if (!object) return E_OUTOFMEMORY; @@ -555,12 +556,22 @@ HRESULT WINAPI MFCreateTransformActivate(IMFActivate **activate) } object->IMFActivate_iface.lpVtbl = &transform_activate_vtbl; + object->factory = factory; + if (object->factory) + IClassFactory_AddRef(object->factory); *activate = &object->IMFActivate_iface; return S_OK; } +HRESULT WINAPI MFCreateTransformActivate(IMFActivate **activate) +{ + TRACE("%p.\n", activate); + + return create_transform_activate(NULL, activate); +} + static const WCHAR transform_keyW[] = {'M','e','d','i','a','F','o','u','n','d','a','t','i','o','n','\\', 'T','r','a','n','s','f','o','r','m','s',0}; static const WCHAR categories_keyW[] = {'M','e','d','i','a','F','o','u','n','d','a','t','i','o','n','\\', @@ -648,7 +659,7 @@ static BOOL GUIDFromString(LPCWSTR s, GUID *id) id->Data4[(i-19)/2] = guid_conv_table[s[i]] << 4 | guid_conv_table[s[i+1]]; } - if (!s[37]) return TRUE; + if (!s[36]) return TRUE; return FALSE; } @@ -774,7 +785,7 @@ HRESULT WINAPI MFTRegister(CLSID clsid, GUID category, LPWSTR name, UINT32 flags return hr; } -static void release_local_mft(struct local_mft *mft) +static void release_mft_registration(struct mft_registration *mft) { if (mft->factory) IClassFactory_Release(mft->factory); @@ -788,7 +799,7 @@ static HRESULT mft_register_local(IClassFactory *factory, REFCLSID clsid, REFGUI UINT32 input_count, const MFT_REGISTER_TYPE_INFO *input_types, UINT32 output_count, const MFT_REGISTER_TYPE_INFO *output_types) { - struct local_mft *mft, *cur, *unreg_mft = NULL; + struct mft_registration *mft, *cur, *unreg_mft = NULL; HRESULT hr; if (!factory && !clsid) @@ -807,7 +818,7 @@ static HRESULT mft_register_local(IClassFactory *factory, REFCLSID clsid, REFGUI if (clsid) mft->clsid = *clsid; mft->category = *category; - mft->flags = flags; + mft->flags = flags | MFT_ENUM_FLAG_LOCALMFT; if (FAILED(hr = heap_strdupW(name, &mft->name))) goto failed; @@ -835,7 +846,7 @@ static HRESULT mft_register_local(IClassFactory *factory, REFCLSID clsid, REFGUI EnterCriticalSection(&local_mfts_section); - LIST_FOR_EACH_ENTRY(cur, &local_mfts, struct local_mft, entry) + LIST_FOR_EACH_ENTRY(cur, &local_mfts, struct mft_registration, entry) { if (cur->factory == factory) { @@ -849,11 +860,11 @@ static HRESULT mft_register_local(IClassFactory *factory, REFCLSID clsid, REFGUI LeaveCriticalSection(&local_mfts_section); if (unreg_mft) - release_local_mft(unreg_mft); + release_mft_registration(unreg_mft); failed: if (FAILED(hr)) - release_local_mft(mft); + release_mft_registration(mft); return hr; } @@ -880,7 +891,7 @@ HRESULT WINAPI MFTRegisterLocalByCLSID(REFCLSID clsid, REFGUID category, LPCWSTR static HRESULT mft_unregister_local(IClassFactory *factory, REFCLSID clsid) { - struct local_mft *cur, *cur2; + struct mft_registration *cur, *cur2; BOOL unregister_all = !factory && !clsid; struct list unreg; @@ -888,7 +899,7 @@ static HRESULT mft_unregister_local(IClassFactory *factory, REFCLSID clsid) EnterCriticalSection(&local_mfts_section); - LIST_FOR_EACH_ENTRY_SAFE(cur, cur2, &local_mfts, struct local_mft, entry) + LIST_FOR_EACH_ENTRY_SAFE(cur, cur2, &local_mfts, struct mft_registration, entry) { if (!unregister_all) { @@ -911,10 +922,10 @@ static HRESULT mft_unregister_local(IClassFactory *factory, REFCLSID clsid) if (!unregister_all && list_empty(&unreg)) return HRESULT_FROM_WIN32(ERROR_NOT_FOUND); - LIST_FOR_EACH_ENTRY_SAFE(cur, cur2, &unreg, struct local_mft, entry) + LIST_FOR_EACH_ENTRY_SAFE(cur, cur2, &unreg, struct mft_registration, entry) { list_remove(&cur->entry); - release_local_mft(cur); + release_mft_registration(cur); } return S_OK; @@ -945,135 +956,411 @@ MFTIME WINAPI MFGetSystemTime(void) return mf; } -static BOOL match_type(const WCHAR *clsid_str, const WCHAR *type_str, MFT_REGISTER_TYPE_INFO *type) +static BOOL mft_is_type_info_match(struct mft_registration *mft, const GUID *category, UINT32 flags, + IMFPluginControl *plugin_control, const MFT_REGISTER_TYPE_INFO *input_type, + const MFT_REGISTER_TYPE_INFO *output_type) +{ + BOOL matching = TRUE; + DWORD model; + int i; + + if (!IsEqualGUID(category, &mft->category)) + return FALSE; + + /* Default model is synchronous. */ + model = mft->flags & (MFT_ENUM_FLAG_SYNCMFT | MFT_ENUM_FLAG_ASYNCMFT | MFT_ENUM_FLAG_HARDWARE); + if (!model) + model = MFT_ENUM_FLAG_SYNCMFT; + if (!(model & flags & (MFT_ENUM_FLAG_SYNCMFT | MFT_ENUM_FLAG_ASYNCMFT | MFT_ENUM_FLAG_HARDWARE))) + return FALSE; + + /* These flags should be explicitly enabled. */ + if (mft->flags & ~flags & (MFT_ENUM_FLAG_FIELDOFUSE | MFT_ENUM_FLAG_TRANSCODE_ONLY)) + return FALSE; + + if (flags & MFT_ENUM_FLAG_SORTANDFILTER && !mft->factory && plugin_control + && IMFPluginControl_IsDisabled(plugin_control, MF_Plugin_Type_MFT, &mft->clsid) == S_OK) + { + return FALSE; + } + + if (input_type) + { + for (i = 0, matching = FALSE; input_type && i < mft->input_types_count; ++i) + { + if (!memcmp(&mft->input_types[i], input_type, sizeof(*input_type))) + { + matching = TRUE; + break; + } + } + } + + if (output_type && matching) + { + for (i = 0, matching = FALSE; i < mft->output_types_count; ++i) + { + if (!memcmp(&mft->output_types[i], output_type, sizeof(*output_type))) + { + matching = TRUE; + break; + } + } + } + + return matching; +} + +static void mft_get_reg_type_info(const WCHAR *clsidW, const WCHAR *typeW, MFT_REGISTER_TYPE_INFO **type, + UINT32 *count) { HKEY htransform, hfilter; DWORD reg_type, size; - LONG ret = FALSE; - MFT_REGISTER_TYPE_INFO *info = NULL; - int i; + + *type = NULL; + *count = 0; if (RegOpenKeyW(HKEY_CLASSES_ROOT, transform_keyW, &htransform)) - return FALSE; + return; - if (RegOpenKeyW(htransform, clsid_str, &hfilter)) + if (RegOpenKeyW(htransform, clsidW, &hfilter)) { RegCloseKey(htransform); - return FALSE; + return; } - if (RegQueryValueExW(hfilter, type_str, NULL, &reg_type, NULL, &size) != ERROR_SUCCESS) + if (RegQueryValueExW(hfilter, typeW, NULL, &reg_type, NULL, &size)) goto out; if (reg_type != REG_BINARY) goto out; - if (!size || size % (sizeof(MFT_REGISTER_TYPE_INFO)) != 0) + if (!size || size % sizeof(**type)) goto out; - info = HeapAlloc(GetProcessHeap(), 0, size); - if (!info) + if (!(*type = heap_alloc(size))) goto out; - if (RegQueryValueExW(hfilter, type_str, NULL, &reg_type, (LPBYTE)info, &size) != ERROR_SUCCESS) - goto out; + *count = size / sizeof(**type); - for (i = 0; i < size / sizeof(MFT_REGISTER_TYPE_INFO); i++) + if (RegQueryValueExW(hfilter, typeW, NULL, &reg_type, (BYTE *)*type, &size)) { - if (IsEqualGUID(&info[i].guidMajorType, &type->guidMajorType) && - IsEqualGUID(&info[i].guidSubtype, &type->guidSubtype)) - { - ret = TRUE; - break; - } + heap_free(*type); + *type = NULL; + *count = 0; } out: - HeapFree(GetProcessHeap(), 0, info); RegCloseKey(hfilter); RegCloseKey(htransform); - return ret; } -/*********************************************************************** - * MFTEnum (mfplat.@) - */ -HRESULT WINAPI MFTEnum(GUID category, UINT32 flags, MFT_REGISTER_TYPE_INFO *input_type, - MFT_REGISTER_TYPE_INFO *output_type, IMFAttributes *attributes, - CLSID **pclsids, UINT32 *pcount) +static void mft_get_reg_flags(const WCHAR *clsidW, const WCHAR *nameW, DWORD *flags) { - WCHAR buffer[64], clsid_str[MAX_PATH] = {0}; - HKEY hcategory, hlist; - DWORD index = 0; - DWORD size = MAX_PATH; - CLSID *clsids = NULL; - UINT32 count = 0; - LONG ret; + DWORD ret, reg_type, size; + HKEY hroot, hmft; - TRACE("(%s, %x, %p, %p, %p, %p, %p)\n", debugstr_guid(&category), flags, input_type, - output_type, attributes, pclsids, pcount); + *flags = 0; - if (!pclsids || !pcount) - return E_INVALIDARG; + if (RegOpenKeyW(HKEY_CLASSES_ROOT, transform_keyW, &hroot)) + return; + + ret = RegOpenKeyW(hroot, clsidW, &hmft); + RegCloseKey(hroot); + if (ret) + return; + + reg_type = 0; + if (!RegQueryValueExW(hmft, nameW, NULL, &reg_type, NULL, &size) && reg_type == REG_DWORD) + RegQueryValueExW(hmft, nameW, NULL, &reg_type, (BYTE *)flags, &size); + + RegCloseKey(hmft); +} + +static HRESULT mft_collect_machine_reg(struct list *mfts, const GUID *category, UINT32 flags, + IMFPluginControl *plugin_control, const MFT_REGISTER_TYPE_INFO *input_type, + const MFT_REGISTER_TYPE_INFO *output_type) +{ + struct mft_registration mft, *cur; + HKEY hcategory, hlist; + WCHAR clsidW[64]; + DWORD ret, size; + int index = 0; if (RegOpenKeyW(HKEY_CLASSES_ROOT, categories_keyW, &hcategory)) return E_FAIL; - GUIDToString(buffer, &category); - - ret = RegOpenKeyW(hcategory, buffer, &hlist); + GUIDToString(clsidW, category); + ret = RegOpenKeyW(hcategory, clsidW, &hlist); RegCloseKey(hcategory); - if (ret) return E_FAIL; + if (ret) + return E_FAIL; - while (RegEnumKeyExW(hlist, index, clsid_str, &size, NULL, NULL, NULL, NULL) == ERROR_SUCCESS) + size = ARRAY_SIZE(clsidW); + while (!RegEnumKeyExW(hlist, index, clsidW, &size, NULL, NULL, NULL, NULL)) { - GUID clsid; - void *tmp; - - if (!GUIDFromString(clsid_str, &clsid)) + memset(&mft, 0, sizeof(mft)); + mft.category = *category; + if (!GUIDFromString(clsidW, &mft.clsid)) goto next; - if (output_type && !match_type(clsid_str, outputtypesW, output_type)) - goto next; + mft_get_reg_flags(clsidW, mftflagsW, &mft.flags); - if (input_type && !match_type(clsid_str, inputtypesW, input_type)) - goto next; + if (output_type) + mft_get_reg_type_info(clsidW, outputtypesW, &mft.output_types, &mft.output_types_count); + + if (input_type) + mft_get_reg_type_info(clsidW, inputtypesW, &mft.input_types, &mft.input_types_count); - tmp = CoTaskMemRealloc(clsids, (count + 1) * sizeof(GUID)); - if (!tmp) + if (!mft_is_type_info_match(&mft, category, flags, plugin_control, input_type, output_type)) { - CoTaskMemFree(clsids); - RegCloseKey(hlist); - return E_OUTOFMEMORY; + heap_free(mft.input_types); + heap_free(mft.output_types); + goto next; } - clsids = tmp; - clsids[count++] = clsid; + cur = heap_alloc(sizeof(*cur)); + /* Reuse allocated type arrays. */ + *cur = mft; + list_add_tail(mfts, &cur->entry); next: - size = MAX_PATH; + size = ARRAY_SIZE(clsidW); index++; } - *pclsids = clsids; - *pcount = count; - - RegCloseKey(hlist); return S_OK; } +static BOOL mft_is_preferred(IMFPluginControl *plugin_control, const CLSID *clsid) +{ + CLSID preferred; + WCHAR *selector; + int index = 0; + + while (SUCCEEDED(IMFPluginControl_GetPreferredClsidByIndex(plugin_control, MF_Plugin_Type_MFT, index++, &selector, + &preferred))) + { + CoTaskMemFree(selector); + + if (IsEqualGUID(&preferred, clsid)) + return TRUE; + } + + return FALSE; +} + +static HRESULT mft_enum(GUID category, UINT32 flags, const MFT_REGISTER_TYPE_INFO *input_type, + const MFT_REGISTER_TYPE_INFO *output_type, IMFAttributes *attributes, IMFActivate ***activate, UINT32 *count) +{ + IMFPluginControl *plugin_control = NULL; + struct list mfts, mfts_sorted, *result = &mfts; + struct mft_registration *mft, *mft2; + unsigned int obj_count; + HRESULT hr; + + *count = 0; + *activate = NULL; + + if (!flags) + flags = MFT_ENUM_FLAG_SYNCMFT | MFT_ENUM_FLAG_LOCALMFT | MFT_ENUM_FLAG_SORTANDFILTER; + + /* Synchronous processing is default. */ + if (!(flags & (MFT_ENUM_FLAG_SYNCMFT | MFT_ENUM_FLAG_ASYNCMFT | MFT_ENUM_FLAG_HARDWARE))) + flags |= MFT_ENUM_FLAG_SYNCMFT; + + if (FAILED(hr = MFGetPluginControl(&plugin_control))) + { + WARN("Failed to get plugin control instance, hr %#x.\n", hr); + return hr; + } + + list_init(&mfts); + + /* Collect from registry */ + mft_collect_machine_reg(&mfts, &category, flags, plugin_control, input_type, output_type); + + /* Collect locally registered ones. */ + if (flags & MFT_ENUM_FLAG_LOCALMFT) + { + struct mft_registration *local; + + EnterCriticalSection(&local_mfts_section); + + LIST_FOR_EACH_ENTRY(local, &local_mfts, struct mft_registration, entry) + { + if (mft_is_type_info_match(local, &category, flags, plugin_control, input_type, output_type)) + { + mft = heap_alloc_zero(sizeof(*mft)); + + mft->clsid = local->clsid; + mft->factory = local->factory; + if (mft->factory) + IClassFactory_AddRef(mft->factory); + mft->flags = local->flags; + + list_add_tail(&mfts, &mft->entry); + } + } + + LeaveCriticalSection(&local_mfts_section); + } + + list_init(&mfts_sorted); + + if (flags & MFT_ENUM_FLAG_SORTANDFILTER) + { + /* Local registrations. */ + LIST_FOR_EACH_ENTRY_SAFE(mft, mft2, &mfts, struct mft_registration, entry) + { + if (mft->flags & MFT_ENUM_FLAG_LOCALMFT) + { + list_remove(&mft->entry); + list_add_tail(&mfts_sorted, &mft->entry); + } + } + + /* FIXME: Sort by merit value, for the ones that got it. Currently not handled. */ + + /* Preferred transforms. */ + LIST_FOR_EACH_ENTRY_SAFE(mft, mft2, &mfts, struct mft_registration, entry) + { + if (!mft->factory && mft_is_preferred(plugin_control, &mft->clsid)) + { + list_remove(&mft->entry); + list_add_tail(&mfts_sorted, &mft->entry); + } + } + + /* Append the rest. */ + LIST_FOR_EACH_ENTRY_SAFE(mft, mft2, &mfts, struct mft_registration, entry) + { + list_remove(&mft->entry); + list_add_tail(&mfts_sorted, &mft->entry); + } + + result = &mfts; + } + + IMFPluginControl_Release(plugin_control); + + /* Create activation objects from CLSID/IClassFactory. */ + + obj_count = list_count(result); + + if (obj_count) + { + if (!(*activate = CoTaskMemAlloc(obj_count * sizeof(**activate)))) + hr = E_OUTOFMEMORY; + + obj_count = 0; + + LIST_FOR_EACH_ENTRY_SAFE(mft, mft2, result, struct mft_registration, entry) + { + IMFActivate *mft_activate; + + if (*activate) + { + if (SUCCEEDED(create_transform_activate(mft->factory, &mft_activate))) + { + (*activate)[obj_count] = mft_activate; + + /* FIXME: set some attributes */ + + obj_count++; + } + } + + list_remove(&mft->entry); + release_mft_registration(mft); + } + } + + if (!obj_count) + { + CoTaskMemFree(*activate); + *activate = NULL; + } + *count = obj_count; + + return hr; +} + +/*********************************************************************** + * MFTEnum (mfplat.@) + */ +HRESULT WINAPI MFTEnum(GUID category, UINT32 flags, MFT_REGISTER_TYPE_INFO *input_type, + MFT_REGISTER_TYPE_INFO *output_type, IMFAttributes *attributes, CLSID **clsids, UINT32 *count) +{ + struct mft_registration *mft, *mft2; + unsigned int mft_count; + struct list mfts; + HRESULT hr; + + TRACE("%s, %#x, %p, %p, %p, %p, %p.\n", debugstr_guid(&category), flags, input_type, output_type, attributes, + clsids, count); + + if (!clsids || !count) + return E_INVALIDARG; + + *count = 0; + + list_init(&mfts); + + if (FAILED(hr = mft_collect_machine_reg(&mfts, &category, MFT_ENUM_FLAG_SYNCMFT, NULL, input_type, output_type))) + return hr; + + mft_count = list_count(&mfts); + + if (mft_count) + { + if (!(*clsids = CoTaskMemAlloc(mft_count * sizeof(**clsids)))) + hr = E_OUTOFMEMORY; + + mft_count = 0; + LIST_FOR_EACH_ENTRY_SAFE(mft, mft2, &mfts, struct mft_registration, entry) + { + if (*clsids) + (*clsids)[mft_count++] = mft->clsid; + list_remove(&mft->entry); + release_mft_registration(mft); + } + } + + if (!mft_count) + { + CoTaskMemFree(*clsids); + *clsids = NULL; + } + *count = mft_count; + + return hr; +} + /*********************************************************************** * MFTEnumEx (mfplat.@) */ HRESULT WINAPI MFTEnumEx(GUID category, UINT32 flags, const MFT_REGISTER_TYPE_INFO *input_type, - const MFT_REGISTER_TYPE_INFO *output_type, IMFActivate ***activate, - UINT32 *pcount) + const MFT_REGISTER_TYPE_INFO *output_type, IMFActivate ***activate, UINT32 *count) { - FIXME("(%s, %x, %p, %p, %p, %p): stub\n", debugstr_guid(&category), flags, input_type, - output_type, activate, pcount); + TRACE("%s, %#x, %p, %p, %p, %p.\n", debugstr_guid(&category), flags, input_type, output_type, activate, count); - *pcount = 0; - return S_OK; + return mft_enum(category, flags, input_type, output_type, NULL, activate, count); +} + +/*********************************************************************** + * MFTEnum2 (mfplat.@) + */ +HRESULT WINAPI MFTEnum2(GUID category, UINT32 flags, const MFT_REGISTER_TYPE_INFO *input_type, + const MFT_REGISTER_TYPE_INFO *output_type, IMFAttributes *attributes, IMFActivate ***activate, UINT32 *count) +{ + TRACE("%s, %#x, %p, %p, %p, %p, %p.\n", debugstr_guid(&category), flags, input_type, output_type, attributes, + activate, count); + + if (attributes) + FIXME("Ignoring attributes.\n"); + + return mft_enum(category, flags, input_type, output_type, attributes, activate, count); } /*********************************************************************** diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index 85e28792c6..7e3bd4571c 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -144,6 +144,7 @@ @ stdcall MFStartup(long long) @ stub MFStreamDescriptorProtectMediaType @ stdcall MFTEnum(int128 long ptr ptr ptr ptr ptr) +@ stdcall MFTEnum2(int128 long ptr ptr ptr ptr ptr) @ stdcall MFTEnumEx(int128 long ptr ptr ptr ptr) @ stub MFTGetInfo @ stdcall MFTRegister(int128 int128 wstr long long ptr long ptr ptr) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 896cd93a46..a93bbfe7f1 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -89,6 +89,8 @@ static HRESULT (WINAPI *pMFTRegisterLocalByCLSID)(REFCLSID clsid, REFGUID catego static HRESULT (WINAPI *pMFTUnregisterLocal)(IClassFactory *factory); static HRESULT (WINAPI *pMFTUnregisterLocalByCLSID)(CLSID clsid); static HRESULT (WINAPI *pMFAllocateWorkQueueEx)(MFASYNC_WORKQUEUE_TYPE queue_type, DWORD *queue); +static HRESULT (WINAPI *pMFTEnumEx)(GUID category, UINT32 flags, const MFT_REGISTER_TYPE_INFO *input_type, + const MFT_REGISTER_TYPE_INFO *output_type, IMFActivate ***activate, UINT32 *count); static const WCHAR fileschemeW[] = L"file://"; @@ -659,13 +661,14 @@ static void init_functions(void) X(MFCreateDXGIDeviceManager); X(MFCreateSourceResolver); X(MFCreateMFByteStreamOnStream); + X(MFCreateTransformActivate); X(MFHeapAlloc); X(MFHeapFree); X(MFPutWaitingWorkItem); X(MFRegisterLocalByteStreamHandler); X(MFRegisterLocalSchemeHandler); X(MFRemovePeriodicCallback); - X(MFCreateTransformActivate); + X(MFTEnumEx); X(MFTRegisterLocal); X(MFTRegisterLocalByCLSID); X(MFTUnregisterLocal); @@ -4055,6 +4058,8 @@ static void test_MFTRegisterLocal(void) { IClassFactory test_factory = { &test_mft_factory_vtbl }; MFT_REGISTER_TYPE_INFO input_types[1]; + IMFActivate **activate; + UINT32 count, count2; HRESULT hr; if (!pMFTRegisterLocal) @@ -4071,9 +4076,19 @@ static void test_MFTRegisterLocal(void) hr = pMFTRegisterLocal(&test_factory, &MFT_CATEGORY_OTHER, L"Local MFT name", 0, 1, input_types, 0, NULL); ok(hr == S_OK, "Failed to register MFT, hr %#x.\n", hr); + hr = pMFTEnumEx(MFT_CATEGORY_OTHER, MFT_ENUM_FLAG_LOCALMFT, NULL, NULL, &activate, &count); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(count > 0, "Unexpected count %u.\n", count); + CoTaskMemFree(activate); + hr = pMFTUnregisterLocal(&test_factory); ok(hr == S_OK, "Failed to unregister MFT, hr %#x.\n", hr); + hr = pMFTEnumEx(MFT_CATEGORY_OTHER, MFT_ENUM_FLAG_LOCALMFT, NULL, NULL, &activate, &count2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(count2 < count, "Unexpected count %u.\n", count2); + CoTaskMemFree(activate); + hr = pMFTUnregisterLocal(&test_factory); ok(hr == HRESULT_FROM_WIN32(ERROR_NOT_FOUND), "Unexpected hr %#x.\n", hr); diff --git a/include/mfapi.h b/include/mfapi.h index 910b45e68f..4d5ad5ad15 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -422,6 +422,8 @@ HRESULT WINAPI MFGetTimerPeriodicity(DWORD *periodicity); HRESULT WINAPI MFTEnum(GUID category, UINT32 flags, MFT_REGISTER_TYPE_INFO *input_type, MFT_REGISTER_TYPE_INFO *output_type, IMFAttributes *attributes, CLSID **pclsids, UINT32 *pcount); +HRESULT WINAPI MFTEnum2(GUID category, UINT32 flags, const MFT_REGISTER_TYPE_INFO *input_type, + const MFT_REGISTER_TYPE_INFO *output_type, IMFAttributes *attributes, IMFActivate ***activate, UINT32 *count); HRESULT WINAPI MFTEnumEx(GUID category, UINT32 flags, const MFT_REGISTER_TYPE_INFO *input_type, const MFT_REGISTER_TYPE_INFO *output_type, IMFActivate ***activate, UINT32 *pcount); -- 2.25.1

2 5

[PATCH v2 2/2] kernelbase: Implement SetConsoleScreenBufferInfoEx().
by Aaro Altonen 03 Mar '20

03 Mar '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47288 Signed-off-by: Aaro Altonen <a.altonen(a)hotmail.com> --- v2: - Removed an unnecessary check and added a print (thanks Gijs) --- dlls/kernel32/tests/console.c | 10 +++++----- dlls/kernelbase/console.c | 33 ++++++++++++++++++++++++++++++--- 2 files changed, 35 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 9c05784a28..84406e8409 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -3162,24 +3162,24 @@ static void test_SetConsoleScreenBufferInfoEx(HANDLE std_output) SetLastError(0xdeadbeef); ret = pSetConsoleScreenBufferInfoEx(NULL, &info); ok(!ret, "got %d, expected zero\n", ret); - todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); SetLastError(0xdeadbeef); ret = pSetConsoleScreenBufferInfoEx(std_output, &info); - todo_wine ok(ret, "got %d, expected one\n", ret); - todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + ok(ret, "got %d, expected one\n", ret); + ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); SetLastError(0xdeadbeef); ret = pSetConsoleScreenBufferInfoEx(std_input, &info); ok(!ret, "got %d, expected zero\n", ret); - todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE || GetLastError() == ERROR_ACCESS_DENIED, + ok(GetLastError() == ERROR_INVALID_HANDLE || GetLastError() == ERROR_ACCESS_DENIED, "got %u, expected 5 or 6\n", GetLastError()); info.cbSize = 0; SetLastError(0xdeadbeef); ret = pSetConsoleScreenBufferInfoEx(std_output, &info); ok(!ret, "got %d, expected zero\n", ret); - todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); CloseHandle(std_input); } diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index 91e8129fbe..8ce9252413 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -1146,9 +1146,36 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetConsoleOutputCP( UINT cp ) BOOL WINAPI DECLSPEC_HOTPATCH SetConsoleScreenBufferInfoEx( HANDLE handle, CONSOLE_SCREEN_BUFFER_INFOEX *info ) { - FIXME( "(%p %p): stub!\n", handle, info ); - SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); - return FALSE; + BOOL ret; + + TRACE("(%p, %p)\n", handle, info); + + if (info->cbSize != sizeof(CONSOLE_SCREEN_BUFFER_INFOEX)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + SERVER_START_REQ(set_console_output_info) + { + req->handle = console_handle_unmap(handle); + req->width = info->dwSize.X; + req->height = info->dwSize.Y; + req->cursor_x = info->dwCursorPosition.X; + req->cursor_y = info->dwCursorPosition.Y; + req->attr = info->wAttributes; + req->win_left = info->srWindow.Left; + req->win_top = info->srWindow.Top; + req->win_right = info->srWindow.Right; + req->win_bottom = info->srWindow.Bottom; + req->popup_attr = info->wPopupAttributes; + req->max_width = min(info->dwMaximumWindowSize.X, info->dwSize.X); + req->max_height = min(info->dwMaximumWindowSize.Y, info->dwSize.Y); + ret = !wine_server_call_err(req); + } + SERVER_END_REQ; + + return ret; } -- 2.25.1

2 1

[PATCH v2 1/2] kernel32/tests: Add tests for SetConsoleScreenBufferInfoEx().
by Aaro Altonen 03 Mar '20

03 Mar '20

Signed-off-by: Aaro Altonen <a.altonen(a)hotmail.com> --- v2: - Fix code formatting and a typo --- dlls/kernel32/tests/console.c | 43 +++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 5f8003760d..9c05784a28 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -3142,6 +3142,48 @@ static void test_GetConsoleScreenBufferInfoEx(HANDLE std_output) ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); } +static void test_SetConsoleScreenBufferInfoEx(HANDLE std_output) +{ + BOOL ret; + HANDLE hmod; + HANDLE std_input = CreateFileA("CONIN$", GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0); + BOOL (WINAPI *pSetConsoleScreenBufferInfoEx)(HANDLE, CONSOLE_SCREEN_BUFFER_INFOEX *); + CONSOLE_SCREEN_BUFFER_INFOEX info; + info.cbSize = sizeof(CONSOLE_SCREEN_BUFFER_INFOEX); + + hmod = GetModuleHandleA("kernel32.dll"); + pSetConsoleScreenBufferInfoEx = (void *)GetProcAddress(hmod, "SetConsoleScreenBufferInfoEx"); + if (!pSetConsoleScreenBufferInfoEx) + { + win_skip("SetConsoleScreenBufferInfoEx is not available\n"); + return; + } + + SetLastError(0xdeadbeef); + ret = pSetConsoleScreenBufferInfoEx(NULL, &info); + ok(!ret, "got %d, expected zero\n", ret); + todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = pSetConsoleScreenBufferInfoEx(std_output, &info); + todo_wine ok(ret, "got %d, expected one\n", ret); + todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = pSetConsoleScreenBufferInfoEx(std_input, &info); + ok(!ret, "got %d, expected zero\n", ret); + todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE || GetLastError() == ERROR_ACCESS_DENIED, + "got %u, expected 5 or 6\n", GetLastError()); + + info.cbSize = 0; + SetLastError(0xdeadbeef); + ret = pSetConsoleScreenBufferInfoEx(std_output, &info); + ok(!ret, "got %d, expected zero\n", ret); + todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); + + CloseHandle(std_input); +} + static void test_AttachConsole_child(DWORD console_pid) { HANDLE pipe_in, pipe_out; @@ -3398,5 +3440,6 @@ START_TEST(console) test_GetConsoleFontInfo(hConOut); test_SetConsoleFont(hConOut); test_GetConsoleScreenBufferInfoEx(hConOut); + test_SetConsoleScreenBufferInfoEx(hConOut); test_AttachConsole(hConOut); } -- 2.25.1

2 1

[PATCH 1/4] mf: Handle shutdown state in GetFullTopology().
by Nikolay Sivov 03 Mar '20

03 Mar '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/session.c | 33 ++++++++++++++++++--------------- dlls/mf/tests/mf.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 15 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index a2a2ba6fe5..c5235e42a8 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -1401,8 +1401,8 @@ static HRESULT WINAPI mfsession_GetFullTopology(IMFMediaSession *iface, DWORD fl { struct media_session *session = impl_from_IMFMediaSession(iface); struct queued_topology *queued; - HRESULT hr = S_OK; TOPOID topo_id; + HRESULT hr; TRACE("%p, %#x, %s, %p.\n", iface, flags, wine_dbgstr_longlong(id), topology); @@ -1410,27 +1410,30 @@ static HRESULT WINAPI mfsession_GetFullTopology(IMFMediaSession *iface, DWORD fl EnterCriticalSection(&session->cs); - if (flags & MFSESSION_GETFULLTOPOLOGY_CURRENT) + if (SUCCEEDED(hr = session_is_shut_down(session))) { - if (session->presentation.topo_status != MF_TOPOSTATUS_INVALID) - *topology = session->presentation.current_topology; + if (flags & MFSESSION_GETFULLTOPOLOGY_CURRENT) + { + if (session->presentation.topo_status != MF_TOPOSTATUS_INVALID) + *topology = session->presentation.current_topology; + else + hr = MF_E_INVALIDREQUEST; + } else - hr = MF_E_INVALIDREQUEST; - } - else - { - LIST_FOR_EACH_ENTRY(queued, &session->topologies, struct queued_topology, entry) { - if (SUCCEEDED(IMFTopology_GetTopologyID(queued->topology, &topo_id)) && topo_id == id) + LIST_FOR_EACH_ENTRY(queued, &session->topologies, struct queued_topology, entry) { - *topology = queued->topology; - break; + if (SUCCEEDED(IMFTopology_GetTopologyID(queued->topology, &topo_id)) && topo_id == id) + { + *topology = queued->topology; + break; + } } } - } - if (*topology) - IMFTopology_AddRef(*topology); + if (*topology) + IMFTopology_AddRef(*topology); + } LeaveCriticalSection(&session->cs); diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 5f3114da32..5a690880d1 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -1027,11 +1027,14 @@ static void test_media_session(void) IMFRateSupport *rate_support; IMFAttributes *attributes; IMFMediaSession *session; + IMFTopology *topology; + PROPVARIANT propvar; IMFGetService *gs; IMFClock *clock; IUnknown *unk; HRESULT hr; float rate; + DWORD caps; BOOL thin; hr = MFStartup(MF_VERSION, MFSTARTUP_FULL); @@ -1115,12 +1118,40 @@ todo_wine hr = IMFMediaSession_Shutdown(session); ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); + hr = IMFMediaSession_ClearTopologies(session); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaSession_Start(session, &GUID_NULL, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + propvar.vt = VT_EMPTY; + hr = IMFMediaSession_Start(session, &GUID_NULL, &propvar); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaSession_Pause(session); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaSession_Stop(session); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + hr = IMFMediaSession_Close(session); ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); hr = IMFMediaSession_GetClock(session, &clock); ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + hr = IMFMediaSession_GetSessionCapabilities(session, &caps); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaSession_GetSessionCapabilities(session, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaSession_GetFullTopology(session, MFSESSION_GETFULLTOPOLOGY_CURRENT, 0, &topology); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaSession_Shutdown(session); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + IMFMediaSession_Release(session); /* Custom topology loader, GUID is not registered. */ -- 2.25.1

1 3

[PATCH v2] msi: Add support for ListView dialog control.
by Dmitry Timoshkov 03 Mar '20

03 Mar '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/msi/dialog.c | 109 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 108 insertions(+), 1 deletion(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 8a28e4d4af..67a0633991 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -66,6 +66,7 @@ struct msi_control_tag LPWSTR value; HBITMAP hBitmap; HICON hIcon; + HIMAGELIST hImageList; LPWSTR tabnext; LPWSTR type; HMODULE hDll; @@ -159,6 +160,7 @@ static const WCHAR szVolumeSelectCombo[] = { 'V','o','l','u','m','e','S','e','l' static const WCHAR szSelectionDescription[] = {'S','e','l','e','c','t','i','o','n','D','e','s','c','r','i','p','t','i','o','n',0}; static const WCHAR szSelectionPath[] = {'S','e','l','e','c','t','i','o','n','P','a','t','h',0}; static const WCHAR szHyperLink[] = {'H','y','p','e','r','L','i','n','k',0}; +static const WCHAR szListView[] = {'L','i','s','t','V','i','e','w',0}; /* dialog sequencing */ @@ -401,6 +403,8 @@ static void msi_destroy_control( msi_control *t ) DeleteObject( t->hBitmap ); if( t->hIcon ) DestroyIcon( t->hIcon ); + if ( t->hImageList ) + ImageList_Destroy( t->hImageList ); msi_free( t->tabnext ); msi_free( t->type ); if (t->hDll) @@ -431,6 +435,7 @@ static msi_control *dialog_create_window( msi_dialog *dialog, MSIRECORD *rec, DW control->value = NULL; control->hBitmap = NULL; control->hIcon = NULL; + control->hImageList = NULL; control->hDll = NULL; control->tabnext = strdupW( MSI_RecordGetString( rec, 11) ); control->type = strdupW( MSI_RecordGetString( rec, 3 ) ); @@ -3522,6 +3527,107 @@ static UINT msi_dialog_hyperlink( msi_dialog *dialog, MSIRECORD *rec ) return ERROR_SUCCESS; } +/******************** ListView *****************************************/ + +struct listview_param +{ + msi_dialog *dialog; + msi_control *control; +}; + +static UINT msi_dialog_listview_handler( msi_dialog *dialog, msi_control *control, WPARAM param ) +{ + NMHDR *nmhdr = (NMHDR *)param; + + FIXME("code %#x (%d)\n", nmhdr->code, nmhdr->code); + + return ERROR_SUCCESS; +} + +static UINT msi_listview_add_item( MSIRECORD *rec, LPVOID param ) +{ + struct listview_param *lv_param = (struct listview_param *)param; + LPCWSTR text, binary; + LVITEMW item; + HICON hIcon; + + text = MSI_RecordGetString( rec, 4 ); + binary = MSI_RecordGetString( rec, 5 ); + hIcon = msi_load_icon( lv_param->dialog->package->db, binary, 0 ); + + TRACE("Adding: text %s, binary %s, icon %p\n", debugstr_w(text), debugstr_w(binary), hIcon); + + memset( &item, 0, sizeof(item) ); + item.mask = LVIF_TEXT | LVIF_IMAGE; + deformat_string( lv_param->dialog->package, text, &item.pszText ); + item.iImage = ImageList_AddIcon( lv_param->control->hImageList, hIcon ); + item.iItem = item.iImage; + SendMessageW( lv_param->control->hwnd, LVM_INSERTITEMW, 0, (LPARAM)&item ); + + DestroyIcon( hIcon ); + + return ERROR_SUCCESS; +} + +static UINT msi_listview_add_items( msi_dialog *dialog, msi_control *control ) +{ + static const WCHAR query[] = { + 'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', + '`','L','i','s','t','V','i','e','w','`',' ','W','H','E','R','E',' ', + '`','P','r','o','p','e','r','t','y','`',' ','=',' ','\'','%','s','\'',' ', + 'O','R','D','E','R',' ','B','Y',' ','`','O','r','d','e','r','`',0}; + MSIQUERY *view; + struct listview_param lv_param = { dialog, control }; + + if (MSI_OpenQuery( dialog->package->db, &view, query, control->property ) == ERROR_SUCCESS) + { + MSI_IterateRecords( view, NULL, msi_listview_add_item, &lv_param ); + msiobj_release( &view->hdr ); + } + + return ERROR_SUCCESS; +} + +static UINT msi_dialog_listview( msi_dialog *dialog, MSIRECORD *rec ) +{ + msi_control *control; + LPCWSTR prop; + DWORD style, attributes; + LVCOLUMNW col; + RECT rc; + + style = LVS_REPORT | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | LVS_SINGLESEL | + LVS_SHOWSELALWAYS | WS_VSCROLL | WS_HSCROLL | WS_BORDER | WS_TABSTOP | WS_CHILD; + attributes = MSI_RecordGetInteger( rec, 8 ); + if ( ~attributes & msidbControlAttributesSorted ) + style |= LVS_SORTASCENDING; + control = msi_dialog_add_control( dialog, rec, WC_LISTVIEWW, style ); + if (!control) + return ERROR_FUNCTION_FAILED; + + prop = MSI_RecordGetString( rec, 9 ); + control->property = msi_dialog_dup_property( dialog, prop, FALSE ); + + control->hImageList = ImageList_Create( 16, 16, ILC_COLOR32, 0, 1); + SendMessageW( control->hwnd, LVM_SETIMAGELIST, LVSIL_SMALL, (LPARAM)control->hImageList ); + + col.mask = LVCF_FMT | LVCF_WIDTH; + col.fmt = LVCFMT_LEFT; + col.cx = 16; + SendMessageW( control->hwnd, LVM_INSERTCOLUMNW, 0, (LPARAM)&col ); + + GetClientRect( control->hwnd, &rc ); + col.cx = rc.right - 16; + SendMessageW( control->hwnd, LVM_INSERTCOLUMNW, 0, (LPARAM)&col ); + + if (control->property) + msi_listview_add_items( dialog, control ); + + control->handler = msi_dialog_listview_handler; + + return ERROR_SUCCESS; +} + static const struct control_handler msi_dialog_handler[] = { { szText, msi_dialog_text_control }, @@ -3544,7 +3650,8 @@ static const struct control_handler msi_dialog_handler[] = { szDirectoryList, msi_dialog_directory_list }, { szVolumeCostList, msi_dialog_volumecost_list }, { szVolumeSelectCombo, msi_dialog_volumeselect_combo }, - { szHyperLink, msi_dialog_hyperlink } + { szHyperLink, msi_dialog_hyperlink }, + { szListView, msi_dialog_listview } }; static UINT msi_dialog_create_controls( MSIRECORD *rec, LPVOID param ) -- 2.20.1

2 1

[PATCH 1/4] http.sys: Support cancelling IRPs.
by Zebediah Figura 03 Mar '20

03 Mar '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/http.sys/http.c | 28 ++++++++++++++++++++++++++-- dlls/httpapi/tests/httpapi.c | 12 ++++++++++++ 2 files changed, 38 insertions(+), 2 deletions(-) diff --git a/dlls/http.sys/http.c b/dlls/http.sys/http.c index 4259ca618f..9587eaa9a8 100644 --- a/dlls/http.sys/http.c +++ b/dlls/http.sys/http.c @@ -1178,6 +1178,20 @@ static struct connection *get_connection(HTTP_REQUEST_ID req_id) return NULL; } +static void WINAPI http_receive_request_cancel(DEVICE_OBJECT *device, IRP *irp) +{ + TRACE("device %p, irp %p.\n", device, irp); + + IoReleaseCancelSpinLock(irp->CancelIrql); + + EnterCriticalSection(&http_cs); + RemoveEntryList(&irp->Tail.Overlay.ListEntry); + LeaveCriticalSection(&http_cs); + + irp->IoStatus.Status = STATUS_CANCELLED; + IoCompleteRequest(irp, IO_NO_INCREMENT); +} + static NTSTATUS http_receive_request(struct request_queue *queue, IRP *irp) { const struct http_receive_request_params *params = irp->AssociatedIrp.SystemBuffer; @@ -1199,8 +1213,18 @@ static NTSTATUS http_receive_request(struct request_queue *queue, IRP *irp) if (params->id == HTTP_NULL_ID) { TRACE("Queuing IRP %p.\n", irp); - InsertTailList(&queue->irp_queue, &irp->Tail.Overlay.ListEntry); - ret = STATUS_PENDING; + + IoSetCancelRoutine(irp, http_receive_request_cancel); + if (irp->Cancel && !IoSetCancelRoutine(irp, NULL)) + { + /* The IRP was canceled before we set the cancel routine. */ + ret = STATUS_CANCELLED; + } + else + { + InsertTailList(&queue->irp_queue, &irp->Tail.Overlay.ListEntry); + ret = STATUS_PENDING; + } } else ret = STATUS_CONNECTION_INVALID; diff --git a/dlls/httpapi/tests/httpapi.c b/dlls/httpapi/tests/httpapi.c index fced1b5e2f..5a9f3c3178 100644 --- a/dlls/httpapi/tests/httpapi.c +++ b/dlls/httpapi/tests/httpapi.c @@ -348,6 +348,18 @@ static void test_v1_server(void) ret = remove_url_v1(queue, port); ok(ret == ERROR_FILE_NOT_FOUND, "Got error %u.\n", ret); + ret = HttpReceiveHttpRequest(queue, HTTP_NULL_ID, 0, (HTTP_REQUEST *)req, sizeof(req_buffer), NULL, &ovl); + ok(ret == ERROR_IO_PENDING, "Got error %u.\n", ret); + + ret = CancelIo(queue); + ok(ret, "Failed to close queue handle, error %u.\n", GetLastError()); + + ret_size = 0xdeadbeef; + ret = GetOverlappedResult(queue, &ovl, &ret_size, FALSE); + ok(!ret, "Expected failure.\n"); + ok(GetLastError() == ERROR_OPERATION_ABORTED, "Got error %u.\n", GetLastError()); + ok(!ret_size, "Got size %u.\n", ret_size); + closesocket(s); CloseHandle(ovl.hEvent); ret = CloseHandle(queue); -- 2.25.1

1 3

Re: [PATCH] kernel32/tests: Fix test_Toolhelp()'s nested process lookup.
by Francois Gouget 03 Mar '20

03 Mar '20

On Mon, 2 Mar 2020, Marvin wrote: [...] > === w1064v1507 (32 bit report) === > > Report validation errors: > kernel32:process is missing some failure messages That's one of the occasional timeouts that was identified before, only in this case it raced with the child process so that the test failure message was garbled and unrecognizable. At some point I'll patch this test with timing information and longer timeouts to see just how long some of these waits are (all I know for now is that raising them to 2s is not enough). -- Francois Gouget <fgouget(a)codeweavers.com>

1 0

[PATCH] oledb32: Initialize data provider when switching tabs
by Alistair Leslie-Hughes 03 Mar '20

03 Mar '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/oledb32/dslocator.c | 115 ++++++++++++++++++++++++++++++++++++++- dlls/oledb32/resource.h | 1 + dlls/oledb32/version.rc | 1 + 3 files changed, 115 insertions(+), 2 deletions(-) diff --git a/dlls/oledb32/dslocator.c b/dlls/oledb32/dslocator.c index 006330b004..8a7f2d134c 100644 --- a/dlls/oledb32/dslocator.c +++ b/dlls/oledb32/dslocator.c @@ -41,6 +41,75 @@ WINE_DEFAULT_DEBUG_CHANNEL(oledb); +struct datasource +{ + CLSID clsid; + IDBProperties *provider; + DBPROPINFOSET *propinfoset; + WCHAR *description; +}; + +static struct datasource *create_datasource(WCHAR *guid) +{ + struct datasource *data = heap_alloc_zero(sizeof(struct datasource)); + if (data) + { + CLSIDFromString(guid, &data->clsid); + } + + return data; +} + +static void destroy_datasource(struct datasource *data) +{ + if (data->propinfoset) + { + ULONG i; + + for (i = 0; i < data->propinfoset->cPropertyInfos; i++) + VariantClear(&data->propinfoset->rgPropertyInfos[i].vValues); + + CoTaskMemFree(data->propinfoset->rgPropertyInfos); + CoTaskMemFree(data->propinfoset); + } + if (data->description) + CoTaskMemFree(data->description); + + if (data->provider) + IDBProperties_Release(data->provider); + + heap_free(data); +} + +static BOOL initialize_datasource(struct datasource *data) +{ + HRESULT hr; + DBPROPIDSET propidset; + ULONG infocount; + + hr = CoCreateInstance(&data->clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IDBProperties, (void**)&data->provider); + if (FAILED(hr)) + { + WARN("Datasource cannot be created (0x%08x)\n", hr); + return FALSE; + } + + propidset.rgPropertyIDs = NULL; + propidset.cPropertyIDs = 0; + propidset.guidPropertySet = DBPROPSET_DBINITALL; + + hr = IDBProperties_GetPropertyInfo(data->provider, 1, &propidset, &infocount, &data->propinfoset, &data->description); + if (FAILED(hr)) + { + WARN("Failed to get DB Properties (0x%08x)\n", hr); + + IDBProperties_Release(data->provider); + data->provider = NULL; + return FALSE; + } + + return TRUE; +} typedef struct DSLocatorImpl { @@ -240,12 +309,17 @@ static void add_connections_providers(HWND lv) if (res == ERROR_SUCCESS) { LVITEMW item; - item.mask = LVIF_TEXT; + struct datasource *data; + + data = create_datasource(guidkey); + + item.mask = LVIF_TEXT | LVIF_PARAM; item.iItem = SendMessageW(lv, LVM_GETITEMCOUNT, 0, 0); item.iSubItem = 0; item.pszText = description; + item.lParam = (LPARAM)data; + SendMessageW(lv, LVM_INSERTITEMW, 0, (LPARAM)&item); - /* TODO - Add ProgID to item data */ } RegCloseKey(subkey); } @@ -274,6 +348,22 @@ static LRESULT CALLBACK data_link_properties_dlg_proc(HWND hwnd, UINT msg, WPARA break; } + case WM_DESTROY: + { + HWND lv = GetDlgItem(hwnd, IDC_LST_CONNECTIONS); + LVITEMA item; + + item.iItem = 0; + item.iSubItem = 0; + item.mask = LVIF_PARAM; + + while(ListView_GetItemA(lv, &item)) + { + destroy_datasource( (struct datasource *)item.lParam); + item.iItem++; + } + break; + } case WM_NOTIFY: { NMHDR *hdr = ((LPNMHDR)lp); @@ -281,6 +371,7 @@ static LRESULT CALLBACK data_link_properties_dlg_proc(HWND hwnd, UINT msg, WPARA { case PSN_KILLACTIVE: { + LVITEMA item; /* * FIXME: This needs to replace the connection page based off the selection. * We only care about the ODBC for now which is the default. @@ -298,6 +389,26 @@ static LRESULT CALLBACK data_link_properties_dlg_proc(HWND hwnd, UINT msg, WPARA return TRUE; } + item.iItem = 0; + item.iSubItem = 0; + item.stateMask = LVIS_SELECTED; + item.mask = LVIF_PARAM | LVIF_STATE; + + if(ListView_GetItemA(lv, &item)) + { + if(!initialize_datasource( (struct datasource*)item.lParam)) + { + WCHAR title[256], msg[256]; + LoadStringW(instance, IDS_PROVIDER_TITLE, title, ARRAY_SIZE(title)); + LoadStringW(instance, IDS_PROVIDER_NOT_AVAIL, msg, ARRAY_SIZE(msg)); + MessageBoxW(hwnd, msg, title, MB_OK | MB_ICONEXCLAMATION); + SetWindowLongPtrW(hwnd, DWLP_MSGRESULT, TRUE); + return TRUE; + } + } + else + ERR("Failed to get selected item\n"); + return FALSE; } } diff --git a/dlls/oledb32/resource.h b/dlls/oledb32/resource.h index dfedb34a54..42f984c013 100644 --- a/dlls/oledb32/resource.h +++ b/dlls/oledb32/resource.h @@ -21,6 +21,7 @@ #define IDC_LST_CONNECTIONS 1002 #define IDS_PROVIDER_TITLE 1003 #define IDS_PROVIDER_ERROR 1004 +#define IDS_PROVIDER_NOT_AVAIL 1005 #define IDS_PROPSHEET_TITLE 2000 #define IDS_COL_PROVIDER 2001 diff --git a/dlls/oledb32/version.rc b/dlls/oledb32/version.rc index 247709dec2..86b5a317b2 100644 --- a/dlls/oledb32/version.rc +++ b/dlls/oledb32/version.rc @@ -48,6 +48,7 @@ STRINGTABLE IDS_PROVIDER_TITLE "Data Link Error" IDS_PROVIDER_ERROR "Please select a provider." + IDS_PROVIDER_NOT_AVAIL "Provider is no longer available. Ensure that the provider is installed properly." } IDD_PROVIDER DIALOG 0, 0, 227, 225 -- 2.17.1

1 0

[PATCH 2/2] kernelbase: Implement SetConsoleScreenBufferInfoEx().
by Aaro Altonen 02 Mar '20

02 Mar '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47288 Signed-off-by: Aaro Altonen <a.altonen(a)hotmail.com> --- dlls/kernel32/tests/console.c | 10 +++++----- dlls/kernelbase/console.c | 37 ++++++++++++++++++++++++++++++++--- 2 files changed, 39 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index e6c2c8e364..7da82ae47d 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -3161,24 +3161,24 @@ static void test_SetConsoleScreenBufferInfoEx(HANDLE std_output) SetLastError(0xdeadbeef); ret = pSetConsoleScreenBufferInfoEx(NULL, &info); ok(!ret, "got %d, expected zero\n", ret); - todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 87\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 87\n", GetLastError()); SetLastError(0xdeadbeef); ret = pSetConsoleScreenBufferInfoEx(std_output, &info); - todo_wine ok(ret, "got %d, expected one\n", ret); - todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + ok(ret, "got %d, expected one\n", ret); + ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); SetLastError(0xdeadbeef); ret = pSetConsoleScreenBufferInfoEx(std_input, &info); ok(!ret, "got %d, expected zero\n", ret); - todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE || GetLastError() == ERROR_ACCESS_DENIED, + ok(GetLastError() == ERROR_INVALID_HANDLE || GetLastError() == ERROR_ACCESS_DENIED, "got %u, expected 5 or 6\n", GetLastError()); info.cbSize = 0; SetLastError(0xdeadbeef); ret = pSetConsoleScreenBufferInfoEx(std_output, &info); ok(!ret, "got %d, expected zero\n", ret); - todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); CloseHandle(std_input); } diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index 91e8129fbe..9d38398d25 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -1146,9 +1146,40 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetConsoleOutputCP( UINT cp ) BOOL WINAPI DECLSPEC_HOTPATCH SetConsoleScreenBufferInfoEx( HANDLE handle, CONSOLE_SCREEN_BUFFER_INFOEX *info ) { - FIXME( "(%p %p): stub!\n", handle, info ); - SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); - return FALSE; + BOOL ret; + + if (info->cbSize != sizeof(CONSOLE_SCREEN_BUFFER_INFOEX)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + if (!handle) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + + SERVER_START_REQ(set_console_output_info) + { + req->handle = console_handle_unmap(handle); + req->width = info->dwSize.X; + req->height = info->dwSize.Y; + req->cursor_x = info->dwCursorPosition.X; + req->cursor_y = info->dwCursorPosition.Y; + req->attr = info->wAttributes; + req->win_left = info->srWindow.Left; + req->win_top = info->srWindow.Top; + req->win_right = info->srWindow.Right; + req->win_bottom = info->srWindow.Bottom; + req->popup_attr = info->wPopupAttributes; + req->max_width = min(info->dwMaximumWindowSize.X, info->dwSize.X); + req->max_height = min(info->dwMaximumWindowSize.Y, info->dwSize.Y); + ret = !wine_server_call_err(req); + } + SERVER_END_REQ; + + return ret; } -- 2.25.1

2 1

Re: [PATCH 1/5] wined3d: Introduce wined3d_enum_adapters().
by Henri Verbeet 02 Mar '20

02 Mar '20

On Mon, 2 Mar 2020 at 19:02, Zhiyi Zhang <zzhang(a)codeweavers.com> wrote: > On 2020/3/2 23:19, Henri Verbeet wrote: > > On Mon, 2 Mar 2020 at 11:54, Zhiyi Zhang <zzhang(a)codeweavers.com> wrote: > >> @@ -2257,6 +2258,8 @@ HRESULT __cdecl wined3d_check_device_type(const struct wined3d *wined3d, UINT ad > >> enum wined3d_format_id backbuffer_format_id, BOOL windowed); > >> struct wined3d * __cdecl wined3d_create(DWORD flags); > >> ULONG __cdecl wined3d_decref(struct wined3d *wined3d); > >> +HRESULT __cdecl wined3d_enum_adapters(const struct wined3d *wined3d, UINT adapter_idx, > >> + struct wined3d_adapter **adapter); > > "struct wined3d_adapter * __cdecl wined3d_get_adapter(const struct > > wined3d *wined3d, unsigned int idx);", right? > Thanks, I will change that. > > I am a bit confused about the coding style here. Is the preference for wined3d > function exports not to use HRESULT when possible/when there isn't a corresponding > API call? > When possible, yes. More broadly, the idea is to avoid Win32 specific types and conventions unless necessary, so that wined3d is for the most part just a regular library.

1 0

[PATCH 2/2] d3d9: Avoid a dead assignment in d3d9_device_SetStreamSource() (Coverity).
by Henri Verbeet 02 Mar '20

02 Mar '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d9/device.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 8d85a43523c..a651a63f02e 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3688,17 +3688,18 @@ static HRESULT WINAPI d3d9_device_SetStreamSource(IDirect3DDevice9Ex *iface, const struct wined3d_stream_state *stream; state = wined3d_stateblock_get_state(device->state); stream = &state->streams[stream_idx]; - wined3d_buffer = stream->buffer; offset = stream->offset; stride = stream->stride; - } - - if (!buffer_impl) wined3d_buffer = NULL; + } else if (buffer_impl->draw_buffer) + { wined3d_buffer = buffer_impl->draw_buffer; + } else + { wined3d_buffer = buffer_impl->wined3d_buffer; + } hr = wined3d_stateblock_set_stream_source(device->update_state, stream_idx, wined3d_buffer, offset, stride); if (SUCCEEDED(hr) && !device->recording) -- 2.20.1

1 0

[PATCH v3 4/5] d3dx9: Handle clipping in ID3DXFont_DrawText.
by Sven Baars 02 Mar '20

02 Mar '20

Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> --- dlls/d3dx9_36/font.c | 5 +++++ dlls/d3dx9_36/tests/core.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/font.c b/dlls/d3dx9_36/font.c index 23e6e5c401..6721bc0765 100644 --- a/dlls/d3dx9_36/font.c +++ b/dlls/d3dx9_36/font.c @@ -565,6 +565,9 @@ static INT WINAPI ID3DXFontImpl_DrawTextW(ID3DXFont *iface, ID3DXSprite *sprite, if (!count) return 0; + if (format & DT_CALCRECT) + format |= DT_NOCLIP; + if (!rect) { y = ID3DXFont_DrawTextW(iface, NULL, string, count, &textrect, format | DT_CALCRECT, 0); @@ -639,6 +642,8 @@ static INT WINAPI ID3DXFontImpl_DrawTextW(ID3DXFont *iface, ID3DXSprite *sprite, heap_free(results.lpGlyphs); } y += lh; + if (!(DT_NOCLIP & format) && (y > textrect.bottom)) + break; } ret = y - textrect.top; diff --git a/dlls/d3dx9_36/tests/core.c b/dlls/d3dx9_36/tests/core.c index c6f5beff43..c79f5c1f72 100644 --- a/dlls/d3dx9_36/tests/core.c +++ b/dlls/d3dx9_36/tests/core.c @@ -780,7 +780,7 @@ static void test_ID3DXFont(IDirect3DDevice9 *device) todo_wine ok(height == 36, "Got unexpected height %d.\n", height); height = ID3DXFont_DrawTextW(font, NULL, L"1\n2\n3\n4\n5\n6", -1, &rect, 0, 0xff00ff); - todo_wine ok(height == 48, "Got unexpected height %d.\n", height); + ok(height == 48, "Got unexpected height %d.\n", height); height = ID3DXFont_DrawTextW(font, NULL, L"1\n2\n3\n4\n5\n6", -1, &rect, DT_NOCLIP, 0xff00ff); ok(height == 72, "Got unexpected height %d.\n", height); -- 2.24.0

1 0

[PATCH 4/4] winegcc: Add support for using clang directly.
by Jacek Caban 02 Mar '20

02 Mar '20

Inspired by llvm-mingw wrappers. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- tools/winegcc/winegcc.c | 35 +++++++++++++++++++++++++++++------ 1 file changed, 29 insertions(+), 6 deletions(-)

1 0

[PATCH 3/4] winegcc: Pass tool by id to build_tool_name.
by Jacek Caban 02 Mar '20

02 Mar '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- tools/winegcc/winegcc.c | 42 +++++++++++++++++++++++++++++++---------- 1 file changed, 32 insertions(+), 10 deletions(-)

1 0

[PATCH 1/4] winegcc: Lookup PATH in find_binary and don't try to run binaries that can't be found.
by Jacek Caban 02 Mar '20

02 Mar '20

Based on winebuild. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- tools/winegcc/utils.c | 44 +++++++++++++++++++++++++++++++++++------ tools/winegcc/winegcc.c | 7 ++++++- 2 files changed, 44 insertions(+), 7 deletions(-)

1 0

[PATCH v3] dsound: Make GlobalHandle() for the sound buffer failed.
by Akihiro Sagawa 02 Mar '20

02 Mar '20

In v3, use VirtualAlloc/VirtualFree and revert dsound test for 32-bit. Andrew and Zebediah, thanks for reviewing and useful comments. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48635 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/dsound/buffer.c | 4 ++-- dlls/dsound/tests/dsound.c | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-)

2 1

[PATCH] user32: Trace iModeNum with %#x in EnumDisplaySettingsExW().
by Zhiyi Zhang 02 Mar '20

02 Mar '20

ENUM_CURRENT_SETTINGS is (DWORD)-1 and ENUM_REGISTRY_SETTINGS is (DWORD)-2. Using %u to print them ends up a very large decimal integer, which is not easily recognizable. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/sysparams.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index ab386a074e8..fd795470792 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -3423,7 +3423,7 @@ BOOL WINAPI EnumDisplaySettingsExW(LPCWSTR lpszDeviceName, DWORD iModeNum, { WCHAR primary_adapter[CCHDEVICENAME]; - TRACE("%s %u %p %#x\n", wine_dbgstr_w(lpszDeviceName), iModeNum, lpDevMode, dwFlags); + TRACE("%s %#x %p %#x\n", wine_dbgstr_w(lpszDeviceName), iModeNum, lpDevMode, dwFlags); if (!lpszDeviceName) { -- 2.20.1

1 0

[PATCH 2/2] ntdll: RtlGetNtProductType() should not validate 'type' parameter.
by Serge Gautherie 02 Mar '20

02 Mar '20

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- dlls/ntdll/version.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/version.c b/dlls/ntdll/version.c index 61e48f6..e03bc69 100644 --- a/dlls/ntdll/version.c +++ b/dlls/ntdll/version.c @@ -637,7 +637,7 @@ void WINAPI RtlGetNtVersionNumbers( LPDWORD major, LPDWORD minor, LPDWORD build */ BOOLEAN WINAPI RtlGetNtProductType( LPDWORD type ) { - if (type) *type = current_version->wProductType; + *type = current_version->wProductType; return TRUE; } -- 2.10.0.windows.1

2 2

[PATCH 1/2] ntdll/tests: Create a test for RtlGetNtProductType().
by Serge Gautherie 02 Mar '20

02 Mar '20

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- dlls/ntdll/tests/rtl.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c index 445f353..e39e1df 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -27,6 +27,12 @@ #include "in6addr.h" #include "inaddr.h" +/* See test_RtlGetNtProductType(), where it does not actually help */ +/* #define TEST_WITH_SEH */ +#ifdef TEST_WITH_SEH +#include "wine/exception.h" +#endif + #ifndef __WINE_WINTERNL_H typedef struct _RTL_HANDLE @@ -112,6 +118,7 @@ static NTSTATUS (WINAPI *pRtlMakeSelfRelativeSD)(PSECURITY_DESCRIPTOR,PSECURITY static NTSTATUS (WINAPI *pRtlAbsoluteToSelfRelativeSD)(PSECURITY_DESCRIPTOR,PSECURITY_DESCRIPTOR,PULONG); static NTSTATUS (WINAPI *pLdrRegisterDllNotification)(ULONG, PLDR_DLL_NOTIFICATION_FUNCTION, void *, void **); static NTSTATUS (WINAPI *pLdrUnregisterDllNotification)(void *); +static BOOLEAN (WINAPI *pRtlGetNtProductType)(LPDWORD); static HMODULE hkernel32 = 0; static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); @@ -183,6 +190,7 @@ static void InitFunctionPtrs(void) pRtlAbsoluteToSelfRelativeSD = (void *)GetProcAddress(hntdll, "RtlAbsoluteToSelfRelativeSD"); pLdrRegisterDllNotification = (void *)GetProcAddress(hntdll, "LdrRegisterDllNotification"); pLdrUnregisterDllNotification = (void *)GetProcAddress(hntdll, "LdrUnregisterDllNotification"); + pRtlGetNtProductType = (void *)GetProcAddress(hntdll, "RtlGetNtProductType"); } hkernel32 = LoadLibraryA("kernel32.dll"); ok(hkernel32 != 0, "LoadLibrary failed\n"); @@ -3673,6 +3681,46 @@ static void test_LdrRegisterDllNotification(void) pLdrUnregisterDllNotification(cookie); } +static void test_RtlGetNtProductType(void) +{ + DWORD type; + + if (!pRtlGetNtProductType) + { + win_skip("RtlGetNtProductType is not available\n"); + return; + } + + /* NULL is not a special value for this function */ +#ifdef TEST_WITH_SEH + /* With SEH, address is different, but it still crashes on Windows: + * 'rtl: unhandled exception c0000005 at 00000001' + */ + __TRY + { + BOOLEAN ret; + + ret = pRtlGetNtProductType(NULL); + + if (ret) + ok(FALSE, "RtlGetNtProductType(NULL) succeeded\n"); + else + ok(FALSE, "RtlGetNtProductType(NULL) did not crash\n"); + } + __EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* As expected */ + ok(TRUE, "\n"); + } + __ENDTRY +#endif + + type = 0xdeadbeef; + ok(pRtlGetNtProductType(&type), "RtlGetNtProductType failed\n"); + ok(type >= VER_NT_WORKSTATION && type <= VER_NT_SERVER, "unknown type %u\n", type); + trace("NtProductType: %u\n", type); +} + START_TEST(rtl) { InitFunctionPtrs(); @@ -3713,4 +3761,5 @@ START_TEST(rtl) test_LdrEnumerateLoadedModules(); test_RtlMakeSelfRelativeSD(); test_LdrRegisterDllNotification(); + test_RtlGetNtProductType(); } -- 2.10.0.windows.1

4 7

[PATCH 1/2] kernel32/tests: Add tests for SetConsoleScreenBufferInfoEx().
by Aaro Altonen 02 Mar '20

02 Mar '20

Signed-off-by: Aaro Altonen <a.altonen(a)hotmail.com> --- dlls/kernel32/tests/console.c | 42 +++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 5f8003760d..e6c2c8e364 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -3142,6 +3142,47 @@ static void test_GetConsoleScreenBufferInfoEx(HANDLE std_output) ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); } +static void test_SetConsoleScreenBufferInfoEx(HANDLE std_output) +{ + BOOL ret; + HANDLE hmod; + HANDLE std_input = CreateFileA("CONIN$", GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0); + BOOL (WINAPI *pSetConsoleScreenBufferInfoEx)(HANDLE, CONSOLE_SCREEN_BUFFER_INFOEX *); + CONSOLE_SCREEN_BUFFER_INFOEX info; + info.cbSize = sizeof(CONSOLE_SCREEN_BUFFER_INFOEX); + + hmod = GetModuleHandleA("kernel32.dll"); + pSetConsoleScreenBufferInfoEx = (void *)GetProcAddress(hmod, "SetConsoleScreenBufferInfoEx"); + if (!pSetConsoleScreenBufferInfoEx) { + win_skip("SetConsoleScreenBufferInfoEx is not available\n"); + return; + } + + SetLastError(0xdeadbeef); + ret = pSetConsoleScreenBufferInfoEx(NULL, &info); + ok(!ret, "got %d, expected zero\n", ret); + todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 87\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = pSetConsoleScreenBufferInfoEx(std_output, &info); + todo_wine ok(ret, "got %d, expected one\n", ret); + todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = pSetConsoleScreenBufferInfoEx(std_input, &info); + ok(!ret, "got %d, expected zero\n", ret); + todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE || GetLastError() == ERROR_ACCESS_DENIED, + "got %u, expected 5 or 6\n", GetLastError()); + + info.cbSize = 0; + SetLastError(0xdeadbeef); + ret = pSetConsoleScreenBufferInfoEx(std_output, &info); + ok(!ret, "got %d, expected zero\n", ret); + todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); + + CloseHandle(std_input); +} + static void test_AttachConsole_child(DWORD console_pid) { HANDLE pipe_in, pipe_out; @@ -3398,5 +3439,6 @@ START_TEST(console) test_GetConsoleFontInfo(hConOut); test_SetConsoleFont(hConOut); test_GetConsoleScreenBufferInfoEx(hConOut); + test_SetConsoleScreenBufferInfoEx(hConOut); test_AttachConsole(hConOut); } -- 2.25.1

1 0

[PATCH] msi: Add support for ListView dialog control.
by Dmitry Timoshkov 02 Mar '20

02 Mar '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/msi/dialog.c | 109 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 108 insertions(+), 1 deletion(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 8a28e4d4af..6345ceacd5 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -66,6 +66,7 @@ struct msi_control_tag LPWSTR value; HBITMAP hBitmap; HICON hIcon; + HIMAGELIST hImageList; LPWSTR tabnext; LPWSTR type; HMODULE hDll; @@ -159,6 +160,7 @@ static const WCHAR szVolumeSelectCombo[] = { 'V','o','l','u','m','e','S','e','l' static const WCHAR szSelectionDescription[] = {'S','e','l','e','c','t','i','o','n','D','e','s','c','r','i','p','t','i','o','n',0}; static const WCHAR szSelectionPath[] = {'S','e','l','e','c','t','i','o','n','P','a','t','h',0}; static const WCHAR szHyperLink[] = {'H','y','p','e','r','L','i','n','k',0}; +static const WCHAR szListView[] = {'L','i','s','t','V','i','e','w',0}; /* dialog sequencing */ @@ -401,6 +403,8 @@ static void msi_destroy_control( msi_control *t ) DeleteObject( t->hBitmap ); if( t->hIcon ) DestroyIcon( t->hIcon ); + if ( t->hImageList ) + ImageList_Destroy( t->hImageList ); msi_free( t->tabnext ); msi_free( t->type ); if (t->hDll) @@ -431,6 +435,7 @@ static msi_control *dialog_create_window( msi_dialog *dialog, MSIRECORD *rec, DW control->value = NULL; control->hBitmap = NULL; control->hIcon = NULL; + control->hImageList = NULL; control->hDll = NULL; control->tabnext = strdupW( MSI_RecordGetString( rec, 11) ); control->type = strdupW( MSI_RecordGetString( rec, 3 ) ); @@ -3522,6 +3527,107 @@ static UINT msi_dialog_hyperlink( msi_dialog *dialog, MSIRECORD *rec ) return ERROR_SUCCESS; } +/******************** ListView *****************************************/ + +struct listview_param +{ + msi_dialog *dialog; + msi_control *control; +}; + +static UINT msi_dialog_listview_handler( msi_dialog *dialog, msi_control *control, WPARAM param ) +{ + NMHDR *nmhdr = (NMHDR *)param; + + TRACE("nmhdr->code = %#x (%d)\n", nmhdr->code, nmhdr->code); + + return ERROR_SUCCESS; +} + +static UINT msi_listview_add_item( MSIRECORD *rec, LPVOID param ) +{ + struct listview_param *lv_param = (struct listview_param *)param; + LPCWSTR text, binary; + LVITEMW item; + HICON hIcon; + + text = MSI_RecordGetString( rec, 4 ); + binary = MSI_RecordGetString( rec, 5 ); + hIcon = msi_load_icon( lv_param->dialog->package->db, binary, 0 ); + + TRACE("Adding: text %s, binary %s, icon %p\n", debugstr_w(text), debugstr_w(binary), hIcon); + + memset( &item, 0, sizeof(item) ); + item.mask = LVIF_TEXT | LVIF_IMAGE; + deformat_string( lv_param->dialog->package, text, &item.pszText ); + item.iImage = ImageList_AddIcon( lv_param->control->hImageList, hIcon ); + item.iItem = item.iImage; + SendMessageW( lv_param->control->hwnd, LVM_INSERTITEMW, 0, (LPARAM)&item ); + + DestroyIcon( hIcon ); + + return ERROR_SUCCESS; +} + +static UINT msi_listview_add_items( msi_dialog *dialog, msi_control *control ) +{ + static const WCHAR query[] = { + 'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', + '`','L','i','s','t','V','i','e','w','`',' ','W','H','E','R','E',' ', + '`','P','r','o','p','e','r','t','y','`',' ','=',' ','\'','%','s','\'',' ', + 'O','R','D','E','R',' ','B','Y',' ','`','O','r','d','e','r','`',0}; + MSIQUERY *view; + struct listview_param lv_param = { dialog, control }; + + if (MSI_OpenQuery( dialog->package->db, &view, query, control->property ) == ERROR_SUCCESS) + { + MSI_IterateRecords( view, NULL, msi_listview_add_item, &lv_param ); + msiobj_release( &view->hdr ); + } + + return ERROR_SUCCESS; +} + +static UINT msi_dialog_listview( msi_dialog *dialog, MSIRECORD *rec ) +{ + msi_control *control; + LPCWSTR prop; + DWORD style, attributes; + LVCOLUMNW col; + RECT rc; + + style = LVS_REPORT | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | LVS_SINGLESEL | + LVS_SHOWSELALWAYS | WS_VSCROLL | WS_HSCROLL | WS_BORDER | WS_TABSTOP | WS_CHILD; + attributes = MSI_RecordGetInteger( rec, 8 ); + if ( ~attributes & msidbControlAttributesSorted ) + style |= LVS_SORTASCENDING; + control = msi_dialog_add_control( dialog, rec, WC_LISTVIEWW, style ); + if (!control) + return ERROR_FUNCTION_FAILED; + + prop = MSI_RecordGetString( rec, 9 ); + control->property = msi_dialog_dup_property( dialog, prop, FALSE ); + + control->hImageList = ImageList_Create( 16, 16, ILC_COLOR32, 0, 1); + SendMessageW( control->hwnd, LVM_SETIMAGELIST, LVSIL_SMALL, (LPARAM)control->hImageList ); + + col.mask = LVCF_FMT | LVCF_WIDTH; + col.fmt = LVCFMT_LEFT; + col.cx = 16; + SendMessageW( control->hwnd, LVM_INSERTCOLUMNW, 0, (LPARAM)&col ); + + GetClientRect( control->hwnd, &rc ); + col.cx = rc.right - 16; + SendMessageW( control->hwnd, LVM_INSERTCOLUMNW, 0, (LPARAM)&col ); + + if (control->property) + msi_listview_add_items( dialog, control ); + + control->handler = msi_dialog_listview_handler; + + return ERROR_SUCCESS; +} + static const struct control_handler msi_dialog_handler[] = { { szText, msi_dialog_text_control }, @@ -3544,7 +3650,8 @@ static const struct control_handler msi_dialog_handler[] = { szDirectoryList, msi_dialog_directory_list }, { szVolumeCostList, msi_dialog_volumecost_list }, { szVolumeSelectCombo, msi_dialog_volumeselect_combo }, - { szHyperLink, msi_dialog_hyperlink } + { szHyperLink, msi_dialog_hyperlink }, + { szListView, msi_dialog_listview } }; static UINT msi_dialog_create_controls( MSIRECORD *rec, LPVOID param ) -- 2.20.1

2 1

[PATCH 1/3] mf: Implement GetFullTopology().
by Nikolay Sivov 02 Mar '20

02 Mar '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/session.c | 37 +++++++++++++++++++++++++++++++++++-- 1 file changed, 35 insertions(+), 2 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 76310040ee..8edab28935 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -1395,9 +1395,42 @@ static HRESULT WINAPI mfsession_GetSessionCapabilities(IMFMediaSession *iface, D static HRESULT WINAPI mfsession_GetFullTopology(IMFMediaSession *iface, DWORD flags, TOPOID id, IMFTopology **topology) { - FIXME("%p, %#x, %s, %p.\n", iface, flags, wine_dbgstr_longlong(id), topology); + struct media_session *session = impl_from_IMFMediaSession(iface); + struct queued_topology *queued; + HRESULT hr = S_OK; + TOPOID topo_id; - return E_NOTIMPL; + TRACE("%p, %#x, %s, %p.\n", iface, flags, wine_dbgstr_longlong(id), topology); + + *topology = NULL; + + EnterCriticalSection(&session->cs); + + if (flags & MFSESSION_GETFULLTOPOLOGY_CURRENT) + { + if (session->presentation.topo_status != MF_TOPOSTATUS_INVALID) + *topology = session->presentation.current_topology; + else + hr = MF_E_INVALIDREQUEST; + } + else + { + LIST_FOR_EACH_ENTRY(queued, &session->topologies, struct queued_topology, entry) + { + if (SUCCEEDED(IMFTopology_GetTopologyID(queued->topology, &topo_id)) && topo_id == id) + { + *topology = queued->topology; + break; + } + } + } + + if (*topology) + IMFTopology_AddRef(*topology); + + LeaveCriticalSection(&session->cs); + + return hr; } static const IMFMediaSessionVtbl mfmediasessionvtbl = -- 2.25.1

2 3

[PATCH] rtworkq: Change RtwqPutWorkItem() trace format for consistency.
by Nikolay Sivov 02 Mar '20

02 Mar '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/rtworkq/queue.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/rtworkq/queue.c b/dlls/rtworkq/queue.c index 70af6a7658..85e84d46d6 100644 --- a/dlls/rtworkq/queue.c +++ b/dlls/rtworkq/queue.c @@ -1380,7 +1380,7 @@ HRESULT WINAPI RtwqInvokeCallback(IRtwqAsyncResult *result) HRESULT WINAPI RtwqPutWorkItem(DWORD queue, LONG priority, IRtwqAsyncResult *result) { - TRACE("%d, %d, %p.\n", queue, priority, result); + TRACE("%#x, %d, %p.\n", queue, priority, result); return queue_put_work_item(queue, priority, result); } -- 2.25.1

1 0

[PATCH] mfplat: Use underlying work queue calls more to get rid of duplicated traces.
by Nikolay Sivov 02 Mar '20

02 Mar '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/queue.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/mfplat/queue.c b/dlls/mfplat/queue.c index c0279f1744..d39d6af3a5 100644 --- a/dlls/mfplat/queue.c +++ b/dlls/mfplat/queue.c @@ -44,17 +44,17 @@ HRESULT WINAPI MFAllocateWorkQueue(DWORD *queue) */ HRESULT WINAPI MFPutWorkItem(DWORD queue, IMFAsyncCallback *callback, IUnknown *state) { - IMFAsyncResult *result; + IRtwqAsyncResult *result; HRESULT hr; TRACE("%#x, %p, %p.\n", queue, callback, state); - if (FAILED(hr = MFCreateAsyncResult(NULL, callback, state, &result))) + if (FAILED(hr = RtwqCreateAsyncResult(NULL, (IRtwqAsyncCallback *)callback, state, &result))) return hr; - hr = MFPutWorkItemEx2(queue, 0, result); + hr = RtwqPutWorkItem(queue, 0, result); - IMFAsyncResult_Release(result); + IRtwqAsyncResult_Release(result); return hr; } @@ -64,17 +64,17 @@ HRESULT WINAPI MFPutWorkItem(DWORD queue, IMFAsyncCallback *callback, IUnknown * */ HRESULT WINAPI MFPutWorkItem2(DWORD queue, LONG priority, IMFAsyncCallback *callback, IUnknown *state) { - IMFAsyncResult *result; + IRtwqAsyncResult *result; HRESULT hr; TRACE("%#x, %d, %p, %p.\n", queue, priority, callback, state); - if (FAILED(hr = MFCreateAsyncResult(NULL, callback, state, &result))) + if (FAILED(hr = RtwqCreateAsyncResult(NULL, (IRtwqAsyncCallback *)callback, state, &result))) return hr; - hr = MFPutWorkItemEx2(queue, priority, result); + hr = RtwqPutWorkItem(queue, priority, result); - IMFAsyncResult_Release(result); + IRtwqAsyncResult_Release(result); return hr; } @@ -86,7 +86,7 @@ HRESULT WINAPI MFPutWorkItemEx(DWORD queue, IMFAsyncResult *result) { TRACE("%#x, %p\n", queue, result); - return MFPutWorkItemEx2(queue, 0, result); + return RtwqPutWorkItem(queue, 0, (IRtwqAsyncResult *)result); } /*********************************************************************** @@ -104,17 +104,17 @@ HRESULT WINAPI MFPutWorkItemEx2(DWORD queue, LONG priority, IMFAsyncResult *resu */ HRESULT WINAPI MFScheduleWorkItem(IMFAsyncCallback *callback, IUnknown *state, INT64 timeout, MFWORKITEM_KEY *key) { - IMFAsyncResult *result; + IRtwqAsyncResult *result; HRESULT hr; TRACE("%p, %p, %s, %p.\n", callback, state, wine_dbgstr_longlong(timeout), key); - if (FAILED(hr = MFCreateAsyncResult(NULL, callback, state, &result))) + if (FAILED(hr = RtwqCreateAsyncResult(NULL, (IRtwqAsyncCallback *)callback, state, &result))) return hr; - hr = MFScheduleWorkItemEx(result, timeout, key); + hr = RtwqScheduleWorkItem(result, timeout, key); - IMFAsyncResult_Release(result); + IRtwqAsyncResult_Release(result); return hr; } -- 2.25.1

1 0

[PATCH] include: Add IMFFinalizableMediaSink definition.
by Nikolay Sivov 02 Mar '20

02 Mar '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- include/mfidl.idl | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/include/mfidl.idl b/include/mfidl.idl index b1568b9b56..7d3dae0cbb 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -715,6 +715,20 @@ interface IMFMediaSink : IUnknown HRESULT Shutdown(); } +[ + object, + uuid(eaecb74a-9a50-42ce-9541-6a7f57aa4ad7), + local +] +interface IMFFinalizableMediaSink : IMFMediaSink +{ + HRESULT BeginFinalize( + [in] IMFAsyncCallback *callback, + [in] IUnknown *state); + + HRESULT EndFinalize([in] IMFAsyncResult *result); +} + [ object, uuid(0a97b3cf-8e7c-4a3d-8f8c-0c843dc247fb), -- 2.25.1

1 0

[PATCH v2 1/2] d2d1: Implement ellipse and rounded rectangle filling with arcs.
by Giovanni Mascellani 02 Mar '20

02 Mar '20

Signed-off-by: Giovanni Mascellani <gio(a)debian.org> --- dlls/d2d1/brush.c | 3 +- dlls/d2d1/d2d1_private.h | 14 +++-- dlls/d2d1/device.c | 109 +++++++++++++++++++++++++++------------ dlls/d2d1/geometry.c | 30 +++++------ dlls/d2d1/tests/d2d1.c | 14 ++--- 5 files changed, 109 insertions(+), 61 deletions(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index 80fc0f5331..cc557ea9ef 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -1262,7 +1262,7 @@ static BOOL d2d_brush_fill_cb(const struct d2d_brush *brush, } HRESULT d2d_brush_get_ps_cb(struct d2d_brush *brush, struct d2d_brush *opacity_brush, - BOOL outline, struct d2d_device_context *render_target, ID3D10Buffer **ps_cb) + BOOL outline, BOOL is_arc, struct d2d_device_context *render_target, ID3D10Buffer **ps_cb) { D3D10_SUBRESOURCE_DATA buffer_data; struct d2d_ps_cb cb_data = {0}; @@ -1270,6 +1270,7 @@ HRESULT d2d_brush_get_ps_cb(struct d2d_brush *brush, struct d2d_brush *opacity_b HRESULT hr; cb_data.outline = outline; + cb_data.is_arc = is_arc; if (!d2d_brush_fill_cb(brush, render_target, &cb_data.colour_brush)) return E_NOTIMPL; if (!d2d_brush_fill_cb(opacity_brush, render_target, &cb_data.opacity_brush)) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 62c9d222fa..934a22468c 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -47,6 +47,7 @@ enum d2d_shape_type D2D_SHAPE_TYPE_BEZIER_OUTLINE, D2D_SHAPE_TYPE_TRIANGLE, D2D_SHAPE_TYPE_BEZIER, + D2D_SHAPE_TYPE_ARC, D2D_SHAPE_TYPE_COUNT, }; @@ -113,7 +114,8 @@ struct d2d_brush_cb struct d2d_ps_cb { BOOL outline; - BOOL pad[3]; + BOOL is_arc; + BOOL pad[2]; struct d2d_brush_cb colour_brush; struct d2d_brush_cb opacity_brush; }; @@ -301,7 +303,7 @@ HRESULT d2d_bitmap_brush_create(ID2D1Factory *factory, ID2D1Bitmap *bitmap, const D2D1_BITMAP_BRUSH_PROPERTIES1 *bitmap_brush_desc, const D2D1_BRUSH_PROPERTIES *brush_desc, struct d2d_brush **brush) DECLSPEC_HIDDEN; void d2d_brush_bind_resources(struct d2d_brush *brush, ID3D10Device *device, unsigned int brush_idx) DECLSPEC_HIDDEN; -HRESULT d2d_brush_get_ps_cb(struct d2d_brush *brush, struct d2d_brush *opacity_brush, BOOL outline, +HRESULT d2d_brush_get_ps_cb(struct d2d_brush *brush, struct d2d_brush *opacity_brush, BOOL outline, BOOL is_arc, struct d2d_device_context *render_target, ID3D10Buffer **ps_cb) DECLSPEC_HIDDEN; struct d2d_brush *unsafe_impl_from_ID2D1Brush(ID2D1Brush *iface) DECLSPEC_HIDDEN; @@ -388,7 +390,7 @@ enum d2d_geometry_state D2D_GEOMETRY_STATE_FIGURE, }; -struct d2d_bezier_vertex +struct d2d_curve_vertex { D2D1_POINT_2F position; struct @@ -439,9 +441,13 @@ struct d2d_geometry size_t faces_size; size_t face_count; - struct d2d_bezier_vertex *bezier_vertices; + struct d2d_curve_vertex *bezier_vertices; size_t bezier_vertices_size; size_t bezier_vertex_count; + + struct d2d_curve_vertex *arc_vertices; + size_t arc_vertices_size; + size_t arc_vertex_count; } fill; struct diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index 0ab6e53f5f..364a3074c1 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -754,7 +754,7 @@ static void d2d_device_context_draw_geometry(struct d2d_device_context *render_t return; } - if (FAILED(hr = d2d_brush_get_ps_cb(brush, NULL, TRUE, render_target, &ps_cb))) + if (FAILED(hr = d2d_brush_get_ps_cb(brush, NULL, TRUE, FALSE, render_target, &ps_cb))) { WARN("Failed to get ps constant buffer, hr %#x.\n", hr); ID3D10Buffer_Release(vs_cb); @@ -846,7 +846,7 @@ static void STDMETHODCALLTYPE d2d_device_context_DrawGeometry(ID2D1DeviceContext static void d2d_device_context_fill_geometry(struct d2d_device_context *render_target, const struct d2d_geometry *geometry, struct d2d_brush *brush, struct d2d_brush *opacity_brush) { - ID3D10Buffer *ib, *vb, *vs_cb, *ps_cb; + ID3D10Buffer *ib, *vb, *vs_cb, *ps_cb_bezier, *ps_cb_arc; D3D10_SUBRESOURCE_DATA buffer_data; D3D10_BUFFER_DESC buffer_desc; D2D1_MATRIX_3X2_F *w; @@ -902,10 +902,18 @@ static void d2d_device_context_fill_geometry(struct d2d_device_context *render_t return; } - if (FAILED(hr = d2d_brush_get_ps_cb(brush, opacity_brush, FALSE, render_target, &ps_cb))) + if (FAILED(hr = d2d_brush_get_ps_cb(brush, opacity_brush, FALSE, FALSE, render_target, &ps_cb_bezier))) + { + WARN("Failed to get ps constant buffer, hr %#x.\n", hr); + ID3D10Buffer_Release(vs_cb); + return; + } + + if (FAILED(hr = d2d_brush_get_ps_cb(brush, opacity_brush, FALSE, TRUE, render_target, &ps_cb_arc))) { WARN("Failed to get ps constant buffer, hr %#x.\n", hr); ID3D10Buffer_Release(vs_cb); + ID3D10Buffer_Release(ps_cb_bezier); return; } @@ -933,7 +941,7 @@ static void d2d_device_context_fill_geometry(struct d2d_device_context *render_t } d2d_device_context_draw(render_target, D2D_SHAPE_TYPE_TRIANGLE, ib, 3 * geometry->fill.face_count, vb, - sizeof(*geometry->fill.vertices), vs_cb, ps_cb, brush, opacity_brush); + sizeof(*geometry->fill.vertices), vs_cb, ps_cb_bezier, brush, opacity_brush); ID3D10Buffer_Release(vb); ID3D10Buffer_Release(ib); @@ -952,13 +960,29 @@ static void d2d_device_context_fill_geometry(struct d2d_device_context *render_t } d2d_device_context_draw(render_target, D2D_SHAPE_TYPE_BEZIER, NULL, geometry->fill.bezier_vertex_count, vb, - sizeof(*geometry->fill.bezier_vertices), vs_cb, ps_cb, brush, opacity_brush); + sizeof(*geometry->fill.bezier_vertices), vs_cb, ps_cb_bezier, brush, opacity_brush); + + ID3D10Buffer_Release(vb); + } + + if (geometry->fill.arc_vertex_count) { + buffer_desc.ByteWidth = geometry->fill.arc_vertex_count * sizeof(*geometry->fill.arc_vertices); + buffer_data.pSysMem = geometry->fill.arc_vertices; + + if (FAILED(hr = ID3D10Device_CreateBuffer(render_target->d3d_device, &buffer_desc, &buffer_data, &vb))) { + ERR("Failed to create arc vertex buffer, hr %#x.\n", hr); + goto done; + } + + d2d_device_context_draw(render_target, D2D_SHAPE_TYPE_ARC, NULL, geometry->fill.arc_vertex_count, vb, + sizeof(*geometry->fill.arc_vertices), vs_cb, ps_cb_arc, brush, opacity_brush); ID3D10Buffer_Release(vb); } done: - ID3D10Buffer_Release(ps_cb); + ID3D10Buffer_Release(ps_cb_arc); + ID3D10Buffer_Release(ps_cb_bezier); ID3D10Buffer_Release(vs_cb); } @@ -2743,7 +2767,7 @@ static HRESULT d2d_device_context_init(struct d2d_device_context *render_target, { {"POSITION", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 0, D3D10_INPUT_PER_VERTEX_DATA, 0}, }; - static const D3D10_INPUT_ELEMENT_DESC il_desc_bezier[] = + static const D3D10_INPUT_ELEMENT_DESC il_desc_curve[] = { {"POSITION", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 0, D3D10_INPUT_PER_VERTEX_DATA, 0}, {"TEXCOORD", 0, DXGI_FORMAT_R32G32B32_FLOAT, 0, 8, D3D10_INPUT_PER_VERTEX_DATA, 0}, @@ -3073,7 +3097,7 @@ static HRESULT d2d_device_context_init(struct d2d_device_context *render_target, 0x00000000, 0x00000000, 0x08000036, 0x001020c2, 0x00000004, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x3f800000, 0x0100003e, }; - static const DWORD vs_code_bezier[] = + static const DWORD vs_code_curve[] = { #if 0 float3x2 transform_geometry; @@ -3137,6 +3161,7 @@ static HRESULT d2d_device_context_init(struct d2d_device_context *render_target, #define BRUSH_TYPE_COUNT 4 bool outline; + bool is_arc; struct brush { uint type; @@ -3299,21 +3324,28 @@ static HRESULT d2d_device_context_init(struct d2d_device_context *render_target, { /* Evaluate the implicit form of the curve in texture space. * "i.b.z" determines which side of the curve is shaded. */ - clip((i.b.x * i.b.x - i.b.y) * i.b.z); + if (!is_arc) + { + clip((i.b.x * i.b.x - i.b.y) * i.b.z); + } + else + { + clip((i.b.x * i.b.x + i.b.y * i.b.y - 1.0) * i.b.z); + } } return colour; } #endif - 0x43425844, 0xf3cbb8bd, 0x5f286454, 0x139976a7, 0x6817e876, 0x00000001, 0x00001d18, 0x00000003, + 0x43425844, 0x9b22fd36, 0xa300dd1c, 0x99947c91, 0x774ecf4b, 0x00000001, 0x00001df4, 0x00000003, 0x0000002c, 0x000000c4, 0x000000f8, 0x4e475349, 0x00000090, 0x00000004, 0x00000008, 0x00000068, 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000303, 0x00000077, 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x00000f0f, 0x0000007e, 0x00000000, 0x00000000, 0x00000003, 0x00000002, 0x00000303, 0x0000007e, 0x00000001, 0x00000000, 0x00000003, 0x00000003, 0x00000303, 0x4c524f57, 0x4f505f44, 0x49544953, 0x42004e4f, 0x45495a45, 0x54530052, 0x454b4f52, 0x4152545f, 0x4f46534e, 0xab004d52, 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, - 0x00000003, 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x00001c18, - 0x00000040, 0x00000706, 0x04000059, 0x00208e46, 0x00000000, 0x00000009, 0x0300005a, 0x00106000, + 0x00000003, 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x00001cf4, + 0x00000040, 0x0000073d, 0x04000059, 0x00208e46, 0x00000000, 0x00000009, 0x0300005a, 0x00106000, 0x00000000, 0x0300005a, 0x00106000, 0x00000001, 0x04001858, 0x00107000, 0x00000000, 0x00005555, 0x04001858, 0x00107000, 0x00000001, 0x00005555, 0x04000858, 0x00107000, 0x00000002, 0x00005555, 0x04000858, 0x00107000, 0x00000003, 0x00005555, 0x03001062, 0x00101032, 0x00000000, 0x03001062, @@ -3518,26 +3550,33 @@ static HRESULT d2d_device_context_init(struct d2d_device_context *render_target, 0x00000000, 0x00000005, 0x01000015, 0x0a000037, 0x00100012, 0x00000001, 0x0010001a, 0x00000001, 0x0010000a, 0x00000001, 0x0020801a, 0x00000000, 0x00000005, 0x01000015, 0x01000015, 0x01000015, 0x07000038, 0x001020f2, 0x00000000, 0x00100e46, 0x00000000, 0x00100006, 0x00000001, 0x01000012, - 0x05000036, 0x001020f2, 0x00000000, 0x00100e46, 0x00000000, 0x01000015, 0x08000027, 0x00100012, - 0x00000000, 0x0020800a, 0x00000000, 0x00000000, 0x00004001, 0x00000000, 0x0500003b, 0x00100022, - 0x00000000, 0x0010000a, 0x00000000, 0x0500000b, 0x00100032, 0x00000001, 0x00101046, 0x00000001, - 0x0500000c, 0x001000c2, 0x00000001, 0x00101406, 0x00000001, 0x07000000, 0x00100042, 0x00000000, - 0x0010100a, 0x00000001, 0x0010100a, 0x00000001, 0x0a000032, 0x001000c2, 0x00000000, 0x00100aa6, - 0x00000000, 0x00100806, 0x00000001, 0x80100d56, 0x00000041, 0x00000001, 0x0700000f, 0x00100012, - 0x00000001, 0x00100ae6, 0x00000000, 0x00101ae6, 0x00000001, 0x07000031, 0x00100012, 0x00000001, - 0x0010000a, 0x00000001, 0x00004001, 0x00000000, 0x07000001, 0x00100012, 0x00000001, 0x0010000a, - 0x00000000, 0x0010000a, 0x00000001, 0x0304000d, 0x0010000a, 0x00000001, 0x07000038, 0x00100032, - 0x00000001, 0x00100ff6, 0x00000000, 0x00101046, 0x00000003, 0x09000032, 0x001000c2, 0x00000000, - 0x00101406, 0x00000002, 0x00100aa6, 0x00000000, 0x00100406, 0x00000001, 0x0700000f, 0x00100042, - 0x00000000, 0x00100ae6, 0x00000000, 0x00100ae6, 0x00000000, 0x0500004b, 0x00100042, 0x00000000, - 0x0010002a, 0x00000000, 0x0a000032, 0x00100082, 0x00000000, 0x0010100a, 0x00000001, 0x0010100a, - 0x00000001, 0x8010101a, 0x00000041, 0x00000001, 0x08000000, 0x00100042, 0x00000000, 0x8010003a, - 0x000000c1, 0x00000000, 0x0010002a, 0x00000000, 0x07000031, 0x00100042, 0x00000000, 0x0010002a, - 0x00000000, 0x00004001, 0x00000000, 0x07000001, 0x00100012, 0x00000000, 0x0010000a, 0x00000000, - 0x0010002a, 0x00000000, 0x0304000d, 0x0010000a, 0x00000000, 0x07000038, 0x00100012, 0x00000000, - 0x0010003a, 0x00000000, 0x0010102a, 0x00000001, 0x07000031, 0x00100012, 0x00000000, 0x0010000a, - 0x00000000, 0x00004001, 0x00000000, 0x07000001, 0x00100012, 0x00000000, 0x0010001a, 0x00000000, - 0x0010000a, 0x00000000, 0x0304000d, 0x0010000a, 0x00000000, 0x0100003e, + 0x05000036, 0x001020f2, 0x00000000, 0x00100e46, 0x00000000, 0x01000015, 0x0b000027, 0x00100032, + 0x00000000, 0x00208046, 0x00000000, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x0500000b, 0x00100032, 0x00000001, 0x00101046, 0x00000001, 0x0500000c, 0x001000c2, + 0x00000001, 0x00101406, 0x00000001, 0x07000000, 0x00100042, 0x00000000, 0x0010100a, 0x00000001, + 0x0010100a, 0x00000001, 0x0a000032, 0x001000c2, 0x00000000, 0x00100aa6, 0x00000000, 0x00100806, + 0x00000001, 0x80100d56, 0x00000041, 0x00000001, 0x0700000f, 0x00100012, 0x00000001, 0x00100ae6, + 0x00000000, 0x00101ae6, 0x00000001, 0x07000031, 0x00100012, 0x00000001, 0x0010000a, 0x00000001, + 0x00004001, 0x00000000, 0x07000001, 0x00100012, 0x00000001, 0x0010000a, 0x00000000, 0x0010000a, + 0x00000001, 0x0304000d, 0x0010000a, 0x00000001, 0x07000038, 0x00100032, 0x00000001, 0x00100ff6, + 0x00000000, 0x00101046, 0x00000003, 0x09000032, 0x001000c2, 0x00000000, 0x00101406, 0x00000002, + 0x00100aa6, 0x00000000, 0x00100406, 0x00000001, 0x0700000f, 0x00100042, 0x00000000, 0x00100ae6, + 0x00000000, 0x00100ae6, 0x00000000, 0x0500004b, 0x00100042, 0x00000000, 0x0010002a, 0x00000000, + 0x07000038, 0x00100032, 0x00000001, 0x00101046, 0x00000001, 0x00101046, 0x00000001, 0x0a000032, + 0x00100082, 0x00000000, 0x0010100a, 0x00000001, 0x0010100a, 0x00000001, 0x8010101a, 0x00000041, + 0x00000001, 0x08000000, 0x00100042, 0x00000000, 0x8010003a, 0x000000c1, 0x00000000, 0x0010002a, + 0x00000000, 0x07000031, 0x00100042, 0x00000000, 0x0010002a, 0x00000000, 0x00004001, 0x00000000, + 0x07000001, 0x00100042, 0x00000000, 0x0010000a, 0x00000000, 0x0010002a, 0x00000000, 0x0304000d, + 0x0010002a, 0x00000000, 0x0500003b, 0x00100052, 0x00000000, 0x00100106, 0x00000000, 0x07000001, + 0x00100042, 0x00000000, 0x0010002a, 0x00000000, 0x0010000a, 0x00000000, 0x07000038, 0x00100082, + 0x00000000, 0x0010003a, 0x00000000, 0x0010102a, 0x00000001, 0x07000031, 0x00100082, 0x00000000, + 0x0010003a, 0x00000000, 0x00004001, 0x00000000, 0x07000001, 0x00100052, 0x00000000, 0x00100656, + 0x00000000, 0x00100306, 0x00000000, 0x0304000d, 0x0010002a, 0x00000000, 0x07000000, 0x00100022, + 0x00000000, 0x0010001a, 0x00000001, 0x0010000a, 0x00000001, 0x07000000, 0x00100022, 0x00000000, + 0x0010001a, 0x00000000, 0x00004001, 0xbf800000, 0x07000038, 0x00100022, 0x00000000, 0x0010001a, + 0x00000000, 0x0010102a, 0x00000001, 0x07000031, 0x00100022, 0x00000000, 0x0010001a, 0x00000000, + 0x00004001, 0x00000000, 0x07000001, 0x00100012, 0x00000000, 0x0010000a, 0x00000000, 0x0010001a, + 0x00000000, 0x0304000d, 0x0010000a, 0x00000000, 0x0100003e, }; static const struct shape_info { @@ -3555,8 +3594,10 @@ static HRESULT d2d_device_context_init(struct d2d_device_context *render_target, vs_code_bezier_outline, sizeof(vs_code_bezier_outline)}, {D2D_SHAPE_TYPE_TRIANGLE, il_desc_triangle, ARRAY_SIZE(il_desc_triangle), vs_code_triangle, sizeof(vs_code_triangle)}, - {D2D_SHAPE_TYPE_BEZIER, il_desc_bezier, ARRAY_SIZE(il_desc_bezier), - vs_code_bezier, sizeof(vs_code_bezier)}, + {D2D_SHAPE_TYPE_BEZIER, il_desc_curve, ARRAY_SIZE(il_desc_curve), + vs_code_curve, sizeof(vs_code_curve)}, + {D2D_SHAPE_TYPE_ARC, il_desc_curve, ARRAY_SIZE(il_desc_curve), + vs_code_curve, sizeof(vs_code_curve)}, }; static const struct { diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index e7bb809359..a6a026aa21 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -129,7 +129,7 @@ struct d2d_fp_fin size_t length; }; -static void d2d_bezier_vertex_set(struct d2d_bezier_vertex *b, +static void d2d_curve_vertex_set(struct d2d_curve_vertex *b, const D2D1_POINT_2F *p, float u, float v, float sign) { b->position = *p; @@ -2351,19 +2351,17 @@ static BOOL d2d_geometry_add_figure_outline(struct d2d_geometry *geometry, static BOOL d2d_geometry_fill_add_arc_triangle(struct d2d_geometry *geometry, const D2D1_POINT_2F *p0, const D2D1_POINT_2F *p1, const D2D1_POINT_2F *p2) { - struct d2d_bezier_vertex *b; + struct d2d_curve_vertex *a; - FIXME("Approximating arc triangle with Bezier triangle.\n"); - - if (!d2d_array_reserve((void **)&geometry->fill.bezier_vertices, &geometry->fill.bezier_vertices_size, - geometry->fill.bezier_vertex_count + 3, sizeof(*geometry->fill.bezier_vertices))) + if (!d2d_array_reserve((void **)&geometry->fill.arc_vertices, &geometry->fill.arc_vertices_size, + geometry->fill.arc_vertex_count + 3, sizeof(*geometry->fill.arc_vertices))) return FALSE; - b = &geometry->fill.bezier_vertices[geometry->fill.bezier_vertex_count]; - d2d_bezier_vertex_set(&b[0], p0, 0.0f, 0.0f, -1.0f); - d2d_bezier_vertex_set(&b[1], p1, 0.5f, 0.0f, -1.0f); - d2d_bezier_vertex_set(&b[2], p2, 1.0f, 1.0f, -1.0f); - geometry->fill.bezier_vertex_count += 3; + a = &geometry->fill.arc_vertices[geometry->fill.arc_vertex_count]; + d2d_curve_vertex_set(&a[0], p0, 0.0f, 1.0f, -1.0f); + d2d_curve_vertex_set(&a[1], p1, 1.0f, 1.0f, -1.0f); + d2d_curve_vertex_set(&a[2], p2, 1.0f, 0.0f, -1.0f); + geometry->fill.arc_vertex_count += 3; return TRUE; } @@ -2374,6 +2372,7 @@ static void d2d_geometry_cleanup(struct d2d_geometry *geometry) heap_free(geometry->outline.beziers); heap_free(geometry->outline.faces); heap_free(geometry->outline.vertices); + heap_free(geometry->fill.arc_vertices); heap_free(geometry->fill.bezier_vertices); heap_free(geometry->fill.faces); heap_free(geometry->fill.vertices); @@ -2782,7 +2781,7 @@ static BOOL d2d_geometry_split_bezier(struct d2d_geometry *geometry, const struc static HRESULT d2d_geometry_resolve_beziers(struct d2d_geometry *geometry) { struct d2d_segment_idx idx_p, idx_q; - struct d2d_bezier_vertex *b; + struct d2d_curve_vertex *b; const D2D1_POINT_2F *p[3]; struct d2d_figure *figure; size_t bezier_idx, i; @@ -2858,9 +2857,9 @@ static HRESULT d2d_geometry_resolve_beziers(struct d2d_geometry *geometry) p[2] = &figure->vertices[i]; b = &geometry->fill.bezier_vertices[bezier_idx * 3]; - d2d_bezier_vertex_set(&b[0], p[0], 0.0f, 0.0f, sign); - d2d_bezier_vertex_set(&b[1], p[1], 0.5f, 0.0f, sign); - d2d_bezier_vertex_set(&b[2], p[2], 1.0f, 1.0f, sign); + d2d_curve_vertex_set(&b[0], p[0], 0.0f, 0.0f, sign); + d2d_curve_vertex_set(&b[1], p[1], 0.5f, 0.0f, sign); + d2d_curve_vertex_set(&b[2], p[2], 1.0f, 1.0f, sign); if (!d2d_geometry_get_next_bezier_segment_idx(geometry, &idx_p)) break; @@ -4524,6 +4523,7 @@ static ULONG STDMETHODCALLTYPE d2d_transformed_geometry_Release(ID2D1Transformed geometry->outline.beziers = NULL; geometry->outline.faces = NULL; geometry->outline.vertices = NULL; + geometry->fill.arc_vertices = NULL; geometry->fill.bezier_vertices = NULL; geometry->fill.faces = NULL; geometry->fill.vertices = NULL; diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 319246a0bc..1d4db386ab 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -6846,7 +6846,7 @@ static void test_fill_geometry(void) "yjIMjwEWhwEcggEgfiR6KHYscy5xMG40azZpOGc6ZTxjPmI+YUBfQl1EXERbRlpGWUhYSFdKVkpV" "TFRMVExTTlJOUk5STlJOUVBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUU5STlJOUk5STlNMVExUTFVK" "VkpXSFhIWUZaRltEXERdQl9AYT5iPmM8ZTpnOGk2azRuMHEucyx2KHokfiCCARyHARaPAQzKMgAA"); - todo_wine ok(match, "Figure does not match.\n"); + ok(match, "Figure does not match.\n"); ID2D1RenderTarget_BeginDraw(rt); set_color(&color, 0.396f, 0.180f, 0.537f, 1.0f); @@ -6892,7 +6892,7 @@ static void test_fill_geometry(void) "szI6YURZSlROUVBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQ" "UFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQ" "UFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUU5USllEYTqzMgAA"); - todo_wine ok(match, "Figure does not match.\n"); + ok(match, "Figure does not match.\n"); match = compare_figure(surface, 0, 160, 160, 160, 0xff652e89, 0, "gMgB"); ok(match, "Figure does not match.\n"); @@ -6904,7 +6904,7 @@ static void test_fill_geometry(void) "tjI0aDxhQlxGWEpVTFNOUk5RUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQ" "UFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQ" "UFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFFOUk5TTFVKWEZcQmA+ZzS2MgAA"); - todo_wine ok(match, "Figure does not match.\n"); + ok(match, "Figure does not match.\n"); match = compare_figure(surface, 0, 320, 160, 160, 0xff652e89, 0, "gMgB"); ok(match, "Figure does not match.\n"); @@ -6916,7 +6916,7 @@ static void test_fill_geometry(void) "sDJAWkxSUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQ" "UFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQ" "UFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFJMWkCwMgAA"); - todo_wine ok(match, "Figure does not match.\n"); + ok(match, "Figure does not match.\n"); ID2D1RenderTarget_BeginDraw(rt); set_color(&color, 0.396f, 0.180f, 0.537f, 1.0f); @@ -6962,7 +6962,7 @@ static void test_fill_geometry(void) "yjIMjwEWhwEcggEgfiR6KHYscy5xMG40azZpOGc6ZTxjPmI+YUBfQl1EXERbRlpGWUhYSFdKVkpV" "TFRMVExTTlJOUk5STlJOUVBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUU5STlJOUk5STlNMVExUTFVK" "VkpXSFhIWUZaRltEXERdQl9AYT5iPmM8ZTpnOGk2azRuMHEucyx2KHokfiCCARyHARaPAQzKMgAA"); - todo_wine ok(match, "Figure does not match.\n"); + ok(match, "Figure does not match.\n"); match = compare_figure(surface, 0, 160, 160, 160, 0xff652e89, 0, "gMgB"); ok(match, "Figure does not match.\n"); @@ -6974,7 +6974,7 @@ static void test_fill_geometry(void) "uTIucDJsNmk4ZzplPGM+YUBgQF9CXkJdRFxEW0ZaRllIWEhXSlZKVkpWSlVMVExUTFRMU05STlJO" "Uk5STlJOUk9QUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFFPUU5STlJOUk5STlJOU0xU" "TFRMVExVSlZKVkpWSldIWEhZRlpGW0RcRF1CXkJfQGBAYT5jPGU6ZzhpNmwycC65MgAA"); - todo_wine ok(match, "Figure does not match.\n"); + ok(match, "Figure does not match.\n"); match = compare_figure(surface, 0, 320, 160, 160, 0xff652e89, 0, "gMgB"); ok(match, "Figure does not match.\n"); @@ -6986,7 +6986,7 @@ static void test_fill_geometry(void) "vzIiczhhRldMUlBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQ" "UFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQ" "UFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUkxXRmA6cSS+MgAA"); - todo_wine ok(match, "Figure does not match.\n"); + ok(match, "Figure does not match.\n"); hr = ID2D1Factory_CreatePathGeometry(factory, &geometry); ok(SUCCEEDED(hr), "Failed to create path geometry, hr %#x.\n", hr); -- 2.25.1

1 1

[PATCH 3/5] wined3d: Introduce wined3d_adapter_enum_outputs().
by Zhiyi Zhang 02 Mar '20

02 Mar '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/ddraw/main.c | 41 ++++++++++++++++++++++++++------- dlls/dxgi/adapter.c | 2 +- dlls/dxgi/dxgi_private.h | 4 +++- dlls/dxgi/output.c | 21 ++++++++--------- dlls/wined3d/directx.c | 42 ++++++++++++++++++++++------------ dlls/wined3d/wined3d.spec | 2 +- dlls/wined3d/wined3d_private.h | 2 +- include/wine/wined3d.h | 3 ++- 8 files changed, 78 insertions(+), 39 deletions(-) diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index 5236b39b643..263a1e46c67 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -57,12 +57,15 @@ static void ddraw_enumerate_secondary_devices(struct wined3d *wined3d, LPDDENUMC void *context) { struct wined3d_adapter_identifier adapter_id; + struct wined3d_adapter *wined3d_adapter; struct wined3d_output_desc output_desc; + struct wined3d_output *wined3d_output; + UINT adapter_idx = 0, output_idx; + UINT interface_count = 0; BOOL cont_enum = TRUE; - HRESULT hr = S_OK; - UINT adapter = 0; + HRESULT hr; - for (adapter = 0; SUCCEEDED(hr) && cont_enum; adapter++) + while (cont_enum && SUCCEEDED(wined3d_enum_adapters(wined3d, adapter_idx, &wined3d_adapter))) { char DriverName[512] = "", DriverDescription[512] = ""; @@ -73,16 +76,38 @@ static void ddraw_enumerate_secondary_devices(struct wined3d *wined3d, LPDDENUMC adapter_id.device_name_size = sizeof(DriverName); adapter_id.description = DriverDescription; adapter_id.description_size = sizeof(DriverDescription); + wined3d_mutex_lock(); - if (SUCCEEDED(hr = wined3d_get_adapter_identifier(wined3d, adapter, 0x0, &adapter_id))) - hr = wined3d_get_output_desc(wined3d, adapter, &output_desc); - wined3d_mutex_unlock(); - if (SUCCEEDED(hr)) + if (FAILED(hr = wined3d_get_adapter_identifier(wined3d, adapter_idx, 0x0, &adapter_id))) { - TRACE("Interface %d: %s\n", adapter, wine_dbgstr_guid(&adapter_id.device_identifier)); + WARN("Failed to get adapter identifier, hr %#x.\n", hr); + wined3d_mutex_unlock(); + break; + } + wined3d_mutex_unlock(); + + for (output_idx = 0; cont_enum && SUCCEEDED(wined3d_adapter_enum_outputs(wined3d_adapter, + output_idx, &wined3d_output)); ++output_idx) + { + wined3d_mutex_lock(); + if (FAILED(hr = wined3d_get_output_desc(wined3d, output_idx, &output_desc))) + { + WARN("Failed to get output description, hr %#x.\n", hr); + wined3d_mutex_unlock(); + break; + } + wined3d_mutex_unlock(); + + TRACE("Interface %u: %s\n", interface_count++, + wine_dbgstr_guid(&adapter_id.device_identifier)); cont_enum = callback(&adapter_id.device_identifier, adapter_id.description, adapter_id.device_name, context, output_desc.monitor); } + + if (FAILED(hr)) + break; + + ++adapter_idx; } } diff --git a/dlls/dxgi/adapter.c b/dlls/dxgi/adapter.c index 590f9f13cc3..77516015add 100644 --- a/dlls/dxgi/adapter.c +++ b/dlls/dxgi/adapter.c @@ -139,7 +139,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_EnumOutputs(IWineDXGIAdapter *ifac return DXGI_ERROR_NOT_FOUND; } - if (FAILED(hr = dxgi_output_create(adapter, &output_object))) + if (FAILED(hr = dxgi_output_create(adapter, output_idx, &output_object))) { *output = NULL; return hr; diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index 56939e2aaa6..99fdcf62d43 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -144,11 +144,13 @@ struct dxgi_output { IDXGIOutput4 IDXGIOutput4_iface; LONG refcount; + struct wined3d_output *wined3d_output; struct wined3d_private_store private_store; struct dxgi_adapter *adapter; }; -HRESULT dxgi_output_create(struct dxgi_adapter *adapter, struct dxgi_output **output) DECLSPEC_HIDDEN; +HRESULT dxgi_output_create(struct dxgi_adapter *adapter, UINT output_idx, + struct dxgi_output **output) DECLSPEC_HIDDEN; struct dxgi_output *unsafe_impl_from_IDXGIOutput(IDXGIOutput *iface) DECLSPEC_HIDDEN; /* IDXGIAdapter */ diff --git a/dlls/dxgi/output.c b/dlls/dxgi/output.c index a2331358e69..122f6366b0c 100644 --- a/dlls/dxgi/output.c +++ b/dlls/dxgi/output.c @@ -365,8 +365,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_WaitForVBlank(IDXGIOutput4 *iface) static HRESULT STDMETHODCALLTYPE dxgi_output_TakeOwnership(IDXGIOutput4 *iface, IUnknown *device, BOOL exclusive) { struct dxgi_output *output = impl_from_IDXGIOutput4(iface); - struct wined3d_output *wined3d_output; - HRESULT hr = DXGI_ERROR_INVALID_CALL; + HRESULT hr; TRACE("iface %p, device %p, exclusive %d.\n", iface, device, exclusive); @@ -374,9 +373,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_TakeOwnership(IDXGIOutput4 *iface, return DXGI_ERROR_INVALID_CALL; wined3d_mutex_lock(); - if ((wined3d_output = wined3d_get_adapter_output(output->adapter->factory->wined3d, - output->adapter->ordinal))) - hr = wined3d_output_take_ownership(wined3d_output, exclusive); + hr = wined3d_output_take_ownership(output->wined3d_output, exclusive); wined3d_mutex_unlock(); return hr; @@ -385,14 +382,11 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_TakeOwnership(IDXGIOutput4 *iface, static void STDMETHODCALLTYPE dxgi_output_ReleaseOwnership(IDXGIOutput4 *iface) { struct dxgi_output *output = impl_from_IDXGIOutput4(iface); - struct wined3d_output *wined3d_output; TRACE("iface %p.\n", iface); wined3d_mutex_lock(); - if ((wined3d_output = wined3d_get_adapter_output(output->adapter->factory->wined3d, - output->adapter->ordinal))) - wined3d_output_release_ownership(wined3d_output); + wined3d_output_release_ownership(output->wined3d_output); wined3d_mutex_unlock(); } @@ -581,20 +575,23 @@ struct dxgi_output *unsafe_impl_from_IDXGIOutput(IDXGIOutput *iface) return CONTAINING_RECORD(iface, struct dxgi_output, IDXGIOutput4_iface); } -static void dxgi_output_init(struct dxgi_output *output, struct dxgi_adapter *adapter) +static void dxgi_output_init(struct dxgi_output *output, UINT output_idx, + struct dxgi_adapter *adapter) { output->IDXGIOutput4_iface.lpVtbl = &dxgi_output_vtbl; output->refcount = 1; + wined3d_adapter_enum_outputs(adapter->wined3d_adapter, output_idx, &output->wined3d_output); wined3d_private_store_init(&output->private_store); output->adapter = adapter; IWineDXGIAdapter_AddRef(&output->adapter->IWineDXGIAdapter_iface); } -HRESULT dxgi_output_create(struct dxgi_adapter *adapter, struct dxgi_output **output) +HRESULT dxgi_output_create(struct dxgi_adapter *adapter, UINT output_idx, + struct dxgi_output **output) { if (!(*output = heap_alloc_zero(sizeof(**output)))) return E_OUTOFMEMORY; - dxgi_output_init(*output, adapter); + dxgi_output_init(*output, output_idx, adapter); return S_OK; } diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 4133bedb335..388de0dfe5a 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -155,7 +155,11 @@ UINT64 adapter_adjust_memory(struct wined3d_adapter *adapter, INT64 amount) void wined3d_adapter_cleanup(struct wined3d_adapter *adapter) { - wined3d_output_cleanup(&adapter->output); + UINT output_idx; + + for (output_idx = 0; output_idx < adapter->output_count; ++output_idx) + wined3d_output_cleanup(&adapter->outputs[output_idx]); + heap_free(adapter->outputs); heap_free(adapter->formats); } @@ -885,6 +889,18 @@ UINT CDECL wined3d_get_adapter_count(const struct wined3d *wined3d) return wined3d->adapter_count; } +HRESULT CDECL wined3d_adapter_enum_outputs(const struct wined3d_adapter *adapter, UINT output_idx, + struct wined3d_output **output) +{ + TRACE("adapter %p, output_idx %u, output %p.\n", adapter, output_idx, output); + + if (output_idx >= adapter->output_count) + return WINED3DERR_INVALIDCALL; + + *output = &adapter->outputs[output_idx]; + return WINED3D_OK; +} + UINT CDECL wined3d_adapter_get_output_count(const struct wined3d_adapter *adapter) { TRACE("adapter %p, reporting %u outputs.\n", adapter, adapter->output_count); @@ -932,16 +948,6 @@ HRESULT CDECL wined3d_get_output_desc(const struct wined3d *wined3d, unsigned in return WINED3D_OK; } -struct wined3d_output * CDECL wined3d_get_adapter_output(const struct wined3d *wined3d, unsigned int adapter_idx) -{ - TRACE("wined3d %p, adapter_idx %u.\n", wined3d, adapter_idx); - - if (adapter_idx >= wined3d->adapter_count) - return NULL; - - return &wined3d->adapters[adapter_idx]->output; -} - /* FIXME: GetAdapterModeCount and EnumAdapterModes currently only returns modes of the same bpp but different resolutions */ @@ -2833,14 +2839,23 @@ BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, unsigned int ordinal, HRESULT hr; adapter->ordinal = ordinal; + adapter->formats = NULL; display_device.cb = sizeof(display_device); EnumDisplayDevicesW(NULL, ordinal, &display_device, 0); TRACE("Display device: %s.\n", debugstr_w(display_device.DeviceName)); strcpyW(adapter->device_name, display_device.DeviceName); - if (FAILED(hr = wined3d_output_init(&adapter->output, adapter->device_name))) + + if (!(adapter->outputs = heap_calloc(1, sizeof(*adapter->outputs)))) + { + ERR("Failed to allocate outputs.\n"); + return FALSE; + } + + if (FAILED(hr = wined3d_output_init(&adapter->outputs[0], adapter->device_name))) { ERR("Failed to initialise output, hr %#x.\n", hr); + heap_free(adapter->outputs); return FALSE; } adapter->output_count = 1; @@ -2848,7 +2863,7 @@ BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, unsigned int ordinal, if (!AllocateLocallyUniqueId(&adapter->luid)) { ERR("Failed to set adapter LUID (%#x).\n", GetLastError()); - wined3d_output_cleanup(&adapter->output); + wined3d_adapter_cleanup(adapter); return FALSE; } TRACE("Allocated LUID %08x:%08x for adapter %p.\n", @@ -2857,7 +2872,6 @@ BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, unsigned int ordinal, memset(&adapter->driver_uuid, 0, sizeof(adapter->driver_uuid)); memset(&adapter->device_uuid, 0, sizeof(adapter->device_uuid)); - adapter->formats = NULL; adapter->adapter_ops = adapter_ops; return TRUE; diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 44b4d22e312..47ec322e83b 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -16,7 +16,6 @@ @ cdecl wined3d_get_adapter_display_mode(ptr long ptr ptr) @ cdecl wined3d_get_adapter_identifier(ptr long long ptr) @ cdecl wined3d_get_adapter_mode_count(ptr long long long) -@ cdecl wined3d_get_adapter_output(ptr long ptr) @ cdecl wined3d_get_adapter_raster_status(ptr long ptr) @ cdecl wined3d_get_device_caps(ptr long long ptr) @ cdecl wined3d_get_output_desc(ptr long ptr) @@ -26,6 +25,7 @@ @ cdecl wined3d_set_adapter_display_mode(ptr long ptr) @ cdecl wined3d_unregister_windows(ptr) +@ cdecl wined3d_adapter_enum_outputs(ptr long ptr) @ cdecl wined3d_adapter_get_output_count(ptr) @ cdecl wined3d_blend_state_create(ptr ptr ptr ptr ptr) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e2e03683b8c..618b80c8939 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2913,7 +2913,7 @@ struct wined3d_adapter struct wined3d_gl_info gl_info; struct wined3d_d3d_info d3d_info; struct wined3d_driver_info driver_info; - struct wined3d_output output; + struct wined3d_output *outputs; UINT output_count; UINT64 vram_bytes_used; GUID driver_uuid; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index fd587934757..948836795b7 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2272,7 +2272,6 @@ HRESULT __cdecl wined3d_get_adapter_identifier(const struct wined3d *wined3d, UI DWORD flags, struct wined3d_adapter_identifier *identifier); UINT __cdecl wined3d_get_adapter_mode_count(const struct wined3d *wined3d, UINT adapter_idx, enum wined3d_format_id format_id, enum wined3d_scanline_ordering scanline_ordering); -struct wined3d_output * __cdecl wined3d_get_adapter_output(const struct wined3d *wined3d, unsigned int adapter_idx); HRESULT __cdecl wined3d_get_adapter_raster_status(const struct wined3d *wined3d, UINT adapter_idx, struct wined3d_raster_status *raster_status); HRESULT __cdecl wined3d_get_device_caps(const struct wined3d *wined3d, unsigned int adapter_idx, @@ -2287,6 +2286,8 @@ HRESULT __cdecl wined3d_set_adapter_display_mode(struct wined3d *wined3d, UINT adapter_idx, const struct wined3d_display_mode *mode); void __cdecl wined3d_unregister_windows(struct wined3d *wined3d); +HRESULT __cdecl wined3d_adapter_enum_outputs(const struct wined3d_adapter *adapter, UINT output_idx, + struct wined3d_output **output); UINT __cdecl wined3d_adapter_get_output_count(const struct wined3d_adapter *adapter); HRESULT __cdecl wined3d_buffer_create(struct wined3d_device *device, const struct wined3d_buffer_desc *desc, -- 2.20.1

2 1

[PATCH 5/5] d3d9: Enumerate wined3d outputs in d3d9_init().
by Zhiyi Zhang 02 Mar '20

02 Mar '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/d3d9/d3d9_private.h | 2 ++ dlls/d3d9/directx.c | 50 +++++++++++++++++++++++++++++----------- 2 files changed, 38 insertions(+), 14 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index bc9a3b98b2e..bfd5ba1ff86 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -66,6 +66,8 @@ struct d3d9 IDirect3D9Ex IDirect3D9Ex_iface; LONG refcount; struct wined3d *wined3d; + struct wined3d_output **wined3d_outputs; + UINT wined3d_output_count; BOOL extended; }; diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index a0b6d142113..2a0a560867a 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -85,6 +85,7 @@ static ULONG WINAPI d3d9_Release(IDirect3D9Ex *iface) wined3d_decref(d3d9->wined3d); wined3d_mutex_unlock(); + heap_free(d3d9->wined3d_outputs); heap_free(d3d9); } @@ -108,22 +109,10 @@ static HRESULT WINAPI d3d9_RegisterSoftwareDevice(IDirect3D9Ex *iface, void *ini static UINT WINAPI d3d9_GetAdapterCount(IDirect3D9Ex *iface) { struct d3d9 *d3d9 = impl_from_IDirect3D9Ex(iface); - struct wined3d_adapter *wined3d_adapter; - UINT adapter_idx, adapter_count; - UINT output_count = 0; TRACE("iface %p.\n", iface); - wined3d_mutex_lock(); - adapter_count = wined3d_get_adapter_count(d3d9->wined3d); - for (adapter_idx = 0; adapter_idx < adapter_count; ++adapter_idx) - { - wined3d_enum_adapters(d3d9->wined3d, adapter_idx, &wined3d_adapter); - output_count += wined3d_adapter_get_output_count(wined3d_adapter); - } - wined3d_mutex_unlock(); - - return output_count; + return d3d9->wined3d_output_count; } static HRESULT WINAPI d3d9_GetAdapterIdentifier(IDirect3D9Ex *iface, UINT adapter, @@ -601,6 +590,8 @@ BOOL d3d9_init(struct d3d9 *d3d9, BOOL extended) | WINED3D_SRGB_READ_WRITE_CONTROL | WINED3D_LEGACY_UNBOUND_RESOURCE_COLOR | WINED3D_NO_PRIMITIVE_RESTART | WINED3D_LEGACY_CUBEMAP_FILTERING | WINED3D_NORMALIZED_DEPTH_BIAS; + UINT adapter_idx, output_idx, adapter_count, output_count = 0; + struct wined3d_adapter *wined3d_adapter; if (!extended) flags |= WINED3D_VIDMEM_ACCOUNTING; @@ -612,9 +603,40 @@ BOOL d3d9_init(struct d3d9 *d3d9, BOOL extended) wined3d_mutex_lock(); d3d9->wined3d = wined3d_create(flags); - wined3d_mutex_unlock(); if (!d3d9->wined3d) + { + wined3d_mutex_unlock(); return FALSE; + } + + adapter_count = wined3d_get_adapter_count(d3d9->wined3d); + for (adapter_idx = 0; adapter_idx < adapter_count; ++adapter_idx) + { + wined3d_enum_adapters(d3d9->wined3d, adapter_idx, &wined3d_adapter); + output_count += wined3d_adapter_get_output_count(wined3d_adapter); + } + + d3d9->wined3d_outputs = heap_calloc(output_count, sizeof(*d3d9->wined3d_outputs)); + if (!d3d9->wined3d_outputs) + { + wined3d_decref(d3d9->wined3d); + wined3d_mutex_unlock(); + return FALSE; + } + + d3d9->wined3d_output_count = 0; + for (adapter_idx = 0; adapter_idx < adapter_count; ++adapter_idx) + { + wined3d_enum_adapters(d3d9->wined3d, adapter_idx, &wined3d_adapter); + output_count = wined3d_adapter_get_output_count(wined3d_adapter); + for (output_idx = 0; output_idx < output_count; ++output_idx) + { + wined3d_adapter_enum_outputs(wined3d_adapter, output_idx, + &d3d9->wined3d_outputs[d3d9->wined3d_output_count++]); + } + } + + wined3d_mutex_unlock(); d3d9->extended = extended; return TRUE; -- 2.20.1

1 0

[PATCH 4/5] d3d8: Enumerate wined3d outputs in d3d8_init().
by Zhiyi Zhang 02 Mar '20

02 Mar '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/d3d8/d3d8_private.h | 2 ++ dlls/d3d8/directx.c | 49 ++++++++++++++++++++++++++++------------ 2 files changed, 37 insertions(+), 14 deletions(-) diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index 9bf92af7c9f..e10140bd721 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -57,6 +57,8 @@ struct d3d8 IDirect3D8 IDirect3D8_iface; LONG refcount; struct wined3d *wined3d; + struct wined3d_output **wined3d_outputs; + UINT wined3d_output_count; }; BOOL d3d8_init(struct d3d8 *d3d8) DECLSPEC_HIDDEN; diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index e6acfff3654..e357c1ffe91 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -70,6 +70,7 @@ static ULONG WINAPI d3d8_Release(IDirect3D8 *iface) wined3d_decref(d3d8->wined3d); wined3d_mutex_unlock(); + heap_free(d3d8->wined3d_outputs); heap_free(d3d8); } @@ -93,22 +94,10 @@ static HRESULT WINAPI d3d8_RegisterSoftwareDevice(IDirect3D8 *iface, void *init_ static UINT WINAPI d3d8_GetAdapterCount(IDirect3D8 *iface) { struct d3d8 *d3d8 = impl_from_IDirect3D8(iface); - struct wined3d_adapter *wined3d_adapter; - UINT adapter_idx, adapter_count; - UINT output_count = 0; TRACE("iface %p.\n", iface); - wined3d_mutex_lock(); - adapter_count = wined3d_get_adapter_count(d3d8->wined3d); - for (adapter_idx = 0; adapter_idx < adapter_count; ++adapter_idx) - { - wined3d_enum_adapters(d3d8->wined3d, adapter_idx, &wined3d_adapter); - output_count += wined3d_adapter_get_output_count(wined3d_adapter); - } - wined3d_mutex_unlock(); - - return output_count; + return d3d8->wined3d_output_count; } static HRESULT WINAPI d3d8_GetAdapterIdentifier(IDirect3D8 *iface, UINT adapter, @@ -425,15 +414,47 @@ BOOL d3d8_init(struct d3d8 *d3d8) | WINED3D_HANDLE_RESTORE | WINED3D_PIXEL_CENTER_INTEGER | WINED3D_LEGACY_UNBOUND_RESOURCE_COLOR | WINED3D_NO_PRIMITIVE_RESTART | WINED3D_LEGACY_CUBEMAP_FILTERING; + UINT adapter_idx, output_idx, adapter_count, output_count = 0; + struct wined3d_adapter *wined3d_adapter; d3d8->IDirect3D8_iface.lpVtbl = &d3d8_vtbl; d3d8->refcount = 1; wined3d_mutex_lock(); d3d8->wined3d = wined3d_create(flags); - wined3d_mutex_unlock(); if (!d3d8->wined3d) + { + wined3d_mutex_unlock(); return FALSE; + } + adapter_count = wined3d_get_adapter_count(d3d8->wined3d); + for (adapter_idx = 0; adapter_idx < adapter_count; ++adapter_idx) + { + wined3d_enum_adapters(d3d8->wined3d, adapter_idx, &wined3d_adapter); + output_count += wined3d_adapter_get_output_count(wined3d_adapter); + } + + d3d8->wined3d_outputs = heap_calloc(output_count, sizeof(*d3d8->wined3d_outputs)); + if (!d3d8->wined3d_outputs) + { + wined3d_decref(d3d8->wined3d); + wined3d_mutex_unlock(); + return FALSE; + } + + d3d8->wined3d_output_count = 0; + for (adapter_idx = 0; adapter_idx < adapter_count; ++adapter_idx) + { + wined3d_enum_adapters(d3d8->wined3d, adapter_idx, &wined3d_adapter); + output_count = wined3d_adapter_get_output_count(wined3d_adapter); + for (output_idx = 0; output_idx < output_count; ++output_idx) + { + wined3d_adapter_enum_outputs(wined3d_adapter, output_idx, + &d3d8->wined3d_outputs[d3d8->wined3d_output_count++]); + } + } + + wined3d_mutex_unlock(); return TRUE; } -- 2.20.1

1 0

[PATCH 2/5] wined3d: Introduce wined3d_adapter_get_output_count().
by Zhiyi Zhang 02 Mar '20

02 Mar '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/d3d8/directx.c | 13 ++++++++++--- dlls/d3d9/directx.c | 13 ++++++++++--- dlls/dxgi/adapter.c | 5 ++++- dlls/dxgi/dxgi_private.h | 1 + dlls/wined3d/directx.c | 8 ++++++++ dlls/wined3d/wined3d.spec | 2 ++ dlls/wined3d/wined3d_private.h | 1 + include/wine/wined3d.h | 2 ++ 8 files changed, 38 insertions(+), 7 deletions(-) diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index d1f8872d12e..e6acfff3654 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -93,15 +93,22 @@ static HRESULT WINAPI d3d8_RegisterSoftwareDevice(IDirect3D8 *iface, void *init_ static UINT WINAPI d3d8_GetAdapterCount(IDirect3D8 *iface) { struct d3d8 *d3d8 = impl_from_IDirect3D8(iface); - UINT count; + struct wined3d_adapter *wined3d_adapter; + UINT adapter_idx, adapter_count; + UINT output_count = 0; TRACE("iface %p.\n", iface); wined3d_mutex_lock(); - count = wined3d_get_adapter_count(d3d8->wined3d); + adapter_count = wined3d_get_adapter_count(d3d8->wined3d); + for (adapter_idx = 0; adapter_idx < adapter_count; ++adapter_idx) + { + wined3d_enum_adapters(d3d8->wined3d, adapter_idx, &wined3d_adapter); + output_count += wined3d_adapter_get_output_count(wined3d_adapter); + } wined3d_mutex_unlock(); - return count; + return output_count; } static HRESULT WINAPI d3d8_GetAdapterIdentifier(IDirect3D8 *iface, UINT adapter, diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index b552c3b910c..a0b6d142113 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -108,15 +108,22 @@ static HRESULT WINAPI d3d9_RegisterSoftwareDevice(IDirect3D9Ex *iface, void *ini static UINT WINAPI d3d9_GetAdapterCount(IDirect3D9Ex *iface) { struct d3d9 *d3d9 = impl_from_IDirect3D9Ex(iface); - UINT ret; + struct wined3d_adapter *wined3d_adapter; + UINT adapter_idx, adapter_count; + UINT output_count = 0; TRACE("iface %p.\n", iface); wined3d_mutex_lock(); - ret = wined3d_get_adapter_count(d3d9->wined3d); + adapter_count = wined3d_get_adapter_count(d3d9->wined3d); + for (adapter_idx = 0; adapter_idx < adapter_count; ++adapter_idx) + { + wined3d_enum_adapters(d3d9->wined3d, adapter_idx, &wined3d_adapter); + output_count += wined3d_adapter_get_output_count(wined3d_adapter); + } wined3d_mutex_unlock(); - return ret; + return output_count; } static HRESULT WINAPI d3d9_GetAdapterIdentifier(IDirect3D9Ex *iface, UINT adapter, diff --git a/dlls/dxgi/adapter.c b/dlls/dxgi/adapter.c index 7cdf7bd0d69..590f9f13cc3 100644 --- a/dlls/dxgi/adapter.c +++ b/dlls/dxgi/adapter.c @@ -124,6 +124,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_EnumOutputs(IWineDXGIAdapter *ifac { struct dxgi_adapter *adapter = impl_from_IWineDXGIAdapter(iface); struct dxgi_output *output_object; + UINT output_count; HRESULT hr; TRACE("iface %p, output_idx %u, output %p.\n", iface, output_idx, output); @@ -131,7 +132,8 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_EnumOutputs(IWineDXGIAdapter *ifac if (!output) return E_INVALIDARG; - if (output_idx > 0) + output_count = wined3d_adapter_get_output_count(adapter->wined3d_adapter); + if (output_idx >= output_count) { *output = NULL; return DXGI_ERROR_NOT_FOUND; @@ -450,6 +452,7 @@ static void dxgi_adapter_init(struct dxgi_adapter *adapter, struct dxgi_factory { adapter->IWineDXGIAdapter_iface.lpVtbl = &dxgi_adapter_vtbl; adapter->refcount = 1; + wined3d_enum_adapters(factory->wined3d, ordinal, &adapter->wined3d_adapter); wined3d_private_store_init(&adapter->private_store); adapter->ordinal = ordinal; adapter->factory = factory; diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index 5b934498349..56939e2aaa6 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -156,6 +156,7 @@ struct dxgi_adapter { IWineDXGIAdapter IWineDXGIAdapter_iface; LONG refcount; + struct wined3d_adapter *wined3d_adapter; struct wined3d_private_store private_store; UINT ordinal; struct dxgi_factory *factory; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index cd9c8350148..4133bedb335 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -885,6 +885,13 @@ UINT CDECL wined3d_get_adapter_count(const struct wined3d *wined3d) return wined3d->adapter_count; } +UINT CDECL wined3d_adapter_get_output_count(const struct wined3d_adapter *adapter) +{ + TRACE("adapter %p, reporting %u outputs.\n", adapter, adapter->output_count); + + return adapter->output_count; +} + HRESULT CDECL wined3d_register_software_device(struct wined3d *wined3d, void *init_function) { FIXME("wined3d %p, init_function %p stub!\n", wined3d, init_function); @@ -2836,6 +2843,7 @@ BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, unsigned int ordinal, ERR("Failed to initialise output, hr %#x.\n", hr); return FALSE; } + adapter->output_count = 1; if (!AllocateLocallyUniqueId(&adapter->luid)) { diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 3299e5a78e5..44b4d22e312 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -26,6 +26,8 @@ @ cdecl wined3d_set_adapter_display_mode(ptr long ptr) @ cdecl wined3d_unregister_windows(ptr) +@ cdecl wined3d_adapter_get_output_count(ptr) + @ cdecl wined3d_blend_state_create(ptr ptr ptr ptr ptr) @ cdecl wined3d_blend_state_decref(ptr) @ cdecl wined3d_blend_state_get_parent(ptr) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 744e647008e..e2e03683b8c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2914,6 +2914,7 @@ struct wined3d_adapter struct wined3d_d3d_info d3d_info; struct wined3d_driver_info driver_info; struct wined3d_output output; + UINT output_count; UINT64 vram_bytes_used; GUID driver_uuid; GUID device_uuid; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 39286145ccf..fd587934757 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2287,6 +2287,8 @@ HRESULT __cdecl wined3d_set_adapter_display_mode(struct wined3d *wined3d, UINT adapter_idx, const struct wined3d_display_mode *mode); void __cdecl wined3d_unregister_windows(struct wined3d *wined3d); +UINT __cdecl wined3d_adapter_get_output_count(const struct wined3d_adapter *adapter); + HRESULT __cdecl wined3d_buffer_create(struct wined3d_device *device, const struct wined3d_buffer_desc *desc, const struct wined3d_sub_resource_data *data, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_buffer **buffer); -- 2.20.1

1 0

[PATCH 1/5] wined3d: Introduce wined3d_enum_adapters().
by Zhiyi Zhang 02 Mar '20

02 Mar '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/wined3d/directx.c | 12 ++++++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 3 +++ 3 files changed, 16 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 4d6f63c2ffb..cd9c8350148 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -865,6 +865,18 @@ enum wined3d_pci_device wined3d_gpu_from_feature_level(enum wined3d_pci_vendor * return device_id; } +HRESULT CDECL wined3d_enum_adapters(const struct wined3d *wined3d, UINT adapter_idx, + struct wined3d_adapter **adapter) +{ + TRACE("wined3d %p, adapter_idx %u, adapter %p.\n", wined3d, adapter_idx, adapter); + + if (adapter_idx >= wined3d->adapter_count) + return WINED3DERR_INVALIDCALL; + + *adapter = wined3d->adapters[adapter_idx]; + return WINED3D_OK; +} + UINT CDECL wined3d_get_adapter_count(const struct wined3d *wined3d) { TRACE("wined3d %p, reporting %u adapters.\n", diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 8538b3dcd6e..3299e5a78e5 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -9,6 +9,7 @@ @ cdecl wined3d_check_device_type(ptr long long long long long) @ cdecl wined3d_create(long) @ cdecl wined3d_decref(ptr) +@ cdecl wined3d_enum_adapters(ptr long ptr) @ cdecl wined3d_enum_adapter_modes(ptr long long long long ptr) @ cdecl wined3d_find_closest_matching_adapter_mode(ptr long ptr) @ cdecl wined3d_get_adapter_count(ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 908a1c92668..39286145ccf 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2178,6 +2178,7 @@ struct wined3d_parent_ops }; struct wined3d; +struct wined3d_adapter; struct wined3d_blend_state; struct wined3d_buffer; struct wined3d_device; @@ -2257,6 +2258,8 @@ HRESULT __cdecl wined3d_check_device_type(const struct wined3d *wined3d, UINT ad enum wined3d_format_id backbuffer_format_id, BOOL windowed); struct wined3d * __cdecl wined3d_create(DWORD flags); ULONG __cdecl wined3d_decref(struct wined3d *wined3d); +HRESULT __cdecl wined3d_enum_adapters(const struct wined3d *wined3d, UINT adapter_idx, + struct wined3d_adapter **adapter); HRESULT __cdecl wined3d_enum_adapter_modes(const struct wined3d *wined3d, UINT adapter_idx, enum wined3d_format_id format_id, enum wined3d_scanline_ordering scanline_ordering, UINT mode_idx, struct wined3d_display_mode *mode); -- 2.20.1

1 0

[PATCH 1/2] winemenubuilder: Blacklist desktop integration for certain associations
by Alex Henrie 02 Mar '20

02 Mar '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=41275 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/mshtml/mshtml.inf | 6 +++ loader/wine.inf.in | 10 ++++ programs/winemenubuilder/winemenubuilder.c | 54 +++++++++++++++++++--- 3 files changed, 63 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/mshtml.inf b/dlls/mshtml/mshtml.inf index 4a650b444f..548739f432 100644 --- a/dlls/mshtml/mshtml.inf +++ b/dlls/mshtml/mshtml.inf @@ -111,6 +111,7 @@ HKCR,"giffile\shell\open\ddeexec",,,"""file:%%1"",,-1,,,,," HKCR,"giffile\shell\open\ddeexec\Application",,,"IExplore" HKCR,"giffile\shell\open\ddeexec\Topic",,,"WWW_OpenURL" ;; HKCR,"giffile\DefaultIcon",,,"%16422%\Internet Explorer\iexplore.exe,9" +HKCU,Software\Wine\FileOpenBlacklist\.gif,"iexplore",,"""%16422%\Internet Explorer\iexplore.exe"" -nohome" ;; GZIP HKCR,"MIME\Database\Content Type\application/x-gzip","Extension",,".gz" @@ -158,6 +159,7 @@ HKCR,"jpegfile\shell\open\ddeexec",,,"""file:%%1"",,-1,,,,," HKCR,"jpegfile\shell\open\ddeexec\Application",,,"IExplore" HKCR,"jpegfile\shell\open\ddeexec\Topic",,,"WWW_OpenURL" ;; HKCR,"jpegfile\DefaultIcon",,,"%16422%\Internet Explorer\iexplore.exe,8" +HKCU,Software\Wine\FileOpenBlacklist\.jpe,"iexplore",,"""%16422%\Internet Explorer\iexplore.exe"" -nohome" ;; JPEG HKCR,"MIME\Database\Content Type\image/jpeg","CLSID",,"%CLSID_HTMLDocument%" @@ -173,6 +175,7 @@ HKCR,"jpegfile\shell\open\ddeexec",,,"""file:%%1"",,-1,,,,," HKCR,"jpegfile\shell\open\ddeexec\Application",,,"IExplore" HKCR,"jpegfile\shell\open\ddeexec\Topic",,,"WWW_OpenURL" ;; HKCR,"jpegfile\DefaultIcon",,,"%16422%\Internet Explorer\iexplore.exe,8" +HKCU,Software\Wine\FileOpenBlacklist\.jpeg,"iexplore",,"""%16422%\Internet Explorer\iexplore.exe"" -nohome" ;; JPG HKCR,".jpg",,2,"jpegfile" @@ -184,6 +187,7 @@ HKCR,"jpegfile\shell\open\ddeexec",,,"""file:%%1"",,-1,,,,," HKCR,"jpegfile\shell\open\ddeexec\Application",,,"IExplore" HKCR,"jpegfile\shell\open\ddeexec\Topic",,,"WWW_OpenURL" ;; HKCR,"jpegfile\DefaultIcon",,,"%16422%\Internet Explorer\iexplore.exe,8" +HKCU,Software\Wine\FileOpenBlacklist\.jpg,"iexplore",,"""%16422%\Internet Explorer\iexplore.exe"" -nohome" ;; MHTML HKCR,"MIME\Database\Content Type\message/rfc822","CLSID",,"%CLSID_MHTMLDocument%" @@ -221,6 +225,7 @@ HKCR,"pjpegfile\shell\open\ddeexec",,,"""file:%%1"",,-1,,,,," HKCR,"pjpegfile\shell\open\ddeexec\Application",,,"IExplore" HKCR,"pjpegfile\shell\open\ddeexec\Topic",,,"WWW_OpenURL" ;; HKCR,"pjpegfile\DefaultIcon",,,"%16422%\Internet Explorer\iexplore.exe,8" +HKCU,Software\Wine\FileOpenBlacklist\.jfif,"iexplore",,"""%16422%\Internet Explorer\iexplore.exe"" -nohome" ;; PNG HKCR,"MIME\Database\Content Type\image/png","Extension",,".png" @@ -234,6 +239,7 @@ HKCR,"pngfile\shell\open\ddeexec",,,"""file:%%1"",,-1,,,,," HKCR,"pngfile\shell\open\ddeexec\Application",,,"IExplore" HKCR,"pngfile\shell\open\ddeexec\Topic",,,"WWW_OpenURL" ;; HKCR,"pngfile\DefaultIcon",,,"%16422%\Internet Explorer\iexplore.exe,9" +HKCU,Software\Wine\FileOpenBlacklist\.png,"iexplore",,"""%16422%\Internet Explorer\iexplore.exe"" -nohome" ;; PS HKCR,"MIME\Database\Content Type\application/postscript","Extension",,".ps" diff --git a/loader/wine.inf.in b/loader/wine.inf.in index bca478e6d7..e963b4e0f3 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -501,6 +501,16 @@ HKCR,MIME\Database\Charset\us-ascii,"AliasForCharset",,iso-8859-1 HKCR,MIME\Database\Charset\visual,"AliasForCharset",,iso-8859-8 HKCR,MIME\Database\Charset\Windows-1254,"AliasForCharset",,iso-8859-9 +HKCU,Software\Wine\FileOpenBlacklist\.htm,"winebrowser",,"""%11%\winebrowser.exe"" -nohome" +HKCU,Software\Wine\FileOpenBlacklist\.html,"winebrowser",,"""%11%\winebrowser.exe"" -nohome" +HKCU,Software\Wine\FileOpenBlacklist\.ini,"notepad",,"%11%\notepad.exe %1" +HKCU,Software\Wine\FileOpenBlacklist\.pdf,"winebrowser",,"""%11%\winebrowser.exe"" -nohome" +HKCU,Software\Wine\FileOpenBlacklist\.rtf,"wordpad",,"""%16422%\Windows NT\Accessories\wordpad.exe"" %1" +HKCU,Software\Wine\FileOpenBlacklist\.txt,"notepad",,"%11%\notepad.exe %1" +HKCU,Software\Wine\FileOpenBlacklist\.url,"ieframe",,"rundll32.exe ieframe.dll,OpenURL %l" +HKCU,Software\Wine\FileOpenBlacklist\.wri,"wordpad",,"""%16422%\Windows NT\Accessories\wordpad.exe"" %1" +HKCU,Software\Wine\FileOpenBlacklist\.xml,"winebrowser",,"""%11%\winebrowser.exe"" -nohome" + [ContentIndex] HKLM,System\CurrentControlSet\Control\ContentIndex\Language\Neutral,"WBreakerClass",,"{369647e0-17b0-11ce-9950-00aa004bbb1f}" HKLM,System\CurrentControlSet\Control\ContentIndex\Language\Neutral,"StemmerClass",,"" diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index fa700f8c19..6f1dd7c571 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -2465,7 +2465,7 @@ static BOOL write_freedesktop_mime_type_entry(const char *packages_dir, const ch return ret; } -static BOOL is_extension_blacklisted(LPCWSTR extension) +static BOOL is_hard_blacklisted(const WCHAR *extension) { /* These are managed through external tools like wine.desktop, to evade malware created file type associations */ static const WCHAR comW[] = {'.','c','o','m',0}; @@ -2479,6 +2479,42 @@ static BOOL is_extension_blacklisted(LPCWSTR extension) return FALSE; } +static BOOL is_soft_blacklisted(const WCHAR *extension, const WCHAR *command) +{ + static const WCHAR FileOpenBlacklistW[] = {'S','o','f','t','w','a','r','e','\\', + 'W','i','n','e','\\', + 'F','i','l','e','O','p','e','n','B','l','a','c','k','l','i','s','t','\\',0}; + WCHAR blacklist_key_path[MAX_PATH]; + HKEY blacklist_key; + WCHAR program_name[MAX_PATH], *blacklisted_command; + DWORD len = ARRAY_SIZE(program_name); + DWORD i = 0; + + if (ARRAY_SIZE(FileOpenBlacklistW) + lstrlenW(extension) > ARRAY_SIZE(blacklist_key_path)) + return FALSE; + + lstrcpyW(blacklist_key_path, FileOpenBlacklistW); + lstrcatW(blacklist_key_path, extension); + + if (RegOpenKeyExW(HKEY_CURRENT_USER, blacklist_key_path, 0, KEY_QUERY_VALUE, &blacklist_key) != ERROR_SUCCESS) + return FALSE; + + while (RegEnumValueW(blacklist_key, i, program_name, &len, NULL, NULL, NULL, NULL) == ERROR_SUCCESS) + { + blacklisted_command = reg_get_valW(HKEY_CURRENT_USER, blacklist_key_path, program_name); + if (strcmpW(command, blacklisted_command) == 0) + { + RegCloseKey(blacklist_key); + return TRUE; + } + len = ARRAY_SIZE(program_name); + i++; + } + + RegCloseKey(blacklist_key); + return FALSE; +} + static const char* get_special_mime_type(LPCWSTR extension) { static const WCHAR lnkW[] = {'.','l','n','k',0}; @@ -2552,7 +2588,7 @@ static BOOL generate_associations(const char *xdg_data_home, const char *package size *= 2; } while (ret == ERROR_MORE_DATA); - if (ret == ERROR_SUCCESS && extensionW[0] == '.' && !is_extension_blacklisted(extensionW)) + if (ret == ERROR_SUCCESS && extensionW[0] == '.' && !is_hard_blacklisted(extensionW)) { char *extensionA = NULL; WCHAR *commandW = NULL; @@ -2570,6 +2606,15 @@ static BOOL generate_associations(const char *xdg_data_home, const char *package char *progIdA = NULL; char *mimeProgId = NULL; + commandW = assoc_query(ASSOCSTR_COMMAND, extensionW, openW); + if (commandW == NULL) + /* no command => no application is associated */ + goto end; + + if (is_soft_blacklisted(extensionW, commandW)) + /* command is on the blacklist => desktop integration is not desirable */ + goto end; + extensionA = wchars_to_utf8_chars(strlwrW(extensionW)); if (extensionA == NULL) { @@ -2638,11 +2683,6 @@ static BOOL generate_associations(const char *xdg_data_home, const char *package } } - commandW = assoc_query(ASSOCSTR_COMMAND, extensionW, openW); - if (commandW == NULL) - /* no command => no application is associated */ - goto end; - executableW = assoc_query(ASSOCSTR_EXECUTABLE, extensionW, openW); if (executableW) openWithIconA = extract_icon(executableW, 0, NULL, FALSE); -- 2.25.1

2 3

[PATCH v2] oledb32: Initialize all DBGUID values
by Alistair Leslie-Hughes 02 Mar '20

02 Mar '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/oledb32/datainit.c | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/dlls/oledb32/datainit.c b/dlls/oledb32/datainit.c index 2acd23ea08..130fb626ea 100644 --- a/dlls/oledb32/datainit.c +++ b/dlls/oledb32/datainit.c @@ -34,7 +34,26 @@ WINE_DEFAULT_DEBUG_CHANNEL(oledb); -DEFINE_GUID(DBPROPSET_DBINIT, 0xc8b522bc, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); +DEFINE_GUID(DB_NULLGUID, 0x00000000, 0x0000, 0x0000, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00); +DEFINE_GUID(DBGUID_SESSION, 0xc8b522f5, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); +DEFINE_GUID(DBGUID_ROWSET, 0xc8b522f6, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); +DEFINE_GUID(DBGUID_ROW, 0xc8b522f7, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); +DEFINE_GUID(DBGUID_STREAM, 0xc8b522f9, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); + +DEFINE_GUID(DBPROPSET_COLUMN, 0xc8b522b9, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); +DEFINE_GUID(DBPROPSET_DATASOURCE, 0xc8b522ba, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); +DEFINE_GUID(DBPROPSET_DATASOURCEINFO, 0xc8b522bb, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); +DEFINE_GUID(DBPROPSET_DBINIT, 0xc8b522bc, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); +DEFINE_GUID(DBPROPSET_INDEX, 0xc8b522bd, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); +DEFINE_GUID(DBPROPSET_ROWSET, 0xc8b522be, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); +DEFINE_GUID(DBPROPSET_TABLE, 0xc8b522bf, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); +DEFINE_GUID(DBPROPSET_DATASOURCEALL, 0xc8b522c0, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); +DEFINE_GUID(DBPROPSET_DATASOURCEINFOALL, 0xc8b522c1, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); +DEFINE_GUID(DBPROPSET_ROWSETALL, 0xc8b522c2, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); +DEFINE_GUID(DBPROPSET_SESSION, 0xc8b522c6, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); +DEFINE_GUID(DBPROPSET_SESSIONALL, 0xc8b522c7, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); +DEFINE_GUID(DBPROPSET_DBINITALL, 0xc8b522ca, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); +DEFINE_GUID(DBPROPSET_PROPERTIESINERROR, 0xc8b522d4, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); typedef struct datainit { -- 2.25.1

1 0

[PATCH 4/4] kernel32: Get[*]PreferredUILanguages should return buffer size when setting ERROR_INSUFFICIENT_BUFFER.
by Dmitry Timoshkov 02 Mar '20

02 Mar '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kernel32/locale.c | 1 + dlls/kernel32/tests/locale.c | 5 ----- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 98f9efa1b6..63b27f9453 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -112,6 +112,7 @@ static BOOL get_dummy_preferred_ui_language( DWORD flags, ULONG *count, WCHAR *b if (lsize > *size) { + *size = lsize; SetLastError(ERROR_INSUFFICIENT_BUFFER); return FALSE; } diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index eff6c88b9e..fa067b7301 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -5477,7 +5477,6 @@ todo_wine ok(!ret, "Expected GetSystemPreferredUILanguages to fail\n"); ok(ERROR_INSUFFICIENT_BUFFER == GetLastError(), "Expected error ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); -todo_wine ok(size == size_id, "expected %u, got %u\n", size_id, size); size = size_id -1; @@ -5487,7 +5486,6 @@ todo_wine ok(!ret, "Expected GetSystemPreferredUILanguages to fail\n"); ok(ERROR_INSUFFICIENT_BUFFER == GetLastError(), "Expected error ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); -todo_wine ok(size == size_id, "expected %u, got %u\n", size_id, size); size = size_id -2; @@ -5497,7 +5495,6 @@ todo_wine ok(!ret, "Expected GetSystemPreferredUILanguages to fail\n"); ok(ERROR_INSUFFICIENT_BUFFER == GetLastError(), "Expected error ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); -todo_wine ok(size == size_id + 2 || size == size_id + 1 /* before win10 1809 */, "expected %u, got %u\n", size_id + 2, size); HeapFree(GetProcessHeap(), 0, buffer); @@ -5550,7 +5547,6 @@ todo_wine ok(!ret, "Expected GetThreadPreferredUILanguages to fail\n"); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Expected error ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); -todo_wine ok(size == size_id, "expected %u, got %u\n", size_id, size); size = size_id - 1; @@ -5559,7 +5555,6 @@ todo_wine ok(!ret, "Expected GetThreadPreferredUILanguages to fail\n"); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Expected error ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); -todo_wine ok(size == size_id, "expected %u, got %u\n", size_id, size); size = size_id - 2; -- 2.20.1

1 0

[PATCH 3/4] kernel32/tests: Add more tests for Get[*]PreferredUILanguages APIs.
by Dmitry Timoshkov 02 Mar '20

02 Mar '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kernel32/tests/locale.c | 63 +++++++++++++++++++++++++++++++++++- 1 file changed, 62 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 8ff630a1eb..eff6c88b9e 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -5461,12 +5461,24 @@ static void test_GetSystemPreferredUILanguages(void) "Expected last two WCHARs being empty, got 0x%x 0x%x\n", buffer[size -2], buffer[size -1]); + size = 0; + SetLastError(0xdeadbeef); + ret = pGetSystemPreferredUILanguages(MUI_LANGUAGE_ID, &count, buffer, &size); +todo_wine + ok(!ret, "Expected GetSystemPreferredUILanguages to fail\n"); +todo_wine + ok(ERROR_INSUFFICIENT_BUFFER == GetLastError(), + "Expected error ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); + ok(size == size_id, "expected %u, got %u\n", size_id, size); + size = 1; SetLastError(0xdeadbeef); ret = pGetSystemPreferredUILanguages(MUI_LANGUAGE_ID, &count, buffer, &size); ok(!ret, "Expected GetSystemPreferredUILanguages to fail\n"); ok(ERROR_INSUFFICIENT_BUFFER == GetLastError(), "Expected error ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); +todo_wine + ok(size == size_id, "expected %u, got %u\n", size_id, size); size = size_id -1; memset(buffer, 0x5a, size_buffer * sizeof(WCHAR)); @@ -5475,6 +5487,8 @@ static void test_GetSystemPreferredUILanguages(void) ok(!ret, "Expected GetSystemPreferredUILanguages to fail\n"); ok(ERROR_INSUFFICIENT_BUFFER == GetLastError(), "Expected error ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); +todo_wine + ok(size == size_id, "expected %u, got %u\n", size_id, size); size = size_id -2; memset(buffer, 0x5a, size_buffer * sizeof(WCHAR)); @@ -5483,6 +5497,8 @@ static void test_GetSystemPreferredUILanguages(void) ok(!ret, "Expected GetSystemPreferredUILanguages to fail\n"); ok(ERROR_INSUFFICIENT_BUFFER == GetLastError(), "Expected error ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); +todo_wine + ok(size == size_id + 2 || size == size_id + 1 /* before win10 1809 */, "expected %u, got %u\n", size_id + 2, size); HeapFree(GetProcessHeap(), 0, buffer); } @@ -5490,7 +5506,7 @@ static void test_GetSystemPreferredUILanguages(void) static void test_GetThreadPreferredUILanguages(void) { BOOL ret; - ULONG count, size; + ULONG count, size, size_id; WCHAR *buf; if (!pGetThreadPreferredUILanguages) @@ -5510,6 +5526,51 @@ static void test_GetThreadPreferredUILanguages(void) ret = pGetThreadPreferredUILanguages(MUI_LANGUAGE_ID|MUI_UI_FALLBACK, &count, buf, &size); ok(ret, "got %u\n", GetLastError()); ok(count, "expected count > 0\n"); + + size_id = count = 0; + ret = pGetThreadPreferredUILanguages(MUI_LANGUAGE_ID, &count, NULL, &size_id); + ok(ret, "got %u\n", GetLastError()); + ok(count, "expected count > 0\n"); + ok(size_id, "expected size > 0\n"); + ok(size_id <= size, "expected size > 0\n"); + + size = 0; + SetLastError(0xdeadbeef); + ret = pGetThreadPreferredUILanguages(MUI_LANGUAGE_ID, &count, buf, &size); +todo_wine + ok(!ret, "Expected GetThreadPreferredUILanguages to fail\n"); +todo_wine + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "Expected error ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); + ok(size == size_id, "expected %u, got %u\n", size_id, size); + + size = 1; + SetLastError(0xdeadbeef); + ret = pGetThreadPreferredUILanguages(MUI_LANGUAGE_ID, &count, buf, &size); + ok(!ret, "Expected GetThreadPreferredUILanguages to fail\n"); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "Expected error ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); +todo_wine + ok(size == size_id, "expected %u, got %u\n", size_id, size); + + size = size_id - 1; + SetLastError(0xdeadbeef); + ret = pGetThreadPreferredUILanguages(MUI_LANGUAGE_ID, &count, buf, &size); + ok(!ret, "Expected GetThreadPreferredUILanguages to fail\n"); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "Expected error ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); +todo_wine + ok(size == size_id, "expected %u, got %u\n", size_id, size); + + size = size_id - 2; + SetLastError(0xdeadbeef); + ret = pGetThreadPreferredUILanguages(0, &count, buf, &size); + ok(!ret, "Expected GetThreadPreferredUILanguages to fail\n"); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "Expected error ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); +todo_wine + ok(size == size_id || size == size_id - 1 /* before win10 1809 */, "expected %u, got %u\n", size_id, size); + HeapFree(GetProcessHeap(), 0, buf); } -- 2.20.1

1 0

[PATCH 2/4] kernel32/tests: Fix initialization of parameters in Get[*]PreferredUILanguages tests.
by Dmitry Timoshkov 02 Mar '20

02 Mar '20

This patch removes initialization of unsued parameters and uses - count = 0xdeadbeef; + count = 0; when after an API call 'count' is checked by ok(count, "Expected count > 0\n"); Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kernel32/tests/locale.c | 44 ++++++++++++------------------------ 1 file changed, 15 insertions(+), 29 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 31add74e4e..8ff630a1eb 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -5318,7 +5318,7 @@ static void test_GetSystemPreferredUILanguages(void) } /* (in)valid first parameter */ - count = 0xdeadbeef; + count = 0; size = 0; SetLastError(0xdeadbeef); ret = pGetSystemPreferredUILanguages(0, &count, NULL, &size); @@ -5326,7 +5326,6 @@ static void test_GetSystemPreferredUILanguages(void) ok(count, "Expected count > 0\n"); ok(size % 6 == 1, "Expected size (%d) %% 6 == 1\n", size); - count = 0xdeadbeef; size = 0; SetLastError(0xdeadbeef); ret = pGetSystemPreferredUILanguages(MUI_FULL_LANGUAGE, &count, NULL, &size); @@ -5334,7 +5333,6 @@ static void test_GetSystemPreferredUILanguages(void) ok(ERROR_INVALID_PARAMETER == GetLastError(), "Expected error ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); - count = 0xdeadbeef; size = 0; SetLastError(0xdeadbeef); ret = pGetSystemPreferredUILanguages(MUI_LANGUAGE_ID | MUI_FULL_LANGUAGE, &count, NULL, &size); @@ -5342,7 +5340,6 @@ static void test_GetSystemPreferredUILanguages(void) ok(ERROR_INVALID_PARAMETER == GetLastError(), "Expected error ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); - count = 0xdeadbeef; size = 0; SetLastError(0xdeadbeef); ret = pGetSystemPreferredUILanguages(MUI_LANGUAGE_ID | MUI_LANGUAGE_NAME, &count, NULL, &size); @@ -5350,7 +5347,7 @@ static void test_GetSystemPreferredUILanguages(void) ok(ERROR_INVALID_PARAMETER == GetLastError(), "Expected error ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); - count = 0xdeadbeef; + count = 0; size = 0; SetLastError(0xdeadbeef); ret = pGetSystemPreferredUILanguages(MUI_LANGUAGE_ID | MUI_MACHINE_LANGUAGE_SETTINGS, &count, NULL, &size); @@ -5358,7 +5355,7 @@ static void test_GetSystemPreferredUILanguages(void) ok(count, "Expected count > 0\n"); ok(size % 5 == 1, "Expected size (%d) %% 5 == 1\n", size); - count = 0xdeadbeef; + count = 0; size = 0; SetLastError(0xdeadbeef); ret = pGetSystemPreferredUILanguages(MUI_LANGUAGE_NAME | MUI_MACHINE_LANGUAGE_SETTINGS, &count, NULL, &size); @@ -5372,7 +5369,6 @@ static void test_GetSystemPreferredUILanguages(void) */ /* invalid third parameter */ - count = 0xdeadbeef; size = 1; SetLastError(0xdeadbeef); ret = pGetSystemPreferredUILanguages(MUI_LANGUAGE_ID, &count, NULL, &size); @@ -5385,7 +5381,7 @@ static void test_GetSystemPreferredUILanguages(void) * -> unhandled exception c0000005 */ - count = 0xdeadbeef; + count = 0; size_id = 0; SetLastError(0xdeadbeef); ret = pGetSystemPreferredUILanguages(MUI_LANGUAGE_ID, &count, NULL, &size_id); @@ -5393,7 +5389,7 @@ static void test_GetSystemPreferredUILanguages(void) ok(count, "Expected count > 0\n"); ok(size_id % 5 == 1, "Expected size (%d) %% 5 == 1\n", size_id); - count = 0xdeadbeef; + count = 0; size_name = 0; SetLastError(0xdeadbeef); ret = pGetSystemPreferredUILanguages(MUI_LANGUAGE_NAME, &count, NULL, &size_name); @@ -5415,7 +5411,7 @@ static void test_GetSystemPreferredUILanguages(void) return; } - count = 0xdeadbeef; + count = 0; size = size_buffer; memset(buffer, 0x5a, size_buffer * sizeof(WCHAR)); SetLastError(0xdeadbeef); @@ -5428,7 +5424,7 @@ static void test_GetSystemPreferredUILanguages(void) "Expected last two WCHARs being empty, got 0x%x 0x%x\n", buffer[size -2], buffer[size -1]); - count = 0xdeadbeef; + count = 0; size = size_buffer; memset(buffer, 0x5a, size_buffer * sizeof(WCHAR)); SetLastError(0xdeadbeef); @@ -5441,7 +5437,7 @@ static void test_GetSystemPreferredUILanguages(void) "Expected last two WCHARs being empty, got 0x%x 0x%x\n", buffer[size -2], buffer[size -1]); - count = 0xdeadbeef; + count = 0; size = size_buffer; SetLastError(0xdeadbeef); ret = pGetSystemPreferredUILanguages(MUI_LANGUAGE_NAME, &count, buffer, &size); @@ -5453,7 +5449,7 @@ static void test_GetSystemPreferredUILanguages(void) "Expected last two WCHARs being empty, got 0x%x 0x%x\n", buffer[size -2], buffer[size -1]); - count = 0xdeadbeef; + count = 0; size = 0; SetLastError(0xdeadbeef); ret = pGetSystemPreferredUILanguages(MUI_MACHINE_LANGUAGE_SETTINGS, &count, NULL, &size); @@ -5465,7 +5461,6 @@ static void test_GetSystemPreferredUILanguages(void) "Expected last two WCHARs being empty, got 0x%x 0x%x\n", buffer[size -2], buffer[size -1]); - count = 0xdeadbeef; size = 1; SetLastError(0xdeadbeef); ret = pGetSystemPreferredUILanguages(MUI_LANGUAGE_ID, &count, buffer, &size); @@ -5473,7 +5468,6 @@ static void test_GetSystemPreferredUILanguages(void) ok(ERROR_INSUFFICIENT_BUFFER == GetLastError(), "Expected error ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); - count = 0xdeadbeef; size = size_id -1; memset(buffer, 0x5a, size_buffer * sizeof(WCHAR)); SetLastError(0xdeadbeef); @@ -5482,7 +5476,6 @@ static void test_GetSystemPreferredUILanguages(void) ok(ERROR_INSUFFICIENT_BUFFER == GetLastError(), "Expected error ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); - count = 0xdeadbeef; size = size_id -2; memset(buffer, 0x5a, size_buffer * sizeof(WCHAR)); SetLastError(0xdeadbeef); @@ -5526,14 +5519,12 @@ static void test_GetUserPreferredUILanguages(void) ULONG count, size, size_id, size_name, size_buffer; WCHAR *buffer; - if (!pGetUserPreferredUILanguages) { win_skip("GetUserPreferredUILanguages is not available.\n"); return; } - count = 0xdeadbeef; size = 0; SetLastError(0xdeadbeef); ret = pGetUserPreferredUILanguages(MUI_FULL_LANGUAGE, &count, NULL, &size); @@ -5541,7 +5532,6 @@ static void test_GetUserPreferredUILanguages(void) ok(ERROR_INVALID_PARAMETER == GetLastError(), "Expected error ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); - count = 0xdeadbeef; size = 0; SetLastError(0xdeadbeef); ret = pGetUserPreferredUILanguages(MUI_LANGUAGE_ID | MUI_FULL_LANGUAGE, &count, NULL, &size); @@ -5549,7 +5539,6 @@ static void test_GetUserPreferredUILanguages(void) ok(ERROR_INVALID_PARAMETER == GetLastError(), "Expected error ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); - count = 0xdeadbeef; size = 0; SetLastError(0xdeadbeef); ret = pGetUserPreferredUILanguages(MUI_LANGUAGE_ID | MUI_MACHINE_LANGUAGE_SETTINGS, &count, NULL, &size); @@ -5557,7 +5546,6 @@ static void test_GetUserPreferredUILanguages(void) ok(ERROR_INVALID_PARAMETER == GetLastError(), "Expected error ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); - count = 0xdeadbeef; size = 1; SetLastError(0xdeadbeef); ret = pGetUserPreferredUILanguages(MUI_LANGUAGE_ID, &count, NULL, &size); @@ -5565,7 +5553,7 @@ static void test_GetUserPreferredUILanguages(void) ok(ERROR_INVALID_PARAMETER == GetLastError(), "Expected error ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); - count = 0xdeadbeef; + count = 0; size_id = 0; SetLastError(0xdeadbeef); ret = pGetUserPreferredUILanguages(MUI_LANGUAGE_ID, &count, NULL, &size_id); @@ -5573,7 +5561,7 @@ static void test_GetUserPreferredUILanguages(void) ok(count, "Expected count > 0\n"); ok(size_id % 5 == 1, "Expected size (%d) %% 5 == 1\n", size_id); - count = 0xdeadbeef; + count = 0; size_name = 0; SetLastError(0xdeadbeef); ret = pGetUserPreferredUILanguages(MUI_LANGUAGE_NAME, &count, NULL, &size_name); @@ -5590,7 +5578,7 @@ static void test_GetUserPreferredUILanguages(void) buffer = HeapAlloc(GetProcessHeap(), 0, size_buffer * sizeof(WCHAR)); - count = 0xdeadbeef; + count = 0; size = size_buffer; memset(buffer, 0x5a, size_buffer * sizeof(WCHAR)); SetLastError(0xdeadbeef); @@ -5603,7 +5591,7 @@ static void test_GetUserPreferredUILanguages(void) "Expected last two WCHARs being empty, got 0x%x 0x%x\n", buffer[size -2], buffer[size -1]); - count = 0xdeadbeef; + count = 0; size = size_buffer; memset(buffer, 0x5a, size_buffer * sizeof(WCHAR)); SetLastError(0xdeadbeef); @@ -5616,7 +5604,7 @@ static void test_GetUserPreferredUILanguages(void) "Expected last two WCHARs being empty, got 0x%x 0x%x\n", buffer[size -2], buffer[size -1]); - count = 0xdeadbeef; + count = 0; size = size_buffer; SetLastError(0xdeadbeef); ret = pGetUserPreferredUILanguages(MUI_LANGUAGE_NAME, &count, buffer, &size); @@ -5628,7 +5616,6 @@ static void test_GetUserPreferredUILanguages(void) "Expected last two WCHARs being empty, got 0x%x 0x%x\n", buffer[size -2], buffer[size -1]); - count = 0xdeadbeef; size = 1; SetLastError(0xdeadbeef); ret = pGetUserPreferredUILanguages(MUI_LANGUAGE_ID, &count, buffer, &size); @@ -5636,7 +5623,6 @@ static void test_GetUserPreferredUILanguages(void) ok(ERROR_INSUFFICIENT_BUFFER == GetLastError(), "Expected error ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); - count = 0xdeadbeef; size = size_id -1; memset(buffer, 0x5a, size_buffer * sizeof(WCHAR)); SetLastError(0xdeadbeef); @@ -5645,7 +5631,7 @@ static void test_GetUserPreferredUILanguages(void) ok(ERROR_INSUFFICIENT_BUFFER == GetLastError(), "Expected error ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); - count = 0xdeadbeef; + count = 0; size = size_id -2; memset(buffer, 0x5a, size_buffer * sizeof(WCHAR)); SetLastError(0xdeadbeef); -- 2.20.1

1 0

[PATCH 1/4] kernel32/tests: Fix locale.c compilation with Visual Studio 14.0.
by Dmitry Timoshkov 02 Mar '20

02 Mar '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kernel32/tests/locale.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 1df3c0dcd6..31add74e4e 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -25,6 +25,8 @@ * the control panel i8n page), we will still get the expected results. */ +#define _CRT_NON_CONFORMING_WCSTOK + #include <assert.h> #include <stdlib.h> #include <stdarg.h> @@ -4197,7 +4199,7 @@ static void test_GetCPInfo(void) for (i = 0; i <= sizeof(buf); i++) { memset( wbuf, 0xcc, sizeof(wbuf) ); - RtlCustomCPToUnicodeN( &table, wbuf, sizeof(wbuf), &reslen, (char *)buf, i ); + pRtlCustomCPToUnicodeN( &table, wbuf, sizeof(wbuf), &reslen, (char *)buf, i ); for (j = 0; j < 4; j++) if (expect[i][j] == 0xcccc) break; ok( reslen == j * sizeof(WCHAR), "%u: wrong len %u\n", i, reslen ); for (j = 0; j < 4; j++) -- 2.20.1

1 0

[PATCH] include/sal.h: Add _Ret_writes_z_ for Visual Studio 14.0.
by Dmitry Timoshkov 02 Mar '20

02 Mar '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- include/sal.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/sal.h b/include/sal.h index 81a828dd97..ca8b824f1b 100644 --- a/include/sal.h +++ b/include/sal.h @@ -217,6 +217,7 @@ #define _Ret_opt_z_cap_(count) #define _Ret_range_(exp,exp2) #define _Ret_writes_bytes_maybenull_(count) +#define _Ret_writes_z_(count) #define _Ret_z_ #define _Return_type_success_(count) -- 2.20.1

1 0

[PATCH] oledb32: Initialize all DBGUID values
by Alistair Leslie-Hughes 02 Mar '20

02 Mar '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/oledb32/datainit.c | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/dlls/oledb32/datainit.c b/dlls/oledb32/datainit.c index 2acd23ea083..072bb1ece14 100644 --- a/dlls/oledb32/datainit.c +++ b/dlls/oledb32/datainit.c @@ -34,7 +34,26 @@ WINE_DEFAULT_DEBUG_CHANNEL(oledb); -DEFINE_GUID(DBPROPSET_DBINIT, 0xc8b522bc, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); +DEFINE_DBGUID(DB_NULLGUID, 0x00000000, 0x0000, 0x0000, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00); +DEFINE_DBGUID(DBGUID_SESSION, 0xc8b522f5, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); +DEFINE_DBGUID(DBGUID_ROWSET, 0xc8b522f6, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); +DEFINE_DBGUID(DBGUID_ROW, 0xc8b522f7, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); +DEFINE_DBGUID(DBGUID_STREAM, 0xc8b522f9, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); + +DEFINE_DBGUID(DBPROPSET_COLUMN, 0xc8b522b9, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); +DEFINE_DBGUID(DBPROPSET_DATASOURCE, 0xc8b522ba, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); +DEFINE_DBGUID(DBPROPSET_DATASOURCEINFO, 0xc8b522bb, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); +DEFINE_DBGUID(DBPROPSET_DBINIT, 0xc8b522bc, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); +DEFINE_DBGUID(DBPROPSET_INDEX, 0xc8b522bd, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); +DEFINE_DBGUID(DBPROPSET_ROWSET, 0xc8b522be, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); +DEFINE_DBGUID(DBPROPSET_TABLE, 0xc8b522bf, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); +DEFINE_DBGUID(DBPROPSET_DATASOURCEALL, 0xc8b522c0, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); +DEFINE_DBGUID(DBPROPSET_DATASOURCEINFOALL, 0xc8b522c1, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); +DEFINE_DBGUID(DBPROPSET_ROWSETALL, 0xc8b522c2, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); +DEFINE_DBGUID(DBPROPSET_SESSION, 0xc8b522c6, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); +DEFINE_DBGUID(DBPROPSET_SESSIONALL, 0xc8b522c7, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); +DEFINE_DBGUID(DBPROPSET_DBINITALL, 0xc8b522ca, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); +DEFINE_DBGUID(DBPROPSET_PROPERTIESINERROR, 0xc8b522d4, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); typedef struct datainit { -- 2.17.1

2 1

[PATCH 1/2] comctl32/tests: Add tests for alpha channel of imagelist.
by Ziqing Hui 02 Mar '20

02 Mar '20

The test_alpha() is run under version 6 comctl32 because alpha channel is not supported in older version. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/comctl32/tests/imagelist.c | 79 +++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+)

1 1

[PATCH v2 2/2] comctl32/imagelist: Correctly handle alpha channel of 32bpp image.
by Ziqing Hui 02 Mar '20

02 Mar '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/comctl32/imagelist.c | 24 ++++++++++-------------- dlls/comctl32/tests/imagelist.c | 2 -- 2 files changed, 10 insertions(+), 16 deletions(-)

1 0

[PATCH v2 1/2] comctl32/tests: Add tests for alpha channel of imagelist.
by Ziqing Hui 02 Mar '20

02 Mar '20

v2: Fix some style problem in the first patch: * remove white space between "ok" and "(" * remove unnecessary ok() * use todo_wine_if(xxx) to replace if (xxx) todo_wine Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/comctl32/tests/imagelist.c | 70 +++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+)

1 0

[PATCH v2] wmvcore: Add semi-stub implementation for WMIsContentProtected
by Vijay Kiran Kamuju 01 Mar '20

01 Mar '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48683 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH] wmvcore: Add semi-stub implementation for WMIsContentProtected
by Vijay Kiran Kamuju 01 Mar '20

01 Mar '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48683 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

2 1

[PATCH 2/2] include: Fix QUOTA_LIMITS_EX in winnt.h
by Vijay Kiran Kamuju 01 Mar '20

01 Mar '20

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH 1/2] include: Add missing defines in winnt.h
by Vijay Kiran Kamuju 01 Mar '20

01 Mar '20

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH] shell32: Implement SHCreateAssociationRegistration.
by Roman Pišl 29 Feb '20

29 Feb '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44253 Signed-off-by: Roman Pišl <rpisl(a)seznam.cz> --- dlls/shell32/assoc.c | 8 ++++++++ dlls/shell32/shell32.spec | 1 + 2 files changed, 9 insertions(+) diff --git a/dlls/shell32/assoc.c b/dlls/shell32/assoc.c index a501dea2e7..49751048f3 100644 --- a/dlls/shell32/assoc.c +++ b/dlls/shell32/assoc.c @@ -1139,6 +1139,14 @@ static const IEnumAssocHandlersVtbl enumassochandlersvtbl = { enumassochandlers_Next }; +/************************************************************************** + * SHCreateAssociationRegistration [SHELL32.@] + */ +HRESULT WINAPI SHCreateAssociationRegistration(REFIID riid, LPVOID *ppv) +{ + return ApplicationAssociationRegistration_Constructor(NULL, riid, ppv); +} + /************************************************************************** * SHAssocEnumHandlers [SHELL32.@] */ diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index 96251a87ca..d4571212ce 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -338,6 +338,7 @@ @ stdcall SHBrowseForFolderW(ptr) @ stdcall SHChangeNotify (long long ptr ptr) @ stub SHChangeNotifySuspendResume +@ stdcall SHCreateAssociationRegistration(ptr ptr) @ stdcall SHCreateDataObject(ptr long ptr ptr ptr ptr) @ stdcall SHCreateDefaultContextMenu(ptr ptr ptr) @ stdcall SHCreateDirectoryExA(long str ptr) -- 2.20.1

1 0

[PATCH] oleaut32: preferentially load icons having the desired size in OleLoadPictureEx
by Damjan Jovanovic 29 Feb '20

29 Feb '20

Currently OleLoadPictureEx() ignores the caller-desired icon size and always loads the 32x32 icon, which sometimes has to be scaled down to 16x16, resulting in quality loss. Change this to load the icon having the desired size, falling back to 32x32 only when the desired size is unavailable. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=20732 Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/oleaut32/olepicture.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-)

1 0

[PATCH] include: COMMCONFIG.wcProviderData is WCHAR, not DWORD.
by Serge Gautherie 29 Feb '20

29 Feb '20

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> -- * See https://jira.reactos.org/browse/ROSTESTS-251?focusedCommentId=87960&page=co… * I am not sure what the process is to update generated.c. Please, advice. --- dlls/kernel32/tests/generated.c | 8 ++++---- include/winbase.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/tests/generated.c b/dlls/kernel32/tests/generated.c index ae1f966..a166d97 100644 --- a/dlls/kernel32/tests/generated.c +++ b/dlls/kernel32/tests/generated.c @@ -546,8 +546,8 @@ static void test_pack_COMMCONFIG(void) TEST_FIELD_SIZE (COMMCONFIG, dwProviderSize, 4) TEST_FIELD_ALIGN (COMMCONFIG, dwProviderSize, 4) TEST_FIELD_OFFSET(COMMCONFIG, dwProviderSize, 44) - TEST_FIELD_SIZE (COMMCONFIG, wcProviderData, 4) - TEST_FIELD_ALIGN (COMMCONFIG, wcProviderData, 4) + TEST_FIELD_SIZE (COMMCONFIG, wcProviderData, 2) + TEST_FIELD_ALIGN (COMMCONFIG, wcProviderData, 2) TEST_FIELD_OFFSET(COMMCONFIG, wcProviderData, 48) } @@ -2403,8 +2403,8 @@ static void test_pack_COMMCONFIG(void) TEST_FIELD_SIZE (COMMCONFIG, dwProviderSize, 4) TEST_FIELD_ALIGN (COMMCONFIG, dwProviderSize, 4) TEST_FIELD_OFFSET(COMMCONFIG, dwProviderSize, 44) - TEST_FIELD_SIZE (COMMCONFIG, wcProviderData, 4) - TEST_FIELD_ALIGN (COMMCONFIG, wcProviderData, 4) + TEST_FIELD_SIZE (COMMCONFIG, wcProviderData, 2) + TEST_FIELD_ALIGN (COMMCONFIG, wcProviderData, 2) TEST_FIELD_OFFSET(COMMCONFIG, wcProviderData, 48) } diff --git a/include/winbase.h b/include/winbase.h index 10b92fe..2aefd0e 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1409,7 +1409,7 @@ typedef struct tagCOMMCONFIG { DWORD dwProviderSubType; DWORD dwProviderOffset; DWORD dwProviderSize; - DWORD wcProviderData[1]; + WCHAR wcProviderData[1]; } COMMCONFIG, *LPCOMMCONFIG; typedef struct tagCOMMPROP { -- 2.10.0.windows.1

1 0

Wine staging 5.3 release
by Alistair Leslie-Hughes 29 Feb '20

29 Feb '20

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary since last release * Rebased to current wine 5.3 (836 patches are applied to wine vanilla) Upstreamed (Either directly from staging or fixed with a similar patch). * ntdll: Fill NumberOfPhysicalPages field in user shared data area. * ntdll: Detect more processor features on Intel CPU. Added: * [47699] Multiple games fail to connect to online services (missing BCryptSecretAgreement / BCryptDeriveKey implementation) Updated: * eventfd_synchronization Where can you help * Run Steam/Battle.net/GOG/UPlay/Epic * Test your favorite game. * Test your favorite applications. * Improve staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

1 0

[PATCH v2 1/5] httpapi: Update the spec file to Windows 7.
by Zebediah Figura 29 Feb '20

29 Feb '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48514 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48530 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/httpapi/httpapi.spec | 45 +++++++++------------------------------ 1 file changed, 10 insertions(+), 35 deletions(-) diff --git a/dlls/httpapi/httpapi.spec b/dlls/httpapi/httpapi.spec index e1a16c39ab..efb2dedb3a 100644 --- a/dlls/httpapi/httpapi.spec +++ b/dlls/httpapi/httpapi.spec @@ -1,62 +1,37 @@ @ stub HttpAddFragmentToCache @ stdcall HttpAddUrl(ptr wstr ptr) -@ stub HttpAddUrlToConfigGroup @ stdcall HttpAddUrlToUrlGroup(int64 wstr int64 long) @ stub HttpCancelHttpRequest -@ stub HttpCreateAppPool -@ stub HttpCreateConfigGroup -@ stub HttpCreateFilter +@ stdcall HttpCloseRequestQueue(ptr) +@ stdcall HttpCloseServerSession(int64) +@ stdcall HttpCloseUrlGroup(int64) +@ stub HttpControlService @ stdcall HttpCreateHttpHandle(ptr long) @ stdcall HttpCreateRequestQueue(long wstr ptr long ptr) @ stdcall HttpCreateServerSession(long ptr long) @ stdcall HttpCreateUrlGroup(int64 ptr long) -@ stdcall HttpCloseRequestQueue(ptr) -@ stdcall HttpCloseServerSession(int64) -@ stdcall HttpCloseUrlGroup(int64) -@ stub HttpDeleteConfigGroup @ stdcall HttpDeleteServiceConfiguration(ptr long ptr long ptr) -@ stub HttpFilterAccept -@ stub HttpFilterAppRead -@ stub HttpFilterAppWrite -@ stub HttpFilterAppWriteAndRawRead -@ stub HttpFilterClose -@ stub HttpFilterRawRead -@ stub HttpFilterRawWrite -@ stub HttpFilterRawWriteAndAppRead @ stub HttpFlushResponseCache @ stub HttpGetCounters @ stdcall HttpInitialize(long long ptr) -@ stub HttpInitializeServerContext -@ stub HttpOpenAppPool -@ stub HttpOpenControlChannel -@ stub HttpOpenFilter -@ stub HttpQueryAppPoolInformation -@ stub HttpQueryConfigGroupInformation -@ stub HttpQueryControlChannelInformation -@ stub HttpQueryServerContextInformation +@ stub HttpQueryRequestQueueProperty +@ stub HttpQueryServerSessionProperty @ stdcall HttpQueryServiceConfiguration(ptr long ptr long ptr long ptr ptr) +@ stub HttpQueryUrlGroupProperty @ stub HttpReadFragmentFromCache @ stub HttpReceiveClientCertificate @ stdcall HttpReceiveHttpRequest(ptr int64 long ptr long ptr ptr) -@ stub HttpReceiveHttpResponse @ stdcall HttpReceiveRequestEntityBody(ptr int64 long ptr long ptr ptr) -@ stub HttpRemoveAllUrlsFromConfigGroup @ stdcall HttpRemoveUrl(ptr wstr) -@ stub HttpRemoveUrlFromConfigGroup @ stdcall HttpRemoveUrlFromUrlGroup(int64 wstr long) -@ stub HttpSendHttpRequest @ stdcall HttpSendHttpResponse(ptr int64 long ptr ptr ptr ptr long ptr ptr) -@ stub HttpSendRequestEntityBody @ stub HttpSendResponseEntityBody -@ stub HttpSetAppPoolInformation -@ stub HttpSetConfigGroupInformation -@ stub HttpSetControlChannelInformation @ stdcall HttpSetRequestQueueProperty(ptr long ptr long long ptr) -@ stub HttpSetServerContextInformation +@ stub HttpSetServerSessionProperty @ stdcall HttpSetServiceConfiguration(ptr long ptr long ptr) @ stdcall HttpSetUrlGroupProperty(int64 long ptr long) -@ stub HttpShutdownAppPool -@ stub HttpShutdownFilter +@ stub HttpShutdownRequestQueue @ stdcall HttpTerminate(long ptr) @ stub HttpWaitForDemandStart @ stub HttpWaitForDisconnect +@ stub HttpWaitForDisconnectEx -- 2.25.0

1 4

[PATCH 1/5] httpapi: Update the spec file to Windows 7.
by Zebediah Figura 28 Feb '20

28 Feb '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48514 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48530 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/httpapi/httpapi.spec | 45 +++++++++------------------------------ 1 file changed, 10 insertions(+), 35 deletions(-) diff --git a/dlls/httpapi/httpapi.spec b/dlls/httpapi/httpapi.spec index e1a16c39ab..efb2dedb3a 100644 --- a/dlls/httpapi/httpapi.spec +++ b/dlls/httpapi/httpapi.spec @@ -1,62 +1,37 @@ @ stub HttpAddFragmentToCache @ stdcall HttpAddUrl(ptr wstr ptr) -@ stub HttpAddUrlToConfigGroup @ stdcall HttpAddUrlToUrlGroup(int64 wstr int64 long) @ stub HttpCancelHttpRequest -@ stub HttpCreateAppPool -@ stub HttpCreateConfigGroup -@ stub HttpCreateFilter +@ stdcall HttpCloseRequestQueue(ptr) +@ stdcall HttpCloseServerSession(int64) +@ stdcall HttpCloseUrlGroup(int64) +@ stub HttpControlService @ stdcall HttpCreateHttpHandle(ptr long) @ stdcall HttpCreateRequestQueue(long wstr ptr long ptr) @ stdcall HttpCreateServerSession(long ptr long) @ stdcall HttpCreateUrlGroup(int64 ptr long) -@ stdcall HttpCloseRequestQueue(ptr) -@ stdcall HttpCloseServerSession(int64) -@ stdcall HttpCloseUrlGroup(int64) -@ stub HttpDeleteConfigGroup @ stdcall HttpDeleteServiceConfiguration(ptr long ptr long ptr) -@ stub HttpFilterAccept -@ stub HttpFilterAppRead -@ stub HttpFilterAppWrite -@ stub HttpFilterAppWriteAndRawRead -@ stub HttpFilterClose -@ stub HttpFilterRawRead -@ stub HttpFilterRawWrite -@ stub HttpFilterRawWriteAndAppRead @ stub HttpFlushResponseCache @ stub HttpGetCounters @ stdcall HttpInitialize(long long ptr) -@ stub HttpInitializeServerContext -@ stub HttpOpenAppPool -@ stub HttpOpenControlChannel -@ stub HttpOpenFilter -@ stub HttpQueryAppPoolInformation -@ stub HttpQueryConfigGroupInformation -@ stub HttpQueryControlChannelInformation -@ stub HttpQueryServerContextInformation +@ stub HttpQueryRequestQueueProperty +@ stub HttpQueryServerSessionProperty @ stdcall HttpQueryServiceConfiguration(ptr long ptr long ptr long ptr ptr) +@ stub HttpQueryUrlGroupProperty @ stub HttpReadFragmentFromCache @ stub HttpReceiveClientCertificate @ stdcall HttpReceiveHttpRequest(ptr int64 long ptr long ptr ptr) -@ stub HttpReceiveHttpResponse @ stdcall HttpReceiveRequestEntityBody(ptr int64 long ptr long ptr ptr) -@ stub HttpRemoveAllUrlsFromConfigGroup @ stdcall HttpRemoveUrl(ptr wstr) -@ stub HttpRemoveUrlFromConfigGroup @ stdcall HttpRemoveUrlFromUrlGroup(int64 wstr long) -@ stub HttpSendHttpRequest @ stdcall HttpSendHttpResponse(ptr int64 long ptr ptr ptr ptr long ptr ptr) -@ stub HttpSendRequestEntityBody @ stub HttpSendResponseEntityBody -@ stub HttpSetAppPoolInformation -@ stub HttpSetConfigGroupInformation -@ stub HttpSetControlChannelInformation @ stdcall HttpSetRequestQueueProperty(ptr long ptr long long ptr) -@ stub HttpSetServerContextInformation +@ stub HttpSetServerSessionProperty @ stdcall HttpSetServiceConfiguration(ptr long ptr long ptr) @ stdcall HttpSetUrlGroupProperty(int64 long ptr long) -@ stub HttpShutdownAppPool -@ stub HttpShutdownFilter +@ stub HttpShutdownRequestQueue @ stdcall HttpTerminate(long ptr) @ stub HttpWaitForDemandStart @ stub HttpWaitForDisconnect +@ stub HttpWaitForDisconnectEx -- 2.25.0

2 5

[PATCH vkd3d 0/3] Support SM 5.1 register spaces
by Hans-Kristian Arntzen 28 Feb '20

28 Feb '20

These patches add support for SM 5.1 register spaces. The binary format of DXBC changes depending on whether SM 5.1 is used, compared to SM 5.0 or earlier as 5.0 has a flat binding space, whereas 5.1 does not, which makes implementation a bit awkward. Two tests are added which demonstrate the functionality for all descriptor types as well as root constants and root descriptors. Descriptor indexing is also part of SM 5.1, but is not covered here, as that will need a larger rewrite of the binding model in vkd3d to work. (These patches were the start of the DXIL patchset submitted earlier.) Hans-Kristian Arntzen (3): vkd3d: Deal correctly with SM 5.1 register spaces. vkd3d: Add test case for SM 5.1 register spaces. vkd3d: Add test case for root constants in SM 5.1. include/vkd3d_shader.h | 16 + libs/vkd3d-shader/dxbc.c | 29 ++ libs/vkd3d-shader/spirv.c | 194 +++++++- libs/vkd3d-shader/vkd3d_shader_private.h | 5 + libs/vkd3d/command.c | 32 +- libs/vkd3d/state.c | 65 ++- libs/vkd3d/vkd3d_private.h | 1 + tests/d3d12.c | 579 +++++++++++++++++++++++ 8 files changed, 867 insertions(+), 54 deletions(-) -- 2.25.1

2 5

[PATCH v3 1/4] jscript: Reference-count the named items.
by Gabriel Ivăncescu 28 Feb '20

28 Feb '20

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/jscript.c | 12 ++++++++++-- dlls/jscript/jscript.h | 2 ++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index 5e02d4f..5e9b153 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -143,6 +143,14 @@ named_item_t *lookup_named_item(script_ctx_t *ctx, const WCHAR *item_name, unsig return NULL; } +void release_named_item(named_item_t *item) +{ + if(--item->ref) return; + + heap_free(item->name); + heap_free(item); +} + static inline JScriptError *impl_from_IActiveScriptError(IActiveScriptError *iface) { return CONTAINING_RECORD(iface, JScriptError, IActiveScriptError_iface); @@ -415,8 +423,7 @@ static void decrease_state(JScript *This, SCRIPTSTATE state) if(iter->disp) IDispatch_Release(iter->disp); - heap_free(iter->name); - heap_free(iter); + release_named_item(iter); iter = iter2; } @@ -833,6 +840,7 @@ static HRESULT WINAPI JScript_AddNamedItem(IActiveScript *iface, return E_OUTOFMEMORY; } + item->ref = 1; item->disp = disp; item->flags = dwFlags; item->name = heap_strdupW(pstrName); diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 8297838..efd5a54 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -206,6 +206,7 @@ HRESULT builtin_set_const(script_ctx_t*,jsdisp_t*,jsval_t) DECLSPEC_HIDDEN; typedef struct named_item_t { IDispatch *disp; + unsigned ref; DWORD flags; LPWSTR name; @@ -213,6 +214,7 @@ typedef struct named_item_t { } named_item_t; named_item_t *lookup_named_item(script_ctx_t*,const WCHAR*,unsigned) DECLSPEC_HIDDEN; +void release_named_item(named_item_t*) DECLSPEC_HIDDEN; typedef struct { const WCHAR *name; -- 2.21.0

2 4

[PATCH 1/3] server: Make free_object() static.
by Zebediah Figura 28 Feb '20

28 Feb '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- server/object.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/object.c b/server/object.c index 048da504ad..aeb30684a8 100644 --- a/server/object.c +++ b/server/object.c @@ -215,7 +215,7 @@ void *alloc_object( const struct object_ops *ops ) } /* free an object once it has been destroyed */ -void free_object( struct object *obj ) +static void free_object( struct object *obj ) { free( obj->sd ); #ifdef DEBUG_OBJECTS -- 2.25.0

1 3

[PATCH 2/2] vbscript: Don't create script dispatches for items with the SCRIPTITEM_GLOBALMEMBERS flag.
by Jacek Caban 28 Feb '20

28 Feb '20

From: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/compile.c | 1 + dlls/vbscript/tests/vbscript.c | 97 ++++++++++++++++++++++++++++++++-- dlls/vbscript/vbscript.c | 7 ++- 3 files changed, 97 insertions(+), 8 deletions(-)

1 0

[PATCH 1/2] vbscript: Lookup host global object in interp_me instead of storing it in script context.
by Jacek Caban 28 Feb '20

28 Feb '20

Inspired by patch by Gabriel Ivăncescu. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/interp.c | 19 +++++++++++++------ dlls/vbscript/vbscript.c | 10 ---------- dlls/vbscript/vbscript.h | 2 -- 3 files changed, 13 insertions(+), 18 deletions(-)

1 0

[PATCH v2] dsound: Make GlobalHandle() for the sound buffer failed.
by Akihiro Sagawa 28 Feb '20

28 Feb '20

In v2, remove an unreliable conformance test. It crashes on x64 Windows. I think GlobalHandle() does the right thing here because it should succeed if the buffer is allocated by GlobalAlloc(GMEM_FIXED) or HeapAlloc(). Therefore, dsound needs to be fixed. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48635 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/dsound/buffer.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-)

2 1

[PATCH v2 2/3] msvcrt: Silence wide environment inisialization debug messages.
by Jacek Caban 28 Feb '20

28 Feb '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/msvcrt/data.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

2 1

[PATCH v3 1/3] ucrtbase: Add exe entry points implementation.
by Jacek Caban 28 Feb '20

28 Feb '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- v3: Thanks Jeff dlls/msvcrt/crt_main.c | 16 +++++++++++++++- dlls/msvcrt/crt_wmain.c | 16 +++++++++++++++- dlls/ucrtbase/Makefile.in | 5 +++++ 3 files changed, 35 insertions(+), 2 deletions(-)

1 0

[PATCH v2 1/3] ucrtbase: Add exe exntry points implementation.
by Jacek Caban 28 Feb '20

28 Feb '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/msvcrt/crt_main.c | 16 +++++++++++++++- dlls/msvcrt/crt_wmain.c | 16 +++++++++++++++- dlls/ucrtbase/Makefile.in | 5 +++++ 3 files changed, 35 insertions(+), 2 deletions(-)

2 1

[PATCH] vbscript/tests: Get rid of strcmp_wa()
by Michael Stefaniuc 28 Feb '20

28 Feb '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/vbscript/tests/createobj.c | 13 +++---------- dlls/vbscript/tests/run.c | 15 ++++----------- 2 files changed, 7 insertions(+), 21 deletions(-) diff --git a/dlls/vbscript/tests/createobj.c b/dlls/vbscript/tests/createobj.c index b16be88b85..34a9def89d 100644 --- a/dlls/vbscript/tests/createobj.c +++ b/dlls/vbscript/tests/createobj.c @@ -131,13 +131,6 @@ static BSTR a2bstr(const char *str) return ret; } -static int strcmp_wa(LPCWSTR strw, const char *stra) -{ - CHAR buf[512]; - WideCharToMultiByte(CP_ACP, 0, strw, -1, buf, sizeof(buf), 0, 0); - return lstrcmpA(buf, stra); -} - static HRESULT WINAPI ObjectWithSite_QueryInterface(IObjectWithSite *iface, REFIID riid, void **ppv) { ok(0, "unexpected call\n"); @@ -286,7 +279,7 @@ static HRESULT WINAPI DispatchEx_GetNameSpaceParent(IDispatchEx *iface, IUnknown static HRESULT WINAPI Test_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD grfdex, DISPID *pid) { - if(!strcmp_wa(bstrName, "reportSuccess")) { + if(!lstrcmpW(bstrName, L"reportSuccess")) { ok(grfdex == fdexNameCaseInsensitive, "grfdex = %x\n", grfdex); *pid = DISPID_TEST_REPORTSUCCESS; return S_OK; @@ -342,7 +335,7 @@ static IDispatchEx testObj = { &testObjVtbl }; static HRESULT WINAPI Global_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD grfdex, DISPID *pid) { - if(!strcmp_wa(bstrName, "ok")) { + if(!lstrcmpW(bstrName, L"ok")) { ok(grfdex == fdexNameCaseSensitive, "grfdex = %x\n", grfdex); *pid = DISPID_GLOBAL_OK; return S_OK; @@ -620,7 +613,7 @@ static HRESULT WINAPI ActiveScriptSite_GetItemInfo(IActiveScriptSite *iface, LPC { ok(dwReturnMask == SCRIPTINFO_IUNKNOWN, "unexpected dwReturnMask %x\n", dwReturnMask); ok(!ppti, "ppti != NULL\n"); - ok(!strcmp_wa(pstrName, "test"), "pstrName = %s\n", wine_dbgstr_w(pstrName)); + ok(!lstrcmpW(pstrName, L"test"), "pstrName = %s\n", wine_dbgstr_w(pstrName)); *ppiunkItem = (IUnknown*)&globalObj; return S_OK; diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 474fe1d452..6dcd13bf75 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -179,13 +179,6 @@ static BSTR a2bstr(const char *str) return ret; } -static int strcmp_wa(LPCWSTR strw, const char *stra) -{ - CHAR buf[512]; - WideCharToMultiByte(CP_ACP, 0, strw, -1, buf, sizeof(buf), 0, 0); - return lstrcmpA(buf, stra); -} - static const char *vt2a(VARIANT *v) { if(V_VT(v) == (VT_BYREF|VT_VARIANT)) { @@ -1040,7 +1033,7 @@ static IDispatchEx enumDisp = { &enumDispVtbl }; static HRESULT WINAPI collectionObj_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD grfdex, DISPID *pid) { - if(!strcmp_wa(bstrName, "reset")) { + if(!lstrcmpW(bstrName, L"reset")) { *pid = DISPID_COLLOBJ_RESET; return S_OK; } @@ -1841,7 +1834,7 @@ static HRESULT WINAPI ActiveScriptSite_GetItemInfo(IActiveScriptSite *iface, LPC ok(dwReturnMask == SCRIPTINFO_IUNKNOWN, "unexpected dwReturnMask %x\n", dwReturnMask); ok(!ppti, "ppti != NULL\n"); - if(strcmp_wa(pstrName, "test")) + if(lstrcmpW(pstrName, L"test")) ok(0, "unexpected pstrName %s\n", wine_dbgstr_w(pstrName)); *ppiunkItem = (IUnknown*)&Global; @@ -2190,7 +2183,7 @@ static void test_procedures(void) CHECK_CALLED(OnEnterScript); CHECK_CALLED(OnLeaveScript); ok(V_VT(&v) == VT_BSTR, "Expected VT_BSTR, got %s\n", vt2a(&v)); - ok(!strcmp_wa(V_BSTR(&v), "foobar"), "Wrong string, got %s\n", wine_dbgstr_w(V_BSTR(&v))); + ok(!lstrcmpW(V_BSTR(&v), L"foobar"), "Wrong string, got %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); IDispatchEx_Release(proc); @@ -2789,7 +2782,7 @@ static void test_isexpression(void) hres = IActiveScriptParse_ParseScriptText(parser, str, NULL, NULL, NULL, 0, 0, SCRIPTTEXT_ISEXPRESSION, &var, NULL); ok(hres == S_OK, "ParseScriptText failed: %08x\n", hres); ok(V_VT(&var) == VT_BSTR, "Expected VT_BSTR, got %s\n", vt2a(&var)); - ok(!strcmp_wa(V_BSTR(&var), "foo is 42"), "Wrong string, got %s\n", wine_dbgstr_w(V_BSTR(&var))); + ok(!lstrcmpW(V_BSTR(&var), L"foo is 42"), "Wrong string, got %s\n", wine_dbgstr_w(V_BSTR(&var))); VariantClear(&var); SysFreeString(str); -- 2.24.1

2 1

[PATCH v2 3/3] makedep: Build builtin programs with ucrt.
by Jacek Caban 28 Feb '20

28 Feb '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- tools/makedep.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-)

2 1

[PATCH 2/2] winegcc: Don't pass ld command to winebuild when building PE file.
by Jacek Caban 28 Feb '20

28 Feb '20

It's not used anyway. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- tools/winegcc/winegcc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[PATCH 1/2] winegcc: Fix passing -delayload argument to linker.
by Jacek Caban 28 Feb '20

28 Feb '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- tools/winegcc/winegcc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[PATCH 1/5] wined3d: Optimize scanning changed texture states in wined3d_device_apply_stateblock().
by Matteo Bruni 28 Feb '20

28 Feb '20

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/wined3d/device.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e706c830d31..9478c459e0a 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3951,12 +3951,13 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, } } - for (i = 0; i < ARRAY_SIZE(state->texture_states); ++i) + for (i = 0; i < ARRAY_SIZE(changed->textureState); ++i) { - for (j = 0; j < ARRAY_SIZE(state->texture_states[i]); ++j) + map = changed->textureState[i]; + while (map) { - if (changed->textureState[i] & (1u << j)) - wined3d_device_set_texture_stage_state(device, i, j, state->texture_states[i][j]); + j = wined3d_bit_scan(&map); + wined3d_device_set_texture_stage_state(device, i, j, state->texture_states[i][j]); } } -- 2.24.1

2 9

[PATCH 1/4] ddraw: Retrieve transform state from the primary stateblock.
by Zebediah Figura 28 Feb '20

28 Feb '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ddraw/ddraw_private.h | 6 +++--- dlls/ddraw/device.c | 38 +++++++++++++++----------------------- dlls/ddraw/executebuffer.c | 2 +- dlls/ddraw/utils.c | 21 +++------------------ dlls/ddraw/viewport.c | 24 +++++++++--------------- 5 files changed, 31 insertions(+), 60 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 088092830c..42a7a85e4e 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -333,8 +333,7 @@ struct d3d_device BOOL legacyTextureBlending; D3DTEXTUREBLEND texture_map_blend; - D3DMATRIX legacy_projection; - D3DMATRIX legacy_clipspace; + struct wined3d_matrix legacy_projection, legacy_clipspace; /* Light state */ DWORD material; @@ -615,7 +614,8 @@ void DDRAW_dump_cooperativelevel(DWORD cooplevel) DECLSPEC_HIDDEN; void DDSD_to_DDSD2(const DDSURFACEDESC *in, DDSURFACEDESC2 *out) DECLSPEC_HIDDEN; void DDSD2_to_DDSD(const DDSURFACEDESC2 *in, DDSURFACEDESC *out) DECLSPEC_HIDDEN; -void multiply_matrix(D3DMATRIX *dst, const D3DMATRIX *src1, const D3DMATRIX *src2) DECLSPEC_HIDDEN; +void multiply_matrix(struct wined3d_matrix *dst, const struct wined3d_matrix *src1, + const struct wined3d_matrix *src2) DECLSPEC_HIDDEN; static inline BOOL format_is_compressed(const DDPIXELFORMAT *format) { diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 92c726c10d..ee860d4010 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -3173,15 +3173,15 @@ static HRESULT WINAPI d3d_device3_SetTransform(IDirect3DDevice3 *iface, if (state == D3DTRANSFORMSTATE_PROJECTION) { - D3DMATRIX projection; + struct wined3d_matrix projection; wined3d_mutex_lock(); - multiply_matrix(&projection, &device->legacy_clipspace, matrix); + multiply_matrix(&projection, &device->legacy_clipspace, (struct wined3d_matrix *)matrix); wined3d_stateblock_set_transform(device->state, WINED3D_TS_PROJECTION, (struct wined3d_matrix *)&projection); wined3d_device_set_transform(device->wined3d_device, WINED3D_TS_PROJECTION, (struct wined3d_matrix *)&projection); - device->legacy_projection = *matrix; + memcpy(&device->legacy_projection, matrix, sizeof(*matrix)); wined3d_mutex_unlock(); return D3D_OK; @@ -3247,7 +3247,7 @@ static HRESULT d3d_device7_GetTransform(IDirect3DDevice7 *iface, /* Note: D3DMATRIX is compatible with struct wined3d_matrix. */ wined3d_mutex_lock(); - wined3d_device_get_transform(device->wined3d_device, wined3d_state, (struct wined3d_matrix *)matrix); + memcpy(matrix, &wined3d_stateblock_get_state(device->state)->transforms[wined3d_state], sizeof(*matrix)); wined3d_mutex_unlock(); return D3D_OK; @@ -3285,7 +3285,7 @@ static HRESULT WINAPI d3d_device3_GetTransform(IDirect3DDevice3 *iface, if (state == D3DTRANSFORMSTATE_PROJECTION) { wined3d_mutex_lock(); - *matrix = device->legacy_projection; + memcpy(matrix, &device->legacy_projection, sizeof(*matrix)); wined3d_mutex_unlock(); return DD_OK; } @@ -3385,15 +3385,13 @@ static HRESULT WINAPI d3d_device3_MultiplyTransform(IDirect3DDevice3 *iface, if (state == D3DTRANSFORMSTATE_PROJECTION) { - D3DMATRIX projection, tmp; + struct wined3d_matrix projection, tmp; wined3d_mutex_lock(); - multiply_matrix(&tmp, &device->legacy_projection, matrix); + multiply_matrix(&tmp, &device->legacy_projection, (struct wined3d_matrix *)matrix); multiply_matrix(&projection, &device->legacy_clipspace, &tmp); - wined3d_stateblock_set_transform(device->state, - WINED3D_TS_PROJECTION, (struct wined3d_matrix *)&projection); - wined3d_device_set_transform(device->wined3d_device, - WINED3D_TS_PROJECTION, (struct wined3d_matrix *)&projection); + wined3d_stateblock_set_transform(device->state, WINED3D_TS_PROJECTION, &projection); + wined3d_device_set_transform(device->wined3d_device, WINED3D_TS_PROJECTION, &projection); device->legacy_projection = tmp; wined3d_mutex_unlock(); @@ -4579,21 +4577,15 @@ static DWORD in_plane(UINT idx, struct wined3d_vec4 p, D3DVECTOR center, D3DVALU static void prepare_clip_space_planes(struct d3d_device *device, struct wined3d_vec4 *plane) { - D3DMATRIX m, temp; + const struct wined3d_stateblock_state *state; + struct wined3d_matrix m; /* We want the wined3d matrices since those include the legacy viewport * transformation. */ wined3d_mutex_lock(); - wined3d_device_get_transform(device->wined3d_device, - WINED3D_TS_WORLD, (struct wined3d_matrix *)&m); - - wined3d_device_get_transform(device->wined3d_device, - WINED3D_TS_VIEW, (struct wined3d_matrix *)&temp); - multiply_matrix(&m, &temp, &m); - - wined3d_device_get_transform(device->wined3d_device, - WINED3D_TS_PROJECTION, (struct wined3d_matrix *)&temp); - multiply_matrix(&m, &temp, &m); + state = wined3d_stateblock_get_state(device->state); + multiply_matrix(&m, &state->transforms[WINED3D_TS_VIEW], &state->transforms[WINED3D_TS_WORLD]); + multiply_matrix(&m, &state->transforms[WINED3D_TS_PROJECTION], &m); wined3d_mutex_unlock(); /* Left plane. */ @@ -6991,7 +6983,7 @@ static void ddraw_reset_viewport_state(struct ddraw *ddraw) static HRESULT d3d_device_init(struct d3d_device *device, struct ddraw *ddraw, struct ddraw_surface *target, IUnknown *rt_iface, UINT version, IUnknown *outer_unknown) { - static const D3DMATRIX ident = + static const struct wined3d_matrix ident = { 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index 1b680f627e..e0a9445bf7 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -205,7 +205,7 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, struct d3d for (i = 0; i < count; ++i) { D3DMATRIXMULTIPLY *ci = (D3DMATRIXMULTIPLY *)instr; - D3DMATRIX *a, *b, *c; + struct wined3d_matrix *a, *b, *c; a = ddraw_get_object(&device->handle_table, ci->hDestMatrix - 1, DDRAW_HANDLE_MATRIX); b = ddraw_get_object(&device->handle_table, ci->hSrcMatrix1 - 1, DDRAW_HANDLE_MATRIX); diff --git a/dlls/ddraw/utils.c b/dlls/ddraw/utils.c index 2aa4cc2e88..23e75a32fc 100644 --- a/dlls/ddraw/utils.c +++ b/dlls/ddraw/utils.c @@ -1155,23 +1155,9 @@ void DDRAW_dump_DDCAPS(const DDCAPS *lpcaps) TRACE(" - ddsCaps : "); DDRAW_dump_DDSCAPS2(&lpcaps->ddsCaps); } -/***************************************************************************** - * multiply_matrix - * - * Multiplies 2 4x4 matrices src1 and src2, and stores the result in dest. - * - * Params: - * dest: Pointer to the destination matrix - * src1: Pointer to the first source matrix - * src2: Pointer to the second source matrix - * - *****************************************************************************/ -void -multiply_matrix(D3DMATRIX *dest, - const D3DMATRIX *src1, - const D3DMATRIX *src2) +void multiply_matrix(struct wined3d_matrix *dst, const struct wined3d_matrix *src1, const struct wined3d_matrix *src2) { - D3DMATRIX temp; + struct wined3d_matrix temp; /* Now do the multiplication 'by hand'. I know that all this could be optimised, but this will be done later :-) */ @@ -1195,8 +1181,7 @@ multiply_matrix(D3DMATRIX *dest, temp._34 = (src1->_14 * src2->_31) + (src1->_24 * src2->_32) + (src1->_34 * src2->_33) + (src1->_44 * src2->_34); temp._44 = (src1->_14 * src2->_41) + (src1->_24 * src2->_42) + (src1->_34 * src2->_43) + (src1->_44 * src2->_44); - /* And copy the new matrix in the good storage.. */ - memcpy(dest, &temp, 16 * sizeof(D3DVALUE)); + *dst = temp; } HRESULT diff --git a/dlls/ddraw/viewport.c b/dlls/ddraw/viewport.c index 1b7f778699..2f2515036d 100644 --- a/dlls/ddraw/viewport.c +++ b/dlls/ddraw/viewport.c @@ -28,20 +28,18 @@ WINE_DEFAULT_DEBUG_CHANNEL(ddraw); static void update_clip_space(struct d3d_device *device, struct wined3d_vec3 *scale, struct wined3d_vec3 *offset) { - D3DMATRIX clip_space = + struct wined3d_matrix clip_space = { scale->x, 0.0f, 0.0f, 0.0f, 0.0f, scale->y, 0.0f, 0.0f, 0.0f, 0.0f, scale->z, 0.0f, offset->x, offset->y, offset->z, 1.0f, }; - D3DMATRIX projection; + struct wined3d_matrix projection; multiply_matrix(&projection, &clip_space, &device->legacy_projection); - wined3d_stateblock_set_transform(device->state, - WINED3D_TS_PROJECTION, (struct wined3d_matrix *)&projection); - wined3d_device_set_transform(device->wined3d_device, - WINED3D_TS_PROJECTION, (struct wined3d_matrix *)&projection); + wined3d_stateblock_set_transform(device->state, WINED3D_TS_PROJECTION, &projection); + wined3d_device_set_transform(device->wined3d_device, WINED3D_TS_PROJECTION, &projection); device->legacy_clipspace = clip_space; } @@ -486,9 +484,10 @@ static HRESULT WINAPI d3d_viewport_TransformVertices(IDirect3DViewport3 *iface, DWORD dwVertexCount, D3DTRANSFORMDATA *data, DWORD dwFlags, DWORD *offscreen) { struct d3d_viewport *viewport = impl_from_IDirect3DViewport3(iface); + const struct wined3d_stateblock_state *state; D3DVIEWPORT vp = viewport->viewports.vp1; - D3DMATRIX view_mat, world_mat, proj_mat, mat; struct transform_vertices_vertex *in, *out; + struct wined3d_matrix mat; float x, y, z, w; unsigned int i; D3DHVERTEX *outH; @@ -522,14 +521,9 @@ static HRESULT WINAPI d3d_viewport_TransformVertices(IDirect3DViewport3 *iface, if (activate) viewport_activate(viewport, TRUE); - wined3d_device_get_transform(device->wined3d_device, - D3DTRANSFORMSTATE_VIEW, (struct wined3d_matrix *)&view_mat); - wined3d_device_get_transform(device->wined3d_device, - WINED3D_TS_WORLD_MATRIX(0), (struct wined3d_matrix *)&world_mat); - wined3d_device_get_transform(device->wined3d_device, - WINED3D_TS_PROJECTION, (struct wined3d_matrix *)&proj_mat); - multiply_matrix(&mat, &view_mat, &world_mat); - multiply_matrix(&mat, &proj_mat, &mat); + state = wined3d_stateblock_get_state(device->state); + multiply_matrix(&mat, &state->transforms[WINED3D_TS_VIEW], &state->transforms[WINED3D_TS_WORLD_MATRIX(0)]); + multiply_matrix(&mat, &state->transforms[WINED3D_TS_PROJECTION], &mat); /* The pointer is not tested against NULL on Windows. */ if (dwFlags & D3DTRANSFORM_CLIPPED) -- 2.25.0

2 7

[PATCH 01/14] include: Add more Media Foundation error codes.
by Nikolay Sivov 28 Feb '20

28 Feb '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- include/mferror.h | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/include/mferror.h b/include/mferror.h index 6341d832ab..523800d7f0 100644 --- a/include/mferror.h +++ b/include/mferror.h @@ -166,4 +166,46 @@ #define MF_E_CLOCK_NOT_SIMPLE _HRESULT_TYPEDEF_(0xc00d9c43) #define MF_S_CLOCK_STOPPED _HRESULT_TYPEDEF_(0x000d9c44) +#define MF_E_NO_MORE_DROP_MODES _HRESULT_TYPEDEF_(0xc00da028) +#define MF_E_NO_MORE_QUALITY_LEVELS _HRESULT_TYPEDEF_(0xc00da029) +#define MF_E_DROPTIME_NOT_SUPPORTED _HRESULT_TYPEDEF_(0xc00da02a) +#define MF_E_QUALITYKNOB_WAIT_LONGER _HRESULT_TYPEDEF_(0xc00da02b) +#define MF_E_QM_INVALIDSTATE _HRESULT_TYPEDEF_(0xc00da02c) + +#define MF_E_TRANSCODE_NO_CONTAINERTYPE _HRESULT_TYPEDEF_(0xc00da410) +#define MF_E_TRANSCODE_PROFILE_NO_MATCHING_STREAMS _HRESULT_TYPEDEF_(0xc00da411) +#define MF_E_TRANSCODE_NO_MATCHING_ENCODER _HRESULT_TYPEDEF_(0xc00da412) +#define MF_E_TRANSCODE_INVALID_PROFILE _HRESULT_TYPEDEF_(0xc00da413) + +#define MF_E_ALLOCATOR_NOT_INITIALIZED _HRESULT_TYPEDEF_(0xc00da7f8) +#define MF_E_ALLOCATOR_NOT_COMMITED _HRESULT_TYPEDEF_(0xc00da7f9) +#define MF_E_ALLOCATOR_ALREADY_COMMITED _HRESULT_TYPEDEF_(0xc00da7fa) +#define MF_E_STREAM_ERROR _HRESULT_TYPEDEF_(0xc00da7fb) +#define MF_E_INVALID_STREAM_STATE _HRESULT_TYPEDEF_(0xc00da7fc) +#define MF_E_HW_STREAM_NOT_CONNECTED _HRESULT_TYPEDEF_(0xc00da7fd) + +#define MF_E_NO_CAPTURE_DEVICES_AVAILABLE _HRESULT_TYPEDEF_(0xc00dabe0) +#define MF_E_CAPTURE_SINK_OUTPUT_NOT_SET _HRESULT_TYPEDEF_(0xc00dabe1) +#define MF_E_CAPTURE_SINK_MIRROR_ERROR _HRESULT_TYPEDEF_(0xc00dabe2) +#define MF_E_CAPTURE_SINK_ROTATE_ERROR _HRESULT_TYPEDEF_(0xc00dabe3) +#define MF_E_CAPTURE_ENGINE_INVALID_OP _HRESULT_TYPEDEF_(0xc00dabe4) +#define MF_E_CAPTURE_ENGINE_ALL_EFFECTS_REMOVED _HRESULT_TYPEDEF_(0xc00dabe5) +#define MF_E_CAPTURE_SOURCE_NO_INDEPENDENT_PHOTO_STREAM_PRESENT _HRESULT_TYPEDEF_(0xc00dabe6) +#define MF_E_CAPTURE_SOURCE_NO_VIDEO_STREAM_PRESENT _HRESULT_TYPEDEF_(0xc00dabe7) +#define MF_E_CAPTURE_SOURCE_NO_AUDIO_STREAM_PRESENT _HRESULT_TYPEDEF_(0xc00dabe8) +#define MF_E_CAPTURE_SOURCE_DEVICE_EXTENDEDPROP_OP_IN_PROGRESS _HRESULT_TYPEDEF_(0xc00dabe9) +#define MF_E_CAPTURE_PROPERTY_SET_DURING_PHOTO _HRESULT_TYPEDEF_(0xc00dabea) +#define MF_E_CAPTURE_NO_SAMPLES_IN_QUEUE _HRESULT_TYPEDEF_(0xc00dabeb) +#define MF_E_HW_ACCELERATED_THUMBNAIL_NOT_SUPPORTED _HRESULT_TYPEDEF_(0xc00dabec) +#define MF_E_UNSUPPORTED_CAPTURE_DEVICE_PRESENT _HRESULT_TYPEDEF_(0xc00dabed) + +#define MF_E_TIMELINECONTROLLER_UNSUPPORTED_SOURCE_TYPE _HRESULT_TYPEDEF_(0xc00dafc8) +#define MF_E_TIMELINECONTROLLER_NOT_ALLOWED _HRESULT_TYPEDEF_(0xc00dafc9) +#define MF_E_TIMELINECONTROLLER_CANNOT_ATTACH _HRESULT_TYPEDEF_(0xc00dafca) + +#define MF_E_MEDIA_EXTENSION_APPSERVICE_CONNECTION_FAILED _HRESULT_TYPEDEF_(0xc00db3b0) +#define MF_E_MEDIA_EXTENSION_APPSERVICE_REQUEST_FAILED _HRESULT_TYPEDEF_(0xc00db3b1) +#define MF_E_MEDIA_EXTENSION_PACKAGE_INTEGRITY_CHECK_FAILED _HRESULT_TYPEDEF_(0xc00db3b2) +#define MF_E_MEDIA_EXTENSION_PACKAGE_LICENSE_INVALID _HRESULT_TYPEDEF_(0xc00db3b3) + #endif /* __WINE_MFERROR_H */ -- 2.25.0

1 13

[PATCH 1/3] d3dcompiler/tests: Rewrite to use a separate d3d9 device for each test.
by Matteo Bruni 28 Feb '20

28 Feb '20

From: Zebediah Figura <z.figura12(a)gmail.com> This brings the d3dcompiler tests more in line with existing d3d9 tests, and allows potentially running the tests in parallel. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/d3dcompiler_43/tests/Makefile.in | 2 +- dlls/d3dcompiler_43/tests/hlsl.c | 701 -------------------------- dlls/d3dcompiler_43/tests/hlsl_d3d9.c | 678 +++++++++++++++++++++++++ dlls/d3dcompiler_47/tests/Makefile.in | 2 +- 4 files changed, 680 insertions(+), 703 deletions(-) delete mode 100644 dlls/d3dcompiler_43/tests/hlsl.c create mode 100644 dlls/d3dcompiler_43/tests/hlsl_d3d9.c diff --git a/dlls/d3dcompiler_43/tests/Makefile.in b/dlls/d3dcompiler_43/tests/Makefile.in index 51b1f934836..f00d8560826 100644 --- a/dlls/d3dcompiler_43/tests/Makefile.in +++ b/dlls/d3dcompiler_43/tests/Makefile.in @@ -5,5 +5,5 @@ EXTRADEFS = -DD3D_COMPILER_VERSION=43 C_SRCS = \ asm.c \ blob.c \ - hlsl.c \ + hlsl_d3d9.c \ reflection.c diff --git a/dlls/d3dcompiler_43/tests/hlsl.c b/dlls/d3dcompiler_43/tests/hlsl.c deleted file mode 100644 index 868693838cc..00000000000 --- a/dlls/d3dcompiler_43/tests/hlsl.c +++ /dev/null @@ -1,701 +0,0 @@ -/* - * Copyright (C) 2010 Travis Athougies - * - * 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 - */ -#define COBJMACROS -#include "wine/test.h" -#include "d3dx9.h" -#include "d3dcompiler.h" - -#include <math.h> - -static pD3DCompile ppD3DCompile; - -static HRESULT (WINAPI *pD3DXGetShaderConstantTable)(const DWORD *byte_code, ID3DXConstantTable **constant_table); -static D3DMATRIX *(WINAPI *pD3DXMatrixOrthoLH)(D3DXMATRIX *pout, FLOAT w, FLOAT h, FLOAT zn, FLOAT zf); - -struct vertex -{ - float x, y, z; - float tx, ty; -}; - -/* Tells compute_shader_probe* which pixels should be what colors */ -struct hlsl_probe_info -{ - unsigned int x, y; - /* The expected values in this region */ - D3DXCOLOR c; - /* The max error for any value */ - float epsilon; - /* An error message to print if this test fails */ - const char *message; -}; - -static HWND create_window(void) -{ - WNDCLASSA wc = {0}; - wc.lpfnWndProc = DefWindowProcA; - wc.lpszClassName = "d3d9_test_wc"; - RegisterClassA(&wc); - - return CreateWindowA("d3d9_test_wc", "d3d9_test", 0, 0, 0, 0, 0, 0, 0, 0, 0); -} - -static IDirect3DDevice9 *init_d3d9(IDirect3DVertexDeclaration9 **vdeclaration, - IDirect3DVertexBuffer9 **quad_geometry, IDirect3DVertexShader9 **vshader_passthru) -{ - static const struct vertex quad_vertices[4] = - { - {-1.0f, -1.0f, 0.0f, 0.0f, 1.0f}, - {-1.0f, 1.0f, 0.0f, 0.0f, 0.0f}, - { 1.0f, -1.0f, 0.0f, 1.0f, 1.0f}, - { 1.0f, 1.0f, 0.0f, 1.0f, 0.0f} - }; - - static const D3DVERTEXELEMENT9 vdeclelements[] = - { - {0, 0, D3DDECLTYPE_FLOAT3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0}, - {0, 12, D3DDECLTYPE_FLOAT2, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_TEXCOORD, 0}, - D3DDECL_END() - }; - - static const char *vshader_passthru_hlsl = - "float4 vshader(float4 pos: POSITION, inout float2 texcoord: TEXCOORD0): POSITION\n" - "{\n" - " return pos;\n" - "}"; - - IDirect3D9 *d3d9_ptr; - IDirect3DDevice9 *device_ptr = NULL; - D3DPRESENT_PARAMETERS present_parameters; - - void *temp_geometry_vertices; - - ID3D10Blob *compiled = NULL; - ID3D10Blob *errors = NULL; - - HRESULT hr; - - d3d9_ptr = Direct3DCreate9(D3D_SDK_VERSION); - if (!d3d9_ptr) - { - skip("could not create D3D9\n"); - return NULL; - } - - hr = IDirect3D9_CheckDeviceFormat(d3d9_ptr, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, - 0, D3DRTYPE_SURFACE, D3DFMT_A32B32G32R32F); - if (FAILED(hr)) - { - skip("A32B32G32R32F format not available on this device\n"); - IDirect3D9_Release(d3d9_ptr); - return NULL; - } - - ZeroMemory(&present_parameters, sizeof(present_parameters)); - present_parameters.Windowed = TRUE; - present_parameters.hDeviceWindow = create_window(); - present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; - - hr = IDirect3D9_CreateDevice(d3d9_ptr, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, NULL, - D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, &device_ptr); - IDirect3D9_Release(d3d9_ptr); - if (FAILED(hr)) - { - skip("could not create Direct3D9 device\n"); - return NULL; - } - - /* Create the quad geometry */ - hr = IDirect3DDevice9_CreateVertexBuffer(device_ptr, 4 * sizeof(struct vertex), - D3DUSAGE_WRITEONLY, 0, D3DPOOL_DEFAULT, quad_geometry, NULL); - ok(SUCCEEDED(hr), - "Could not create vertex buffer, IDirect3DDevice9_CreateVertexBuffer returned: %08x\n", hr); - - hr = IDirect3DVertexBuffer9_Lock(*quad_geometry, 0, sizeof(quad_vertices), &temp_geometry_vertices, 0); - ok(SUCCEEDED(hr), "IDirect3DVertexBuffer9_Lock returned: %08x\n", hr); - memcpy(temp_geometry_vertices, quad_vertices, sizeof(quad_vertices)); - IDirect3DVertexBuffer9_Unlock(*quad_geometry); - - hr = IDirect3DDevice9_CreateVertexDeclaration(device_ptr, vdeclelements, vdeclaration); - ok(SUCCEEDED(hr), "Could not create vertex declaration: " - "IDirect3DDevice9_CreateVertexDeclaration returned: %08x\n", hr); - - hr = IDirect3DDevice9_SetVertexDeclaration(device_ptr, *vdeclaration); - ok(hr == D3D_OK, "IDirect3DDevice9_SetVertexDeclaration returned: %08x\n", hr); - - /* Create a simple vertex shader to just pass through the values */ - hr = ppD3DCompile(vshader_passthru_hlsl, strlen(vshader_passthru_hlsl), NULL, - NULL, NULL, "vshader", "vs_1_1", 0, 0, &compiled, &errors); - if (FAILED(hr)) - { - skip("not compiling vertex shader due to lacking wine HLSL support!\n"); - if (errors) - ID3D10Blob_Release(errors); - return NULL; - } - - hr = IDirect3DDevice9_CreateVertexShader(device_ptr, ID3D10Blob_GetBufferPointer(compiled), - vshader_passthru); - ok(SUCCEEDED(hr), "IDirect3DDevice9_CreateVertexShader returned: %08x\n", hr); - ID3D10Blob_Release(compiled); - - return device_ptr; -} - -/* Convenience functions */ -static void set_float4_d3d9(IDirect3DDevice9 *device, ID3DXConstantTable *constants, const char *name, - float x, float y, float z, float w) -{ - D3DXVECTOR4 vector; - vector.x = x; - vector.y = y; - vector.z = z; - vector.w = w; - ID3DXConstantTable_SetVector(constants, device, name, &vector); -} - -/* Compile our pixel shader and get back the compiled version and a constant table */ -static IDirect3DPixelShader9 *compile_pixel_shader9(IDirect3DDevice9 *device, const char *shader, - const char *profile, ID3DXConstantTable **constants) -{ - ID3D10Blob *compiled = NULL; - ID3D10Blob *errors = NULL; - IDirect3DPixelShader9 *pshader; - HRESULT hr; - - hr = ppD3DCompile(shader, strlen(shader), NULL, NULL, - NULL, "test", profile, /* test is the name of the entry point of our shader */ - 0, 0, &compiled, &errors); - ok(hr == D3D_OK, "Pixel shader %s compilation failed: %s\n", shader, - errors ? (char *)ID3D10Blob_GetBufferPointer(errors) : ""); - if (FAILED(hr)) return NULL; - - hr = pD3DXGetShaderConstantTable(ID3D10Blob_GetBufferPointer(compiled), constants); - ok(hr == D3D_OK, "Could not get constant table from compiled pixel shader\n"); - - hr = IDirect3DDevice9_CreatePixelShader(device, ID3D10Blob_GetBufferPointer(compiled), &pshader); - ok(SUCCEEDED(hr), "IDirect3DDevice9_CreatePixelShader returned: %08x\n", hr); - ID3D10Blob_Release(compiled); - return pshader; -} - -/* Draw a full screen quad */ -static void draw_quad_with_shader9(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 *quad_geometry) -{ - HRESULT hr; - D3DXMATRIX projection_matrix; - - pD3DXMatrixOrthoLH(&projection_matrix, 2.0f, 2.0f, 0.0f, 1.0f); - IDirect3DDevice9_SetTransform(device, D3DTS_PROJECTION, &projection_matrix); - - hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, D3DCOLOR_XRGB(0, 0, 0), 1.0f, 0); - ok(hr == D3D_OK, "IDirect3DDevice9_Clear returned: %08x\n", hr); - - hr = IDirect3DDevice9_BeginScene(device); - ok(hr == D3D_OK, "IDirect3DDevice9_BeginScene returned: %08x\n", hr); - - hr = IDirect3DDevice9_SetStreamSource(device, 0, quad_geometry, 0, sizeof(struct vertex)); - ok(hr == D3D_OK, "IDirect3DDevice9_SetStreamSource returned: %08x\n", hr); - hr = IDirect3DDevice9_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, 0, 2); - ok(hr == D3D_OK, "IDirect3DDevice9_DrawPrimitive returned: %08x\n", hr); - - hr = IDirect3DDevice9_EndScene(device); - ok(hr == D3D_OK, "IDirect3DDevice9_EndScene returned: %08x\n", hr); -} - -static void setup_device9(IDirect3DDevice9 *device, IDirect3DSurface9 **render_target, - IDirect3DSurface9 **readback, D3DFORMAT format, unsigned int width, unsigned int height, - IDirect3DVertexShader9 *vshader, IDirect3DPixelShader9 *pshader) -{ - HRESULT hr; - hr = IDirect3DDevice9_CreateRenderTarget(device, width, height, format, - D3DMULTISAMPLE_NONE, 0, FALSE, render_target, NULL); - ok(hr == D3D_OK, "IDirect3DDevice9_CreateRenderTarget returned: %08x\n", hr); - - /* The Direct3D 9 docs state that we cannot lock a render target surface, - instead we must copy the render target onto this surface to lock it */ - hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, width, height, format, - D3DPOOL_SYSTEMMEM, readback, NULL); - ok(hr == D3D_OK, "IDirect3DDevice9_CreateOffscreenPlainSurface returned: %08x\n", hr); - - hr = IDirect3DDevice9_SetRenderTarget(device, 0, *render_target); - ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderTarget returned: %08x\n", hr); - - hr = IDirect3DDevice9_SetVertexShader(device, vshader); - ok(hr == D3D_OK, "IDirect3DDevice9_SetVertexShader returned: %08x\n", hr); - hr = IDirect3DDevice9_SetPixelShader(device, pshader); - ok(hr == D3D_OK, "IDirect3DDevice9_SetPixelShader returned: %08x\n", hr); -} - -static BOOL colors_match(D3DXCOLOR a, D3DXCOLOR b, float epsilon) -{ - return (fabs(a.r - b.r) < epsilon && fabs(a.g - b.g) < epsilon && fabs(a.b - b.b) < epsilon && - fabs(a.a - b.a) < epsilon); -} - -/* Compute a shader on a width by height buffer and probes certain locations - to see if they are as expected. */ -static void compute_shader_probe9(IDirect3DDevice9 *device, IDirect3DVertexShader9 *vshader, - IDirect3DPixelShader9 *pshader, IDirect3DVertexBuffer9 *quad_geometry, - const struct hlsl_probe_info *probes, unsigned int count, - unsigned int width, unsigned int height, unsigned int line_number) -{ - IDirect3DSurface9 *render_target; - IDirect3DSurface9 *readback; - - HRESULT hr; - D3DLOCKED_RECT lr; - D3DXCOLOR *pbits_data; - unsigned int i; - - setup_device9(device, &render_target, &readback, D3DFMT_A32B32G32R32F, - width, height, vshader, pshader); - - /* Draw the quad with the shader and read back the data */ - draw_quad_with_shader9(device, quad_geometry); - IDirect3DDevice9_GetRenderTargetData(device, render_target, readback); - hr = IDirect3DSurface9_LockRect(readback, &lr, NULL, D3DLOCK_READONLY); - ok(hr == D3D_OK, "IDirect3DSurface9_LockRect returned: %08x\n", hr); - pbits_data = lr.pBits; - - /* Now go through the probes and check each one */ - for (i = 0; i < count; i++, probes++) { - int index = probes->x + (probes->y * lr.Pitch / sizeof(D3DXCOLOR)); - ok(colors_match(probes->c, pbits_data[index], probes->epsilon), - "Line %d: At (%d, %d): %s: Expected (%.04f,%.04f,%.04f, %.04f), got " - "(%.04f,%.04f,%.04f,%.04f)\n", line_number, probes->x, probes->y, probes->message, - probes->c.r, probes->c.g, probes->c.b, probes->c.a, pbits_data[index].r, - pbits_data[index].g, pbits_data[index].b, pbits_data[index].a); - } - - hr = IDirect3DSurface9_UnlockRect(readback); - ok(hr == D3D_OK, "IDirect3DSurface9_UnlockRect returned: %08x\n", hr); - - /* We now present the scene. This is mostly for debugging purposes, since GetRenderTargetData - also waits for drawing commands to complete. The reason this call is here and not in a - draw function is because the contents of the render target surface are invalidated after - this call. */ - hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); - ok(hr == D3D_OK, "IDirect3DDevice9_Present returned: %08x\n", hr); - - IDirect3DSurface9_Release(render_target); - IDirect3DSurface9_Release(readback); -} - -/* Now the actual test functions */ -static void test_swizzle(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 *quad_geometry, - IDirect3DVertexShader9 *vshader_passthru) -{ - static const struct hlsl_probe_info probes[] = - { - {0, 0, {0.0101f, 0.0303f, 0.0202f, 0.0404f}, 0.0001f, "swizzle_test"} - }; - - static const char *swizzle_test_shader = - "uniform float4 color;\n" - "float4 test(): COLOR\n" - "{\n" - " float4 ret = color;\n" - " ret.gb = ret.ra;\n" - " ret.ra = float2(0.0101, 0.0404);\n" - " return ret;\n" - "}"; - - ID3DXConstantTable *constants; - IDirect3DPixelShader9 *pshader; - - pshader = compile_pixel_shader9(device, swizzle_test_shader, "ps_2_0", &constants); - if (pshader != NULL) - { - set_float4_d3d9(device, constants, "color", 0.0303f, 0.0f, 0.0f, 0.0202f); - - compute_shader_probe9(device, vshader_passthru, pshader, quad_geometry, - probes, ARRAY_SIZE(probes), 1, 1, __LINE__); - - ID3DXConstantTable_Release(constants); - IDirect3DPixelShader9_Release(pshader); - } -} - -static void test_math(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 *quad_geometry, - IDirect3DVertexShader9 *vshader_passthru) -{ - /* Tests order of operations */ - static const float u = 2.5f, v = 0.3f, w = 0.2f, x = 0.7f, y = 0.1f, z = 1.5f; - - static const struct hlsl_probe_info probes[] = - { - {0, 0, {-12.4300f, 9.8333f, 1.6000f, 34.9999f}, 0.0001f, - "order of operations test"} - }; - - static const char *order_of_operations_shader = - "float4 test(uniform float u, uniform float v, uniform float w, uniform float x,\n" - " uniform float y, uniform float z): COLOR\n" - "{\n" - " return float4(x * y - z / w + --u / -v,\n" - " z * x / y + w / -v,\n" - " u + v - w,\n" - " x / y / w);\n" - "}"; - - ID3DXConstantTable *constants; - IDirect3DPixelShader9 *pshader; - - pshader = compile_pixel_shader9(device, order_of_operations_shader, "ps_2_0", &constants); - if (pshader != NULL) - { - ID3DXConstantTable_SetFloat(constants, device, "$u", u); - ID3DXConstantTable_SetFloat(constants, device, "$v", v); - ID3DXConstantTable_SetFloat(constants, device, "$w", w); - ID3DXConstantTable_SetFloat(constants, device, "$x", x); - ID3DXConstantTable_SetFloat(constants, device, "$y", y); - ID3DXConstantTable_SetFloat(constants, device, "$z", z); - - compute_shader_probe9(device, vshader_passthru, pshader, quad_geometry, - probes, ARRAY_SIZE(probes), 1, 1, __LINE__); - - ID3DXConstantTable_Release(constants); - IDirect3DPixelShader9_Release(pshader); - } -} - -static void test_conditionals(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 *quad_geometry, - IDirect3DVertexShader9 *vshader_passthru) -{ - static const struct hlsl_probe_info if_greater_probes[] = - { - { 0, 0, {0.9f, 0.8f, 0.7f, 0.6f}, 0.0001f, "if greater test"}, - { 5, 0, {0.9f, 0.8f, 0.7f, 0.6f}, 0.0001f, "if greater test"}, - {10, 0, {0.9f, 0.8f, 0.7f, 0.6f}, 0.0001f, "if greater test"}, - {15, 0, {0.9f, 0.8f, 0.7f, 0.6f}, 0.0001f, "if greater test"}, - {25, 0, {0.1f, 0.2f, 0.3f, 0.4f}, 0.0001f, "if greater test"}, - {30, 0, {0.1f, 0.2f, 0.3f, 0.4f}, 0.0001f, "if greater test"} - }; - - static const char *if_greater_shader = - "float4 test(float2 pos: TEXCOORD0): COLOR\n" - "{\n" - " if((pos.x * 32.0) > 20.0)\n" - " return float4(0.1, 0.2, 0.3, 0.4);\n" - " else\n" - " return float4(0.9, 0.8, 0.7, 0.6);\n" - "}"; - - static const struct hlsl_probe_info ternary_operator_probes[] = - { - {0, 0, {0.50f, 0.25f, 0.50f, 0.75f}, 0.00001f, "ternary operator test"}, - {1, 0, {0.50f, 0.25f, 0.50f, 0.75f}, 0.00001f, "ternary operator test"}, - {2, 0, {0.50f, 0.25f, 0.50f, 0.75f}, 0.00001f, "ternary operator test"}, - {3, 0, {0.50f, 0.25f, 0.50f, 0.75f}, 0.00001f, "ternary operator test"}, - {4, 0, {0.60f, 0.80f, 0.10f, 0.20f}, 0.00001f, "ternary operator test"}, - {5, 0, {0.60f, 0.80f, 0.10f, 0.20f}, 0.00001f, "ternary operator test"}, - {6, 0, {0.60f, 0.80f, 0.10f, 0.20f}, 0.00001f, "ternary operator test"}, - {7, 0, {0.60f, 0.80f, 0.10f, 0.20f}, 0.00001f, "ternary operator test"} - }; - - static const char *ternary_operator_shader = - "float4 test(float2 pos: TEXCOORD0): COLOR\n" - "{\n" - " return (pos.x < 0.5?float4(0.5, 0.25, 0.5, 0.75):float4(0.6, 0.8, 0.1, 0.2));\n" - "}"; - - ID3DXConstantTable *constants; - IDirect3DPixelShader9 *pshader; - - pshader = compile_pixel_shader9(device, if_greater_shader, "ps_2_0", &constants); - if (pshader != NULL) - { - compute_shader_probe9(device, vshader_passthru, pshader, quad_geometry, if_greater_probes, - ARRAY_SIZE(if_greater_probes), 32, 1, __LINE__); - - ID3DXConstantTable_Release(constants); - IDirect3DPixelShader9_Release(pshader); - } - - pshader = compile_pixel_shader9(device, ternary_operator_shader, "ps_2_0", &constants); - if (pshader != NULL) - { - compute_shader_probe9(device, vshader_passthru, pshader, quad_geometry, ternary_operator_probes, - ARRAY_SIZE(ternary_operator_probes), 8, 1, __LINE__); - - ID3DXConstantTable_Release(constants); - IDirect3DPixelShader9_Release(pshader); - } -} - -static void test_float_vectors(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 *quad_geometry, - IDirect3DVertexShader9 *vshader_passthru) -{ - static const struct hlsl_probe_info vec4_indexing_test1_probes[] = - { - {0, 0, {0.020f, 0.245f, 0.351f, 1.000f}, 0.0001f, "vec4 indexing test 1"} - }; - - static const char *vec4_indexing_test1_shader = - "float4 test(): COLOR\n" - "{\n" - " float4 color;\n" - " color[0] = 0.020;\n" - " color[1] = 0.245;\n" - " color[2] = 0.351;\n" - " color[3] = 1.0;\n" - " return color;\n" - "}"; - - static const struct hlsl_probe_info vec4_indexing_test2_probes[] = - { - {0, 0, {0.5f, 0.3f, 0.8f, 0.2f}, 0.0001f, "vec4 indexing test 2"} - }; - - /* We have this uniform i here so the compiler can't optimize */ - static const char *vec4_indexing_test2_shader = - "uniform int i;\n" - "float4 test(): COLOR\n" - "{\n" - " float4 color = float4(0.5, 0.4, 0.3, 0.2);\n" - " color.g = color[i];\n" - " color.b = 0.8;\n" - " return color;\n" - "}"; - - ID3DXConstantTable *constants; - IDirect3DPixelShader9 *pshader; - - pshader = compile_pixel_shader9(device, vec4_indexing_test1_shader, "ps_2_0", &constants); - if (pshader != NULL) - { - compute_shader_probe9(device, vshader_passthru, pshader, quad_geometry, vec4_indexing_test1_probes, - ARRAY_SIZE(vec4_indexing_test1_probes), 1, 1, __LINE__); - - ID3DXConstantTable_Release(constants); - IDirect3DPixelShader9_Release(pshader); - } - - pshader = compile_pixel_shader9(device, vec4_indexing_test2_shader, "ps_2_0", &constants); - if (pshader != NULL) - { - ID3DXConstantTable_SetInt(constants, device, "i", 2); - - compute_shader_probe9(device, vshader_passthru, pshader, quad_geometry, vec4_indexing_test2_probes, - ARRAY_SIZE(vec4_indexing_test2_probes), 32, 1, __LINE__); - - ID3DXConstantTable_Release(constants); - IDirect3DPixelShader9_Release(pshader); - } -} - -static void test_trig(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 *quad_geometry, - IDirect3DVertexShader9 *vshader_passthru) -{ - static const struct hlsl_probe_info sincos_probes[] = - { - {0, 0, {0.5000f, 1.0000f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {1, 0, {0.5975f, 0.9904f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {2, 0, {0.6913f, 0.9620f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {3, 0, {0.7778f, 0.9160f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {4, 0, {0.8536f, 0.8536f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {5, 0, {0.9157f, 0.7778f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {6, 0, {0.9620f, 0.6913f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {7, 0, {0.9904f, 0.5975f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {8, 0, {1.0000f, 0.5000f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {9, 0, {0.9904f, 0.4025f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {10, 0, {0.9619f, 0.3087f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {11, 0, {0.9157f, 0.2222f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {12, 0, {0.8536f, 0.1464f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {13, 0, {0.7778f, 0.0843f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {14, 0, {0.6913f, 0.0381f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {15, 0, {0.5975f, 0.0096f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {16, 0, {0.5000f, 0.0000f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {17, 0, {0.4025f, 0.0096f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {18, 0, {0.3087f, 0.0381f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {19, 0, {0.2222f, 0.0843f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {20, 0, {0.1464f, 0.1464f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {21, 0, {0.0843f, 0.2222f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {22, 0, {0.0381f, 0.3087f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {23, 0, {0.0096f, 0.4025f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {24, 0, {0.0000f, 0.5000f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {25, 0, {0.0096f, 0.5975f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {26, 0, {0.0381f, 0.6913f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {27, 0, {0.0843f, 0.7778f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {28, 0, {0.1464f, 0.8536f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {29, 0, {0.2222f, 0.9157f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {30, 0, {0.3087f, 0.9619f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {31, 0, {0.4025f, 0.9904f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - }; - - static const char *sincos_shader = - "float4 test(float x: TEXCOORD0): COLOR\n" - "{\n" - " const float pi2 = 6.2831853;\n" - " float calcd_sin = (sin(x * pi2) + 1)/2;\n" - " float calcd_cos = (cos(x * pi2) + 1)/2;\n" - " return float4(calcd_sin, calcd_cos, 0, 0);\n" - "}"; - - ID3DXConstantTable *constants; - IDirect3DPixelShader9 *pshader; - - pshader = compile_pixel_shader9(device, sincos_shader, "ps_2_0", &constants); - if (pshader != NULL) - { - compute_shader_probe9(device, vshader_passthru, pshader, quad_geometry, sincos_probes, - ARRAY_SIZE(sincos_probes), 32, 1, __LINE__); - - ID3DXConstantTable_Release(constants); - IDirect3DPixelShader9_Release(pshader); - } -} - -static void test_fail(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 *qquad_geometry, - IDirect3DVertexShader9 *vshader_passthru) -{ - static const char *tests[] = - { - "float4 test(float2 pos: TEXCOORD0) : COLOR\n" - "{\n" - " return y;\n" - "}", - - "float4 test(float2 pos: TEXCOORD0) : COLOR\n" - "{\n" - " float4 x = float4(0, 0, 0, 0);\n" - " x.xzzx = float4(1, 2, 3, 4);\n" - " return x;\n" - "}", - - "float4 test(float2 pos: TEXCOORD0) : COLOR\n" - "{\n" - " float4 x = pos;\n" - " return x;\n" - "}", - - "float4 test(float2 pos, TEXCOORD0) ; COLOR\n" - "{\n" - " pos = float4 x;\n" - " mul(float4(5, 4, 3, 2), mvp) = x;\n" - " return float4;\n" - "}", - - "float4 563r(float2 45s: TEXCOORD0) : COLOR\n" - "{\n" - " float2 x = 45s;\n" - " return float4(x.x, x.y, 0, 0);\n" - "}", - - "float4 test(float2 pos: TEXCOORD0) : COLOR\n" - "{\n" - " struct { int b,c; } x = {0};\n" - " return y;\n" - "}", - - "float4 test(float2 pos: TEXCOORD0) : COLOR\n" - "{\n" - " struct {} x = {};\n" - " return y;\n" - "}", - }; - - ID3D10Blob *compiled, *errors; - unsigned int i; - HRESULT hr; - - for (i = 0; i < ARRAY_SIZE(tests); ++i) - { - compiled = errors = NULL; - hr = ppD3DCompile(tests[i], strlen(tests[i]), NULL, NULL, NULL, "test", "ps_2_0", 0, 0, &compiled, &errors); - ok(hr == E_FAIL, "Test %u, got unexpected hr %#x.\n", i, hr); - ok(!!errors, "Test %u, expected non-NULL error blob.\n", i); - ok(!compiled, "Test %u, expected no compiled shader blob.\n", i); - ID3D10Blob_Release(errors); - } -} - -static BOOL load_d3dcompiler(void) -{ - HMODULE module; - -#if D3D_COMPILER_VERSION == 47 - if (!(module = LoadLibraryA("d3dcompiler_47.dll"))) return FALSE; -#else - if (!(module = LoadLibraryA("d3dcompiler_43.dll"))) return FALSE; -#endif - - ppD3DCompile = (void*)GetProcAddress(module, "D3DCompile"); - return TRUE; -} - -START_TEST(hlsl) -{ - D3DCAPS9 caps; - ULONG refcount; - IDirect3DDevice9 *device; - IDirect3DVertexDeclaration9 *vdeclaration; - IDirect3DVertexBuffer9 *quad_geometry; - IDirect3DVertexShader9 *vshader_passthru; - HMODULE mod; - - if (!load_d3dcompiler()) - { - win_skip("Could not load DLL.\n"); - return; - } - - if (!(mod = LoadLibraryA("d3dx9_36.dll"))) - { - win_skip("Failed to load d3dx9_36.dll.\n"); - return; - } - pD3DXGetShaderConstantTable = (void *)GetProcAddress(mod, "D3DXGetShaderConstantTable"); - pD3DXMatrixOrthoLH = (void *)GetProcAddress(mod, "D3DXMatrixOrthoLH"); - - device = init_d3d9(&vdeclaration, &quad_geometry, &vshader_passthru); - if (!device) return; - - /* Make sure we support pixel shaders, before trying to compile them! */ - /* Direct3D 9 (Shader model 1-3 tests) */ - IDirect3DDevice9_GetDeviceCaps(device, &caps); - if (caps.PixelShaderVersion >= D3DPS_VERSION(2, 0)) - { - todo_wine - { - test_swizzle(device, quad_geometry, vshader_passthru); - test_math(device, quad_geometry, vshader_passthru); - test_conditionals(device, quad_geometry, vshader_passthru); - test_float_vectors(device, quad_geometry, vshader_passthru); - test_trig(device, quad_geometry, vshader_passthru); - test_fail(device, quad_geometry, vshader_passthru); - } - } else skip("no pixel shader support\n"); - - /* Reference counting sanity checks */ - if (vshader_passthru) - { - refcount = IDirect3DVertexShader9_Release(vshader_passthru); - ok(!refcount, "Pass-through vertex shader has %u references left\n", refcount); - } - - refcount = IDirect3DVertexBuffer9_Release(quad_geometry); - ok(!refcount, "Vertex buffer has %u references left\n", refcount); - - refcount = IDirect3DVertexDeclaration9_Release(vdeclaration); - ok(!refcount, "Vertex declaration has %u references left\n", refcount); - - refcount = IDirect3DDevice9_Release(device); - ok(!refcount, "Device has %u references left\n", refcount); -} diff --git a/dlls/d3dcompiler_43/tests/hlsl_d3d9.c b/dlls/d3dcompiler_43/tests/hlsl_d3d9.c new file mode 100644 index 00000000000..79f54d200e2 --- /dev/null +++ b/dlls/d3dcompiler_43/tests/hlsl_d3d9.c @@ -0,0 +1,678 @@ +/* + * Copyright (C) 2010 Travis Athougies + * Copyright (C) 2020 Zebediah Figura for CodeWeavers + * + * 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 + */ +#define COBJMACROS +#include "wine/test.h" +#include "d3dx9.h" +#include "d3dcompiler.h" + +#include <math.h> + +static pD3DCompile ppD3DCompile; + +static HRESULT (WINAPI *pD3DXGetShaderConstantTable)(const DWORD *byte_code, ID3DXConstantTable **constant_table); + +struct vec2 +{ + float x, y; +}; + +struct vec4 +{ + float x, y, z, w; +}; + +#define compile_shader(a, b) compile_shader_(__LINE__, a, b) +static ID3D10Blob *compile_shader_(unsigned int line, const char *source, const char *target) +{ + ID3D10Blob *blob = NULL, *errors = NULL; + HRESULT hr; + + hr = ppD3DCompile(source, strlen(source), NULL, NULL, NULL, "main", target, 0, 0, &blob, &errors); + ok_(__FILE__, line)(hr == D3D_OK, "Failed to compile shader, hr %#x.\n", hr); + if (errors) + { + if (winetest_debug > 1) + trace_(__FILE__, line)("%s\n", (char *)ID3D10Blob_GetBufferPointer(errors)); + ID3D10Blob_Release(errors); + } + return blob; +} + +static IDirect3DDevice9 *create_device(HWND window) +{ + D3DPRESENT_PARAMETERS present_parameters = + { + .Windowed = TRUE, + .hDeviceWindow = window, + .SwapEffect = D3DSWAPEFFECT_DISCARD, + .BackBufferWidth = 640, + .BackBufferHeight = 480, + .BackBufferFormat = D3DFMT_A8R8G8B8, + }; + IDirect3DDevice9 *device; + IDirect3DSurface9 *rt; + IDirect3D9 *d3d; + D3DCAPS9 caps; + HRESULT hr; + + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, window, + D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, &device); + IDirect3D9_Release(d3d); + if (FAILED(hr)) + { + skip("Failed to create a 3D device, hr %#x.\n", hr); + return NULL; + } + + hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); + ok(hr == D3D_OK, "Failed to get device caps, hr %#x.\n", hr); + if (caps.PixelShaderVersion < D3DPS_VERSION(2, 0) || caps.VertexShaderVersion < D3DVS_VERSION(2, 0)) + { + skip("No shader model 2 support.\n"); + IDirect3DDevice9_Release(device); + return NULL; + } + + if (FAILED(hr = IDirect3DDevice9_CreateRenderTarget(device, 640, 480, D3DFMT_A32B32G32R32F, + D3DMULTISAMPLE_NONE, 0, FALSE, &rt, NULL))) + { + skip("Failed to create an A32B32G32R32F surface, hr %#x.\n", hr); + IDirect3DDevice9_Release(device); + return NULL; + } + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderTarget(device, 0, rt); + ok(hr == D3D_OK, "Failed to set render target, hr %#x.\n", hr); + IDirect3DSurface9_Release(rt); + + return device; +} + +struct test_context +{ + IDirect3DDevice9 *device; + HWND window; +}; + +#define init_test_context(a) init_test_context_(__LINE__, a) +static BOOL init_test_context_(unsigned int line, struct test_context *context) +{ + RECT rect = {0, 0, 640, 480}; + + AdjustWindowRect(&rect, WS_OVERLAPPEDWINDOW, FALSE); + context->window = CreateWindowA("static", "d3dcompiler_test", WS_OVERLAPPEDWINDOW, + 0, 0, rect.right - rect.left, rect.bottom - rect.top, NULL, NULL, NULL, NULL); + ok(!!context->window, "Failed to create a window.\n"); + + if (!(context->device = create_device(context->window))) + { + DestroyWindow(context->window); + return FALSE; + } + + return TRUE; +} + +#define release_test_context(context) release_test_context_(__LINE__, context) +static void release_test_context_(unsigned int line, struct test_context *context) +{ + ULONG ref = IDirect3DDevice9_Release(context->device); + ok_(__FILE__, line)(!ref, "Device has %u references left.\n", ref); + DestroyWindow(context->window); +} + +#define draw_quad(device, ps_code) draw_quad_(__LINE__, device, ps_code) +static void draw_quad_(unsigned int line, IDirect3DDevice9 *device, ID3D10Blob *ps_code) +{ + IDirect3DVertexDeclaration9 *vertex_declaration; + IDirect3DVertexShader9 *vs; + IDirect3DPixelShader9 *ps; + ID3D10Blob *vs_code; + HRESULT hr; + + static const D3DVERTEXELEMENT9 decl_elements[] = + { + {0, 0, D3DDECLTYPE_FLOAT2, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0}, + {0, 8, D3DDECLTYPE_FLOAT2, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_TEXCOORD, 0}, + D3DDECL_END() + }; + + static const struct + { + struct vec2 position; + struct vec2 t0; + } + quad[] = + { + {{-1.0f, -1.0f}, {0.0f, 1.0f}}, + {{-1.0f, 1.0f}, {0.0f, 0.0f}}, + {{ 1.0f, -1.0f}, {1.0f, 1.0f}}, + {{ 1.0f, 1.0f}, {1.0f, 0.0f}}, + }; + + static const char vs_source[] = + "float4 main(float4 pos : POSITION, inout float2 texcoord : TEXCOORD0) : POSITION\n" + "{\n" + " return pos;\n" + "}"; + + hr = IDirect3DDevice9_CreateVertexDeclaration(device, decl_elements, &vertex_declaration); + ok_(__FILE__, line)(hr == D3D_OK, "Failed to create vertex declaration, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetVertexDeclaration(device, vertex_declaration); + ok_(__FILE__, line)(hr == D3D_OK, "Failed to set vertex declaration, hr %#x.\n", hr); + + vs_code = compile_shader(vs_source, "vs_2_0"); + + hr = IDirect3DDevice9_CreateVertexShader(device, ID3D10Blob_GetBufferPointer(vs_code), &vs); + ok_(__FILE__, line)(hr == D3D_OK, "Failed to create vertex shader, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetVertexShader(device, vs); + ok_(__FILE__, line)(hr == D3D_OK, "Failed to set vertex shader, hr %#x.\n", hr); + + hr = IDirect3DDevice9_CreatePixelShader(device, ID3D10Blob_GetBufferPointer(ps_code), &ps); + ok_(__FILE__, line)(hr == D3D_OK, "Failed to create pixel shader, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetPixelShader(device, ps); + ok_(__FILE__, line)(hr == D3D_OK, "Failed to set pixel shader, hr %#x.\n", hr); + + hr = IDirect3DDevice9_BeginScene(device); + ok_(__FILE__, line)(hr == D3D_OK, "Failed to draw, hr %#x.\n", hr); + + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(*quad)); + ok_(__FILE__, line)(hr == D3D_OK, "Failed to draw, hr %#x.\n", hr); + + hr = IDirect3DDevice9_EndScene(device); + ok_(__FILE__, line)(hr == D3D_OK, "Failed to draw, hr %#x.\n", hr); + + IDirect3DVertexDeclaration9_Release(vertex_declaration); + IDirect3DVertexShader9_Release(vs); + IDirect3DPixelShader9_Release(ps); + ID3D10Blob_Release(vs_code); +} + +struct readback +{ + IDirect3DSurface9 *surface; + D3DLOCKED_RECT rect; +}; + +static void init_readback(IDirect3DDevice9 *device, struct readback *rb) +{ + IDirect3DSurface9 *rt; + D3DSURFACE_DESC desc; + HRESULT hr; + + hr = IDirect3DDevice9Ex_GetRenderTarget(device, 0, &rt); + ok(hr == D3D_OK, "Failed to get render target, hr %#x.\n", hr); + + hr = IDirect3DSurface9_GetDesc(rt, &desc); + ok(hr == D3D_OK, "Failed to get surface desc, hr %#x.\n", hr); + hr = IDirect3DDevice9Ex_CreateOffscreenPlainSurface(device, desc.Width, desc.Height, + desc.Format, D3DPOOL_SYSTEMMEM, &rb->surface, NULL); + ok(hr == D3D_OK, "Failed to create surface, hr %#x.\n", hr); + + hr = IDirect3DDevice9Ex_GetRenderTargetData(device, rt, rb->surface); + ok(hr == D3D_OK, "Failed to get render target data, hr %#x.\n", hr); + + hr = IDirect3DSurface9_LockRect(rb->surface, &rb->rect, NULL, D3DLOCK_READONLY); + ok(hr == D3D_OK, "Failed to lock surface, hr %#x.\n", hr); + + IDirect3DSurface9_Release(rt); +} + +static const struct vec4 *get_readback_vec4(const struct readback *rb, unsigned int x, unsigned int y) +{ + return (struct vec4 *)((BYTE *)rb->rect.pBits + y * rb->rect.Pitch + x * sizeof(struct vec4)); +} + +static void release_readback(struct readback *rb) +{ + IDirect3DSurface9_UnlockRect(rb->surface); + IDirect3DSurface9_Release(rb->surface); +} + +static struct vec4 get_color_vec4(IDirect3DDevice9 *device, unsigned int x, unsigned int y) +{ + struct readback rb; + struct vec4 ret; + + init_readback(device, &rb); + ret = *get_readback_vec4(&rb, x, y); + release_readback(&rb); + + return ret; +} + +static BOOL compare_float(float f, float g, unsigned int ulps) +{ + int x = *(int *)&f; + int y = *(int *)&g; + + if (x < 0) + x = INT_MIN - x; + if (y < 0) + y = INT_MIN - y; + + if (abs(x - y) > ulps) + return FALSE; + + return TRUE; +} + +static BOOL compare_vec4(const struct vec4 *vec, float x, float y, float z, float w, unsigned int ulps) +{ + return compare_float(vec->x, x, ulps) + && compare_float(vec->y, y, ulps) + && compare_float(vec->z, z, ulps) + && compare_float(vec->w, w, ulps); +} + +static void test_swizzle(void) +{ + static const D3DXVECTOR4 color = {0.0303f, 0.0f, 0.0f, 0.0202f}; + struct test_context test_context; + ID3DXConstantTable *constants; + ID3D10Blob *ps_code = NULL; + IDirect3DDevice9 *device; + struct vec4 v; + HRESULT hr; + + static const char ps_source[] = + "uniform float4 color;\n" + "float4 main() : COLOR\n" + "{\n" + " float4 ret = color;\n" + " ret.gb = ret.ra;\n" + " ret.ra = float2(0.0101, 0.0404);\n" + " return ret;\n" + "}"; + + if (!init_test_context(&test_context)) + return; + device = test_context.device; + + todo_wine ps_code = compile_shader(ps_source, "ps_2_0"); + if (ps_code) + { + hr = pD3DXGetShaderConstantTable(ID3D10Blob_GetBufferPointer(ps_code), &constants); + ok(hr == D3D_OK, "Failed to get constant table, hr %#x.\n", hr); + hr = ID3DXConstantTable_SetVector(constants, device, "color", &color); + ok(hr == D3D_OK, "Failed to set constant, hr %#x.\n", hr); + ID3DXConstantTable_Release(constants); + + draw_quad(device, ps_code); + + v = get_color_vec4(device, 0, 0); + ok(compare_vec4(&v, 0.0101f, 0.0303f, 0.0202f, 0.0404f, 0), + "Got unexpected value {%.8e, %.8e, %.8e, %.8e}.\n", v.x, v.y, v.z, v.w); + + ID3D10Blob_Release(ps_code); + } + release_test_context(&test_context); +} + +static void test_math(void) +{ + struct test_context test_context; + ID3DXConstantTable *constants; + ID3D10Blob *ps_code = NULL; + IDirect3DDevice9 *device; + struct vec4 v; + HRESULT hr; + + static const char ps_source[] = + "float4 main(uniform float u, uniform float v, uniform float w, uniform float x,\n" + " uniform float y, uniform float z): COLOR\n" + "{\n" + " return float4(x * y - z / w + --u / -v,\n" + " z * x / y + w / -v,\n" + " u + v - w,\n" + " x / y / w);\n" + "}"; + + if (!init_test_context(&test_context)) + return; + device = test_context.device; + + todo_wine ps_code = compile_shader(ps_source, "ps_2_0"); + if (ps_code) + { + hr = pD3DXGetShaderConstantTable(ID3D10Blob_GetBufferPointer(ps_code), &constants); + ok(hr == D3D_OK, "Failed to get constant table, hr %#x.\n", hr); + hr = ID3DXConstantTable_SetFloat(constants, device, "$u", 2.5f); + ok(hr == D3D_OK, "Failed to set constant, hr %#x.\n", hr); + hr = ID3DXConstantTable_SetFloat(constants, device, "$v", 0.3f); + ok(hr == D3D_OK, "Failed to set constant, hr %#x.\n", hr); + hr = ID3DXConstantTable_SetFloat(constants, device, "$w", 0.2f); + ok(hr == D3D_OK, "Failed to set constant, hr %#x.\n", hr); + hr = ID3DXConstantTable_SetFloat(constants, device, "$x", 0.7f); + ok(hr == D3D_OK, "Failed to set constant, hr %#x.\n", hr); + hr = ID3DXConstantTable_SetFloat(constants, device, "$y", 0.1f); + ok(hr == D3D_OK, "Failed to set constant, hr %#x.\n", hr); + hr = ID3DXConstantTable_SetFloat(constants, device, "$z", 1.5f); + ok(hr == D3D_OK, "Failed to set constant, hr %#x.\n", hr); + ID3DXConstantTable_Release(constants); + + draw_quad(device, ps_code); + + v = get_color_vec4(device, 0, 0); + ok(compare_vec4(&v, -12.43f, 9.833333f, 1.6f, 35.0f, 1), + "Got unexpected value {%.8e, %.8e, %.8e, %.8e}.\n", v.x, v.y, v.z, v.w); + + ID3D10Blob_Release(ps_code); + } + release_test_context(&test_context); +} + +static void test_conditionals(void) +{ + struct test_context test_context; + ID3D10Blob *ps_code = NULL; + IDirect3DDevice9 *device; + const struct vec4 *v; + struct readback rb; + unsigned int i; + + static const char ps_if_source[] = + "float4 main(float2 pos : TEXCOORD0) : COLOR\n" + "{\n" + " if((pos.x * 640.0) > 200.0)\n" + " return float4(0.1, 0.2, 0.3, 0.4);\n" + " else\n" + " return float4(0.9, 0.8, 0.7, 0.6);\n" + "}"; + + static const char ps_ternary_source[] = + "float4 main(float2 pos : TEXCOORD0) : COLOR\n" + "{\n" + " return (pos.x < 0.5 ? float4(0.5, 0.25, 0.5, 0.75) : float4(0.6, 0.8, 0.1, 0.2));\n" + "}"; + + if (!init_test_context(&test_context)) + return; + device = test_context.device; + + todo_wine ps_code = compile_shader(ps_if_source, "ps_2_0"); + if (ps_code) + { + draw_quad(device, ps_code); + init_readback(device, &rb); + + for (i = 0; i < 200; i += 40) + { + v = get_readback_vec4(&rb, i, 0); + ok(compare_vec4(v, 0.9f, 0.8f, 0.7f, 0.6f, 0), + "Got unexpected value {%.8e, %.8e, %.8e, %.8e}.\n", v->x, v->y, v->z, v->w); + } + + for (i = 240; i < 640; i += 40) + { + v = get_readback_vec4(&rb, i, 0); + ok(compare_vec4(v, 0.1f, 0.2f, 0.3f, 0.4f, 0), + "Got unexpected value {%.8e, %.8e, %.8e, %.8e}.\n", v->x, v->y, v->z, v->w); + } + + release_readback(&rb); + ID3D10Blob_Release(ps_code); + } + + todo_wine ps_code = compile_shader(ps_ternary_source, "ps_2_0"); + if (ps_code) + { + draw_quad(device, ps_code); + init_readback(device, &rb); + + for (i = 0; i < 320; i += 40) + { + v = get_readback_vec4(&rb, i, 0); + ok(compare_vec4(v, 0.5f, 0.25f, 0.5f, 0.75f, 0), + "Got unexpected value {%.8e, %.8e, %.8e, %.8e}.\n", v->x, v->y, v->z, v->w); + } + + for (i = 360; i < 640; i += 40) + { + v = get_readback_vec4(&rb, i, 0); + ok(compare_vec4(v, 0.6f, 0.8f, 0.1f, 0.2f, 0), + "Got unexpected value {%.8e, %.8e, %.8e, %.8e}.\n", v->x, v->y, v->z, v->w); + } + + release_readback(&rb); + ID3D10Blob_Release(ps_code); + } + + release_test_context(&test_context); +} + +static void test_float_vectors(void) +{ + struct test_context test_context; + ID3DXConstantTable *constants; + ID3D10Blob *ps_code = NULL; + IDirect3DDevice9 *device; + struct vec4 v; + HRESULT hr; + + static const char ps_indexing_source[] = + "float4 main() : COLOR\n" + "{\n" + " float4 color;\n" + " color[0] = 0.020;\n" + " color[1] = 0.245;\n" + " color[2] = 0.351;\n" + " color[3] = 1.0;\n" + " return color;\n" + "}"; + + /* A uniform index is used so that the compiler can't optimize. */ + static const char ps_uniform_indexing_source[] = + "uniform int i;\n" + "float4 main() : COLOR\n" + "{\n" + " float4 color = float4(0.5, 0.4, 0.3, 0.2);\n" + " color.g = color[i];\n" + " color.b = 0.8;\n" + " return color;\n" + "}"; + + if (!init_test_context(&test_context)) + return; + device = test_context.device; + + todo_wine ps_code = compile_shader(ps_indexing_source, "ps_2_0"); + if (ps_code) + { + draw_quad(device, ps_code); + + v = get_color_vec4(device, 0, 0); + ok(compare_vec4(&v, 0.02f, 0.245f, 0.351f, 1.0f, 0), + "Got unexpected value {%.8e, %.8e, %.8e, %.8e}.\n", v.x, v.y, v.z, v.w); + + ID3D10Blob_Release(ps_code); + } + + todo_wine ps_code = compile_shader(ps_uniform_indexing_source, "ps_2_0"); + if (ps_code) + { + hr = pD3DXGetShaderConstantTable(ID3D10Blob_GetBufferPointer(ps_code), &constants); + ok(hr == D3D_OK, "Failed to get constants, hr %#x.\n", hr); + hr = ID3DXConstantTable_SetInt(constants, device, "i", 2); + ok(hr == D3D_OK, "Failed to set constant, hr %#x.\n", hr); + ID3DXConstantTable_Release(constants); + draw_quad(device, ps_code); + + v = get_color_vec4(device, 0, 0); + ok(compare_vec4(&v, 0.5f, 0.3f, 0.8f, 0.2f, 0), + "Got unexpected value {%.8e, %.8e, %.8e, %.8e}.\n", v.x, v.y, v.z, v.w); + + ID3D10Blob_Release(ps_code); + } + + release_test_context(&test_context); +} + +static void test_trig(void) +{ + struct test_context test_context; + ID3D10Blob *ps_code = NULL; + IDirect3DDevice9 *device; + const struct vec4 *v; + struct readback rb; + unsigned int i; + + static const char ps_source[] = + "float4 main(float x : TEXCOORD0) : COLOR\n" + "{\n" + " const float pi2 = 6.2831853;\n" + " float calcd_sin = (sin(x * pi2) + 1)/2;\n" + " float calcd_cos = (cos(x * pi2) + 1)/2;\n" + " return float4(calcd_sin, calcd_cos, 0, 0);\n" + "}"; + + if (!init_test_context(&test_context)) + return; + device = test_context.device; + + todo_wine ps_code = compile_shader(ps_source, "ps_2_0"); + if (ps_code) + { + draw_quad(device, ps_code); + init_readback(device, &rb); + + for (i = 0; i < 32; ++i) + { + float expect_x = (sinf(i * 2 * M_PI / 32) + 1.0f) / 2.0f; + float expect_y = (cosf(i * 2 * M_PI / 32) + 1.0f) / 2.0f; + v = get_readback_vec4(&rb, i * 640 / 32, 0); + ok(compare_vec4(v, expect_x, expect_y, 0.0f, 0.0f, 4096), + "Test %u: Got {%.8e, %.8e, %.8e, %.8e}, expected {%.8e, %.8e, %.8e, %.8e}.\n", + i, v->x, v->y, v->z, v->w, expect_x, expect_y, 0.0f, 0.0f); + } + + release_readback(&rb); + ID3D10Blob_Release(ps_code); + } + release_test_context(&test_context); +} + +static void test_fail(void) +{ + static const char *tests[] = + { + "float4 test(float2 pos: TEXCOORD0) : COLOR\n" + "{\n" + " return y;\n" + "}", + + "float4 test(float2 pos: TEXCOORD0) : COLOR\n" + "{\n" + " float4 x = float4(0, 0, 0, 0);\n" + " x.xzzx = float4(1, 2, 3, 4);\n" + " return x;\n" + "}", + + "float4 test(float2 pos: TEXCOORD0) : COLOR\n" + "{\n" + " float4 x = pos;\n" + " return x;\n" + "}", + + "float4 test(float2 pos, TEXCOORD0) ; COLOR\n" + "{\n" + " pos = float4 x;\n" + " mul(float4(5, 4, 3, 2), mvp) = x;\n" + " return float4;\n" + "}", + + "float4 563r(float2 45s: TEXCOORD0) : COLOR\n" + "{\n" + " float2 x = 45s;\n" + " return float4(x.x, x.y, 0, 0);\n" + "}", + + "float4 test(float2 pos: TEXCOORD0) : COLOR\n" + "{\n" + " struct { int b,c; } x = {0};\n" + " return y;\n" + "}", + + "float4 test(float2 pos: TEXCOORD0) : COLOR\n" + "{\n" + " struct {} x = {};\n" + " return y;\n" + "}", + }; + + ID3D10Blob *compiled, *errors; + unsigned int i; + HRESULT hr; + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + compiled = errors = NULL; + hr = ppD3DCompile(tests[i], strlen(tests[i]), NULL, NULL, NULL, "test", "ps_2_0", 0, 0, &compiled, &errors); + todo_wine ok(hr == E_FAIL, "Test %u, got unexpected hr %#x.\n", i, hr); + todo_wine_if (i == 1) ok(!!errors, "Test %u, expected non-NULL error blob.\n", i); + ok(!compiled, "Test %u, expected no compiled shader blob.\n", i); + if (errors) + ID3D10Blob_Release(errors); + } +} + +static BOOL load_d3dcompiler(void) +{ + HMODULE module; + +#if D3D_COMPILER_VERSION == 47 + if (!(module = LoadLibraryA("d3dcompiler_47.dll"))) return FALSE; +#else + if (!(module = LoadLibraryA("d3dcompiler_43.dll"))) return FALSE; +#endif + + ppD3DCompile = (void*)GetProcAddress(module, "D3DCompile"); + return TRUE; +} + +START_TEST(hlsl_d3d9) +{ + HMODULE mod; + + if (!load_d3dcompiler()) + { + win_skip("Could not load DLL.\n"); + return; + } + + if (!(mod = LoadLibraryA("d3dx9_36.dll"))) + { + win_skip("Failed to load d3dx9_36.dll.\n"); + return; + } + pD3DXGetShaderConstantTable = (void *)GetProcAddress(mod, "D3DXGetShaderConstantTable"); + + test_swizzle(); + test_math(); + test_conditionals(); + test_float_vectors(); + test_trig(); + test_fail(); +} diff --git a/dlls/d3dcompiler_47/tests/Makefile.in b/dlls/d3dcompiler_47/tests/Makefile.in index 401ed30b0f1..032e16fdb8f 100644 --- a/dlls/d3dcompiler_47/tests/Makefile.in +++ b/dlls/d3dcompiler_47/tests/Makefile.in @@ -6,5 +6,5 @@ PARENTSRC = ../../d3dcompiler_43/tests C_SRCS = \ asm.c \ blob.c \ - hlsl.c \ + hlsl_d3d9.c \ reflection.c -- 2.24.1

1 2

[PATCH v2 1/4] winegstreamer: Don't query or set GStreamer duration if the filter is stopped.
by Zebediah Figura 28 Feb '20

28 Feb '20

This check is not equivalent to the existence of "their_src" for the MPEG-1 splitter, since that always exposes a source audio pin. Fixes: 40a4c782b7f77534535dfa7bb2a97049026fef47 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/winegstreamer/gstdemux.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 488c9bd8a13..d469f2dbbff 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1841,7 +1841,8 @@ static HRESULT WINAPI GST_Seeking_GetCurrentPosition(IMediaSeeking *iface, REFER mark_wine_thread(); - if (!This->their_src) { + if (This->pin.pin.filter->state == State_Stopped) + { *pos = This->seek.llCurrent; TRACE("Cached value\n"); if (This->seek.llDuration) @@ -1892,7 +1893,7 @@ static HRESULT WINAPI GST_Seeking_SetPositions(IMediaSeeking *iface, return E_NOTIMPL; hr = SourceSeekingImpl_SetPositions(iface, pCur, curflags, pStop, stopflags); - if (!This->their_src) + if (This->pin.pin.filter->state == State_Stopped) return hr; curtype = type_from_flags(curflags); -- 2.25.0

1 3

[PATCH 1/4] winegstreamer: Don't query or set GStreamer duration if the filter is stopped.
by Zebediah Figura 28 Feb '20

28 Feb '20

This check is not equivalent to the existence of "their_src" for the MPEG-1 splitter, since that always exposes a source audio pin. Fixes: 40a4c782b7f77534535dfa7bb2a97049026fef47 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/winegstreamer/gstdemux.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 488c9bd8a13..d469f2dbbff 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1841,7 +1841,8 @@ static HRESULT WINAPI GST_Seeking_GetCurrentPosition(IMediaSeeking *iface, REFER mark_wine_thread(); - if (!This->their_src) { + if (This->pin.pin.filter->state == State_Stopped) + { *pos = This->seek.llCurrent; TRACE("Cached value\n"); if (This->seek.llDuration) @@ -1892,7 +1893,7 @@ static HRESULT WINAPI GST_Seeking_SetPositions(IMediaSeeking *iface, return E_NOTIMPL; hr = SourceSeekingImpl_SetPositions(iface, pCur, curflags, pStop, stopflags); - if (!This->their_src) + if (This->pin.pin.filter->state == State_Stopped) return hr; curtype = type_from_flags(curflags); -- 2.25.0

3 5

[PATCH 4/6] ucrtbase: Add exe exntry points implementation.
by Jacek Caban 27 Feb '20

27 Feb '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/msvcrt/crt_main.c | 12 +++++++++++- dlls/msvcrt/crt_wmain.c | 12 +++++++++++- dlls/ucrtbase/Makefile.in | 7 ++++++- 3 files changed, 28 insertions(+), 3 deletions(-)

3 2

[PATCH v3 1/3] d3dcompiler/tests: Rewrite to use a separate d3d9 device for each test.
by Zebediah Figura 27 Feb '20

27 Feb '20

This brings the d3dcompiler tests more in line with existing d3d9 tests, and allows potentially running the tests in parallel. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- v3: make window creation more consistent dlls/d3dcompiler_43/tests/Makefile.in | 2 +- dlls/d3dcompiler_43/tests/hlsl.c | 701 -------------------------- dlls/d3dcompiler_43/tests/hlsl_d3d9.c | 678 +++++++++++++++++++++++++ dlls/d3dcompiler_47/tests/Makefile.in | 2 +- 4 files changed, 680 insertions(+), 703 deletions(-) delete mode 100644 dlls/d3dcompiler_43/tests/hlsl.c create mode 100644 dlls/d3dcompiler_43/tests/hlsl_d3d9.c diff --git a/dlls/d3dcompiler_43/tests/Makefile.in b/dlls/d3dcompiler_43/tests/Makefile.in index 51b1f934836..f00d8560826 100644 --- a/dlls/d3dcompiler_43/tests/Makefile.in +++ b/dlls/d3dcompiler_43/tests/Makefile.in @@ -5,5 +5,5 @@ EXTRADEFS = -DD3D_COMPILER_VERSION=43 C_SRCS = \ asm.c \ blob.c \ - hlsl.c \ + hlsl_d3d9.c \ reflection.c diff --git a/dlls/d3dcompiler_43/tests/hlsl.c b/dlls/d3dcompiler_43/tests/hlsl.c deleted file mode 100644 index 868693838cc..00000000000 --- a/dlls/d3dcompiler_43/tests/hlsl.c +++ /dev/null @@ -1,701 +0,0 @@ -/* - * Copyright (C) 2010 Travis Athougies - * - * 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 - */ -#define COBJMACROS -#include "wine/test.h" -#include "d3dx9.h" -#include "d3dcompiler.h" - -#include <math.h> - -static pD3DCompile ppD3DCompile; - -static HRESULT (WINAPI *pD3DXGetShaderConstantTable)(const DWORD *byte_code, ID3DXConstantTable **constant_table); -static D3DMATRIX *(WINAPI *pD3DXMatrixOrthoLH)(D3DXMATRIX *pout, FLOAT w, FLOAT h, FLOAT zn, FLOAT zf); - -struct vertex -{ - float x, y, z; - float tx, ty; -}; - -/* Tells compute_shader_probe* which pixels should be what colors */ -struct hlsl_probe_info -{ - unsigned int x, y; - /* The expected values in this region */ - D3DXCOLOR c; - /* The max error for any value */ - float epsilon; - /* An error message to print if this test fails */ - const char *message; -}; - -static HWND create_window(void) -{ - WNDCLASSA wc = {0}; - wc.lpfnWndProc = DefWindowProcA; - wc.lpszClassName = "d3d9_test_wc"; - RegisterClassA(&wc); - - return CreateWindowA("d3d9_test_wc", "d3d9_test", 0, 0, 0, 0, 0, 0, 0, 0, 0); -} - -static IDirect3DDevice9 *init_d3d9(IDirect3DVertexDeclaration9 **vdeclaration, - IDirect3DVertexBuffer9 **quad_geometry, IDirect3DVertexShader9 **vshader_passthru) -{ - static const struct vertex quad_vertices[4] = - { - {-1.0f, -1.0f, 0.0f, 0.0f, 1.0f}, - {-1.0f, 1.0f, 0.0f, 0.0f, 0.0f}, - { 1.0f, -1.0f, 0.0f, 1.0f, 1.0f}, - { 1.0f, 1.0f, 0.0f, 1.0f, 0.0f} - }; - - static const D3DVERTEXELEMENT9 vdeclelements[] = - { - {0, 0, D3DDECLTYPE_FLOAT3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0}, - {0, 12, D3DDECLTYPE_FLOAT2, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_TEXCOORD, 0}, - D3DDECL_END() - }; - - static const char *vshader_passthru_hlsl = - "float4 vshader(float4 pos: POSITION, inout float2 texcoord: TEXCOORD0): POSITION\n" - "{\n" - " return pos;\n" - "}"; - - IDirect3D9 *d3d9_ptr; - IDirect3DDevice9 *device_ptr = NULL; - D3DPRESENT_PARAMETERS present_parameters; - - void *temp_geometry_vertices; - - ID3D10Blob *compiled = NULL; - ID3D10Blob *errors = NULL; - - HRESULT hr; - - d3d9_ptr = Direct3DCreate9(D3D_SDK_VERSION); - if (!d3d9_ptr) - { - skip("could not create D3D9\n"); - return NULL; - } - - hr = IDirect3D9_CheckDeviceFormat(d3d9_ptr, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, - 0, D3DRTYPE_SURFACE, D3DFMT_A32B32G32R32F); - if (FAILED(hr)) - { - skip("A32B32G32R32F format not available on this device\n"); - IDirect3D9_Release(d3d9_ptr); - return NULL; - } - - ZeroMemory(&present_parameters, sizeof(present_parameters)); - present_parameters.Windowed = TRUE; - present_parameters.hDeviceWindow = create_window(); - present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; - - hr = IDirect3D9_CreateDevice(d3d9_ptr, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, NULL, - D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, &device_ptr); - IDirect3D9_Release(d3d9_ptr); - if (FAILED(hr)) - { - skip("could not create Direct3D9 device\n"); - return NULL; - } - - /* Create the quad geometry */ - hr = IDirect3DDevice9_CreateVertexBuffer(device_ptr, 4 * sizeof(struct vertex), - D3DUSAGE_WRITEONLY, 0, D3DPOOL_DEFAULT, quad_geometry, NULL); - ok(SUCCEEDED(hr), - "Could not create vertex buffer, IDirect3DDevice9_CreateVertexBuffer returned: %08x\n", hr); - - hr = IDirect3DVertexBuffer9_Lock(*quad_geometry, 0, sizeof(quad_vertices), &temp_geometry_vertices, 0); - ok(SUCCEEDED(hr), "IDirect3DVertexBuffer9_Lock returned: %08x\n", hr); - memcpy(temp_geometry_vertices, quad_vertices, sizeof(quad_vertices)); - IDirect3DVertexBuffer9_Unlock(*quad_geometry); - - hr = IDirect3DDevice9_CreateVertexDeclaration(device_ptr, vdeclelements, vdeclaration); - ok(SUCCEEDED(hr), "Could not create vertex declaration: " - "IDirect3DDevice9_CreateVertexDeclaration returned: %08x\n", hr); - - hr = IDirect3DDevice9_SetVertexDeclaration(device_ptr, *vdeclaration); - ok(hr == D3D_OK, "IDirect3DDevice9_SetVertexDeclaration returned: %08x\n", hr); - - /* Create a simple vertex shader to just pass through the values */ - hr = ppD3DCompile(vshader_passthru_hlsl, strlen(vshader_passthru_hlsl), NULL, - NULL, NULL, "vshader", "vs_1_1", 0, 0, &compiled, &errors); - if (FAILED(hr)) - { - skip("not compiling vertex shader due to lacking wine HLSL support!\n"); - if (errors) - ID3D10Blob_Release(errors); - return NULL; - } - - hr = IDirect3DDevice9_CreateVertexShader(device_ptr, ID3D10Blob_GetBufferPointer(compiled), - vshader_passthru); - ok(SUCCEEDED(hr), "IDirect3DDevice9_CreateVertexShader returned: %08x\n", hr); - ID3D10Blob_Release(compiled); - - return device_ptr; -} - -/* Convenience functions */ -static void set_float4_d3d9(IDirect3DDevice9 *device, ID3DXConstantTable *constants, const char *name, - float x, float y, float z, float w) -{ - D3DXVECTOR4 vector; - vector.x = x; - vector.y = y; - vector.z = z; - vector.w = w; - ID3DXConstantTable_SetVector(constants, device, name, &vector); -} - -/* Compile our pixel shader and get back the compiled version and a constant table */ -static IDirect3DPixelShader9 *compile_pixel_shader9(IDirect3DDevice9 *device, const char *shader, - const char *profile, ID3DXConstantTable **constants) -{ - ID3D10Blob *compiled = NULL; - ID3D10Blob *errors = NULL; - IDirect3DPixelShader9 *pshader; - HRESULT hr; - - hr = ppD3DCompile(shader, strlen(shader), NULL, NULL, - NULL, "test", profile, /* test is the name of the entry point of our shader */ - 0, 0, &compiled, &errors); - ok(hr == D3D_OK, "Pixel shader %s compilation failed: %s\n", shader, - errors ? (char *)ID3D10Blob_GetBufferPointer(errors) : ""); - if (FAILED(hr)) return NULL; - - hr = pD3DXGetShaderConstantTable(ID3D10Blob_GetBufferPointer(compiled), constants); - ok(hr == D3D_OK, "Could not get constant table from compiled pixel shader\n"); - - hr = IDirect3DDevice9_CreatePixelShader(device, ID3D10Blob_GetBufferPointer(compiled), &pshader); - ok(SUCCEEDED(hr), "IDirect3DDevice9_CreatePixelShader returned: %08x\n", hr); - ID3D10Blob_Release(compiled); - return pshader; -} - -/* Draw a full screen quad */ -static void draw_quad_with_shader9(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 *quad_geometry) -{ - HRESULT hr; - D3DXMATRIX projection_matrix; - - pD3DXMatrixOrthoLH(&projection_matrix, 2.0f, 2.0f, 0.0f, 1.0f); - IDirect3DDevice9_SetTransform(device, D3DTS_PROJECTION, &projection_matrix); - - hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, D3DCOLOR_XRGB(0, 0, 0), 1.0f, 0); - ok(hr == D3D_OK, "IDirect3DDevice9_Clear returned: %08x\n", hr); - - hr = IDirect3DDevice9_BeginScene(device); - ok(hr == D3D_OK, "IDirect3DDevice9_BeginScene returned: %08x\n", hr); - - hr = IDirect3DDevice9_SetStreamSource(device, 0, quad_geometry, 0, sizeof(struct vertex)); - ok(hr == D3D_OK, "IDirect3DDevice9_SetStreamSource returned: %08x\n", hr); - hr = IDirect3DDevice9_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, 0, 2); - ok(hr == D3D_OK, "IDirect3DDevice9_DrawPrimitive returned: %08x\n", hr); - - hr = IDirect3DDevice9_EndScene(device); - ok(hr == D3D_OK, "IDirect3DDevice9_EndScene returned: %08x\n", hr); -} - -static void setup_device9(IDirect3DDevice9 *device, IDirect3DSurface9 **render_target, - IDirect3DSurface9 **readback, D3DFORMAT format, unsigned int width, unsigned int height, - IDirect3DVertexShader9 *vshader, IDirect3DPixelShader9 *pshader) -{ - HRESULT hr; - hr = IDirect3DDevice9_CreateRenderTarget(device, width, height, format, - D3DMULTISAMPLE_NONE, 0, FALSE, render_target, NULL); - ok(hr == D3D_OK, "IDirect3DDevice9_CreateRenderTarget returned: %08x\n", hr); - - /* The Direct3D 9 docs state that we cannot lock a render target surface, - instead we must copy the render target onto this surface to lock it */ - hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, width, height, format, - D3DPOOL_SYSTEMMEM, readback, NULL); - ok(hr == D3D_OK, "IDirect3DDevice9_CreateOffscreenPlainSurface returned: %08x\n", hr); - - hr = IDirect3DDevice9_SetRenderTarget(device, 0, *render_target); - ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderTarget returned: %08x\n", hr); - - hr = IDirect3DDevice9_SetVertexShader(device, vshader); - ok(hr == D3D_OK, "IDirect3DDevice9_SetVertexShader returned: %08x\n", hr); - hr = IDirect3DDevice9_SetPixelShader(device, pshader); - ok(hr == D3D_OK, "IDirect3DDevice9_SetPixelShader returned: %08x\n", hr); -} - -static BOOL colors_match(D3DXCOLOR a, D3DXCOLOR b, float epsilon) -{ - return (fabs(a.r - b.r) < epsilon && fabs(a.g - b.g) < epsilon && fabs(a.b - b.b) < epsilon && - fabs(a.a - b.a) < epsilon); -} - -/* Compute a shader on a width by height buffer and probes certain locations - to see if they are as expected. */ -static void compute_shader_probe9(IDirect3DDevice9 *device, IDirect3DVertexShader9 *vshader, - IDirect3DPixelShader9 *pshader, IDirect3DVertexBuffer9 *quad_geometry, - const struct hlsl_probe_info *probes, unsigned int count, - unsigned int width, unsigned int height, unsigned int line_number) -{ - IDirect3DSurface9 *render_target; - IDirect3DSurface9 *readback; - - HRESULT hr; - D3DLOCKED_RECT lr; - D3DXCOLOR *pbits_data; - unsigned int i; - - setup_device9(device, &render_target, &readback, D3DFMT_A32B32G32R32F, - width, height, vshader, pshader); - - /* Draw the quad with the shader and read back the data */ - draw_quad_with_shader9(device, quad_geometry); - IDirect3DDevice9_GetRenderTargetData(device, render_target, readback); - hr = IDirect3DSurface9_LockRect(readback, &lr, NULL, D3DLOCK_READONLY); - ok(hr == D3D_OK, "IDirect3DSurface9_LockRect returned: %08x\n", hr); - pbits_data = lr.pBits; - - /* Now go through the probes and check each one */ - for (i = 0; i < count; i++, probes++) { - int index = probes->x + (probes->y * lr.Pitch / sizeof(D3DXCOLOR)); - ok(colors_match(probes->c, pbits_data[index], probes->epsilon), - "Line %d: At (%d, %d): %s: Expected (%.04f,%.04f,%.04f, %.04f), got " - "(%.04f,%.04f,%.04f,%.04f)\n", line_number, probes->x, probes->y, probes->message, - probes->c.r, probes->c.g, probes->c.b, probes->c.a, pbits_data[index].r, - pbits_data[index].g, pbits_data[index].b, pbits_data[index].a); - } - - hr = IDirect3DSurface9_UnlockRect(readback); - ok(hr == D3D_OK, "IDirect3DSurface9_UnlockRect returned: %08x\n", hr); - - /* We now present the scene. This is mostly for debugging purposes, since GetRenderTargetData - also waits for drawing commands to complete. The reason this call is here and not in a - draw function is because the contents of the render target surface are invalidated after - this call. */ - hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); - ok(hr == D3D_OK, "IDirect3DDevice9_Present returned: %08x\n", hr); - - IDirect3DSurface9_Release(render_target); - IDirect3DSurface9_Release(readback); -} - -/* Now the actual test functions */ -static void test_swizzle(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 *quad_geometry, - IDirect3DVertexShader9 *vshader_passthru) -{ - static const struct hlsl_probe_info probes[] = - { - {0, 0, {0.0101f, 0.0303f, 0.0202f, 0.0404f}, 0.0001f, "swizzle_test"} - }; - - static const char *swizzle_test_shader = - "uniform float4 color;\n" - "float4 test(): COLOR\n" - "{\n" - " float4 ret = color;\n" - " ret.gb = ret.ra;\n" - " ret.ra = float2(0.0101, 0.0404);\n" - " return ret;\n" - "}"; - - ID3DXConstantTable *constants; - IDirect3DPixelShader9 *pshader; - - pshader = compile_pixel_shader9(device, swizzle_test_shader, "ps_2_0", &constants); - if (pshader != NULL) - { - set_float4_d3d9(device, constants, "color", 0.0303f, 0.0f, 0.0f, 0.0202f); - - compute_shader_probe9(device, vshader_passthru, pshader, quad_geometry, - probes, ARRAY_SIZE(probes), 1, 1, __LINE__); - - ID3DXConstantTable_Release(constants); - IDirect3DPixelShader9_Release(pshader); - } -} - -static void test_math(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 *quad_geometry, - IDirect3DVertexShader9 *vshader_passthru) -{ - /* Tests order of operations */ - static const float u = 2.5f, v = 0.3f, w = 0.2f, x = 0.7f, y = 0.1f, z = 1.5f; - - static const struct hlsl_probe_info probes[] = - { - {0, 0, {-12.4300f, 9.8333f, 1.6000f, 34.9999f}, 0.0001f, - "order of operations test"} - }; - - static const char *order_of_operations_shader = - "float4 test(uniform float u, uniform float v, uniform float w, uniform float x,\n" - " uniform float y, uniform float z): COLOR\n" - "{\n" - " return float4(x * y - z / w + --u / -v,\n" - " z * x / y + w / -v,\n" - " u + v - w,\n" - " x / y / w);\n" - "}"; - - ID3DXConstantTable *constants; - IDirect3DPixelShader9 *pshader; - - pshader = compile_pixel_shader9(device, order_of_operations_shader, "ps_2_0", &constants); - if (pshader != NULL) - { - ID3DXConstantTable_SetFloat(constants, device, "$u", u); - ID3DXConstantTable_SetFloat(constants, device, "$v", v); - ID3DXConstantTable_SetFloat(constants, device, "$w", w); - ID3DXConstantTable_SetFloat(constants, device, "$x", x); - ID3DXConstantTable_SetFloat(constants, device, "$y", y); - ID3DXConstantTable_SetFloat(constants, device, "$z", z); - - compute_shader_probe9(device, vshader_passthru, pshader, quad_geometry, - probes, ARRAY_SIZE(probes), 1, 1, __LINE__); - - ID3DXConstantTable_Release(constants); - IDirect3DPixelShader9_Release(pshader); - } -} - -static void test_conditionals(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 *quad_geometry, - IDirect3DVertexShader9 *vshader_passthru) -{ - static const struct hlsl_probe_info if_greater_probes[] = - { - { 0, 0, {0.9f, 0.8f, 0.7f, 0.6f}, 0.0001f, "if greater test"}, - { 5, 0, {0.9f, 0.8f, 0.7f, 0.6f}, 0.0001f, "if greater test"}, - {10, 0, {0.9f, 0.8f, 0.7f, 0.6f}, 0.0001f, "if greater test"}, - {15, 0, {0.9f, 0.8f, 0.7f, 0.6f}, 0.0001f, "if greater test"}, - {25, 0, {0.1f, 0.2f, 0.3f, 0.4f}, 0.0001f, "if greater test"}, - {30, 0, {0.1f, 0.2f, 0.3f, 0.4f}, 0.0001f, "if greater test"} - }; - - static const char *if_greater_shader = - "float4 test(float2 pos: TEXCOORD0): COLOR\n" - "{\n" - " if((pos.x * 32.0) > 20.0)\n" - " return float4(0.1, 0.2, 0.3, 0.4);\n" - " else\n" - " return float4(0.9, 0.8, 0.7, 0.6);\n" - "}"; - - static const struct hlsl_probe_info ternary_operator_probes[] = - { - {0, 0, {0.50f, 0.25f, 0.50f, 0.75f}, 0.00001f, "ternary operator test"}, - {1, 0, {0.50f, 0.25f, 0.50f, 0.75f}, 0.00001f, "ternary operator test"}, - {2, 0, {0.50f, 0.25f, 0.50f, 0.75f}, 0.00001f, "ternary operator test"}, - {3, 0, {0.50f, 0.25f, 0.50f, 0.75f}, 0.00001f, "ternary operator test"}, - {4, 0, {0.60f, 0.80f, 0.10f, 0.20f}, 0.00001f, "ternary operator test"}, - {5, 0, {0.60f, 0.80f, 0.10f, 0.20f}, 0.00001f, "ternary operator test"}, - {6, 0, {0.60f, 0.80f, 0.10f, 0.20f}, 0.00001f, "ternary operator test"}, - {7, 0, {0.60f, 0.80f, 0.10f, 0.20f}, 0.00001f, "ternary operator test"} - }; - - static const char *ternary_operator_shader = - "float4 test(float2 pos: TEXCOORD0): COLOR\n" - "{\n" - " return (pos.x < 0.5?float4(0.5, 0.25, 0.5, 0.75):float4(0.6, 0.8, 0.1, 0.2));\n" - "}"; - - ID3DXConstantTable *constants; - IDirect3DPixelShader9 *pshader; - - pshader = compile_pixel_shader9(device, if_greater_shader, "ps_2_0", &constants); - if (pshader != NULL) - { - compute_shader_probe9(device, vshader_passthru, pshader, quad_geometry, if_greater_probes, - ARRAY_SIZE(if_greater_probes), 32, 1, __LINE__); - - ID3DXConstantTable_Release(constants); - IDirect3DPixelShader9_Release(pshader); - } - - pshader = compile_pixel_shader9(device, ternary_operator_shader, "ps_2_0", &constants); - if (pshader != NULL) - { - compute_shader_probe9(device, vshader_passthru, pshader, quad_geometry, ternary_operator_probes, - ARRAY_SIZE(ternary_operator_probes), 8, 1, __LINE__); - - ID3DXConstantTable_Release(constants); - IDirect3DPixelShader9_Release(pshader); - } -} - -static void test_float_vectors(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 *quad_geometry, - IDirect3DVertexShader9 *vshader_passthru) -{ - static const struct hlsl_probe_info vec4_indexing_test1_probes[] = - { - {0, 0, {0.020f, 0.245f, 0.351f, 1.000f}, 0.0001f, "vec4 indexing test 1"} - }; - - static const char *vec4_indexing_test1_shader = - "float4 test(): COLOR\n" - "{\n" - " float4 color;\n" - " color[0] = 0.020;\n" - " color[1] = 0.245;\n" - " color[2] = 0.351;\n" - " color[3] = 1.0;\n" - " return color;\n" - "}"; - - static const struct hlsl_probe_info vec4_indexing_test2_probes[] = - { - {0, 0, {0.5f, 0.3f, 0.8f, 0.2f}, 0.0001f, "vec4 indexing test 2"} - }; - - /* We have this uniform i here so the compiler can't optimize */ - static const char *vec4_indexing_test2_shader = - "uniform int i;\n" - "float4 test(): COLOR\n" - "{\n" - " float4 color = float4(0.5, 0.4, 0.3, 0.2);\n" - " color.g = color[i];\n" - " color.b = 0.8;\n" - " return color;\n" - "}"; - - ID3DXConstantTable *constants; - IDirect3DPixelShader9 *pshader; - - pshader = compile_pixel_shader9(device, vec4_indexing_test1_shader, "ps_2_0", &constants); - if (pshader != NULL) - { - compute_shader_probe9(device, vshader_passthru, pshader, quad_geometry, vec4_indexing_test1_probes, - ARRAY_SIZE(vec4_indexing_test1_probes), 1, 1, __LINE__); - - ID3DXConstantTable_Release(constants); - IDirect3DPixelShader9_Release(pshader); - } - - pshader = compile_pixel_shader9(device, vec4_indexing_test2_shader, "ps_2_0", &constants); - if (pshader != NULL) - { - ID3DXConstantTable_SetInt(constants, device, "i", 2); - - compute_shader_probe9(device, vshader_passthru, pshader, quad_geometry, vec4_indexing_test2_probes, - ARRAY_SIZE(vec4_indexing_test2_probes), 32, 1, __LINE__); - - ID3DXConstantTable_Release(constants); - IDirect3DPixelShader9_Release(pshader); - } -} - -static void test_trig(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 *quad_geometry, - IDirect3DVertexShader9 *vshader_passthru) -{ - static const struct hlsl_probe_info sincos_probes[] = - { - {0, 0, {0.5000f, 1.0000f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {1, 0, {0.5975f, 0.9904f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {2, 0, {0.6913f, 0.9620f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {3, 0, {0.7778f, 0.9160f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {4, 0, {0.8536f, 0.8536f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {5, 0, {0.9157f, 0.7778f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {6, 0, {0.9620f, 0.6913f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {7, 0, {0.9904f, 0.5975f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {8, 0, {1.0000f, 0.5000f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {9, 0, {0.9904f, 0.4025f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {10, 0, {0.9619f, 0.3087f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {11, 0, {0.9157f, 0.2222f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {12, 0, {0.8536f, 0.1464f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {13, 0, {0.7778f, 0.0843f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {14, 0, {0.6913f, 0.0381f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {15, 0, {0.5975f, 0.0096f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {16, 0, {0.5000f, 0.0000f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {17, 0, {0.4025f, 0.0096f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {18, 0, {0.3087f, 0.0381f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {19, 0, {0.2222f, 0.0843f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {20, 0, {0.1464f, 0.1464f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {21, 0, {0.0843f, 0.2222f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {22, 0, {0.0381f, 0.3087f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {23, 0, {0.0096f, 0.4025f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {24, 0, {0.0000f, 0.5000f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {25, 0, {0.0096f, 0.5975f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {26, 0, {0.0381f, 0.6913f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {27, 0, {0.0843f, 0.7778f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {28, 0, {0.1464f, 0.8536f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {29, 0, {0.2222f, 0.9157f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {30, 0, {0.3087f, 0.9619f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {31, 0, {0.4025f, 0.9904f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - }; - - static const char *sincos_shader = - "float4 test(float x: TEXCOORD0): COLOR\n" - "{\n" - " const float pi2 = 6.2831853;\n" - " float calcd_sin = (sin(x * pi2) + 1)/2;\n" - " float calcd_cos = (cos(x * pi2) + 1)/2;\n" - " return float4(calcd_sin, calcd_cos, 0, 0);\n" - "}"; - - ID3DXConstantTable *constants; - IDirect3DPixelShader9 *pshader; - - pshader = compile_pixel_shader9(device, sincos_shader, "ps_2_0", &constants); - if (pshader != NULL) - { - compute_shader_probe9(device, vshader_passthru, pshader, quad_geometry, sincos_probes, - ARRAY_SIZE(sincos_probes), 32, 1, __LINE__); - - ID3DXConstantTable_Release(constants); - IDirect3DPixelShader9_Release(pshader); - } -} - -static void test_fail(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 *qquad_geometry, - IDirect3DVertexShader9 *vshader_passthru) -{ - static const char *tests[] = - { - "float4 test(float2 pos: TEXCOORD0) : COLOR\n" - "{\n" - " return y;\n" - "}", - - "float4 test(float2 pos: TEXCOORD0) : COLOR\n" - "{\n" - " float4 x = float4(0, 0, 0, 0);\n" - " x.xzzx = float4(1, 2, 3, 4);\n" - " return x;\n" - "}", - - "float4 test(float2 pos: TEXCOORD0) : COLOR\n" - "{\n" - " float4 x = pos;\n" - " return x;\n" - "}", - - "float4 test(float2 pos, TEXCOORD0) ; COLOR\n" - "{\n" - " pos = float4 x;\n" - " mul(float4(5, 4, 3, 2), mvp) = x;\n" - " return float4;\n" - "}", - - "float4 563r(float2 45s: TEXCOORD0) : COLOR\n" - "{\n" - " float2 x = 45s;\n" - " return float4(x.x, x.y, 0, 0);\n" - "}", - - "float4 test(float2 pos: TEXCOORD0) : COLOR\n" - "{\n" - " struct { int b,c; } x = {0};\n" - " return y;\n" - "}", - - "float4 test(float2 pos: TEXCOORD0) : COLOR\n" - "{\n" - " struct {} x = {};\n" - " return y;\n" - "}", - }; - - ID3D10Blob *compiled, *errors; - unsigned int i; - HRESULT hr; - - for (i = 0; i < ARRAY_SIZE(tests); ++i) - { - compiled = errors = NULL; - hr = ppD3DCompile(tests[i], strlen(tests[i]), NULL, NULL, NULL, "test", "ps_2_0", 0, 0, &compiled, &errors); - ok(hr == E_FAIL, "Test %u, got unexpected hr %#x.\n", i, hr); - ok(!!errors, "Test %u, expected non-NULL error blob.\n", i); - ok(!compiled, "Test %u, expected no compiled shader blob.\n", i); - ID3D10Blob_Release(errors); - } -} - -static BOOL load_d3dcompiler(void) -{ - HMODULE module; - -#if D3D_COMPILER_VERSION == 47 - if (!(module = LoadLibraryA("d3dcompiler_47.dll"))) return FALSE; -#else - if (!(module = LoadLibraryA("d3dcompiler_43.dll"))) return FALSE; -#endif - - ppD3DCompile = (void*)GetProcAddress(module, "D3DCompile"); - return TRUE; -} - -START_TEST(hlsl) -{ - D3DCAPS9 caps; - ULONG refcount; - IDirect3DDevice9 *device; - IDirect3DVertexDeclaration9 *vdeclaration; - IDirect3DVertexBuffer9 *quad_geometry; - IDirect3DVertexShader9 *vshader_passthru; - HMODULE mod; - - if (!load_d3dcompiler()) - { - win_skip("Could not load DLL.\n"); - return; - } - - if (!(mod = LoadLibraryA("d3dx9_36.dll"))) - { - win_skip("Failed to load d3dx9_36.dll.\n"); - return; - } - pD3DXGetShaderConstantTable = (void *)GetProcAddress(mod, "D3DXGetShaderConstantTable"); - pD3DXMatrixOrthoLH = (void *)GetProcAddress(mod, "D3DXMatrixOrthoLH"); - - device = init_d3d9(&vdeclaration, &quad_geometry, &vshader_passthru); - if (!device) return; - - /* Make sure we support pixel shaders, before trying to compile them! */ - /* Direct3D 9 (Shader model 1-3 tests) */ - IDirect3DDevice9_GetDeviceCaps(device, &caps); - if (caps.PixelShaderVersion >= D3DPS_VERSION(2, 0)) - { - todo_wine - { - test_swizzle(device, quad_geometry, vshader_passthru); - test_math(device, quad_geometry, vshader_passthru); - test_conditionals(device, quad_geometry, vshader_passthru); - test_float_vectors(device, quad_geometry, vshader_passthru); - test_trig(device, quad_geometry, vshader_passthru); - test_fail(device, quad_geometry, vshader_passthru); - } - } else skip("no pixel shader support\n"); - - /* Reference counting sanity checks */ - if (vshader_passthru) - { - refcount = IDirect3DVertexShader9_Release(vshader_passthru); - ok(!refcount, "Pass-through vertex shader has %u references left\n", refcount); - } - - refcount = IDirect3DVertexBuffer9_Release(quad_geometry); - ok(!refcount, "Vertex buffer has %u references left\n", refcount); - - refcount = IDirect3DVertexDeclaration9_Release(vdeclaration); - ok(!refcount, "Vertex declaration has %u references left\n", refcount); - - refcount = IDirect3DDevice9_Release(device); - ok(!refcount, "Device has %u references left\n", refcount); -} diff --git a/dlls/d3dcompiler_43/tests/hlsl_d3d9.c b/dlls/d3dcompiler_43/tests/hlsl_d3d9.c new file mode 100644 index 00000000000..79f54d200e2 --- /dev/null +++ b/dlls/d3dcompiler_43/tests/hlsl_d3d9.c @@ -0,0 +1,678 @@ +/* + * Copyright (C) 2010 Travis Athougies + * Copyright (C) 2020 Zebediah Figura for CodeWeavers + * + * 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 + */ +#define COBJMACROS +#include "wine/test.h" +#include "d3dx9.h" +#include "d3dcompiler.h" + +#include <math.h> + +static pD3DCompile ppD3DCompile; + +static HRESULT (WINAPI *pD3DXGetShaderConstantTable)(const DWORD *byte_code, ID3DXConstantTable **constant_table); + +struct vec2 +{ + float x, y; +}; + +struct vec4 +{ + float x, y, z, w; +}; + +#define compile_shader(a, b) compile_shader_(__LINE__, a, b) +static ID3D10Blob *compile_shader_(unsigned int line, const char *source, const char *target) +{ + ID3D10Blob *blob = NULL, *errors = NULL; + HRESULT hr; + + hr = ppD3DCompile(source, strlen(source), NULL, NULL, NULL, "main", target, 0, 0, &blob, &errors); + ok_(__FILE__, line)(hr == D3D_OK, "Failed to compile shader, hr %#x.\n", hr); + if (errors) + { + if (winetest_debug > 1) + trace_(__FILE__, line)("%s\n", (char *)ID3D10Blob_GetBufferPointer(errors)); + ID3D10Blob_Release(errors); + } + return blob; +} + +static IDirect3DDevice9 *create_device(HWND window) +{ + D3DPRESENT_PARAMETERS present_parameters = + { + .Windowed = TRUE, + .hDeviceWindow = window, + .SwapEffect = D3DSWAPEFFECT_DISCARD, + .BackBufferWidth = 640, + .BackBufferHeight = 480, + .BackBufferFormat = D3DFMT_A8R8G8B8, + }; + IDirect3DDevice9 *device; + IDirect3DSurface9 *rt; + IDirect3D9 *d3d; + D3DCAPS9 caps; + HRESULT hr; + + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, window, + D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, &device); + IDirect3D9_Release(d3d); + if (FAILED(hr)) + { + skip("Failed to create a 3D device, hr %#x.\n", hr); + return NULL; + } + + hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); + ok(hr == D3D_OK, "Failed to get device caps, hr %#x.\n", hr); + if (caps.PixelShaderVersion < D3DPS_VERSION(2, 0) || caps.VertexShaderVersion < D3DVS_VERSION(2, 0)) + { + skip("No shader model 2 support.\n"); + IDirect3DDevice9_Release(device); + return NULL; + } + + if (FAILED(hr = IDirect3DDevice9_CreateRenderTarget(device, 640, 480, D3DFMT_A32B32G32R32F, + D3DMULTISAMPLE_NONE, 0, FALSE, &rt, NULL))) + { + skip("Failed to create an A32B32G32R32F surface, hr %#x.\n", hr); + IDirect3DDevice9_Release(device); + return NULL; + } + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderTarget(device, 0, rt); + ok(hr == D3D_OK, "Failed to set render target, hr %#x.\n", hr); + IDirect3DSurface9_Release(rt); + + return device; +} + +struct test_context +{ + IDirect3DDevice9 *device; + HWND window; +}; + +#define init_test_context(a) init_test_context_(__LINE__, a) +static BOOL init_test_context_(unsigned int line, struct test_context *context) +{ + RECT rect = {0, 0, 640, 480}; + + AdjustWindowRect(&rect, WS_OVERLAPPEDWINDOW, FALSE); + context->window = CreateWindowA("static", "d3dcompiler_test", WS_OVERLAPPEDWINDOW, + 0, 0, rect.right - rect.left, rect.bottom - rect.top, NULL, NULL, NULL, NULL); + ok(!!context->window, "Failed to create a window.\n"); + + if (!(context->device = create_device(context->window))) + { + DestroyWindow(context->window); + return FALSE; + } + + return TRUE; +} + +#define release_test_context(context) release_test_context_(__LINE__, context) +static void release_test_context_(unsigned int line, struct test_context *context) +{ + ULONG ref = IDirect3DDevice9_Release(context->device); + ok_(__FILE__, line)(!ref, "Device has %u references left.\n", ref); + DestroyWindow(context->window); +} + +#define draw_quad(device, ps_code) draw_quad_(__LINE__, device, ps_code) +static void draw_quad_(unsigned int line, IDirect3DDevice9 *device, ID3D10Blob *ps_code) +{ + IDirect3DVertexDeclaration9 *vertex_declaration; + IDirect3DVertexShader9 *vs; + IDirect3DPixelShader9 *ps; + ID3D10Blob *vs_code; + HRESULT hr; + + static const D3DVERTEXELEMENT9 decl_elements[] = + { + {0, 0, D3DDECLTYPE_FLOAT2, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0}, + {0, 8, D3DDECLTYPE_FLOAT2, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_TEXCOORD, 0}, + D3DDECL_END() + }; + + static const struct + { + struct vec2 position; + struct vec2 t0; + } + quad[] = + { + {{-1.0f, -1.0f}, {0.0f, 1.0f}}, + {{-1.0f, 1.0f}, {0.0f, 0.0f}}, + {{ 1.0f, -1.0f}, {1.0f, 1.0f}}, + {{ 1.0f, 1.0f}, {1.0f, 0.0f}}, + }; + + static const char vs_source[] = + "float4 main(float4 pos : POSITION, inout float2 texcoord : TEXCOORD0) : POSITION\n" + "{\n" + " return pos;\n" + "}"; + + hr = IDirect3DDevice9_CreateVertexDeclaration(device, decl_elements, &vertex_declaration); + ok_(__FILE__, line)(hr == D3D_OK, "Failed to create vertex declaration, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetVertexDeclaration(device, vertex_declaration); + ok_(__FILE__, line)(hr == D3D_OK, "Failed to set vertex declaration, hr %#x.\n", hr); + + vs_code = compile_shader(vs_source, "vs_2_0"); + + hr = IDirect3DDevice9_CreateVertexShader(device, ID3D10Blob_GetBufferPointer(vs_code), &vs); + ok_(__FILE__, line)(hr == D3D_OK, "Failed to create vertex shader, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetVertexShader(device, vs); + ok_(__FILE__, line)(hr == D3D_OK, "Failed to set vertex shader, hr %#x.\n", hr); + + hr = IDirect3DDevice9_CreatePixelShader(device, ID3D10Blob_GetBufferPointer(ps_code), &ps); + ok_(__FILE__, line)(hr == D3D_OK, "Failed to create pixel shader, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetPixelShader(device, ps); + ok_(__FILE__, line)(hr == D3D_OK, "Failed to set pixel shader, hr %#x.\n", hr); + + hr = IDirect3DDevice9_BeginScene(device); + ok_(__FILE__, line)(hr == D3D_OK, "Failed to draw, hr %#x.\n", hr); + + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(*quad)); + ok_(__FILE__, line)(hr == D3D_OK, "Failed to draw, hr %#x.\n", hr); + + hr = IDirect3DDevice9_EndScene(device); + ok_(__FILE__, line)(hr == D3D_OK, "Failed to draw, hr %#x.\n", hr); + + IDirect3DVertexDeclaration9_Release(vertex_declaration); + IDirect3DVertexShader9_Release(vs); + IDirect3DPixelShader9_Release(ps); + ID3D10Blob_Release(vs_code); +} + +struct readback +{ + IDirect3DSurface9 *surface; + D3DLOCKED_RECT rect; +}; + +static void init_readback(IDirect3DDevice9 *device, struct readback *rb) +{ + IDirect3DSurface9 *rt; + D3DSURFACE_DESC desc; + HRESULT hr; + + hr = IDirect3DDevice9Ex_GetRenderTarget(device, 0, &rt); + ok(hr == D3D_OK, "Failed to get render target, hr %#x.\n", hr); + + hr = IDirect3DSurface9_GetDesc(rt, &desc); + ok(hr == D3D_OK, "Failed to get surface desc, hr %#x.\n", hr); + hr = IDirect3DDevice9Ex_CreateOffscreenPlainSurface(device, desc.Width, desc.Height, + desc.Format, D3DPOOL_SYSTEMMEM, &rb->surface, NULL); + ok(hr == D3D_OK, "Failed to create surface, hr %#x.\n", hr); + + hr = IDirect3DDevice9Ex_GetRenderTargetData(device, rt, rb->surface); + ok(hr == D3D_OK, "Failed to get render target data, hr %#x.\n", hr); + + hr = IDirect3DSurface9_LockRect(rb->surface, &rb->rect, NULL, D3DLOCK_READONLY); + ok(hr == D3D_OK, "Failed to lock surface, hr %#x.\n", hr); + + IDirect3DSurface9_Release(rt); +} + +static const struct vec4 *get_readback_vec4(const struct readback *rb, unsigned int x, unsigned int y) +{ + return (struct vec4 *)((BYTE *)rb->rect.pBits + y * rb->rect.Pitch + x * sizeof(struct vec4)); +} + +static void release_readback(struct readback *rb) +{ + IDirect3DSurface9_UnlockRect(rb->surface); + IDirect3DSurface9_Release(rb->surface); +} + +static struct vec4 get_color_vec4(IDirect3DDevice9 *device, unsigned int x, unsigned int y) +{ + struct readback rb; + struct vec4 ret; + + init_readback(device, &rb); + ret = *get_readback_vec4(&rb, x, y); + release_readback(&rb); + + return ret; +} + +static BOOL compare_float(float f, float g, unsigned int ulps) +{ + int x = *(int *)&f; + int y = *(int *)&g; + + if (x < 0) + x = INT_MIN - x; + if (y < 0) + y = INT_MIN - y; + + if (abs(x - y) > ulps) + return FALSE; + + return TRUE; +} + +static BOOL compare_vec4(const struct vec4 *vec, float x, float y, float z, float w, unsigned int ulps) +{ + return compare_float(vec->x, x, ulps) + && compare_float(vec->y, y, ulps) + && compare_float(vec->z, z, ulps) + && compare_float(vec->w, w, ulps); +} + +static void test_swizzle(void) +{ + static const D3DXVECTOR4 color = {0.0303f, 0.0f, 0.0f, 0.0202f}; + struct test_context test_context; + ID3DXConstantTable *constants; + ID3D10Blob *ps_code = NULL; + IDirect3DDevice9 *device; + struct vec4 v; + HRESULT hr; + + static const char ps_source[] = + "uniform float4 color;\n" + "float4 main() : COLOR\n" + "{\n" + " float4 ret = color;\n" + " ret.gb = ret.ra;\n" + " ret.ra = float2(0.0101, 0.0404);\n" + " return ret;\n" + "}"; + + if (!init_test_context(&test_context)) + return; + device = test_context.device; + + todo_wine ps_code = compile_shader(ps_source, "ps_2_0"); + if (ps_code) + { + hr = pD3DXGetShaderConstantTable(ID3D10Blob_GetBufferPointer(ps_code), &constants); + ok(hr == D3D_OK, "Failed to get constant table, hr %#x.\n", hr); + hr = ID3DXConstantTable_SetVector(constants, device, "color", &color); + ok(hr == D3D_OK, "Failed to set constant, hr %#x.\n", hr); + ID3DXConstantTable_Release(constants); + + draw_quad(device, ps_code); + + v = get_color_vec4(device, 0, 0); + ok(compare_vec4(&v, 0.0101f, 0.0303f, 0.0202f, 0.0404f, 0), + "Got unexpected value {%.8e, %.8e, %.8e, %.8e}.\n", v.x, v.y, v.z, v.w); + + ID3D10Blob_Release(ps_code); + } + release_test_context(&test_context); +} + +static void test_math(void) +{ + struct test_context test_context; + ID3DXConstantTable *constants; + ID3D10Blob *ps_code = NULL; + IDirect3DDevice9 *device; + struct vec4 v; + HRESULT hr; + + static const char ps_source[] = + "float4 main(uniform float u, uniform float v, uniform float w, uniform float x,\n" + " uniform float y, uniform float z): COLOR\n" + "{\n" + " return float4(x * y - z / w + --u / -v,\n" + " z * x / y + w / -v,\n" + " u + v - w,\n" + " x / y / w);\n" + "}"; + + if (!init_test_context(&test_context)) + return; + device = test_context.device; + + todo_wine ps_code = compile_shader(ps_source, "ps_2_0"); + if (ps_code) + { + hr = pD3DXGetShaderConstantTable(ID3D10Blob_GetBufferPointer(ps_code), &constants); + ok(hr == D3D_OK, "Failed to get constant table, hr %#x.\n", hr); + hr = ID3DXConstantTable_SetFloat(constants, device, "$u", 2.5f); + ok(hr == D3D_OK, "Failed to set constant, hr %#x.\n", hr); + hr = ID3DXConstantTable_SetFloat(constants, device, "$v", 0.3f); + ok(hr == D3D_OK, "Failed to set constant, hr %#x.\n", hr); + hr = ID3DXConstantTable_SetFloat(constants, device, "$w", 0.2f); + ok(hr == D3D_OK, "Failed to set constant, hr %#x.\n", hr); + hr = ID3DXConstantTable_SetFloat(constants, device, "$x", 0.7f); + ok(hr == D3D_OK, "Failed to set constant, hr %#x.\n", hr); + hr = ID3DXConstantTable_SetFloat(constants, device, "$y", 0.1f); + ok(hr == D3D_OK, "Failed to set constant, hr %#x.\n", hr); + hr = ID3DXConstantTable_SetFloat(constants, device, "$z", 1.5f); + ok(hr == D3D_OK, "Failed to set constant, hr %#x.\n", hr); + ID3DXConstantTable_Release(constants); + + draw_quad(device, ps_code); + + v = get_color_vec4(device, 0, 0); + ok(compare_vec4(&v, -12.43f, 9.833333f, 1.6f, 35.0f, 1), + "Got unexpected value {%.8e, %.8e, %.8e, %.8e}.\n", v.x, v.y, v.z, v.w); + + ID3D10Blob_Release(ps_code); + } + release_test_context(&test_context); +} + +static void test_conditionals(void) +{ + struct test_context test_context; + ID3D10Blob *ps_code = NULL; + IDirect3DDevice9 *device; + const struct vec4 *v; + struct readback rb; + unsigned int i; + + static const char ps_if_source[] = + "float4 main(float2 pos : TEXCOORD0) : COLOR\n" + "{\n" + " if((pos.x * 640.0) > 200.0)\n" + " return float4(0.1, 0.2, 0.3, 0.4);\n" + " else\n" + " return float4(0.9, 0.8, 0.7, 0.6);\n" + "}"; + + static const char ps_ternary_source[] = + "float4 main(float2 pos : TEXCOORD0) : COLOR\n" + "{\n" + " return (pos.x < 0.5 ? float4(0.5, 0.25, 0.5, 0.75) : float4(0.6, 0.8, 0.1, 0.2));\n" + "}"; + + if (!init_test_context(&test_context)) + return; + device = test_context.device; + + todo_wine ps_code = compile_shader(ps_if_source, "ps_2_0"); + if (ps_code) + { + draw_quad(device, ps_code); + init_readback(device, &rb); + + for (i = 0; i < 200; i += 40) + { + v = get_readback_vec4(&rb, i, 0); + ok(compare_vec4(v, 0.9f, 0.8f, 0.7f, 0.6f, 0), + "Got unexpected value {%.8e, %.8e, %.8e, %.8e}.\n", v->x, v->y, v->z, v->w); + } + + for (i = 240; i < 640; i += 40) + { + v = get_readback_vec4(&rb, i, 0); + ok(compare_vec4(v, 0.1f, 0.2f, 0.3f, 0.4f, 0), + "Got unexpected value {%.8e, %.8e, %.8e, %.8e}.\n", v->x, v->y, v->z, v->w); + } + + release_readback(&rb); + ID3D10Blob_Release(ps_code); + } + + todo_wine ps_code = compile_shader(ps_ternary_source, "ps_2_0"); + if (ps_code) + { + draw_quad(device, ps_code); + init_readback(device, &rb); + + for (i = 0; i < 320; i += 40) + { + v = get_readback_vec4(&rb, i, 0); + ok(compare_vec4(v, 0.5f, 0.25f, 0.5f, 0.75f, 0), + "Got unexpected value {%.8e, %.8e, %.8e, %.8e}.\n", v->x, v->y, v->z, v->w); + } + + for (i = 360; i < 640; i += 40) + { + v = get_readback_vec4(&rb, i, 0); + ok(compare_vec4(v, 0.6f, 0.8f, 0.1f, 0.2f, 0), + "Got unexpected value {%.8e, %.8e, %.8e, %.8e}.\n", v->x, v->y, v->z, v->w); + } + + release_readback(&rb); + ID3D10Blob_Release(ps_code); + } + + release_test_context(&test_context); +} + +static void test_float_vectors(void) +{ + struct test_context test_context; + ID3DXConstantTable *constants; + ID3D10Blob *ps_code = NULL; + IDirect3DDevice9 *device; + struct vec4 v; + HRESULT hr; + + static const char ps_indexing_source[] = + "float4 main() : COLOR\n" + "{\n" + " float4 color;\n" + " color[0] = 0.020;\n" + " color[1] = 0.245;\n" + " color[2] = 0.351;\n" + " color[3] = 1.0;\n" + " return color;\n" + "}"; + + /* A uniform index is used so that the compiler can't optimize. */ + static const char ps_uniform_indexing_source[] = + "uniform int i;\n" + "float4 main() : COLOR\n" + "{\n" + " float4 color = float4(0.5, 0.4, 0.3, 0.2);\n" + " color.g = color[i];\n" + " color.b = 0.8;\n" + " return color;\n" + "}"; + + if (!init_test_context(&test_context)) + return; + device = test_context.device; + + todo_wine ps_code = compile_shader(ps_indexing_source, "ps_2_0"); + if (ps_code) + { + draw_quad(device, ps_code); + + v = get_color_vec4(device, 0, 0); + ok(compare_vec4(&v, 0.02f, 0.245f, 0.351f, 1.0f, 0), + "Got unexpected value {%.8e, %.8e, %.8e, %.8e}.\n", v.x, v.y, v.z, v.w); + + ID3D10Blob_Release(ps_code); + } + + todo_wine ps_code = compile_shader(ps_uniform_indexing_source, "ps_2_0"); + if (ps_code) + { + hr = pD3DXGetShaderConstantTable(ID3D10Blob_GetBufferPointer(ps_code), &constants); + ok(hr == D3D_OK, "Failed to get constants, hr %#x.\n", hr); + hr = ID3DXConstantTable_SetInt(constants, device, "i", 2); + ok(hr == D3D_OK, "Failed to set constant, hr %#x.\n", hr); + ID3DXConstantTable_Release(constants); + draw_quad(device, ps_code); + + v = get_color_vec4(device, 0, 0); + ok(compare_vec4(&v, 0.5f, 0.3f, 0.8f, 0.2f, 0), + "Got unexpected value {%.8e, %.8e, %.8e, %.8e}.\n", v.x, v.y, v.z, v.w); + + ID3D10Blob_Release(ps_code); + } + + release_test_context(&test_context); +} + +static void test_trig(void) +{ + struct test_context test_context; + ID3D10Blob *ps_code = NULL; + IDirect3DDevice9 *device; + const struct vec4 *v; + struct readback rb; + unsigned int i; + + static const char ps_source[] = + "float4 main(float x : TEXCOORD0) : COLOR\n" + "{\n" + " const float pi2 = 6.2831853;\n" + " float calcd_sin = (sin(x * pi2) + 1)/2;\n" + " float calcd_cos = (cos(x * pi2) + 1)/2;\n" + " return float4(calcd_sin, calcd_cos, 0, 0);\n" + "}"; + + if (!init_test_context(&test_context)) + return; + device = test_context.device; + + todo_wine ps_code = compile_shader(ps_source, "ps_2_0"); + if (ps_code) + { + draw_quad(device, ps_code); + init_readback(device, &rb); + + for (i = 0; i < 32; ++i) + { + float expect_x = (sinf(i * 2 * M_PI / 32) + 1.0f) / 2.0f; + float expect_y = (cosf(i * 2 * M_PI / 32) + 1.0f) / 2.0f; + v = get_readback_vec4(&rb, i * 640 / 32, 0); + ok(compare_vec4(v, expect_x, expect_y, 0.0f, 0.0f, 4096), + "Test %u: Got {%.8e, %.8e, %.8e, %.8e}, expected {%.8e, %.8e, %.8e, %.8e}.\n", + i, v->x, v->y, v->z, v->w, expect_x, expect_y, 0.0f, 0.0f); + } + + release_readback(&rb); + ID3D10Blob_Release(ps_code); + } + release_test_context(&test_context); +} + +static void test_fail(void) +{ + static const char *tests[] = + { + "float4 test(float2 pos: TEXCOORD0) : COLOR\n" + "{\n" + " return y;\n" + "}", + + "float4 test(float2 pos: TEXCOORD0) : COLOR\n" + "{\n" + " float4 x = float4(0, 0, 0, 0);\n" + " x.xzzx = float4(1, 2, 3, 4);\n" + " return x;\n" + "}", + + "float4 test(float2 pos: TEXCOORD0) : COLOR\n" + "{\n" + " float4 x = pos;\n" + " return x;\n" + "}", + + "float4 test(float2 pos, TEXCOORD0) ; COLOR\n" + "{\n" + " pos = float4 x;\n" + " mul(float4(5, 4, 3, 2), mvp) = x;\n" + " return float4;\n" + "}", + + "float4 563r(float2 45s: TEXCOORD0) : COLOR\n" + "{\n" + " float2 x = 45s;\n" + " return float4(x.x, x.y, 0, 0);\n" + "}", + + "float4 test(float2 pos: TEXCOORD0) : COLOR\n" + "{\n" + " struct { int b,c; } x = {0};\n" + " return y;\n" + "}", + + "float4 test(float2 pos: TEXCOORD0) : COLOR\n" + "{\n" + " struct {} x = {};\n" + " return y;\n" + "}", + }; + + ID3D10Blob *compiled, *errors; + unsigned int i; + HRESULT hr; + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + compiled = errors = NULL; + hr = ppD3DCompile(tests[i], strlen(tests[i]), NULL, NULL, NULL, "test", "ps_2_0", 0, 0, &compiled, &errors); + todo_wine ok(hr == E_FAIL, "Test %u, got unexpected hr %#x.\n", i, hr); + todo_wine_if (i == 1) ok(!!errors, "Test %u, expected non-NULL error blob.\n", i); + ok(!compiled, "Test %u, expected no compiled shader blob.\n", i); + if (errors) + ID3D10Blob_Release(errors); + } +} + +static BOOL load_d3dcompiler(void) +{ + HMODULE module; + +#if D3D_COMPILER_VERSION == 47 + if (!(module = LoadLibraryA("d3dcompiler_47.dll"))) return FALSE; +#else + if (!(module = LoadLibraryA("d3dcompiler_43.dll"))) return FALSE; +#endif + + ppD3DCompile = (void*)GetProcAddress(module, "D3DCompile"); + return TRUE; +} + +START_TEST(hlsl_d3d9) +{ + HMODULE mod; + + if (!load_d3dcompiler()) + { + win_skip("Could not load DLL.\n"); + return; + } + + if (!(mod = LoadLibraryA("d3dx9_36.dll"))) + { + win_skip("Failed to load d3dx9_36.dll.\n"); + return; + } + pD3DXGetShaderConstantTable = (void *)GetProcAddress(mod, "D3DXGetShaderConstantTable"); + + test_swizzle(); + test_math(); + test_conditionals(); + test_float_vectors(); + test_trig(); + test_fail(); +} diff --git a/dlls/d3dcompiler_47/tests/Makefile.in b/dlls/d3dcompiler_47/tests/Makefile.in index 401ed30b0f1..032e16fdb8f 100644 --- a/dlls/d3dcompiler_47/tests/Makefile.in +++ b/dlls/d3dcompiler_47/tests/Makefile.in @@ -6,5 +6,5 @@ PARENTSRC = ../../d3dcompiler_43/tests C_SRCS = \ asm.c \ blob.c \ - hlsl.c \ + hlsl_d3d9.c \ reflection.c -- 2.25.0

1 2

[PATCH] hid: Implement HidP_GetUsageValueArray.
by Gabriel Ivăncescu 27 Feb '20

27 Feb '20

Games like Risk of Rain 2 need this with certain controllers. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- Andrew Eikum helped me test this out with a PS4 Controller on Windows 10. Using the test here, I took all the input reports from the Windows log and sent them through this function in a simulation, to compare the outputs with the dumped log from Windows. It was the same, so same input resulted in same output. dlls/hid/hid.spec | 2 +- dlls/hid/hidp.c | 65 +++++++++++++++++++++++++++++++++++++++++ dlls/hid/tests/device.c | 37 +++++++++++++++++++---- include/ddk/hidpi.h | 1 + 4 files changed, 99 insertions(+), 6 deletions(-) diff --git a/dlls/hid/hid.spec b/dlls/hid/hid.spec index b8e29fe..98508a4 100644 --- a/dlls/hid/hid.spec +++ b/dlls/hid/hid.spec @@ -27,7 +27,7 @@ @ stdcall HidP_GetSpecificButtonCaps(long long long long ptr ptr ptr) @ stdcall HidP_GetSpecificValueCaps(long long long long ptr ptr ptr) @ stdcall HidP_GetUsageValue(long long long long ptr ptr ptr long) -@ stub HidP_GetUsageValueArray +@ stdcall HidP_GetUsageValueArray(long long long long ptr long ptr ptr long) @ stdcall HidP_GetUsages(long long long ptr ptr ptr ptr long) @ stdcall HidP_GetUsagesEx(long long ptr ptr ptr ptr long) @ stdcall HidP_GetValueCaps(long ptr ptr ptr) diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index 817e021..c4d1626 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -117,6 +117,46 @@ static NTSTATUS set_report_data(BYTE *report, INT reportLength, INT startBit, IN return HIDP_STATUS_SUCCESS; } +static NTSTATUS get_report_data_array(BYTE *report, UINT reportLength, UINT startBit, UINT elemSize, + UINT numElements, PCHAR values, UINT valuesSize) +{ + BYTE byte, *end, *p = report + startBit / 8; + ULONG size = elemSize * numElements; + ULONG m, bit_index = startBit % 8; + BYTE *data = (BYTE*)values; + + if ((startBit + size) / 8 > reportLength) + return HIDP_STATUS_INVALID_REPORT_LENGTH; + + if (valuesSize < (size + 7) / 8) + return HIDP_STATUS_BUFFER_TOO_SMALL; + + end = report + (startBit + size + 7) / 8; + + data--; + byte = *p++; + while (p != end) + { + *(++data) = byte >> bit_index; + byte = *p++; + *data |= byte << (8 - bit_index); + } + + /* Handle the end and mask out bits beyond */ + m = (startBit + size) % 8; + m = m ? m : 8; + + if (m > bit_index) + *(++data) = (byte >> bit_index) & ((1 << (m - bit_index)) - 1); + else + *data &= (1 << (m + 8 - bit_index)) - 1; + + if (++data < (BYTE*)values + valuesSize) + memset(data, 0, (BYTE*)values + valuesSize - data); + + return HIDP_STATUS_SUCCESS; +} + NTSTATUS WINAPI HidP_GetButtonCaps(HIDP_REPORT_TYPE ReportType, PHIDP_BUTTON_CAPS ButtonCaps, PUSHORT ButtonCapsLength, PHIDP_PREPARSED_DATA PreparsedData) @@ -325,6 +365,31 @@ NTSTATUS WINAPI HidP_GetUsageValue(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, } +NTSTATUS WINAPI HidP_GetUsageValueArray(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, + USAGE Usage, PCHAR UsageValue, USHORT UsageValueByteLength, + PHIDP_PREPARSED_DATA PreparsedData, PCHAR Report, ULONG ReportLength) +{ + WINE_HID_ELEMENT element; + NTSTATUS rc; + + TRACE("(%i, %x, %i, %i, %p, %u, %p, %p, %i)\n", ReportType, UsagePage, LinkCollection, Usage, UsageValue, + UsageValueByteLength, PreparsedData, Report, ReportLength); + + rc = find_usage(ReportType, UsagePage, LinkCollection, Usage, PreparsedData, Report, ValueElement, &element); + + if (rc == HIDP_STATUS_SUCCESS) + { + if (element.caps.value.IsRange || element.caps.value.ReportCount <= 1 || !element.bitCount) + return HIDP_STATUS_NOT_VALUE_ARRAY; + + return get_report_data_array((BYTE*)Report, ReportLength, element.valueStartBit, element.bitCount, + element.caps.value.ReportCount, UsageValue, UsageValueByteLength); + } + + return rc; +} + + NTSTATUS WINAPI HidP_GetUsages(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, PUSAGE UsageList, PULONG UsageLength, PHIDP_PREPARSED_DATA PreparsedData, PCHAR Report, ULONG ReportLength) diff --git a/dlls/hid/tests/device.c b/dlls/hid/tests/device.c index 24c3077..3dd22b7 100644 --- a/dlls/hid/tests/device.c +++ b/dlls/hid/tests/device.c @@ -253,11 +253,38 @@ static void process_data(HIDP_CAPS Caps, PHIDP_PREPARSED_DATA ppd, CHAR *data, D trace("\tValues:\n"); for (i = 0; i < length; i++) { - status = HidP_GetUsageValue(HidP_Input, values[i].UsagePage, 0, - values[i].Range.UsageMin, &value, ppd, data, data_length); - ok(status == HIDP_STATUS_SUCCESS, "Failed to get value [%i,%i] (%x)\n", - values[i].UsagePage, values[i].Range.UsageMin, status); - trace("[%02x, %02x]: %u\n",values[i].UsagePage, values[i].Range.UsageMin, value); + ok(values[i].ReportCount, "Zero ReportCount for [%i,%i]\n", values[i].UsagePage, values[i].NotRange.Usage); + if (values[i].IsRange || values[i].ReportCount <= 1) + { + status = HidP_GetUsageValue(HidP_Input, values[i].UsagePage, 0, + values[i].Range.UsageMin, &value, ppd, data, data_length); + ok(status == HIDP_STATUS_SUCCESS, "Failed to get value [%i,%i] (%x)\n", + values[i].UsagePage, values[i].Range.UsageMin, status); + trace("[%02x, %02x]: %u\n", values[i].UsagePage, values[i].Range.UsageMin, value); + } + else + { + USHORT k, array_size = (values[i].BitSize * values[i].ReportCount + 7) / 8; + PCHAR array = HeapAlloc(GetProcessHeap(), 0, array_size); + char *dump = HeapAlloc(GetProcessHeap(), 0, array_size * 3 + 1); + + status = HidP_GetUsageValueArray(HidP_Input, values[i].UsagePage, 0, + values[i].NotRange.Usage, array, array_size, ppd, data, data_length); + ok(status == HIDP_STATUS_SUCCESS, "Failed to get value array [%i,%i] (%x)\n", + values[i].UsagePage, values[i].NotRange.Usage, status); + dump[0] = 0; + for (k = 0; k < array_size; k++) + { + char bytestr[5]; + sprintf(bytestr, " %02x", (BYTE)array[k]); + strcat(dump, bytestr); + } + trace("[%02x, %02x] element bit size %u num elements %u:%s\n", values[i].UsagePage, + values[i].NotRange.Usage, values[i].BitSize, values[i].ReportCount, dump); + + HeapFree(GetProcessHeap(), 0, dump); + HeapFree(GetProcessHeap(), 0, array); + } } HeapFree(GetProcessHeap(), 0, values); diff --git a/include/ddk/hidpi.h b/include/ddk/hidpi.h index 51d61ea..fb497f3 100644 --- a/include/ddk/hidpi.h +++ b/include/ddk/hidpi.h @@ -195,6 +195,7 @@ NTSTATUS WINAPI HidP_GetButtonCaps(HIDP_REPORT_TYPE ReportType, PHIDP_BUTTON_CAP NTSTATUS WINAPI HidP_GetCaps(PHIDP_PREPARSED_DATA PreparsedData, PHIDP_CAPS Capabilities); NTSTATUS WINAPI HidP_GetUsages(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, PUSAGE UsageList, PULONG UsageLength, PHIDP_PREPARSED_DATA PreparsedData, PCHAR Report, ULONG ReportLength); NTSTATUS WINAPI HidP_GetUsageValue(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, USAGE Usage, PULONG UsageValue, PHIDP_PREPARSED_DATA PreparsedData, PCHAR Report, ULONG ReportLength); +NTSTATUS WINAPI HidP_GetUsageValueArray(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, USAGE Usage, PCHAR UsageValue, USHORT UsageValueByteLength, PHIDP_PREPARSED_DATA PreparsedData, PCHAR Report, ULONG ReportLength); NTSTATUS WINAPI HidP_GetValueCaps(HIDP_REPORT_TYPE ReportType, PHIDP_VALUE_CAPS ValueCaps, PUSHORT ValueCapsLength, PHIDP_PREPARSED_DATA PreparsedData); NTSTATUS WINAPI HidP_InitializeReportForID(HIDP_REPORT_TYPE ReportType, UCHAR ReportID, PHIDP_PREPARSED_DATA PreparsedData, PCHAR Report, ULONG ReportLength); ULONG WINAPI HidP_MaxUsageListLength(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, PHIDP_PREPARSED_DATA PreparsedData); -- 2.21.0

2 3

[PATCH 1/5] d3d8: Fix texture stage index checks.
by Matteo Bruni 27 Feb '20

27 Feb '20

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- In d3d8 there was no vertex shader texture fetch. dlls/d3d8/device.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 869a6a2dd0d..9793eda0c36 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2159,10 +2159,7 @@ static HRESULT WINAPI d3d8_device_GetTexture(IDirect3DDevice8 *iface, DWORD stag if (!texture) return D3DERR_INVALIDCALL; - if (stage >= WINED3DVERTEXTEXTURESAMPLER0 && stage <= WINED3DVERTEXTEXTURESAMPLER3) - stage -= (WINED3DVERTEXTEXTURESAMPLER0 - WINED3D_MAX_FRAGMENT_SAMPLERS); - - if (stage >= WINED3D_MAX_COMBINED_SAMPLERS) + if (stage >= WINED3D_MAX_FRAGMENT_SAMPLERS) { WARN("Ignoring invalid stage %u.\n", stage); *texture = NULL; @@ -2253,10 +2250,7 @@ static HRESULT WINAPI d3d8_device_GetTextureStageState(IDirect3DDevice8 *iface, TRACE("iface %p, stage %u, state %#x, value %p.\n", iface, stage, state, value); - if (stage >= WINED3DVERTEXTEXTURESAMPLER0 && stage <= WINED3DVERTEXTEXTURESAMPLER3) - stage -= (WINED3DVERTEXTEXTURESAMPLER0 - WINED3D_MAX_FRAGMENT_SAMPLERS); - - if (stage >= WINED3D_MAX_COMBINED_SAMPLERS) + if (stage >= WINED3D_MAX_FRAGMENT_SAMPLERS) { WARN("Invalid stage %u.\n", stage); *value = 0; -- 2.24.1

2 9

[PATCH 1/5] ddraw: Set the primary stateblock when executing draw calls.
by Zebediah Figura 27 Feb '20

27 Feb '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ddraw/device.c | 48 +++++++++++++++++++------------------- dlls/ddraw/executebuffer.c | 23 +++++++++--------- dlls/ddraw/vertexbuffer.c | 29 +++++++++++------------ 3 files changed, 49 insertions(+), 51 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 7fd78e6234..e18c2c7853 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -3513,7 +3513,6 @@ static HRESULT d3d_device7_DrawPrimitive(IDirect3DDevice7 *iface, size = vertex_count * stride; wined3d_mutex_lock(); - wined3d_device_apply_stateblock(device->wined3d_device, device->state); hr = d3d_device_prepare_vertex_buffer(device, size); if (FAILED(hr)) goto done; @@ -3536,12 +3535,13 @@ static HRESULT d3d_device7_DrawPrimitive(IDirect3DDevice7 *iface, wined3d_resource_unmap(vb, 0); device->vertex_buffer_pos = vb_pos + size; - hr = wined3d_device_set_stream_source(device->wined3d_device, 0, device->vertex_buffer, 0, stride); + hr = wined3d_stateblock_set_stream_source(device->state, 0, device->vertex_buffer, 0, stride); if (FAILED(hr)) goto done; - wined3d_device_set_vertex_declaration(device->wined3d_device, ddraw_find_decl(device->ddraw, fvf)); + wined3d_stateblock_set_vertex_declaration(device->state, ddraw_find_decl(device->ddraw, fvf)); wined3d_device_set_primitive_type(device->wined3d_device, primitive_type, 0); + wined3d_device_apply_stateblock(device->wined3d_device, device->state); hr = wined3d_device_draw_primitive(device->wined3d_device, vb_pos / stride, vertex_count); done: @@ -3706,7 +3706,6 @@ static HRESULT d3d_device7_DrawIndexedPrimitive(IDirect3DDevice7 *iface, /* Set the D3DDevice's FVF */ wined3d_mutex_lock(); - wined3d_device_apply_stateblock(device->wined3d_device, device->state); hr = d3d_device_prepare_vertex_buffer(device, vtx_size); if (FAILED(hr)) goto done; @@ -3746,14 +3745,15 @@ static HRESULT d3d_device7_DrawIndexedPrimitive(IDirect3DDevice7 *iface, wined3d_resource_unmap(ib, 0); device->index_buffer_pos = ib_pos + idx_size; - hr = wined3d_device_set_stream_source(device->wined3d_device, 0, device->vertex_buffer, 0, stride); + hr = wined3d_stateblock_set_stream_source(device->state, 0, device->vertex_buffer, 0, stride); if (FAILED(hr)) goto done; - wined3d_device_set_index_buffer(device->wined3d_device, device->index_buffer, WINED3DFMT_R16_UINT, 0); + wined3d_stateblock_set_index_buffer(device->state, device->index_buffer, WINED3DFMT_R16_UINT); - wined3d_device_set_vertex_declaration(device->wined3d_device, ddraw_find_decl(device->ddraw, fvf)); + wined3d_stateblock_set_vertex_declaration(device->state, ddraw_find_decl(device->ddraw, fvf)); wined3d_device_set_primitive_type(device->wined3d_device, primitive_type, 0); - wined3d_device_set_base_vertex_index(device->wined3d_device, vb_pos / stride); + wined3d_stateblock_set_base_vertex_index(device->state, vb_pos / stride); + wined3d_device_apply_stateblock(device->wined3d_device, device->state); hr = wined3d_device_draw_indexed_primitive(device->wined3d_device, ib_pos / sizeof(*indices), index_count); done: @@ -4051,7 +4051,6 @@ static HRESULT d3d_device7_DrawPrimitiveStrided(IDirect3DDevice7 *iface, D3DPRIM } wined3d_mutex_lock(); - wined3d_device_apply_stateblock(device->wined3d_device, device->state); hr = d3d_device_prepare_vertex_buffer(device, dst_size); if (FAILED(hr)) goto done; @@ -4074,12 +4073,13 @@ static HRESULT d3d_device7_DrawPrimitiveStrided(IDirect3DDevice7 *iface, D3DPRIM wined3d_resource_unmap(vb, 0); device->vertex_buffer_pos = vb_pos + dst_size; - hr = wined3d_device_set_stream_source(device->wined3d_device, 0, device->vertex_buffer, 0, dst_stride); + hr = wined3d_stateblock_set_stream_source(device->state, 0, device->vertex_buffer, 0, dst_stride); if (FAILED(hr)) goto done; - wined3d_device_set_vertex_declaration(device->wined3d_device, ddraw_find_decl(device->ddraw, fvf)); + wined3d_stateblock_set_vertex_declaration(device->state, ddraw_find_decl(device->ddraw, fvf)); wined3d_device_set_primitive_type(device->wined3d_device, primitive_type, 0); + wined3d_device_apply_stateblock(device->wined3d_device, device->state); hr = wined3d_device_draw_primitive(device->wined3d_device, vb_pos / dst_stride, vertex_count); done: @@ -4168,7 +4168,6 @@ static HRESULT d3d_device7_DrawIndexedPrimitiveStrided(IDirect3DDevice7 *iface, wined3d_mutex_lock(); - wined3d_device_apply_stateblock(device->wined3d_device, device->state); hr = d3d_device_prepare_vertex_buffer(device, vtx_dst_size); if (FAILED(hr)) goto done; @@ -4208,14 +4207,15 @@ static HRESULT d3d_device7_DrawIndexedPrimitiveStrided(IDirect3DDevice7 *iface, wined3d_resource_unmap(ib, 0); device->index_buffer_pos = ib_pos + idx_size; - hr = wined3d_device_set_stream_source(device->wined3d_device, 0, device->vertex_buffer, 0, vtx_dst_stride); + hr = wined3d_stateblock_set_stream_source(device->state, 0, device->vertex_buffer, 0, vtx_dst_stride); if (FAILED(hr)) goto done; - wined3d_device_set_index_buffer(device->wined3d_device, device->index_buffer, WINED3DFMT_R16_UINT, 0); - wined3d_device_set_base_vertex_index(device->wined3d_device, vb_pos / vtx_dst_stride); + wined3d_stateblock_set_index_buffer(device->state, device->index_buffer, WINED3DFMT_R16_UINT); + wined3d_stateblock_set_base_vertex_index(device->state, vb_pos / vtx_dst_stride); - wined3d_device_set_vertex_declaration(device->wined3d_device, ddraw_find_decl(device->ddraw, fvf)); + wined3d_stateblock_set_vertex_declaration(device->state, ddraw_find_decl(device->ddraw, fvf)); wined3d_device_set_primitive_type(device->wined3d_device, primitive_type, 0); + wined3d_device_apply_stateblock(device->wined3d_device, device->state); hr = wined3d_device_draw_indexed_primitive(device->wined3d_device, ib_pos / sizeof(WORD), index_count); done: @@ -4326,9 +4326,8 @@ static HRESULT d3d_device7_DrawPrimitiveVB(IDirect3DDevice7 *iface, D3DPRIMITIVE } wined3d_mutex_lock(); - wined3d_device_apply_stateblock(device->wined3d_device, device->state); - wined3d_device_set_vertex_declaration(device->wined3d_device, vb_impl->wined3d_declaration); - if (FAILED(hr = wined3d_device_set_stream_source(device->wined3d_device, + wined3d_stateblock_set_vertex_declaration(device->state, vb_impl->wined3d_declaration); + if (FAILED(hr = wined3d_stateblock_set_stream_source(device->state, 0, vb_impl->wined3d_buffer, 0, stride))) { WARN("Failed to set stream source, hr %#x.\n", hr); @@ -4338,6 +4337,7 @@ static HRESULT d3d_device7_DrawPrimitiveVB(IDirect3DDevice7 *iface, D3DPRIMITIVE /* Now draw the primitives */ wined3d_device_set_primitive_type(device->wined3d_device, primitive_type, 0); + wined3d_device_apply_stateblock(device->wined3d_device, device->state); hr = wined3d_device_draw_primitive(device->wined3d_device, start_vertex, vertex_count); wined3d_mutex_unlock(); @@ -4449,8 +4449,7 @@ static HRESULT d3d_device7_DrawIndexedPrimitiveVB(IDirect3DDevice7 *iface, wined3d_mutex_lock(); - wined3d_device_apply_stateblock(device->wined3d_device, device->state); - wined3d_device_set_vertex_declaration(device->wined3d_device, vb_impl->wined3d_declaration); + wined3d_stateblock_set_vertex_declaration(device->state, vb_impl->wined3d_declaration); hr = d3d_device_prepare_index_buffer(device, index_count * sizeof(WORD)); if (FAILED(hr)) @@ -4479,11 +4478,11 @@ static HRESULT d3d_device7_DrawIndexedPrimitiveVB(IDirect3DDevice7 *iface, device->index_buffer_pos = ib_pos + index_count * sizeof(WORD); /* Set the index stream */ - wined3d_device_set_base_vertex_index(device->wined3d_device, start_vertex); - wined3d_device_set_index_buffer(device->wined3d_device, device->index_buffer, WINED3DFMT_R16_UINT, 0); + wined3d_stateblock_set_base_vertex_index(device->state, start_vertex); + wined3d_stateblock_set_index_buffer(device->state, device->index_buffer, WINED3DFMT_R16_UINT); /* Set the vertex stream source */ - if (FAILED(hr = wined3d_device_set_stream_source(device->wined3d_device, + if (FAILED(hr = wined3d_stateblock_set_stream_source(device->state, 0, vb_impl->wined3d_buffer, 0, stride))) { ERR("(%p) IDirect3DDevice::SetStreamSource failed with hr = %08x\n", device, hr); @@ -4492,6 +4491,7 @@ static HRESULT d3d_device7_DrawIndexedPrimitiveVB(IDirect3DDevice7 *iface, } wined3d_device_set_primitive_type(device->wined3d_device, primitive_type, 0); + wined3d_device_apply_stateblock(device->wined3d_device, device->state); hr = wined3d_device_draw_indexed_primitive(device->wined3d_device, ib_pos / sizeof(WORD), index_count); wined3d_mutex_unlock(); diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index 0d1726ed7f..1b680f627e 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -74,13 +74,13 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, struct d3d case D3DOP_POINT: { const D3DPOINT *p = (D3DPOINT *)instr; - wined3d_device_apply_stateblock(device->wined3d_device, device->state); wined3d_device_set_primitive_type(device->wined3d_device, WINED3D_PT_POINTLIST, 0); - wined3d_device_set_stream_source(device->wined3d_device, 0, + wined3d_stateblock_set_stream_source(device->state, 0, buffer->dst_vertex_buffer, 0, sizeof(D3DTLVERTEX)); - wined3d_device_set_vertex_declaration(device->wined3d_device, + wined3d_stateblock_set_vertex_declaration(device->state, ddraw_find_decl(device->ddraw, D3DFVF_TLVERTEX)); + wined3d_device_apply_stateblock(device->wined3d_device, device->state); for (i = 0; i < count; ++i) wined3d_device_draw_primitive(device->wined3d_device, p[i].wFirst, p[i].wCount); @@ -107,8 +107,6 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, struct d3d primitive_size = 3; } - wined3d_device_apply_stateblock(device->wined3d_device, device->state); - index_count = count * primitive_size; if (buffer->index_size < index_count) { @@ -185,11 +183,12 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, struct d3d wined3d_resource_unmap(wined3d_buffer_get_resource(buffer->index_buffer), 0); - wined3d_device_set_stream_source(device->wined3d_device, 0, + wined3d_stateblock_set_stream_source(device->state, 0, buffer->dst_vertex_buffer, 0, sizeof(D3DTLVERTEX)); - wined3d_device_set_vertex_declaration(device->wined3d_device, + wined3d_stateblock_set_vertex_declaration(device->state, ddraw_find_decl(device->ddraw, D3DFVF_TLVERTEX)); - wined3d_device_set_index_buffer(device->wined3d_device, buffer->index_buffer, WINED3DFMT_R16_UINT, 0); + wined3d_stateblock_set_index_buffer(device->state, buffer->index_buffer, WINED3DFMT_R16_UINT); + wined3d_device_apply_stateblock(device->wined3d_device, device->state); wined3d_device_draw_indexed_primitive(device->wined3d_device, index_pos, index_count); buffer->index_pos = index_pos + index_count; @@ -303,14 +302,14 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, struct d3d { case D3DPROCESSVERTICES_TRANSFORMLIGHT: case D3DPROCESSVERTICES_TRANSFORM: - wined3d_device_apply_stateblock(device->wined3d_device, device->state); - wined3d_device_set_stream_source(device->wined3d_device, 0, + wined3d_stateblock_set_stream_source(device->state, 0, buffer->src_vertex_buffer, buffer->src_vertex_pos * sizeof(D3DVERTEX), sizeof(D3DVERTEX)); - wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_LIGHTING, + wined3d_stateblock_set_render_state(device->state, WINED3D_RS_LIGHTING, op == D3DPROCESSVERTICES_TRANSFORMLIGHT && !!device->material); - wined3d_device_set_vertex_declaration(device->wined3d_device, + wined3d_stateblock_set_vertex_declaration(device->state, ddraw_find_decl(device->ddraw, op == D3DPROCESSVERTICES_TRANSFORMLIGHT ? D3DFVF_VERTEX : D3DFVF_LVERTEX)); + wined3d_device_apply_stateblock(device->wined3d_device, device->state); wined3d_device_process_vertices(device->wined3d_device, ci->wStart, ci->wDest, ci->dwCount, buffer->dst_vertex_buffer, NULL, 0, D3DFVF_TLVERTEX); break; diff --git a/dlls/ddraw/vertexbuffer.c b/dlls/ddraw/vertexbuffer.c index 1e3d25f6cb..afd798cb9f 100644 --- a/dlls/ddraw/vertexbuffer.c +++ b/dlls/ddraw/vertexbuffer.c @@ -80,17 +80,13 @@ static ULONG WINAPI d3d_vertex_buffer7_Release(IDirect3DVertexBuffer7 *iface) if (!ref) { - struct wined3d_buffer *vb = NULL; - UINT offset, stride; - /* D3D7 vertex buffers don't stay bound in the device, they are passed * as a parameter to DrawPrimitiveVB. DrawPrimitiveVB sets them as the * stream source in wined3d and they should get unset there before * they are destroyed. */ wined3d_mutex_lock(); - wined3d_device_get_stream_source(buffer->ddraw->wined3d_device, 0, &vb, &offset, &stride); - if (vb == buffer->wined3d_buffer) - wined3d_device_set_stream_source(buffer->ddraw->wined3d_device, 0, NULL, 0, 0); + if (wined3d_stateblock_get_state(buffer->ddraw->state)->streams[0].buffer == buffer->wined3d_buffer) + wined3d_stateblock_set_stream_source(buffer->ddraw->state, 0, NULL, 0, 0); wined3d_vertex_declaration_decref(buffer->wined3d_declaration); wined3d_buffer_decref(buffer->wined3d_buffer); @@ -258,6 +254,7 @@ static HRESULT WINAPI d3d_vertex_buffer7_ProcessVertices(IDirect3DVertexBuffer7 ? unsafe_impl_from_IDirect3DDevice7(device) : unsafe_impl_from_IDirect3DDevice3((IDirect3DDevice3 *)device); BOOL old_clip, do_clip, old_lighting, do_lighting; + const struct wined3d_stateblock_state *state; HRESULT hr; TRACE("iface %p, vertex_op %#x, dst_idx %u, count %u, src_buffer %p, src_idx %u, device %p, flags %#x.\n", @@ -277,18 +274,19 @@ static HRESULT WINAPI d3d_vertex_buffer7_ProcessVertices(IDirect3DVertexBuffer7 return DDERR_INVALIDPARAMS; wined3d_mutex_lock(); - wined3d_device_apply_stateblock(device_impl->wined3d_device, device_impl->state); + + state = wined3d_stateblock_get_state(device_impl->state); /* WineD3D doesn't know d3d7 vertex operation, it uses * render states instead. Set the render states according to * the vertex ops */ do_clip = !!(vertex_op & D3DVOP_CLIP); - old_clip = !!wined3d_device_get_render_state(device_impl->wined3d_device, WINED3D_RS_CLIPPING); + old_clip = !!state->rs[WINED3D_RS_CLIPPING]; if (do_clip != old_clip) - wined3d_device_set_render_state(device_impl->wined3d_device, WINED3D_RS_CLIPPING, do_clip); + wined3d_stateblock_set_render_state(device_impl->state, WINED3D_RS_CLIPPING, do_clip); - old_lighting = !!wined3d_device_get_render_state(device_impl->wined3d_device, WINED3D_RS_LIGHTING); + old_lighting = !!state->rs[WINED3D_RS_LIGHTING]; if (dst_buffer_impl->version == 3) do_lighting = device_impl->material && (src_buffer_impl->fvf & D3DFVF_NORMAL) && (vertex_op & D3DVOP_LIGHT); @@ -296,19 +294,20 @@ static HRESULT WINAPI d3d_vertex_buffer7_ProcessVertices(IDirect3DVertexBuffer7 do_lighting = old_lighting && (vertex_op & D3DVOP_LIGHT); if (do_lighting != old_lighting) - wined3d_device_set_render_state(device_impl->wined3d_device, WINED3D_RS_LIGHTING, do_lighting); + wined3d_stateblock_set_render_state(device_impl->state, WINED3D_RS_LIGHTING, do_lighting); - wined3d_device_set_stream_source(device_impl->wined3d_device, + wined3d_stateblock_set_stream_source(device_impl->state, 0, src_buffer_impl->wined3d_buffer, 0, get_flexible_vertex_size(src_buffer_impl->fvf)); - wined3d_device_set_vertex_declaration(device_impl->wined3d_device, src_buffer_impl->wined3d_declaration); + wined3d_stateblock_set_vertex_declaration(device_impl->state, src_buffer_impl->wined3d_declaration); + wined3d_device_apply_stateblock(device_impl->wined3d_device, device_impl->state); hr = wined3d_device_process_vertices(device_impl->wined3d_device, src_idx, dst_idx, count, dst_buffer_impl->wined3d_buffer, NULL, flags, dst_buffer_impl->fvf); /* Restore the states if needed */ if (do_clip != old_clip) - wined3d_device_set_render_state(device_impl->wined3d_device, WINED3D_RS_CLIPPING, old_clip); + wined3d_stateblock_set_render_state(device_impl->state, WINED3D_RS_CLIPPING, old_clip); if (do_lighting != old_lighting) - wined3d_device_set_render_state(device_impl->wined3d_device, WINED3D_RS_LIGHTING, old_lighting); + wined3d_stateblock_set_render_state(device_impl->state, WINED3D_RS_LIGHTING, old_lighting); wined3d_mutex_unlock(); -- 2.25.0

3 10

[PATCH v2 1/3] d3dcompiler/tests: Rewrite to use a separate d3d9 device for each test.
by Zebediah Figura 27 Feb '20

27 Feb '20

This brings the d3dcompiler tests more in line with existing d3d9 tests, and allows potentially running the tests in parallel. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/d3dcompiler_43/tests/hlsl.c | 801 +++++++++++++++---------------- 1 file changed, 384 insertions(+), 417 deletions(-) diff --git a/dlls/d3dcompiler_43/tests/hlsl.c b/dlls/d3dcompiler_43/tests/hlsl.c index 868693838cc..9114ec98e1d 100644 --- a/dlls/d3dcompiler_43/tests/hlsl.c +++ b/dlls/d3dcompiler_43/tests/hlsl.c @@ -1,5 +1,6 @@ /* * Copyright (C) 2010 Travis Athougies + * Copyright (C) 2020 Zebediah Figura * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -25,290 +26,265 @@ static pD3DCompile ppD3DCompile; static HRESULT (WINAPI *pD3DXGetShaderConstantTable)(const DWORD *byte_code, ID3DXConstantTable **constant_table); -static D3DMATRIX *(WINAPI *pD3DXMatrixOrthoLH)(D3DXMATRIX *pout, FLOAT w, FLOAT h, FLOAT zn, FLOAT zf); -struct vertex +struct vec2 { - float x, y, z; - float tx, ty; + float x, y; }; -/* Tells compute_shader_probe* which pixels should be what colors */ -struct hlsl_probe_info +struct vec4 { - unsigned int x, y; - /* The expected values in this region */ - D3DXCOLOR c; - /* The max error for any value */ - float epsilon; - /* An error message to print if this test fails */ - const char *message; + float x, y, z, w; }; -static HWND create_window(void) +#define compile_shader(a, b) compile_shader_(__LINE__, a, b) +static ID3D10Blob *compile_shader_(unsigned int line, const char *source, const char *target) { - WNDCLASSA wc = {0}; - wc.lpfnWndProc = DefWindowProcA; - wc.lpszClassName = "d3d9_test_wc"; - RegisterClassA(&wc); + ID3D10Blob *blob = NULL, *errors = NULL; + HRESULT hr; - return CreateWindowA("d3d9_test_wc", "d3d9_test", 0, 0, 0, 0, 0, 0, 0, 0, 0); + hr = ppD3DCompile(source, strlen(source), NULL, NULL, NULL, "main", target, 0, 0, &blob, &errors); + ok_(__FILE__, line)(hr == D3D_OK, "Failed to compile shader, hr %#x.\n", hr); + if (errors) + { + if (winetest_debug > 1) + trace_(__FILE__, line)("%s\n", (char *)ID3D10Blob_GetBufferPointer(errors)); + ID3D10Blob_Release(errors); + } + return blob; } -static IDirect3DDevice9 *init_d3d9(IDirect3DVertexDeclaration9 **vdeclaration, - IDirect3DVertexBuffer9 **quad_geometry, IDirect3DVertexShader9 **vshader_passthru) +static IDirect3DDevice9 *create_d3d9_device(HWND window) { - static const struct vertex quad_vertices[4] = + D3DPRESENT_PARAMETERS present_parameters = { - {-1.0f, -1.0f, 0.0f, 0.0f, 1.0f}, - {-1.0f, 1.0f, 0.0f, 0.0f, 0.0f}, - { 1.0f, -1.0f, 0.0f, 1.0f, 1.0f}, - { 1.0f, 1.0f, 0.0f, 1.0f, 0.0f} + .Windowed = TRUE, + .hDeviceWindow = window, + .SwapEffect = D3DSWAPEFFECT_DISCARD, + .BackBufferWidth = 640, + .BackBufferHeight = 480, + .BackBufferFormat = D3DFMT_A8R8G8B8, }; - - static const D3DVERTEXELEMENT9 vdeclelements[] = - { - {0, 0, D3DDECLTYPE_FLOAT3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0}, - {0, 12, D3DDECLTYPE_FLOAT2, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_TEXCOORD, 0}, - D3DDECL_END() - }; - - static const char *vshader_passthru_hlsl = - "float4 vshader(float4 pos: POSITION, inout float2 texcoord: TEXCOORD0): POSITION\n" - "{\n" - " return pos;\n" - "}"; - - IDirect3D9 *d3d9_ptr; - IDirect3DDevice9 *device_ptr = NULL; - D3DPRESENT_PARAMETERS present_parameters; - - void *temp_geometry_vertices; - - ID3D10Blob *compiled = NULL; - ID3D10Blob *errors = NULL; - + IDirect3DDevice9 *device; + IDirect3DSurface9 *rt; + IDirect3D9 *d3d; + D3DCAPS9 caps; HRESULT hr; - d3d9_ptr = Direct3DCreate9(D3D_SDK_VERSION); - if (!d3d9_ptr) + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, window, + D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, &device); + IDirect3D9_Release(d3d); + if (FAILED(hr)) { - skip("could not create D3D9\n"); + skip("Failed to create a 3D device, hr %#x.\n", hr); return NULL; } - hr = IDirect3D9_CheckDeviceFormat(d3d9_ptr, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, - 0, D3DRTYPE_SURFACE, D3DFMT_A32B32G32R32F); - if (FAILED(hr)) + hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); + ok(hr == D3D_OK, "Failed to get device caps, hr %#x.\n", hr); + if (caps.PixelShaderVersion < D3DPS_VERSION(2, 0) || caps.VertexShaderVersion < D3DVS_VERSION(2, 0)) { - skip("A32B32G32R32F format not available on this device\n"); - IDirect3D9_Release(d3d9_ptr); + skip("No shader model 2 support.\n"); + IDirect3DDevice9_Release(device); return NULL; } - ZeroMemory(&present_parameters, sizeof(present_parameters)); - present_parameters.Windowed = TRUE; - present_parameters.hDeviceWindow = create_window(); - present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; - - hr = IDirect3D9_CreateDevice(d3d9_ptr, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, NULL, - D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, &device_ptr); - IDirect3D9_Release(d3d9_ptr); - if (FAILED(hr)) + if (FAILED(hr = IDirect3DDevice9_CreateRenderTarget(device, 640, 480, D3DFMT_A32B32G32R32F, + D3DMULTISAMPLE_NONE, 0, FALSE, &rt, NULL))) { - skip("could not create Direct3D9 device\n"); + skip("Failed to create an A32B32G32R32F surface, hr %#x.\n", hr); + IDirect3DDevice9_Release(device); return NULL; } + ok(hr == D3D_OK, "Failed to create render target, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderTarget(device, 0, rt); + ok(hr == D3D_OK, "Failed to set render target, hr %#x.\n", hr); + IDirect3DSurface9_Release(rt); - /* Create the quad geometry */ - hr = IDirect3DDevice9_CreateVertexBuffer(device_ptr, 4 * sizeof(struct vertex), - D3DUSAGE_WRITEONLY, 0, D3DPOOL_DEFAULT, quad_geometry, NULL); - ok(SUCCEEDED(hr), - "Could not create vertex buffer, IDirect3DDevice9_CreateVertexBuffer returned: %08x\n", hr); - - hr = IDirect3DVertexBuffer9_Lock(*quad_geometry, 0, sizeof(quad_vertices), &temp_geometry_vertices, 0); - ok(SUCCEEDED(hr), "IDirect3DVertexBuffer9_Lock returned: %08x\n", hr); - memcpy(temp_geometry_vertices, quad_vertices, sizeof(quad_vertices)); - IDirect3DVertexBuffer9_Unlock(*quad_geometry); + return device; +} - hr = IDirect3DDevice9_CreateVertexDeclaration(device_ptr, vdeclelements, vdeclaration); - ok(SUCCEEDED(hr), "Could not create vertex declaration: " - "IDirect3DDevice9_CreateVertexDeclaration returned: %08x\n", hr); +#define draw_quad(device, ps_code) draw_quad_(__LINE__, device, ps_code) +static void draw_quad_(unsigned int line, IDirect3DDevice9 *device, ID3D10Blob *ps_code) +{ + IDirect3DVertexDeclaration9 *vertex_declaration; + IDirect3DVertexShader9 *vs; + IDirect3DPixelShader9 *ps; + ID3D10Blob *vs_code; + HRESULT hr; - hr = IDirect3DDevice9_SetVertexDeclaration(device_ptr, *vdeclaration); - ok(hr == D3D_OK, "IDirect3DDevice9_SetVertexDeclaration returned: %08x\n", hr); + static const D3DVERTEXELEMENT9 decl_elements[] = + { + {0, 0, D3DDECLTYPE_FLOAT2, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0}, + {0, 8, D3DDECLTYPE_FLOAT2, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_TEXCOORD, 0}, + D3DDECL_END() + }; - /* Create a simple vertex shader to just pass through the values */ - hr = ppD3DCompile(vshader_passthru_hlsl, strlen(vshader_passthru_hlsl), NULL, - NULL, NULL, "vshader", "vs_1_1", 0, 0, &compiled, &errors); - if (FAILED(hr)) + static const struct { - skip("not compiling vertex shader due to lacking wine HLSL support!\n"); - if (errors) - ID3D10Blob_Release(errors); - return NULL; + struct vec2 position; + struct vec2 t0; } + quad[] = + { + {{-1.0f, -1.0f}, {0.0f, 1.0f}}, + {{-1.0f, 1.0f}, {0.0f, 0.0f}}, + {{ 1.0f, -1.0f}, {1.0f, 1.0f}}, + {{ 1.0f, 1.0f}, {1.0f, 0.0f}}, + }; - hr = IDirect3DDevice9_CreateVertexShader(device_ptr, ID3D10Blob_GetBufferPointer(compiled), - vshader_passthru); - ok(SUCCEEDED(hr), "IDirect3DDevice9_CreateVertexShader returned: %08x\n", hr); - ID3D10Blob_Release(compiled); + static const char vs_source[] = + "float4 main(float4 pos : POSITION, inout float2 texcoord : TEXCOORD0) : POSITION\n" + "{\n" + " return pos;\n" + "}"; - return device_ptr; -} + hr = IDirect3DDevice9_CreateVertexDeclaration(device, decl_elements, &vertex_declaration); + ok_(__FILE__, line)(hr == D3D_OK, "Failed to create vertex declaration, hr %#x.\n", hr); -/* Convenience functions */ -static void set_float4_d3d9(IDirect3DDevice9 *device, ID3DXConstantTable *constants, const char *name, - float x, float y, float z, float w) -{ - D3DXVECTOR4 vector; - vector.x = x; - vector.y = y; - vector.z = z; - vector.w = w; - ID3DXConstantTable_SetVector(constants, device, name, &vector); -} + hr = IDirect3DDevice9_SetVertexDeclaration(device, vertex_declaration); + ok_(__FILE__, line)(hr == D3D_OK, "Failed to set vertex declaration, hr %#x.\n", hr); -/* Compile our pixel shader and get back the compiled version and a constant table */ -static IDirect3DPixelShader9 *compile_pixel_shader9(IDirect3DDevice9 *device, const char *shader, - const char *profile, ID3DXConstantTable **constants) -{ - ID3D10Blob *compiled = NULL; - ID3D10Blob *errors = NULL; - IDirect3DPixelShader9 *pshader; - HRESULT hr; + vs_code = compile_shader(vs_source, "vs_2_0"); + + hr = IDirect3DDevice9_CreateVertexShader(device, ID3D10Blob_GetBufferPointer(vs_code), &vs); + ok_(__FILE__, line)(hr == D3D_OK, "Failed to create vertex shader, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetVertexShader(device, vs); + ok_(__FILE__, line)(hr == D3D_OK, "Failed to set vertex shader, hr %#x.\n", hr); + + hr = IDirect3DDevice9_CreatePixelShader(device, ID3D10Blob_GetBufferPointer(ps_code), &ps); + ok_(__FILE__, line)(hr == D3D_OK, "Failed to create pixel shader, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetPixelShader(device, ps); + ok_(__FILE__, line)(hr == D3D_OK, "Failed to set pixel shader, hr %#x.\n", hr); + + hr = IDirect3DDevice9_BeginScene(device); + ok_(__FILE__, line)(hr == D3D_OK, "Failed to draw, hr %#x.\n", hr); - hr = ppD3DCompile(shader, strlen(shader), NULL, NULL, - NULL, "test", profile, /* test is the name of the entry point of our shader */ - 0, 0, &compiled, &errors); - ok(hr == D3D_OK, "Pixel shader %s compilation failed: %s\n", shader, - errors ? (char *)ID3D10Blob_GetBufferPointer(errors) : ""); - if (FAILED(hr)) return NULL; + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(*quad)); + ok_(__FILE__, line)(hr == D3D_OK, "Failed to draw, hr %#x.\n", hr); - hr = pD3DXGetShaderConstantTable(ID3D10Blob_GetBufferPointer(compiled), constants); - ok(hr == D3D_OK, "Could not get constant table from compiled pixel shader\n"); + hr = IDirect3DDevice9_EndScene(device); + ok_(__FILE__, line)(hr == D3D_OK, "Failed to draw, hr %#x.\n", hr); - hr = IDirect3DDevice9_CreatePixelShader(device, ID3D10Blob_GetBufferPointer(compiled), &pshader); - ok(SUCCEEDED(hr), "IDirect3DDevice9_CreatePixelShader returned: %08x\n", hr); - ID3D10Blob_Release(compiled); - return pshader; + IDirect3DVertexShader9_Release(vs); + IDirect3DPixelShader9_Release(ps); + ID3D10Blob_Release(vs_code); } -/* Draw a full screen quad */ -static void draw_quad_with_shader9(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 *quad_geometry) +static struct vec4 get_readback_vec4_d3d9(IDirect3DDevice9 *device, unsigned int x, unsigned int y) { + IDirect3DSurface9 *surface = NULL, *target = NULL; + RECT rect = {x, y, x + 1, y + 1}; + D3DLOCKED_RECT locked_rect; + D3DSURFACE_DESC desc; + struct vec4 ret; HRESULT hr; - D3DXMATRIX projection_matrix; - pD3DXMatrixOrthoLH(&projection_matrix, 2.0f, 2.0f, 0.0f, 1.0f); - IDirect3DDevice9_SetTransform(device, D3DTS_PROJECTION, &projection_matrix); + hr = IDirect3DDevice9Ex_GetRenderTarget(device, 0, &target); + ok(hr == D3D_OK, "Failed to get render target, hr %#x.\n", hr); - hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, D3DCOLOR_XRGB(0, 0, 0), 1.0f, 0); - ok(hr == D3D_OK, "IDirect3DDevice9_Clear returned: %08x\n", hr); + hr = IDirect3DSurface9_GetDesc(target, &desc); + ok(hr == D3D_OK, "Failed to get surface desc, hr %#x.\n", hr); + hr = IDirect3DDevice9Ex_CreateOffscreenPlainSurface(device, desc.Width, desc.Height, + desc.Format, D3DPOOL_SYSTEMMEM, &surface, NULL); + ok(hr == D3D_OK, "Failed to create surface, hr %#x.\n", hr); - hr = IDirect3DDevice9_BeginScene(device); - ok(hr == D3D_OK, "IDirect3DDevice9_BeginScene returned: %08x\n", hr); + hr = IDirect3DDevice9Ex_GetRenderTargetData(device, target, surface); + ok(hr == D3D_OK, "Failed to get render target data, hr %#x.\n", hr); - hr = IDirect3DDevice9_SetStreamSource(device, 0, quad_geometry, 0, sizeof(struct vertex)); - ok(hr == D3D_OK, "IDirect3DDevice9_SetStreamSource returned: %08x\n", hr); - hr = IDirect3DDevice9_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, 0, 2); - ok(hr == D3D_OK, "IDirect3DDevice9_DrawPrimitive returned: %08x\n", hr); + hr = IDirect3DSurface9_LockRect(surface, &locked_rect, &rect, D3DLOCK_READONLY); + ok(hr == D3D_OK, "Failed to lock surface, hr %#x.\n", hr); - hr = IDirect3DDevice9_EndScene(device); - ok(hr == D3D_OK, "IDirect3DDevice9_EndScene returned: %08x\n", hr); + ret = ((struct vec4 *)locked_rect.pBits)[0]; + + IDirect3DSurface9_UnlockRect(surface); + + IDirect3DSurface9_Release(target); + IDirect3DSurface9_Release(surface); + return ret; } -static void setup_device9(IDirect3DDevice9 *device, IDirect3DSurface9 **render_target, - IDirect3DSurface9 **readback, D3DFORMAT format, unsigned int width, unsigned int height, - IDirect3DVertexShader9 *vshader, IDirect3DPixelShader9 *pshader) +#define set_float_d3d9(a, b, c, d) set_float_d3d9_(__LINE__, a, b, c, d) +static void set_float_d3d9_(unsigned int line, IDirect3DDevice9 *device, ID3D10Blob *blob, const char *name, float f) { + ID3DXConstantTable *constants; HRESULT hr; - hr = IDirect3DDevice9_CreateRenderTarget(device, width, height, format, - D3DMULTISAMPLE_NONE, 0, FALSE, render_target, NULL); - ok(hr == D3D_OK, "IDirect3DDevice9_CreateRenderTarget returned: %08x\n", hr); - - /* The Direct3D 9 docs state that we cannot lock a render target surface, - instead we must copy the render target onto this surface to lock it */ - hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, width, height, format, - D3DPOOL_SYSTEMMEM, readback, NULL); - ok(hr == D3D_OK, "IDirect3DDevice9_CreateOffscreenPlainSurface returned: %08x\n", hr); - - hr = IDirect3DDevice9_SetRenderTarget(device, 0, *render_target); - ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderTarget returned: %08x\n", hr); - - hr = IDirect3DDevice9_SetVertexShader(device, vshader); - ok(hr == D3D_OK, "IDirect3DDevice9_SetVertexShader returned: %08x\n", hr); - hr = IDirect3DDevice9_SetPixelShader(device, pshader); - ok(hr == D3D_OK, "IDirect3DDevice9_SetPixelShader returned: %08x\n", hr); + + hr = pD3DXGetShaderConstantTable(ID3D10Blob_GetBufferPointer(blob), &constants); + ok_(__FILE__, line)(hr == D3D_OK, "Failed to get constant table, hr %#x.\n", hr); + + hr = ID3DXConstantTable_SetFloat(constants, device, name, f); + ok_(__FILE__, line)(hr == D3D_OK, "Failed to set constant, hr %#x.\n", hr); + + ID3DXConstantTable_Release(constants); } -static BOOL colors_match(D3DXCOLOR a, D3DXCOLOR b, float epsilon) +#define set_float4_d3d9(a, b, c, d, e, f, g) set_float4_d3d9_(__LINE__, a, b, c, d, e, f, g) +static void set_float4_d3d9_(unsigned int line, IDirect3DDevice9 *device, ID3D10Blob *blob, + const char *name, float x, float y, float z, float w) { - return (fabs(a.r - b.r) < epsilon && fabs(a.g - b.g) < epsilon && fabs(a.b - b.b) < epsilon && - fabs(a.a - b.a) < epsilon); + ID3DXConstantTable *constants; + D3DXVECTOR4 v = {x, y, z, w}; + HRESULT hr; + + hr = pD3DXGetShaderConstantTable(ID3D10Blob_GetBufferPointer(blob), &constants); + ok_(__FILE__, line)(hr == D3D_OK, "Failed to get constant table, hr %#x.\n", hr); + + hr = ID3DXConstantTable_SetVector(constants, device, name, &v); + ok_(__FILE__, line)(hr == D3D_OK, "Failed to set constant, hr %#x.\n", hr); + + ID3DXConstantTable_Release(constants); } -/* Compute a shader on a width by height buffer and probes certain locations - to see if they are as expected. */ -static void compute_shader_probe9(IDirect3DDevice9 *device, IDirect3DVertexShader9 *vshader, - IDirect3DPixelShader9 *pshader, IDirect3DVertexBuffer9 *quad_geometry, - const struct hlsl_probe_info *probes, unsigned int count, - unsigned int width, unsigned int height, unsigned int line_number) +static BOOL compare_float(float f, float g, unsigned int ulps) { - IDirect3DSurface9 *render_target; - IDirect3DSurface9 *readback; + int x = *(int *)&f; + int y = *(int *)&g; - HRESULT hr; - D3DLOCKED_RECT lr; - D3DXCOLOR *pbits_data; - unsigned int i; + if (x < 0) + x = INT_MIN - x; + if (y < 0) + y = INT_MIN - y; - setup_device9(device, &render_target, &readback, D3DFMT_A32B32G32R32F, - width, height, vshader, pshader); - - /* Draw the quad with the shader and read back the data */ - draw_quad_with_shader9(device, quad_geometry); - IDirect3DDevice9_GetRenderTargetData(device, render_target, readback); - hr = IDirect3DSurface9_LockRect(readback, &lr, NULL, D3DLOCK_READONLY); - ok(hr == D3D_OK, "IDirect3DSurface9_LockRect returned: %08x\n", hr); - pbits_data = lr.pBits; - - /* Now go through the probes and check each one */ - for (i = 0; i < count; i++, probes++) { - int index = probes->x + (probes->y * lr.Pitch / sizeof(D3DXCOLOR)); - ok(colors_match(probes->c, pbits_data[index], probes->epsilon), - "Line %d: At (%d, %d): %s: Expected (%.04f,%.04f,%.04f, %.04f), got " - "(%.04f,%.04f,%.04f,%.04f)\n", line_number, probes->x, probes->y, probes->message, - probes->c.r, probes->c.g, probes->c.b, probes->c.a, pbits_data[index].r, - pbits_data[index].g, pbits_data[index].b, pbits_data[index].a); - } + if (abs(x - y) > ulps) + return FALSE; - hr = IDirect3DSurface9_UnlockRect(readback); - ok(hr == D3D_OK, "IDirect3DSurface9_UnlockRect returned: %08x\n", hr); + return TRUE; +} + +static BOOL compare_vec4(const struct vec4 *vec, float x, float y, float z, float w, unsigned int ulps) +{ + return compare_float(vec->x, x, ulps) + && compare_float(vec->y, y, ulps) + && compare_float(vec->z, z, ulps) + && compare_float(vec->w, w, ulps); +} - /* We now present the scene. This is mostly for debugging purposes, since GetRenderTargetData - also waits for drawing commands to complete. The reason this call is here and not in a - draw function is because the contents of the render target surface are invalidated after - this call. */ - hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); - ok(hr == D3D_OK, "IDirect3DDevice9_Present returned: %08x\n", hr); +static HWND create_window(void) +{ + WNDCLASSA wc = {0}; + wc.lpfnWndProc = DefWindowProcA; + wc.lpszClassName = "d3d9_test_wc"; + RegisterClassA(&wc); - IDirect3DSurface9_Release(render_target); - IDirect3DSurface9_Release(readback); + return CreateWindowA("d3d9_test_wc", "d3d9_test", 0, 0, 0, 0, 0, 0, 0, 0, 0); } -/* Now the actual test functions */ -static void test_swizzle(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 *quad_geometry, - IDirect3DVertexShader9 *vshader_passthru) +static void test_swizzle(void) { - static const struct hlsl_probe_info probes[] = - { - {0, 0, {0.0101f, 0.0303f, 0.0202f, 0.0404f}, 0.0001f, "swizzle_test"} - }; + IDirect3DDevice9 *device; + ID3D10Blob *ps_code; + struct vec4 v; + HWND window; - static const char *swizzle_test_shader = + static const char ps_source[] = "uniform float4 color;\n" - "float4 test(): COLOR\n" + "float4 main() : COLOR\n" "{\n" " float4 ret = color;\n" " ret.gb = ret.ra;\n" @@ -316,36 +292,40 @@ static void test_swizzle(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 *quad_ " return ret;\n" "}"; - ID3DXConstantTable *constants; - IDirect3DPixelShader9 *pshader; + window = create_window(); + ok(!!window, "Failed to create a window.\n"); - pshader = compile_pixel_shader9(device, swizzle_test_shader, "ps_2_0", &constants); - if (pshader != NULL) + if (!(device = create_d3d9_device(window))) { - set_float4_d3d9(device, constants, "color", 0.0303f, 0.0f, 0.0f, 0.0202f); + DestroyWindow(window); + return; + } + + todo_wine ps_code = compile_shader(ps_source, "ps_2_0"); + if (ps_code) + { + set_float4_d3d9(device, ps_code, "color", 0.0303f, 0.0f, 0.0f, 0.0202f); + draw_quad(device, ps_code); - compute_shader_probe9(device, vshader_passthru, pshader, quad_geometry, - probes, ARRAY_SIZE(probes), 1, 1, __LINE__); + v = get_readback_vec4_d3d9(device, 0, 0); + ok(compare_vec4(&v, 0.0101f, 0.0303f, 0.0202f, 0.0404f, 0), + "Got unexpected value {%.8e, %.8e, %.8e, %.8e}.\n", v.x, v.y, v.z, v.w); - ID3DXConstantTable_Release(constants); - IDirect3DPixelShader9_Release(pshader); + ID3D10Blob_Release(ps_code); } + IDirect3DDevice9_Release(device); + DestroyWindow(window); } -static void test_math(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 *quad_geometry, - IDirect3DVertexShader9 *vshader_passthru) +static void test_math(void) { - /* Tests order of operations */ - static const float u = 2.5f, v = 0.3f, w = 0.2f, x = 0.7f, y = 0.1f, z = 1.5f; - - static const struct hlsl_probe_info probes[] = - { - {0, 0, {-12.4300f, 9.8333f, 1.6000f, 34.9999f}, 0.0001f, - "order of operations test"} - }; + IDirect3DDevice9 *device; + ID3D10Blob *ps_code; + struct vec4 v; + HWND window; - static const char *order_of_operations_shader = - "float4 test(uniform float u, uniform float v, uniform float w, uniform float x,\n" + static const char ps_source[] = + "float4 main(uniform float u, uniform float v, uniform float w, uniform float x,\n" " uniform float y, uniform float z): COLOR\n" "{\n" " return float4(x * y - z / w + --u / -v,\n" @@ -354,101 +334,127 @@ static void test_math(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 *quad_geo " x / y / w);\n" "}"; - ID3DXConstantTable *constants; - IDirect3DPixelShader9 *pshader; + window = create_window(); + ok(!!window, "Failed to create a window.\n"); - pshader = compile_pixel_shader9(device, order_of_operations_shader, "ps_2_0", &constants); - if (pshader != NULL) + if (!(device = create_d3d9_device(window))) { - ID3DXConstantTable_SetFloat(constants, device, "$u", u); - ID3DXConstantTable_SetFloat(constants, device, "$v", v); - ID3DXConstantTable_SetFloat(constants, device, "$w", w); - ID3DXConstantTable_SetFloat(constants, device, "$x", x); - ID3DXConstantTable_SetFloat(constants, device, "$y", y); - ID3DXConstantTable_SetFloat(constants, device, "$z", z); - - compute_shader_probe9(device, vshader_passthru, pshader, quad_geometry, - probes, ARRAY_SIZE(probes), 1, 1, __LINE__); + DestroyWindow(window); + return; + } - ID3DXConstantTable_Release(constants); - IDirect3DPixelShader9_Release(pshader); + todo_wine ps_code = compile_shader(ps_source, "ps_2_0"); + if (ps_code) + { + set_float_d3d9(device, ps_code, "$u", 2.5f); + set_float_d3d9(device, ps_code, "$v", 0.3f); + set_float_d3d9(device, ps_code, "$w", 0.2f); + set_float_d3d9(device, ps_code, "$x", 0.7f); + set_float_d3d9(device, ps_code, "$y", 0.1f); + set_float_d3d9(device, ps_code, "$z", 1.5f); + draw_quad(device, ps_code); + + v = get_readback_vec4_d3d9(device, 0, 0); + ok(compare_vec4(&v, -12.43f, 9.833333f, 1.6f, 35.0f, 1), + "Got unexpected value {%.8e, %.8e, %.8e, %.8e}.\n", v.x, v.y, v.z, v.w); + + ID3D10Blob_Release(ps_code); } + IDirect3DDevice9_Release(device); + DestroyWindow(window); } -static void test_conditionals(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 *quad_geometry, - IDirect3DVertexShader9 *vshader_passthru) +static void test_conditionals(void) { - static const struct hlsl_probe_info if_greater_probes[] = - { - { 0, 0, {0.9f, 0.8f, 0.7f, 0.6f}, 0.0001f, "if greater test"}, - { 5, 0, {0.9f, 0.8f, 0.7f, 0.6f}, 0.0001f, "if greater test"}, - {10, 0, {0.9f, 0.8f, 0.7f, 0.6f}, 0.0001f, "if greater test"}, - {15, 0, {0.9f, 0.8f, 0.7f, 0.6f}, 0.0001f, "if greater test"}, - {25, 0, {0.1f, 0.2f, 0.3f, 0.4f}, 0.0001f, "if greater test"}, - {30, 0, {0.1f, 0.2f, 0.3f, 0.4f}, 0.0001f, "if greater test"} - }; + IDirect3DDevice9 *device; + ID3D10Blob *ps_code; + unsigned int i; + struct vec4 v; + HWND window; - static const char *if_greater_shader = - "float4 test(float2 pos: TEXCOORD0): COLOR\n" + static const char ps_if_source[] = + "float4 main(float2 pos : TEXCOORD0) : COLOR\n" "{\n" - " if((pos.x * 32.0) > 20.0)\n" + " if((pos.x * 640.0) > 200.0)\n" " return float4(0.1, 0.2, 0.3, 0.4);\n" " else\n" " return float4(0.9, 0.8, 0.7, 0.6);\n" "}"; - static const struct hlsl_probe_info ternary_operator_probes[] = - { - {0, 0, {0.50f, 0.25f, 0.50f, 0.75f}, 0.00001f, "ternary operator test"}, - {1, 0, {0.50f, 0.25f, 0.50f, 0.75f}, 0.00001f, "ternary operator test"}, - {2, 0, {0.50f, 0.25f, 0.50f, 0.75f}, 0.00001f, "ternary operator test"}, - {3, 0, {0.50f, 0.25f, 0.50f, 0.75f}, 0.00001f, "ternary operator test"}, - {4, 0, {0.60f, 0.80f, 0.10f, 0.20f}, 0.00001f, "ternary operator test"}, - {5, 0, {0.60f, 0.80f, 0.10f, 0.20f}, 0.00001f, "ternary operator test"}, - {6, 0, {0.60f, 0.80f, 0.10f, 0.20f}, 0.00001f, "ternary operator test"}, - {7, 0, {0.60f, 0.80f, 0.10f, 0.20f}, 0.00001f, "ternary operator test"} - }; - - static const char *ternary_operator_shader = - "float4 test(float2 pos: TEXCOORD0): COLOR\n" + static const char ps_ternary_source[] = + "float4 main(float2 pos : TEXCOORD0) : COLOR\n" "{\n" " return (pos.x < 0.5?float4(0.5, 0.25, 0.5, 0.75):float4(0.6, 0.8, 0.1, 0.2));\n" "}"; - ID3DXConstantTable *constants; - IDirect3DPixelShader9 *pshader; + window = create_window(); + ok(!!window, "Failed to create a window.\n"); + + if (!(device = create_d3d9_device(window))) + { + DestroyWindow(window); + return; + } - pshader = compile_pixel_shader9(device, if_greater_shader, "ps_2_0", &constants); - if (pshader != NULL) + todo_wine ps_code = compile_shader(ps_if_source, "ps_2_0"); + if (ps_code) { - compute_shader_probe9(device, vshader_passthru, pshader, quad_geometry, if_greater_probes, - ARRAY_SIZE(if_greater_probes), 32, 1, __LINE__); + draw_quad(device, ps_code); - ID3DXConstantTable_Release(constants); - IDirect3DPixelShader9_Release(pshader); + for (i = 0; i < 200; i += 40) + { + v = get_readback_vec4_d3d9(device, i, 0); + ok(compare_vec4(&v, 0.9f, 0.8f, 0.7f, 0.6f, 0), + "Got unexpected value {%.8e, %.8e, %.8e, %.8e}.\n", v.x, v.y, v.z, v.w); + } + + for (i = 240; i < 640; i += 40) + { + v = get_readback_vec4_d3d9(device, i, 0); + ok(compare_vec4(&v, 0.1f, 0.2f, 0.3f, 0.4f, 0), + "Got unexpected value {%.8e, %.8e, %.8e, %.8e}.\n", v.x, v.y, v.z, v.w); + } + + ID3D10Blob_Release(ps_code); } - pshader = compile_pixel_shader9(device, ternary_operator_shader, "ps_2_0", &constants); - if (pshader != NULL) + todo_wine ps_code = compile_shader(ps_ternary_source, "ps_2_0"); + if (ps_code) { - compute_shader_probe9(device, vshader_passthru, pshader, quad_geometry, ternary_operator_probes, - ARRAY_SIZE(ternary_operator_probes), 8, 1, __LINE__); + draw_quad(device, ps_code); - ID3DXConstantTable_Release(constants); - IDirect3DPixelShader9_Release(pshader); + for (i = 0; i < 320; i += 40) + { + v = get_readback_vec4_d3d9(device, i, 0); + ok(compare_vec4(&v, 0.5f, 0.25f, 0.5f, 0.75f, 0), + "Got unexpected value {%.8e, %.8e, %.8e, %.8e}.\n", v.x, v.y, v.z, v.w); + } + + for (i = 360; i < 640; i += 40) + { + v = get_readback_vec4_d3d9(device, i, 0); + ok(compare_vec4(&v, 0.6f, 0.8f, 0.1f, 0.2f, 0), + "Got unexpected value {%.8e, %.8e, %.8e, %.8e}.\n", v.x, v.y, v.z, v.w); + } + + ID3D10Blob_Release(ps_code); } + + IDirect3DDevice9_Release(device); + DestroyWindow(window); } -static void test_float_vectors(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 *quad_geometry, - IDirect3DVertexShader9 *vshader_passthru) +static void test_float_vectors(void) { - static const struct hlsl_probe_info vec4_indexing_test1_probes[] = - { - {0, 0, {0.020f, 0.245f, 0.351f, 1.000f}, 0.0001f, "vec4 indexing test 1"} - }; + ID3DXConstantTable *constants; + IDirect3DDevice9 *device; + ID3D10Blob *ps_code; + struct vec4 v; + HWND window; + HRESULT hr; - static const char *vec4_indexing_test1_shader = - "float4 test(): COLOR\n" + static const char ps_indexing_source[] = + "float4 main() : COLOR\n" "{\n" " float4 color;\n" " color[0] = 0.020;\n" @@ -458,15 +464,10 @@ static void test_float_vectors(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 " return color;\n" "}"; - static const struct hlsl_probe_info vec4_indexing_test2_probes[] = - { - {0, 0, {0.5f, 0.3f, 0.8f, 0.2f}, 0.0001f, "vec4 indexing test 2"} - }; - - /* We have this uniform i here so the compiler can't optimize */ - static const char *vec4_indexing_test2_shader = + /* A uniform index is used so that the compiler can't optimize. */ + static const char ps_uniform_indexing_source[] = "uniform int i;\n" - "float4 test(): COLOR\n" + "float4 main() : COLOR\n" "{\n" " float4 color = float4(0.5, 0.4, 0.3, 0.2);\n" " color.g = color[i];\n" @@ -474,73 +475,58 @@ static void test_float_vectors(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 " return color;\n" "}"; - ID3DXConstantTable *constants; - IDirect3DPixelShader9 *pshader; + window = create_window(); + ok(!!window, "Failed to create a window.\n"); - pshader = compile_pixel_shader9(device, vec4_indexing_test1_shader, "ps_2_0", &constants); - if (pshader != NULL) + if (!(device = create_d3d9_device(window))) { - compute_shader_probe9(device, vshader_passthru, pshader, quad_geometry, vec4_indexing_test1_probes, - ARRAY_SIZE(vec4_indexing_test1_probes), 1, 1, __LINE__); - - ID3DXConstantTable_Release(constants); - IDirect3DPixelShader9_Release(pshader); + DestroyWindow(window); + return; } - pshader = compile_pixel_shader9(device, vec4_indexing_test2_shader, "ps_2_0", &constants); - if (pshader != NULL) + todo_wine ps_code = compile_shader(ps_indexing_source, "ps_2_0"); + if (ps_code) { - ID3DXConstantTable_SetInt(constants, device, "i", 2); + draw_quad(device, ps_code); + + v = get_readback_vec4_d3d9(device, 0, 0); + ok(compare_vec4(&v, 0.02f, 0.245f, 0.351f, 1.0f, 0), + "Got unexpected value {%.8e, %.8e, %.8e, %.8e}.\n", v.x, v.y, v.z, v.w); - compute_shader_probe9(device, vshader_passthru, pshader, quad_geometry, vec4_indexing_test2_probes, - ARRAY_SIZE(vec4_indexing_test2_probes), 32, 1, __LINE__); + ID3D10Blob_Release(ps_code); + } + todo_wine ps_code = compile_shader(ps_uniform_indexing_source, "ps_2_0"); + if (ps_code) + { + hr = pD3DXGetShaderConstantTable(ID3D10Blob_GetBufferPointer(ps_code), &constants); + ok(hr == D3D_OK, "Failed to get constants, hr %#x.\n", hr); + hr = ID3DXConstantTable_SetInt(constants, device, "i", 2); + ok(hr == D3D_OK, "Failed to set constant, hr %#x.\n", hr); ID3DXConstantTable_Release(constants); - IDirect3DPixelShader9_Release(pshader); + draw_quad(device, ps_code); + + v = get_readback_vec4_d3d9(device, 0, 0); + ok(compare_vec4(&v, 0.5f, 0.3f, 0.8f, 0.2f, 0), + "Got unexpected value {%.8e, %.8e, %.8e, %.8e}.\n", v.x, v.y, v.z, v.w); + + ID3D10Blob_Release(ps_code); } + + IDirect3DDevice9_Release(device); + DestroyWindow(window); } -static void test_trig(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 *quad_geometry, - IDirect3DVertexShader9 *vshader_passthru) +static void test_trig(void) { - static const struct hlsl_probe_info sincos_probes[] = - { - {0, 0, {0.5000f, 1.0000f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {1, 0, {0.5975f, 0.9904f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {2, 0, {0.6913f, 0.9620f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {3, 0, {0.7778f, 0.9160f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {4, 0, {0.8536f, 0.8536f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {5, 0, {0.9157f, 0.7778f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {6, 0, {0.9620f, 0.6913f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {7, 0, {0.9904f, 0.5975f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {8, 0, {1.0000f, 0.5000f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {9, 0, {0.9904f, 0.4025f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {10, 0, {0.9619f, 0.3087f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {11, 0, {0.9157f, 0.2222f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {12, 0, {0.8536f, 0.1464f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {13, 0, {0.7778f, 0.0843f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {14, 0, {0.6913f, 0.0381f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {15, 0, {0.5975f, 0.0096f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {16, 0, {0.5000f, 0.0000f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {17, 0, {0.4025f, 0.0096f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {18, 0, {0.3087f, 0.0381f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {19, 0, {0.2222f, 0.0843f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {20, 0, {0.1464f, 0.1464f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {21, 0, {0.0843f, 0.2222f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {22, 0, {0.0381f, 0.3087f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {23, 0, {0.0096f, 0.4025f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {24, 0, {0.0000f, 0.5000f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {25, 0, {0.0096f, 0.5975f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {26, 0, {0.0381f, 0.6913f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {27, 0, {0.0843f, 0.7778f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {28, 0, {0.1464f, 0.8536f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {29, 0, {0.2222f, 0.9157f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {30, 0, {0.3087f, 0.9619f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {31, 0, {0.4025f, 0.9904f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - }; + IDirect3DDevice9 *device; + ID3D10Blob *ps_code; + unsigned int i; + struct vec4 v; + HWND window; - static const char *sincos_shader = - "float4 test(float x: TEXCOORD0): COLOR\n" + static const char ps_source[] = + "float4 main(float x : TEXCOORD0) : COLOR\n" "{\n" " const float pi2 = 6.2831853;\n" " float calcd_sin = (sin(x * pi2) + 1)/2;\n" @@ -548,22 +534,37 @@ static void test_trig(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 *quad_geo " return float4(calcd_sin, calcd_cos, 0, 0);\n" "}"; - ID3DXConstantTable *constants; - IDirect3DPixelShader9 *pshader; + window = create_window(); + ok(!!window, "Failed to create a window.\n"); + + if (!(device = create_d3d9_device(window))) + { + DestroyWindow(window); + return; + } - pshader = compile_pixel_shader9(device, sincos_shader, "ps_2_0", &constants); - if (pshader != NULL) + todo_wine ps_code = compile_shader(ps_source, "ps_2_0"); + if (ps_code) { - compute_shader_probe9(device, vshader_passthru, pshader, quad_geometry, sincos_probes, - ARRAY_SIZE(sincos_probes), 32, 1, __LINE__); + draw_quad(device, ps_code); - ID3DXConstantTable_Release(constants); - IDirect3DPixelShader9_Release(pshader); + for (i = 0; i < 32; ++i) + { + float expect_x = (sinf(i * 2 * M_PI / 32) + 1.0f) / 2.0f; + float expect_y = (cosf(i * 2 * M_PI / 32) + 1.0f) / 2.0f; + v = get_readback_vec4_d3d9(device, i * 640 / 32, 0); + ok(compare_vec4(&v, expect_x, expect_y, 0.0f, 0.0f, 4096), + "Test %u: Got {%.8e, %.8e, %.8e, %.8e}, expected {%.8e, %.8e, %.8e, %.8e}.\n", + i, v.x, v.y, v.z, v.w, expect_x, expect_y, 0.0f, 0.0f); + } + + ID3D10Blob_Release(ps_code); } + IDirect3DDevice9_Release(device); + DestroyWindow(window); } -static void test_fail(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 *qquad_geometry, - IDirect3DVertexShader9 *vshader_passthru) +static void test_fail(void) { static const char *tests[] = { @@ -619,10 +620,11 @@ static void test_fail(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 *qquad_ge { compiled = errors = NULL; hr = ppD3DCompile(tests[i], strlen(tests[i]), NULL, NULL, NULL, "test", "ps_2_0", 0, 0, &compiled, &errors); - ok(hr == E_FAIL, "Test %u, got unexpected hr %#x.\n", i, hr); - ok(!!errors, "Test %u, expected non-NULL error blob.\n", i); + todo_wine ok(hr == E_FAIL, "Test %u, got unexpected hr %#x.\n", i, hr); + todo_wine_if (i == 1) ok(!!errors, "Test %u, expected non-NULL error blob.\n", i); ok(!compiled, "Test %u, expected no compiled shader blob.\n", i); - ID3D10Blob_Release(errors); + if (errors) + ID3D10Blob_Release(errors); } } @@ -642,12 +644,6 @@ static BOOL load_d3dcompiler(void) START_TEST(hlsl) { - D3DCAPS9 caps; - ULONG refcount; - IDirect3DDevice9 *device; - IDirect3DVertexDeclaration9 *vdeclaration; - IDirect3DVertexBuffer9 *quad_geometry; - IDirect3DVertexShader9 *vshader_passthru; HMODULE mod; if (!load_d3dcompiler()) @@ -662,40 +658,11 @@ START_TEST(hlsl) return; } pD3DXGetShaderConstantTable = (void *)GetProcAddress(mod, "D3DXGetShaderConstantTable"); - pD3DXMatrixOrthoLH = (void *)GetProcAddress(mod, "D3DXMatrixOrthoLH"); - - device = init_d3d9(&vdeclaration, &quad_geometry, &vshader_passthru); - if (!device) return; - - /* Make sure we support pixel shaders, before trying to compile them! */ - /* Direct3D 9 (Shader model 1-3 tests) */ - IDirect3DDevice9_GetDeviceCaps(device, &caps); - if (caps.PixelShaderVersion >= D3DPS_VERSION(2, 0)) - { - todo_wine - { - test_swizzle(device, quad_geometry, vshader_passthru); - test_math(device, quad_geometry, vshader_passthru); - test_conditionals(device, quad_geometry, vshader_passthru); - test_float_vectors(device, quad_geometry, vshader_passthru); - test_trig(device, quad_geometry, vshader_passthru); - test_fail(device, quad_geometry, vshader_passthru); - } - } else skip("no pixel shader support\n"); - - /* Reference counting sanity checks */ - if (vshader_passthru) - { - refcount = IDirect3DVertexShader9_Release(vshader_passthru); - ok(!refcount, "Pass-through vertex shader has %u references left\n", refcount); - } - - refcount = IDirect3DVertexBuffer9_Release(quad_geometry); - ok(!refcount, "Vertex buffer has %u references left\n", refcount); - - refcount = IDirect3DVertexDeclaration9_Release(vdeclaration); - ok(!refcount, "Vertex declaration has %u references left\n", refcount); - refcount = IDirect3DDevice9_Release(device); - ok(!refcount, "Device has %u references left\n", refcount); + test_swizzle(); + test_math(); + test_conditionals(); + test_float_vectors(); + test_trig(); + test_fail(); } -- 2.25.0

3 10

[PATCH v2 2/2] shell32: Make SHChangeNotify() dwItenN checks stricter
by Serge Gautherie 27 Feb '20

27 Feb '20

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- dlls/shell32/changenotify.c | 43 ++++++++++++++++++++++++++++++------------- 1 file changed, 30 insertions(+), 13 deletions(-) diff --git a/dlls/shell32/changenotify.c b/dlls/shell32/changenotify.c index 6c77a6c..6959fb7 100644 --- a/dlls/shell32/changenotify.c +++ b/dlls/shell32/changenotify.c @@ -280,31 +280,47 @@ void WINAPI SHChangeNotify(LONG wEventId, UINT uFlags, LPCVOID dwItem1, LPCVOID if(uFlags & ~(SHCNF_TYPE|SHCNF_FLUSH)) FIXME("ignoring unsupported flags: %x\n", uFlags); - if( ( wEventId & SHCNE_NOITEMEVENTS ) && ( dwItem1 || dwItem2 ) ) + /* FIXME: Either set to NULL or return, not both */ + if ((wEventId & SHCNE_NOITEMEVENTS) && (dwItem1 || dwItem2)) { - TRACE("dwItem1 and dwItem2 are not zero, but should be\n"); - dwItem1 = 0; - dwItem2 = 0; + WARN("dwItem1 and/or dwItem2 are not NULL\n"); + dwItem1 = NULL; + dwItem2 = NULL; return; } - else if( ( wEventId & SHCNE_ONEITEMEVENTS ) && dwItem2 ) + else if ((wEventId & SHCNE_ONEITEMEVENTS) && (!dwItem1 || dwItem2)) { - TRACE("dwItem2 is not zero, but should be\n"); - dwItem2 = 0; + WARN("dwItem1 is NULL and/or dwItem2 is not NULL\n"); + dwItem2 = NULL; + return; + } + else if ((wEventId & SHCNE_SECONDITEMEVENTS) && (dwItem1 || !dwItem2)) + { + WARN("dwItem1 is not NULL and/or dwItem2 is NULL\n"); + dwItem1 = NULL; + return; + } + else if (!dwItem1 || !dwItem2) + { + WARN("dwItem1 and/or dwItem2 are NULL\n"); return; } - if( ( ( wEventId & SHCNE_NOITEMEVENTS ) && - ( wEventId & ~SHCNE_NOITEMEVENTS ) ) || - ( ( wEventId & SHCNE_ONEITEMEVENTS ) && - ( wEventId & ~SHCNE_ONEITEMEVENTS ) ) || - ( ( wEventId & SHCNE_TWOITEMEVENTS ) && - ( wEventId & ~SHCNE_TWOITEMEVENTS ) ) ) + if (((wEventId & SHCNE_NOITEMEVENTS ) && (wEventId & ~SHCNE_NOITEMEVENTS )) || + ((wEventId & SHCNE_ONEITEMEVENTS ) && (wEventId & ~SHCNE_ONEITEMEVENTS )) || + ((wEventId & SHCNE_SECONDITEMEVENTS) && (wEventId & ~SHCNE_SECONDITEMEVENTS)) || + ((wEventId & SHCNE_TWOITEMEVENTS ) && (wEventId & ~SHCNE_TWOITEMEVENTS ))) { WARN("mutually incompatible events listed\n"); return; } + if ((wEventId & SHCNE_SECONDITEMEVENTS)) + { + FIXME("SHChangeNotify with (wEventId & SHCNE_SECONDITEMEVENTS)\n"); + return; + } + /* convert paths in IDLists*/ switch (uFlags & SHCNF_TYPE) { @@ -351,6 +367,7 @@ void WINAPI SHChangeNotify(LONG wEventId, UINT uFlags, LPCVOID dwItem1, LPCVOID notify = TRUE; else if( wEventId & ( SHCNE_ONEITEMEVENTS | SHCNE_TWOITEMEVENTS ) ) notify = should_notify( Pidls[0], pidl, subtree ); + /* FIXME: Following if() is masked by previous one */ else if( wEventId & SHCNE_TWOITEMEVENTS ) notify = should_notify( Pidls[1], pidl, subtree ); } -- 2.10.0.windows.1

2 2

[PATCH v2 1/2] shell32: Fix SHCNE_UPDATEIMAGE and SHCNE_UPDATEITEM number of items
by Serge Gautherie 27 Feb '20

27 Feb '20

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- Based on MS docs and ReactOS uses. --- dlls/shell32/changenotify.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/changenotify.c b/dlls/shell32/changenotify.c index 2efb297..6c77a6c 100644 --- a/dlls/shell32/changenotify.c +++ b/dlls/shell32/changenotify.c @@ -64,10 +64,13 @@ static LONG next_id; SHCNE_DRIVEADDGUI | SHCNE_DRIVEREMOVED | SHCNE_FREESPACE | \ SHCNE_MEDIAINSERTED | SHCNE_MEDIAREMOVED | SHCNE_MKDIR | \ SHCNE_NETSHARE | SHCNE_NETUNSHARE | SHCNE_RMDIR | \ - SHCNE_SERVERDISCONNECT | SHCNE_UPDATEDIR | SHCNE_UPDATEIMAGE ) + SHCNE_SERVERDISCONNECT | SHCNE_UPDATEDIR | SHCNE_UPDATEITEM ) + +#define SHCNE_SECONDITEMEVENTS ( \ + SHCNE_UPDATEIMAGE ) #define SHCNE_TWOITEMEVENTS ( \ - SHCNE_RENAMEFOLDER | SHCNE_RENAMEITEM | SHCNE_UPDATEITEM ) + SHCNE_RENAMEFOLDER | SHCNE_RENAMEITEM ) /* for dumping events */ static const char * DumpEvent( LONG event ) -- 2.10.0.windows.1

1 1

[PATCH resend 1/2] winex11.drv: Use a helper to retrieve the decoration rect for managed windows.
by Gabriel Ivăncescu 27 Feb '20

27 Feb '20

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- This simplifies the next patch and avoids duplicating code. dlls/winex11.drv/window.c | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 99e4094..5b35e03 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1153,18 +1153,15 @@ void make_window_embedded( struct x11drv_win_data *data ) /*********************************************************************** - * X11DRV_window_to_X_rect - * - * Convert a rect from client to X window coordinates + * get_decoration_rect */ -static void X11DRV_window_to_X_rect( struct x11drv_win_data *data, RECT *rect ) +static void get_decoration_rect( struct x11drv_win_data *data, RECT *rect ) { DWORD style, ex_style, style_mask = 0, ex_style_mask = 0; unsigned long decor; - RECT rc; + SetRectEmpty( rect ); if (!data->managed) return; - if (IsRectEmpty( rect )) return; style = GetWindowLongW( data->hwnd, GWL_STYLE ); ex_style = GetWindowLongW( data->hwnd, GWL_EXSTYLE ); @@ -1177,9 +1174,22 @@ static void X11DRV_window_to_X_rect( struct x11drv_win_data *data, RECT *rect ) ex_style_mask |= WS_EX_DLGMODALFRAME; } - SetRectEmpty( &rc ); - AdjustWindowRectEx( &rc, style & style_mask, FALSE, ex_style & ex_style_mask ); + AdjustWindowRectEx( rect, style & style_mask, FALSE, ex_style & ex_style_mask ); +} + + +/*********************************************************************** + * X11DRV_window_to_X_rect + * + * Convert a rect from client to X window coordinates + */ +static void X11DRV_window_to_X_rect( struct x11drv_win_data *data, RECT *rect ) +{ + RECT rc; + + if (IsRectEmpty( rect )) return; + get_decoration_rect( data, &rc ); rect->left -= rc.left; rect->right -= rc.right; rect->top -= rc.top; -- 2.21.0

1 1

WIndows WSL2 for Test Environment
by Thales 27 Feb '20

27 Feb '20

Hello! I've been looking into Window 10's WSL2 (Window Subsystem for Linux 2), which is an upgrade from WSL. It has its own Linux kernel with full system call compatibility. I believe the prior version was a reduced set. I watched a lecture on it, and was impressed with the way you can move from Linux to Windows instantaneously. It takes about one or two seconds for WSL2 to activate, and then you can transition between Windows and Linux OSs smooth as glass. I tried to determine what limits exist, and one I thing might be performance on the graphics level, but they say they are working to improve this with later versions. I thought I'd mention this as a possible test environment to work on Wine. I don't know if anyone here is using this set up, but it looks promising. I was going to install this, but learned it has compatibility issues with VirtualBox due to the hypervisor (I use VirtualBox for Linux). MS knows about this and said they are working with Oracle and other venders on this problem. Also, I was trying to find a way to install Linux on WSL2 to my non-system drive to save space, and that looked like a non-trivial issue. It's not in the default set up. Here is the talk I heard for those interested:The new Windows subsystem for Linux architecture: a deep dive - BRK3068 | | | | | | | | | | | The new Windows subsystem for Linux architecture: a deep dive - BRK3068 The WSL community has given amazing feedback on how we can improve through platforms like Twitter, Github, and U... | | | Regards,...John Alway

1 0

[PATCH] include: Fix SHCNF_FLUSHNOWAIT value.
by Serge Gautherie 27 Feb '20

27 Feb '20

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- include/shlobj.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/shlobj.h b/include/shlobj.h index d309446..aa3673f 100644 --- a/include/shlobj.h +++ b/include/shlobj.h @@ -1362,7 +1362,7 @@ typedef struct _SHChangeNotifyEntry #define SHCNF_PRINTERW 0x0006 #define SHCNF_TYPE 0x00FF #define SHCNF_FLUSH 0x1000 -#define SHCNF_FLUSHNOWAIT 0x3000 +#define SHCNF_FLUSHNOWAIT 0x2000 #define SHCNF_NOTIFYRECURSIVE 0x10000 #define SHCNF_PATH WINELIB_NAME_AW(SHCNF_PATH) -- 2.10.0.windows.1

2 2

[PATCH 2/2] comctl32/imagelist: Correctly handle alpha channel of 32bpp image.
by Ziqing Hui 27 Feb '20

27 Feb '20

For 32bpp image without alpha channel ("without alpha channel" means each pixel's alpha is set to zero) in imagelist, wine will set each pixel's alpha channel to 0xff. However, this is not how windows work. Windows will keep the alpha as 0. Previous wine test patch can indicate it. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/comctl32/imagelist.c | 24 ++++++++++-------------- dlls/comctl32/tests/imagelist.c | 14 ++++---------- 2 files changed, 14 insertions(+), 24 deletions(-)

1 0

[PATCH] shell32: Fix SHCNE_UPDATEITEM number of items.
by Serge Gautherie 27 Feb '20

27 Feb '20

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- dlls/shell32/changenotify.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/changenotify.c b/dlls/shell32/changenotify.c index 2efb297..a87913c 100644 --- a/dlls/shell32/changenotify.c +++ b/dlls/shell32/changenotify.c @@ -64,10 +64,11 @@ static LONG next_id; SHCNE_DRIVEADDGUI | SHCNE_DRIVEREMOVED | SHCNE_FREESPACE | \ SHCNE_MEDIAINSERTED | SHCNE_MEDIAREMOVED | SHCNE_MKDIR | \ SHCNE_NETSHARE | SHCNE_NETUNSHARE | SHCNE_RMDIR | \ - SHCNE_SERVERDISCONNECT | SHCNE_UPDATEDIR | SHCNE_UPDATEIMAGE ) + SHCNE_SERVERDISCONNECT | SHCNE_UPDATEDIR | SHCNE_UPDATEIMAGE | \ + SHCNE_UPDATEITEM ) #define SHCNE_TWOITEMEVENTS ( \ - SHCNE_RENAMEFOLDER | SHCNE_RENAMEITEM | SHCNE_UPDATEITEM ) + SHCNE_RENAMEFOLDER | SHCNE_RENAMEITEM ) /* for dumping events */ static const char * DumpEvent( LONG event ) -- 2.10.0.windows.1

1 0

[PATCH 6/6] makedep: Build builtin programs with ucrt.
by Jacek Caban 27 Feb '20

27 Feb '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- We could do the same for majority of DLLs. I'm changing only programs for now to let it stabilize first. It will probably need a clean build, because we don't rebuild object files when makedep/Makefile changes. tools/makedep.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-)

2 1

[PATCH 2/2] winegcc: Check more target components for platform string.
by Jacek Caban 27 Feb '20

27 Feb '20

Fixes parsing llvm style mingw target *-pc-windows-gnu. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- tools/winegcc/winegcc.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-)

1 0

[PATCH 1/2] winebuild: Check more target components for platform string.
by Jacek Caban 27 Feb '20

27 Feb '20

Fixes parsing llvm style mingw target *-pc-windows-gnu. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- tools/winebuild/main.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-)

1 0

[PATCH v2 1/5] d3dx9: Implement ID3DXFont_PreloadGlyphs.
by Sven Baars 27 Feb '20

27 Feb '20

Based on a patch by Tony Wasserka. Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> --- v2: Matteo's changes + a fix for the compiler warning. dlls/d3dx9_36/font.c | 288 ++++++++++++++++++++++++++++++++----- dlls/d3dx9_36/tests/core.c | 5 +- 2 files changed, 253 insertions(+), 40 deletions(-) diff --git a/dlls/d3dx9_36/font.c b/dlls/d3dx9_36/font.c index cb09af22f5..b5481785a0 100644 --- a/dlls/d3dx9_36/font.c +++ b/dlls/d3dx9_36/font.c @@ -22,6 +22,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3dx); +struct d3dx_glyph +{ + unsigned int id; + RECT black_box; + POINT cell_inc; + IDirect3DTexture9 *texture; + + struct wine_rb_entry entry; +}; + struct d3dx_font { ID3DXFont ID3DXFont_iface; @@ -29,11 +39,34 @@ struct d3dx_font IDirect3DDevice9 *device; D3DXFONT_DESCW desc; + TEXTMETRICW metrics; HDC hdc; HFONT hfont; + + struct wine_rb_tree glyph_tree; + + IDirect3DTexture9 **textures; + unsigned int texture_count, texture_pos; + + unsigned int texture_size, glyph_size, glyphs_per_texture; }; +static int glyph_rb_compare(const void *key, const struct wine_rb_entry *entry) +{ + struct d3dx_glyph *glyph = WINE_RB_ENTRY_VALUE(entry, struct d3dx_glyph, entry); + unsigned int id = (UINT_PTR)key; + + return id - glyph->id; +} + +static void glyph_rb_free(struct wine_rb_entry *entry, void *context) +{ + struct d3dx_glyph *glyph = WINE_RB_ENTRY_VALUE(entry, struct d3dx_glyph, entry); + + heap_free(glyph); +} + static inline struct d3dx_font *impl_from_ID3DXFont(ID3DXFont *iface) { return CONTAINING_RECORD(iface, struct d3dx_font, ID3DXFont_iface); @@ -59,85 +92,95 @@ static HRESULT WINAPI ID3DXFontImpl_QueryInterface(ID3DXFont *iface, REFIID riid static ULONG WINAPI ID3DXFontImpl_AddRef(ID3DXFont *iface) { - struct d3dx_font *This = impl_from_ID3DXFont(iface); - ULONG ref=InterlockedIncrement(&This->ref); + struct d3dx_font *font = impl_from_ID3DXFont(iface); + ULONG ref = InterlockedIncrement(&font->ref); + TRACE("%p increasing refcount to %u\n", iface, ref); return ref; } static ULONG WINAPI ID3DXFontImpl_Release(ID3DXFont *iface) { - struct d3dx_font *This = impl_from_ID3DXFont(iface); - ULONG ref=InterlockedDecrement(&This->ref); + struct d3dx_font *font = impl_from_ID3DXFont(iface); + ULONG ref = InterlockedDecrement(&font->ref); + unsigned int i; TRACE("%p decreasing refcount to %u\n", iface, ref); - if(ref==0) { - DeleteObject(This->hfont); - DeleteDC(This->hdc); - IDirect3DDevice9_Release(This->device); - HeapFree(GetProcessHeap(), 0, This); + if (!ref) + { + for (i = 0; i < font->texture_count; ++i) + IDirect3DTexture9_Release(font->textures[i]); + + heap_free(font->textures); + + wine_rb_destroy(&font->glyph_tree, glyph_rb_free, NULL); + + DeleteObject(font->hfont); + DeleteDC(font->hdc); + IDirect3DDevice9_Release(font->device); + heap_free(font); } return ref; } static HRESULT WINAPI ID3DXFontImpl_GetDevice(ID3DXFont *iface, IDirect3DDevice9 **device) { - struct d3dx_font *This = impl_from_ID3DXFont(iface); + struct d3dx_font *font = impl_from_ID3DXFont(iface); TRACE("iface %p, device %p\n", iface, device); if( !device ) return D3DERR_INVALIDCALL; - *device = This->device; - IDirect3DDevice9_AddRef(This->device); + *device = font->device; + IDirect3DDevice9_AddRef(font->device); return D3D_OK; } static HRESULT WINAPI ID3DXFontImpl_GetDescA(ID3DXFont *iface, D3DXFONT_DESCA *desc) { - struct d3dx_font *This = impl_from_ID3DXFont(iface); + struct d3dx_font *font = impl_from_ID3DXFont(iface); TRACE("iface %p, desc %p\n", iface, desc); if( !desc ) return D3DERR_INVALIDCALL; - memcpy(desc, &This->desc, FIELD_OFFSET(D3DXFONT_DESCA, FaceName)); - WideCharToMultiByte(CP_ACP, 0, This->desc.FaceName, -1, desc->FaceName, ARRAY_SIZE(desc->FaceName), NULL, NULL); + memcpy(desc, &font->desc, FIELD_OFFSET(D3DXFONT_DESCA, FaceName)); + WideCharToMultiByte(CP_ACP, 0, font->desc.FaceName, -1, desc->FaceName, ARRAY_SIZE(desc->FaceName), NULL, NULL); return D3D_OK; } static HRESULT WINAPI ID3DXFontImpl_GetDescW(ID3DXFont *iface, D3DXFONT_DESCW *desc) { - struct d3dx_font *This = impl_from_ID3DXFont(iface); + struct d3dx_font *font = impl_from_ID3DXFont(iface); TRACE("iface %p, desc %p\n", iface, desc); if( !desc ) return D3DERR_INVALIDCALL; - *desc = This->desc; + *desc = font->desc; return D3D_OK; } static BOOL WINAPI ID3DXFontImpl_GetTextMetricsA(ID3DXFont *iface, TEXTMETRICA *metrics) { - struct d3dx_font *This = impl_from_ID3DXFont(iface); + struct d3dx_font *font = impl_from_ID3DXFont(iface); TRACE("iface %p, metrics %p\n", iface, metrics); - return GetTextMetricsA(This->hdc, metrics); + return GetTextMetricsA(font->hdc, metrics); } static BOOL WINAPI ID3DXFontImpl_GetTextMetricsW(ID3DXFont *iface, TEXTMETRICW *metrics) { - struct d3dx_font *This = impl_from_ID3DXFont(iface); + struct d3dx_font *font = impl_from_ID3DXFont(iface); TRACE("iface %p, metrics %p\n", iface, metrics); - return GetTextMetricsW(This->hdc, metrics); + return GetTextMetricsW(font->hdc, metrics); } static HDC WINAPI ID3DXFontImpl_GetDC(ID3DXFont *iface) { - struct d3dx_font *This = impl_from_ID3DXFont(iface); + struct d3dx_font *font = impl_from_ID3DXFont(iface); TRACE("iface %p\n", iface); - return This->hdc; + return font->hdc; } static HRESULT WINAPI ID3DXFontImpl_GetGlyphData(ID3DXFont *iface, UINT glyph, @@ -154,10 +197,156 @@ static HRESULT WINAPI ID3DXFontImpl_PreloadCharacters(ID3DXFont *iface, UINT fir return S_OK; } +static uint32_t morton_decode(uint32_t x) +{ + x &= 0x55555555; + x = (x ^ (x >> 1)) & 0x33333333; + x = (x ^ (x >> 2)) & 0x0f0f0f0f; + x = (x ^ (x >> 4)) & 0x00ff00ff; + x = (x ^ (x >> 8)) & 0x0000ffff; + return x; +} + +/* The glyphs are stored in a grid. Cell sizes vary between different font + * sizes. + * + * The grid is filled in Morton order: + * 1 2 5 6 17 18 21 22 + * 3 4 7 8 19 20 23 24 + * 9 10 13 14 25 26 29 30 + * 11 12 15 16 27 28 31 32 + * 33 34 ... + * ... + * + * i.e. we try to fill one small square, then three equal-sized squares so + * that we get one big square, etc. + * + * The glyphs are positioned around their baseline, which is located at y + * position glyph_size * i + tmAscent. Concerning the x position, the glyphs + * are centered around glyph_size * (i + 0.5). */ static HRESULT WINAPI ID3DXFontImpl_PreloadGlyphs(ID3DXFont *iface, UINT first, UINT last) { - FIXME("iface %p, first %u, last %u stub!\n", iface, first, last); - return E_NOTIMPL; + static const MAT2 mat = { {0,1}, {0,0}, {0,0}, {0,1} }; + struct d3dx_font *font = impl_from_ID3DXFont(iface); + IDirect3DTexture9 *current_texture = NULL; + unsigned int size, stride, glyph, x, y; + struct d3dx_glyph *current_glyph; + D3DLOCKED_RECT lockrect; + GLYPHMETRICS metrics; + BOOL mapped = FALSE; + DWORD *pixel_data; + BYTE *buffer; + HRESULT hr; + + TRACE("iface %p, first %u, last %u\n", iface, first, last); + + if (last < first) + return D3D_OK; + + if (font->texture_count) + current_texture = font->textures[font->texture_count - 1]; + + for (glyph = first; glyph <= last; ++glyph) + { + if (wine_rb_get(&font->glyph_tree, ULongToPtr(glyph))) + continue; + + current_glyph = heap_alloc(sizeof(*current_glyph)); + if (!current_glyph) + { + if (mapped) + IDirect3DTexture9_UnlockRect(current_texture, 0); + return E_OUTOFMEMORY; + } + + current_glyph->id = glyph; + current_glyph->texture = NULL; + wine_rb_put(&font->glyph_tree, ULongToPtr(current_glyph->id), &current_glyph->entry); + + size = GetGlyphOutlineW(font->hdc, glyph, GGO_GLYPH_INDEX | GGO_GRAY8_BITMAP, &metrics, 0, NULL, &mat); + if (size == GDI_ERROR) + { + WARN("GetGlyphOutlineW failed\n"); + continue; + } + if (!size) + continue; + + buffer = heap_alloc(size); + if (!buffer) + { + if (mapped) + IDirect3DTexture9_UnlockRect(current_texture, 0); + return E_OUTOFMEMORY; + } + + GetGlyphOutlineW(font->hdc, glyph, GGO_GLYPH_INDEX | GGO_GRAY8_BITMAP, &metrics, size, buffer, &mat); + + if (font->texture_pos == font->glyphs_per_texture) + { + unsigned int new_texture_count = font->texture_count + 1; + IDirect3DTexture9 **new_textures; + + if (mapped) + IDirect3DTexture9_UnlockRect(current_texture, 0); + mapped = FALSE; + new_textures = heap_realloc(font->textures, new_texture_count * sizeof(*new_textures)); + if (!new_textures) + { + heap_free(buffer); + return E_OUTOFMEMORY; + } + font->textures = new_textures; + + if (FAILED(hr = IDirect3DDevice9_CreateTexture(font->device, font->texture_size, + font->texture_size, 0, 0, D3DFMT_A8R8G8B8, D3DPOOL_MANAGED, + &font->textures[font->texture_count], NULL))) + { + heap_free(buffer); + return hr; + } + + current_texture = font->textures[font->texture_count++]; + font->texture_pos = 0; + } + + if (!mapped) + { + if (FAILED(hr = IDirect3DTexture9_LockRect(current_texture, 0, &lockrect, NULL, 0))) + { + heap_free(buffer); + return hr; + } + mapped = TRUE; + } + + x = morton_decode(font->texture_pos) * font->glyph_size; + y = morton_decode(font->texture_pos >> 1) * font->glyph_size; + + current_glyph->black_box.left = x - metrics.gmptGlyphOrigin.x + font->glyph_size / 2 + - metrics.gmBlackBoxX / 2; + current_glyph->black_box.top = y - metrics.gmptGlyphOrigin.y + font->metrics.tmAscent + 1; + current_glyph->black_box.right = current_glyph->black_box.left + metrics.gmBlackBoxX; + current_glyph->black_box.bottom = current_glyph->black_box.top + metrics.gmBlackBoxY; + current_glyph->cell_inc.x = metrics.gmptGlyphOrigin.x - 1; + current_glyph->cell_inc.y = font->metrics.tmAscent - metrics.gmptGlyphOrigin.y - 1; + current_glyph->texture = current_texture; + + pixel_data = lockrect.pBits; + stride = (metrics.gmBlackBoxX + 3) & ~3; + for (y = 0; y < metrics.gmBlackBoxY; ++y) + for (x = 0; x < metrics.gmBlackBoxX; ++x) + pixel_data[(current_glyph->black_box.top + y) * lockrect.Pitch / 4 + + current_glyph->black_box.left + x] = + (buffer[y * stride + x] * 255 / 64 << 24) | 0x00ffffffu; + + heap_free(buffer); + ++font->texture_pos; + } + if (mapped) + IDirect3DTexture9_UnlockRect(current_texture, 0); + + return D3D_OK; } static HRESULT WINAPI ID3DXFontImpl_PreloadTextA(ID3DXFont *iface, const char *string, INT count) @@ -291,8 +480,8 @@ HRESULT WINAPI D3DXCreateFontIndirectA(IDirect3DDevice9 *device, const D3DXFONT_ HRESULT WINAPI D3DXCreateFontIndirectW(IDirect3DDevice9 *device, const D3DXFONT_DESCW *desc, ID3DXFont **font) { D3DDEVICE_CREATION_PARAMETERS cpars; - D3DDISPLAYMODE mode; struct d3dx_font *object; + D3DDISPLAYMODE mode; IDirect3D9 *d3d; HRESULT hr; @@ -305,39 +494,62 @@ HRESULT WINAPI D3DXCreateFontIndirectW(IDirect3DDevice9 *device, const D3DXFONT_ IDirect3DDevice9_GetCreationParameters(device, &cpars); IDirect3DDevice9_GetDisplayMode(device, 0, &mode); hr = IDirect3D9_CheckDeviceFormat(d3d, cpars.AdapterOrdinal, cpars.DeviceType, mode.Format, 0, D3DRTYPE_TEXTURE, D3DFMT_A8R8G8B8); - if(FAILED(hr)) { + if (FAILED(hr)) + { IDirect3D9_Release(d3d); return D3DXERR_INVALIDDATA; } IDirect3D9_Release(d3d); - object = HeapAlloc(GetProcessHeap(), 0, sizeof(struct d3dx_font)); - if(object==NULL) { - *font=NULL; + object = heap_alloc_zero(sizeof(struct d3dx_font)); + if (!object) + { + *font = NULL; return E_OUTOFMEMORY; } object->ID3DXFont_iface.lpVtbl = &D3DXFont_Vtbl; - object->ref=1; - object->device=device; - object->desc=*desc; + object->ref = 1; + object->device = device; + object->desc = *desc; object->hdc = CreateCompatibleDC(NULL); - if( !object->hdc ) { - HeapFree(GetProcessHeap(), 0, object); + if (!object->hdc) + { + heap_free(object); return D3DXERR_INVALIDDATA; } object->hfont = CreateFontW(desc->Height, desc->Width, 0, 0, desc->Weight, desc->Italic, FALSE, FALSE, desc->CharSet, desc->OutputPrecision, CLIP_DEFAULT_PRECIS, desc->Quality, desc->PitchAndFamily, desc->FaceName); - if( !object->hfont ) { + if (!object->hfont) + { DeleteDC(object->hdc); - HeapFree(GetProcessHeap(), 0, object); + heap_free(object); return D3DXERR_INVALIDDATA; } SelectObject(object->hdc, object->hfont); + wine_rb_init(&object->glyph_tree, glyph_rb_compare); + + if (!GetTextMetricsW(object->hdc, &object->metrics)) + { + DeleteObject(object->hfont); + DeleteDC(object->hdc); + heap_free(object); + return D3DXERR_INVALIDDATA; + } + + object->glyph_size = make_pow2(object->metrics.tmHeight); + + object->texture_size = object->glyph_size; + if (object->glyph_size < 256) + object->texture_size = min(256, object->texture_size * 16); + + object->glyphs_per_texture = object->texture_size * object->texture_size / (object->glyph_size * object->glyph_size); + object->texture_pos = object->glyphs_per_texture; + IDirect3DDevice9_AddRef(device); - *font=&object->ID3DXFont_iface; + *font = &object->ID3DXFont_iface; return D3D_OK; } diff --git a/dlls/d3dx9_36/tests/core.c b/dlls/d3dx9_36/tests/core.c index c44473396b..22d265b9fc 100644 --- a/dlls/d3dx9_36/tests/core.c +++ b/dlls/d3dx9_36/tests/core.c @@ -556,7 +556,7 @@ static void test_ID3DXFont(IDirect3DDevice9 *device) hr = ID3DXFont_PreloadCharacters(font, 'b', 'a'); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = ID3DXFont_PreloadGlyphs(font, 1, 0); - todo_wine ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = ID3DXFont_PreloadCharacters(font, 'a', 'a'); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); @@ -586,6 +586,7 @@ static void test_ID3DXFont(IDirect3DDevice9 *device) ret = ID3DXFont_GetTextMetricsW(font, &tm); ok(ret, "Got unexpected ret %#x.\n", ret); + ok(blackbox.right - blackbox.left == glyph_metrics.gmBlackBoxX + 2, "Character %c: got %d, expected %d.\n", c, blackbox.right - blackbox.left, glyph_metrics.gmBlackBoxX + 2); ok(blackbox.bottom - blackbox.top == glyph_metrics.gmBlackBoxY + 2, "Character %c: got %d, expected %d.\n", @@ -603,7 +604,7 @@ static void test_ID3DXFont(IDirect3DDevice9 *device) /* Test multiple textures */ hr = ID3DXFont_PreloadGlyphs(font, 0, 1000); - todo_wine ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); /* Test glyphs that are not rendered */ for (glyph = 1; glyph < 4; ++glyph) -- 2.24.0

2 6

[PATCH 1/3] d3dx9: Implement ID3DXFont_PreloadGlyphs.
by Matteo Bruni 27 Feb '20

27 Feb '20

From: Sven Baars <sbaars(a)codeweavers.com> Based on a patch by Tony Wasserka. Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/d3dx9_36/font.c | 289 ++++++++++++++++++++++++++++++++----- dlls/d3dx9_36/tests/core.c | 5 +- 2 files changed, 254 insertions(+), 40 deletions(-) diff --git a/dlls/d3dx9_36/font.c b/dlls/d3dx9_36/font.c index cb09af22f57..0ea19bdee3c 100644 --- a/dlls/d3dx9_36/font.c +++ b/dlls/d3dx9_36/font.c @@ -22,6 +22,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3dx); +struct d3dx_glyph +{ + unsigned int id; + RECT black_box; + POINT cell_inc; + IDirect3DTexture9 *texture; + + struct wine_rb_entry entry; +}; + struct d3dx_font { ID3DXFont ID3DXFont_iface; @@ -29,11 +39,34 @@ struct d3dx_font IDirect3DDevice9 *device; D3DXFONT_DESCW desc; + TEXTMETRICW metrics; HDC hdc; HFONT hfont; + + struct wine_rb_tree glyph_tree; + + IDirect3DTexture9 **textures; + unsigned int texture_count, texture_pos; + + unsigned int texture_size, glyph_size, glyphs_per_texture; }; +static int glyph_rb_compare(const void *key, const struct wine_rb_entry *entry) +{ + struct d3dx_glyph *glyph = WINE_RB_ENTRY_VALUE(entry, struct d3dx_glyph, entry); + unsigned int id = (UINT_PTR)key; + + return id - glyph->id; +} + +static void glyph_rb_free(struct wine_rb_entry *entry, void *context) +{ + struct d3dx_glyph *glyph = WINE_RB_ENTRY_VALUE(entry, struct d3dx_glyph, entry); + + heap_free(glyph); +} + static inline struct d3dx_font *impl_from_ID3DXFont(ID3DXFont *iface) { return CONTAINING_RECORD(iface, struct d3dx_font, ID3DXFont_iface); @@ -59,85 +92,95 @@ static HRESULT WINAPI ID3DXFontImpl_QueryInterface(ID3DXFont *iface, REFIID riid static ULONG WINAPI ID3DXFontImpl_AddRef(ID3DXFont *iface) { - struct d3dx_font *This = impl_from_ID3DXFont(iface); - ULONG ref=InterlockedIncrement(&This->ref); + struct d3dx_font *font = impl_from_ID3DXFont(iface); + ULONG ref = InterlockedIncrement(&font->ref); + TRACE("%p increasing refcount to %u\n", iface, ref); return ref; } static ULONG WINAPI ID3DXFontImpl_Release(ID3DXFont *iface) { - struct d3dx_font *This = impl_from_ID3DXFont(iface); - ULONG ref=InterlockedDecrement(&This->ref); + struct d3dx_font *font = impl_from_ID3DXFont(iface); + ULONG ref = InterlockedDecrement(&font->ref); + unsigned int i; TRACE("%p decreasing refcount to %u\n", iface, ref); - if(ref==0) { - DeleteObject(This->hfont); - DeleteDC(This->hdc); - IDirect3DDevice9_Release(This->device); - HeapFree(GetProcessHeap(), 0, This); + if (!ref) + { + for (i = 0; i < font->texture_count; ++i) + IDirect3DTexture9_Release(font->textures[i]); + + heap_free(font->textures); + + wine_rb_destroy(&font->glyph_tree, glyph_rb_free, NULL); + + DeleteObject(font->hfont); + DeleteDC(font->hdc); + IDirect3DDevice9_Release(font->device); + heap_free(font); } return ref; } static HRESULT WINAPI ID3DXFontImpl_GetDevice(ID3DXFont *iface, IDirect3DDevice9 **device) { - struct d3dx_font *This = impl_from_ID3DXFont(iface); + struct d3dx_font *font = impl_from_ID3DXFont(iface); TRACE("iface %p, device %p\n", iface, device); if( !device ) return D3DERR_INVALIDCALL; - *device = This->device; - IDirect3DDevice9_AddRef(This->device); + *device = font->device; + IDirect3DDevice9_AddRef(font->device); return D3D_OK; } static HRESULT WINAPI ID3DXFontImpl_GetDescA(ID3DXFont *iface, D3DXFONT_DESCA *desc) { - struct d3dx_font *This = impl_from_ID3DXFont(iface); + struct d3dx_font *font = impl_from_ID3DXFont(iface); TRACE("iface %p, desc %p\n", iface, desc); if( !desc ) return D3DERR_INVALIDCALL; - memcpy(desc, &This->desc, FIELD_OFFSET(D3DXFONT_DESCA, FaceName)); - WideCharToMultiByte(CP_ACP, 0, This->desc.FaceName, -1, desc->FaceName, ARRAY_SIZE(desc->FaceName), NULL, NULL); + memcpy(desc, &font->desc, FIELD_OFFSET(D3DXFONT_DESCA, FaceName)); + WideCharToMultiByte(CP_ACP, 0, font->desc.FaceName, -1, desc->FaceName, ARRAY_SIZE(desc->FaceName), NULL, NULL); return D3D_OK; } static HRESULT WINAPI ID3DXFontImpl_GetDescW(ID3DXFont *iface, D3DXFONT_DESCW *desc) { - struct d3dx_font *This = impl_from_ID3DXFont(iface); + struct d3dx_font *font = impl_from_ID3DXFont(iface); TRACE("iface %p, desc %p\n", iface, desc); if( !desc ) return D3DERR_INVALIDCALL; - *desc = This->desc; + *desc = font->desc; return D3D_OK; } static BOOL WINAPI ID3DXFontImpl_GetTextMetricsA(ID3DXFont *iface, TEXTMETRICA *metrics) { - struct d3dx_font *This = impl_from_ID3DXFont(iface); + struct d3dx_font *font = impl_from_ID3DXFont(iface); TRACE("iface %p, metrics %p\n", iface, metrics); - return GetTextMetricsA(This->hdc, metrics); + return GetTextMetricsA(font->hdc, metrics); } static BOOL WINAPI ID3DXFontImpl_GetTextMetricsW(ID3DXFont *iface, TEXTMETRICW *metrics) { - struct d3dx_font *This = impl_from_ID3DXFont(iface); + struct d3dx_font *font = impl_from_ID3DXFont(iface); TRACE("iface %p, metrics %p\n", iface, metrics); - return GetTextMetricsW(This->hdc, metrics); + return GetTextMetricsW(font->hdc, metrics); } static HDC WINAPI ID3DXFontImpl_GetDC(ID3DXFont *iface) { - struct d3dx_font *This = impl_from_ID3DXFont(iface); + struct d3dx_font *font = impl_from_ID3DXFont(iface); TRACE("iface %p\n", iface); - return This->hdc; + return font->hdc; } static HRESULT WINAPI ID3DXFontImpl_GetGlyphData(ID3DXFont *iface, UINT glyph, @@ -154,10 +197,156 @@ static HRESULT WINAPI ID3DXFontImpl_PreloadCharacters(ID3DXFont *iface, UINT fir return S_OK; } +static uint32_t morton_decode(uint32_t x) +{ + x &= 0x55555555; + x = (x ^ (x >> 1)) & 0x33333333; + x = (x ^ (x >> 2)) & 0x0f0f0f0f; + x = (x ^ (x >> 4)) & 0x00ff00ff; + x = (x ^ (x >> 8)) & 0x0000ffff; + return x; +} + +/* The glyphs are stored in a grid. Cell sizes vary between different font + * sizes. + * + * The grid is filled in Morton order: + * 1 2 5 6 17 18 21 22 + * 3 4 7 8 19 20 23 24 + * 9 10 13 14 25 26 29 30 + * 11 12 15 16 27 28 31 32 + * 33 34 ... + * ... + * + * i.e. we try to fill one small square, then three equal-sized squares so + * that we get one big square, etc. + * + * The glyphs are positioned around their baseline, which is located at y + * position glyph_size * i + tmAscent. Concerning the x position, the glyphs + * are centered around glyph_size * (i + 0.5). */ static HRESULT WINAPI ID3DXFontImpl_PreloadGlyphs(ID3DXFont *iface, UINT first, UINT last) { - FIXME("iface %p, first %u, last %u stub!\n", iface, first, last); - return E_NOTIMPL; + static const MAT2 mat = { {0,1}, {0,0}, {0,0}, {0,1} }; + struct d3dx_font *font = impl_from_ID3DXFont(iface); + IDirect3DTexture9 *current_texture = NULL; + unsigned int size, stride, glyph, x, y; + struct d3dx_glyph *current_glyph; + D3DLOCKED_RECT lockrect; + GLYPHMETRICS metrics; + BOOL mapped = FALSE; + DWORD *pixel_data; + BYTE *buffer; + HRESULT hr; + + TRACE("iface %p, first %u, last %u.\n", iface, first, last); + + if (last < first) + return D3D_OK; + + if (font->texture_count) + current_texture = font->textures[font->texture_count - 1]; + + for (glyph = first; glyph <= last; ++glyph) + { + if (wine_rb_get(&font->glyph_tree, ULongToPtr(glyph))) + continue; + + current_glyph = heap_alloc(sizeof(*current_glyph)); + if (!current_glyph) + { + if (mapped) + IDirect3DTexture9_UnlockRect(current_texture, 0); + return E_OUTOFMEMORY; + } + + current_glyph->id = glyph; + current_glyph->texture = NULL; + wine_rb_put(&font->glyph_tree, ULongToPtr(current_glyph->id), &current_glyph->entry); + + size = GetGlyphOutlineW(font->hdc, glyph, GGO_GLYPH_INDEX | GGO_GRAY8_BITMAP, &metrics, 0, NULL, &mat); + if (size == GDI_ERROR) + { + WARN("GetGlyphOutlineW failed.\n"); + continue; + } + if (!size) + continue; + + buffer = heap_alloc(size); + if (!buffer) + { + if (mapped) + IDirect3DTexture9_UnlockRect(current_texture, 0); + return E_OUTOFMEMORY; + } + + GetGlyphOutlineW(font->hdc, glyph, GGO_GLYPH_INDEX | GGO_GRAY8_BITMAP, &metrics, size, buffer, &mat); + + if (font->texture_pos == font->glyphs_per_texture) + { + unsigned int new_texture_count = font->texture_count + 1; + IDirect3DTexture9 **new_textures; + + if (mapped) + IDirect3DTexture9_UnlockRect(current_texture, 0); + mapped = FALSE; + new_textures = heap_realloc(font->textures, new_texture_count * sizeof(*new_textures)); + if (!new_textures) + { + heap_free(buffer); + return E_OUTOFMEMORY; + } + font->textures = new_textures; + + if (FAILED(hr = IDirect3DDevice9_CreateTexture(font->device, font->texture_size, + font->texture_size, 0, 0, D3DFMT_A8R8G8B8, D3DPOOL_MANAGED, + &font->textures[font->texture_count], NULL))) + { + heap_free(buffer); + return hr; + } + + current_texture = font->textures[font->texture_count++]; + font->texture_pos = 0; + } + + if (!mapped) + { + if (FAILED(hr = IDirect3DTexture9_LockRect(current_texture, 0, &lockrect, NULL, 0))) + { + heap_free(buffer); + return hr; + } + mapped = TRUE; + } + + x = morton_decode(font->texture_pos) * font->glyph_size; + y = morton_decode(font->texture_pos >> 1) * font->glyph_size; + + current_glyph->black_box.left = x - metrics.gmptGlyphOrigin.x + font->glyph_size / 2 + - metrics.gmBlackBoxX / 2; + current_glyph->black_box.top = y - metrics.gmptGlyphOrigin.y + font->metrics.tmAscent + 1; + current_glyph->black_box.right = current_glyph->black_box.left + metrics.gmBlackBoxX; + current_glyph->black_box.bottom = current_glyph->black_box.top + metrics.gmBlackBoxY; + current_glyph->cell_inc.x = metrics.gmptGlyphOrigin.x - 1; + current_glyph->cell_inc.y = font->metrics.tmAscent - metrics.gmptGlyphOrigin.y - 1; + current_glyph->texture = current_texture; + + pixel_data = lockrect.pBits; + stride = (metrics.gmBlackBoxX + 3) & ~3; + for (y = 0; y < metrics.gmBlackBoxY; ++y) + for (x = 0; x < metrics.gmBlackBoxX; ++x) + pixel_data[(current_glyph->black_box.top + y) * lockrect.Pitch / 4 + + current_glyph->black_box.left + x] = + (buffer[y * stride + x] * 255 / 64 << 24) | 0x00ffffffu; + + heap_free(buffer); + ++font->texture_pos; + } + if (mapped) + IDirect3DTexture9_UnlockRect(current_texture, 0); + + return D3D_OK; } static HRESULT WINAPI ID3DXFontImpl_PreloadTextA(ID3DXFont *iface, const char *string, INT count) @@ -291,8 +480,8 @@ HRESULT WINAPI D3DXCreateFontIndirectA(IDirect3DDevice9 *device, const D3DXFONT_ HRESULT WINAPI D3DXCreateFontIndirectW(IDirect3DDevice9 *device, const D3DXFONT_DESCW *desc, ID3DXFont **font) { D3DDEVICE_CREATION_PARAMETERS cpars; - D3DDISPLAYMODE mode; struct d3dx_font *object; + D3DDISPLAYMODE mode; IDirect3D9 *d3d; HRESULT hr; @@ -305,39 +494,63 @@ HRESULT WINAPI D3DXCreateFontIndirectW(IDirect3DDevice9 *device, const D3DXFONT_ IDirect3DDevice9_GetCreationParameters(device, &cpars); IDirect3DDevice9_GetDisplayMode(device, 0, &mode); hr = IDirect3D9_CheckDeviceFormat(d3d, cpars.AdapterOrdinal, cpars.DeviceType, mode.Format, 0, D3DRTYPE_TEXTURE, D3DFMT_A8R8G8B8); - if(FAILED(hr)) { + if (FAILED(hr)) + { IDirect3D9_Release(d3d); return D3DXERR_INVALIDDATA; } IDirect3D9_Release(d3d); - object = HeapAlloc(GetProcessHeap(), 0, sizeof(struct d3dx_font)); - if(object==NULL) { - *font=NULL; + object = heap_alloc_zero(sizeof(*object)); + if (!object) + { + *font = NULL; return E_OUTOFMEMORY; } object->ID3DXFont_iface.lpVtbl = &D3DXFont_Vtbl; - object->ref=1; - object->device=device; - object->desc=*desc; + object->ref = 1; + object->device = device; + object->desc = *desc; object->hdc = CreateCompatibleDC(NULL); - if( !object->hdc ) { - HeapFree(GetProcessHeap(), 0, object); + if (!object->hdc) + { + heap_free(object); return D3DXERR_INVALIDDATA; } object->hfont = CreateFontW(desc->Height, desc->Width, 0, 0, desc->Weight, desc->Italic, FALSE, FALSE, desc->CharSet, desc->OutputPrecision, CLIP_DEFAULT_PRECIS, desc->Quality, desc->PitchAndFamily, desc->FaceName); - if( !object->hfont ) { + if (!object->hfont) + { DeleteDC(object->hdc); - HeapFree(GetProcessHeap(), 0, object); + heap_free(object); return D3DXERR_INVALIDDATA; } SelectObject(object->hdc, object->hfont); + wine_rb_init(&object->glyph_tree, glyph_rb_compare); + + if (!GetTextMetricsW(object->hdc, &object->metrics)) + { + DeleteObject(object->hfont); + DeleteDC(object->hdc); + heap_free(object); + return D3DXERR_INVALIDDATA; + } + + object->glyph_size = make_pow2(object->metrics.tmHeight); + + object->texture_size = object->glyph_size; + if (object->glyph_size < 256) + object->texture_size = min(256, object->texture_size * 16); + + object->glyphs_per_texture = object->texture_size * object->texture_size + / (object->glyph_size * object->glyph_size); + object->texture_pos = object->glyphs_per_texture; + IDirect3DDevice9_AddRef(device); - *font=&object->ID3DXFont_iface; + *font = &object->ID3DXFont_iface; return D3D_OK; } diff --git a/dlls/d3dx9_36/tests/core.c b/dlls/d3dx9_36/tests/core.c index c44473396b7..22d265b9fc7 100644 --- a/dlls/d3dx9_36/tests/core.c +++ b/dlls/d3dx9_36/tests/core.c @@ -556,7 +556,7 @@ static void test_ID3DXFont(IDirect3DDevice9 *device) hr = ID3DXFont_PreloadCharacters(font, 'b', 'a'); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = ID3DXFont_PreloadGlyphs(font, 1, 0); - todo_wine ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = ID3DXFont_PreloadCharacters(font, 'a', 'a'); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); @@ -586,6 +586,7 @@ static void test_ID3DXFont(IDirect3DDevice9 *device) ret = ID3DXFont_GetTextMetricsW(font, &tm); ok(ret, "Got unexpected ret %#x.\n", ret); + ok(blackbox.right - blackbox.left == glyph_metrics.gmBlackBoxX + 2, "Character %c: got %d, expected %d.\n", c, blackbox.right - blackbox.left, glyph_metrics.gmBlackBoxX + 2); ok(blackbox.bottom - blackbox.top == glyph_metrics.gmBlackBoxY + 2, "Character %c: got %d, expected %d.\n", @@ -603,7 +604,7 @@ static void test_ID3DXFont(IDirect3DDevice9 *device) /* Test multiple textures */ hr = ID3DXFont_PreloadGlyphs(font, 0, 1000); - todo_wine ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); /* Test glyphs that are not rendered */ for (glyph = 1; glyph < 4; ++glyph) -- 2.24.1

1 2

[PATCH 1/2] oledb32: Resize dialog fields to accomodate translations.
by Lauri Kenttä 27 Feb '20

27 Feb '20

Needed for German (7), Finnish (11), French (12), Lithuanian (39). Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> --- dlls/oledb32/version.rc | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/oledb32/version.rc b/dlls/oledb32/version.rc index 080e444eb7..247709dec2 100644 --- a/dlls/oledb32/version.rc +++ b/dlls/oledb32/version.rc @@ -68,17 +68,17 @@ BEGIN LTEXT "Specify the following to connect to ODBC data:",-1,7,7,213,8 LTEXT "1. Specify the source of data:",IDC_LBL_SOURCE,14,18,206,8 CONTROL "Use &data source name",IDC_RDO_SRC_NAME,"Button",BS_AUTORADIOBUTTON | WS_GROUP,29,29,192,10 - COMBOBOX IDC_CBO_NAMES,36,40,150,128,CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "&Refresh",IDC_BTN_REFRESH,189,39,31,14 + COMBOBOX IDC_CBO_NAMES,36,40,120,128,CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "&Refresh",IDC_BTN_REFRESH,159,39,61,14 CONTROL "Use c&onnection string",IDC_BTN_CONNECTION,"Button",BS_AUTORADIOBUTTON,29,57,192,10 LTEXT "&Connection string:",IDC_LBL_CONNECTION,36,68,182,8 - EDITTEXT IDC_EDT_CONNECTION,36,78,148,12,ES_AUTOHSCROLL - PUSHBUTTON "B&uild...",IDC_BTN_BUILD,189,77,31,14 + EDITTEXT IDC_EDT_CONNECTION,36,78,118,12,ES_AUTOHSCROLL + PUSHBUTTON "B&uild...",IDC_BTN_BUILD,159,77,61,14 LTEXT "2. Enter information to log on to the server",IDC_LBL_LOGIN,14,98,206,8 - LTEXT "User &name:",-1,29,110,38,8 - EDITTEXT IDC_EDT_NAME,67,108,153,12,ES_AUTOHSCROLL - LTEXT "&Password:",-1,29,126,34,8 - EDITTEXT IDC_EDT_PASSWORD,67,124,153,12,ES_PASSWORD | ES_AUTOHSCROLL + LTEXT "User &name:",-1,29,110,58,8 + EDITTEXT IDC_EDT_NAME,87,108,133,12,ES_AUTOHSCROLL + LTEXT "&Password:",-1,29,126,58,8 + EDITTEXT IDC_EDT_PASSWORD,87,124,133,12,ES_PASSWORD | ES_AUTOHSCROLL CONTROL "&Blank password",IDC_CHK_BLANK,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,29,140,69,10 CONTROL "Allow &saving password",IDC_CHK_SAVE_PASS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,103,140,103,10 LTEXT "3. Enter the &initial catalog to use:",IDC_LBL_INITIAL,14,159,206,8 @@ -111,5 +111,5 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "",IDC_LST_PROPERTIES,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,33,213,155 LTEXT "These are the initialization properties for this type of data. To edit a value, select a property, then choose Edit Value below.",-1,7,7,213,23 - PUSHBUTTON "&Edit Value...",IDC_BTN_EDIT_ALL,7,194,60,14 + PUSHBUTTON "&Edit Value...",IDC_BTN_EDIT_ALL,7,194,100,14 END -- 2.25.1

1 1

[PATCH 1/2] iphlpapi: Support InitialNotification flag in NotifyUnicastIpAddressChange().
by Paul Gofman 27 Feb '20

27 Feb '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48669 Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- dlls/iphlpapi/iphlpapi_main.c | 6 ++++- dlls/iphlpapi/tests/iphlpapi.c | 41 ++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 1 deletion(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 429958198d..c248fb50b4 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -2801,9 +2801,13 @@ DWORD WINAPI NotifyRouteChange(PHANDLE Handle, LPOVERLAPPED overlapped) DWORD WINAPI NotifyUnicastIpAddressChange(ADDRESS_FAMILY family, PUNICAST_IPADDRESS_CHANGE_CALLBACK callback, PVOID context, BOOLEAN init_notify, PHANDLE handle) { - FIXME("(family %d, callback %p, context %p, init_notify %d, handle %p): stub\n", + FIXME("(family %d, callback %p, context %p, init_notify %d, handle %p): semi-stub\n", family, callback, context, init_notify, handle); if (handle) *handle = NULL; + + if (init_notify) + callback(context, NULL, MibInitialNotification); + return ERROR_NOT_SUPPORTED; } diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 8ccbf5f9b6..9979cd5abc 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -75,6 +75,9 @@ static DWORD (WINAPI *pConvertInterfaceNameToLuidA)(const char*,NET_LUID*); static DWORD (WINAPI *pConvertInterfaceNameToLuidW)(const WCHAR*,NET_LUID*); static DWORD (WINAPI *pConvertLengthToIpv4Mask)(ULONG,ULONG*); static DWORD (WINAPI *pParseNetworkString)(const WCHAR*,DWORD,NET_ADDRESS_INFO*,USHORT*,BYTE*); +static DWORD (WINAPI *pNotifyUnicastIpAddressChange)(ADDRESS_FAMILY, PUNICAST_IPADDRESS_CHANGE_CALLBACK, + PVOID, BOOLEAN, HANDLE *); +static DWORD (WINAPI *pCancelMibChangeNotify2)(HANDLE); static PCHAR (WINAPI *pif_indextoname)(NET_IFINDEX,PCHAR); static NET_IFINDEX (WINAPI *pif_nametoindex)(const char*); @@ -107,6 +110,8 @@ static void loadIPHlpApi(void) pParseNetworkString = (void *)GetProcAddress(hLibrary, "ParseNetworkString"); pif_indextoname = (void *)GetProcAddress(hLibrary, "if_indextoname"); pif_nametoindex = (void *)GetProcAddress(hLibrary, "if_nametoindex"); + pNotifyUnicastIpAddressChange = (void *)GetProcAddress(hLibrary, "NotifyUnicastIpAddressChange"); + pCancelMibChangeNotify2 = (void *)GetProcAddress(hLibrary, "CancelMibChangeNotify2"); } } @@ -2287,6 +2292,41 @@ static void test_ParseNetworkString(void) } } +static void WINAPI test_ipaddtess_change_callback(PVOID context, PMIB_UNICASTIPADDRESS_ROW row, + MIB_NOTIFICATION_TYPE notification_type) +{ + BOOL *callback_called = context; + + *callback_called = TRUE; + + ok(notification_type == MibInitialNotification, "Unexpected notification_type %#x.\n", + notification_type); + ok(!row, "Unexpected row %p.\n", row); +} + +static void test_NotifyUnicastIpAddressChange(void) +{ + BOOL callback_called; + HANDLE handle; + DWORD ret; + + if (!pNotifyUnicastIpAddressChange) + { + win_skip("NotifyUnicastIpAddressChange not available.\n"); + return; + } + + callback_called = FALSE; + ret = pNotifyUnicastIpAddressChange(AF_INET, test_ipaddtess_change_callback, + &callback_called, TRUE, &handle); + todo_wine ok(ret == NO_ERROR, "Unexpected ret %#x.\n", ret); + ok(callback_called, "Callback was not called.\n"); + + ret = pCancelMibChangeNotify2(handle); + ok(ret == NO_ERROR, "Unexpected ret %#x.\n", ret); + ok(!CloseHandle(handle), "CloseHandle() succeded.\n"); +} + START_TEST(iphlpapi) { @@ -2318,6 +2358,7 @@ START_TEST(iphlpapi) test_GetTcp6Table(); test_GetUdp6Table(); test_ParseNetworkString(); + test_NotifyUnicastIpAddressChange(); freeIPHlpApi(); } } -- 2.24.1

1 1

[PATCH 5/6] msvcrt: Silence wide environment inisialization debug messages.
by Jacek Caban 27 Feb '20

27 Feb '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/msvcrt/data.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[PATCH 3/6] msvcrt: Use more public declarations in exe entry points.
by Jacek Caban 27 Feb '20

27 Feb '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/msvcrt/crt_main.c | 8 ++------ dlls/msvcrt/crt_wmain.c | 8 ++------ 2 files changed, 4 insertions(+), 12 deletions(-)

1 0

[PATCH 2/6] include: Add corecrt_startup.h header.
by Jacek Caban 27 Feb '20

27 Feb '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/msvcrt/tests/data.c | 1 - include/msvcrt/corecrt_startup.h | 47 ++++++++++++++++++++++++++++++++ include/msvcrt/process.h | 2 +- 3 files changed, 48 insertions(+), 2 deletions(-) create mode 100644 include/msvcrt/corecrt_startup.h

1 0

[PATCH 1/6] stdlib.h: Make externs declarations compatible with ucrt.
by Jacek Caban 27 Feb '20

27 Feb '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/msvcrt/stdlib.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[PATCH v4 1/6] d3d10: Allocate buffers for effect interface local_buffers.
by Connor McAdams 27 Feb '20

27 Feb '20

Create ID3D10Buffer interfaces for the constant buffers within the effect shader. Signed-off-by: Connor McAdams <conmanx360(a)gmail.com> --- v4: Add tests for Scalar/Vector array set/get offset arguments, instead of previously where it was just one of the two. dlls/d3d10/d3d10_private.h | 10 ++++++ dlls/d3d10/effect.c | 62 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 72 insertions(+) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 96020cd4a0..5c6c7a2d72 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -114,6 +114,15 @@ struct d3d10_effect_state_object_variable } object; }; +struct d3d10_effect_buffer_variable +{ + ID3D10Buffer *buffer; + ID3D10ShaderResourceView *resource_view; + + UINT changed; + char *local_buffer; +}; + /* ID3D10EffectType */ struct d3d10_effect_type { @@ -169,6 +178,7 @@ struct d3d10_effect_variable { struct d3d10_effect_state_object_variable state; struct d3d10_effect_shader_variable shader; + struct d3d10_effect_buffer_variable buffer; } u; }; diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 91e713bdf5..b62b7c0d3a 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -2096,6 +2096,53 @@ static HRESULT parse_fx10_local_variable(const char *data, size_t data_size, return S_OK; } +static HRESULT create_variable_buffer(struct d3d10_effect_variable *l, D3D10_CBUFFER_TYPE d3d10_cbuffer_type) +{ + D3D10_BUFFER_DESC buffer_desc; + D3D10_SUBRESOURCE_DATA subresource_data; + D3D10_SHADER_RESOURCE_VIEW_DESC srv_desc; + ID3D10Device *device = l->effect->device; + HRESULT hr; + + if (!(l->u.buffer.local_buffer = heap_calloc(l->type->size_unpacked, sizeof(unsigned char)))) + { + ERR("Failed to allocate local constant buffer memory.\n"); + return E_OUTOFMEMORY; + } + + buffer_desc.ByteWidth = l->type->size_unpacked; + buffer_desc.Usage = D3D10_USAGE_DEFAULT; + buffer_desc.CPUAccessFlags = 0; + buffer_desc.MiscFlags = 0; + if (d3d10_cbuffer_type == D3D10_CT_CBUFFER) + buffer_desc.BindFlags = D3D10_BIND_CONSTANT_BUFFER; + else if (d3d10_cbuffer_type == D3D10_CT_TBUFFER) + buffer_desc.BindFlags = D3D10_BIND_SHADER_RESOURCE; + + subresource_data.pSysMem = (const void *)l->u.buffer.local_buffer; + subresource_data.SysMemPitch = 0; + subresource_data.SysMemSlicePitch = 0; + + if (FAILED(hr = ID3D10Device_CreateBuffer(device, &buffer_desc, &subresource_data, &l->u.buffer.buffer))) + return hr; + + if (d3d10_cbuffer_type == D3D10_CT_TBUFFER) + { + srv_desc.Format = DXGI_FORMAT_R32G32B32A32_UINT; + srv_desc.ViewDimension = D3D_SRV_DIMENSION_BUFFER; + srv_desc.Buffer.ElementOffset = 0; + srv_desc.Buffer.ElementWidth = l->type->size_unpacked / 16; + + if (FAILED(hr = ID3D10Device_CreateShaderResourceView(device, (ID3D10Resource *)l->u.buffer.buffer, + (const D3D10_SHADER_RESOURCE_VIEW_DESC *)&srv_desc, &l->u.buffer.resource_view))) + return hr; + } + else + l->u.buffer.resource_view = NULL; + + return S_OK; +} + static HRESULT parse_fx10_local_buffer(const char *data, size_t data_size, const char **ptr, struct d3d10_effect_variable *l) { @@ -2282,6 +2329,12 @@ static HRESULT parse_fx10_local_buffer(const char *data, size_t data_size, TRACE("\tBasetype: %s.\n", debug_d3d10_shader_variable_type(l->type->basetype)); TRACE("\tTypeclass: %s.\n", debug_d3d10_shader_variable_class(l->type->type_class)); + if (l->type->size_unpacked) + { + if (FAILED(hr = create_variable_buffer(l, d3d10_cbuffer_type))) + return hr; + } + return S_OK; } @@ -2760,6 +2813,15 @@ static void d3d10_effect_local_buffer_destroy(struct d3d10_effect_variable *l) } heap_free(l->annotations); } + + if (l->u.buffer.buffer) + ID3D10Buffer_Release(l->u.buffer.buffer); + + if (l->u.buffer.local_buffer) + heap_free(l->u.buffer.local_buffer); + + if (l->u.buffer.resource_view) + ID3D10ShaderResourceView_Release(l->u.buffer.resource_view); } /* IUnknown methods */ -- 2.20.1

2 8

[PATCH v2] dstyle: IDirectMusicStyle8 GetDefaultBand return S_FALSE
by Alistair Leslie-Hughes 26 Feb '20

26 Feb '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48648 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dmstyle/style.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/dmstyle/style.c b/dlls/dmstyle/style.c index 3e480028b9e..5a97dac079a 100644 --- a/dlls/dmstyle/style.c +++ b/dlls/dmstyle/style.c @@ -151,11 +151,17 @@ static HRESULT WINAPI IDirectMusicStyle8Impl_EnumBand(IDirectMusicStyle8 *iface, } static HRESULT WINAPI IDirectMusicStyle8Impl_GetDefaultBand(IDirectMusicStyle8 *iface, - IDirectMusicBand **ppBand) + IDirectMusicBand **band) { - IDirectMusicStyle8Impl *This = impl_from_IDirectMusicStyle8(iface); - FIXME("(%p, %p): stub\n", This, ppBand); - return S_OK; + IDirectMusicStyle8Impl *This = impl_from_IDirectMusicStyle8(iface); + FIXME("(%p, %p): stub\n", This, band); + + if (!band) + return E_POINTER; + + *band = NULL; + + return S_FALSE; } static HRESULT WINAPI IDirectMusicStyle8Impl_EnumMotif(IDirectMusicStyle8 *iface, DWORD index, -- 2.25.0

2 1

[PATCH 1/5] d3d8: Retrieve the viewport from the primary stateblock.
by Zebediah Figura 26 Feb '20

26 Feb '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/d3d8/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index e7c79d54a0..7853aa9b55 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1705,7 +1705,7 @@ static HRESULT WINAPI d3d8_device_GetViewport(IDirect3DDevice8 *iface, D3DVIEWPO TRACE("iface %p, viewport %p.\n", iface, viewport); wined3d_mutex_lock(); - wined3d_device_get_viewports(device->wined3d_device, NULL, &wined3d_viewport); + wined3d_viewport = wined3d_stateblock_get_state(device->state)->viewport; wined3d_mutex_unlock(); viewport->X = wined3d_viewport.x; -- 2.25.0

2 9

[PATCH] gdi32/tests: Reduce some tracing noise in font tests.
by Nikolay Sivov 26 Feb '20

26 Feb '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/gdi32/tests/font.c | 101 +++++++--------------------------------- 1 file changed, 18 insertions(+), 83 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index bc07f11b2c..7e90a50d84 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -407,9 +407,9 @@ static void test_bitmap_font(void) ret = EnumFontFamiliesA(hdc, "System", font_enum_proc, (LPARAM)&bitmap_lf); if (ret) { - ReleaseDC(0, hdc); - trace("no bitmap fonts were found, skipping the test\n"); - return; + ReleaseDC(0, hdc); + skip("no bitmap fonts were found, skipping the test\n"); + return; } trace("found bitmap font %s, height %d\n", bitmap_lf.lfFaceName, bitmap_lf.lfHeight); @@ -570,7 +570,6 @@ static void test_outline_font(void) SetLastError(0xdeadbeef); ret = GetGlyphOutlineA(hdc, 'A', GGO_METRICS, &gm, 0, NULL, &mat); ok(ret != GDI_ERROR, "GetGlyphOutlineA error %d\n", GetLastError()); - trace("gm.gmCellIncX %d, width_orig %d\n", gm.gmCellIncX, width_orig); ok(gm.gmCellIncX == width_orig, "incX %d != %d\n", gm.gmCellIncX, width_orig); ok(gm.gmCellIncY == 0, "incY %d != 0\n", gm.gmCellIncY); /* with a custom matrix */ @@ -578,7 +577,6 @@ static void test_outline_font(void) SetLastError(0xdeadbeef); ret = GetGlyphOutlineA(hdc, 'A', GGO_METRICS, &gm, 0, NULL, &mat2); ok(ret != GDI_ERROR, "GetGlyphOutlineA error %d\n", GetLastError()); - trace("gm.gmCellIncX %d, width_orig %d\n", gm.gmCellIncX, width_orig); ok(gm.gmCellIncX == width_orig/2, "incX %d != %d\n", gm.gmCellIncX, width_orig/2); ok(gm.gmCellIncY == 0, "incY %d != 0\n", gm.gmCellIncY); @@ -650,7 +648,6 @@ static void test_outline_font(void) SetLastError(0xdeadbeef); ret = GetGlyphOutlineA(hdc, 'A', GGO_METRICS, &gm, 0, NULL, &mat); ok(ret != GDI_ERROR, "GetGlyphOutlineA error %d\n", GetLastError()); - trace("gm.gmCellIncX %d, width_orig %d\n", gm.gmCellIncX, width_orig); pt.x = width_orig; pt.y = 0; LPtoDP(hdc, &pt, 1); ok(gm.gmCellIncX == pt.x, "incX %d != %d\n", gm.gmCellIncX, pt.x); @@ -661,7 +658,6 @@ static void test_outline_font(void) SetLastError(0xdeadbeef); ret = GetGlyphOutlineA(hdc, 'A', GGO_METRICS, &gm, 0, NULL, &mat2); ok(ret != GDI_ERROR, "GetGlyphOutlineA error %d\n", GetLastError()); - trace("gm.gmCellIncX %d, width_orig %d\n", gm.gmCellIncX, width_orig); pt.x = width_orig; pt.y = 0; LPtoDP(hdc, &pt, 1); ok(gm.gmCellIncX == pt.x/2, "incX %d != %d\n", gm.gmCellIncX, pt.x/2); @@ -679,7 +675,6 @@ static void test_outline_font(void) SetLastError(0xdeadbeef); ret = GetGlyphOutlineA(hdc, 'A', GGO_METRICS, &gm, 0, NULL, &mat); ok(ret != GDI_ERROR, "GetGlyphOutlineA error %d\n", GetLastError()); - trace("gm.gmCellIncX %d, width_orig %d\n", gm.gmCellIncX, width_orig); pt.x = width_orig; pt.y = 0; LPtoDP(hdc, &pt, 1); ok(near_match(gm.gmCellIncX, pt.x), "incX %d != %d\n", gm.gmCellIncX, pt.x); @@ -689,7 +684,6 @@ static void test_outline_font(void) SetLastError(0xdeadbeef); ret = GetGlyphOutlineA(hdc, 'A', GGO_METRICS, &gm, 0, NULL, &mat2); ok(ret != GDI_ERROR, "GetGlyphOutlineA error %d\n", GetLastError()); - trace("gm.gmCellIncX %d, width_orig %d\n", gm.gmCellIncX, width_orig); pt.x = width_orig; pt.y = 0; LPtoDP(hdc, &pt, 1); ok(near_match(gm.gmCellIncX, (pt.x + 1)/2), "incX %d != %d\n", gm.gmCellIncX, (pt.x + 1)/2); @@ -706,7 +700,6 @@ static void test_outline_font(void) SetLastError(0xdeadbeef); ret = GetGlyphOutlineA(hdc, 'A', GGO_METRICS, &gm, 0, NULL, &mat); ok(ret != GDI_ERROR, "GetGlyphOutlineA error %d\n", GetLastError()); - trace("gm.gmCellIncX %d, width_orig %d\n", gm.gmCellIncX, width_orig); pt.x = width_orig; pt.y = 0; LPtoDP(hdc, &pt, 1); ok(gm.gmCellIncX == pt.x, "incX %d != %d\n", gm.gmCellIncX, pt.x); @@ -717,7 +710,6 @@ static void test_outline_font(void) SetLastError(0xdeadbeef); ret = GetGlyphOutlineA(hdc, 'A', GGO_METRICS, &gm, 0, NULL, &mat2); ok(ret != GDI_ERROR, "GetGlyphOutlineA error %d\n", GetLastError()); - trace("gm.gmCellIncX %d, width_orig %d\n", gm.gmCellIncX, width_orig); pt.x = width_orig; pt.y = 0; LPtoDP(hdc, &pt, 1); ok(gm.gmCellIncX == pt.x/2, "incX %d != %d\n", gm.gmCellIncX, pt.x/2); @@ -1011,13 +1003,9 @@ static void test_bitmap_font_metrics(void) else ok(ret == expected_cs, "got charset %d, expected %d\n", ret, expected_cs); - trace("created %s, height %d charset %x dpi %d\n", face_name, tm.tmHeight, tm.tmCharSet, tm.tmDigitizedAspectX); - trace("expected %s, height %d scaled_height %d, dpi %d\n", fd[i].face_name, height, fd[i].scaled_height, fd[i].dpi); - if(fd[i].dpi == tm.tmDigitizedAspectX) { int skipme = 0; - trace("matched %s, height %d charset %x dpi %d\n", lf.lfFaceName, lf.lfHeight, lf.lfCharSet, fd[i].dpi); if (fd[i].skip_lang_id) { int si = 0; @@ -1384,7 +1372,7 @@ static void test_GetCharABCWidths(void) } ReleaseDC(NULL, hdc); - trace("ABC sign test for a variety of transforms:\n"); + /* ABC sign test for a variety of transforms */ memset(&lf, 0, sizeof(lf)); strcpy(lf.lfFaceName, "Tahoma"); lf.lfHeight = 20; @@ -1420,7 +1408,7 @@ static void test_GetCharABCWidths(void) ReleaseDC(hwnd, hdc); DestroyWindow(hwnd); - trace("RTL layout\n"); + /* RTL layout */ hwnd = CreateWindowExA(WS_EX_LAYOUTRTL, "static", "", WS_POPUP, 0,0,100,100, 0, 0, 0, NULL); hdc = GetDC(hwnd); @@ -1773,12 +1761,10 @@ static void test_GetKerningPairs(void) if (!is_font_installed(kd[i].face_name)) { - trace("%s is not installed so skipping this test\n", kd[i].face_name); + skip("%s is not installed so skipping this test\n", kd[i].face_name); continue; } - trace("testing font %s, height %d\n", kd[i].face_name, kd[i].height); - memset(&lf, 0, sizeof(lf)); strcpy(lf.lfFaceName, kd[i].face_name); lf.lfHeight = kd[i].height; @@ -1824,7 +1810,6 @@ todo_wine kd[i].otmusMinimumPPEM, otm.otmusMinimumPPEM); total_kern_pairs = GetKerningPairsW(hdc, 0, NULL); - trace("total_kern_pairs %u\n", total_kern_pairs); kern_pair = HeapAlloc(GetProcessHeap(), 0, total_kern_pairs * sizeof(*kern_pair)); /* Win98 (GetKerningPairsA) and XP behave differently here, the test @@ -1850,10 +1835,7 @@ todo_wine for (n = 0; n < ret; n++) { DWORD j; - /* Disabled to limit console spam */ - if (0 && kern_pair[n].wFirst < 127 && kern_pair[n].wSecond < 127) - trace("{'%c','%c',%d},\n", - kern_pair[n].wFirst, kern_pair[n].wSecond, kern_pair[n].iKernAmount); + for (j = 0; j < kd[i].total_kern_pairs; j++) { if (kern_pair[n].wFirst == kd[i].kern_pair[j].wFirst && @@ -2231,7 +2213,6 @@ static void test_GetOutlineTextMetrics(void) hfont_old = SelectObject(hdc, hfont); otm_size = GetOutlineTextMetricsA(hdc, 0, NULL); - trace("otm buffer size %u (0x%x)\n", otm_size, otm_size); otm = HeapAlloc(GetProcessHeap(), 0, otm_size); @@ -2667,7 +2648,7 @@ static void test_GdiGetCodePage(void) HDC hdc; LOGFONTA lf; HFONT hfont; - UINT charset, acp; + UINT acp; DWORD codepage; int i; @@ -2701,10 +2682,7 @@ static void test_GdiGetCodePage(void) ok(hfont != 0, "CreateFontIndirectA error %u\n", GetLastError()); hfont = SelectObject(hdc, hfont); - charset = GetTextCharset(hdc); codepage = pGdiGetCodePage(hdc); - trace("acp=%d, lfFaceName=%s, lfCharSet=%d, GetTextCharset=%d, GdiGetCodePage=%d, expected codepage=%d\n", - acp, lf.lfFaceName, lf.lfCharSet, charset, codepage, matching_data[i].expected_codepage); ok(codepage == matching_data[i].expected_codepage, "GdiGetCodePage should have returned %d, got %d\n", matching_data[i].expected_codepage, codepage); @@ -2717,10 +2695,7 @@ static void test_GdiGetCodePage(void) ok(hfont != 0, "CreateFontIndirectA error %u\n", GetLastError()); hfont = SelectObject(hdc, hfont); - charset = GetTextCharset(hdc); codepage = pGdiGetCodePage(hdc); - trace("acp=%d, lfFaceName=%s, lfCharSet=%d, GetTextCharset=%d, GdiGetCodePage=%d\n", - acp, lf.lfFaceName, lf.lfCharSet, charset, codepage); ok(codepage == 1252, "GdiGetCodePage returned %d\n", codepage); hfont = SelectObject(hdc, hfont); @@ -2737,7 +2712,6 @@ static void test_GetFontUnicodeRanges(void) HFONT hfont, hfont_old; DWORD size; GLYPHSET *gs; - DWORD i; if (!pGetFontUnicodeRanges) { @@ -2758,17 +2732,13 @@ static void test_GetFontUnicodeRanges(void) size = pGetFontUnicodeRanges(hdc, NULL); ok(size, "GetFontUnicodeRanges failed unexpectedly\n"); - gs = HeapAlloc(GetProcessHeap(), 0, size); + gs = heap_alloc_zero(size); size = pGetFontUnicodeRanges(hdc, gs); ok(size, "GetFontUnicodeRanges failed\n"); + ok(gs->cRanges, "Unexpected ranges count.\n"); - if (0) /* Disabled to limit console spam */ - for (i = 0; i < gs->cRanges; i++) - trace("%03d wcLow %04x cGlyphs %u\n", i, gs->ranges[i].wcLow, gs->ranges[i].cGlyphs); - trace("found %u ranges\n", gs->cRanges); - - HeapFree(GetProcessHeap(), 0, gs); + heap_free(gs); SelectObject(hdc, hfont_old); DeleteObject(hfont); @@ -2805,9 +2775,6 @@ static INT CALLBACK arial_enum_proc(const LOGFONTA *lf, const TEXTMETRICA *tm, D ok(ntm->ntmCellHeight + ntm->ntmCellHeight/5 >= ntm->ntmSizeEM, "ntmCellHeight %d should be close to ntmSizeEM %d\n", ntm->ntmCellHeight, ntm->ntmSizeEM); - if (0) /* Disabled to limit console spam */ - trace("enumed font \"%s\", charset %d, height %d, weight %d, italic %d\n", - lf->lfFaceName, lf->lfCharSet, lf->lfHeight, lf->lfWeight, lf->lfItalic); if (efd->total >= efd->size) { efd->size = max( (efd->total + 1) * 2, 256 ); @@ -2831,9 +2798,6 @@ static INT CALLBACK arial_enum_procw(const LOGFONTW *lf, const TEXTMETRICW *tm, ok(ntm->ntmCellHeight + ntm->ntmCellHeight/5 >= ntm->ntmSizeEM, "ntmCellHeight %d should be close to ntmSizeEM %d\n", ntm->ntmCellHeight, ntm->ntmSizeEM); - if (0) /* Disabled to limit console spam */ - trace("enumed font %s, charset %d, height %d, weight %d, italic %d\n", - wine_dbgstr_w(lf->lfFaceName), lf->lfCharSet, lf->lfHeight, lf->lfWeight, lf->lfItalic); if (efd->total >= efd->size) { efd->size = max( (efd->total + 1) * 2, 256 ); @@ -2907,8 +2871,6 @@ static void test_EnumFontFamilies(const char *font_name, INT font_charset) HDC hdc; int i, ret, ansi_charset, symbol_charset, russian_charset; - trace("Testing font %s, charset %d\n", *font_name ? font_name : "<empty>", font_charset); - if (*font_name && !is_truetype_font_installed(font_name)) { skip("%s is not installed\n", font_name); @@ -2935,8 +2897,6 @@ static void test_EnumFontFamilies(const char *font_name, INT font_charset) if(ret) { get_charset_statsW(&efdw, &ansi_charset, &symbol_charset, &russian_charset); - trace("enumerated ansi %d, symbol %d, russian %d fonts for NULL\n", - ansi_charset, symbol_charset, russian_charset); ok(efdw.total > 0, "fonts enumerated: NULL\n"); ok(ansi_charset > 0, "NULL family should enumerate ANSI_CHARSET\n"); ok(symbol_charset > 0, "NULL family should enumerate SYMBOL_CHARSET\n"); @@ -2952,8 +2912,6 @@ static void test_EnumFontFamilies(const char *font_name, INT font_charset) if(ret) { get_charset_statsW(&efdw, &ansi_charset, &symbol_charset, &russian_charset); - trace("enumerated ansi %d, symbol %d, russian %d fonts for NULL\n", - ansi_charset, symbol_charset, russian_charset); ok(efdw.total > 0, "fonts enumerated: NULL\n"); ok(ansi_charset > 0, "NULL family should enumerate ANSI_CHARSET\n"); ok(symbol_charset > 0, "NULL family should enumerate SYMBOL_CHARSET\n"); @@ -2966,9 +2924,6 @@ static void test_EnumFontFamilies(const char *font_name, INT font_charset) ret = EnumFontFamiliesA(hdc, font_name, arial_enum_proc, (LPARAM)&efd); ok(ret, "EnumFontFamilies error %u\n", GetLastError()); get_charset_stats(&efd, &ansi_charset, &symbol_charset, &russian_charset); - trace("enumerated ansi %d, symbol %d, russian %d fonts for %s\n", - ansi_charset, symbol_charset, russian_charset, - *font_name ? font_name : "<empty>"); if (*font_name) ok(efd.total > 0, "no fonts enumerated: %s\n", font_name); else @@ -2990,9 +2945,6 @@ static void test_EnumFontFamilies(const char *font_name, INT font_charset) ret = EnumFontFamiliesExA(hdc, &lf, arial_enum_proc, (LPARAM)&efd, 0); ok(ret, "EnumFontFamiliesEx error %u\n", GetLastError()); get_charset_stats(&efd, &ansi_charset, &symbol_charset, &russian_charset); - trace("enumerated ansi %d, symbol %d, russian %d fonts for %s ANSI_CHARSET\n", - ansi_charset, symbol_charset, russian_charset, - *font_name ? font_name : "<empty>"); if (font_charset == SYMBOL_CHARSET) { if (*font_name) @@ -3021,9 +2973,6 @@ static void test_EnumFontFamilies(const char *font_name, INT font_charset) EnumFontFamiliesExA(hdc, &lf, arial_enum_proc, (LPARAM)&efd, 0); ok(ret, "EnumFontFamiliesEx error %u\n", GetLastError()); get_charset_stats(&efd, &ansi_charset, &symbol_charset, &russian_charset); - trace("enumerated ansi %d, symbol %d, russian %d fonts for %s DEFAULT_CHARSET\n", - ansi_charset, symbol_charset, russian_charset, - *font_name ? font_name : "<empty>"); ok(efd.total > 0, "no fonts enumerated: %s DEFAULT_CHARSET\n", font_name); for (i = 0; i < efd.total; i++) { @@ -3079,9 +3028,6 @@ static void test_EnumFontFamilies(const char *font_name, INT font_charset) EnumFontFamiliesExA(hdc, &lf, arial_enum_proc, (LPARAM)&efd, 0); ok(ret, "EnumFontFamiliesEx error %u\n", GetLastError()); get_charset_stats(&efd, &ansi_charset, &symbol_charset, &russian_charset); - trace("enumerated ansi %d, symbol %d, russian %d fonts for %s SYMBOL_CHARSET\n", - ansi_charset, symbol_charset, russian_charset, - *font_name ? font_name : "<empty>"); if (*font_name && font_charset == ANSI_CHARSET) ok(efd.total == 0, "no fonts should be enumerated: %s SYMBOL_CHARSET\n", font_name); else @@ -3200,7 +3146,6 @@ static void test_EnumFontFamiliesEx_default_charset(void) EnumFontFamiliesExA(hdc, &enum_font, enum_font_data_proc, (LPARAM)&efd, 0); ReleaseDC(0, hdc); - trace("'%s' has %d charsets.\n", target.lfFaceName, efd.total); if (efd.total < 2) ok(0, "EnumFontFamilies is broken. Expected >= 2, got %d.\n", efd.total); else @@ -3504,7 +3449,7 @@ static BOOL get_first_last_from_cmap(HDC hdc, DWORD *first, DWORD *last, cmap_ty r = get_first_last_from_cmap4(cmap, first, last, size); break; default: - trace("unhandled cmap format %d\n", format); + skip("unhandled cmap format %d\n", format); break; } @@ -3746,17 +3691,17 @@ static BOOL get_ttf_nametable_entry(HDC hdc, WORD name_id, WCHAR *out_buf, SIZE_ header->storage_offset = GET_BE_WORD(header->storage_offset); if (header->format != 0) { - trace("got format %u\n", header->format); + skip("got format %u\n", header->format); goto out; } if (header->number_of_record == 0 || sizeof(*header) + header->number_of_record * sizeof(*entry) > size) { - trace("number records out of range: %d\n", header->number_of_record); + skip("number records out of range: %d\n", header->number_of_record); goto out; } if (header->storage_offset >= size) { - trace("storage_offset %u > size %u\n", header->storage_offset, size); + skip("storage_offset %u > size %u\n", header->storage_offset, size); goto out; } @@ -3776,12 +3721,12 @@ static BOOL get_ttf_nametable_entry(HDC hdc, WORD name_id, WCHAR *out_buf, SIZE_ length = GET_BE_WORD(entry[best_index].length); if (offset + length > size) { - trace("entry %d is out of range\n", best_index); + skip("entry %d is out of range\n", best_index); goto out; } if (length >= out_size) { - trace("buffer too small for entry %d\n", best_index); + skip("buffer too small for entry %d\n", best_index); goto out; } @@ -4041,7 +3986,6 @@ static void test_GetTextMetrics(void) lf.lfCharSet = DEFAULT_CHARSET; enumed = 0; EnumFontFamiliesExA(hdc, &lf, enum_truetype_font_proc, (LPARAM)&enumed, 0); - trace("Tested metrics of %d truetype fonts\n", enumed); ReleaseDC(0, hdc); } @@ -4821,8 +4765,6 @@ static void test_GetGlyphOutline(void) ok(ret, "GetTextMetrics error %u\n", GetLastError()); ret = GetGlyphOutlineA(hdc, c[i].a, GGO_METRICS, &gm2, 0, NULL, &mat); ok(ret != GDI_ERROR, "GetGlyphOutlineA error %u\n", GetLastError()); - trace("Tests with height=%d,avg=%d,full=%d,face=%s,charset=%d\n", - -lf.lfHeight, tm.tmAveCharWidth, gm2.gmCellIncX, lf.lfFaceName, lf.lfCharSet); ok(gm2.gmCellIncX == tm.tmAveCharWidth * 2 || broken(gm2.gmCellIncX == -lf.lfHeight), "expected %d, got %d (%s:%d)\n", tm.tmAveCharWidth * 2, gm2.gmCellIncX, lf.lfFaceName, lf.lfCharSet); @@ -4870,7 +4812,7 @@ static void test_GetTextMetrics2(const char *fontname, int font_height) HDC hdc; TEXTMETRICA tm; BOOL ret; - int ave_width, height, width, ratio, scale; + int ave_width, height, width, ratio; if (!is_truetype_font_installed( fontname)) { skip("%s is not installed\n", fontname); @@ -4892,8 +4834,6 @@ static void test_GetTextMetrics2(const char *fontname, int font_height) SelectObject( hdc, of); DeleteObject( hf); - trace("height %d, ave width %d\n", height, ave_width); - for (width = ave_width * 2; /* nothing*/; width += ave_width) { hf = CreateFontA(height, width, 0, 0, FW_REGULAR, FALSE, FALSE, FALSE, @@ -4913,10 +4853,6 @@ static void test_GetTextMetrics2(const char *fontname, int font_height) DeleteDC(hdc); ratio = width / height; - scale = width / ave_width; - - trace("max width/height ratio (%d / %d) %d, max width scale (%d / %d) %d\n", - width, height, ratio, width, ave_width, scale); ok(ratio >= 90 && ratio <= 110, "expected width/height ratio 90-110, got %d\n", ratio); } @@ -6245,7 +6181,6 @@ static void test_vertical_font(void) skip("%s is not installed\n", face); continue; } - trace("Testing %s...\n", face); check_vertical_metrics(&face[1]); } -- 2.25.0

1 0

[PATCH] mf/tests: Add some tests for SAR time source.
by Nikolay Sivov 26 Feb '20

26 Feb '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/tests/mf.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index a1a7d2b05a..8f3a80360f 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -2555,7 +2555,11 @@ static void test_quality_manager(void) static void test_sar(void) { IMFPresentationTimeSource *time_source; + IMFClockStateSink *state_sink; + MFCLOCK_STATE state; IMFMediaSink *sink; + IMFClock *clock; + DWORD flags; HRESULT hr; hr = CoInitialize(NULL); @@ -2576,6 +2580,26 @@ if (SUCCEEDED(hr)) { hr = IMFMediaSink_QueryInterface(sink, &IID_IMFPresentationTimeSource, (void **)&time_source); ok(hr == S_OK, "Failed to get time source interface, hr %#x.\n", hr); + + hr = IMFPresentationTimeSource_GetUnderlyingClock(time_source, &clock); + ok(hr == MF_E_NO_CLOCK, "Unexpected hr %#x.\n", hr); + + hr = IMFPresentationTimeSource_GetClockCharacteristics(time_source, &flags); + ok(hr == S_OK, "Failed to get flags, hr %#x.\n", hr); + ok(flags == MFCLOCK_CHARACTERISTICS_FLAG_FREQUENCY_10MHZ, "Unexpected flags %#x.\n", flags); + + hr = IMFPresentationTimeSource_GetState(time_source, 0, &state); + ok(hr == S_OK, "Failed to get clock state, hr %#x.\n", hr); + ok(state == MFCLOCK_STATE_INVALID, "Unexpected state %d.\n", state); + + hr = IMFPresentationTimeSource_QueryInterface(time_source, &IID_IMFClockStateSink, (void **)&state_sink); + ok(hr == S_OK, "Failed to get state sink, hr %#x.\n", hr); + + hr = IMFClockStateSink_OnClockStart(state_sink, 0, 0); + ok(hr == MF_E_NOT_INITIALIZED, "Unexpected hr %#x.\n", hr); + + IMFClockStateSink_Release(state_sink); + IMFPresentationTimeSource_Release(time_source); IMFMediaSink_Release(sink); -- 2.25.0

1 0

[PATCH 4/4] include: Make sys/stat.h compatible with ucrt.
by Jacek Caban 26 Feb '20

26 Feb '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/msvcrt/sys/stat.h | 56 +++++++++++++++++++++++++++++++-------- 1 file changed, 45 insertions(+), 11 deletions(-)

1 0

[PATCH 3/4] include: Make corecrt_wio.h compatible with ucrt.
by Jacek Caban 26 Feb '20

26 Feb '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/msvcrt/corecrt_wio.h | 92 +++++++++++++++++++++++++++++------- 1 file changed, 74 insertions(+), 18 deletions(-)

1 0

[PATCH 2/4] include: Make corecrt_wtime.h compatible with ucrt.
by Jacek Caban 26 Feb '20

26 Feb '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/msvcrt/corecrt_wtime.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)

1 0

[PATCH 1/4] include: Make time.h compatible with ucrt.
by Jacek Caban 26 Feb '20

26 Feb '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- mingw-w64 does a lot of it in importlibs using "==" def aliases. This is a nice way to avoid _UCRT #ifdefs, but we don't have syntax for that in spec files. include/msvcrt/time.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)

1 0

[PATCH v2 1/2] vbscript: Don't overwrite the host_global if already set.
by Gabriel Ivăncescu 26 Feb '20

26 Feb '20

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- This is needed to pass the tests in next patch. dlls/vbscript/vbscript.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index 27985bf..1df6a29 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -676,10 +676,10 @@ static HRESULT WINAPI VBScript_AddNamedItem(IActiveScript *iface, LPCOLESTR pstr return hres; } - if(This->ctx->host_global) - IDispatch_Release(This->ctx->host_global); - IDispatch_AddRef(disp); - This->ctx->host_global = disp; + if(!This->ctx->host_global) { + IDispatch_AddRef(disp); + This->ctx->host_global = disp; + } } item = heap_alloc(sizeof(*item)); -- 2.21.0

1 1

[PATCH] gdi32: Handle 0 count in GetCharacterPlacementW.
by Sven Baars 26 Feb '20

26 Feb '20

Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> --- dlls/gdi32/font.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index d451f30c3e..8788426a2c 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -3313,6 +3313,9 @@ GetCharacterPlacementW( TRACE("%s, %d, %d, 0x%08x\n", debugstr_wn(lpString, uCount), uCount, nMaxExtent, dwFlags); + if (!uCount) + return 0; + if (!lpResults) return GetTextExtentPoint32W(hdc, lpString, uCount, &size) ? MAKELONG(size.cx, size.cy) : 0; -- 2.24.0

4 9

netconnection.c:300：create_netconn_socket: Assertion 'server->addr_len' failed.
by 何文阳 26 Feb '20

26 Feb '20

When running Tencent QQ on Wine, I get this error which caused the program to crash: netconnection.c:300：create_netconn_socket: Assertion 'server->addr_len' failed. It appears that on line 300 of the source file, there was an assertion checking for `server->addr_len` which failed. I suspect this was because of the application misuing the API and filling the struct without setting the `addr_len` field. However, Windows is already full of legacy hacks and it might be sensible to just ignore that field and remove the assertion. I'm just a regular user of Wine and does not really understand the source code yet, but it would be helpful if a Wine developer who has a better understanding of the source code to look at this line and make the modifications. Thanks!

2 1

[tools] testbot/WineRunReconfig: Clarify the email in case of a failed build.
by Francois Gouget 26 Feb '20

26 Feb '20

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineRunReconfig.pl | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 13557c1007..969741f2ee 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -436,9 +436,11 @@ if ($TA->GetFile("Reconfig.log", "$TaskDir/task.log")) { # We should not have badpatch errors and if the result line is missing we # probably already have an error message that explains why. + my $Status = $LogInfo->{Task} eq "missing" ? + "the log contains no status line." : + "the last log status line says $LogInfo->{Task}."; NotifyAdministrator("The ". $VM->Name ." build failed", - "The ". $VM->Name ." build failed:\n\n". - "$LogInfo->{Task}\n\n". + "The ". $VM->Name ." build failed and $Status\n\n". "See the link below for more details:\n". MakeSecureURL(GetTaskURL($JobId, $StepNo, $TaskNo)) ."\n"); $NewStatus = "badbuild"; -- 2.20.1

1 0

[tools] testbot: Don't overwrite existing patch series parts.
by Francois Gouget 26 Feb '20

26 Feb '20

Assume any new email bearing the same part number is either a reply, or a collision from another series and should thus be ignored. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47042 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/PendingPatchSets.pm | 46 +++++++++++---------- 1 file changed, 24 insertions(+), 22 deletions(-) diff --git a/testbot/lib/WineTestBot/PendingPatchSets.pm b/testbot/lib/WineTestBot/PendingPatchSets.pm index adabf2e6c1..cfa6dc0e59 100644 --- a/testbot/lib/WineTestBot/PendingPatchSets.pm +++ b/testbot/lib/WineTestBot/PendingPatchSets.pm @@ -243,50 +243,52 @@ sub NewSubmission($$$) my $Parts = $Set->Parts; my $Part = $Parts->GetItem($SubjectInfo->{PartNo}); - if (! defined($Part)) + if ($Part) { - $Part = $Parts->Add(); - $Part->No($SubjectInfo->{PartNo}); + $Patch->Disposition("Existing part reply / collision"); + return undef; } + $Part = $Parts->Add(); + $Part->No($SubjectInfo->{PartNo}); $Part->Patch($Patch); my ($_ErrKey, $_ErrProperty, $ErrMessage) = $self->Save(); if (defined($ErrMessage)) { $Patch->Disposition("Error occurred during series processing"); + return undef; } if (! $Set->CheckSubsetComplete($SubjectInfo->{PartNo})) { $Patch->Disposition("Set not complete yet"); + return undef; } - else + + my $PartNo = $SubjectInfo->{PartNo}; + my $AllPartsAvailable = 1; + while ($PartNo <= $Set->TotalParts && $AllPartsAvailable && + !defined $ErrMessage) { - my $PartNo = $SubjectInfo->{PartNo}; - my $AllPartsAvailable = 1; - while ($PartNo <= $Set->TotalParts && $AllPartsAvailable && - ! defined($ErrMessage)) + my $Part = $Parts->GetItem($PartNo); + if (defined $Part) { - my $Part = $Parts->GetItem($PartNo); - if (defined($Part)) + $ErrMessage = $Set->SubmitSubset($PartNo, $Part->Patch); + if (!defined $ErrMessage) { - $ErrMessage = $Set->SubmitSubset($PartNo, $Part->Patch); - if (!defined $ErrMessage) - { - ($_ErrProperty, $ErrMessage) = $Part->Patch->Save(); - } + ($_ErrProperty, $ErrMessage) = $Part->Patch->Save(); } - else - { - $AllPartsAvailable = !1; - } - $PartNo++; } - if ($AllPartsAvailable && ! defined($ErrMessage)) + else { - $self->DeleteItem($Set); + $AllPartsAvailable = !1; } + $PartNo++; + } + if ($AllPartsAvailable && ! defined($ErrMessage)) + { + $self->DeleteItem($Set); } return $ErrMessage; -- 2.20.1

1 0

[PATCH v2] ws2_32: Fix return values of WSCGetProviderPath() stub
by Aaro Altonen 26 Feb '20

26 Feb '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45801 Signed-off-by: Aaro Altonen <a.altonen(a)hotmail.com> --- v2: - Fix test breakage on Windows, error for invalid GUID should be WSAEINVAL --- dlls/ws2_32/socket.c | 17 +++++++++++++---- dlls/ws2_32/tests/sock.c | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+), 4 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index c284f595ab..3beb704c22 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -9006,12 +9006,21 @@ INT WINAPI WSCEnableNSProvider( LPGUID provider, BOOL enable ) */ INT WINAPI WSCGetProviderPath( LPGUID provider, LPWSTR path, LPINT len, LPINT errcode ) { - FIXME( "(%s %p %p %p) Stub!\n", debugstr_guid(provider), path, len, errcode ); + if (!provider || !len) { + if (errcode) + *errcode = WSAEFAULT; + return SOCKET_ERROR; + } - if (!errcode || !provider || !len) return WSAEFAULT; + FIXME("WSCGetProviderPath not implemented.\n"); - *errcode = WSAEINVAL; - return SOCKET_ERROR; + if (*len <= 0) { + if (errcode) + *errcode = WSAEFAULT; + return SOCKET_ERROR; + } + + return 0; } /*********************************************************************** diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 60c5dfc63f..83c758d535 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -84,6 +84,7 @@ static int (WINAPI *pWSALookupServiceNextW)(HANDLE,DWORD,LPDWORD,LPWSAQUERYSET static int (WINAPI *pWSAEnumNameSpaceProvidersA)(LPDWORD,LPWSANAMESPACE_INFOA); static int (WINAPI *pWSAEnumNameSpaceProvidersW)(LPDWORD,LPWSANAMESPACE_INFOW); static int (WINAPI *pWSAPoll)(WSAPOLLFD *,ULONG,INT); +static int (WINAPI *pWSCGetProviderPath)(LPGUID, LPWSTR, LPINT, LPINT); /* Function pointers from iphlpapi */ static DWORD (WINAPI *pGetAdaptersInfo)(PIP_ADAPTER_INFO,PULONG); @@ -1300,6 +1301,7 @@ static void Init (void) pWSAEnumNameSpaceProvidersA = (void *)GetProcAddress(hws2_32, "WSAEnumNameSpaceProvidersA"); pWSAEnumNameSpaceProvidersW = (void *)GetProcAddress(hws2_32, "WSAEnumNameSpaceProvidersW"); pWSAPoll = (void *)GetProcAddress(hws2_32, "WSAPoll"); + pWSCGetProviderPath = (void *)GetProcAddress(hws2_32, "WSCGetProviderPath"); hiphlpapi = LoadLibraryA("iphlpapi.dll"); if (hiphlpapi) @@ -10600,6 +10602,41 @@ static void test_address_list_query(void) closesocket(s); } +static void test_WSCGetProviderPath(void) +{ + GUID ProviderIdIP = { 0x0, 0x0, 0x0, { 0x0, 0x0, 0x00, 0x0, 0x0, 0x0, 0x0, 0x0 } }; + wchar_t buffer[256]; + INT ret, err, len; + + ret = pWSCGetProviderPath(NULL, NULL, NULL, NULL); + ok(ret == SOCKET_ERROR, "Got unexpected ret %d.\n", ret); + + ret = pWSCGetProviderPath(&ProviderIdIP, NULL, NULL, NULL); + ok(ret == SOCKET_ERROR, "Got unexpected ret %d.\n", ret); + + ret = pWSCGetProviderPath(NULL, NULL, NULL, &err); + ok(ret == SOCKET_ERROR, "Got unexpected ret %d.\n", ret); + ok(err == WSAEFAULT, "Got unexpected error %d.\n", err); + + ret = pWSCGetProviderPath(&ProviderIdIP, NULL, NULL, &err); + ok(ret == SOCKET_ERROR, "Got unexpected ret %d.\n", ret); + ok(err == WSAEFAULT, "Got unexpected error %d.\n", err); + + /* WSCGetProviderPath() can be used determine the path length + * "ret" is SOCKET_ERROR and "len" will contain the length */ + err = 0; + ret = pWSCGetProviderPath(&ProviderIdIP, NULL, &len, &err); + todo_wine ok(ret == SOCKET_ERROR, "Got unexpected ret %d.\n", ret); + todo_wine ok(err == WSAEINVAL, "Got unexpected error %d.\n", err); + + /* Valid pointers and length but invalid GUID */ + err = 0; + len = 256; + ret = pWSCGetProviderPath(&ProviderIdIP, buffer, &len, &err); + todo_wine ok(ret == SOCKET_ERROR, "Got unexpected ret %d.\n", ret); + todo_wine ok(err == WSAEINVAL, "Got unexpected error %d.\n", err); +} + static DWORD WINAPI inet_ntoa_thread_proc(void *param) { ULONG addr; @@ -11681,6 +11718,8 @@ START_TEST( sock ) test_completion_port(); test_address_list_query(); + test_WSCGetProviderPath(); + /* this is an io heavy test, do it at the end so the kernel doesn't start dropping packets */ test_send(); test_synchronous_WSAIoctl(); -- 2.25.1

2 1

[PATCH] po: Update Lithuanian translation
by Aurimas Fišeras 26 Feb '20

26 Feb '20

1 0

[PATCH v2 1/5] mp3dmod/tests: Test IMediaBuffer reference counting.
by Zebediah Figura 26 Feb '20

26 Feb '20

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/mp3dmod/tests/mp3dmod.c | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/dlls/mp3dmod/tests/mp3dmod.c b/dlls/mp3dmod/tests/mp3dmod.c index 99d52e6fd77..1d404248cc1 100644 --- a/dlls/mp3dmod/tests/mp3dmod.c +++ b/dlls/mp3dmod/tests/mp3dmod.c @@ -40,8 +40,10 @@ static REFERENCE_TIME samplelen(DWORD samples, int rate) return (REFERENCE_TIME) 10000000 * samples / rate; } -struct test_buffer { +struct test_buffer +{ IMediaBuffer IMediaBuffer_iface; + LONG refcount; BYTE data[5000]; DWORD len; DWORD maxlen; @@ -65,12 +67,14 @@ static HRESULT WINAPI Buffer_QueryInterface(IMediaBuffer *iface, REFIID iid, voi static ULONG WINAPI Buffer_AddRef(IMediaBuffer *iface) { - return 2; + struct test_buffer *buffer = impl_from_IMediaBuffer(iface); + return InterlockedIncrement(&buffer->refcount); } static ULONG WINAPI Buffer_Release(IMediaBuffer *iface) { - return 1; + struct test_buffer *buffer = impl_from_IMediaBuffer(iface); + return InterlockedDecrement(&buffer->refcount); } static HRESULT WINAPI Buffer_SetLength(IMediaBuffer *iface, DWORD len) @@ -107,8 +111,8 @@ static IMediaBufferVtbl Buffer_vtbl = { static void test_convert(void) { static const BYTE mp3hdr[] = {0xff,0xfb,0x14,0xc4}; - struct test_buffer outbuf = {{&Buffer_vtbl}}; - struct test_buffer inbuf = {{&Buffer_vtbl}}; + struct test_buffer outbuf = {.IMediaBuffer_iface = {&Buffer_vtbl}, .refcount = 1}; + struct test_buffer inbuf = {.IMediaBuffer_iface = {&Buffer_vtbl}, .refcount = 1}; DMO_MEDIA_TYPE in = {{0}}, out = {{0}}; MPEGLAYER3WAVEFORMAT mp3fmt = {{0}}; DMO_OUTPUT_DATA_BUFFER output; @@ -169,6 +173,7 @@ static void test_convert(void) inbuf.len = 96 * 5; hr = IMediaObject_ProcessInput(dmo, 0, &inbuf.IMediaBuffer_iface, 0, 0, 0); ok(hr == S_OK, "got %#x\n", hr); + ok(inbuf.refcount == 2, "Got refcount %d.\n", inbuf.refcount); hr = IMediaObject_ProcessInput(dmo, 0, &inbuf.IMediaBuffer_iface, 0, 0, 0); ok(hr == DMO_E_NOTACCEPTING, "got %#x\n", hr); @@ -194,6 +199,8 @@ static void test_convert(void) ok(output.rtTimestamp == 0, "got %s\n", wine_dbgstr_longlong(output.rtTimestamp)); ok(output.rtTimelength == samplelen(written, 48000), "got %s\n", wine_dbgstr_longlong(output.rtTimelength)); + ok(inbuf.refcount == 2, "Got refcount %d.\n", inbuf.refcount); + ok(outbuf.refcount == 1, "Got refcount %d.\n", inbuf.refcount); hr = IMediaObject_ProcessOutput(dmo, 0, 1, &output, &status); ok(hr == S_FALSE, "got %#x\n", hr); @@ -205,6 +212,8 @@ static void test_convert(void) hr = IMediaObject_ProcessInput(dmo, 0, &inbuf.IMediaBuffer_iface, 0, 0, 0); ok(hr == DMO_E_NOTACCEPTING, "got %#x\n", hr); + ok(inbuf.refcount == 2, "Got refcount %d.\n", inbuf.refcount); + ok(outbuf.refcount == 1, "Got refcount %d.\n", inbuf.refcount); /* write the rest */ outbuf.len = 0; @@ -219,6 +228,8 @@ static void test_convert(void) "got %s\n", wine_dbgstr_longlong(output.rtTimestamp)); ok(output.rtTimelength == samplelen(outbuf.len, 48000), "got %s\n", wine_dbgstr_longlong(output.rtTimelength)); + ok(inbuf.refcount == 1, "Got refcount %d.\n", inbuf.refcount); + ok(outbuf.refcount == 1, "Got refcount %d.\n", inbuf.refcount); hr = IMediaObject_ProcessOutput(dmo, 0, 1, &output, &status); ok(hr == S_FALSE, "got %#x\n", hr); @@ -228,6 +239,8 @@ static void test_convert(void) ok(hr == S_OK, "got %#x\n", hr); IMediaObject_Release(dmo); + todo_wine ok(inbuf.refcount == 1, "Got outstanding refcount %d.\n", inbuf.refcount); + ok(outbuf.refcount == 1, "Got outstanding refcount %d.\n", outbuf.refcount); } static const GUID IID_test_outer = {0xdeadbeef,0,0,{0,0,0,0,0,0,0,0x66}}; -- 2.25.0

1 4

[PATCH v3 1/3] amstream: Implement AMAudioStream::GetFormat.
by Zebediah Figura 26 Feb '20

26 Feb '20

From: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- v3: Resent with stylistic changes. dlls/amstream/audiostream.c | 21 +++-- dlls/amstream/tests/Makefile.in | 2 +- dlls/amstream/tests/amstream.c | 155 ++++++++++++++++++++++++++++++-- 3 files changed, 166 insertions(+), 12 deletions(-) diff --git a/dlls/amstream/audiostream.c b/dlls/amstream/audiostream.c index 2875e1f59b7..544f70a75cd 100644 --- a/dlls/amstream/audiostream.c +++ b/dlls/amstream/audiostream.c @@ -495,17 +495,28 @@ static HRESULT WINAPI audio_IAudioMediaStream_SendEndOfStream(IAudioMediaStream } /*** IAudioMediaStream methods ***/ -static HRESULT WINAPI audio_IAudioMediaStream_GetFormat(IAudioMediaStream *iface, WAVEFORMATEX *wave_format_current) +static HRESULT WINAPI audio_IAudioMediaStream_GetFormat(IAudioMediaStream *iface, WAVEFORMATEX *format) { - struct audio_stream *This = impl_from_IAudioMediaStream(iface); + struct audio_stream *stream = impl_from_IAudioMediaStream(iface); - FIXME("(%p/%p)->(%p) stub!\n", iface, This, wave_format_current); + TRACE("stream %p, format %p.\n", stream, format); - if (!wave_format_current) + if (!format) return E_POINTER; - return MS_E_NOSTREAM; + EnterCriticalSection(&stream->cs); + if (!stream->peer) + { + LeaveCriticalSection(&stream->cs); + return MS_E_NOSTREAM; + } + + *format = *(WAVEFORMATEX *)stream->mt.pbFormat; + + LeaveCriticalSection(&stream->cs); + + return S_OK; } static HRESULT WINAPI audio_IAudioMediaStream_SetFormat(IAudioMediaStream *iface, const WAVEFORMATEX *wave_format) diff --git a/dlls/amstream/tests/Makefile.in b/dlls/amstream/tests/Makefile.in index 3a1a269feae..81eaed3c152 100644 --- a/dlls/amstream/tests/Makefile.in +++ b/dlls/amstream/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = amstream.dll -IMPORTS = strmiids uuid ddraw ole32 user32 +IMPORTS = strmbase strmiids uuid ddraw ole32 user32 C_SRCS = \ amstream.c diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 6497dde91c3..743dbb99cc0 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -27,6 +27,7 @@ #include "ks.h" #include "initguid.h" #include "ksmedia.h" +#include "wine/strmbase.h" static const WCHAR primary_video_sink_id[] = L"I{A35FF56A-9FDA-11D0-8FDF-00C04FD9189D}"; static const WCHAR primary_audio_sink_id[] = L"I{A35FF56B-9FDA-11D0-8FDF-00C04FD9189D}"; @@ -987,16 +988,10 @@ static void test_media_streams(void) if (SUCCEEDED(hr)) { IAudioData* audio_data = NULL; - WAVEFORMATEX format; hr = CoCreateInstance(&CLSID_AMAudioData, NULL, CLSCTX_INPROC_SERVER, &IID_IAudioData, (void **)&audio_data); ok(hr == S_OK, "CoCreateInstance returned: %x\n", hr); - hr = IAudioMediaStream_GetFormat(audio_media_stream, NULL); - ok(hr == E_POINTER, "IAudioMediaStream_GetFormat returned: %x\n", hr); - hr = IAudioMediaStream_GetFormat(audio_media_stream, &format); - ok(hr == MS_E_NOSTREAM, "IAudioMediaStream_GetFormat returned: %x\n", hr); - hr = IAudioMediaStream_CreateSample(audio_media_stream, NULL, 0, &audio_sample); ok(hr == E_POINTER, "IAudioMediaStream_CreateSample returned: %x\n", hr); hr = IAudioMediaStream_CreateSample(audio_media_stream, audio_data, 0, &audio_sample); @@ -2293,6 +2288,152 @@ out_unknown: IUnknown_Release(unknown); } +struct testfilter +{ + struct strmbase_filter filter; + struct strmbase_source source; +}; + +static inline struct testfilter *impl_from_BaseFilter(struct strmbase_filter *iface) +{ + return CONTAINING_RECORD(iface, struct testfilter, filter); +} + +static struct strmbase_pin *testfilter_get_pin(struct strmbase_filter *iface, unsigned int index) +{ + struct testfilter *filter = impl_from_BaseFilter(iface); + if (!index) + return &filter->source.pin; + return NULL; +} + +static void testfilter_destroy(struct strmbase_filter *iface) +{ + struct testfilter *filter = impl_from_BaseFilter(iface); + strmbase_source_cleanup(&filter->source); + strmbase_filter_cleanup(&filter->filter); +} + +static const struct strmbase_filter_ops testfilter_ops = +{ + .filter_get_pin = testfilter_get_pin, + .filter_destroy = testfilter_destroy, +}; + +static HRESULT testsource_query_accept(struct strmbase_pin *iface, const AM_MEDIA_TYPE *mt) +{ + return S_OK; +} + +static HRESULT WINAPI testsource_DecideAllocator(struct strmbase_source *iface, + IMemInputPin *peer, IMemAllocator **allocator) +{ + return S_OK; +} + +static const struct strmbase_source_ops testsource_ops = +{ + .base.pin_query_accept = testsource_query_accept, + .base.pin_get_media_type = strmbase_pin_get_media_type, + .pfnAttemptConnection = BaseOutputPinImpl_AttemptConnection, + .pfnDecideAllocator = testsource_DecideAllocator, +}; + +static void testfilter_init(struct testfilter *filter) +{ + static const GUID clsid = {0xabacab}; + strmbase_filter_init(&filter->filter, NULL, &clsid, &testfilter_ops); + strmbase_source_init(&filter->source, &filter->filter, L"", &testsource_ops); +} + +static void test_audiostream_get_format(void) +{ + static const WAVEFORMATEX pin_format = + { + .wFormatTag = WAVE_FORMAT_PCM, + .nChannels = 2, + .nSamplesPerSec = 44100, + .wBitsPerSample = 16, + .nBlockAlign = 4, + .nAvgBytesPerSec = 4 * 44100, + }; + AM_MEDIA_TYPE mt = + { + .majortype = MEDIATYPE_Audio, + .subtype = MEDIASUBTYPE_PCM, + .formattype = FORMAT_WaveFormatEx, + .cbFormat = sizeof(WAVEFORMATEX), + .pbFormat = (BYTE *)&pin_format, + }; + IAMMultiMediaStream *mmstream = create_ammultimediastream(); + IAudioMediaStream *audio_stream; + struct testfilter source; + IGraphBuilder *graph; + IMediaStream *stream; + WAVEFORMATEX format; + HRESULT hr; + ULONG ref; + IPin *pin; + + hr = IAMMultiMediaStream_Initialize(mmstream, STREAMTYPE_READ, 0, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAMMultiMediaStream_AddMediaStream(mmstream, NULL, &MSPID_PrimaryAudio, 0, &stream); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaStream_QueryInterface(stream, &IID_IAudioMediaStream, (void **)&audio_stream); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaStream_QueryInterface(stream, &IID_IPin, (void **)&pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAMMultiMediaStream_GetFilterGraph(mmstream, &graph); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!!graph, "Expected non-NULL graph.\n"); + + testfilter_init(&source); + + hr = IGraphBuilder_AddFilter(graph, &source.filter.IBaseFilter_iface, L"source"); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAudioMediaStream_GetFormat(audio_stream, NULL); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + + hr = IAudioMediaStream_GetFormat(audio_stream, &format); + ok(hr == MS_E_NOSTREAM, "Got hr %#x.\n", hr); + + hr = IGraphBuilder_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + memset(&format, 0xcc, sizeof(format)); + hr = IAudioMediaStream_GetFormat(audio_stream, &format); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(format.wFormatTag == WAVE_FORMAT_PCM, "Got tag %#x.\n", format.wFormatTag); + ok(format.nChannels == 2, "Got %u channels.\n", format.nChannels); + ok(format.nSamplesPerSec == 44100, "Got sample rate %u.\n", format.nSamplesPerSec); + ok(format.nAvgBytesPerSec == 176400, "Got %u bytes/sec.\n", format.nAvgBytesPerSec); + ok(format.nBlockAlign == 4, "Got alignment %u.\n", format.nBlockAlign); + ok(format.wBitsPerSample == 16, "Got %u bits/sample.\n", format.wBitsPerSample); + ok(!format.cbSize, "Got extra size %u.\n", format.cbSize); + + hr = IGraphBuilder_Disconnect(graph, pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IGraphBuilder_Disconnect(graph, &source.source.pin.IPin_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAudioMediaStream_GetFormat(audio_stream, &format); + ok(hr == MS_E_NOSTREAM, "Got hr %#x.\n", hr); + + ref = IAMMultiMediaStream_Release(mmstream); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IGraphBuilder_Release(graph); + ok(!ref, "Got outstanding refcount %d.\n", ref); + IPin_Release(pin); + IAudioMediaStream_Release(audio_stream); + ref = IMediaStream_Release(stream); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IBaseFilter_Release(&source.filter.IBaseFilter_iface); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + START_TEST(amstream) { HANDLE file; @@ -2326,5 +2467,7 @@ START_TEST(amstream) test_audiodata_get_format(); test_audiodata_set_format(); + test_audiostream_get_format(); + CoUninitialize(); } -- 2.25.0

1 2

[PATCH 2/2] shell32: Make SHChangeNotify() dwItenN checks stricter
by Serge Gautherie 26 Feb '20

26 Feb '20

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- dlls/shell32/changenotify.c | 39 ++++++++++++++++++++++++++++----------- 1 file changed, 28 insertions(+), 11 deletions(-) diff --git a/dlls/shell32/changenotify.c b/dlls/shell32/changenotify.c index 6c77a6c..6f2cf46 100644 --- a/dlls/shell32/changenotify.c +++ b/dlls/shell32/changenotify.c @@ -280,31 +280,47 @@ void WINAPI SHChangeNotify(LONG wEventId, UINT uFlags, LPCVOID dwItem1, LPCVOID if(uFlags & ~(SHCNF_TYPE|SHCNF_FLUSH)) FIXME("ignoring unsupported flags: %x\n", uFlags); + /* FIXME: Either set to NULL or return, not both */ if( ( wEventId & SHCNE_NOITEMEVENTS ) && ( dwItem1 || dwItem2 ) ) { - TRACE("dwItem1 and dwItem2 are not zero, but should be\n"); - dwItem1 = 0; - dwItem2 = 0; + WARN("dwItem1 and/or dwItem2 are not NULL, but should be\n"); + dwItem1 = NULL; + dwItem2 = NULL; return; } else if( ( wEventId & SHCNE_ONEITEMEVENTS ) && dwItem2 ) { - TRACE("dwItem2 is not zero, but should be\n"); - dwItem2 = 0; + WARN("dwItem2 is not NULL, but should be\n"); + dwItem2 = NULL; + return; + } + else if ((wEventId & SHCNE_SECONDITEMEVENTS) && dwItem1) + { + WARN("dwItem1 is not NULL, but should be\n"); + dwItem1 = NULL; + return; + } + else if (!dwItem1 || !dwItem2) + { + WARN("dwItem1 and/or dwItem2 are NULL, but should not be\n"); return; } - if( ( ( wEventId & SHCNE_NOITEMEVENTS ) && - ( wEventId & ~SHCNE_NOITEMEVENTS ) ) || - ( ( wEventId & SHCNE_ONEITEMEVENTS ) && - ( wEventId & ~SHCNE_ONEITEMEVENTS ) ) || - ( ( wEventId & SHCNE_TWOITEMEVENTS ) && - ( wEventId & ~SHCNE_TWOITEMEVENTS ) ) ) + if (((wEventId & SHCNE_NOITEMEVENTS ) && (wEventId & ~SHCNE_NOITEMEVENTS )) || + ((wEventId & SHCNE_ONEITEMEVENTS ) && (wEventId & ~SHCNE_ONEITEMEVENTS )) || + ((wEventId & SHCNE_SECONDITEMEVENTS) && (wEventId & ~SHCNE_SECONDITEMEVENTS)) || + ((wEventId & SHCNE_TWOITEMEVENTS ) && (wEventId & ~SHCNE_TWOITEMEVENTS ))) { WARN("mutually incompatible events listed\n"); return; } + if ((wEventId & SHCNE_SECONDITEMEVENTS)) + { + FIXME("SHChangeNotify with (wEventId & SHCNE_SECONDITEMEVENTS)\n"); + return; + } + /* convert paths in IDLists*/ switch (uFlags & SHCNF_TYPE) { @@ -351,6 +367,7 @@ void WINAPI SHChangeNotify(LONG wEventId, UINT uFlags, LPCVOID dwItem1, LPCVOID notify = TRUE; else if( wEventId & ( SHCNE_ONEITEMEVENTS | SHCNE_TWOITEMEVENTS ) ) notify = should_notify( Pidls[0], pidl, subtree ); + /* FIXME: Following if() is masked by previous one */ else if( wEventId & SHCNE_TWOITEMEVENTS ) notify = should_notify( Pidls[1], pidl, subtree ); } -- 2.10.0.windows.1

2 1

[PATCH 1/5] mp3dmod/tests: Test IMediaBuffer reference counting.
by Zebediah Figura 26 Feb '20

26 Feb '20

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/mp3dmod/tests/mp3dmod.c | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/dlls/mp3dmod/tests/mp3dmod.c b/dlls/mp3dmod/tests/mp3dmod.c index 99d52e6fd77..1d404248cc1 100644 --- a/dlls/mp3dmod/tests/mp3dmod.c +++ b/dlls/mp3dmod/tests/mp3dmod.c @@ -40,8 +40,10 @@ static REFERENCE_TIME samplelen(DWORD samples, int rate) return (REFERENCE_TIME) 10000000 * samples / rate; } -struct test_buffer { +struct test_buffer +{ IMediaBuffer IMediaBuffer_iface; + LONG refcount; BYTE data[5000]; DWORD len; DWORD maxlen; @@ -65,12 +67,14 @@ static HRESULT WINAPI Buffer_QueryInterface(IMediaBuffer *iface, REFIID iid, voi static ULONG WINAPI Buffer_AddRef(IMediaBuffer *iface) { - return 2; + struct test_buffer *buffer = impl_from_IMediaBuffer(iface); + return InterlockedIncrement(&buffer->refcount); } static ULONG WINAPI Buffer_Release(IMediaBuffer *iface) { - return 1; + struct test_buffer *buffer = impl_from_IMediaBuffer(iface); + return InterlockedDecrement(&buffer->refcount); } static HRESULT WINAPI Buffer_SetLength(IMediaBuffer *iface, DWORD len) @@ -107,8 +111,8 @@ static IMediaBufferVtbl Buffer_vtbl = { static void test_convert(void) { static const BYTE mp3hdr[] = {0xff,0xfb,0x14,0xc4}; - struct test_buffer outbuf = {{&Buffer_vtbl}}; - struct test_buffer inbuf = {{&Buffer_vtbl}}; + struct test_buffer outbuf = {.IMediaBuffer_iface = {&Buffer_vtbl}, .refcount = 1}; + struct test_buffer inbuf = {.IMediaBuffer_iface = {&Buffer_vtbl}, .refcount = 1}; DMO_MEDIA_TYPE in = {{0}}, out = {{0}}; MPEGLAYER3WAVEFORMAT mp3fmt = {{0}}; DMO_OUTPUT_DATA_BUFFER output; @@ -169,6 +173,7 @@ static void test_convert(void) inbuf.len = 96 * 5; hr = IMediaObject_ProcessInput(dmo, 0, &inbuf.IMediaBuffer_iface, 0, 0, 0); ok(hr == S_OK, "got %#x\n", hr); + ok(inbuf.refcount == 2, "Got refcount %d.\n", inbuf.refcount); hr = IMediaObject_ProcessInput(dmo, 0, &inbuf.IMediaBuffer_iface, 0, 0, 0); ok(hr == DMO_E_NOTACCEPTING, "got %#x\n", hr); @@ -194,6 +199,8 @@ static void test_convert(void) ok(output.rtTimestamp == 0, "got %s\n", wine_dbgstr_longlong(output.rtTimestamp)); ok(output.rtTimelength == samplelen(written, 48000), "got %s\n", wine_dbgstr_longlong(output.rtTimelength)); + ok(inbuf.refcount == 2, "Got refcount %d.\n", inbuf.refcount); + ok(outbuf.refcount == 1, "Got refcount %d.\n", inbuf.refcount); hr = IMediaObject_ProcessOutput(dmo, 0, 1, &output, &status); ok(hr == S_FALSE, "got %#x\n", hr); @@ -205,6 +212,8 @@ static void test_convert(void) hr = IMediaObject_ProcessInput(dmo, 0, &inbuf.IMediaBuffer_iface, 0, 0, 0); ok(hr == DMO_E_NOTACCEPTING, "got %#x\n", hr); + ok(inbuf.refcount == 2, "Got refcount %d.\n", inbuf.refcount); + ok(outbuf.refcount == 1, "Got refcount %d.\n", inbuf.refcount); /* write the rest */ outbuf.len = 0; @@ -219,6 +228,8 @@ static void test_convert(void) "got %s\n", wine_dbgstr_longlong(output.rtTimestamp)); ok(output.rtTimelength == samplelen(outbuf.len, 48000), "got %s\n", wine_dbgstr_longlong(output.rtTimelength)); + ok(inbuf.refcount == 1, "Got refcount %d.\n", inbuf.refcount); + ok(outbuf.refcount == 1, "Got refcount %d.\n", inbuf.refcount); hr = IMediaObject_ProcessOutput(dmo, 0, 1, &output, &status); ok(hr == S_FALSE, "got %#x\n", hr); @@ -228,6 +239,8 @@ static void test_convert(void) ok(hr == S_OK, "got %#x\n", hr); IMediaObject_Release(dmo); + todo_wine ok(inbuf.refcount == 1, "Got outstanding refcount %d.\n", inbuf.refcount); + ok(outbuf.refcount == 1, "Got outstanding refcount %d.\n", outbuf.refcount); } static const GUID IID_test_outer = {0xdeadbeef,0,0,{0,0,0,0,0,0,0,0x66}}; -- 2.25.0

2 5

[PATCH 1/2] shell32: Fix SHCNE_UPDATEIMAGE and SHCNE_UPDATEITEM number of items
by Serge Gautherie 26 Feb '20

26 Feb '20

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- Based on MS docs and ReactOS uses. --- dlls/shell32/changenotify.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/changenotify.c b/dlls/shell32/changenotify.c index 2efb297..6c77a6c 100644 --- a/dlls/shell32/changenotify.c +++ b/dlls/shell32/changenotify.c @@ -64,10 +64,13 @@ static LONG next_id; SHCNE_DRIVEADDGUI | SHCNE_DRIVEREMOVED | SHCNE_FREESPACE | \ SHCNE_MEDIAINSERTED | SHCNE_MEDIAREMOVED | SHCNE_MKDIR | \ SHCNE_NETSHARE | SHCNE_NETUNSHARE | SHCNE_RMDIR | \ - SHCNE_SERVERDISCONNECT | SHCNE_UPDATEDIR | SHCNE_UPDATEIMAGE ) + SHCNE_SERVERDISCONNECT | SHCNE_UPDATEDIR | SHCNE_UPDATEITEM ) + +#define SHCNE_SECONDITEMEVENTS ( \ + SHCNE_UPDATEIMAGE ) #define SHCNE_TWOITEMEVENTS ( \ - SHCNE_RENAMEFOLDER | SHCNE_RENAMEITEM | SHCNE_UPDATEITEM ) + SHCNE_RENAMEFOLDER | SHCNE_RENAMEITEM ) /* for dumping events */ static const char * DumpEvent( LONG event ) -- 2.10.0.windows.1

1 0

[PATCH v2 1/3] d3dcompiler/tests: Rewrite to use a separate d3d9 device for each test.
by Zebediah Figura 26 Feb '20

26 Feb '20

This brings the d3dcompiler tests more in line with existing d3d9 tests, and allows potentially running the tests in parallel. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/d3dcompiler_43/tests/Makefile.in | 2 +- dlls/d3dcompiler_43/tests/hlsl.c | 701 -------------------------- dlls/d3dcompiler_43/tests/hlsl_d3d9.c | 679 +++++++++++++++++++++++++ dlls/d3dcompiler_47/tests/Makefile.in | 2 +- 4 files changed, 681 insertions(+), 703 deletions(-) delete mode 100644 dlls/d3dcompiler_43/tests/hlsl.c create mode 100644 dlls/d3dcompiler_43/tests/hlsl_d3d9.c diff --git a/dlls/d3dcompiler_43/tests/Makefile.in b/dlls/d3dcompiler_43/tests/Makefile.in index 51b1f934836..f00d8560826 100644 --- a/dlls/d3dcompiler_43/tests/Makefile.in +++ b/dlls/d3dcompiler_43/tests/Makefile.in @@ -5,5 +5,5 @@ EXTRADEFS = -DD3D_COMPILER_VERSION=43 C_SRCS = \ asm.c \ blob.c \ - hlsl.c \ + hlsl_d3d9.c \ reflection.c diff --git a/dlls/d3dcompiler_43/tests/hlsl.c b/dlls/d3dcompiler_43/tests/hlsl.c deleted file mode 100644 index 868693838cc..00000000000 --- a/dlls/d3dcompiler_43/tests/hlsl.c +++ /dev/null @@ -1,701 +0,0 @@ -/* - * Copyright (C) 2010 Travis Athougies - * - * 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 - */ -#define COBJMACROS -#include "wine/test.h" -#include "d3dx9.h" -#include "d3dcompiler.h" - -#include <math.h> - -static pD3DCompile ppD3DCompile; - -static HRESULT (WINAPI *pD3DXGetShaderConstantTable)(const DWORD *byte_code, ID3DXConstantTable **constant_table); -static D3DMATRIX *(WINAPI *pD3DXMatrixOrthoLH)(D3DXMATRIX *pout, FLOAT w, FLOAT h, FLOAT zn, FLOAT zf); - -struct vertex -{ - float x, y, z; - float tx, ty; -}; - -/* Tells compute_shader_probe* which pixels should be what colors */ -struct hlsl_probe_info -{ - unsigned int x, y; - /* The expected values in this region */ - D3DXCOLOR c; - /* The max error for any value */ - float epsilon; - /* An error message to print if this test fails */ - const char *message; -}; - -static HWND create_window(void) -{ - WNDCLASSA wc = {0}; - wc.lpfnWndProc = DefWindowProcA; - wc.lpszClassName = "d3d9_test_wc"; - RegisterClassA(&wc); - - return CreateWindowA("d3d9_test_wc", "d3d9_test", 0, 0, 0, 0, 0, 0, 0, 0, 0); -} - -static IDirect3DDevice9 *init_d3d9(IDirect3DVertexDeclaration9 **vdeclaration, - IDirect3DVertexBuffer9 **quad_geometry, IDirect3DVertexShader9 **vshader_passthru) -{ - static const struct vertex quad_vertices[4] = - { - {-1.0f, -1.0f, 0.0f, 0.0f, 1.0f}, - {-1.0f, 1.0f, 0.0f, 0.0f, 0.0f}, - { 1.0f, -1.0f, 0.0f, 1.0f, 1.0f}, - { 1.0f, 1.0f, 0.0f, 1.0f, 0.0f} - }; - - static const D3DVERTEXELEMENT9 vdeclelements[] = - { - {0, 0, D3DDECLTYPE_FLOAT3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0}, - {0, 12, D3DDECLTYPE_FLOAT2, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_TEXCOORD, 0}, - D3DDECL_END() - }; - - static const char *vshader_passthru_hlsl = - "float4 vshader(float4 pos: POSITION, inout float2 texcoord: TEXCOORD0): POSITION\n" - "{\n" - " return pos;\n" - "}"; - - IDirect3D9 *d3d9_ptr; - IDirect3DDevice9 *device_ptr = NULL; - D3DPRESENT_PARAMETERS present_parameters; - - void *temp_geometry_vertices; - - ID3D10Blob *compiled = NULL; - ID3D10Blob *errors = NULL; - - HRESULT hr; - - d3d9_ptr = Direct3DCreate9(D3D_SDK_VERSION); - if (!d3d9_ptr) - { - skip("could not create D3D9\n"); - return NULL; - } - - hr = IDirect3D9_CheckDeviceFormat(d3d9_ptr, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, - 0, D3DRTYPE_SURFACE, D3DFMT_A32B32G32R32F); - if (FAILED(hr)) - { - skip("A32B32G32R32F format not available on this device\n"); - IDirect3D9_Release(d3d9_ptr); - return NULL; - } - - ZeroMemory(&present_parameters, sizeof(present_parameters)); - present_parameters.Windowed = TRUE; - present_parameters.hDeviceWindow = create_window(); - present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; - - hr = IDirect3D9_CreateDevice(d3d9_ptr, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, NULL, - D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, &device_ptr); - IDirect3D9_Release(d3d9_ptr); - if (FAILED(hr)) - { - skip("could not create Direct3D9 device\n"); - return NULL; - } - - /* Create the quad geometry */ - hr = IDirect3DDevice9_CreateVertexBuffer(device_ptr, 4 * sizeof(struct vertex), - D3DUSAGE_WRITEONLY, 0, D3DPOOL_DEFAULT, quad_geometry, NULL); - ok(SUCCEEDED(hr), - "Could not create vertex buffer, IDirect3DDevice9_CreateVertexBuffer returned: %08x\n", hr); - - hr = IDirect3DVertexBuffer9_Lock(*quad_geometry, 0, sizeof(quad_vertices), &temp_geometry_vertices, 0); - ok(SUCCEEDED(hr), "IDirect3DVertexBuffer9_Lock returned: %08x\n", hr); - memcpy(temp_geometry_vertices, quad_vertices, sizeof(quad_vertices)); - IDirect3DVertexBuffer9_Unlock(*quad_geometry); - - hr = IDirect3DDevice9_CreateVertexDeclaration(device_ptr, vdeclelements, vdeclaration); - ok(SUCCEEDED(hr), "Could not create vertex declaration: " - "IDirect3DDevice9_CreateVertexDeclaration returned: %08x\n", hr); - - hr = IDirect3DDevice9_SetVertexDeclaration(device_ptr, *vdeclaration); - ok(hr == D3D_OK, "IDirect3DDevice9_SetVertexDeclaration returned: %08x\n", hr); - - /* Create a simple vertex shader to just pass through the values */ - hr = ppD3DCompile(vshader_passthru_hlsl, strlen(vshader_passthru_hlsl), NULL, - NULL, NULL, "vshader", "vs_1_1", 0, 0, &compiled, &errors); - if (FAILED(hr)) - { - skip("not compiling vertex shader due to lacking wine HLSL support!\n"); - if (errors) - ID3D10Blob_Release(errors); - return NULL; - } - - hr = IDirect3DDevice9_CreateVertexShader(device_ptr, ID3D10Blob_GetBufferPointer(compiled), - vshader_passthru); - ok(SUCCEEDED(hr), "IDirect3DDevice9_CreateVertexShader returned: %08x\n", hr); - ID3D10Blob_Release(compiled); - - return device_ptr; -} - -/* Convenience functions */ -static void set_float4_d3d9(IDirect3DDevice9 *device, ID3DXConstantTable *constants, const char *name, - float x, float y, float z, float w) -{ - D3DXVECTOR4 vector; - vector.x = x; - vector.y = y; - vector.z = z; - vector.w = w; - ID3DXConstantTable_SetVector(constants, device, name, &vector); -} - -/* Compile our pixel shader and get back the compiled version and a constant table */ -static IDirect3DPixelShader9 *compile_pixel_shader9(IDirect3DDevice9 *device, const char *shader, - const char *profile, ID3DXConstantTable **constants) -{ - ID3D10Blob *compiled = NULL; - ID3D10Blob *errors = NULL; - IDirect3DPixelShader9 *pshader; - HRESULT hr; - - hr = ppD3DCompile(shader, strlen(shader), NULL, NULL, - NULL, "test", profile, /* test is the name of the entry point of our shader */ - 0, 0, &compiled, &errors); - ok(hr == D3D_OK, "Pixel shader %s compilation failed: %s\n", shader, - errors ? (char *)ID3D10Blob_GetBufferPointer(errors) : ""); - if (FAILED(hr)) return NULL; - - hr = pD3DXGetShaderConstantTable(ID3D10Blob_GetBufferPointer(compiled), constants); - ok(hr == D3D_OK, "Could not get constant table from compiled pixel shader\n"); - - hr = IDirect3DDevice9_CreatePixelShader(device, ID3D10Blob_GetBufferPointer(compiled), &pshader); - ok(SUCCEEDED(hr), "IDirect3DDevice9_CreatePixelShader returned: %08x\n", hr); - ID3D10Blob_Release(compiled); - return pshader; -} - -/* Draw a full screen quad */ -static void draw_quad_with_shader9(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 *quad_geometry) -{ - HRESULT hr; - D3DXMATRIX projection_matrix; - - pD3DXMatrixOrthoLH(&projection_matrix, 2.0f, 2.0f, 0.0f, 1.0f); - IDirect3DDevice9_SetTransform(device, D3DTS_PROJECTION, &projection_matrix); - - hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, D3DCOLOR_XRGB(0, 0, 0), 1.0f, 0); - ok(hr == D3D_OK, "IDirect3DDevice9_Clear returned: %08x\n", hr); - - hr = IDirect3DDevice9_BeginScene(device); - ok(hr == D3D_OK, "IDirect3DDevice9_BeginScene returned: %08x\n", hr); - - hr = IDirect3DDevice9_SetStreamSource(device, 0, quad_geometry, 0, sizeof(struct vertex)); - ok(hr == D3D_OK, "IDirect3DDevice9_SetStreamSource returned: %08x\n", hr); - hr = IDirect3DDevice9_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, 0, 2); - ok(hr == D3D_OK, "IDirect3DDevice9_DrawPrimitive returned: %08x\n", hr); - - hr = IDirect3DDevice9_EndScene(device); - ok(hr == D3D_OK, "IDirect3DDevice9_EndScene returned: %08x\n", hr); -} - -static void setup_device9(IDirect3DDevice9 *device, IDirect3DSurface9 **render_target, - IDirect3DSurface9 **readback, D3DFORMAT format, unsigned int width, unsigned int height, - IDirect3DVertexShader9 *vshader, IDirect3DPixelShader9 *pshader) -{ - HRESULT hr; - hr = IDirect3DDevice9_CreateRenderTarget(device, width, height, format, - D3DMULTISAMPLE_NONE, 0, FALSE, render_target, NULL); - ok(hr == D3D_OK, "IDirect3DDevice9_CreateRenderTarget returned: %08x\n", hr); - - /* The Direct3D 9 docs state that we cannot lock a render target surface, - instead we must copy the render target onto this surface to lock it */ - hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, width, height, format, - D3DPOOL_SYSTEMMEM, readback, NULL); - ok(hr == D3D_OK, "IDirect3DDevice9_CreateOffscreenPlainSurface returned: %08x\n", hr); - - hr = IDirect3DDevice9_SetRenderTarget(device, 0, *render_target); - ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderTarget returned: %08x\n", hr); - - hr = IDirect3DDevice9_SetVertexShader(device, vshader); - ok(hr == D3D_OK, "IDirect3DDevice9_SetVertexShader returned: %08x\n", hr); - hr = IDirect3DDevice9_SetPixelShader(device, pshader); - ok(hr == D3D_OK, "IDirect3DDevice9_SetPixelShader returned: %08x\n", hr); -} - -static BOOL colors_match(D3DXCOLOR a, D3DXCOLOR b, float epsilon) -{ - return (fabs(a.r - b.r) < epsilon && fabs(a.g - b.g) < epsilon && fabs(a.b - b.b) < epsilon && - fabs(a.a - b.a) < epsilon); -} - -/* Compute a shader on a width by height buffer and probes certain locations - to see if they are as expected. */ -static void compute_shader_probe9(IDirect3DDevice9 *device, IDirect3DVertexShader9 *vshader, - IDirect3DPixelShader9 *pshader, IDirect3DVertexBuffer9 *quad_geometry, - const struct hlsl_probe_info *probes, unsigned int count, - unsigned int width, unsigned int height, unsigned int line_number) -{ - IDirect3DSurface9 *render_target; - IDirect3DSurface9 *readback; - - HRESULT hr; - D3DLOCKED_RECT lr; - D3DXCOLOR *pbits_data; - unsigned int i; - - setup_device9(device, &render_target, &readback, D3DFMT_A32B32G32R32F, - width, height, vshader, pshader); - - /* Draw the quad with the shader and read back the data */ - draw_quad_with_shader9(device, quad_geometry); - IDirect3DDevice9_GetRenderTargetData(device, render_target, readback); - hr = IDirect3DSurface9_LockRect(readback, &lr, NULL, D3DLOCK_READONLY); - ok(hr == D3D_OK, "IDirect3DSurface9_LockRect returned: %08x\n", hr); - pbits_data = lr.pBits; - - /* Now go through the probes and check each one */ - for (i = 0; i < count; i++, probes++) { - int index = probes->x + (probes->y * lr.Pitch / sizeof(D3DXCOLOR)); - ok(colors_match(probes->c, pbits_data[index], probes->epsilon), - "Line %d: At (%d, %d): %s: Expected (%.04f,%.04f,%.04f, %.04f), got " - "(%.04f,%.04f,%.04f,%.04f)\n", line_number, probes->x, probes->y, probes->message, - probes->c.r, probes->c.g, probes->c.b, probes->c.a, pbits_data[index].r, - pbits_data[index].g, pbits_data[index].b, pbits_data[index].a); - } - - hr = IDirect3DSurface9_UnlockRect(readback); - ok(hr == D3D_OK, "IDirect3DSurface9_UnlockRect returned: %08x\n", hr); - - /* We now present the scene. This is mostly for debugging purposes, since GetRenderTargetData - also waits for drawing commands to complete. The reason this call is here and not in a - draw function is because the contents of the render target surface are invalidated after - this call. */ - hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); - ok(hr == D3D_OK, "IDirect3DDevice9_Present returned: %08x\n", hr); - - IDirect3DSurface9_Release(render_target); - IDirect3DSurface9_Release(readback); -} - -/* Now the actual test functions */ -static void test_swizzle(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 *quad_geometry, - IDirect3DVertexShader9 *vshader_passthru) -{ - static const struct hlsl_probe_info probes[] = - { - {0, 0, {0.0101f, 0.0303f, 0.0202f, 0.0404f}, 0.0001f, "swizzle_test"} - }; - - static const char *swizzle_test_shader = - "uniform float4 color;\n" - "float4 test(): COLOR\n" - "{\n" - " float4 ret = color;\n" - " ret.gb = ret.ra;\n" - " ret.ra = float2(0.0101, 0.0404);\n" - " return ret;\n" - "}"; - - ID3DXConstantTable *constants; - IDirect3DPixelShader9 *pshader; - - pshader = compile_pixel_shader9(device, swizzle_test_shader, "ps_2_0", &constants); - if (pshader != NULL) - { - set_float4_d3d9(device, constants, "color", 0.0303f, 0.0f, 0.0f, 0.0202f); - - compute_shader_probe9(device, vshader_passthru, pshader, quad_geometry, - probes, ARRAY_SIZE(probes), 1, 1, __LINE__); - - ID3DXConstantTable_Release(constants); - IDirect3DPixelShader9_Release(pshader); - } -} - -static void test_math(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 *quad_geometry, - IDirect3DVertexShader9 *vshader_passthru) -{ - /* Tests order of operations */ - static const float u = 2.5f, v = 0.3f, w = 0.2f, x = 0.7f, y = 0.1f, z = 1.5f; - - static const struct hlsl_probe_info probes[] = - { - {0, 0, {-12.4300f, 9.8333f, 1.6000f, 34.9999f}, 0.0001f, - "order of operations test"} - }; - - static const char *order_of_operations_shader = - "float4 test(uniform float u, uniform float v, uniform float w, uniform float x,\n" - " uniform float y, uniform float z): COLOR\n" - "{\n" - " return float4(x * y - z / w + --u / -v,\n" - " z * x / y + w / -v,\n" - " u + v - w,\n" - " x / y / w);\n" - "}"; - - ID3DXConstantTable *constants; - IDirect3DPixelShader9 *pshader; - - pshader = compile_pixel_shader9(device, order_of_operations_shader, "ps_2_0", &constants); - if (pshader != NULL) - { - ID3DXConstantTable_SetFloat(constants, device, "$u", u); - ID3DXConstantTable_SetFloat(constants, device, "$v", v); - ID3DXConstantTable_SetFloat(constants, device, "$w", w); - ID3DXConstantTable_SetFloat(constants, device, "$x", x); - ID3DXConstantTable_SetFloat(constants, device, "$y", y); - ID3DXConstantTable_SetFloat(constants, device, "$z", z); - - compute_shader_probe9(device, vshader_passthru, pshader, quad_geometry, - probes, ARRAY_SIZE(probes), 1, 1, __LINE__); - - ID3DXConstantTable_Release(constants); - IDirect3DPixelShader9_Release(pshader); - } -} - -static void test_conditionals(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 *quad_geometry, - IDirect3DVertexShader9 *vshader_passthru) -{ - static const struct hlsl_probe_info if_greater_probes[] = - { - { 0, 0, {0.9f, 0.8f, 0.7f, 0.6f}, 0.0001f, "if greater test"}, - { 5, 0, {0.9f, 0.8f, 0.7f, 0.6f}, 0.0001f, "if greater test"}, - {10, 0, {0.9f, 0.8f, 0.7f, 0.6f}, 0.0001f, "if greater test"}, - {15, 0, {0.9f, 0.8f, 0.7f, 0.6f}, 0.0001f, "if greater test"}, - {25, 0, {0.1f, 0.2f, 0.3f, 0.4f}, 0.0001f, "if greater test"}, - {30, 0, {0.1f, 0.2f, 0.3f, 0.4f}, 0.0001f, "if greater test"} - }; - - static const char *if_greater_shader = - "float4 test(float2 pos: TEXCOORD0): COLOR\n" - "{\n" - " if((pos.x * 32.0) > 20.0)\n" - " return float4(0.1, 0.2, 0.3, 0.4);\n" - " else\n" - " return float4(0.9, 0.8, 0.7, 0.6);\n" - "}"; - - static const struct hlsl_probe_info ternary_operator_probes[] = - { - {0, 0, {0.50f, 0.25f, 0.50f, 0.75f}, 0.00001f, "ternary operator test"}, - {1, 0, {0.50f, 0.25f, 0.50f, 0.75f}, 0.00001f, "ternary operator test"}, - {2, 0, {0.50f, 0.25f, 0.50f, 0.75f}, 0.00001f, "ternary operator test"}, - {3, 0, {0.50f, 0.25f, 0.50f, 0.75f}, 0.00001f, "ternary operator test"}, - {4, 0, {0.60f, 0.80f, 0.10f, 0.20f}, 0.00001f, "ternary operator test"}, - {5, 0, {0.60f, 0.80f, 0.10f, 0.20f}, 0.00001f, "ternary operator test"}, - {6, 0, {0.60f, 0.80f, 0.10f, 0.20f}, 0.00001f, "ternary operator test"}, - {7, 0, {0.60f, 0.80f, 0.10f, 0.20f}, 0.00001f, "ternary operator test"} - }; - - static const char *ternary_operator_shader = - "float4 test(float2 pos: TEXCOORD0): COLOR\n" - "{\n" - " return (pos.x < 0.5?float4(0.5, 0.25, 0.5, 0.75):float4(0.6, 0.8, 0.1, 0.2));\n" - "}"; - - ID3DXConstantTable *constants; - IDirect3DPixelShader9 *pshader; - - pshader = compile_pixel_shader9(device, if_greater_shader, "ps_2_0", &constants); - if (pshader != NULL) - { - compute_shader_probe9(device, vshader_passthru, pshader, quad_geometry, if_greater_probes, - ARRAY_SIZE(if_greater_probes), 32, 1, __LINE__); - - ID3DXConstantTable_Release(constants); - IDirect3DPixelShader9_Release(pshader); - } - - pshader = compile_pixel_shader9(device, ternary_operator_shader, "ps_2_0", &constants); - if (pshader != NULL) - { - compute_shader_probe9(device, vshader_passthru, pshader, quad_geometry, ternary_operator_probes, - ARRAY_SIZE(ternary_operator_probes), 8, 1, __LINE__); - - ID3DXConstantTable_Release(constants); - IDirect3DPixelShader9_Release(pshader); - } -} - -static void test_float_vectors(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 *quad_geometry, - IDirect3DVertexShader9 *vshader_passthru) -{ - static const struct hlsl_probe_info vec4_indexing_test1_probes[] = - { - {0, 0, {0.020f, 0.245f, 0.351f, 1.000f}, 0.0001f, "vec4 indexing test 1"} - }; - - static const char *vec4_indexing_test1_shader = - "float4 test(): COLOR\n" - "{\n" - " float4 color;\n" - " color[0] = 0.020;\n" - " color[1] = 0.245;\n" - " color[2] = 0.351;\n" - " color[3] = 1.0;\n" - " return color;\n" - "}"; - - static const struct hlsl_probe_info vec4_indexing_test2_probes[] = - { - {0, 0, {0.5f, 0.3f, 0.8f, 0.2f}, 0.0001f, "vec4 indexing test 2"} - }; - - /* We have this uniform i here so the compiler can't optimize */ - static const char *vec4_indexing_test2_shader = - "uniform int i;\n" - "float4 test(): COLOR\n" - "{\n" - " float4 color = float4(0.5, 0.4, 0.3, 0.2);\n" - " color.g = color[i];\n" - " color.b = 0.8;\n" - " return color;\n" - "}"; - - ID3DXConstantTable *constants; - IDirect3DPixelShader9 *pshader; - - pshader = compile_pixel_shader9(device, vec4_indexing_test1_shader, "ps_2_0", &constants); - if (pshader != NULL) - { - compute_shader_probe9(device, vshader_passthru, pshader, quad_geometry, vec4_indexing_test1_probes, - ARRAY_SIZE(vec4_indexing_test1_probes), 1, 1, __LINE__); - - ID3DXConstantTable_Release(constants); - IDirect3DPixelShader9_Release(pshader); - } - - pshader = compile_pixel_shader9(device, vec4_indexing_test2_shader, "ps_2_0", &constants); - if (pshader != NULL) - { - ID3DXConstantTable_SetInt(constants, device, "i", 2); - - compute_shader_probe9(device, vshader_passthru, pshader, quad_geometry, vec4_indexing_test2_probes, - ARRAY_SIZE(vec4_indexing_test2_probes), 32, 1, __LINE__); - - ID3DXConstantTable_Release(constants); - IDirect3DPixelShader9_Release(pshader); - } -} - -static void test_trig(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 *quad_geometry, - IDirect3DVertexShader9 *vshader_passthru) -{ - static const struct hlsl_probe_info sincos_probes[] = - { - {0, 0, {0.5000f, 1.0000f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {1, 0, {0.5975f, 0.9904f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {2, 0, {0.6913f, 0.9620f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {3, 0, {0.7778f, 0.9160f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {4, 0, {0.8536f, 0.8536f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {5, 0, {0.9157f, 0.7778f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {6, 0, {0.9620f, 0.6913f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {7, 0, {0.9904f, 0.5975f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {8, 0, {1.0000f, 0.5000f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {9, 0, {0.9904f, 0.4025f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {10, 0, {0.9619f, 0.3087f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {11, 0, {0.9157f, 0.2222f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {12, 0, {0.8536f, 0.1464f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {13, 0, {0.7778f, 0.0843f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {14, 0, {0.6913f, 0.0381f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {15, 0, {0.5975f, 0.0096f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {16, 0, {0.5000f, 0.0000f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {17, 0, {0.4025f, 0.0096f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {18, 0, {0.3087f, 0.0381f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {19, 0, {0.2222f, 0.0843f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {20, 0, {0.1464f, 0.1464f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {21, 0, {0.0843f, 0.2222f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {22, 0, {0.0381f, 0.3087f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {23, 0, {0.0096f, 0.4025f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {24, 0, {0.0000f, 0.5000f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {25, 0, {0.0096f, 0.5975f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {26, 0, {0.0381f, 0.6913f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {27, 0, {0.0843f, 0.7778f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {28, 0, {0.1464f, 0.8536f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {29, 0, {0.2222f, 0.9157f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {30, 0, {0.3087f, 0.9619f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - {31, 0, {0.4025f, 0.9904f, 0.0f, 0.0f}, 0.001f, "sin/cos test"}, - }; - - static const char *sincos_shader = - "float4 test(float x: TEXCOORD0): COLOR\n" - "{\n" - " const float pi2 = 6.2831853;\n" - " float calcd_sin = (sin(x * pi2) + 1)/2;\n" - " float calcd_cos = (cos(x * pi2) + 1)/2;\n" - " return float4(calcd_sin, calcd_cos, 0, 0);\n" - "}"; - - ID3DXConstantTable *constants; - IDirect3DPixelShader9 *pshader; - - pshader = compile_pixel_shader9(device, sincos_shader, "ps_2_0", &constants); - if (pshader != NULL) - { - compute_shader_probe9(device, vshader_passthru, pshader, quad_geometry, sincos_probes, - ARRAY_SIZE(sincos_probes), 32, 1, __LINE__); - - ID3DXConstantTable_Release(constants); - IDirect3DPixelShader9_Release(pshader); - } -} - -static void test_fail(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 *qquad_geometry, - IDirect3DVertexShader9 *vshader_passthru) -{ - static const char *tests[] = - { - "float4 test(float2 pos: TEXCOORD0) : COLOR\n" - "{\n" - " return y;\n" - "}", - - "float4 test(float2 pos: TEXCOORD0) : COLOR\n" - "{\n" - " float4 x = float4(0, 0, 0, 0);\n" - " x.xzzx = float4(1, 2, 3, 4);\n" - " return x;\n" - "}", - - "float4 test(float2 pos: TEXCOORD0) : COLOR\n" - "{\n" - " float4 x = pos;\n" - " return x;\n" - "}", - - "float4 test(float2 pos, TEXCOORD0) ; COLOR\n" - "{\n" - " pos = float4 x;\n" - " mul(float4(5, 4, 3, 2), mvp) = x;\n" - " return float4;\n" - "}", - - "float4 563r(float2 45s: TEXCOORD0) : COLOR\n" - "{\n" - " float2 x = 45s;\n" - " return float4(x.x, x.y, 0, 0);\n" - "}", - - "float4 test(float2 pos: TEXCOORD0) : COLOR\n" - "{\n" - " struct { int b,c; } x = {0};\n" - " return y;\n" - "}", - - "float4 test(float2 pos: TEXCOORD0) : COLOR\n" - "{\n" - " struct {} x = {};\n" - " return y;\n" - "}", - }; - - ID3D10Blob *compiled, *errors; - unsigned int i; - HRESULT hr; - - for (i = 0; i < ARRAY_SIZE(tests); ++i) - { - compiled = errors = NULL; - hr = ppD3DCompile(tests[i], strlen(tests[i]), NULL, NULL, NULL, "test", "ps_2_0", 0, 0, &compiled, &errors); - ok(hr == E_FAIL, "Test %u, got unexpected hr %#x.\n", i, hr); - ok(!!errors, "Test %u, expected non-NULL error blob.\n", i); - ok(!compiled, "Test %u, expected no compiled shader blob.\n", i); - ID3D10Blob_Release(errors); - } -} - -static BOOL load_d3dcompiler(void) -{ - HMODULE module; - -#if D3D_COMPILER_VERSION == 47 - if (!(module = LoadLibraryA("d3dcompiler_47.dll"))) return FALSE; -#else - if (!(module = LoadLibraryA("d3dcompiler_43.dll"))) return FALSE; -#endif - - ppD3DCompile = (void*)GetProcAddress(module, "D3DCompile"); - return TRUE; -} - -START_TEST(hlsl) -{ - D3DCAPS9 caps; - ULONG refcount; - IDirect3DDevice9 *device; - IDirect3DVertexDeclaration9 *vdeclaration; - IDirect3DVertexBuffer9 *quad_geometry; - IDirect3DVertexShader9 *vshader_passthru; - HMODULE mod; - - if (!load_d3dcompiler()) - { - win_skip("Could not load DLL.\n"); - return; - } - - if (!(mod = LoadLibraryA("d3dx9_36.dll"))) - { - win_skip("Failed to load d3dx9_36.dll.\n"); - return; - } - pD3DXGetShaderConstantTable = (void *)GetProcAddress(mod, "D3DXGetShaderConstantTable"); - pD3DXMatrixOrthoLH = (void *)GetProcAddress(mod, "D3DXMatrixOrthoLH"); - - device = init_d3d9(&vdeclaration, &quad_geometry, &vshader_passthru); - if (!device) return; - - /* Make sure we support pixel shaders, before trying to compile them! */ - /* Direct3D 9 (Shader model 1-3 tests) */ - IDirect3DDevice9_GetDeviceCaps(device, &caps); - if (caps.PixelShaderVersion >= D3DPS_VERSION(2, 0)) - { - todo_wine - { - test_swizzle(device, quad_geometry, vshader_passthru); - test_math(device, quad_geometry, vshader_passthru); - test_conditionals(device, quad_geometry, vshader_passthru); - test_float_vectors(device, quad_geometry, vshader_passthru); - test_trig(device, quad_geometry, vshader_passthru); - test_fail(device, quad_geometry, vshader_passthru); - } - } else skip("no pixel shader support\n"); - - /* Reference counting sanity checks */ - if (vshader_passthru) - { - refcount = IDirect3DVertexShader9_Release(vshader_passthru); - ok(!refcount, "Pass-through vertex shader has %u references left\n", refcount); - } - - refcount = IDirect3DVertexBuffer9_Release(quad_geometry); - ok(!refcount, "Vertex buffer has %u references left\n", refcount); - - refcount = IDirect3DVertexDeclaration9_Release(vdeclaration); - ok(!refcount, "Vertex declaration has %u references left\n", refcount); - - refcount = IDirect3DDevice9_Release(device); - ok(!refcount, "Device has %u references left\n", refcount); -} diff --git a/dlls/d3dcompiler_43/tests/hlsl_d3d9.c b/dlls/d3dcompiler_43/tests/hlsl_d3d9.c new file mode 100644 index 00000000000..6e2672175b9 --- /dev/null +++ b/dlls/d3dcompiler_43/tests/hlsl_d3d9.c @@ -0,0 +1,679 @@ +/* + * Copyright (C) 2010 Travis Athougies + * Copyright (C) 2020 Zebediah Figura for CodeWeavers + * + * 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 + */ +#define COBJMACROS +#include "wine/test.h" +#include "d3dx9.h" +#include "d3dcompiler.h" + +#include <math.h> + +static pD3DCompile ppD3DCompile; + +static HRESULT (WINAPI *pD3DXGetShaderConstantTable)(const DWORD *byte_code, ID3DXConstantTable **constant_table); + +struct vec2 +{ + float x, y; +}; + +struct vec4 +{ + float x, y, z, w; +}; + +#define compile_shader(a, b) compile_shader_(__LINE__, a, b) +static ID3D10Blob *compile_shader_(unsigned int line, const char *source, const char *target) +{ + ID3D10Blob *blob = NULL, *errors = NULL; + HRESULT hr; + + hr = ppD3DCompile(source, strlen(source), NULL, NULL, NULL, "main", target, 0, 0, &blob, &errors); + ok_(__FILE__, line)(hr == D3D_OK, "Failed to compile shader, hr %#x.\n", hr); + if (errors) + { + if (winetest_debug > 1) + trace_(__FILE__, line)("%s\n", (char *)ID3D10Blob_GetBufferPointer(errors)); + ID3D10Blob_Release(errors); + } + return blob; +} + +static IDirect3DDevice9 *create_device(HWND window) +{ + D3DPRESENT_PARAMETERS present_parameters = + { + .Windowed = TRUE, + .hDeviceWindow = window, + .SwapEffect = D3DSWAPEFFECT_DISCARD, + .BackBufferWidth = 640, + .BackBufferHeight = 480, + .BackBufferFormat = D3DFMT_A8R8G8B8, + }; + IDirect3DDevice9 *device; + IDirect3DSurface9 *rt; + IDirect3D9 *d3d; + D3DCAPS9 caps; + HRESULT hr; + + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, window, + D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, &device); + IDirect3D9_Release(d3d); + if (FAILED(hr)) + { + skip("Failed to create a 3D device, hr %#x.\n", hr); + return NULL; + } + + hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); + ok(hr == D3D_OK, "Failed to get device caps, hr %#x.\n", hr); + if (caps.PixelShaderVersion < D3DPS_VERSION(2, 0) || caps.VertexShaderVersion < D3DVS_VERSION(2, 0)) + { + skip("No shader model 2 support.\n"); + IDirect3DDevice9_Release(device); + return NULL; + } + + if (FAILED(hr = IDirect3DDevice9_CreateRenderTarget(device, 640, 480, D3DFMT_A32B32G32R32F, + D3DMULTISAMPLE_NONE, 0, FALSE, &rt, NULL))) + { + skip("Failed to create an A32B32G32R32F surface, hr %#x.\n", hr); + IDirect3DDevice9_Release(device); + return NULL; + } + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderTarget(device, 0, rt); + ok(hr == D3D_OK, "Failed to set render target, hr %#x.\n", hr); + IDirect3DSurface9_Release(rt); + + return device; +} + +struct test_context +{ + IDirect3DDevice9 *device; + HWND window; +}; + +#define init_test_context(a) init_test_context_(__LINE__, a) +static BOOL init_test_context_(unsigned int line, struct test_context *context) +{ + WNDCLASSA wc = {0}; + wc.lpfnWndProc = DefWindowProcA; + wc.lpszClassName = "d3dcompiler_test_wc"; + RegisterClassA(&wc); + + context->window = CreateWindowA("d3dcompiler_test_wc", "d3dcompiler_test", 0, 0, 0, 0, 0, 0, 0, 0, 0); + ok(!!context->window, "Failed to create a window.\n"); + + if (!(context->device = create_device(context->window))) + { + DestroyWindow(context->window); + return FALSE; + } + + return TRUE; +} + +#define release_test_context(context) release_test_context_(__LINE__, context) +static void release_test_context_(unsigned int line, struct test_context *context) +{ + ULONG ref = IDirect3DDevice9_Release(context->device); + ok_(__FILE__, line)(!ref, "Device has %u references left.\n", ref); + DestroyWindow(context->window); +} + +#define draw_quad(device, ps_code) draw_quad_(__LINE__, device, ps_code) +static void draw_quad_(unsigned int line, IDirect3DDevice9 *device, ID3D10Blob *ps_code) +{ + IDirect3DVertexDeclaration9 *vertex_declaration; + IDirect3DVertexShader9 *vs; + IDirect3DPixelShader9 *ps; + ID3D10Blob *vs_code; + HRESULT hr; + + static const D3DVERTEXELEMENT9 decl_elements[] = + { + {0, 0, D3DDECLTYPE_FLOAT2, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0}, + {0, 8, D3DDECLTYPE_FLOAT2, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_TEXCOORD, 0}, + D3DDECL_END() + }; + + static const struct + { + struct vec2 position; + struct vec2 t0; + } + quad[] = + { + {{-1.0f, -1.0f}, {0.0f, 1.0f}}, + {{-1.0f, 1.0f}, {0.0f, 0.0f}}, + {{ 1.0f, -1.0f}, {1.0f, 1.0f}}, + {{ 1.0f, 1.0f}, {1.0f, 0.0f}}, + }; + + static const char vs_source[] = + "float4 main(float4 pos : POSITION, inout float2 texcoord : TEXCOORD0) : POSITION\n" + "{\n" + " return pos;\n" + "}"; + + hr = IDirect3DDevice9_CreateVertexDeclaration(device, decl_elements, &vertex_declaration); + ok_(__FILE__, line)(hr == D3D_OK, "Failed to create vertex declaration, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetVertexDeclaration(device, vertex_declaration); + ok_(__FILE__, line)(hr == D3D_OK, "Failed to set vertex declaration, hr %#x.\n", hr); + + vs_code = compile_shader(vs_source, "vs_2_0"); + + hr = IDirect3DDevice9_CreateVertexShader(device, ID3D10Blob_GetBufferPointer(vs_code), &vs); + ok_(__FILE__, line)(hr == D3D_OK, "Failed to create vertex shader, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetVertexShader(device, vs); + ok_(__FILE__, line)(hr == D3D_OK, "Failed to set vertex shader, hr %#x.\n", hr); + + hr = IDirect3DDevice9_CreatePixelShader(device, ID3D10Blob_GetBufferPointer(ps_code), &ps); + ok_(__FILE__, line)(hr == D3D_OK, "Failed to create pixel shader, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetPixelShader(device, ps); + ok_(__FILE__, line)(hr == D3D_OK, "Failed to set pixel shader, hr %#x.\n", hr); + + hr = IDirect3DDevice9_BeginScene(device); + ok_(__FILE__, line)(hr == D3D_OK, "Failed to draw, hr %#x.\n", hr); + + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(*quad)); + ok_(__FILE__, line)(hr == D3D_OK, "Failed to draw, hr %#x.\n", hr); + + hr = IDirect3DDevice9_EndScene(device); + ok_(__FILE__, line)(hr == D3D_OK, "Failed to draw, hr %#x.\n", hr); + + IDirect3DVertexDeclaration9_Release(vertex_declaration); + IDirect3DVertexShader9_Release(vs); + IDirect3DPixelShader9_Release(ps); + ID3D10Blob_Release(vs_code); +} + +struct readback +{ + IDirect3DSurface9 *surface; + D3DLOCKED_RECT rect; +}; + +static void init_readback(IDirect3DDevice9 *device, struct readback *rb) +{ + IDirect3DSurface9 *rt; + D3DSURFACE_DESC desc; + HRESULT hr; + + hr = IDirect3DDevice9Ex_GetRenderTarget(device, 0, &rt); + ok(hr == D3D_OK, "Failed to get render target, hr %#x.\n", hr); + + hr = IDirect3DSurface9_GetDesc(rt, &desc); + ok(hr == D3D_OK, "Failed to get surface desc, hr %#x.\n", hr); + hr = IDirect3DDevice9Ex_CreateOffscreenPlainSurface(device, desc.Width, desc.Height, + desc.Format, D3DPOOL_SYSTEMMEM, &rb->surface, NULL); + ok(hr == D3D_OK, "Failed to create surface, hr %#x.\n", hr); + + hr = IDirect3DDevice9Ex_GetRenderTargetData(device, rt, rb->surface); + ok(hr == D3D_OK, "Failed to get render target data, hr %#x.\n", hr); + + hr = IDirect3DSurface9_LockRect(rb->surface, &rb->rect, NULL, D3DLOCK_READONLY); + ok(hr == D3D_OK, "Failed to lock surface, hr %#x.\n", hr); + + IDirect3DSurface9_Release(rt); +} + +static const struct vec4 *get_readback_vec4(const struct readback *rb, unsigned int x, unsigned int y) +{ + return (struct vec4 *)((BYTE *)rb->rect.pBits + y * rb->rect.Pitch + x * sizeof(struct vec4)); +} + +static void release_readback(struct readback *rb) +{ + IDirect3DSurface9_UnlockRect(rb->surface); + IDirect3DSurface9_Release(rb->surface); +} + +static struct vec4 get_color_vec4(IDirect3DDevice9 *device, unsigned int x, unsigned int y) +{ + struct readback rb; + struct vec4 ret; + + init_readback(device, &rb); + ret = *get_readback_vec4(&rb, x, y); + release_readback(&rb); + + return ret; +} + +static BOOL compare_float(float f, float g, unsigned int ulps) +{ + int x = *(int *)&f; + int y = *(int *)&g; + + if (x < 0) + x = INT_MIN - x; + if (y < 0) + y = INT_MIN - y; + + if (abs(x - y) > ulps) + return FALSE; + + return TRUE; +} + +static BOOL compare_vec4(const struct vec4 *vec, float x, float y, float z, float w, unsigned int ulps) +{ + return compare_float(vec->x, x, ulps) + && compare_float(vec->y, y, ulps) + && compare_float(vec->z, z, ulps) + && compare_float(vec->w, w, ulps); +} + +static void test_swizzle(void) +{ + static const D3DXVECTOR4 color = {0.0303f, 0.0f, 0.0f, 0.0202f}; + struct test_context test_context; + ID3DXConstantTable *constants; + ID3D10Blob *ps_code = NULL; + IDirect3DDevice9 *device; + struct vec4 v; + HRESULT hr; + + static const char ps_source[] = + "uniform float4 color;\n" + "float4 main() : COLOR\n" + "{\n" + " float4 ret = color;\n" + " ret.gb = ret.ra;\n" + " ret.ra = float2(0.0101, 0.0404);\n" + " return ret;\n" + "}"; + + if (!init_test_context(&test_context)) + return; + device = test_context.device; + + todo_wine ps_code = compile_shader(ps_source, "ps_2_0"); + if (ps_code) + { + hr = pD3DXGetShaderConstantTable(ID3D10Blob_GetBufferPointer(ps_code), &constants); + ok(hr == D3D_OK, "Failed to get constant table, hr %#x.\n", hr); + hr = ID3DXConstantTable_SetVector(constants, device, "color", &color); + ok(hr == D3D_OK, "Failed to set constant, hr %#x.\n", hr); + ID3DXConstantTable_Release(constants); + + draw_quad(device, ps_code); + + v = get_color_vec4(device, 0, 0); + ok(compare_vec4(&v, 0.0101f, 0.0303f, 0.0202f, 0.0404f, 0), + "Got unexpected value {%.8e, %.8e, %.8e, %.8e}.\n", v.x, v.y, v.z, v.w); + + ID3D10Blob_Release(ps_code); + } + release_test_context(&test_context); +} + +static void test_math(void) +{ + struct test_context test_context; + ID3DXConstantTable *constants; + ID3D10Blob *ps_code = NULL; + IDirect3DDevice9 *device; + struct vec4 v; + HRESULT hr; + + static const char ps_source[] = + "float4 main(uniform float u, uniform float v, uniform float w, uniform float x,\n" + " uniform float y, uniform float z): COLOR\n" + "{\n" + " return float4(x * y - z / w + --u / -v,\n" + " z * x / y + w / -v,\n" + " u + v - w,\n" + " x / y / w);\n" + "}"; + + if (!init_test_context(&test_context)) + return; + device = test_context.device; + + todo_wine ps_code = compile_shader(ps_source, "ps_2_0"); + if (ps_code) + { + hr = pD3DXGetShaderConstantTable(ID3D10Blob_GetBufferPointer(ps_code), &constants); + ok(hr == D3D_OK, "Failed to get constant table, hr %#x.\n", hr); + hr = ID3DXConstantTable_SetFloat(constants, device, "$u", 2.5f); + ok(hr == D3D_OK, "Failed to set constant, hr %#x.\n", hr); + hr = ID3DXConstantTable_SetFloat(constants, device, "$v", 0.3f); + ok(hr == D3D_OK, "Failed to set constant, hr %#x.\n", hr); + hr = ID3DXConstantTable_SetFloat(constants, device, "$w", 0.2f); + ok(hr == D3D_OK, "Failed to set constant, hr %#x.\n", hr); + hr = ID3DXConstantTable_SetFloat(constants, device, "$x", 0.7f); + ok(hr == D3D_OK, "Failed to set constant, hr %#x.\n", hr); + hr = ID3DXConstantTable_SetFloat(constants, device, "$y", 0.1f); + ok(hr == D3D_OK, "Failed to set constant, hr %#x.\n", hr); + hr = ID3DXConstantTable_SetFloat(constants, device, "$z", 1.5f); + ok(hr == D3D_OK, "Failed to set constant, hr %#x.\n", hr); + ID3DXConstantTable_Release(constants); + + draw_quad(device, ps_code); + + v = get_color_vec4(device, 0, 0); + ok(compare_vec4(&v, -12.43f, 9.833333f, 1.6f, 35.0f, 1), + "Got unexpected value {%.8e, %.8e, %.8e, %.8e}.\n", v.x, v.y, v.z, v.w); + + ID3D10Blob_Release(ps_code); + } + release_test_context(&test_context); +} + +static void test_conditionals(void) +{ + struct test_context test_context; + ID3D10Blob *ps_code = NULL; + IDirect3DDevice9 *device; + const struct vec4 *v; + struct readback rb; + unsigned int i; + + static const char ps_if_source[] = + "float4 main(float2 pos : TEXCOORD0) : COLOR\n" + "{\n" + " if((pos.x * 640.0) > 200.0)\n" + " return float4(0.1, 0.2, 0.3, 0.4);\n" + " else\n" + " return float4(0.9, 0.8, 0.7, 0.6);\n" + "}"; + + static const char ps_ternary_source[] = + "float4 main(float2 pos : TEXCOORD0) : COLOR\n" + "{\n" + " return (pos.x < 0.5 ? float4(0.5, 0.25, 0.5, 0.75) : float4(0.6, 0.8, 0.1, 0.2));\n" + "}"; + + if (!init_test_context(&test_context)) + return; + device = test_context.device; + + todo_wine ps_code = compile_shader(ps_if_source, "ps_2_0"); + if (ps_code) + { + draw_quad(device, ps_code); + init_readback(device, &rb); + + for (i = 0; i < 200; i += 40) + { + v = get_readback_vec4(&rb, i, 0); + ok(compare_vec4(v, 0.9f, 0.8f, 0.7f, 0.6f, 0), + "Got unexpected value {%.8e, %.8e, %.8e, %.8e}.\n", v->x, v->y, v->z, v->w); + } + + for (i = 240; i < 640; i += 40) + { + v = get_readback_vec4(&rb, i, 0); + ok(compare_vec4(v, 0.1f, 0.2f, 0.3f, 0.4f, 0), + "Got unexpected value {%.8e, %.8e, %.8e, %.8e}.\n", v->x, v->y, v->z, v->w); + } + + release_readback(&rb); + ID3D10Blob_Release(ps_code); + } + + todo_wine ps_code = compile_shader(ps_ternary_source, "ps_2_0"); + if (ps_code) + { + draw_quad(device, ps_code); + init_readback(device, &rb); + + for (i = 0; i < 320; i += 40) + { + v = get_readback_vec4(&rb, i, 0); + ok(compare_vec4(v, 0.5f, 0.25f, 0.5f, 0.75f, 0), + "Got unexpected value {%.8e, %.8e, %.8e, %.8e}.\n", v->x, v->y, v->z, v->w); + } + + for (i = 360; i < 640; i += 40) + { + v = get_readback_vec4(&rb, i, 0); + ok(compare_vec4(v, 0.6f, 0.8f, 0.1f, 0.2f, 0), + "Got unexpected value {%.8e, %.8e, %.8e, %.8e}.\n", v->x, v->y, v->z, v->w); + } + + release_readback(&rb); + ID3D10Blob_Release(ps_code); + } + + release_test_context(&test_context); +} + +static void test_float_vectors(void) +{ + struct test_context test_context; + ID3DXConstantTable *constants; + ID3D10Blob *ps_code = NULL; + IDirect3DDevice9 *device; + struct vec4 v; + HRESULT hr; + + static const char ps_indexing_source[] = + "float4 main() : COLOR\n" + "{\n" + " float4 color;\n" + " color[0] = 0.020;\n" + " color[1] = 0.245;\n" + " color[2] = 0.351;\n" + " color[3] = 1.0;\n" + " return color;\n" + "}"; + + /* A uniform index is used so that the compiler can't optimize. */ + static const char ps_uniform_indexing_source[] = + "uniform int i;\n" + "float4 main() : COLOR\n" + "{\n" + " float4 color = float4(0.5, 0.4, 0.3, 0.2);\n" + " color.g = color[i];\n" + " color.b = 0.8;\n" + " return color;\n" + "}"; + + if (!init_test_context(&test_context)) + return; + device = test_context.device; + + todo_wine ps_code = compile_shader(ps_indexing_source, "ps_2_0"); + if (ps_code) + { + draw_quad(device, ps_code); + + v = get_color_vec4(device, 0, 0); + ok(compare_vec4(&v, 0.02f, 0.245f, 0.351f, 1.0f, 0), + "Got unexpected value {%.8e, %.8e, %.8e, %.8e}.\n", v.x, v.y, v.z, v.w); + + ID3D10Blob_Release(ps_code); + } + + todo_wine ps_code = compile_shader(ps_uniform_indexing_source, "ps_2_0"); + if (ps_code) + { + hr = pD3DXGetShaderConstantTable(ID3D10Blob_GetBufferPointer(ps_code), &constants); + ok(hr == D3D_OK, "Failed to get constants, hr %#x.\n", hr); + hr = ID3DXConstantTable_SetInt(constants, device, "i", 2); + ok(hr == D3D_OK, "Failed to set constant, hr %#x.\n", hr); + ID3DXConstantTable_Release(constants); + draw_quad(device, ps_code); + + v = get_color_vec4(device, 0, 0); + ok(compare_vec4(&v, 0.5f, 0.3f, 0.8f, 0.2f, 0), + "Got unexpected value {%.8e, %.8e, %.8e, %.8e}.\n", v.x, v.y, v.z, v.w); + + ID3D10Blob_Release(ps_code); + } + + release_test_context(&test_context); +} + +static void test_trig(void) +{ + struct test_context test_context; + ID3D10Blob *ps_code = NULL; + IDirect3DDevice9 *device; + const struct vec4 *v; + struct readback rb; + unsigned int i; + + static const char ps_source[] = + "float4 main(float x : TEXCOORD0) : COLOR\n" + "{\n" + " const float pi2 = 6.2831853;\n" + " float calcd_sin = (sin(x * pi2) + 1)/2;\n" + " float calcd_cos = (cos(x * pi2) + 1)/2;\n" + " return float4(calcd_sin, calcd_cos, 0, 0);\n" + "}"; + + if (!init_test_context(&test_context)) + return; + device = test_context.device; + + todo_wine ps_code = compile_shader(ps_source, "ps_2_0"); + if (ps_code) + { + draw_quad(device, ps_code); + init_readback(device, &rb); + + for (i = 0; i < 32; ++i) + { + float expect_x = (sinf(i * 2 * M_PI / 32) + 1.0f) / 2.0f; + float expect_y = (cosf(i * 2 * M_PI / 32) + 1.0f) / 2.0f; + v = get_readback_vec4(&rb, i * 640 / 32, 0); + ok(compare_vec4(v, expect_x, expect_y, 0.0f, 0.0f, 4096), + "Test %u: Got {%.8e, %.8e, %.8e, %.8e}, expected {%.8e, %.8e, %.8e, %.8e}.\n", + i, v->x, v->y, v->z, v->w, expect_x, expect_y, 0.0f, 0.0f); + } + + release_readback(&rb); + ID3D10Blob_Release(ps_code); + } + release_test_context(&test_context); +} + +static void test_fail(void) +{ + static const char *tests[] = + { + "float4 test(float2 pos: TEXCOORD0) : COLOR\n" + "{\n" + " return y;\n" + "}", + + "float4 test(float2 pos: TEXCOORD0) : COLOR\n" + "{\n" + " float4 x = float4(0, 0, 0, 0);\n" + " x.xzzx = float4(1, 2, 3, 4);\n" + " return x;\n" + "}", + + "float4 test(float2 pos: TEXCOORD0) : COLOR\n" + "{\n" + " float4 x = pos;\n" + " return x;\n" + "}", + + "float4 test(float2 pos, TEXCOORD0) ; COLOR\n" + "{\n" + " pos = float4 x;\n" + " mul(float4(5, 4, 3, 2), mvp) = x;\n" + " return float4;\n" + "}", + + "float4 563r(float2 45s: TEXCOORD0) : COLOR\n" + "{\n" + " float2 x = 45s;\n" + " return float4(x.x, x.y, 0, 0);\n" + "}", + + "float4 test(float2 pos: TEXCOORD0) : COLOR\n" + "{\n" + " struct { int b,c; } x = {0};\n" + " return y;\n" + "}", + + "float4 test(float2 pos: TEXCOORD0) : COLOR\n" + "{\n" + " struct {} x = {};\n" + " return y;\n" + "}", + }; + + ID3D10Blob *compiled, *errors; + unsigned int i; + HRESULT hr; + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + compiled = errors = NULL; + hr = ppD3DCompile(tests[i], strlen(tests[i]), NULL, NULL, NULL, "test", "ps_2_0", 0, 0, &compiled, &errors); + todo_wine ok(hr == E_FAIL, "Test %u, got unexpected hr %#x.\n", i, hr); + todo_wine_if (i == 1) ok(!!errors, "Test %u, expected non-NULL error blob.\n", i); + ok(!compiled, "Test %u, expected no compiled shader blob.\n", i); + if (errors) + ID3D10Blob_Release(errors); + } +} + +static BOOL load_d3dcompiler(void) +{ + HMODULE module; + +#if D3D_COMPILER_VERSION == 47 + if (!(module = LoadLibraryA("d3dcompiler_47.dll"))) return FALSE; +#else + if (!(module = LoadLibraryA("d3dcompiler_43.dll"))) return FALSE; +#endif + + ppD3DCompile = (void*)GetProcAddress(module, "D3DCompile"); + return TRUE; +} + +START_TEST(hlsl_d3d9) +{ + HMODULE mod; + + if (!load_d3dcompiler()) + { + win_skip("Could not load DLL.\n"); + return; + } + + if (!(mod = LoadLibraryA("d3dx9_36.dll"))) + { + win_skip("Failed to load d3dx9_36.dll.\n"); + return; + } + pD3DXGetShaderConstantTable = (void *)GetProcAddress(mod, "D3DXGetShaderConstantTable"); + + test_swizzle(); + test_math(); + test_conditionals(); + test_float_vectors(); + test_trig(); + test_fail(); +} diff --git a/dlls/d3dcompiler_47/tests/Makefile.in b/dlls/d3dcompiler_47/tests/Makefile.in index 401ed30b0f1..032e16fdb8f 100644 --- a/dlls/d3dcompiler_47/tests/Makefile.in +++ b/dlls/d3dcompiler_47/tests/Makefile.in @@ -6,5 +6,5 @@ PARENTSRC = ../../d3dcompiler_43/tests C_SRCS = \ asm.c \ blob.c \ - hlsl.c \ + hlsl_d3d9.c \ reflection.c -- 2.25.0

1 2

[PATCH] dstyle: IDirectMusicStyle8 GetDefaultBand return S_FALSE
by Alistair Leslie-Hughes 26 Feb '20

26 Feb '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48648 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dmstyle/style.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/dmstyle/style.c b/dlls/dmstyle/style.c index 3e480028b9e..31bf1118809 100644 --- a/dlls/dmstyle/style.c +++ b/dlls/dmstyle/style.c @@ -153,9 +153,12 @@ static HRESULT WINAPI IDirectMusicStyle8Impl_EnumBand(IDirectMusicStyle8 *iface, static HRESULT WINAPI IDirectMusicStyle8Impl_GetDefaultBand(IDirectMusicStyle8 *iface, IDirectMusicBand **ppBand) { - IDirectMusicStyle8Impl *This = impl_from_IDirectMusicStyle8(iface); - FIXME("(%p, %p): stub\n", This, ppBand); - return S_OK; + IDirectMusicStyle8Impl *This = impl_from_IDirectMusicStyle8(iface); + FIXME("(%p, %p): stub\n", This, ppBand); + + *ppBand = NULL; + + return S_FALSE; } static HRESULT WINAPI IDirectMusicStyle8Impl_EnumMotif(IDirectMusicStyle8 *iface, DWORD index, -- 2.25.0

1 0

Re: wine-devel Digest, Vol 175, Issue 361
by Anton Baskanov 25 Feb '20

25 Feb '20

Hello, thanks for reviewing my patches! I've addressed your comments in the new version. On Mon, 24 Feb 2020 14:21:32 -0600 Zebediah Figura wrote: > Hello Anton, thanks for the patch! I have a few comments inlined below: > > On 2/24/20 12:03 PM, Anton Baskanov wrote: > > Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> > > --- > > dlls/amstream/audiostream.c | 8 +- > > dlls/amstream/tests/amstream.c | 336 +++++++++++++++++++++++++++++++++ > > 2 files changed, 342 insertions(+), 2 deletions(-) > > > > diff --git a/dlls/amstream/audiostream.c b/dlls/amstream/audiostream.c > > index 2875e1f59b..8a16512dcd 100644 > > --- a/dlls/amstream/audiostream.c > > +++ b/dlls/amstream/audiostream.c > > @@ -499,13 +499,17 @@ static HRESULT WINAPI > > audio_IAudioMediaStream_GetFormat(IAudioMediaStream *iface > > { > > struct audio_stream *This = impl_from_IAudioMediaStream(iface); > > > > - FIXME("(%p/%p)->(%p) stub!\n", iface, This, wave_format_current); > > + TRACE("(%p/%p)->(%p)\n", iface, This, wave_format_current); > > > > if (!wave_format_current) > > return E_POINTER; > > > > - return MS_E_NOSTREAM; > > + if (!This->peer) > > + return MS_E_NOSTREAM; > > > > + *wave_format_current = *(WAVEFORMATEX *)This->mt.pbFormat; > > + > > + return S_OK; > > I suspect this should be protected by the stream's critical section. > > > } > > > > static HRESULT WINAPI > > audio_IAudioMediaStream_SetFormat(IAudioMediaStream *iface, const > > WAVEFORMATEX *wave_format) > > diff --git a/dlls/amstream/tests/amstream.c > b/dlls/amstream/tests/amstream.c > > index 6497dde91c..1fb3cc239b 100644 > > --- a/dlls/amstream/tests/amstream.c > > +++ b/dlls/amstream/tests/amstream.c > > @@ -2293,6 +2293,340 @@ out_unknown: > > IUnknown_Release(unknown); > > } > > > > +static LONG filter_ref_count = 1; > > + > > +static HRESULT WINAPI filter_QueryInterface(IBaseFilter *iface, > > REFIID riid, void **ret_iface) > > +{ > > + if (IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_IPersist, > riid) || > > + IsEqualGUID(&IID_IMediaFilter, riid) || > > IsEqualGUID(&IID_IBaseFilter, riid)) > > + { > > + *ret_iface = iface; > > + IBaseFilter_AddRef(iface); > > + return S_OK; > > + } > > + return E_NOINTERFACE; > > +} > > + > > +static ULONG WINAPI filter_AddRef(IBaseFilter *iface) > > +{ > > + return InterlockedIncrement(&filter_ref_count); > > +} > > + > > +static ULONG WINAPI filter_Release(IBaseFilter *iface) > > +{ > > + return InterlockedDecrement(&filter_ref_count); > > +} > > + > > +static HRESULT WINAPI filter_GetClassID(IBaseFilter *iface, CLSID > *clsid) > > +{ > > + ok(0, "Unexpected call.\n"); > > + return E_NOTIMPL; > > +} > > + > > +static HRESULT WINAPI filter_Stop(IBaseFilter *iface) > > +{ > > + ok(0, "Unexpected call.\n"); > > + return E_NOTIMPL; > > +} > > + > > +static HRESULT WINAPI filter_Pause(IBaseFilter *iface) > > +{ > > + ok(0, "Unexpected call.\n"); > > + return E_NOTIMPL; > > +} > > + > > +static HRESULT WINAPI filter_Run(IBaseFilter *iface, REFERENCE_TIME > start) > > +{ > > + ok(0, "Unexpected call.\n"); > > + return E_NOTIMPL; > > +} > > + > > +static HRESULT WINAPI filter_GetState(IBaseFilter *iface, DWORD > > timeout, FILTER_STATE *state) > > +{ > > + ok(0, "Unexpected call.\n"); > > + return E_NOTIMPL; > > +} > > + > > +static HRESULT WINAPI filter_SetSyncSource(IBaseFilter *iface, > > IReferenceClock *clock) > > +{ > > + ok(0, "Unexpected call.\n"); > > + return E_NOTIMPL; > > +} > > + > > +static HRESULT WINAPI filter_GetSyncSource(IBaseFilter *iface, > > IReferenceClock **clock) > > +{ > > + ok(0, "Unexpected call.\n"); > > + return E_NOTIMPL; > > +} > > + > > +static HRESULT WINAPI filter_EnumPins(IBaseFilter *iface, IEnumPins > > **enum_pins) > > +{ > > + ok(0, "Unexpected call.\n"); > > + return E_NOTIMPL; > > +} > > + > > +static HRESULT WINAPI filter_FindPin(IBaseFilter *iface, const WCHAR > > *id, IPin **out) > > +{ > > + ok(0, "Unexpected call.\n"); > > + return E_NOTIMPL; > > +} > > + > > +static HRESULT WINAPI filter_QueryFilterInfo(IBaseFilter *iface, > > FILTER_INFO *info) > > +{ > > + ok(0, "Unexpected call.\n"); > > + return E_NOTIMPL; > > +} > > + > > +static HRESULT WINAPI filter_JoinFilterGraph(IBaseFilter *iface, > > + IFilterGraph *graph, const WCHAR *name) > > +{ > > + ok(0, "Unexpected call.\n"); > > + return E_NOTIMPL; > > +} > > + > > +static HRESULT WINAPI filter_QueryVendorInfo(IBaseFilter *iface, > > LPWSTR *vendor_info) > > +{ > > + ok(0, "Unexpected call.\n"); > > + return E_NOTIMPL; > > +} > > + > > +static const IBaseFilterVtbl filter_vtbl = > > +{ > > + filter_QueryInterface, > > + filter_AddRef, > > + filter_Release, > > + filter_GetClassID, > > + filter_Stop, > > + filter_Pause, > > + filter_Run, > > + filter_GetState, > > + filter_SetSyncSource, > > + filter_GetSyncSource, > > + filter_EnumPins, > > + filter_FindPin, > > + filter_QueryFilterInfo, > > + filter_JoinFilterGraph, > > + filter_QueryVendorInfo, > > +}; > > + > > +static IBaseFilter filter = {&filter_vtbl}; > > + > > +static LONG output_pin_ref_count = 1; > > + > > +static HRESULT WINAPI output_pin_QueryInterface(IPin *iface, REFIID > > iid, void **out) > > +{ > > + if (IsEqualGUID(&IID_IUnknown, iid) || IsEqualGUID(&IID_IPin, iid)) > > + { > > + *out = iface; > > + IPin_AddRef(iface); > > + return S_OK; > > + } > > + return E_NOINTERFACE; > > +} > > + > > +static ULONG WINAPI output_pin_AddRef(IPin *iface) > > +{ > > + return InterlockedIncrement(&output_pin_ref_count); > > +} > > + > > +static ULONG WINAPI output_pin_Release(IPin *iface) > > +{ > > + return InterlockedDecrement(&output_pin_ref_count); > > +} > > + > > +static HRESULT WINAPI output_pin_Connect(IPin *iface, IPin *peer, > > const AM_MEDIA_TYPE *mt) > > +{ > > + ok(0, "Unexpected call.\n"); > > + return E_NOTIMPL; > > +} > > + > > +static HRESULT WINAPI output_pin_ReceiveConnection(IPin *iface, IPin > > *peer, const AM_MEDIA_TYPE *mt) > > +{ > > + ok(0, "Unexpected call.\n"); > > + return E_NOTIMPL; > > +} > > + > > +static HRESULT WINAPI output_pin_Disconnect(IPin *iface) > > +{ > > + ok(0, "Unexpected call.\n"); > > + return E_NOTIMPL; > > +} > > + > > +static HRESULT WINAPI output_pin_ConnectedTo(IPin *iface, IPin **peer) > > +{ > > + ok(0, "Unexpected call.\n"); > > + return E_NOTIMPL; > > +} > > + > > +static HRESULT WINAPI output_pin_ConnectionMediaType(IPin *iface, > > AM_MEDIA_TYPE *mt) > > +{ > > + ok(0, "Unexpected call.\n"); > > + return E_NOTIMPL; > > +} > > + > > +static HRESULT WINAPI output_pin_QueryPinInfo(IPin *iface, PIN_INFO > *info) > > +{ > > + if (winetest_debug > 1) trace("QueryPinInfo\n"); > > + info->pFilter = &filter; > > + info->dir = PINDIR_OUTPUT; > > + lstrcpyW(info->achName, L"output"); > > + IBaseFilter_AddRef(info->pFilter); > > + return S_OK; > > +} > > + > > +static HRESULT WINAPI output_pin_QueryDirection(IPin *iface, > > PIN_DIRECTION *dir) > > +{ > > + if (winetest_debug > 1) trace("QueryDirection\n"); > > + *dir = PINDIR_OUTPUT; > > + return S_OK; > > +} > > + > > +static HRESULT WINAPI output_pin_QueryId(IPin *iface, WCHAR **id) > > +{ > > + ok(0, "Unexpected call.\n"); > > + return E_NOTIMPL; > > +} > > + > > +static HRESULT WINAPI output_pin_QueryAccept(IPin *iface, const > > AM_MEDIA_TYPE *mt) > > +{ > > + ok(0, "Unexpected call.\n"); > > + return E_NOTIMPL; > > +} > > + > > +static HRESULT WINAPI output_pin_EnumMediaTypes(IPin *iface, > > IEnumMediaTypes **out) > > +{ > > + ok(0, "Unexpected call.\n"); > > + return E_NOTIMPL; > > +} > > + > > +static HRESULT WINAPI output_pin_QueryInternalConnections(IPin > > *iface, IPin **pins, ULONG *count) > > +{ > > + ok(0, "Unexpected call.\n"); > > + return E_NOTIMPL; > > +} > > + > > +static HRESULT WINAPI output_pin_EndOfStream(IPin *iface) > > +{ > > + ok(0, "Unexpected call.\n"); > > + return E_NOTIMPL; > > +} > > + > > +static HRESULT WINAPI output_pin_BeginFlush(IPin *iface) > > +{ > > + ok(0, "Unexpected call.\n"); > > + return E_NOTIMPL; > > +} > > + > > +static HRESULT WINAPI output_pin_EndFlush(IPin *iface) > > +{ > > + ok(0, "Unexpected call.\n"); > > + return E_NOTIMPL; > > +} > > + > > +static HRESULT WINAPI output_pin_NewSegment(IPin *iface, > > REFERENCE_TIME start, REFERENCE_TIME stop, double rate) > > +{ > > + ok(0, "Unexpected call.\n"); > > + return E_NOTIMPL; > > +} > > + > > +static const IPinVtbl output_pin_vtbl = > > +{ > > + output_pin_QueryInterface, > > + output_pin_AddRef, > > + output_pin_Release, > > + output_pin_Connect, > > + output_pin_ReceiveConnection, > > + output_pin_Disconnect, > > + output_pin_ConnectedTo, > > + output_pin_ConnectionMediaType, > > + output_pin_QueryPinInfo, > > + output_pin_QueryDirection, > > + output_pin_QueryId, > > + output_pin_QueryAccept, > > + output_pin_EnumMediaTypes, > > + output_pin_QueryInternalConnections, > > + output_pin_EndOfStream, > > + output_pin_BeginFlush, > > + output_pin_EndFlush, > > + output_pin_NewSegment, > > +}; > > + > > +static IPin output_pin = {&output_pin_vtbl}; > > I would suggest using strmbase for this instead of manually implementing > the source pin and filter, similar to how it's done in the quartz > renderer tests. > > > + > > +static void test_audiostream_get_format(void) > > +{ > > + IAMMultiMediaStream *mmstream = create_ammultimediastream(); > > + IMediaStream *stream = NULL; > > + IAudioMediaStream *audio_stream = NULL; > > + IPin *pin = NULL; > > + WAVEFORMATEX stream_format = {0}; > > + WAVEFORMATEX media_type_format = {0}; > > + AM_MEDIA_TYPE media_type = {0}; > > + HRESULT hr; > > + > > + hr = IAMMultiMediaStream_AddMediaStream(mmstream, NULL, > > &MSPID_PrimaryAudio, 0, &stream); > > + ok(hr == S_OK, "Got hr %#x.\n", hr); > > + hr = IMediaStream_QueryInterface(stream, &IID_IAudioMediaStream, > > (void **)&audio_stream); > > + ok(hr == S_OK, "Got hr %#x.\n", hr); > > + hr = IMediaStream_QueryInterface(stream, &IID_IPin, (void **)&pin); > > + ok(hr == S_OK, "Got hr %#x.\n", hr); > > + > > + hr = IAudioMediaStream_GetFormat(audio_stream, NULL); > > + ok(hr == E_POINTER, "Got hr %#x.\n", hr); > > + > > + hr = IAudioMediaStream_GetFormat(audio_stream, &stream_format); > > + ok(hr == MS_E_NOSTREAM, "Got hr %#x.\n", hr); > > + > > + media_type_format.wFormatTag = WAVE_FORMAT_PCM; > > + media_type_format.nChannels = 2; > > + media_type_format.nSamplesPerSec = 44100; > > + media_type_format.nAvgBytesPerSec = 176400; > > + media_type_format.nBlockAlign = 4; > > + media_type_format.wBitsPerSample = 16; > > + media_type_format.cbSize = 0; > > + > > + media_type.majortype = MEDIATYPE_Audio; > > + media_type.subtype = MEDIASUBTYPE_PCM; > > + media_type.bFixedSizeSamples = TRUE; > > + media_type.bTemporalCompression = FALSE; > > + media_type.lSampleSize = 2; > > + media_type.formattype = FORMAT_WaveFormatEx; > > + media_type.pUnk = NULL; > > + media_type.cbFormat = sizeof(media_type_format); > > + media_type.pbFormat = (BYTE *)&media_type_format; > > + > > + hr = IPin_ReceiveConnection(pin, &output_pin, &media_type); > > + ok(hr == S_OK, "Got hr %#x.\n", hr); > > And similarly, this should use IFilterGraph2::ConnectDirect() with the > multimedia stream's filter graph, unless there's a good reason not to. > > > + > > + stream_format.wFormatTag = 0xdead; > > + stream_format.nChannels = 0xdead; > > + stream_format.nSamplesPerSec = 0xdeadbeef; > > + stream_format.nAvgBytesPerSec = 0xdeadbeef; > > + stream_format.nBlockAlign = 0xdead; > > + stream_format.wBitsPerSample = 0xdead; > > + stream_format.cbSize = 0xdead; > > memset(&stream_format, 0xcc, sizeof(stream_format)) would probably be > easier. > > > + hr = IAudioMediaStream_GetFormat(audio_stream, &stream_format); > > + ok(hr == S_OK, "Got hr %#x.\n", hr); > > + ok(WAVE_FORMAT_PCM == stream_format.wFormatTag, "got %u\n", > > stream_format.wFormatTag); > > + ok(2 == stream_format.nChannels, "got %u\n", > stream_format.nChannels); > > + ok(44100 == stream_format.nSamplesPerSec, "got %u\n", > > stream_format.nSamplesPerSec); > > + ok(176400 == stream_format.nAvgBytesPerSec, "got %u\n", > > stream_format.nAvgBytesPerSec); > > + ok(4 == stream_format.nBlockAlign, "got %u\n", > stream_format.nBlockAlign); > > + ok(16 == stream_format.wBitsPerSample, "got %u\n", > > stream_format.wBitsPerSample); > > + ok(0 == stream_format.cbSize, "got %u\n", stream_format.cbSize); > > It's my stylistic preference (mostly borrowed from d3d) to put the > constant on the right, and capitalize and punctuate trace messages. > Adding a description (e.g. "Got alignment %u.") would probably also be > appreciated. > > > + > > + hr = IPin_Disconnect(pin); > > + ok(hr == S_OK, "Got hr %#x.\n", hr); > > + > > + hr = IAudioMediaStream_GetFormat(audio_stream, &stream_format); > > + ok(hr == MS_E_NOSTREAM, "Got hr %#x.\n", hr); > > + > > + IPin_Release(pin); > > + IAudioMediaStream_Release(audio_stream); > > + IMediaStream_Release(stream); > > + IAMMultiMediaStream_Release(mmstream); > > Can you please check that all references are released, as is done > elsewhere? > > > +} > > + > > START_TEST(amstream) > > { > > HANDLE file; > > @@ -2326,5 +2660,7 @@ START_TEST(amstream) > > test_audiodata_get_format(); > > test_audiodata_set_format(); > > > > + test_audiostream_get_format(); > > + > > CoUninitialize(); > > } > > -- > > 2.17.1 > > >

1 0

[PATCH v2 1/3] amstream: Implement AMAudioStream::GetFormat.
by Anton Baskanov 25 Feb '20

25 Feb '20

Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> --- v2: - Protect access to stream data by the stream's critical section - Use strmbase to implement the test pin and filter. - Use IGraphBuilder::ConnectDirect to connect the pins in the test - Use IGraphBuilder::Disconnect to disconnect the pins in tests the test - Use memset instead of manual assignment of debug pattern in the test - Check that all references are released at the end of the test - Improve test trace messages --- dlls/amstream/audiostream.c | 15 +++- dlls/amstream/tests/Makefile.in | 2 +- dlls/amstream/tests/amstream.c | 152 ++++++++++++++++++++++++++++++++ 3 files changed, 166 insertions(+), 3 deletions(-) diff --git a/dlls/amstream/audiostream.c b/dlls/amstream/audiostream.c index 2875e1f59b..e4161fa3e6 100644 --- a/dlls/amstream/audiostream.c +++ b/dlls/amstream/audiostream.c @@ -499,13 +499,24 @@ static HRESULT WINAPI audio_IAudioMediaStream_GetFormat(IAudioMediaStream *iface { struct audio_stream *This = impl_from_IAudioMediaStream(iface); - FIXME("(%p/%p)->(%p) stub!\n", iface, This, wave_format_current); + TRACE("(%p/%p)->(%p)\n", iface, This, wave_format_current); if (!wave_format_current) return E_POINTER; - return MS_E_NOSTREAM; + EnterCriticalSection(&This->cs); + if (!This->peer) + { + LeaveCriticalSection(&This->cs); + return MS_E_NOSTREAM; + } + + *wave_format_current = *(WAVEFORMATEX *)This->mt.pbFormat; + + LeaveCriticalSection(&This->cs); + + return S_OK; } static HRESULT WINAPI audio_IAudioMediaStream_SetFormat(IAudioMediaStream *iface, const WAVEFORMATEX *wave_format) diff --git a/dlls/amstream/tests/Makefile.in b/dlls/amstream/tests/Makefile.in index 3a1a269fea..81eaed3c15 100644 --- a/dlls/amstream/tests/Makefile.in +++ b/dlls/amstream/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = amstream.dll -IMPORTS = strmiids uuid ddraw ole32 user32 +IMPORTS = strmbase strmiids uuid ddraw ole32 user32 C_SRCS = \ amstream.c diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 6497dde91c..1d1b7deb3f 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -27,6 +27,7 @@ #include "ks.h" #include "initguid.h" #include "ksmedia.h" +#include "wine/strmbase.h" static const WCHAR primary_video_sink_id[] = L"I{A35FF56A-9FDA-11D0-8FDF-00C04FD9189D}"; static const WCHAR primary_audio_sink_id[] = L"I{A35FF56B-9FDA-11D0-8FDF-00C04FD9189D}"; @@ -2293,6 +2294,155 @@ out_unknown: IUnknown_Release(unknown); } +struct testfilter +{ + struct strmbase_filter filter; + struct strmbase_source source; +}; + +static inline struct testfilter *impl_from_BaseFilter(struct strmbase_filter *iface) +{ + return CONTAINING_RECORD(iface, struct testfilter, filter); +} + +static struct strmbase_pin *testfilter_get_pin(struct strmbase_filter *iface, unsigned int index) +{ + struct testfilter *filter = impl_from_BaseFilter(iface); + if (!index) + return &filter->source.pin; + return NULL; +} + +static void testfilter_destroy(struct strmbase_filter *iface) +{ + struct testfilter *filter = impl_from_BaseFilter(iface); + strmbase_source_cleanup(&filter->source); + strmbase_filter_cleanup(&filter->filter); +} + +static const struct strmbase_filter_ops testfilter_ops = +{ + .filter_get_pin = testfilter_get_pin, + .filter_destroy = testfilter_destroy, +}; + +static HRESULT testsource_query_accept(struct strmbase_pin *iface, const AM_MEDIA_TYPE *mt) +{ + return S_OK; +} + +static HRESULT WINAPI testsource_DecideAllocator(struct strmbase_source *iface, + IMemInputPin *peer, IMemAllocator **allocator) +{ + return S_OK; +} + +static const struct strmbase_source_ops testsource_ops = +{ + .base.pin_query_accept = testsource_query_accept, + .base.pin_get_media_type = strmbase_pin_get_media_type, + .pfnAttemptConnection = BaseOutputPinImpl_AttemptConnection, + .pfnDecideAllocator = testsource_DecideAllocator, +}; + +static void testfilter_init(struct testfilter *filter) +{ + static const GUID clsid = {0xabacab}; + strmbase_filter_init(&filter->filter, NULL, &clsid, &testfilter_ops); + strmbase_source_init(&filter->source, &filter->filter, L"", &testsource_ops); +} + +static void test_audiostream_get_format(void) +{ + IAMMultiMediaStream *mmstream = create_ammultimediastream(); + IGraphBuilder *graph = NULL; + struct testfilter source; + IMediaStream *stream = NULL; + IAudioMediaStream *audio_stream = NULL; + IPin *pin = NULL; + WAVEFORMATEX stream_format = {0}; + WAVEFORMATEX media_type_format = {0}; + AM_MEDIA_TYPE media_type = {0}; + HRESULT hr; + ULONG ref; + + hr = IAMMultiMediaStream_Initialize(mmstream, STREAMTYPE_READ, 0, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAMMultiMediaStream_AddMediaStream(mmstream, NULL, &MSPID_PrimaryAudio, 0, &stream); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaStream_QueryInterface(stream, &IID_IAudioMediaStream, (void **)&audio_stream); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaStream_QueryInterface(stream, &IID_IPin, (void **)&pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAMMultiMediaStream_GetFilterGraph(mmstream, &graph); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(graph != NULL, "Expected non-null graph\n"); + + testfilter_init(&source); + + hr = IGraphBuilder_AddFilter(graph, &source.filter.IBaseFilter_iface, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAudioMediaStream_GetFormat(audio_stream, NULL); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + + hr = IAudioMediaStream_GetFormat(audio_stream, &stream_format); + ok(hr == MS_E_NOSTREAM, "Got hr %#x.\n", hr); + + media_type_format.wFormatTag = WAVE_FORMAT_PCM; + media_type_format.nChannels = 2; + media_type_format.nSamplesPerSec = 44100; + media_type_format.nAvgBytesPerSec = 176400; + media_type_format.nBlockAlign = 4; + media_type_format.wBitsPerSample = 16; + media_type_format.cbSize = 0; + + media_type.majortype = MEDIATYPE_Audio; + media_type.subtype = MEDIASUBTYPE_PCM; + media_type.bFixedSizeSamples = TRUE; + media_type.bTemporalCompression = FALSE; + media_type.lSampleSize = 2; + media_type.formattype = FORMAT_WaveFormatEx; + media_type.pUnk = NULL; + media_type.cbFormat = sizeof(media_type_format); + media_type.pbFormat = (BYTE *)&media_type_format; + + hr = IGraphBuilder_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &media_type); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + memset(&stream_format, 0xcc, sizeof(stream_format)); + hr = IAudioMediaStream_GetFormat(audio_stream, &stream_format); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(stream_format.wFormatTag == WAVE_FORMAT_PCM, "Got wFormatTag %u\n", stream_format.wFormatTag); + ok(stream_format.nChannels == 2, "Got nChannels %u\n", stream_format.nChannels); + ok(stream_format.nSamplesPerSec == 44100, "Got nSamplesPerSec %u\n", stream_format.nSamplesPerSec); + ok(stream_format.nAvgBytesPerSec == 176400, "Got nAvgBytesPerSec %u\n", stream_format.nAvgBytesPerSec); + ok(stream_format.nBlockAlign == 4, "Got nBlockAlign %u\n", stream_format.nBlockAlign); + ok(stream_format.wBitsPerSample == 16, "Got wBitsPerSample %u\n", stream_format.wBitsPerSample); + ok(stream_format.cbSize == 0, "Got cbSize %u\n", stream_format.cbSize); + + hr = IGraphBuilder_Disconnect(graph, pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IGraphBuilder_Disconnect(graph, &source.source.pin.IPin_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAudioMediaStream_GetFormat(audio_stream, &stream_format); + ok(hr == MS_E_NOSTREAM, "Got hr %#x.\n", hr); + + ref = IAMMultiMediaStream_Release(mmstream); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IGraphBuilder_Release(graph); + ok(!ref, "Got outstanding refcount %d.\n", ref); + IPin_Release(pin); + IAudioMediaStream_Release(audio_stream); + ref = IMediaStream_Release(stream); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IBaseFilter_Release(&source.filter.IBaseFilter_iface); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + START_TEST(amstream) { HANDLE file; @@ -2326,5 +2476,7 @@ START_TEST(amstream) test_audiodata_get_format(); test_audiodata_set_format(); + test_audiostream_get_format(); + CoUninitialize(); } -- 2.17.1

1 2

[PATCH v2] maintainers: Move d3d10 and d3d10_1 under Direct3D helper libraries.
by Matteo Bruni 25 Feb '20

25 Feb '20

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- v2: Fix typo, thanks Zebediah. Supersedes patch 179579. MAINTAINERS | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index c4f5b080b2d..93e89193b70 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -65,7 +65,7 @@ Direct3D M: Henri Verbeet <hverbeet(a)codeweavers.com> P: Stefan Dösinger <stefan(a)codeweavers.com> P: Matteo Bruni <mbruni(a)codeweavers.com> -F: dlls/d3d10*/ +F: dlls/d3d10core/ F: dlls/d3d11/ F: dlls/d3d12/ F: dlls/d3d8/ @@ -79,6 +79,8 @@ Direct3D helper libraries M: Matteo Bruni <mbruni(a)codeweavers.com> P: Henri Verbeet <hverbeet(a)codeweavers.com> P: Stefan Dösinger <stefan(a)codeweavers.com> +F: dlls/d3d10/ +F: dlls/d3d10_1/ F: dlls/d3dcompiler*/ F: dlls/d3dx10*/ F: dlls/d3dx11*/ -- 2.24.1

1 0

[PATCH 1/3] d3d10: Implement matrix effect variable set methods.
by Connor McAdams 25 Feb '20

25 Feb '20

Implement SetMatrix/SetMatrixArray and SetMatrixTranspose/SetMatrixTransposeArray methods for the matrix effect variable interface. Signed-off-by: Connor McAdams <conmanx360(a)gmail.com> --- dlls/d3d10/d3d10_private.h | 5 ++ dlls/d3d10/effect.c | 107 ++++++++++++++++++++++++++++++++++--- 2 files changed, 104 insertions(+), 8 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 5c6c7a2d72..2be381f608 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -61,6 +61,11 @@ enum d3d10_effect_object_operation D3D10_EOO_ANONYMOUS_SHADER = 7, }; +struct d3d10_effect_matrix +{ + float m[4][4]; +}; + struct d3d10_effect_object { struct d3d10_effect_pass *pass; diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 93be257b81..1bc7968499 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -4967,8 +4967,87 @@ static const struct ID3D10EffectVectorVariableVtbl d3d10_effect_vector_variable_ d3d10_effect_vector_variable_GetFloatVectorArray, }; +static void write_matrix_to_buffer(struct d3d10_effect_variable *variable, float *buf, + struct d3d10_effect_matrix *matrix, BOOL transpose) +{ + unsigned int row, col; + + if (variable->type->type_class == D3D10_SVC_MATRIX_COLUMNS) + { + for (col = 0; col < variable->type->column_count; col++) + { + for (row = 0; row < variable->type->row_count; row++) + { + if (transpose) + buf[(col * 4) + row] = matrix->m[col][row]; + else + buf[(col * 4) + row] = matrix->m[row][col]; + } + } + } + else + { + for (col = 0; col < variable->type->column_count; col++) + { + for (row = 0; row < variable->type->row_count; row++) + { + if (transpose) + buf[(row * 4) + col] = matrix->m[col][row]; + else + buf[(row * 4) + col] = matrix->m[row][col]; + } + } + } +} + +static void write_matrix_variable_to_buffer(struct d3d10_effect_variable *variable, void *data, BOOL transpose) +{ + char *buf = variable->buffer->u.buffer.local_buffer + variable->buffer_offset; + + write_matrix_to_buffer(variable, (float *)buf, data, transpose); + + variable->buffer->u.buffer.changed = 1; +} + +static void write_matrix_variable_array_to_buffer(struct d3d10_effect_variable *variable, void *data, UINT offset, + UINT count, BOOL transpose) +{ + char *buf = variable->buffer->u.buffer.local_buffer + variable->buffer_offset; + struct d3d10_effect_matrix *input_data = data; + unsigned int i; + + if (!variable->type->element_count) + { + write_matrix_variable_to_buffer(variable, data, transpose); + return; + } + + if (offset >= variable->type->element_count) + return; + + if (count > variable->type->element_count - offset) + count = variable->type->element_count - offset; + + if (offset) + buf += variable->type->stride * offset; + + for (i = 0; i < count; i++) + { + write_matrix_to_buffer(variable, (float *)buf, &input_data[i], transpose); + + buf += variable->type->stride; + } + + variable->buffer->u.buffer.changed = 1; +} + /* ID3D10EffectVariable methods */ +static inline struct d3d10_effect_variable *impl_from_ID3D10EffectMatrixVariable(ID3D10EffectMatrixVariable *iface) +{ + return CONTAINING_RECORD(iface, struct d3d10_effect_variable, ID3D10EffectVariable_iface); +} + static BOOL STDMETHODCALLTYPE d3d10_effect_matrix_variable_IsValid(ID3D10EffectMatrixVariable *iface) { TRACE("iface %p\n", iface); @@ -5125,9 +5204,12 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_matrix_variable_GetRawValue(ID3D10 static HRESULT STDMETHODCALLTYPE d3d10_effect_matrix_variable_SetMatrix(ID3D10EffectMatrixVariable *iface, float *data) { - FIXME("iface %p, data %p stub!\n", iface, data); + struct d3d10_effect_variable *effect_var = impl_from_ID3D10EffectMatrixVariable(iface); - return E_NOTIMPL; + TRACE("iface %p, data %p.\n", iface, data); + write_matrix_variable_to_buffer(effect_var, data, FALSE); + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d10_effect_matrix_variable_GetMatrix(ID3D10EffectMatrixVariable *iface, @@ -5141,9 +5223,12 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_matrix_variable_GetMatrix(ID3D10Ef static HRESULT STDMETHODCALLTYPE d3d10_effect_matrix_variable_SetMatrixArray(ID3D10EffectMatrixVariable *iface, float *data, UINT offset, UINT count) { - FIXME("iface %p, data %p, offset %u, count %u stub!\n", iface, data, offset, count); + struct d3d10_effect_variable *effect_var = impl_from_ID3D10EffectMatrixVariable(iface); - return E_NOTIMPL; + TRACE("iface %p, data %p, offset %u, count %u.\n", iface, data, offset, count); + write_matrix_variable_array_to_buffer(effect_var, data, offset, count, FALSE); + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d10_effect_matrix_variable_GetMatrixArray(ID3D10EffectMatrixVariable *iface, @@ -5157,9 +5242,12 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_matrix_variable_GetMatrixArray(ID3 static HRESULT STDMETHODCALLTYPE d3d10_effect_matrix_variable_SetMatrixTranspose(ID3D10EffectMatrixVariable *iface, float *data) { - FIXME("iface %p, data %p stub!\n", iface, data); + struct d3d10_effect_variable *effect_var = impl_from_ID3D10EffectMatrixVariable(iface); - return E_NOTIMPL; + TRACE("iface %p, data %p.\n", iface, data); + write_matrix_variable_to_buffer(effect_var, data, TRUE); + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d10_effect_matrix_variable_GetMatrixTranspose(ID3D10EffectMatrixVariable *iface, @@ -5173,9 +5261,12 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_matrix_variable_GetMatrixTranspose static HRESULT STDMETHODCALLTYPE d3d10_effect_matrix_variable_SetMatrixTransposeArray(ID3D10EffectMatrixVariable *iface, float *data, UINT offset, UINT count) { - FIXME("iface %p, data %p, offset %u, count %u stub!\n", iface, data, offset, count); + struct d3d10_effect_variable *effect_var = impl_from_ID3D10EffectMatrixVariable(iface); - return E_NOTIMPL; + TRACE("iface %p, data %p, offset %u, count %u.\n", iface, data, offset, count); + write_matrix_variable_array_to_buffer(effect_var, data, offset, count, TRUE); + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d10_effect_matrix_variable_GetMatrixTransposeArray(ID3D10EffectMatrixVariable *iface, -- 2.20.1

3 7

[PATCH] gdi32/tests: Remove unnecessary metafile handle traces.
by Francois Gouget 25 Feb '20

25 Feb '20

Tracing the handle values is not useful and increases the test report size. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- dlls/gdi32/tests/metafile.c | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index f1caebbc9d0..5a64fe6d60a 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -179,8 +179,6 @@ static void test_ExtTextOut(void) hdcDisplay = GetDC(hwnd); ok(hdcDisplay != 0, "GetDC error %d\n", GetLastError()); - trace("hdcDisplay %p\n", hdcDisplay); - SetMapMode(hdcDisplay, MM_TEXT); memset(&orig_lf, 0, sizeof(orig_lf)); @@ -207,8 +205,6 @@ static void test_ExtTextOut(void) hdcMetafile = CreateEnhMetaFileA(hdcDisplay, NULL, NULL, NULL); ok(hdcMetafile != 0, "CreateEnhMetaFileA error %d\n", GetLastError()); - trace("hdcMetafile %p\n", hdcMetafile); - ok(GetDeviceCaps(hdcMetafile, TECHNOLOGY) == DT_RASDISPLAY, "GetDeviceCaps(TECHNOLOGY) has to return DT_RASDISPLAY for a display based EMF\n"); @@ -2057,7 +2053,6 @@ static void test_mf_Blank(void) hdcMetafile = CreateMetaFileA(NULL); ok(hdcMetafile != 0, "CreateMetaFileA(NULL) error %d\n", GetLastError()); - trace("hdcMetafile %p\n", hdcMetafile); /* Tests on metafile initialization */ caps = GetDeviceCaps (hdcMetafile, TECHNOLOGY); @@ -2094,7 +2089,6 @@ static void test_CopyMetaFile(void) hdcMetafile = CreateMetaFileA(NULL); ok(hdcMetafile != 0, "CreateMetaFileA(NULL) error %d\n", GetLastError()); - trace("hdcMetafile %p\n", hdcMetafile); hMetafile = CloseMetaFile(hdcMetafile); ok(hMetafile != 0, "CloseMetaFile error %d\n", GetLastError()); @@ -2141,7 +2135,6 @@ static void test_SetMetaFileBits(void) METAHEADER *mh; hmf = SetMetaFileBitsEx(sizeof(MF_GRAPHICS_BITS), MF_GRAPHICS_BITS); - trace("hmf %p\n", hmf); ok(hmf != 0, "SetMetaFileBitsEx error %d\n", GetLastError()); type = GetObjectType(hmf); ok(type == OBJ_METAFILE, "SetMetaFileBitsEx created object with type %d\n", type); @@ -2161,7 +2154,6 @@ static void test_SetMetaFileBits(void) /* Now with zero size */ SetLastError(0xdeadbeef); hmf = SetMetaFileBitsEx(0, MF_GRAPHICS_BITS); - trace("hmf %p\n", hmf); ok(!hmf, "SetMetaFileBitsEx should fail\n"); ok(GetLastError() == ERROR_INVALID_DATA || broken(GetLastError() == ERROR_INVALID_PARAMETER), /* Win9x */ @@ -2170,7 +2162,6 @@ static void test_SetMetaFileBits(void) /* Now with odd size */ SetLastError(0xdeadbeef); hmf = SetMetaFileBitsEx(sizeof(MF_GRAPHICS_BITS) - 1, MF_GRAPHICS_BITS); - trace("hmf %p\n", hmf); ok(!hmf, "SetMetaFileBitsEx should fail\n"); ok(GetLastError() == 0xdeadbeef /* XP SP1 */, "wrong error %d\n", GetLastError()); @@ -2184,7 +2175,6 @@ static void test_SetMetaFileBits(void) mh->mtHeaderSize = 0; SetLastError(0xdeadbeef); hmf = SetMetaFileBitsEx(sizeof(MF_GRAPHICS_BITS), buf); - trace("hmf %p\n", hmf); ok(!hmf, "SetMetaFileBitsEx should fail\n"); ok(GetLastError() == ERROR_INVALID_DATA || broken(GetLastError() == ERROR_INVALID_PARAMETER), /* Win9x */ @@ -2196,7 +2186,6 @@ static void test_SetMetaFileBits(void) /* corruption of mtSize doesn't lead to a failure */ mh->mtSize *= 2; hmf = SetMetaFileBitsEx(sizeof(MF_GRAPHICS_BITS), buf); - trace("hmf %p\n", hmf); ok(hmf != 0, "SetMetaFileBitsEx error %d\n", GetLastError()); if (compare_mf_bits(hmf, MF_GRAPHICS_BITS, sizeof(MF_GRAPHICS_BITS), "mf_Graphics") != 0) @@ -2215,7 +2204,6 @@ static void test_SetMetaFileBits(void) /* zeroing mtSize doesn't lead to a failure */ mh->mtSize = 0; hmf = SetMetaFileBitsEx(sizeof(MF_GRAPHICS_BITS), buf); - trace("hmf %p\n", hmf); ok(hmf != 0, "SetMetaFileBitsEx error %d\n", GetLastError()); if (compare_mf_bits(hmf, MF_GRAPHICS_BITS, sizeof(MF_GRAPHICS_BITS), "mf_Graphics") != 0) @@ -2242,7 +2230,6 @@ static void test_mf_Graphics(void) hdcMetafile = CreateMetaFileA(NULL); ok(hdcMetafile != 0, "CreateMetaFileA(NULL) error %d\n", GetLastError()); - trace("hdcMetafile %p\n", hdcMetafile); ret = MoveToEx(hdcMetafile, 1, 1, NULL); ok( ret, "MoveToEx error %d.\n", GetLastError()); @@ -2301,7 +2288,6 @@ static void test_mf_PatternBrush(void) hdcMetafile = CreateMetaFileA(NULL); ok(hdcMetafile != 0, "CreateMetaFileA error %d\n", GetLastError()); - trace("hdcMetafile %p\n", hdcMetafile); hBrush = SelectObject(hdcMetafile, hBrush); ok(hBrush != 0, "SelectObject error %d.\n", GetLastError()); @@ -2385,7 +2371,6 @@ static void test_mf_ExtTextOut_on_path(void) hdcMetafile = CreateMetaFileA(NULL); ok(hdcMetafile != 0, "CreateMetaFileA(NULL) error %d\n", GetLastError()); - trace("hdcMetafile %p\n", hdcMetafile); ret = BeginPath(hdcMetafile); ok(!ret, "BeginPath on metafile DC should fail\n"); -- 2.20.1

1 0

[PATCH v2 1/4] d3d10: Introduce an effect buffer variable structure.
by Matteo Bruni 25 Feb '20

25 Feb '20

From: Connor McAdams <conmanx360(a)gmail.com> Signed-off-by: Connor McAdams <conmanx360(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- v2: Clean it up a bit. dlls/d3d10/d3d10_private.h | 10 ++++++ dlls/d3d10/effect.c | 62 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 72 insertions(+) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 96020cd4a0c..f83ff0d4c94 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -114,6 +114,15 @@ struct d3d10_effect_state_object_variable } object; }; +struct d3d10_effect_buffer_variable +{ + ID3D10Buffer *buffer; + ID3D10ShaderResourceView *resource_view; + + BOOL changed; + BYTE *local_buffer; +}; + /* ID3D10EffectType */ struct d3d10_effect_type { @@ -169,6 +178,7 @@ struct d3d10_effect_variable { struct d3d10_effect_state_object_variable state; struct d3d10_effect_shader_variable shader; + struct d3d10_effect_buffer_variable buffer; } u; }; diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 91e713bdf54..3ee9bf7a35c 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -2096,6 +2096,55 @@ static HRESULT parse_fx10_local_variable(const char *data, size_t data_size, return S_OK; } +static HRESULT create_variable_buffer(struct d3d10_effect_variable *v, D3D10_CBUFFER_TYPE type) +{ + D3D10_BUFFER_DESC buffer_desc; + D3D10_SUBRESOURCE_DATA subresource_data; + D3D10_SHADER_RESOURCE_VIEW_DESC srv_desc; + ID3D10Device *device = v->effect->device; + HRESULT hr; + + if (!(v->u.buffer.local_buffer = heap_alloc_zero(v->type->size_unpacked))) + { + ERR("Failed to allocate local constant buffer memory.\n"); + return E_OUTOFMEMORY; + } + + buffer_desc.ByteWidth = v->type->size_unpacked; + buffer_desc.Usage = D3D10_USAGE_DEFAULT; + buffer_desc.CPUAccessFlags = 0; + buffer_desc.MiscFlags = 0; + if (type == D3D10_CT_CBUFFER) + buffer_desc.BindFlags = D3D10_BIND_CONSTANT_BUFFER; + else + buffer_desc.BindFlags = D3D10_BIND_SHADER_RESOURCE; + + subresource_data.pSysMem = v->u.buffer.local_buffer; + subresource_data.SysMemPitch = 0; + subresource_data.SysMemSlicePitch = 0; + + if (FAILED(hr = ID3D10Device_CreateBuffer(device, &buffer_desc, &subresource_data, &v->u.buffer.buffer))) + return hr; + + if (type == D3D10_CT_TBUFFER) + { + srv_desc.Format = DXGI_FORMAT_R32G32B32A32_UINT; + srv_desc.ViewDimension = D3D_SRV_DIMENSION_BUFFER; + srv_desc.Buffer.ElementOffset = 0; + srv_desc.Buffer.ElementWidth = v->type->size_unpacked / 16; + if (v->type->size_unpacked % 16) + WARN("Unexpected texture buffer size not a multiple of 16.\n"); + + if (FAILED(hr = ID3D10Device_CreateShaderResourceView(device, (ID3D10Resource *)v->u.buffer.buffer, + &srv_desc, &v->u.buffer.resource_view))) + return hr; + } + else + v->u.buffer.resource_view = NULL; + + return S_OK; +} + static HRESULT parse_fx10_local_buffer(const char *data, size_t data_size, const char **ptr, struct d3d10_effect_variable *l) { @@ -2282,6 +2331,12 @@ static HRESULT parse_fx10_local_buffer(const char *data, size_t data_size, TRACE("\tBasetype: %s.\n", debug_d3d10_shader_variable_type(l->type->basetype)); TRACE("\tTypeclass: %s.\n", debug_d3d10_shader_variable_class(l->type->type_class)); + if (l->type->size_unpacked) + { + if (FAILED(hr = create_variable_buffer(l, d3d10_cbuffer_type))) + return hr; + } + return S_OK; } @@ -2760,6 +2815,13 @@ static void d3d10_effect_local_buffer_destroy(struct d3d10_effect_variable *l) } heap_free(l->annotations); } + + heap_free(l->u.buffer.local_buffer); + + if (l->u.buffer.buffer) + ID3D10Buffer_Release(l->u.buffer.buffer); + if (l->u.buffer.resource_view) + ID3D10ShaderResourceView_Release(l->u.buffer.resource_view); } /* IUnknown methods */ -- 2.24.1

1 3

[PATCH 1/5] d3dcompiler: Store the swizzle unshifted.
by Zebediah Figura 25 Feb '20

25 Feb '20

From: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/d3dcompiler_43/asmshader.y | 4 +-- dlls/d3dcompiler_43/bytecodewriter.c | 6 +--- dlls/d3dcompiler_43/d3dcompiler_private.h | 38 +++++++++++------------ dlls/d3dcompiler_43/utils.c | 8 ++--- 4 files changed, 26 insertions(+), 30 deletions(-) diff --git a/dlls/d3dcompiler_43/asmshader.y b/dlls/d3dcompiler_43/asmshader.y index 32b37d0885d..1b7a07313fc 100644 --- a/dlls/d3dcompiler_43/asmshader.y +++ b/dlls/d3dcompiler_43/asmshader.y @@ -1148,11 +1148,11 @@ swizzle: /* empty */ else { DWORD last, i; - $$ = $2.swizzle << BWRITERVS_SWIZZLE_SHIFT; + $$ = $2.swizzle; /* Fill the swizzle by extending the last component */ last = ($2.swizzle >> 2 * ($2.idx - 1)) & 0x03; for(i = $2.idx; i < 4; i++){ - $$ |= last << (BWRITERVS_SWIZZLE_SHIFT + 2 * i); + $$ |= last << (2 * i); } TRACE("Got a swizzle: %08x\n", $$); } diff --git a/dlls/d3dcompiler_43/bytecodewriter.c b/dlls/d3dcompiler_43/bytecodewriter.c index 14162ab212b..42013dfba3f 100644 --- a/dlls/d3dcompiler_43/bytecodewriter.c +++ b/dlls/d3dcompiler_43/bytecodewriter.c @@ -342,8 +342,6 @@ static void put_dword(struct bytecode_buffer *buffer, DWORD value) { /* bwriter -> d3d9 conversion functions. */ static DWORD d3d9_swizzle(DWORD bwriter_swizzle) { - /* Currently a NOP, but this allows changing the internal definitions - * without side effects. */ DWORD ret = 0; if ((bwriter_swizzle & BWRITERVS_X_X) == BWRITERVS_X_X) ret |= D3DVS_X_X; @@ -1270,9 +1268,7 @@ static void instr_ps_1_0123_texld(struct bc_writer *This, This->funcs->dstreg(This, &instr->dst, buffer, instr->shift, instr->dstmod); } else if(instr->src[0].type == BWRITERSPR_TEMP) { - swizzlemask = (3 << BWRITERVS_SWIZZLE_SHIFT) | - (3 << (BWRITERVS_SWIZZLE_SHIFT + 2)) | - (3 << (BWRITERVS_SWIZZLE_SHIFT + 4)); + swizzlemask = 3 | (3 << 2) | (3 << 4); if((instr->src[0].u.swizzle & swizzlemask) == (BWRITERVS_X_X | BWRITERVS_Y_Y | BWRITERVS_Z_Z)) { TRACE("writing texreg2rgb\n"); This->funcs->opcode(This, instr, D3DSIO_TEXREG2RGB & D3DSI_OPCODE_MASK, buffer); diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 45dbff7225b..5fc3161f5f0 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -542,25 +542,25 @@ enum bwritershader_param_srcmod_type #define BWRITERVS_SWIZZLE_SHIFT 16 #define BWRITERVS_SWIZZLE_MASK (0xFF << BWRITERVS_SWIZZLE_SHIFT) -#define BWRITERVS_X_X (0 << BWRITERVS_SWIZZLE_SHIFT) -#define BWRITERVS_X_Y (1 << BWRITERVS_SWIZZLE_SHIFT) -#define BWRITERVS_X_Z (2 << BWRITERVS_SWIZZLE_SHIFT) -#define BWRITERVS_X_W (3 << BWRITERVS_SWIZZLE_SHIFT) - -#define BWRITERVS_Y_X (0 << (BWRITERVS_SWIZZLE_SHIFT + 2)) -#define BWRITERVS_Y_Y (1 << (BWRITERVS_SWIZZLE_SHIFT + 2)) -#define BWRITERVS_Y_Z (2 << (BWRITERVS_SWIZZLE_SHIFT + 2)) -#define BWRITERVS_Y_W (3 << (BWRITERVS_SWIZZLE_SHIFT + 2)) - -#define BWRITERVS_Z_X (0 << (BWRITERVS_SWIZZLE_SHIFT + 4)) -#define BWRITERVS_Z_Y (1 << (BWRITERVS_SWIZZLE_SHIFT + 4)) -#define BWRITERVS_Z_Z (2 << (BWRITERVS_SWIZZLE_SHIFT + 4)) -#define BWRITERVS_Z_W (3 << (BWRITERVS_SWIZZLE_SHIFT + 4)) - -#define BWRITERVS_W_X (0 << (BWRITERVS_SWIZZLE_SHIFT + 6)) -#define BWRITERVS_W_Y (1 << (BWRITERVS_SWIZZLE_SHIFT + 6)) -#define BWRITERVS_W_Z (2 << (BWRITERVS_SWIZZLE_SHIFT + 6)) -#define BWRITERVS_W_W (3 << (BWRITERVS_SWIZZLE_SHIFT + 6)) +#define BWRITERVS_X_X (0) +#define BWRITERVS_X_Y (1) +#define BWRITERVS_X_Z (2) +#define BWRITERVS_X_W (3) + +#define BWRITERVS_Y_X (0 << 2) +#define BWRITERVS_Y_Y (1 << 2) +#define BWRITERVS_Y_Z (2 << 2) +#define BWRITERVS_Y_W (3 << 2) + +#define BWRITERVS_Z_X (0 << 4) +#define BWRITERVS_Z_Y (1 << 4) +#define BWRITERVS_Z_Z (2 << 4) +#define BWRITERVS_Z_W (3 << 4) + +#define BWRITERVS_W_X (0 << 6) +#define BWRITERVS_W_Y (1 << 6) +#define BWRITERVS_W_Z (2 << 6) +#define BWRITERVS_W_W (3 << 6) #define BWRITERVS_NOSWIZZLE (BWRITERVS_X_X | BWRITERVS_Y_Y | BWRITERVS_Z_Z | BWRITERVS_W_W) diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index 1436ed6bf3e..b2b1e25bbdc 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -291,10 +291,10 @@ static const char *debug_print_swizzle(DWORD arg) return ".w"; } - swizzle[0] = (arg >> (BWRITERVS_SWIZZLE_SHIFT + 0)) & 0x03; - swizzle[1] = (arg >> (BWRITERVS_SWIZZLE_SHIFT + 2)) & 0x03; - swizzle[2] = (arg >> (BWRITERVS_SWIZZLE_SHIFT + 4)) & 0x03; - swizzle[3] = (arg >> (BWRITERVS_SWIZZLE_SHIFT + 6)) & 0x03; + swizzle[0] = arg & 3; + swizzle[1] = (arg >> 2) & 3; + swizzle[2] = (arg >> 4) & 3; + swizzle[3] = (arg >> 6) & 3; ret[0] = '.'; for (i = 0; i < 4; ++i) -- 2.25.0

4 13

[PATCH] ws2_32: Fix return values of WSCGetProviderPath() stub
by Aaro Altonen 25 Feb '20

25 Feb '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45801 Signed-off-by: Aaro Altonen <a.altonen(a)hotmail.com> --- dlls/ws2_32/socket.c | 17 +++++++++++++---- dlls/ws2_32/tests/sock.c | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 4 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index c284f595ab..700e93894d 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -9006,12 +9006,21 @@ INT WINAPI WSCEnableNSProvider( LPGUID provider, BOOL enable ) */ INT WINAPI WSCGetProviderPath( LPGUID provider, LPWSTR path, LPINT len, LPINT errcode ) { - FIXME( "(%s %p %p %p) Stub!\n", debugstr_guid(provider), path, len, errcode ); + if (!provider || !len || !path) { + if (errcode) + *errcode = WSAEFAULT; + return SOCKET_ERROR; + } - if (!errcode || !provider || !len) return WSAEFAULT; + if (*len <= 0) { + if (errcode) + *errcode = WSAEFAULT; + return SOCKET_ERROR; + } - *errcode = WSAEINVAL; - return SOCKET_ERROR; + FIXME("WSCGetProviderPath not implemented.\n"); + + return 0; } /*********************************************************************** diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 60c5dfc63f..176a19bcfa 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -84,6 +84,7 @@ static int (WINAPI *pWSALookupServiceNextW)(HANDLE,DWORD,LPDWORD,LPWSAQUERYSET static int (WINAPI *pWSAEnumNameSpaceProvidersA)(LPDWORD,LPWSANAMESPACE_INFOA); static int (WINAPI *pWSAEnumNameSpaceProvidersW)(LPDWORD,LPWSANAMESPACE_INFOW); static int (WINAPI *pWSAPoll)(WSAPOLLFD *,ULONG,INT); +static int (WINAPI *pWSCGetProviderPath)(LPGUID, LPWSTR, LPINT, LPINT); /* Function pointers from iphlpapi */ static DWORD (WINAPI *pGetAdaptersInfo)(PIP_ADAPTER_INFO,PULONG); @@ -1300,6 +1301,7 @@ static void Init (void) pWSAEnumNameSpaceProvidersA = (void *)GetProcAddress(hws2_32, "WSAEnumNameSpaceProvidersA"); pWSAEnumNameSpaceProvidersW = (void *)GetProcAddress(hws2_32, "WSAEnumNameSpaceProvidersW"); pWSAPoll = (void *)GetProcAddress(hws2_32, "WSAPoll"); + pWSCGetProviderPath = (void *)GetProcAddress(hws2_32, "WSCGetProviderPath"); hiphlpapi = LoadLibraryA("iphlpapi.dll"); if (hiphlpapi) @@ -10600,6 +10602,39 @@ static void test_address_list_query(void) closesocket(s); } +static void test_WSCGetProviderPath(void) +{ + GUID ProviderIdIP = { 0x0, 0x0, 0x0, { 0x0, 0x0, 0x00, 0x0, 0x0, 0x0, 0x0, 0x0 } }; + wchar_t buffer[256]; + INT ret, err, len; + + ret = pWSCGetProviderPath(NULL, NULL, NULL, NULL); + ok(ret == SOCKET_ERROR, "Got unexpected ret %d.\n", ret); + + ret = pWSCGetProviderPath(&ProviderIdIP, NULL, NULL, NULL); + ok(ret == SOCKET_ERROR, "Got unexpected ret %d.\n", ret); + + ret = pWSCGetProviderPath(NULL, NULL, NULL, &err); + ok(ret == SOCKET_ERROR, "Got unexpected ret %d.\n", ret); + ok(err == WSAEFAULT, "Got unexpected error %d.\n", err); + + ret = pWSCGetProviderPath(&ProviderIdIP, NULL, NULL, &err); + ok(ret == SOCKET_ERROR, "Got unexpected ret %d.\n", ret); + ok(err == WSAEFAULT, "Got unexpected error %d.\n", err); + + len = -1; + ret = pWSCGetProviderPath(&ProviderIdIP, buffer, &len, &err); + ok(ret == SOCKET_ERROR, "Got unexpected ret %d.\n", ret); + ok(err == WSAEFAULT, "Got unexpected error %d.\n", err); + + /* WSCGetProviderPath() will return an error but if "ProviderIdIP" + * was valid, its path's length is written to "len" */ + len = -1; + ret = pWSCGetProviderPath(&ProviderIdIP, NULL, &len, &err); + ok(ret == SOCKET_ERROR, "Got unexpected ret %d.\n", ret); + ok(err == WSAEFAULT, "Got unexpected error %d.\n", err); +} + static DWORD WINAPI inet_ntoa_thread_proc(void *param) { ULONG addr; @@ -11681,6 +11716,8 @@ START_TEST( sock ) test_completion_port(); test_address_list_query(); + test_WSCGetProviderPath(); + /* this is an io heavy test, do it at the end so the kernel doesn't start dropping packets */ test_send(); test_synchronous_WSAIoctl(); -- 2.25.1

2 1

[PATCH 1/2] d3dx9: Add more ID3DXFont_DrawTextW tests.
by Matteo Bruni 25 Feb '20

25 Feb '20

From: Sven Baars <sbaars(a)codeweavers.com> Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/d3dx9_36/tests/core.c | 78 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 78 insertions(+) diff --git a/dlls/d3dx9_36/tests/core.c b/dlls/d3dx9_36/tests/core.c index f5c539ca85e..c44473396b7 100644 --- a/dlls/d3dx9_36/tests/core.c +++ b/dlls/d3dx9_36/tests/core.c @@ -770,6 +770,84 @@ static void test_ID3DXFont(IDirect3DDevice9 *device) height = ID3DXFont_DrawTextW(font, NULL, long_textW, -1, &rect, DT_WORDBREAK | DT_NOCLIP, 0xff00ff); ok(height == 96, "Got unexpected height %d.\n", height); + + height = ID3DXFont_DrawTextW(font, NULL, L"a\na", -1, &rect, 0, 0xff00ff); + ok(height == 24, "Got unexpected height %d.\n", height); + + height = ID3DXFont_DrawTextW(font, NULL, L"a\r\na", -1, &rect, 0, 0xff00ff); + ok(height == 24, "Got unexpected height %d.\n", height); + + height = ID3DXFont_DrawTextW(font, NULL, L"a\ra", -1, &rect, 0, 0xff00ff); + ok(height == 12, "Got unexpected height %d.\n", height); + + height = ID3DXFont_DrawTextW(font, NULL, L"a\na", -1, &rect, DT_SINGLELINE, 0xff00ff); + ok(height == 12, "Got unexpected height %d.\n", height); + + height = ID3DXFont_DrawTextW(font, NULL, L"a\naaaaa aaaa", -1, &rect, 0, 0xff00ff); + ok(height == 24, "Got unexpected height %d.\n", height); + + height = ID3DXFont_DrawTextW(font, NULL, L"a\naaaaa aaaa", -1, &rect, DT_WORDBREAK, 0xff00ff); + ok(height == 36, "Got unexpected height %d.\n", height); + + height = ID3DXFont_DrawTextW(font, NULL, L"1\n2\n3\n4\n5\n6", -1, &rect, 0, 0xff00ff); + ok(height == 48, "Got unexpected height %d.\n", height); + + height = ID3DXFont_DrawTextW(font, NULL, L"1\n2\n3\n4\n5\n6", -1, &rect, DT_NOCLIP, 0xff00ff); + ok(height == 72, "Got unexpected height %d.\n", height); + + height = ID3DXFont_DrawTextW(font, NULL, L"\t\t\t\t\t\t\t\t\t\t", -1, &rect, DT_WORDBREAK, 0xff00ff); + ok(height == 0, "Got unexpected height %d.\n", height); + + height = ID3DXFont_DrawTextW(font, NULL, L"\t\t\t\t\t\t\t\t\t\ta", -1, &rect, DT_WORDBREAK, 0xff00ff); + ok(height == 12, "Got unexpected height %d.\n", height); + + height = ID3DXFont_DrawTextW(font, NULL, L"\taaaaaaaaaa", -1, &rect, DT_WORDBREAK, 0xff00ff); + ok(height == 24, "Got unexpected height %d.\n", height); + + height = ID3DXFont_DrawTextW(font, NULL, L"\taaaaaaaaaa", -1, &rect, DT_EXPANDTABS | DT_WORDBREAK, 0xff00ff); + ok(height == 36, "Got unexpected height %d.\n", height); + + height = ID3DXFont_DrawTextW(font, NULL, L"\taaa\taaa\taaa", -1, &rect, DT_WORDBREAK, 0xff00ff); + ok(height == 24, "Got unexpected height %d.\n", height); + + height = ID3DXFont_DrawTextW(font, NULL, L"\taaa\taaa\taaa", -1, &rect, DT_EXPANDTABS | DT_WORDBREAK, 0xff00ff); + ok(height == 48, "Got unexpected height %d.\n", height); + + height = ID3DXFont_DrawTextW(font, NULL, L"\t\t\t\t\t\t\t\t\t\t", -1, &rect, DT_EXPANDTABS | DT_WORDBREAK, 0xff00ff); + ok(height == 60, "Got unexpected height %d.\n", height); + + height = ID3DXFont_DrawTextW(font, NULL, L"a\ta", -1, &rect, DT_EXPANDTABS | DT_WORDBREAK, 0xff00ff); + ok(height == 12, "Got unexpected height %d.\n", height); + + height = ID3DXFont_DrawTextW(font, NULL, L"a\ta\ta", -1, &rect, DT_EXPANDTABS | DT_WORDBREAK, 0xff00ff); + ok(height == 24, "Got unexpected height %d.\n", height); + + height = ID3DXFont_DrawTextW(font, NULL, L"aaaaaaaaaaaaaaaaaaaa", -1, &rect, DT_WORDBREAK, 0xff00ff); + ok(height == 36, "Got unexpected height %d.\n", height); + + height = ID3DXFont_DrawTextW(font, NULL, L"a a", -1, &rect, DT_WORDBREAK, 0xff00ff); + ok(height == 36, "Got unexpected height %d.\n", height); + + height = ID3DXFont_DrawTextW(font, NULL, L"aaaa aaaa", -1, &rect, DT_WORDBREAK, 0xff00ff); + ok(height == 36, "Got unexpected height %d.\n", height); + + height = ID3DXFont_DrawTextW(font, NULL, L"aaaa aaaa", -1, &rect, DT_WORDBREAK | DT_RIGHT, 0xff00ff); + ok(height == 36, "Got unexpected height %d.\n", height); + + height = ID3DXFont_DrawTextW(font, NULL, L"aaaa aaaa", -1, &rect, DT_WORDBREAK | DT_RIGHT, 0xff00ff); + ok(height == 36, "Got unexpected height %d.\n", height); + + height = ID3DXFont_DrawTextW(font, NULL, L"aaaa\naaaa", -1, &rect, DT_BOTTOM, 0xff00ff); + ok(height == 40, "Got unexpected height %d.\n", height); + + height = ID3DXFont_DrawTextW(font, NULL, L"aaaa\naaaa", -1, &rect, DT_VCENTER, 0xff00ff); + ok(height == 32, "Got unexpected height %d.\n", height); + + height = ID3DXFont_DrawTextW(font, NULL, L"aaaa\naaaa", -1, &rect, DT_RIGHT, 0xff00ff); + ok(height == 24, "Got unexpected height %d.\n", height); + + height = ID3DXFont_DrawTextW(font, NULL, L"aaaa\naaaa", -1, &rect, DT_CENTER, 0xff00ff); + ok(height == 24, "Got unexpected height %d.\n", height); } ID3DXFont_Release(font); -- 2.24.1

1 1

[PATCH 1/2] vbscript: Return the item's disp when it does not have the SCRIPTITEM_CODEONLY flag, rather than the script dispatch.
by Gabriel Ivăncescu 25 Feb '20

25 Feb '20

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/vbscript/interp.c | 4 +++- dlls/vbscript/tests/vbscript.c | 18 ++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index b0046cb..27a4aee 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -1527,7 +1527,9 @@ static HRESULT interp_me(exec_ctx_t *ctx) if(ctx->vbthis) disp = (IDispatch*)&ctx->vbthis->IDispatchEx_iface; else if(ctx->code->named_item) - disp = (IDispatch*)&ctx->code->named_item->script_obj->IDispatchEx_iface; + disp = (ctx->code->named_item->flags & SCRIPTITEM_CODEONLY) + ? (IDispatch*)&ctx->code->named_item->script_obj->IDispatchEx_iface + : ctx->code->named_item->disp; else if(ctx->script->host_global) disp = ctx->script->host_global; else diff --git a/dlls/vbscript/tests/vbscript.c b/dlls/vbscript/tests/vbscript.c index 19689b5..8536ee1 100644 --- a/dlls/vbscript/tests/vbscript.c +++ b/dlls/vbscript/tests/vbscript.c @@ -1858,6 +1858,15 @@ static void test_named_items(void) hres = IActiveScript_GetScriptDispatch(script, L"visibleCodeItem", &disp); ok(hres == S_OK, "GetScriptDispatch returned: %08x\n", hres); + SET_EXPECT(OnEnterScript); + SET_EXPECT(OnLeaveScript); + hres = IActiveScriptParse_ParseScriptText(parse, L"me", L"visibleCodeItem", NULL, NULL, 0, 0, SCRIPTTEXT_ISEXPRESSION, &var, NULL); + ok(hres == S_OK, "ParseScriptText failed: %08x\n", hres); + ok(V_VT(&var) == VT_DISPATCH && V_DISPATCH(&var) == disp, + "Unexpected 'me': V_VT = %d, V_DISPATCH = %p\n", V_VT(&var), V_DISPATCH(&var)); + VariantClear(&var); + CHECK_CALLED(OnEnterScript); + CHECK_CALLED(OnLeaveScript); IDispatch_Release(disp); SET_EXPECT(GetItemInfo_visible_code); @@ -1993,6 +2002,15 @@ static void test_named_items(void) CHECK_CALLED(OnLeaveScript); SET_EXPECT(OnEnterScript); SET_EXPECT(OnLeaveScript); + hres = IActiveScriptParse_ParseScriptText(parse, L"me", L"globalItem", NULL, NULL, 0, 0, SCRIPTTEXT_ISEXPRESSION, &var, NULL); + ok(hres == S_OK, "ParseScriptText failed: %08x\n", hres); + ok(V_VT(&var) == VT_DISPATCH && V_DISPATCH(&var) == &global_named_item, + "Unexpected 'me': V_VT = %d, V_DISPATCH = %p\n", V_VT(&var), V_DISPATCH(&var)); + VariantClear(&var); + CHECK_CALLED(OnEnterScript); + CHECK_CALLED(OnLeaveScript); + SET_EXPECT(OnEnterScript); + SET_EXPECT(OnLeaveScript); hres = IActiveScriptParse_ParseScriptText(parse, L"me", L"codeOnlyItem", NULL, NULL, 0, 0, SCRIPTTEXT_ISEXPRESSION, &var, NULL); ok(hres == S_OK, "ParseScriptText failed: %08x\n", hres); ok(V_VT(&var) == VT_DISPATCH && V_DISPATCH(&var) == (IDispatch*)script_disp2, -- 2.21.0

2 5

[PATCH 1/2] kernel32/tests: Add more tests for DefineDosDevice().
by Zebediah Figura 25 Feb '20

25 Feb '20

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/kernel32/tests/volume.c | 79 ++++++++++++++++++++++++++++-------- 1 file changed, 63 insertions(+), 16 deletions(-) diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c index 348ce1a76c5..5fa8a9f05de 100644 --- a/dlls/kernel32/tests/volume.c +++ b/dlls/kernel32/tests/volume.c @@ -24,6 +24,7 @@ #include "ntddstor.h" #include <stdio.h> #include "ddk/ntddcdvd.h" +#include "ddk/mountmgr.h" #include <pshpack1.h> struct COMPLETE_DVD_LAYER_DESCRIPTOR @@ -105,11 +106,12 @@ static void test_query_dos_deviceA(void) HeapFree( GetProcessHeap(), 0, buffer ); } -static void test_define_dos_deviceA(void) +static void test_dos_devices(void) { + char buf[MAX_PATH], buf2[400]; char drivestr[3]; - char buf[MAX_PATH]; - DWORD ret; + HANDLE file; + BOOL ret; /* Find an unused drive letter */ drivestr[1] = ':'; @@ -123,20 +125,65 @@ static void test_define_dos_deviceA(void) return; } - /* Map it to point to the current directory */ - ret = GetCurrentDirectoryA(sizeof(buf), buf); - ok(ret, "GetCurrentDir\n"); + ret = DefineDosDeviceA( 0, drivestr, "C:/windows/" ); + todo_wine ok(ret, "failed to define drive %s, error %u\n", drivestr, GetLastError()); - ret = DefineDosDeviceA(0, drivestr, buf); - todo_wine - ok(ret, "Could not make drive %s point to %s!\n", drivestr, buf); + ret = QueryDosDeviceA( drivestr, buf, sizeof(buf) ); + todo_wine ok(ret, "failed to query drive %s, error %u\n", drivestr, GetLastError()); + todo_wine ok(!strcmp(buf, "\\??\\C:\\windows\\"), "got path %s\n", debugstr_a(buf)); - if (!ret) { - skip("can't test removing fake drive\n"); - } else { - ret = DefineDosDeviceA(DDD_REMOVE_DEFINITION, drivestr, NULL); - ok(ret, "Could not remove fake drive %s!\n", drivestr); - } + sprintf(buf, "%s/system32", drivestr); + file = CreateFileA( buf, 0, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, + OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, NULL ); + todo_wine ok(file != INVALID_HANDLE_VALUE, "got error %u\n", GetLastError()); + CloseHandle( file ); + + /* but it's not a volume mount point */ + + sprintf(buf, "%s\\", drivestr); + ret = GetVolumeNameForVolumeMountPointA( buf, buf2, sizeof(buf2) ); + ok(!ret, "expected failure\n"); + todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, "got error %u\n", GetLastError()); + + ret = DefineDosDeviceA(DDD_REMOVE_DEFINITION, drivestr, NULL); + todo_wine ok(ret, "failed to remove drive %s, error %u\n", drivestr, GetLastError()); + + ret = QueryDosDeviceA( drivestr, buf, sizeof(buf) ); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_FILE_NOT_FOUND, "got error %u\n", GetLastError()); + + sprintf(buf, "%s/system32", drivestr); + file = CreateFileA( buf, 0, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, + OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, NULL ); + ok(file == INVALID_HANDLE_VALUE, "expected failure\n"); + todo_wine ok(GetLastError() == ERROR_PATH_NOT_FOUND, "got error %u\n", GetLastError()); + + /* try with DDD_RAW_TARGET_PATH */ + + ret = DefineDosDeviceA( DDD_RAW_TARGET_PATH, drivestr, "\\??\\C:\\windows\\" ); + ok(ret, "failed to define drive %s, error %u\n", drivestr, GetLastError()); + + ret = QueryDosDeviceA( drivestr, buf, sizeof(buf) ); + todo_wine ok(ret, "failed to query drive %s, error %u\n", drivestr, GetLastError()); + todo_wine ok(!strcmp(buf, "\\??\\C:\\windows\\"), "got path %s\n", debugstr_a(buf)); + + sprintf(buf, "%s/system32", drivestr); + file = CreateFileA( buf, 0, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, + OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, NULL ); + todo_wine ok(file != INVALID_HANDLE_VALUE, "got error %u\n", GetLastError()); + CloseHandle( file ); + + sprintf(buf, "%s\\", drivestr); + ret = GetVolumeNameForVolumeMountPointA( buf, buf2, sizeof(buf2) ); + ok(!ret, "expected failure\n"); + todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, "got error %u\n", GetLastError()); + + ret = DefineDosDeviceA(DDD_REMOVE_DEFINITION, drivestr, NULL); + ok(ret, "failed to remove drive %s, error %u\n", drivestr, GetLastError()); + + ret = QueryDosDeviceA( drivestr, buf, sizeof(buf) ); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_FILE_NOT_FOUND, "got error %u\n", GetLastError()); } static void test_FindFirstVolume(void) @@ -1272,7 +1319,7 @@ START_TEST(volume) pGetVolumePathNamesForVolumeNameW = (void *) GetProcAddress(hdll, "GetVolumePathNamesForVolumeNameW"); test_query_dos_deviceA(); - test_define_dos_deviceA(); + test_dos_devices(); test_FindFirstVolume(); test_GetVolumePathNameA(); test_GetVolumePathNameW(); -- 2.25.0

1 1

[PATCH v2] include: Add corecrt_wstring.h header.
by Jacek Caban 25 Feb '20

25 Feb '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/msvcrt/corecrt_wstring.h | 88 ++++++++++++++++++++++++++++++++ include/msvcrt/string.h | 74 +-------------------------- include/msvcrt/wchar.h | 59 +-------------------- 3 files changed, 90 insertions(+), 131 deletions(-) create mode 100644 include/msvcrt/corecrt_wstring.h

1 0

[PATCH] include: Add corecrt_wstring.h header.
by Jacek Caban 25 Feb '20

25 Feb '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/msvcrt/corecrt_wstring.h | 86 ++++++++++++++++++++++++++++++++ include/msvcrt/string.h | 73 +-------------------------- include/msvcrt/wchar.h | 59 +--------------------- 3 files changed, 88 insertions(+), 130 deletions(-) create mode 100644 include/msvcrt/corecrt_wstring.h

1 0

[PATCH 1/6] d3d8: Retrieve transform states from the primary stateblock.
by Zebediah Figura 25 Feb '20

25 Feb '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/d3d8/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 5e18f64550..8ce38e2d9e 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1636,7 +1636,7 @@ static HRESULT WINAPI d3d8_device_GetTransform(IDirect3DDevice8 *iface, /* Note: D3DMATRIX is compatible with struct wined3d_matrix. */ wined3d_mutex_lock(); - wined3d_device_get_transform(device->wined3d_device, state, (struct wined3d_matrix *)matrix); + memcpy(matrix, &wined3d_stateblock_get_state(device->state)->transforms[state], sizeof(*matrix)); wined3d_mutex_unlock(); return D3D_OK; -- 2.25.0

2 11

[PATCH] dsound: Make GlobalHandle() for the sound buffer failed.
by Akihiro Sagawa 25 Feb '20

25 Feb '20

I think GlobalHandle() does the right thing here because it should succeed if the buffer is allocated by GlobalAlloc(GMEM_FIXED) or HeapAlloc(). Therefore, dsound needs to be fixed. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48635 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/dsound/buffer.c | 16 +++++----------- dlls/dsound/tests/dsound.c | 6 ++++++ 2 files changed, 11 insertions(+), 11 deletions(-)

2 1

[PATCH] crypt32/test: Update *.winehq.org certificate.
by Hans Leidekker 25 Feb '20

25 Feb '20

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/crypt32/tests/chain.c | 252 ++++++++++++++++++++++--------------- 1 file changed, 150 insertions(+), 102 deletions(-) diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index 1bf78b084d..30a69a21f9 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -402,95 +402,130 @@ static const BYTE google_com[]={ }; /* *.winehq.org cert */ static const BYTE winehq_org[] = { -0x30,0x82,0x05,0x2a,0x30,0x82,0x04,0x12,0xa0,0x03,0x02,0x01,0x02,0x02,0x03, -0x0c,0x35,0xd0,0x30,0x0d,0x06,0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01,0x01, -0x05,0x05,0x00,0x30,0x3c,0x31,0x0b,0x30,0x09,0x06,0x03,0x55,0x04,0x06,0x13, -0x02,0x55,0x53,0x31,0x17,0x30,0x15,0x06,0x03,0x55,0x04,0x0a,0x13,0x0e,0x47, -0x65,0x6f,0x54,0x72,0x75,0x73,0x74,0x2c,0x20,0x49,0x6e,0x63,0x2e,0x31,0x14, -0x30,0x12,0x06,0x03,0x55,0x04,0x03,0x13,0x0b,0x52,0x61,0x70,0x69,0x64,0x53, -0x53,0x4c,0x20,0x43,0x41,0x30,0x1e,0x17,0x0d,0x31,0x33,0x30,0x35,0x32,0x32, -0x30,0x33,0x35,0x36,0x30,0x39,0x5a,0x17,0x0d,0x31,0x34,0x30,0x35,0x32,0x35, -0x30,0x37,0x33,0x34,0x31,0x34,0x5a,0x30,0x81,0xbb,0x31,0x29,0x30,0x27,0x06, -0x03,0x55,0x04,0x05,0x13,0x20,0x30,0x6d,0x4a,0x75,0x76,0x31,0x74,0x2d,0x31, -0x43,0x46,0x79,0x70,0x51,0x6b,0x79,0x54,0x5a,0x77,0x66,0x76,0x6a,0x48,0x48, -0x42,0x41,0x62,0x6e,0x55,0x6e,0x64,0x47,0x31,0x13,0x30,0x11,0x06,0x03,0x55, -0x04,0x0b,0x13,0x0a,0x47,0x54,0x39,0x38,0x33,0x38,0x30,0x30,0x31,0x31,0x31, -0x31,0x30,0x2f,0x06,0x03,0x55,0x04,0x0b,0x13,0x28,0x53,0x65,0x65,0x20,0x77, -0x77,0x77,0x2e,0x72,0x61,0x70,0x69,0x64,0x73,0x73,0x6c,0x2e,0x63,0x6f,0x6d, -0x2f,0x72,0x65,0x73,0x6f,0x75,0x72,0x63,0x65,0x73,0x2f,0x63,0x70,0x73,0x20, -0x28,0x63,0x29,0x31,0x33,0x31,0x2f,0x30,0x2d,0x06,0x03,0x55,0x04,0x0b,0x13, -0x26,0x44,0x6f,0x6d,0x61,0x69,0x6e,0x20,0x43,0x6f,0x6e,0x74,0x72,0x6f,0x6c, -0x20,0x56,0x61,0x6c,0x69,0x64,0x61,0x74,0x65,0x64,0x20,0x2d,0x20,0x52,0x61, -0x70,0x69,0x64,0x53,0x53,0x4c,0x28,0x52,0x29,0x31,0x15,0x30,0x13,0x06,0x03, -0x55,0x04,0x03,0x0c,0x0c,0x2a,0x2e,0x77,0x69,0x6e,0x65,0x68,0x71,0x2e,0x6f, -0x72,0x67,0x30,0x82,0x01,0x22,0x30,0x0d,0x06,0x09,0x2a,0x86,0x48,0x86,0xf7, -0x0d,0x01,0x01,0x01,0x05,0x00,0x03,0x82,0x01,0x0f,0x00,0x30,0x82,0x01,0x0a, -0x02,0x82,0x01,0x01,0x00,0xc2,0x91,0x35,0xc7,0x67,0x32,0xf1,0x66,0x12,0x38, -0x79,0xdb,0x02,0x11,0x95,0x89,0x1b,0x4a,0x6a,0x63,0x45,0x35,0x58,0x1b,0x57, -0x8d,0xec,0x19,0x88,0xf5,0xa3,0x9e,0x6b,0xdb,0x07,0xfb,0x6e,0x29,0xe9,0xa9, -0x14,0x07,0x8c,0x3a,0xc1,0xd7,0x88,0xcc,0xe4,0x55,0x79,0x6e,0x97,0xe9,0x93, -0x88,0x9a,0x89,0xf9,0x31,0x0f,0x91,0x61,0xc2,0x9c,0xae,0x59,0x25,0x93,0x9a, -0xc8,0xf9,0x28,0x7a,0x0f,0x0f,0x89,0x9a,0xda,0x46,0xbe,0xb2,0xdc,0x90,0x5b, -0xd8,0x87,0xda,0xda,0xce,0x70,0x70,0x95,0x43,0x51,0xa0,0x21,0x22,0x54,0xab, -0xa7,0x09,0xe1,0x81,0x09,0x8c,0x00,0x15,0x30,0x5a,0xa7,0x61,0x77,0xba,0x48, -0x91,0xc6,0x94,0x90,0xdd,0x1a,0xf4,0x3f,0xa6,0x8a,0xb4,0x2f,0x98,0x16,0x0d, -0x96,0x9f,0x0c,0x96,0x01,0x15,0xbc,0x74,0x7e,0x5c,0x4e,0xe3,0x95,0xae,0x00, -0xf5,0x5b,0x88,0x0f,0xef,0x7c,0x1f,0xab,0x22,0xfe,0x95,0x42,0x1a,0xbd,0xee, -0x23,0xca,0x5b,0x7f,0x4a,0xb0,0xbe,0x15,0x65,0xe2,0xce,0x02,0xc4,0xf6,0xb8, -0xf3,0xd6,0x7e,0x75,0x5e,0x63,0x47,0x5d,0xc1,0xca,0xc3,0xc4,0x4a,0xf5,0x4d, -0x66,0x34,0x03,0xf8,0xf4,0x54,0x7d,0x6b,0x54,0x2f,0x17,0x7c,0x39,0x13,0x78, -0x09,0x9e,0xd0,0x9c,0x51,0x02,0x11,0x9d,0xa7,0x53,0x60,0xdd,0x62,0x2b,0xee, -0xb0,0xd1,0xf2,0x1a,0x5c,0xdc,0xa7,0x58,0xc2,0xfa,0x29,0xcf,0xf3,0xc9,0xe9, -0xae,0xe8,0x70,0x60,0x99,0xc7,0x30,0xdd,0x1c,0xda,0x32,0xc0,0x45,0xa5,0x48, -0xc5,0x22,0x29,0x0c,0x74,0x25,0x02,0x03,0x01,0x00,0x01,0xa3,0x82,0x01,0xb3, -0x30,0x82,0x01,0xaf,0x30,0x1f,0x06,0x03,0x55,0x1d,0x23,0x04,0x18,0x30,0x16, -0x80,0x14,0x6b,0x69,0x3d,0x6a,0x18,0x42,0x4a,0xdd,0x8f,0x02,0x65,0x39,0xfd, -0x35,0x24,0x86,0x78,0x91,0x16,0x30,0x30,0x0e,0x06,0x03,0x55,0x1d,0x0f,0x01, -0x01,0xff,0x04,0x04,0x03,0x02,0x05,0xa0,0x30,0x1d,0x06,0x03,0x55,0x1d,0x25, -0x04,0x16,0x30,0x14,0x06,0x08,0x2b,0x06,0x01,0x05,0x05,0x07,0x03,0x01,0x06, -0x08,0x2b,0x06,0x01,0x05,0x05,0x07,0x03,0x02,0x30,0x23,0x06,0x03,0x55,0x1d, -0x11,0x04,0x1c,0x30,0x1a,0x82,0x0c,0x2a,0x2e,0x77,0x69,0x6e,0x65,0x68,0x71, -0x2e,0x6f,0x72,0x67,0x82,0x0a,0x77,0x69,0x6e,0x65,0x68,0x71,0x2e,0x6f,0x72, -0x67,0x30,0x43,0x06,0x03,0x55,0x1d,0x1f,0x04,0x3c,0x30,0x3a,0x30,0x38,0xa0, -0x36,0xa0,0x34,0x86,0x32,0x68,0x74,0x74,0x70,0x3a,0x2f,0x2f,0x72,0x61,0x70, -0x69,0x64,0x73,0x73,0x6c,0x2d,0x63,0x72,0x6c,0x2e,0x67,0x65,0x6f,0x74,0x72, -0x75,0x73,0x74,0x2e,0x63,0x6f,0x6d,0x2f,0x63,0x72,0x6c,0x73,0x2f,0x72,0x61, -0x70,0x69,0x64,0x73,0x73,0x6c,0x2e,0x63,0x72,0x6c,0x30,0x1d,0x06,0x03,0x55, -0x1d,0x0e,0x04,0x16,0x04,0x14,0xff,0x4c,0x0f,0x46,0xb8,0x3c,0x5b,0x72,0xe4, -0x10,0x96,0xbb,0xa7,0xbc,0x91,0xa2,0x63,0xf6,0x81,0x0a,0x30,0x0c,0x06,0x03, -0x55,0x1d,0x13,0x01,0x01,0xff,0x04,0x02,0x30,0x00,0x30,0x78,0x06,0x08,0x2b, -0x06,0x01,0x05,0x05,0x07,0x01,0x01,0x04,0x6c,0x30,0x6a,0x30,0x2d,0x06,0x08, -0x2b,0x06,0x01,0x05,0x05,0x07,0x30,0x01,0x86,0x21,0x68,0x74,0x74,0x70,0x3a, -0x2f,0x2f,0x72,0x61,0x70,0x69,0x64,0x73,0x73,0x6c,0x2d,0x6f,0x63,0x73,0x70, -0x2e,0x67,0x65,0x6f,0x74,0x72,0x75,0x73,0x74,0x2e,0x63,0x6f,0x6d,0x30,0x39, -0x06,0x08,0x2b,0x06,0x01,0x05,0x05,0x07,0x30,0x02,0x86,0x2d,0x68,0x74,0x74, -0x70,0x3a,0x2f,0x2f,0x72,0x61,0x70,0x69,0x64,0x73,0x73,0x6c,0x2d,0x61,0x69, -0x61,0x2e,0x67,0x65,0x6f,0x74,0x72,0x75,0x73,0x74,0x2e,0x63,0x6f,0x6d,0x2f, -0x72,0x61,0x70,0x69,0x64,0x73,0x73,0x6c,0x2e,0x63,0x72,0x74,0x30,0x4c,0x06, -0x03,0x55,0x1d,0x20,0x04,0x45,0x30,0x43,0x30,0x41,0x06,0x0a,0x60,0x86,0x48, -0x01,0x86,0xf8,0x45,0x01,0x07,0x36,0x30,0x33,0x30,0x31,0x06,0x08,0x2b,0x06, -0x01,0x05,0x05,0x07,0x02,0x01,0x16,0x25,0x68,0x74,0x74,0x70,0x3a,0x2f,0x2f, -0x77,0x77,0x77,0x2e,0x67,0x65,0x6f,0x74,0x72,0x75,0x73,0x74,0x2e,0x63,0x6f, -0x6d,0x2f,0x72,0x65,0x73,0x6f,0x75,0x72,0x63,0x65,0x73,0x2f,0x63,0x70,0x73, -0x30,0x0d,0x06,0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01,0x01,0x05,0x05,0x00, -0x03,0x82,0x01,0x01,0x00,0x1b,0xa8,0x34,0xc1,0xb7,0xf3,0xbe,0xb6,0xed,0x12, -0x85,0x58,0xe1,0x69,0x35,0x0c,0xb8,0x7e,0x38,0x11,0xb3,0xd2,0xe2,0x2e,0x52, -0xcf,0xa6,0x39,0xe1,0x25,0x73,0xf0,0x1d,0xc9,0x54,0xa1,0xc2,0x50,0x19,0xea, -0x68,0xeb,0x1a,0x21,0xdb,0x86,0x14,0x55,0x73,0x02,0x28,0x56,0x14,0xf7,0xf1, -0x48,0x43,0xfb,0xd7,0xbf,0xcf,0xbb,0x20,0xc4,0x1e,0x4e,0x9a,0x7c,0xf1,0xe8, -0x28,0x76,0xce,0xf9,0xb3,0xf0,0x6f,0x93,0x70,0x51,0xcd,0xed,0x28,0x1b,0xdd, -0x66,0x38,0x40,0x5e,0x0b,0x13,0xaf,0x21,0xff,0x23,0xf1,0x5b,0xcd,0x32,0x43, -0x00,0x87,0x3d,0x10,0xc6,0x6e,0xe5,0x67,0xdc,0x9f,0x44,0x12,0x94,0xb4,0x76, -0xbd,0xd9,0x4c,0x53,0x12,0x1c,0x2e,0x2c,0x09,0x66,0x41,0x83,0x6c,0xee,0x68, -0x98,0x38,0xd2,0xc8,0x32,0xa3,0x42,0xcf,0x1c,0xfd,0x60,0x6c,0x5d,0x4b,0x4b, -0x6c,0xb8,0xf3,0x7e,0xc8,0x93,0x0a,0x68,0x66,0x14,0x3b,0x39,0x73,0x82,0xfe, -0x86,0x3c,0x3d,0xb3,0xb5,0x42,0xec,0x4c,0xc6,0xe6,0xdd,0x7e,0xd7,0xb4,0x5d, -0xeb,0x6d,0x8c,0x9e,0x29,0x95,0x99,0xb6,0x95,0x5b,0xc0,0xdd,0x46,0xdf,0xdc, -0xf2,0x1c,0x3d,0x80,0xeb,0x14,0x3d,0xd9,0x4a,0xb4,0x6f,0x3e,0x79,0xca,0x7f, -0xbc,0x27,0x47,0x90,0x86,0x55,0xfa,0x27,0xf5,0x35,0x3d,0x1d,0xc4,0xa8,0x55, -0x31,0x8f,0x3a,0x76,0x8d,0x98,0x50,0xa3,0x11,0x91,0x1c,0xb0,0xa8,0x06,0xf9, -0x22,0xb1,0xca,0x20,0x49,0xaa,0xe1,0x4d,0x41,0xf1,0x21,0xcc,0x25,0x45,0x33, -0x4f,0x2f,0x3a,0x48,0x70,0xbb }; + 0x30, 0x82, 0x05, 0xb5, 0x30, 0x82, 0x04, 0x9d, 0xa0, 0x03, 0x02, 0x01, + 0x02, 0x02, 0x11, 0x00, 0xc9, 0xce, 0x10, 0xbc, 0x5e, 0xcf, 0xf2, 0xfd, + 0xa6, 0x37, 0xb8, 0x51, 0xf1, 0xe4, 0xb9, 0x30, 0x30, 0x0d, 0x06, 0x09, + 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x0b, 0x05, 0x00, 0x30, + 0x7a, 0x31, 0x0b, 0x30, 0x09, 0x06, 0x03, 0x55, 0x04, 0x06, 0x13, 0x02, + 0x55, 0x53, 0x31, 0x0b, 0x30, 0x09, 0x06, 0x03, 0x55, 0x04, 0x08, 0x13, + 0x02, 0x56, 0x41, 0x31, 0x10, 0x30, 0x0e, 0x06, 0x03, 0x55, 0x04, 0x07, + 0x13, 0x07, 0x48, 0x65, 0x72, 0x6e, 0x64, 0x6f, 0x6e, 0x31, 0x21, 0x30, + 0x1f, 0x06, 0x03, 0x55, 0x04, 0x0a, 0x13, 0x18, 0x4e, 0x65, 0x74, 0x77, + 0x6f, 0x72, 0x6b, 0x20, 0x53, 0x6f, 0x6c, 0x75, 0x74, 0x69, 0x6f, 0x6e, + 0x73, 0x20, 0x4c, 0x2e, 0x4c, 0x2e, 0x43, 0x2e, 0x31, 0x29, 0x30, 0x27, + 0x06, 0x03, 0x55, 0x04, 0x03, 0x13, 0x20, 0x4e, 0x65, 0x74, 0x77, 0x6f, + 0x72, 0x6b, 0x20, 0x53, 0x6f, 0x6c, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x73, + 0x20, 0x4f, 0x56, 0x20, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x20, 0x43, + 0x41, 0x20, 0x32, 0x30, 0x1e, 0x17, 0x0d, 0x31, 0x38, 0x30, 0x33, 0x30, + 0x36, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x5a, 0x17, 0x0d, 0x32, 0x30, + 0x30, 0x36, 0x30, 0x37, 0x32, 0x33, 0x35, 0x39, 0x35, 0x39, 0x5a, 0x30, + 0x81, 0xc8, 0x31, 0x0b, 0x30, 0x09, 0x06, 0x03, 0x55, 0x04, 0x06, 0x13, + 0x02, 0x55, 0x53, 0x31, 0x0e, 0x30, 0x0c, 0x06, 0x03, 0x55, 0x04, 0x11, + 0x13, 0x05, 0x35, 0x35, 0x31, 0x31, 0x34, 0x31, 0x0b, 0x30, 0x09, 0x06, + 0x03, 0x55, 0x04, 0x08, 0x13, 0x02, 0x4d, 0x4e, 0x31, 0x13, 0x30, 0x11, + 0x06, 0x03, 0x55, 0x04, 0x07, 0x13, 0x0a, 0x53, 0x61, 0x69, 0x6e, 0x74, + 0x20, 0x50, 0x61, 0x75, 0x6c, 0x31, 0x10, 0x30, 0x0e, 0x06, 0x03, 0x55, + 0x04, 0x09, 0x13, 0x07, 0x53, 0x74, 0x65, 0x20, 0x31, 0x32, 0x30, 0x31, + 0x18, 0x30, 0x16, 0x06, 0x03, 0x55, 0x04, 0x09, 0x13, 0x0f, 0x37, 0x30, + 0x30, 0x20, 0x52, 0x61, 0x79, 0x6d, 0x6f, 0x6e, 0x64, 0x20, 0x41, 0x76, + 0x65, 0x31, 0x14, 0x30, 0x12, 0x06, 0x03, 0x55, 0x04, 0x0a, 0x13, 0x0b, + 0x43, 0x6f, 0x64, 0x65, 0x57, 0x65, 0x61, 0x76, 0x65, 0x72, 0x73, 0x31, + 0x0b, 0x30, 0x09, 0x06, 0x03, 0x55, 0x04, 0x0b, 0x13, 0x02, 0x49, 0x54, + 0x31, 0x21, 0x30, 0x1f, 0x06, 0x03, 0x55, 0x04, 0x0b, 0x13, 0x18, 0x53, + 0x65, 0x63, 0x75, 0x72, 0x65, 0x20, 0x4c, 0x69, 0x6e, 0x6b, 0x20, 0x53, + 0x53, 0x4c, 0x20, 0x57, 0x69, 0x6c, 0x64, 0x63, 0x61, 0x72, 0x64, 0x31, + 0x15, 0x30, 0x13, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0c, 0x0c, 0x2a, 0x2e, + 0x77, 0x69, 0x6e, 0x65, 0x68, 0x71, 0x2e, 0x6f, 0x72, 0x67, 0x30, 0x82, + 0x01, 0x22, 0x30, 0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, + 0x01, 0x01, 0x01, 0x05, 0x00, 0x03, 0x82, 0x01, 0x0f, 0x00, 0x30, 0x82, + 0x01, 0x0a, 0x02, 0x82, 0x01, 0x01, 0x00, 0xc2, 0x91, 0x35, 0xc7, 0x67, + 0x32, 0xf1, 0x66, 0x12, 0x38, 0x79, 0xdb, 0x02, 0x11, 0x95, 0x89, 0x1b, + 0x4a, 0x6a, 0x63, 0x45, 0x35, 0x58, 0x1b, 0x57, 0x8d, 0xec, 0x19, 0x88, + 0xf5, 0xa3, 0x9e, 0x6b, 0xdb, 0x07, 0xfb, 0x6e, 0x29, 0xe9, 0xa9, 0x14, + 0x07, 0x8c, 0x3a, 0xc1, 0xd7, 0x88, 0xcc, 0xe4, 0x55, 0x79, 0x6e, 0x97, + 0xe9, 0x93, 0x88, 0x9a, 0x89, 0xf9, 0x31, 0x0f, 0x91, 0x61, 0xc2, 0x9c, + 0xae, 0x59, 0x25, 0x93, 0x9a, 0xc8, 0xf9, 0x28, 0x7a, 0x0f, 0x0f, 0x89, + 0x9a, 0xda, 0x46, 0xbe, 0xb2, 0xdc, 0x90, 0x5b, 0xd8, 0x87, 0xda, 0xda, + 0xce, 0x70, 0x70, 0x95, 0x43, 0x51, 0xa0, 0x21, 0x22, 0x54, 0xab, 0xa7, + 0x09, 0xe1, 0x81, 0x09, 0x8c, 0x00, 0x15, 0x30, 0x5a, 0xa7, 0x61, 0x77, + 0xba, 0x48, 0x91, 0xc6, 0x94, 0x90, 0xdd, 0x1a, 0xf4, 0x3f, 0xa6, 0x8a, + 0xb4, 0x2f, 0x98, 0x16, 0x0d, 0x96, 0x9f, 0x0c, 0x96, 0x01, 0x15, 0xbc, + 0x74, 0x7e, 0x5c, 0x4e, 0xe3, 0x95, 0xae, 0x00, 0xf5, 0x5b, 0x88, 0x0f, + 0xef, 0x7c, 0x1f, 0xab, 0x22, 0xfe, 0x95, 0x42, 0x1a, 0xbd, 0xee, 0x23, + 0xca, 0x5b, 0x7f, 0x4a, 0xb0, 0xbe, 0x15, 0x65, 0xe2, 0xce, 0x02, 0xc4, + 0xf6, 0xb8, 0xf3, 0xd6, 0x7e, 0x75, 0x5e, 0x63, 0x47, 0x5d, 0xc1, 0xca, + 0xc3, 0xc4, 0x4a, 0xf5, 0x4d, 0x66, 0x34, 0x03, 0xf8, 0xf4, 0x54, 0x7d, + 0x6b, 0x54, 0x2f, 0x17, 0x7c, 0x39, 0x13, 0x78, 0x09, 0x9e, 0xd0, 0x9c, + 0x51, 0x02, 0x11, 0x9d, 0xa7, 0x53, 0x60, 0xdd, 0x62, 0x2b, 0xee, 0xb0, + 0xd1, 0xf2, 0x1a, 0x5c, 0xdc, 0xa7, 0x58, 0xc2, 0xfa, 0x29, 0xcf, 0xf3, + 0xc9, 0xe9, 0xae, 0xe8, 0x70, 0x60, 0x99, 0xc7, 0x30, 0xdd, 0x1c, 0xda, + 0x32, 0xc0, 0x45, 0xa5, 0x48, 0xc5, 0x22, 0x29, 0x0c, 0x74, 0x25, 0x02, + 0x03, 0x01, 0x00, 0x01, 0xa3, 0x82, 0x01, 0xe5, 0x30, 0x82, 0x01, 0xe1, + 0x30, 0x1f, 0x06, 0x03, 0x55, 0x1d, 0x23, 0x04, 0x18, 0x30, 0x16, 0x80, + 0x14, 0x20, 0x33, 0xcd, 0xb7, 0x61, 0xf6, 0xa5, 0x86, 0x4f, 0xdc, 0xc9, + 0xd7, 0x73, 0x6a, 0xbc, 0x0a, 0x51, 0x65, 0x98, 0xec, 0x30, 0x1d, 0x06, + 0x03, 0x55, 0x1d, 0x0e, 0x04, 0x16, 0x04, 0x14, 0xff, 0x4c, 0x0f, 0x46, + 0xb8, 0x3c, 0x5b, 0x72, 0xe4, 0x10, 0x96, 0xbb, 0xa7, 0xbc, 0x91, 0xa2, + 0x63, 0xf6, 0x81, 0x0a, 0x30, 0x0e, 0x06, 0x03, 0x55, 0x1d, 0x0f, 0x01, + 0x01, 0xff, 0x04, 0x04, 0x03, 0x02, 0x05, 0xa0, 0x30, 0x0c, 0x06, 0x03, + 0x55, 0x1d, 0x13, 0x01, 0x01, 0xff, 0x04, 0x02, 0x30, 0x00, 0x30, 0x1d, + 0x06, 0x03, 0x55, 0x1d, 0x25, 0x04, 0x16, 0x30, 0x14, 0x06, 0x08, 0x2b, + 0x06, 0x01, 0x05, 0x05, 0x07, 0x03, 0x01, 0x06, 0x08, 0x2b, 0x06, 0x01, + 0x05, 0x05, 0x07, 0x03, 0x02, 0x30, 0x75, 0x06, 0x03, 0x55, 0x1d, 0x20, + 0x04, 0x6e, 0x30, 0x6c, 0x30, 0x60, 0x06, 0x0c, 0x2b, 0x06, 0x01, 0x04, + 0x01, 0x86, 0x0e, 0x01, 0x02, 0x01, 0x03, 0x01, 0x30, 0x50, 0x30, 0x4e, + 0x06, 0x08, 0x2b, 0x06, 0x01, 0x05, 0x05, 0x07, 0x02, 0x01, 0x16, 0x42, + 0x68, 0x74, 0x74, 0x70, 0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x6e, + 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x73, 0x6f, 0x6c, 0x75, 0x74, 0x69, + 0x6f, 0x6e, 0x73, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6c, 0x65, 0x67, 0x61, + 0x6c, 0x2f, 0x53, 0x53, 0x4c, 0x2d, 0x6c, 0x65, 0x67, 0x61, 0x6c, 0x2d, + 0x72, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x6f, 0x72, 0x79, 0x2d, 0x63, + 0x70, 0x73, 0x2e, 0x6a, 0x73, 0x70, 0x30, 0x08, 0x06, 0x06, 0x67, 0x81, + 0x0c, 0x01, 0x02, 0x02, 0x30, 0x49, 0x06, 0x03, 0x55, 0x1d, 0x1f, 0x04, + 0x42, 0x30, 0x40, 0x30, 0x3e, 0xa0, 0x3c, 0xa0, 0x3a, 0x86, 0x38, 0x68, + 0x74, 0x74, 0x70, 0x3a, 0x2f, 0x2f, 0x63, 0x72, 0x6c, 0x2e, 0x6e, 0x65, + 0x74, 0x73, 0x6f, 0x6c, 0x73, 0x73, 0x6c, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, + 0x4e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x53, 0x6f, 0x6c, 0x75, 0x74, + 0x69, 0x6f, 0x6e, 0x73, 0x4f, 0x56, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, + 0x43, 0x41, 0x32, 0x2e, 0x63, 0x72, 0x6c, 0x30, 0x7b, 0x06, 0x08, 0x2b, + 0x06, 0x01, 0x05, 0x05, 0x07, 0x01, 0x01, 0x04, 0x6f, 0x30, 0x6d, 0x30, + 0x44, 0x06, 0x08, 0x2b, 0x06, 0x01, 0x05, 0x05, 0x07, 0x30, 0x02, 0x86, + 0x38, 0x68, 0x74, 0x74, 0x70, 0x3a, 0x2f, 0x2f, 0x63, 0x72, 0x74, 0x2e, + 0x6e, 0x65, 0x74, 0x73, 0x6f, 0x6c, 0x73, 0x73, 0x6c, 0x2e, 0x63, 0x6f, + 0x6d, 0x2f, 0x4e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x53, 0x6f, 0x6c, + 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x4f, 0x56, 0x53, 0x65, 0x72, 0x76, + 0x65, 0x72, 0x43, 0x41, 0x32, 0x2e, 0x63, 0x72, 0x74, 0x30, 0x25, 0x06, + 0x08, 0x2b, 0x06, 0x01, 0x05, 0x05, 0x07, 0x30, 0x01, 0x86, 0x19, 0x68, + 0x74, 0x74, 0x70, 0x3a, 0x2f, 0x2f, 0x6f, 0x63, 0x73, 0x70, 0x2e, 0x6e, + 0x65, 0x74, 0x73, 0x6f, 0x6c, 0x73, 0x73, 0x6c, 0x2e, 0x63, 0x6f, 0x6d, + 0x30, 0x23, 0x06, 0x03, 0x55, 0x1d, 0x11, 0x04, 0x1c, 0x30, 0x1a, 0x82, + 0x0c, 0x2a, 0x2e, 0x77, 0x69, 0x6e, 0x65, 0x68, 0x71, 0x2e, 0x6f, 0x72, + 0x67, 0x82, 0x0a, 0x77, 0x69, 0x6e, 0x65, 0x68, 0x71, 0x2e, 0x6f, 0x72, + 0x67, 0x30, 0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, + 0x01, 0x0b, 0x05, 0x00, 0x03, 0x82, 0x01, 0x01, 0x00, 0x58, 0x90, 0xa4, + 0x5b, 0x56, 0x5f, 0xf6, 0xab, 0x28, 0x6b, 0xc8, 0x17, 0xe6, 0x48, 0x51, + 0x38, 0x51, 0xea, 0xc2, 0x16, 0x07, 0x88, 0x32, 0xa0, 0x75, 0x17, 0xef, + 0xc3, 0xc3, 0x19, 0xce, 0xfb, 0xc9, 0x98, 0x2c, 0x1f, 0x16, 0x94, 0x41, + 0xa0, 0x46, 0xc5, 0x0d, 0x7e, 0x90, 0x40, 0x24, 0xd2, 0xb1, 0xf4, 0xc8, + 0x51, 0x43, 0x21, 0x54, 0xdb, 0xed, 0x47, 0x21, 0x97, 0x37, 0x11, 0xc9, + 0x22, 0xe5, 0xcc, 0xe1, 0x64, 0x5e, 0x3a, 0xd0, 0xbf, 0x95, 0x4a, 0xe9, + 0x3a, 0x32, 0x05, 0xca, 0x9d, 0xb4, 0x8c, 0x7e, 0xce, 0x31, 0x54, 0xb0, + 0x5f, 0xf5, 0xcf, 0xef, 0x59, 0x71, 0x7b, 0x5d, 0xaf, 0xc0, 0x76, 0xe2, + 0xdb, 0x89, 0x03, 0x25, 0x94, 0xc4, 0x55, 0xd4, 0xf8, 0xac, 0xe1, 0xbb, + 0x12, 0xc1, 0x24, 0x97, 0xd0, 0xfb, 0x17, 0x64, 0xae, 0x80, 0xc9, 0x3b, + 0xff, 0x16, 0x20, 0xfd, 0x65, 0x0c, 0x34, 0xdf, 0x7b, 0x11, 0xf6, 0x37, + 0xcb, 0x5c, 0xec, 0x98, 0xef, 0xab, 0xd3, 0x60, 0xaf, 0x6e, 0x1b, 0x0d, + 0x1b, 0xfd, 0xc1, 0x43, 0xf0, 0x8d, 0xb5, 0x44, 0xdf, 0xcc, 0xc3, 0xe7, + 0x6e, 0xb6, 0x51, 0x9e, 0x8b, 0x77, 0x5c, 0x1a, 0x8b, 0xbd, 0xb4, 0xa4, + 0x28, 0xf8, 0x01, 0x41, 0xc5, 0xa1, 0xc0, 0x64, 0x0a, 0xe0, 0x6f, 0x32, + 0x30, 0x2c, 0x06, 0x2a, 0xc4, 0x76, 0x0b, 0x95, 0x8b, 0xbf, 0x14, 0x59, + 0x16, 0xb3, 0xd1, 0xee, 0xc9, 0xef, 0x71, 0xd5, 0x5a, 0x26, 0xb4, 0xb0, + 0xba, 0x86, 0x1f, 0x41, 0x13, 0xd8, 0xff, 0x96, 0x51, 0x7b, 0x2e, 0x8f, + 0x85, 0x21, 0x60, 0xcd, 0x8f, 0x47, 0xe2, 0x48, 0x44, 0x07, 0x38, 0x29, + 0xdd, 0x0a, 0x3a, 0x01, 0xd8, 0x2c, 0x37, 0x8d, 0xc3, 0x0e, 0x68, 0xc5, + 0xd4, 0x24, 0x86, 0x2b, 0x05, 0x8f, 0xf5, 0x08, 0xd7, 0x46, 0x73, 0x59, + 0xb2 +}; /* Battle.Net's cert */ static const BYTE battlenet[] = { 0x30,0x82,0x03,0xd8,0x30,0x82,0x02,0xc0,0xa0,0x03,0x02,0x01,0x02,0x02,0x10, @@ -4109,7 +4144,8 @@ static void testGetCertChain(void) return; } - ok(!chain->TrustStatus.dwErrorStatus, "chain->TrustStatus.dwErrorStatus = %x\n", chain->TrustStatus.dwErrorStatus); + ok(chain->TrustStatus.dwErrorStatus == CERT_TRUST_HAS_EXACT_MATCH_ISSUER, "chain->TrustStatus.dwErrorStatus = %x\n", + chain->TrustStatus.dwErrorStatus); todo_wine ok(chain->TrustStatus.dwInfoStatus == CERT_TRUST_HAS_PREFERRED_ISSUER, "chain->TrustStatus.dwInfoStatus = %x\n", chain->TrustStatus.dwInfoStatus); @@ -4120,7 +4156,7 @@ static void testGetCertChain(void) simple_chain = *chain->rgpChain; ok(simple_chain->cbSize == sizeof(*simple_chain), "simple_chain->cbSize = %u\n", simple_chain->cbSize); - ok(!simple_chain->TrustStatus.dwErrorStatus, "simple_chain->TrustStatus.dwErrorStatus = %x\n", + ok(simple_chain->TrustStatus.dwErrorStatus == CERT_TRUST_HAS_EXACT_MATCH_ISSUER, "simple_chain->TrustStatus.dwErrorStatus = %x\n", simple_chain->TrustStatus.dwErrorStatus); todo_wine ok(simple_chain->TrustStatus.dwInfoStatus == CERT_TRUST_HAS_PREFERRED_ISSUER, @@ -4130,9 +4166,15 @@ static void testGetCertChain(void) for(i=0; i < simple_chain->cElement; i++) { chain_elem = simple_chain->rgpElement[i]; ok(chain_elem->cbSize == sizeof(*chain_elem), "chain_elem->cbSize = %u\n", chain_elem->cbSize); - - ok(!chain_elem->TrustStatus.dwErrorStatus, "chain_elem->TrustStatus.dwErrorStatus = %x\n", - chain_elem->TrustStatus.dwErrorStatus); + if (!i) + ok(chain_elem->TrustStatus.dwErrorStatus == CERT_TRUST_HAS_EXACT_MATCH_ISSUER, + "chain_elem->TrustStatus.dwErrorStatus = %x\n", chain_elem->TrustStatus.dwErrorStatus); + else if (i == 1) + todo_wine ok(!chain_elem->TrustStatus.dwErrorStatus, "chain_elem->TrustStatus.dwErrorStatus = %x\n", + chain_elem->TrustStatus.dwErrorStatus); + else + ok(!chain_elem->TrustStatus.dwErrorStatus, "chain_elem->TrustStatus.dwErrorStatus = %x\n", + chain_elem->TrustStatus.dwErrorStatus); trace("info[%u] = %x\n", i, chain_elem->TrustStatus.dwInfoStatus); ok(chain_elem->pCertContext->dwCertEncodingType == CRYPT_ASN_ENCODING, "chain_elem->pCertContext->dwCertEncodingType = %x\n", @@ -4140,10 +4182,14 @@ static void testGetCertChain(void) } ok(simple_chain->rgpElement[0]->pCertContext == cert, "simple_chain->rgpElement[0]->pCertContext != cert\n"); - test_name_blob(&simple_chain->rgpElement[1]->pCertContext->pCertInfo->Issuer, "US, GeoTrust Inc., GeoTrust Global CA"); - test_name_blob(&simple_chain->rgpElement[1]->pCertContext->pCertInfo->Subject, "US, \"GeoTrust, Inc.\", RapidSSL CA"); - test_name_blob(&simple_chain->rgpElement[2]->pCertContext->pCertInfo->Issuer, "US, GeoTrust Inc., GeoTrust Global CA"); - test_name_blob(&simple_chain->rgpElement[2]->pCertContext->pCertInfo->Subject, "US, GeoTrust Inc., GeoTrust Global CA"); + test_name_blob(&simple_chain->rgpElement[1]->pCertContext->pCertInfo->Issuer, + "US, New Jersey, Jersey City, The USERTRUST Network, USERTrust RSA Certification Authority"); + test_name_blob(&simple_chain->rgpElement[1]->pCertContext->pCertInfo->Subject, + "US, VA, Herndon, Network Solutions L.L.C., Network Solutions OV Server CA 2"); + test_name_blob(&simple_chain->rgpElement[2]->pCertContext->pCertInfo->Issuer, + "US, New Jersey, Jersey City, The USERTRUST Network, USERTrust RSA Certification Authority"); + test_name_blob(&simple_chain->rgpElement[2]->pCertContext->pCertInfo->Subject, + "US, New Jersey, Jersey City, The USERTRUST Network, USERTrust RSA Certification Authority"); pCertFreeCertificateChain(chain); @@ -4151,20 +4197,22 @@ static void testGetCertChain(void) ret = CertGetCertificateChain(NULL, cert, &fileTime, store, &para, CERT_CHAIN_REVOCATION_CHECK_END_CERT, NULL, &chain); ok(ret, "CertGetCertificateChain failed: %u\n", GetLastError()); - ok(!chain->TrustStatus.dwErrorStatus, "chain->TrustStatus.dwErrorStatus = %x\n", chain->TrustStatus.dwErrorStatus); + ok(chain->TrustStatus.dwErrorStatus == CERT_TRUST_HAS_EXACT_MATCH_ISSUER, "chain->TrustStatus.dwErrorStatus = %x\n", + chain->TrustStatus.dwErrorStatus); pCertFreeCertificateChain(chain); ret = CertGetCertificateChain(NULL, cert, &fileTime, store, &para, CERT_CHAIN_REVOCATION_CHECK_CHAIN, NULL, &chain); ok(ret, "CertGetCertificateChain failed: %u\n", GetLastError()); - ok(!chain->TrustStatus.dwErrorStatus - || broken(chain->TrustStatus.dwErrorStatus == CERT_TRUST_REVOCATION_STATUS_UNKNOWN), /* XP */ + ok(chain->TrustStatus.dwErrorStatus == CERT_TRUST_HAS_EXACT_MATCH_ISSUER || + broken(chain->TrustStatus.dwErrorStatus == (CERT_TRUST_IS_NOT_TIME_VALID|CERT_TRUST_REVOCATION_STATUS_UNKNOWN)), /* XP */ "chain->TrustStatus.dwErrorStatus = %x\n", chain->TrustStatus.dwErrorStatus); pCertFreeCertificateChain(chain); ret = CertGetCertificateChain(NULL, cert, &fileTime, store, &para, CERT_CHAIN_REVOCATION_CHECK_CHAIN_EXCLUDE_ROOT, NULL, &chain); ok(ret, "CertGetCertificateChain failed: %u\n", GetLastError()); - ok(!chain->TrustStatus.dwErrorStatus, "chain->TrustStatus.dwErrorStatus = %x\n", chain->TrustStatus.dwErrorStatus); + ok(chain->TrustStatus.dwErrorStatus == CERT_TRUST_HAS_EXACT_MATCH_ISSUER, "chain->TrustStatus.dwErrorStatus = %x\n", + chain->TrustStatus.dwErrorStatus); pCertFreeCertificateChain(chain); /* Test HCCE_LOCAL_MACHINE */ -- 2.20.1

1 0

[PATCH 3/3] wbemprox/tests: Use wide character string literals.
by Hans Leidekker 25 Feb '20

25 Feb '20

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wbemprox/tests/query.c | 746 ++++++++++----------------------- dlls/wbemprox/tests/services.c | 84 ++-- 2 files changed, 249 insertions(+), 581 deletions(-) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 02e4f564e7..77aa5ee882 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -27,15 +27,11 @@ #include "wbemcli.h" #include "wine/test.h" -static const WCHAR wqlW[] = {'w','q','l',0}; - static HRESULT exec_query( IWbemServices *services, const WCHAR *str, IEnumWbemClassObject **result ) { - static const WCHAR captionW[] = {'C','a','p','t','i','o','n',0}; - static const WCHAR descriptionW[] = {'D','e','s','c','r','i','p','t','i','o','n',0}; HRESULT hr; IWbemClassObject *obj; - BSTR wql = SysAllocString( wqlW ), query = SysAllocString( str ); + BSTR wql = SysAllocString( L"wql" ), query = SysAllocString( str ); LONG flags = WBEM_FLAG_RETURN_IMMEDIATELY | WBEM_FLAG_FORWARD_ONLY; ULONG count; @@ -52,12 +48,12 @@ static HRESULT exec_query( IWbemServices *services, const WCHAR *str, IEnumWbemC IEnumWbemClassObject_Next( *result, 10000, 1, &obj, &count ); if (!count) break; - if (IWbemClassObject_Get( obj, captionW, 0, &var, NULL, NULL ) == WBEM_S_NO_ERROR) + if (IWbemClassObject_Get( obj, L"Caption", 0, &var, NULL, NULL ) == WBEM_S_NO_ERROR) { trace("caption: %s\n", wine_dbgstr_w(V_BSTR(&var))); VariantClear( &var ); } - if (IWbemClassObject_Get( obj, descriptionW, 0, &var, NULL, NULL ) == WBEM_S_NO_ERROR) + if (IWbemClassObject_Get( obj, L"Description", 0, &var, NULL, NULL ) == WBEM_S_NO_ERROR) { trace("description: %s\n", wine_dbgstr_w(V_BSTR(&var))); VariantClear( &var ); @@ -81,61 +77,29 @@ static HRESULT exec_query( IWbemServices *services, const WCHAR *str, IEnumWbemC static void test_select( IWbemServices *services ) { - static const WCHAR emptyW[] = {0}; - static const WCHAR sqlW[] = {'S','Q','L',0}; - static const WCHAR query1[] = - {'S','E','L','E','C','T',' ','H','O','T','F','I','X','I','D',' ','F','R','O','M',' ', - 'W','i','n','3','2','_','Q','u','i','c','k','F','i','x','E','n','g','i','n','e','e','r','i','n','g',0}; - static const WCHAR query2[] = - {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_','B','I','O','S',0}; - static const WCHAR query3[] = - {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_', - 'L','o','g','i','c','a','l','D','i','s','k',' ','W','H','E','R','E',' ', - '\"','N','T','F','S','\"',' ','=',' ','F','i','l','e','S','y','s','t','e','m',0}; - static const WCHAR query4[] = - {'S','E','L','E','C','T',' ','a',' ','F','R','O','M',' ','b',0}; - static const WCHAR query5[] = - {'S','E','L','E','C','T',' ','a',' ','F','R','O','M',' ','W','i','n','3','2','_','B','i','o','s',0}; - static const WCHAR query6[] = - {'S','E','L','E','C','T',' ','D','e','s','c','r','i','p','t','i','o','n',' ','F','R','O','M',' ', - 'W','i','n','3','2','_','B','i','o','s',0}; - static const WCHAR query7[] = - {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_', - 'P','r','o','c','e','s','s',' ','W','H','E','R','E',' ','C','a','p','t','i','o','n',' ', - 'L','I','K','E',' ','\'','%','%','R','E','G','E','D','I','T','%','\'',0}; - static const WCHAR query8[] = - {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_', - 'D','i','s','k','D','r','i','v','e',' ','W','H','E','R','E',' ','D','e','v','i','c','e','I','D','=', - '\"','\\','\\','\\','\\','.','\\','\\','P','H','Y','S','I','C','A','L','D','R','I','V','E','0','\"',0}; - static const WCHAR query9[] = - {'S','E','L','E','C','T','\n','a','\r','F','R','O','M','\t','b',0}; - static const WCHAR query10[] = - {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_', - 'P','r','o','c','e','s','s',' ','W','H','E','R','E',' ','C','a','p','t','i','o','n',' ', - 'L','I','K','E',' ','"','%','f','i','r','e','f','o','x','.','e','x','e','"',0}; - static const WCHAR query11[] = - {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', - 'W','i','n','3','2','_','V','i','d','e','o','C','o','n','t','r','o','l','l','e','r',' ','w','h','e','r','e',' ', - 'a','v','a','i','l','a','b','i','l','i','t','y',' ','=',' ','\'','3','\'',0}; - static const WCHAR query12[] = - {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_','B','I','O','S', - ' ','W','H','E','R','E',' ','N','A','M','E',' ','<','>',' ','N','U','L','L', 0}; - static const WCHAR query13[] = - {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_','B','I','O','S', - ' ','W','H','E','R','E',' ','N','U','L','L',' ','=',' ','N','A','M','E', 0}; - static const WCHAR query14[] = - {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_', - 'L','o','g','i','c','a','l','D','i','s','k','T','o','P','a','r','t','i','t','i','o','n',0}; - static const WCHAR query15[] = - {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_', - 'D','i','s','k','D','r','i','v','e','T','o','D','i','s','k','P','a','r','t','i','t','i','o','n',0}; - static const WCHAR *test[] = { query1, query2, query3, query4, query5, query6, query7, query8, query9, query10, - query11, query12, query13, query14, query15 }; + static const WCHAR *test[] = + { + L"SELECT HOTFIXID FROM Win32_QuickFixEngineering", + L"SELECT * FROM Win32_BIOS", + L"SELECT * FROM Win32_LogicalDisk WHERE \"NTFS\" = FileSystem", + L"SELECT a FROM b", + L"SELECT a FROM Win32_Bios", + L"SELECT Description FROM Win32_Bios", + L"SELECT * FROM Win32_Process WHERE Caption LIKE '%%REGEDIT%'", + L"SELECT * FROM Win32_DiskDrive WHERE DeviceID=\"\\\\\\\\.\\\\PHYSICALDRIVE0\"", + L"SELECT\na\rFROM\tb", + L"SELECT * FROM Win32_Process WHERE Caption LIKE \"%firefox.exe\"", + L"SELECT * FROM Win32_VideoController where availability = '3'", + L"SELECT * FROM Win3_BIOS WHERE NAME <> NULL", + L"SELECT * FROM Win32_BIOS WHERE NULL = NAME", + L"SELECT * FROM Win32_LogicalDiskToPartition", + L"SELECT * FROM Win32_DiskDriveToDiskPartition", + }; HRESULT hr; IEnumWbemClassObject *result; - BSTR wql = SysAllocString( wqlW ); - BSTR sql = SysAllocString( sqlW ); - BSTR query = SysAllocString( query1 ); + BSTR wql = SysAllocString( L"wql" ); + BSTR sql = SysAllocString( L"SQL" ); + BSTR query = SysAllocString( L"SELECT * FROM Win32_BIOS" ); UINT i; hr = IWbemServices_ExecQuery( services, NULL, NULL, 0, NULL, &result ); @@ -154,7 +118,7 @@ static void test_select( IWbemServices *services ) ok( hr == WBEM_E_INVALID_PARAMETER, "query failed %08x\n", hr ); SysFreeString( query ); - query = SysAllocString( emptyW ); + query = SysAllocString( L"" ); hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); ok( hr == WBEM_E_INVALID_PARAMETER, "query failed %08x\n", hr ); @@ -172,38 +136,16 @@ static void test_select( IWbemServices *services ) static void test_associators( IWbemServices *services ) { - static const WCHAR query1[] = - {'A','S','S','O','C','I','A','T','O','R','S',' ',' ','O','F','{','W','i','n','3','2','_', - 'L','o','g','i','c','a','l','D','i','s','k','.','D','e','v','i','c','e','I','D','=','"','C',':','"','}',0}; - static const WCHAR query2[] = - {'A','S','S','O','C','I','A','T','O','R','S',' ','O','F',' ','{','W','i','n','3','2','_', - 'L','o','g','i','c','a','l','D','i','s','k','.','D','e','v','i','c','e','I','D','=','"','C',':','"','}',' ', - 'W','H','E','R','E',' ','A','s','s','o','c','C','l','a','s','s','=','W','i','n','3','2','_', - 'L','o','g','i','c','a','l','D','i','s','k','T','o','P','a','r','t','i','t','i','o','n',0}; - static const WCHAR query3[] = - {'A','S','S','O','C','I','A','T','O','R','S',' ',' ','O','F',' ','{','W','i','n','3','2','_', - 'L','o','g','i','c','a','l','D','i','s','k','.','D','e','v','i','c','e','I','D','}',0}; - static const WCHAR query4[] = - {'A','S','S','O','C','I','A','T','O','R','S',' ',' ','O','F',' ','{','W','i','n','3','2','_', - 'D','i','s','k','D','r','i','v','e','.','D','e','v','i','c','e','I','D','=', - '\'','\\','\\','.','\\','P','H','Y','S','I','C','A','L','D','R','I','V','E','0','\'','}',0}; - static const WCHAR query5[] = - {'A','S','S','O','C','I','A','T','O','R','S',' ','O','F',' ','{','W','i','n','3','2','_', - 'L','o','g','i','c','a','l','D','i','s','k','.','D','e','v','i','c','e','I','D','=','"','C',':','"','}',' ', - 'W','H','E','R','E',' ','A','s','s','o','c','C','l','a','s','s','=','W','i','n','3','2','_', - 'L','o','g','i','c','a','l','D','i','s','k','T','o','P','a','r','t','i','t','i','o','n',' ', - 'C','l','a','s','s','D','e','f','s','O','n','l','y',0}; - static const WCHAR query6[] = - {'A','S','S','O','C','I','A','T','O','R','S',' ','O','F',' ','{','W','i','n','3','2','_', - 'L','o','g','i','c','a','l','D','i','s','k','.','D','e','v','i','c','e','I','D','=','"','C',':','"','}',' ', - 'W','H','E','R','E',' ','C','l','a','s','s','D','e','f','s','O','n','l','y',0}; - static const WCHAR query7[] = - {'A','S','S','O','C','I','A','T','O','R','S',' ','O','F',' ','{','W','i','n','3','2','_', - 'L','o','g','i','c','a','l','D','i','s','k','.','D','e','v','i','c','e','I','D','=','"','C',':','"','}',' ', - 'W','H','E','R','E',' ','C','l','a','s','s','D','e','f','s','O','n','l','y',' ', - 'A','s','s','o','c','C','l','a','s','s',' ','=',' ','W','i','n','3','2','_', - 'L','o','g','i','c','a','l','D','i','s','k','T','o','P','a','r','t','i','t','i','o','n',0}; - static const WCHAR *test[] = { query1, query2, query3, query4, query5, query6, query7 }; + static const WCHAR *test[] = + { + L"ASSOCIATORS OF{Win32_LogicalDisk.DeviceID=\"C:\"}", + L"ASSOCIATORS OF {Win32_LogicalDisk.DeviceID=\"C:\"} WHERE AssocClass=Win32_LogicalDiskToPartition", + L"ASSOCIATORS OF {Win32_LogicalDisk.DeviceID}", + L"ASSOCIATORS OF {Win32_DiskDrive.DeviceID='\\\\.\\PHYSICALDRIVE0'}", + L"ASSOCIATORS OF {Win32_LogicalDisk.DeviceID=\"C:\"} WHERE AssocClass=Win32_LogicalDiskToPartition ClassDefsOnly", + L"ASSOCIATORS OF {Win32_LogicalDisk.DeviceID=\"C:\"} WHERE ClassDefsOnly", + L"ASSOCIATORS OF {Win32_LogicalDisk.DeviceID=\"C:\"} WHERE ClassDefsOnly AssocClass = Win32_LogicalDiskToPartition", + }; HRESULT hr; IEnumWbemClassObject *result; UINT i; @@ -250,18 +192,7 @@ static void _check_property( ULONG line, IWbemClassObject *obj, const WCHAR *pro static void test_Win32_Service( IWbemServices *services ) { - static const WCHAR pauseserviceW[] = {'P','a','u','s','e','S','e','r','v','i','c','e',0}; - static const WCHAR processidW[] = {'P','r','o','c','e','s','s','I','D',0}; - static const WCHAR resumeserviceW[] = {'R','e','s','u','m','e','S','e','r','v','i','c','e',0}; - static const WCHAR returnvalueW[] = {'R','e','t','u','r','n','V','a','l','u','e',0}; - static const WCHAR serviceW[] = {'W','i','n','3','2','_','S','e','r','v','i','c','e','.', - 'N','a','m','e','=','"','S','p','o','o','l','e','r','"',0}; - static const WCHAR startserviceW[] = {'S','t','a','r','t','S','e','r','v','i','c','e',0}; - static const WCHAR stateW[] = {'S','t','a','t','e',0}; - static const WCHAR stoppedW[] = {'S','t','o','p','p','e','d',0}; - static const WCHAR stopserviceW[] = {'S','t','o','p','S','e','r','v','i','c','e',0}; - static const WCHAR emptyW[] = {0}; - BSTR class = SysAllocString( serviceW ), empty = SysAllocString( emptyW ), method; + BSTR class = SysAllocString( L"Win32_Service.Name=\"Spooler\"" ), empty = SysAllocString( L"" ), method; IWbemClassObject *service, *out; VARIANT state, retval; CIMTYPE type; @@ -274,62 +205,62 @@ static void test_Win32_Service( IWbemServices *services ) goto out; } - check_property( service, processidW, VT_I4, CIM_UINT32 ); + check_property( service, L"ProcessID", VT_I4, CIM_UINT32 ); type = 0xdeadbeef; VariantInit( &state ); - hr = IWbemClassObject_Get( service, stateW, 0, &state, &type, NULL ); + hr = IWbemClassObject_Get( service, L"State", 0, &state, &type, NULL ); ok( hr == S_OK, "failed to get service state %08x\n", hr ); ok( V_VT( &state ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &state ) ); ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); - if (!lstrcmpW( V_BSTR( &state ), stoppedW )) + if (!lstrcmpW( V_BSTR( &state ), L"Stopped" )) { out = NULL; - method = SysAllocString( startserviceW ); + method = SysAllocString( L"StartService" ); hr = IWbemServices_ExecMethod( services, class, method, 0, NULL, NULL, &out, NULL ); ok( hr == S_OK, "failed to execute method %08x\n", hr ); SysFreeString( method ); VariantInit( &retval ); - hr = IWbemClassObject_Get( out, returnvalueW, 0, &retval, NULL, NULL ); + hr = IWbemClassObject_Get( out, L"ReturnValue", 0, &retval, NULL, NULL ); ok( hr == S_OK, "failed to get return value %08x\n", hr ); ok( !V_I4( &retval ), "unexpected error %u\n", V_UI4( &retval ) ); IWbemClassObject_Release( out ); } out = NULL; - method = SysAllocString( pauseserviceW ); + method = SysAllocString( L"PauseService" ); hr = IWbemServices_ExecMethod( services, class, method, 0, NULL, NULL, &out, NULL ); ok( hr == S_OK, "failed to execute method %08x\n", hr ); SysFreeString( method ); VariantInit( &retval ); - hr = IWbemClassObject_Get( out, returnvalueW, 0, &retval, NULL, NULL ); + hr = IWbemClassObject_Get( out, L"ReturnValue", 0, &retval, NULL, NULL ); ok( hr == S_OK, "failed to get return value %08x\n", hr ); ok( V_I4( &retval ), "unexpected success\n" ); IWbemClassObject_Release( out ); out = NULL; - method = SysAllocString( resumeserviceW ); + method = SysAllocString( L"ResumeService" ); hr = IWbemServices_ExecMethod( services, class, method, 0, NULL, NULL, &out, NULL ); ok( hr == S_OK, "failed to execute method %08x\n", hr ); SysFreeString( method ); VariantInit( &retval ); - hr = IWbemClassObject_Get( out, returnvalueW, 0, &retval, NULL, NULL ); + hr = IWbemClassObject_Get( out, L"ReturnValue", 0, &retval, NULL, NULL ); ok( hr == S_OK, "failed to get return value %08x\n", hr ); ok( V_I4( &retval ), "unexpected success\n" ); IWbemClassObject_Release( out ); - if (!lstrcmpW( V_BSTR( &state ), stoppedW )) + if (!lstrcmpW( V_BSTR( &state ), L"Stopped" )) { out = NULL; - method = SysAllocString( stopserviceW ); + method = SysAllocString( L"StopService" ); hr = IWbemServices_ExecMethod( services, class, method, 0, NULL, NULL, &out, NULL ); ok( hr == S_OK, "failed to execute method %08x\n", hr ); SysFreeString( method ); VariantInit( &retval ); - hr = IWbemClassObject_Get( out, returnvalueW, 0, &retval, NULL, NULL ); + hr = IWbemClassObject_Get( out, L"ReturnValue", 0, &retval, NULL, NULL ); ok( hr == S_OK, "failed to get return value %08x\n", hr ); ok( !V_I4( &retval ), "unexpected error %u\n", V_UI4( &retval ) ); IWbemClassObject_Release( out ); @@ -354,19 +285,7 @@ out: static void test_Win32_Bios( IWbemServices *services ) { - static const WCHAR queryW[] = - {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_','B','i','o','s',0}; - static const WCHAR descriptionW[] = {'D','e','s','c','r','i','p','t','i','o','n',0}; - static const WCHAR identificationcodeW[] = {'I','d','e','n','t','i','f','i','c','a','t','i','o','n','C','o','d','e',0}; - static const WCHAR manufacturerW[] = {'M','a','n','u','f','a','c','t','u','r','e','r',0}; - static const WCHAR nameW[] = {'N','a','m','e',0}; - static const WCHAR releasedateW[] = {'R','e','l','e','a','s','e','D','a','t','e',0}; - static const WCHAR serialnumberW[] = {'S','e','r','i','a','l','N','u','m','b','e','r',0}; - static const WCHAR smbiosbiosversionW[] = {'S','M','B','I','O','S','B','I','O','S','V','e','r','s','i','o','n',0}; - static const WCHAR smbiosmajorversionW[] = {'S','M','B','I','O','S','M','a','j','o','r','V','e','r','s','i','o','n',0}; - static const WCHAR smbiosminorversionW[] = {'S','M','B','I','O','S','M','i','n','o','r','V','e','r','s','i','o','n',0}; - static const WCHAR versionW[] = {'V','e','r','s','i','o','n',0}; - BSTR wql = SysAllocString( wqlW ), query = SysAllocString( queryW ); + BSTR wql = SysAllocString( L"wql" ), query = SysAllocString( L"SELECT * FROM Win32_BIOS" ); IEnumWbemClassObject *result; IWbemClassObject *obj; CIMTYPE type; @@ -380,25 +299,25 @@ static void test_Win32_Bios( IWbemServices *services ) hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); ok( hr == S_OK, "IEnumWbemClassObject_Next failed %08x\n", hr ); - check_property( obj, descriptionW, VT_BSTR, CIM_STRING ); - check_property( obj, identificationcodeW, VT_NULL, CIM_STRING ); - check_property( obj, manufacturerW, VT_BSTR, CIM_STRING ); - check_property( obj, nameW, VT_BSTR, CIM_STRING ); - check_property( obj, releasedateW, VT_BSTR, CIM_DATETIME ); + check_property( obj, L"Description", VT_BSTR, CIM_STRING ); + check_property( obj, L"IdentificationCode", VT_NULL, CIM_STRING ); + check_property( obj, L"Manufacturer", VT_BSTR, CIM_STRING ); + check_property( obj, L"Name", VT_BSTR, CIM_STRING ); + check_property( obj, L"ReleaseDate", VT_BSTR, CIM_DATETIME ); type = 0xdeadbeef; VariantInit( &val ); - hr = IWbemClassObject_Get( obj, serialnumberW, 0, &val, &type, NULL ); + hr = IWbemClassObject_Get( obj, L"SerialNumber", 0, &val, &type, NULL ); ok( hr == S_OK, "failed to get serial number %08x\n", hr ); ok( V_VT( &val ) == VT_BSTR || V_VT( &val ) == VT_NULL /* Testbot VMs */, "unexpected variant type 0x%x\n", V_VT( &val ) ); ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); VariantClear( &val ); - check_property( obj, smbiosbiosversionW, VT_BSTR, CIM_STRING ); - check_property( obj, smbiosmajorversionW, VT_I4, CIM_UINT16 ); - check_property( obj, smbiosminorversionW, VT_I4, CIM_UINT16 ); - check_property( obj, versionW, VT_BSTR, CIM_STRING ); + check_property( obj, L"SMBIOSBIOSVersion", VT_BSTR, CIM_STRING ); + check_property( obj, L"SMBIOSMajorVersion", VT_I4, CIM_UINT16 ); + check_property( obj, L"SMBIOSMinorVersion", VT_I4, CIM_UINT16 ); + check_property( obj, L"Version", VT_BSTR, CIM_STRING ); IWbemClassObject_Release( obj ); IEnumWbemClassObject_Release( result ); @@ -408,15 +327,7 @@ static void test_Win32_Bios( IWbemServices *services ) static void test_Win32_Baseboard( IWbemServices *services ) { - static const WCHAR queryW[] = - {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_','B','a','s','e','b','o','a','r','d',0}; - static const WCHAR manufacturerW[] = {'M','a','n','u','f','a','c','t','u','r','e','r',0}; - static const WCHAR modelW[] = {'M','o','d','e','l',0}; - static const WCHAR nameW[] = {'N','a','m','e',0}; - static const WCHAR productW[] = {'P','r','o','d','u','c','t',0}; - static const WCHAR tagW[] = {'T','a','g',0}; - static const WCHAR versionW[] = {'V','e','r','s','i','o','n',0}; - BSTR wql = SysAllocString( wqlW ), query = SysAllocString( queryW ); + BSTR wql = SysAllocString( L"wql" ), query = SysAllocString( L"SELECT * FROM Win32_Baseboard" ); IEnumWbemClassObject *result; IWbemClassObject *obj; CIMTYPE type; @@ -435,21 +346,21 @@ static void test_Win32_Baseboard( IWbemServices *services ) } ok( hr == S_OK, "IEnumWbemClassObject_Next failed %08x\n", hr ); - check_property( obj, manufacturerW, VT_BSTR, CIM_STRING ); + check_property( obj, L"Manufacturer", VT_BSTR, CIM_STRING ); type = 0xdeadbeef; VariantInit( &val ); - hr = IWbemClassObject_Get( obj, modelW, 0, &val, &type, NULL ); + hr = IWbemClassObject_Get( obj, L"Model", 0, &val, &type, NULL ); ok( hr == S_OK, "failed to get model %08x\n", hr ); ok( V_VT( &val ) == VT_BSTR || V_VT( &val ) == VT_NULL, "unexpected variant type 0x%x\n", V_VT( &val ) ); ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); trace( "model: %s\n", wine_dbgstr_w(V_BSTR(&val)) ); VariantClear( &val ); - check_property( obj, nameW, VT_BSTR, CIM_STRING ); - check_property( obj, productW, VT_BSTR, CIM_STRING ); - check_property( obj, tagW, VT_BSTR, CIM_STRING ); - check_property( obj, versionW, VT_BSTR, CIM_STRING ); + check_property( obj, L"Name", VT_BSTR, CIM_STRING ); + check_property( obj, L"Product", VT_BSTR, CIM_STRING ); + check_property( obj, L"Tag", VT_BSTR, CIM_STRING ); + check_property( obj, L"Version", VT_BSTR, CIM_STRING ); IWbemClassObject_Release( obj ); IEnumWbemClassObject_Release( result ); @@ -459,20 +370,10 @@ static void test_Win32_Baseboard( IWbemServices *services ) static void test_Win32_Process( IWbemServices *services, BOOL use_full_path ) { - static const WCHAR returnvalueW[] = {'R','e','t','u','r','n','V','a','l','u','e',0}; - static const WCHAR getownerW[] = {'G','e','t','O','w','n','e','r',0}; - static const WCHAR userW[] = {'U','s','e','r',0}; - static const WCHAR domainW[] = {'D','o','m','a','i','n',0}; - static const WCHAR processW[] = {'W','i','n','3','2','_','P','r','o','c','e','s','s',0}; - static const WCHAR idW[] = {'I','D',0}; - static const WCHAR fmtW[] = {'W','i','n','3','2','_','P','r','o','c','e','s','s','.', - 'H','a','n','d','l','e','=','"','%','u','"',0}; - static const WCHAR full_path_fmt[] = - {'\\','\\','%','s','\\','R','O','O','T','\\','C','I','M','V','2',':',0}; static const LONG expected_flavor = WBEM_FLAVOR_FLAG_PROPAGATE_TO_INSTANCE | WBEM_FLAVOR_NOT_OVERRIDABLE | WBEM_FLAVOR_ORIGIN_PROPAGATED; - WCHAR full_path[MAX_COMPUTERNAME_LENGTH + ARRAY_SIZE(full_path_fmt)]; + WCHAR full_path[MAX_COMPUTERNAME_LENGTH + ARRAY_SIZE( L"\\\\%s\\ROOT\\CIMV2:" )]; BSTR class, method; IWbemClassObject *process, *sig_in, *out; IWbemQualifierSet *qualifiers; @@ -488,12 +389,12 @@ static void test_Win32_Process( IWbemServices *services, BOOL use_full_path ) full_path_len = ARRAY_SIZE(server); ok( GetComputerNameW(server, &full_path_len), "GetComputerName failed\n" ); - full_path_len = wsprintfW(full_path, full_path_fmt, server); + full_path_len = wsprintfW( full_path, L"\\\\%s\\ROOT\\CIMV2:", server ); } - class = SysAllocStringLen( NULL, full_path_len + ARRAY_SIZE( processW ) ); + class = SysAllocStringLen( NULL, full_path_len + ARRAY_SIZE( L"Win32_Process" ) ); memcpy( class, full_path, full_path_len * sizeof(WCHAR) ); - memcpy( class + full_path_len, processW, sizeof(processW) ); + memcpy( class + full_path_len, L"Win32_Process", sizeof(L"Win32_Process") ); hr = IWbemServices_GetObject( services, class, 0, NULL, &process, NULL ); SysFreeString( class ); if (hr != S_OK) @@ -502,16 +403,16 @@ static void test_Win32_Process( IWbemServices *services, BOOL use_full_path ) return; } sig_in = (void*)0xdeadbeef; - hr = IWbemClassObject_GetMethod( process, getownerW, 0, &sig_in, NULL ); + hr = IWbemClassObject_GetMethod( process, L"GetOwner", 0, &sig_in, NULL ); ok( hr == S_OK, "failed to get GetOwner method %08x\n", hr ); ok( !sig_in, "sig_in != NULL\n"); IWbemClassObject_Release( process ); out = NULL; - method = SysAllocString( getownerW ); - class = SysAllocStringLen( NULL, full_path_len + ARRAY_SIZE( fmtW ) + 10 ); + method = SysAllocString( L"GetOwner" ); + class = SysAllocStringLen( NULL, full_path_len + ARRAY_SIZE( L"Win32_Process.Handle=\"%u\"" ) + 10 ); memcpy( class, full_path, full_path_len * sizeof(WCHAR) ); - wsprintfW( class + full_path_len, fmtW, GetCurrentProcessId() ); + wsprintfW( class + full_path_len, L"Win32_Process.Handle=\"%u\"", GetCurrentProcessId() ); hr = IWbemServices_ExecMethod( services, class, method, 0, NULL, NULL, &out, NULL ); ok( hr == S_OK, "failed to execute method %08x\n", hr ); SysFreeString( method ); @@ -519,22 +420,22 @@ static void test_Win32_Process( IWbemServices *services, BOOL use_full_path ) type = 0xdeadbeef; VariantInit( &retval ); - hr = IWbemClassObject_Get( out, returnvalueW, 0, &retval, &type, NULL ); + hr = IWbemClassObject_Get( out, L"ReturnValue", 0, &retval, &type, NULL ); ok( hr == S_OK, "failed to get return value %08x\n", hr ); ok( V_VT( &retval ) == VT_I4, "unexpected variant type 0x%x\n", V_VT( &retval ) ); ok( !V_I4( &retval ), "unexpected error %u\n", V_I4( &retval ) ); ok( type == CIM_UINT32, "unexpected type 0x%x\n", type ); - check_property( out, userW, VT_BSTR, CIM_STRING ); - check_property( out, domainW, VT_BSTR, CIM_STRING ); + check_property( out, L"User", VT_BSTR, CIM_STRING ); + check_property( out, L"Domain", VT_BSTR, CIM_STRING ); - hr = IWbemClassObject_GetPropertyQualifierSet( out, userW, &qualifiers ); + hr = IWbemClassObject_GetPropertyQualifierSet( out, L"User", &qualifiers ); ok( hr == S_OK, "failed to get qualifier set %08x\n", hr ); flavor = -1; V_I4(&val) = -1; V_VT(&val) = VT_ERROR; - hr = IWbemQualifierSet_Get( qualifiers, idW, 0, &val, &flavor ); + hr = IWbemQualifierSet_Get( qualifiers, L"ID", 0, &val, &flavor ); ok( hr == S_OK, "got %08x\n", hr ); ok( flavor == expected_flavor, "got %d\n", flavor ); ok( V_VT(&val) == VT_I4, "got %u\n", V_VT(&val) ); @@ -542,13 +443,13 @@ static void test_Win32_Process( IWbemServices *services, BOOL use_full_path ) VariantClear( &val ); IWbemQualifierSet_Release( qualifiers ); - hr = IWbemClassObject_GetPropertyQualifierSet( out, domainW, &qualifiers ); + hr = IWbemClassObject_GetPropertyQualifierSet( out, L"Domain", &qualifiers ); ok( hr == S_OK, "failed to get qualifier set %08x\n", hr ); flavor = -1; V_I4(&val) = -1; V_VT(&val) = VT_ERROR; - hr = IWbemQualifierSet_Get( qualifiers, idW, 0, &val, &flavor ); + hr = IWbemQualifierSet_Get( qualifiers, L"ID", 0, &val, &flavor ); ok( hr == S_OK, "got %08x\n", hr ); ok( flavor == expected_flavor, "got %d\n", flavor ); ok( V_VT(&val) == VT_I4, "got %u\n", V_VT(&val) ); @@ -556,10 +457,10 @@ static void test_Win32_Process( IWbemServices *services, BOOL use_full_path ) VariantClear( &val ); IWbemQualifierSet_Release( qualifiers ); - hr = IWbemClassObject_GetPropertyQualifierSet( out, returnvalueW, &qualifiers ); + hr = IWbemClassObject_GetPropertyQualifierSet( out, L"ReturnValue", &qualifiers ); ok( hr == S_OK, "failed to get qualifier set %08x\n", hr ); - hr = IWbemQualifierSet_Get( qualifiers, idW, 0, &val, &flavor ); + hr = IWbemQualifierSet_Get( qualifiers, L"ID", 0, &val, &flavor ); ok( hr == WBEM_E_NOT_FOUND, "got %08x\n", hr ); IWbemQualifierSet_Release( qualifiers ); @@ -568,19 +469,7 @@ static void test_Win32_Process( IWbemServices *services, BOOL use_full_path ) static void test_Win32_ComputerSystem( IWbemServices *services ) { - static const WCHAR backslashW[] = {'\\',0}; - static const WCHAR memorytypeW[] = {'M','e','m','o','r','y','T','y','p','e',0}; - static const WCHAR modelW[] = {'M','o','d','e','l',0}; - static const WCHAR nameW[] = {'N','a','m','e',0}; - static const WCHAR usernameW[] = {'U','s','e','r','N','a','m','e',0}; - static const WCHAR numprocessorsW[] = - {'N','u','m','b','e','r','O','f','P','r','o','c','e','s','s','o','r','s',0}; - static const WCHAR numlogicalprocessorsW[] = - {'N','u','m','b','e','r','O','f','L','o','g','i','c','a','l','P','r','o','c','e','s','s','o','r','s',0}; - static const WCHAR queryW[] = - {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_', - 'C','o','m','p','u','t','e','r','S','y','s','t','e','m',0}; - BSTR wql = SysAllocString( wqlW ), query = SysAllocString( queryW ); + BSTR wql = SysAllocString( L"wql" ), query = SysAllocString( L"SELECT * FROM Win32_ComputerSystem" ); IEnumWbemClassObject *result; IWbemClassObject *obj; VARIANT value; @@ -595,7 +484,7 @@ static void test_Win32_ComputerSystem( IWbemServices *services ) compname[0] = 0; lstrcpyW( username, compname ); - lstrcatW( username, backslashW ); + lstrcatW( username, L"\\" ); len = ARRAY_SIZE( username ) - lstrlenW( username ); if (!GetUserNameW( username + lstrlenW( username ), &len )) username[0] = 0; @@ -618,14 +507,14 @@ static void test_Win32_ComputerSystem( IWbemServices *services ) type = 0xdeadbeef; VariantInit( &value ); - hr = IWbemClassObject_Get( obj, memorytypeW, 0, &value, &type, NULL ); + hr = IWbemClassObject_Get( obj, L"MemoryType", 0, &value, &type, NULL ); ok( hr == WBEM_E_NOT_FOUND, "got %08x\n", hr ); - check_property( obj, modelW, VT_BSTR, CIM_STRING ); + check_property( obj, L"Model", VT_BSTR, CIM_STRING ); type = 0xdeadbeef; VariantInit( &value ); - hr = IWbemClassObject_Get( obj, nameW, 0, &value, &type, NULL ); + hr = IWbemClassObject_Get( obj, L"Name", 0, &value, &type, NULL ); ok( hr == S_OK, "failed to get computer name %08x\n", hr ); ok( V_VT( &value ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &value ) ); ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); @@ -634,7 +523,7 @@ static void test_Win32_ComputerSystem( IWbemServices *services ) type = 0xdeadbeef; VariantInit( &value ); - hr = IWbemClassObject_Get( obj, numlogicalprocessorsW, 0, &value, &type, NULL ); + hr = IWbemClassObject_Get( obj, L"NumberOfLogicalProcessors", 0, &value, &type, NULL ); ok( hr == S_OK || broken(hr == WBEM_E_NOT_FOUND) /* win2k3 */, "got %08x\n", hr ); if (hr == S_OK) { @@ -643,11 +532,11 @@ static void test_Win32_ComputerSystem( IWbemServices *services ) trace( "numlogicalprocessors %u\n", V_I4( &value ) ); } - check_property( obj, numprocessorsW, VT_I4, CIM_UINT32 ); + check_property( obj, L"NumberOfProcessors", VT_I4, CIM_UINT32 ); type = 0xdeadbeef; VariantInit( &value ); - hr = IWbemClassObject_Get( obj, usernameW, 0, &value, &type, NULL ); + hr = IWbemClassObject_Get( obj, L"UserName", 0, &value, &type, NULL ); ok( hr == S_OK, "failed to get computer name %08x\n", hr ); ok( V_VT( &value ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &value ) ); ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); @@ -663,17 +552,7 @@ out: static void test_Win32_SystemEnclosure( IWbemServices *services ) { - static const WCHAR queryW[] = - {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_', - 'S','y','s','t','e','m','E','n','c','l','o','s','u','r','e',0}; - static const WCHAR captionW[] = {'C','a','p','t','i','o','n',0}; - static const WCHAR chassistypesW[] = {'C','h','a','s','s','i','s','T','y','p','e','s',0}; - static const WCHAR descriptionW[] = {'D','e','s','c','r','i','p','t','i','o','n',0}; - static const WCHAR lockpresentW[] = {'L','o','c','k','P','r','e','s','e','n','t',0}; - static const WCHAR manufacturerW[] = {'M','a','n','u','f','a','c','t','u','r','e','r',0}; - static const WCHAR nameW[] = {'N','a','m','e',0}; - static const WCHAR tagW[] = {'T','a','g',0}; - BSTR wql = SysAllocString( wqlW ), query = SysAllocString( queryW ); + BSTR wql = SysAllocString( L"wql" ), query = SysAllocString( L"SELECT * FROM Win32_SystemEnclosure" ); IEnumWbemClassObject *result; IWbemClassObject *obj; CIMTYPE type; @@ -688,11 +567,11 @@ static void test_Win32_SystemEnclosure( IWbemServices *services ) hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); ok( hr == S_OK, "IEnumWbemClassObject_Next failed %08x\n", hr ); - check_property( obj, captionW, VT_BSTR, CIM_STRING ); + check_property( obj, L"Caption", VT_BSTR, CIM_STRING ); type = 0xdeadbeef; VariantInit( &val ); - hr = IWbemClassObject_Get( obj, chassistypesW, 0, &val, &type, NULL ); + hr = IWbemClassObject_Get( obj, L"ChassisTypes", 0, &val, &type, NULL ); ok( hr == S_OK, "failed to get chassis types %08x\n", hr ); ok( V_VT( &val ) == (VT_I4|VT_ARRAY), "unexpected variant type 0x%x\n", V_VT( &val ) ); ok( type == (CIM_UINT16|CIM_FLAG_ARRAY), "unexpected type 0x%x\n", type ); @@ -716,11 +595,11 @@ static void test_Win32_SystemEnclosure( IWbemServices *services ) } VariantClear( &val ); - check_property( obj, descriptionW, VT_BSTR, CIM_STRING ); - check_property( obj, lockpresentW, VT_BOOL, CIM_BOOLEAN ); - check_property( obj, manufacturerW, VT_BSTR, CIM_STRING ); - check_property( obj, nameW, VT_BSTR, CIM_STRING ); - check_property( obj, tagW, VT_BSTR, CIM_STRING ); + check_property( obj, L"Description", VT_BSTR, CIM_STRING ); + check_property( obj, L"LockPresent", VT_BOOL, CIM_BOOLEAN ); + check_property( obj, L"Manufacturer", VT_BSTR, CIM_STRING ); + check_property( obj, L"Name", VT_BSTR, CIM_STRING ); + check_property( obj, L"Tag", VT_BSTR, CIM_STRING ); IWbemClassObject_Release( obj ); IEnumWbemClassObject_Release( result ); @@ -730,25 +609,7 @@ static void test_Win32_SystemEnclosure( IWbemServices *services ) static void test_StdRegProv( IWbemServices *services ) { - static const WCHAR createkeyW[] = {'C','r','e','a','t','e','K','e','y',0}; - static const WCHAR enumkeyW[] = {'E','n','u','m','K','e','y',0}; - static const WCHAR enumvaluesW[] = {'E','n','u','m','V','a','l','u','e','s',0}; - static const WCHAR getstringvalueW[] = {'G','e','t','S','t','r','i','n','g','V','a','l','u','e',0}; - static const WCHAR stdregprovW[] = {'S','t','d','R','e','g','P','r','o','v',0}; - static const WCHAR defkeyW[] = {'h','D','e','f','K','e','y',0}; - static const WCHAR subkeynameW[] = {'s','S','u','b','K','e','y','N','a','m','e',0}; - static const WCHAR returnvalueW[] = {'R','e','t','u','r','n','V','a','l','u','e',0}; - static const WCHAR namesW[] = {'s','N','a','m','e','s',0}; - static const WCHAR typesW[] = {'T','y','p','e','s',0}; - static const WCHAR valueW[] = {'s','V','a','l','u','e',0}; - static const WCHAR valuenameW[] = {'s','V','a','l','u','e','N','a','m','e',0}; - static const WCHAR programfilesW[] = {'P','r','o','g','r','a','m','F','i','l','e','s','D','i','r',0}; - static const WCHAR windowsW[] = - {'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',0}; - static const WCHAR regtestW[] = - {'S','o','f','t','w','a','r','e','\\','S','t','d','R','e','g','P','r','o','v','T','e','s','t',0}; - BSTR class = SysAllocString( stdregprovW ), method, name; + BSTR class = SysAllocString( L"StdRegProv" ), method, name; IWbemClassObject *reg, *sig_in, *sig_out, *in, *out; VARIANT defkey, subkey, retval, valuename; CIMTYPE type; @@ -784,7 +645,7 @@ static void test_StdRegProv( IWbemServices *services ) hr = IWbemClassObject_EndEnumeration( reg ); ok( hr == S_OK, "got %08x\n", hr ); - hr = IWbemClassObject_GetMethod( reg, createkeyW, 0, &sig_in, NULL ); + hr = IWbemClassObject_GetMethod( reg, L"CreateKey", 0, &sig_in, NULL ); ok( hr == S_OK, "failed to get CreateKey method %08x\n", hr ); hr = IWbemClassObject_SpawnInstance( sig_in, 0, &in ); @@ -792,29 +653,29 @@ static void test_StdRegProv( IWbemServices *services ) V_VT( &defkey ) = VT_I4; V_I4( &defkey ) = 0x80000001; - hr = IWbemClassObject_Put( in, defkeyW, 0, &defkey, 0 ); + hr = IWbemClassObject_Put( in, L"hDefKey", 0, &defkey, 0 ); ok( hr == S_OK, "failed to set root %08x\n", hr ); V_VT( &subkey ) = VT_BSTR; - V_BSTR( &subkey ) = SysAllocString( regtestW ); - hr = IWbemClassObject_Put( in, subkeynameW, 0, &subkey, 0 ); + V_BSTR( &subkey ) = SysAllocString( L"Software\\StdRegProvTest" ); + hr = IWbemClassObject_Put( in, L"sSubKeyName", 0, &subkey, 0 ); ok( hr == S_OK, "failed to set subkey %08x\n", hr ); out = NULL; - method = SysAllocString( createkeyW ); + method = SysAllocString( L"CreateKey" ); hr = IWbemServices_ExecMethod( services, class, method, 0, NULL, in, &out, NULL ); ok( hr == S_OK, "failed to execute method %08x\n", hr ); SysFreeString( method ); type = 0xdeadbeef; VariantInit( &retval ); - hr = IWbemClassObject_Get( out, returnvalueW, 0, &retval, &type, NULL ); + hr = IWbemClassObject_Get( out, L"ReturnValue", 0, &retval, &type, NULL ); ok( hr == S_OK, "failed to get return value %08x\n", hr ); ok( V_VT( &retval ) == VT_I4, "unexpected variant type 0x%x\n", V_VT( &retval ) ); ok( !V_I4( &retval ), "unexpected error %u\n", V_UI4( &retval ) ); ok( type == CIM_UINT32, "unexpected type 0x%x\n", type ); - res = RegDeleteKeyW( HKEY_CURRENT_USER, regtestW ); + res = RegDeleteKeyW( HKEY_CURRENT_USER, L"Software\\StdRegProvTest" ); ok( !res, "got %d\n", res ); VariantClear( &subkey ); @@ -822,7 +683,7 @@ static void test_StdRegProv( IWbemServices *services ) IWbemClassObject_Release( out ); IWbemClassObject_Release( sig_in ); - hr = IWbemClassObject_GetMethod( reg, enumkeyW, 0, &sig_in, NULL ); + hr = IWbemClassObject_GetMethod( reg, L"EnumKey", 0, &sig_in, NULL ); ok( hr == S_OK, "failed to get EnumKey method %08x\n", hr ); hr = IWbemClassObject_SpawnInstance( sig_in, 0, &in ); @@ -830,36 +691,36 @@ static void test_StdRegProv( IWbemServices *services ) V_VT( &defkey ) = VT_I4; V_I4( &defkey ) = 0x80000002; - hr = IWbemClassObject_Put( in, defkeyW, 0, &defkey, 0 ); + hr = IWbemClassObject_Put( in, L"hDefKey", 0, &defkey, 0 ); ok( hr == S_OK, "failed to set root %08x\n", hr ); V_VT( &subkey ) = VT_BSTR; - V_BSTR( &subkey ) = SysAllocString( windowsW ); - hr = IWbemClassObject_Put( in, subkeynameW, 0, &subkey, 0 ); + V_BSTR( &subkey ) = SysAllocString( L"Software\\microsoft\\Windows\\CurrentVersion" ); + hr = IWbemClassObject_Put( in, L"sSubKeyName", 0, &subkey, 0 ); ok( hr == S_OK, "failed to set subkey %08x\n", hr ); out = NULL; - method = SysAllocString( enumkeyW ); + method = SysAllocString( L"EnumKey" ); hr = IWbemServices_ExecMethod( services, class, method, 0, NULL, in, &out, NULL ); ok( hr == S_OK, "failed to execute method %08x\n", hr ); SysFreeString( method ); type = 0xdeadbeef; VariantInit( &retval ); - hr = IWbemClassObject_Get( out, returnvalueW, 0, &retval, &type, NULL ); + hr = IWbemClassObject_Get( out, L"ReturnValue", 0, &retval, &type, NULL ); ok( hr == S_OK, "failed to get return value %08x\n", hr ); ok( V_VT( &retval ) == VT_I4, "unexpected variant type 0x%x\n", V_VT( &retval ) ); ok( !V_I4( &retval ), "unexpected error %u\n", V_UI4( &retval ) ); ok( type == CIM_UINT32, "unexpected type 0x%x\n", type ); - check_property( out, namesW, VT_BSTR|VT_ARRAY, CIM_STRING|CIM_FLAG_ARRAY ); + check_property( out, L"sNames", VT_BSTR|VT_ARRAY, CIM_STRING|CIM_FLAG_ARRAY ); VariantClear( &subkey ); IWbemClassObject_Release( in ); IWbemClassObject_Release( out ); IWbemClassObject_Release( sig_in ); - hr = IWbemClassObject_GetMethod( reg, enumvaluesW, 0, &sig_in, NULL ); + hr = IWbemClassObject_GetMethod( reg, L"EnumValues", 0, &sig_in, NULL ); ok( hr == S_OK, "failed to get EnumValues method %08x\n", hr ); hr = IWbemClassObject_SpawnInstance( sig_in, 0, &in ); @@ -867,37 +728,37 @@ static void test_StdRegProv( IWbemServices *services ) V_VT( &defkey ) = VT_I4; V_I4( &defkey ) = 0x80000002; - hr = IWbemClassObject_Put( in, defkeyW, 0, &defkey, 0 ); + hr = IWbemClassObject_Put( in, L"hDefKey", 0, &defkey, 0 ); ok( hr == S_OK, "failed to set root %08x\n", hr ); V_VT( &subkey ) = VT_BSTR; - V_BSTR( &subkey ) = SysAllocString( windowsW ); - hr = IWbemClassObject_Put( in, subkeynameW, 0, &subkey, 0 ); + V_BSTR( &subkey ) = SysAllocString( L"Software\\microsoft\\Windows\\CurrentVersion" ); + hr = IWbemClassObject_Put( in, L"sSubKeyName", 0, &subkey, 0 ); ok( hr == S_OK, "failed to set subkey %08x\n", hr ); out = NULL; - method = SysAllocString( enumvaluesW ); + method = SysAllocString( L"EnumValues" ); hr = IWbemServices_ExecMethod( services, class, method, 0, NULL, in, &out, NULL ); ok( hr == S_OK, "failed to execute method %08x\n", hr ); SysFreeString( method ); type = 0xdeadbeef; VariantInit( &retval ); - hr = IWbemClassObject_Get( out, returnvalueW, 0, &retval, &type, NULL ); + hr = IWbemClassObject_Get( out, L"ReturnValue", 0, &retval, &type, NULL ); ok( hr == S_OK, "failed to get return value %08x\n", hr ); ok( V_VT( &retval ) == VT_I4, "unexpected variant type 0x%x\n", V_VT( &retval ) ); ok( !V_I4( &retval ), "unexpected error %u\n", V_I4( &retval ) ); ok( type == CIM_UINT32, "unexpected type 0x%x\n", type ); - check_property( out, namesW, VT_BSTR|VT_ARRAY, CIM_STRING|CIM_FLAG_ARRAY ); - check_property( out, typesW, VT_I4|VT_ARRAY, CIM_SINT32|CIM_FLAG_ARRAY ); + check_property( out, L"sNames", VT_BSTR|VT_ARRAY, CIM_STRING|CIM_FLAG_ARRAY ); + check_property( out, L"Types", VT_I4|VT_ARRAY, CIM_SINT32|CIM_FLAG_ARRAY ); VariantClear( &subkey ); IWbemClassObject_Release( in ); IWbemClassObject_Release( out ); IWbemClassObject_Release( sig_in ); - hr = IWbemClassObject_GetMethod( reg, getstringvalueW, 0, &sig_in, NULL ); + hr = IWbemClassObject_GetMethod( reg, L"GetStringValue", 0, &sig_in, NULL ); ok( hr == S_OK, "failed to get GetStringValue method %08x\n", hr ); hr = IWbemClassObject_SpawnInstance( sig_in, 0, &in ); @@ -905,34 +766,34 @@ static void test_StdRegProv( IWbemServices *services ) V_VT( &defkey ) = VT_I4; V_I4( &defkey ) = 0x80000002; - hr = IWbemClassObject_Put( in, defkeyW, 0, &defkey, 0 ); + hr = IWbemClassObject_Put( in, L"hDefKey", 0, &defkey, 0 ); ok( hr == S_OK, "failed to set root %08x\n", hr ); V_VT( &subkey ) = VT_BSTR; - V_BSTR( &subkey ) = SysAllocString( windowsW ); - hr = IWbemClassObject_Put( in, subkeynameW, 0, &subkey, 0 ); + V_BSTR( &subkey ) = SysAllocString( L"Software\\microsoft\\Windows\\CurrentVersion" ); + hr = IWbemClassObject_Put( in, L"sSubKeyName", 0, &subkey, 0 ); ok( hr == S_OK, "failed to set subkey %08x\n", hr ); V_VT( &valuename ) = VT_BSTR; - V_BSTR( &valuename ) = SysAllocString( programfilesW ); - hr = IWbemClassObject_Put( in, valuenameW, 0, &valuename, 0 ); + V_BSTR( &valuename ) = SysAllocString( L"ProgramFilesDir" ); + hr = IWbemClassObject_Put( in, L"sValueName", 0, &valuename, 0 ); ok( hr == S_OK, "failed to set value name %08x\n", hr ); out = NULL; - method = SysAllocString( getstringvalueW ); + method = SysAllocString( L"GetStringValue" ); hr = IWbemServices_ExecMethod( services, class, method, 0, NULL, in, &out, NULL ); ok( hr == S_OK, "failed to execute method %08x\n", hr ); SysFreeString( method ); type = 0xdeadbeef; VariantInit( &retval ); - hr = IWbemClassObject_Get( out, returnvalueW, 0, &retval, &type, NULL ); + hr = IWbemClassObject_Get( out, L"ReturnValue", 0, &retval, &type, NULL ); ok( hr == S_OK, "failed to get return value %08x\n", hr ); ok( V_VT( &retval ) == VT_I4, "unexpected variant type 0x%x\n", V_VT( &retval ) ); ok( !V_I4( &retval ), "unexpected error %u\n", V_I4( &retval ) ); ok( type == CIM_UINT32, "unexpected type 0x%x\n", type ); - check_property( out, valueW, VT_BSTR, CIM_STRING ); + check_property( out, L"sValue", VT_BSTR, CIM_STRING ); VariantClear( &valuename ); VariantClear( &subkey ); @@ -998,10 +859,7 @@ static IWbemObjectSink sink = { &sink_vtbl }; static void test_notification_query_async( IWbemServices *services ) { - static const WCHAR queryW[] = - {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_', - 'D','e','v','i','c','e','C','h','a','n','g','e','E','v','e','n','t',0}; - BSTR wql = SysAllocString( wqlW ), query = SysAllocString( queryW ); + BSTR wql = SysAllocString( L"wql" ), query = SysAllocString( L"SELECT * FROM Win32_DeviceChangeEvent" ); ULONG prev_sink_refs; HRESULT hr; @@ -1022,10 +880,7 @@ static void test_notification_query_async( IWbemServices *services ) static void test_query_async( IWbemServices *services ) { - static const WCHAR queryW[] = - {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_', - 'P','r','o','c','e','s','s',0}; - BSTR wql = SysAllocString( wqlW ), query = SysAllocString( queryW ); + BSTR wql = SysAllocString( L"wql" ), query = SysAllocString( L"SELECT * FROM Win32_Process" ); HRESULT hr; hr = IWbemServices_ExecQueryAsync( services, wql, query, 0, NULL, NULL ); @@ -1046,9 +901,7 @@ static void test_query_async( IWbemServices *services ) static void test_query_semisync( IWbemServices *services ) { - static const WCHAR queryW[] = - {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_','D','u','m','m','y',0}; - BSTR wql = SysAllocString( wqlW ), query = SysAllocString( queryW ); + BSTR wql = SysAllocString( L"wql" ), query = SysAllocString( L"SELECT * FROM Win32_Dummy" ); IEnumWbemClassObject *result; IWbemClassObject *obj; ULONG count; @@ -1074,10 +927,7 @@ todo_wine static void test_GetNames( IWbemServices *services ) { - static const WCHAR queryW[] = - {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_', - 'O','p','e','r','a','t','i','n','g','S','y','s','t','e','m',0}; - BSTR wql = SysAllocString( wqlW ), query = SysAllocString( queryW ); + BSTR wql = SysAllocString( L"wql" ), query = SysAllocString( L"SELECT * FROM Win32_OperatingSystem" ); IEnumWbemClassObject *result; HRESULT hr; @@ -1108,11 +958,7 @@ static void test_GetNames( IWbemServices *services ) static void test_SystemSecurity( IWbemServices *services ) { - static const WCHAR systemsecurityW[] = {'_','_','S','y','s','t','e','m','S','e','c','u','r','i','t','y',0}; - static const WCHAR getsdW[] = {'G','e','t','S','D',0}; - static const WCHAR returnvalueW[] = {'R','e','t','u','r','n','V','a','l','u','e',0}; - static const WCHAR sdW[] = {'S','D',0}; - BSTR class = SysAllocString( systemsecurityW ), method; + BSTR class = SysAllocString( L"__SystemSecurity" ), method; IWbemClassObject *reg, *out; VARIANT retval, var_sd; void *data; @@ -1137,7 +983,7 @@ static void test_SystemSecurity( IWbemServices *services ) ok( ret, "CreateWellKnownSid failed\n" ); out = NULL; - method = SysAllocString( getsdW ); + method = SysAllocString( L"GetSD" ); hr = IWbemServices_ExecMethod( services, class, method, 0, NULL, NULL, &out, NULL ); ok( hr == S_OK || hr == WBEM_E_ACCESS_DENIED, "failed to execute method %08x\n", hr ); SysFreeString( method ); @@ -1146,7 +992,7 @@ static void test_SystemSecurity( IWbemServices *services ) { type = 0xdeadbeef; VariantInit( &retval ); - hr = IWbemClassObject_Get( out, returnvalueW, 0, &retval, &type, NULL ); + hr = IWbemClassObject_Get( out, L"ReturnValue", 0, &retval, &type, NULL ); ok( hr == S_OK, "failed to get return value %08x\n", hr ); ok( V_VT( &retval ) == VT_I4, "unexpected variant type 0x%x\n", V_VT( &retval ) ); ok( !V_I4( &retval ), "unexpected error %u\n", V_UI4( &retval ) ); @@ -1154,7 +1000,7 @@ static void test_SystemSecurity( IWbemServices *services ) type = 0xdeadbeef; VariantInit( &var_sd ); - hr = IWbemClassObject_Get( out, sdW, 0, &var_sd, &type, NULL ); + hr = IWbemClassObject_Get( out, L"SD", 0, &var_sd, &type, NULL ); ok( hr == S_OK, "failed to get names %08x\n", hr ); ok( V_VT( &var_sd ) == (VT_UI1|VT_ARRAY), "unexpected variant type 0x%x\n", V_VT( &var_sd ) ); ok( type == (CIM_UINT8|CIM_FLAG_ARRAY), "unexpected type 0x%x\n", type ); @@ -1186,33 +1032,7 @@ static void test_SystemSecurity( IWbemServices *services ) static void test_Win32_OperatingSystem( IWbemServices *services ) { - static const WCHAR queryW[] = - {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_', - 'O','p','e','r','a','t','i','n','g','S','y','s','t','e','m',0}; - static const WCHAR buildnumberW[] = {'B','u','i','l','d','N','u','m','b','e','r',0}; - static const WCHAR captionW[] = {'C','a','p','t','i','o','n',0}; - static const WCHAR csdversionW[] = {'C','S','D','V','e','r','s','i','o','n',0}; - static const WCHAR csnameW[] = {'C','S','N','a','m','e',0}; - static const WCHAR currenttimezoneW[] = {'C','u','r','r','e','n','t','T','i','m','e','Z','o','n','e',0}; - static const WCHAR freephysicalmemoryW[] = {'F','r','e','e','P','h','y','s','i','c','a','l','M','e','m','o','r','y',0}; - static const WCHAR manufacturerW[] = {'M','a','n','u','f','a','c','t','u','r','e','r',0}; - static const WCHAR nameW[] = {'N','a','m','e',0}; - static const WCHAR operatingsystemskuW[] = {'O','p','e','r','a','t','i','n','g','S','y','s','t','e','m','S','K','U',0}; - static const WCHAR osproductsuiteW[] = {'O','S','P','r','o','d','u','c','t','S','u','i','t','e',0}; - static const WCHAR ostypeW[] = {'O','S','T','y','p','e',0}; - static const WCHAR suitemaskW[] = {'S','u','i','t','e','M','a','s','k',0}; - static const WCHAR versionW[] = {'V','e','r','s','i','o','n',0}; - static const WCHAR servicepackmajorW[] = - {'S','e','r','v','i','c','e','P','a','c','k','M','a','j','o','r','V','e','r','s','i','o','n',0}; - static const WCHAR servicepackminorW[] = - {'S','e','r','v','i','c','e','P','a','c','k','M','i','n','o','r','V','e','r','s','i','o','n',0}; - static const WCHAR systemdriveW[] = - {'S','y','s','t','e','m','D','r','i','v','e',0}; - static const WCHAR totalvisiblememorysizeW[] = - {'T','o','t','a','l','V','i','s','i','b','l','e','M','e','m','o','r','y','S','i','z','e',0}; - static const WCHAR totalvirtualmemorysizeW[] = - {'T','o','t','a','l','V','i','r','t','u','a','l','M','e','m','o','r','y','S','i','z','e',0}; - BSTR wql = SysAllocString( wqlW ), query = SysAllocString( queryW ); + BSTR wql = SysAllocString( L"wql" ), query = SysAllocString( L"SELECT * FROM Win32_OperatingSystem" ); IEnumWbemClassObject *result; IWbemClassObject *obj; CIMTYPE type; @@ -1234,24 +1054,24 @@ static void test_Win32_OperatingSystem( IWbemServices *services ) hr = IWbemClassObject_EndEnumeration( obj ); ok( hr == S_OK, "got %08x\n", hr ); - check_property( obj, buildnumberW, VT_BSTR, CIM_STRING ); - check_property( obj, captionW, VT_BSTR, CIM_STRING ); + check_property( obj, L"BuildNumber", VT_BSTR, CIM_STRING ); + check_property( obj, L"Caption", VT_BSTR, CIM_STRING ); type = 0xdeadbeef; VariantInit( &val ); - hr = IWbemClassObject_Get( obj, csdversionW, 0, &val, &type, NULL ); + hr = IWbemClassObject_Get( obj, L"CSDVersion", 0, &val, &type, NULL ); ok( hr == S_OK, "failed to get csdversion %08x\n", hr ); ok( V_VT( &val ) == VT_BSTR || V_VT( &val ) == VT_NULL, "unexpected variant type 0x%x\n", V_VT( &val ) ); ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); trace( "csdversion: %s\n", wine_dbgstr_w(V_BSTR( &val )) ); VariantClear( &val ); - check_property( obj, freephysicalmemoryW, VT_BSTR, CIM_UINT64 ); - check_property( obj, nameW, VT_BSTR, CIM_STRING ); + check_property( obj, L"FreePhysicalMemory", VT_BSTR, CIM_UINT64 ); + check_property( obj, L"Name", VT_BSTR, CIM_STRING ); type = 0xdeadbeef; VariantInit( &val ); - hr = IWbemClassObject_Get( obj, operatingsystemskuW, 0, &val, &type, NULL ); + hr = IWbemClassObject_Get( obj, L"OperatingSystemSKU", 0, &val, &type, NULL ); ok( hr == S_OK || broken(hr == WBEM_E_NOT_FOUND) /* winxp */, "failed to get operatingsystemsku %08x\n", hr ); if (hr == S_OK) { @@ -1263,24 +1083,24 @@ static void test_Win32_OperatingSystem( IWbemServices *services ) type = 0xdeadbeef; VariantInit( &val ); - hr = IWbemClassObject_Get( obj, osproductsuiteW, 0, &val, &type, NULL ); + hr = IWbemClassObject_Get( obj, L"OSProductSuite", 0, &val, &type, NULL ); ok( hr == S_OK, "failed to get osproductsuite %08x\n", hr ); ok( V_VT( &val ) == VT_I4 || broken(V_VT( &val ) == VT_NULL) /* winxp */, "unexpected variant type 0x%x\n", V_VT( &val ) ); ok( type == CIM_UINT32, "unexpected type 0x%x\n", type ); trace( "osproductsuite: %d (%08x)\n", V_I4( &val ), V_I4( &val ) ); VariantClear( &val ); - check_property( obj, csnameW, VT_BSTR, CIM_STRING ); - check_property( obj, currenttimezoneW, VT_I2, CIM_SINT16 ); - check_property( obj, manufacturerW, VT_BSTR, CIM_STRING ); - check_property( obj, ostypeW, VT_I4, CIM_UINT16 ); - check_property( obj, servicepackmajorW, VT_I4, CIM_UINT16 ); - check_property( obj, servicepackminorW, VT_I4, CIM_UINT16 ); - check_property( obj, suitemaskW, VT_I4, CIM_UINT32 ); - check_property( obj, versionW, VT_BSTR, CIM_STRING ); - check_property( obj, totalvisiblememorysizeW, VT_BSTR, CIM_UINT64 ); - check_property( obj, totalvirtualmemorysizeW, VT_BSTR, CIM_UINT64 ); - check_property( obj, systemdriveW, VT_BSTR, CIM_STRING ); + check_property( obj, L"CSName", VT_BSTR, CIM_STRING ); + check_property( obj, L"CurrentTimeZone", VT_I2, CIM_SINT16 ); + check_property( obj, L"Manufacturer", VT_BSTR, CIM_STRING ); + check_property( obj, L"OSType", VT_I4, CIM_UINT16 ); + check_property( obj, L"ServicePackMajorVersion", VT_I4, CIM_UINT16 ); + check_property( obj, L"ServicePackMinorVersion", VT_I4, CIM_UINT16 ); + check_property( obj, L"SuiteMask", VT_I4, CIM_UINT32 ); + check_property( obj, L"Version", VT_BSTR, CIM_STRING ); + check_property( obj, L"TotalVisibleMemorySize", VT_BSTR, CIM_UINT64 ); + check_property( obj, L"TotalVirtualMemorySize", VT_BSTR, CIM_UINT64 ); + check_property( obj, L"SystemDrive", VT_BSTR, CIM_STRING ); IWbemClassObject_Release( obj ); IEnumWbemClassObject_Release( result ); @@ -1290,22 +1110,7 @@ static void test_Win32_OperatingSystem( IWbemServices *services ) static void test_Win32_ComputerSystemProduct( IWbemServices *services ) { - static const WCHAR identifyingnumberW[] = - {'I','d','e','n','t','i','f','y','i','n','g','N','u','m','b','e','r',0}; - static const WCHAR nameW[] = - {'N','a','m','e',0}; - static const WCHAR skunumberW[] = - {'S','K','U','N','u','m','b','e','r',0}; - static const WCHAR uuidW[] = - {'U','U','I','D',0}; - static const WCHAR vendorW[] = - {'V','e','n','d','o','r',0}; - static const WCHAR versionW[] = - {'V','e','r','s','i','o','n',0}; - static const WCHAR queryW[] = - {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_', - 'C','o','m','p','u','t','e','r','S','y','s','t','e','m','P','r','o','d','u','c','t',0}; - BSTR wql = SysAllocString( wqlW ), query = SysAllocString( queryW ); + BSTR wql = SysAllocString( L"wql" ), query = SysAllocString( L"SELECT * FROM Win32_ComputerSystemProduct" ); IEnumWbemClassObject *result; IWbemClassObject *obj; HRESULT hr; @@ -1321,12 +1126,12 @@ static void test_Win32_ComputerSystemProduct( IWbemServices *services ) hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); ok( hr == S_OK, "got %08x\n", hr ); - check_property( obj, identifyingnumberW, VT_BSTR, CIM_STRING ); - check_property( obj, nameW, VT_BSTR, CIM_STRING ); - check_property( obj, skunumberW, VT_NULL, CIM_STRING ); - check_property( obj, uuidW, VT_BSTR, CIM_STRING ); - check_property( obj, vendorW, VT_BSTR, CIM_STRING ); - check_property( obj, versionW, VT_BSTR, CIM_STRING ); + check_property( obj, L"IdentifyingNumber", VT_BSTR, CIM_STRING ); + check_property( obj, L"Name", VT_BSTR, CIM_STRING ); + check_property( obj, L"SKUNumber", VT_NULL, CIM_STRING ); + check_property( obj, L"UUID", VT_BSTR, CIM_STRING ); + check_property( obj, L"Vendor", VT_BSTR, CIM_STRING ); + check_property( obj, L"Version", VT_BSTR, CIM_STRING ); IWbemClassObject_Release( obj ); IEnumWbemClassObject_Release( result ); @@ -1336,14 +1141,7 @@ static void test_Win32_ComputerSystemProduct( IWbemServices *services ) static void test_Win32_PhysicalMemory( IWbemServices *services ) { - static const WCHAR capacityW[] = {'C','a','p','a','c','i','t','y',0}; - static const WCHAR memorytypeW[] = {'M','e','m','o','r','y','T','y','p','e',0}; - static const WCHAR formfactorW[] = {'F','o','r','m','F','a','c','t','o','r',0}; - static const WCHAR devicelocatorW[] = {'D','e','v','i','c','e','L','o','c','a','t','o','r',0}; - static const WCHAR queryW[] = - {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_', - 'P','h','y','s','i','c','a','l','M','e','m','o','r','y',0}; - BSTR wql = SysAllocString( wqlW ), query = SysAllocString( queryW ); + BSTR wql = SysAllocString( L"wql" ), query = SysAllocString( L"SELECT * FROM Win32_PhysicalMemory" ); IEnumWbemClassObject *result; IWbemClassObject *obj; HRESULT hr; @@ -1361,10 +1159,10 @@ static void test_Win32_PhysicalMemory( IWbemServices *services ) if (count > 0) { - check_property( obj, capacityW, VT_BSTR, CIM_UINT64 ); - check_property( obj, devicelocatorW, VT_BSTR, CIM_STRING ); - check_property( obj, formfactorW, VT_I4, CIM_UINT16 ); - check_property( obj, memorytypeW, VT_I4, CIM_UINT16 ); + check_property( obj, L"Capacity", VT_BSTR, CIM_UINT64 ); + check_property( obj, L"DeviceLocator", VT_BSTR, CIM_STRING ); + check_property( obj, L"FormFactor", VT_I4, CIM_UINT16 ); + check_property( obj, L"MemoryType", VT_I4, CIM_UINT16 ); IWbemClassObject_Release( obj ); } IEnumWbemClassObject_Release( result ); @@ -1374,13 +1172,7 @@ static void test_Win32_PhysicalMemory( IWbemServices *services ) static void test_Win32_IP4RouteTable( IWbemServices *services ) { - static const WCHAR destinationW[] = {'D','e','s','t','i','n','a','t','i','o','n',0}; - static const WCHAR interfaceindexW[] = {'I','n','t','e','r','f','a','c','e','I','n','d','e','x',0}; - static const WCHAR nexthopW[] = {'N','e','x','t','H','o','p',0}; - static const WCHAR queryW[] = - {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_', - 'I','P','4','R','o','u','t','e','T','a','b','l','e',0}; - BSTR wql = SysAllocString( wqlW ), query = SysAllocString( queryW ); + BSTR wql = SysAllocString( L"wql" ), query = SysAllocString( L"SELECT * FROM Win32_IP4RouteTable" ); IEnumWbemClassObject *result; IWbemClassObject *obj; HRESULT hr; @@ -1398,9 +1190,9 @@ static void test_Win32_IP4RouteTable( IWbemServices *services ) hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); if (hr != S_OK) break; - check_property( obj, destinationW, VT_BSTR, CIM_STRING ); - check_property( obj, interfaceindexW, VT_I4, CIM_SINT32 ); - check_property( obj, nexthopW, VT_BSTR, CIM_STRING ); + check_property( obj, L"Destination", VT_BSTR, CIM_STRING ); + check_property( obj, L"InterfaceIndex", VT_I4, CIM_SINT32 ); + check_property( obj, L"NextHop", VT_BSTR, CIM_STRING ); IWbemClassObject_Release( obj ); } @@ -1411,34 +1203,7 @@ static void test_Win32_IP4RouteTable( IWbemServices *services ) static void test_Win32_Processor( IWbemServices *services ) { - static const WCHAR architectureW[] = - {'A','r','c','h','i','t','e','c','t','u','r','e',0}; - static const WCHAR captionW[] = - {'C','a','p','t','i','o','n',0}; - static const WCHAR cpustatusW[] = - {'C','p','u','S','t','a','t','u','s',0}; - static const WCHAR familyW[] = - {'F','a','m','i','l','y',0}; - static const WCHAR levelW[] = - {'L','e','v','e','l',0}; - static const WCHAR manufacturerW[] = - {'M','a','n','u','f','a','c','t','u','r','e','r',0}; - static const WCHAR nameW[] = - {'N','a','m','e',0}; - static const WCHAR numcoresW[] = - {'N','u','m','b','e','r','O','f','C','o','r','e','s',0}; - static const WCHAR numlogicalprocessorsW[] = - {'N','u','m','b','e','r','O','f','L','o','g','i','c','a','l','P','r','o','c','e','s','s','o','r','s',0}; - static const WCHAR processoridW[] = - {'P','r','o','c','e','s','s','o','r','I','d',0}; - static const WCHAR revisionW[] = - {'R','e','v','i','s','i','o','n',0}; - static const WCHAR versionW[] = - {'V','e','r','s','i','o','n',0}; - static const WCHAR queryW[] = - {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_', - 'P','r','o','c','e','s','s','o','r',0}; - BSTR wql = SysAllocString( wqlW ), query = SysAllocString( queryW ); + BSTR wql = SysAllocString( L"wql" ), query = SysAllocString( L"SELECT * FROM Win32_Processor" ); IEnumWbemClassObject *result; IWbemClassObject *obj; VARIANT val; @@ -1454,20 +1219,20 @@ static void test_Win32_Processor( IWbemServices *services ) hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); if (hr != S_OK) break; - check_property( obj, architectureW, VT_I4, CIM_UINT16 ); - check_property( obj, captionW, VT_BSTR, CIM_STRING ); - check_property( obj, cpustatusW, VT_I4, CIM_UINT16 ); - check_property( obj, familyW, VT_I4, CIM_UINT16 ); - check_property( obj, levelW, VT_I4, CIM_UINT16 ); - check_property( obj, manufacturerW, VT_BSTR, CIM_STRING ); - check_property( obj, nameW, VT_BSTR, CIM_STRING ); - check_property( obj, processoridW, VT_BSTR, CIM_STRING ); - check_property( obj, revisionW, VT_I4, CIM_UINT16 ); - check_property( obj, versionW, VT_BSTR, CIM_STRING ); + check_property( obj, L"Architecture", VT_I4, CIM_UINT16 ); + check_property( obj, L"Caption", VT_BSTR, CIM_STRING ); + check_property( obj, L"CpuStatus", VT_I4, CIM_UINT16 ); + check_property( obj, L"Family", VT_I4, CIM_UINT16 ); + check_property( obj, L"Level", VT_I4, CIM_UINT16 ); + check_property( obj, L"Manufacturer", VT_BSTR, CIM_STRING ); + check_property( obj, L"Name", VT_BSTR, CIM_STRING ); + check_property( obj, L"ProcessorId", VT_BSTR, CIM_STRING ); + check_property( obj, L"Revision", VT_I4, CIM_UINT16 ); + check_property( obj, L"Version", VT_BSTR, CIM_STRING ); type = 0xdeadbeef; VariantInit( &val ); - hr = IWbemClassObject_Get( obj, numlogicalprocessorsW, 0, &val, &type, NULL ); + hr = IWbemClassObject_Get( obj, L"NumberOfLogicalProcessors", 0, &val, &type, NULL ); ok( hr == S_OK || broken(hr == WBEM_E_NOT_FOUND) /* win2k3 */, "got %08x\n", hr ); if (hr == S_OK) { @@ -1478,7 +1243,7 @@ static void test_Win32_Processor( IWbemServices *services ) type = 0xdeadbeef; VariantInit( &val ); - hr = IWbemClassObject_Get( obj, numcoresW, 0, &val, &type, NULL ); + hr = IWbemClassObject_Get( obj, L"NumberOfCores", 0, &val, &type, NULL ); ok( hr == S_OK || broken(hr == WBEM_E_NOT_FOUND) /* win2k3 */, "got %08x\n", hr ); if (hr == S_OK) { @@ -1497,20 +1262,7 @@ static void test_Win32_Processor( IWbemServices *services ) static void test_Win32_VideoController( IWbemServices *services ) { - static const WCHAR availabilityW[] = - {'A','v','a','i','l','a','b','i','l','i','t','y',0}; - static const WCHAR configmanagererrorcodeW[] = - {'C','o','n','f','i','g','M','a','n','a','g','e','r','E','r','r','o','r','C','o','d','e',0}; - static const WCHAR driverdateW[] = - {'D','r','i','v','e','r','D','a','t','e',0}; - static const WCHAR installeddisplaydriversW[]= - {'I','n','s','t','a','l','l','e','d','D','i','s','p','l','a','y','D','r','i','v','e','r','s',0}; - static const WCHAR statusW[] = - {'S','t','a','t','u','s',0}; - static const WCHAR queryW[] = - {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_', - 'V','i','d','e','o','C','o','n','t','r','o','l','l','e','r',0}; - BSTR wql = SysAllocString( wqlW ), query = SysAllocString( queryW ); + BSTR wql = SysAllocString( L"wql" ), query = SysAllocString( L"SELECT * FROM Win32_VideoController" ); IEnumWbemClassObject *result; IWbemClassObject *obj; VARIANT val; @@ -1530,20 +1282,20 @@ static void test_Win32_VideoController( IWbemServices *services ) hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); if (hr != S_OK) break; - check_property( obj, availabilityW, VT_I4, CIM_UINT16 ); - check_property( obj, configmanagererrorcodeW, VT_I4, CIM_UINT32 ); - check_property( obj, driverdateW, VT_BSTR, CIM_DATETIME ); + check_property( obj, L"Availability", VT_I4, CIM_UINT16 ); + check_property( obj, L"ConfigManagerErrorCode", VT_I4, CIM_UINT32 ); + check_property( obj, L"DriverDate", VT_BSTR, CIM_DATETIME ); type = 0xdeadbeef; VariantInit( &val ); - hr = IWbemClassObject_Get( obj, installeddisplaydriversW, 0, &val, &type, NULL ); + hr = IWbemClassObject_Get( obj, L"InstalledDisplayDrivers", 0, &val, &type, NULL ); ok( hr == S_OK, "got %08x\n", hr ); ok( V_VT( &val ) == VT_BSTR || V_VT( &val ) == VT_NULL, "unexpected variant type 0x%x\n", V_VT( &val ) ); ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); trace( "installeddisplaydrivers %s\n", wine_dbgstr_w(V_BSTR( &val )) ); VariantClear( &val ); - check_property( obj, statusW, VT_BSTR, CIM_STRING ); + check_property( obj, L"Status", VT_BSTR, CIM_STRING ); IWbemClassObject_Release( obj ); } @@ -1554,20 +1306,7 @@ static void test_Win32_VideoController( IWbemServices *services ) static void test_Win32_Printer( IWbemServices *services ) { - static const WCHAR attributesW[] = - {'A','t','t','r','i','b','u','t','e','s',0}; - static const WCHAR deviceidW[] = - {'D','e','v','i','c','e','I','d',0}; - static const WCHAR horizontalresolutionW[] = - {'H','o','r','i','z','o','n','t','a','l','R','e','s','o','l','u','t','i','o','n',0}; - static const WCHAR locationW[] = - {'L','o','c','a','t','i','o','n',0}; - static const WCHAR portnameW[] = - {'P','o','r','t','N','a','m','e',0}; - static const WCHAR queryW[] = - {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_', - 'P','r','i','n','t','e','r',0}; - BSTR wql = SysAllocString( wqlW ), query = SysAllocString( queryW ); + BSTR wql = SysAllocString( L"wql" ), query = SysAllocString( L"SELECT * FROM Win32_Printer" ); IEnumWbemClassObject *result; IWbemClassObject *obj; VARIANT val; @@ -1587,20 +1326,20 @@ static void test_Win32_Printer( IWbemServices *services ) hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); if (hr != S_OK) break; - check_property( obj, attributesW, VT_I4, CIM_UINT32 ); - check_property( obj, deviceidW, VT_BSTR, CIM_STRING ); - check_property( obj, horizontalresolutionW, VT_I4, CIM_UINT32 ); + check_property( obj, L"Attributes", VT_I4, CIM_UINT32 ); + check_property( obj, L"DeviceId", VT_BSTR, CIM_STRING ); + check_property( obj, L"HorizontalResolution", VT_I4, CIM_UINT32 ); type = 0xdeadbeef; memset( &val, 0, sizeof(val) ); - hr = IWbemClassObject_Get( obj, locationW, 0, &val, &type, NULL ); + hr = IWbemClassObject_Get( obj, L"Location", 0, &val, &type, NULL ); ok( hr == S_OK, "got %08x\n", hr ); ok( V_VT( &val ) == VT_BSTR || V_VT( &val ) == VT_NULL, "unexpected variant type 0x%x\n", V_VT( &val ) ); ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); trace( "location %s\n", wine_dbgstr_w(V_BSTR( &val )) ); VariantClear( &val ); - check_property( obj, portnameW, VT_BSTR, CIM_STRING ); + check_property( obj, L"PortName", VT_BSTR, CIM_STRING ); IWbemClassObject_Release( obj ); } @@ -1619,17 +1358,12 @@ static void test_Win32_PnPEntity( IWbemServices *services ) ULONG count, i; BSTR bstr; - static WCHAR win32_pnpentityW[] = {'W','i','n','3','2','_','P','n','P','E','n','t','i','t','y',0}; - static const WCHAR deviceidW[] = {'D','e','v','i','c','e','I','d',0}; - - bstr = SysAllocString( win32_pnpentityW ); - + bstr = SysAllocString( L"Win32_PnPEntity" ); hr = IWbemServices_CreateInstanceEnum( services, bstr, 0, NULL, &enm ); ok( hr == S_OK, "got %08x\n", hr ); - SysFreeString( bstr ); - bstr = SysAllocString( deviceidW ); + bstr = SysAllocString( L"DeviceId" ); while (1) { hr = IEnumWbemClassObject_Next( enm, 1000, 1, &obj, &count ); @@ -1656,29 +1390,12 @@ static void test_Win32_PnPEntity( IWbemServices *services ) } SysFreeString( bstr ); - IEnumWbemClassObject_Release( enm ); } static void test_Win32_WinSAT( IWbemServices *services ) { - static const WCHAR cpuscoreW[] = - {'C','P','U','S','c','o','r','e',0}; - static const WCHAR d3dscoreW[] = - {'D','3','D','S','c','o','r','e',0}; - static const WCHAR diskscoreW[] = - {'D','i','s','k','S','c','o','r','e',0}; - static const WCHAR graphicsscoreW[] = - {'G','r','a','p','h','i','c','s','S','c','o','r','e',0}; - static const WCHAR memoryscoreW[] = - {'M','e','m','o','r','y','S','c','o','r','e',0}; - static const WCHAR winsatassessmentstateW[] = - {'W','i','n','S','A','T','A','s','s','e','s','s','m','e','n','t','S','t','a','t','e',0}; - static const WCHAR winsprlevelW[] = - {'W','i','n','S','P','R','L','e','v','e','l',0}; - static const WCHAR queryW[] = - {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_','W','i','n','S','A','T',0}; - BSTR wql = SysAllocString( wqlW ), query = SysAllocString( queryW ); + BSTR wql = SysAllocString( L"wql" ), query = SysAllocString( L"SELECT * FROM Win32_WinSAT" ); IEnumWbemClassObject *result; IWbemClassObject *obj; HRESULT hr; @@ -1697,13 +1414,13 @@ static void test_Win32_WinSAT( IWbemServices *services ) hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); if (hr != S_OK) break; - check_property( obj, cpuscoreW, VT_R4, CIM_REAL32 ); - check_property( obj, d3dscoreW, VT_R4, CIM_REAL32 ); - check_property( obj, diskscoreW, VT_R4, CIM_REAL32 ); - check_property( obj, graphicsscoreW, VT_R4, CIM_REAL32 ); - check_property( obj, memoryscoreW, VT_R4, CIM_REAL32 ); - check_property( obj, winsatassessmentstateW, VT_I4, CIM_UINT32 ); - check_property( obj, winsprlevelW, VT_R4, CIM_REAL32 ); + check_property( obj, L"CPUScore", VT_R4, CIM_REAL32 ); + check_property( obj, L"D3DScore", VT_R4, CIM_REAL32 ); + check_property( obj, L"DiskScore", VT_R4, CIM_REAL32 ); + check_property( obj, L"GraphicsScore", VT_R4, CIM_REAL32 ); + check_property( obj, L"MemoryScore", VT_R4, CIM_REAL32 ); + check_property( obj, L"WinSATAssessmentState", VT_I4, CIM_UINT32 ); + check_property( obj, L"WinSPRLevel", VT_R4, CIM_REAL32 ); IWbemClassObject_Release( obj ); } @@ -1714,7 +1431,7 @@ static void test_Win32_WinSAT( IWbemServices *services ) static void test_Win32_DesktopMonitor( IWbemServices *services ) { - BSTR wql = SysAllocString( wqlW ), query = SysAllocString( L"SELECT * FROM Win32_DesktopMonitor" ); + BSTR wql = SysAllocString( L"wql" ), query = SysAllocString( L"SELECT * FROM Win32_DesktopMonitor" ); IEnumWbemClassObject *result; IWbemClassObject *obj; HRESULT hr; @@ -1740,21 +1457,8 @@ static void test_Win32_DesktopMonitor( IWbemServices *services ) static void test_Win32_DisplayControllerConfiguration( IWbemServices *services ) { - static const WCHAR bitsperpixelW[] = - {'B','i','t','s','P','e','r','P','i','x','e','l',0}; - static const WCHAR captionW[] = - {'C','a','p','t','i','o','n',0}; - static const WCHAR horizontalresolutionW[] = - {'H','o','r','i','z','o','n','t','a','l','R','e','s','o','l','u','t','i','o','n',0}; - static const WCHAR nameW[] = - {'N','a','m','e',0}; - static const WCHAR queryW[] = - {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_', - 'D','i','s','p','l','a','y','C','o','n','t','r','o','l','l','e','r', - 'C','o','n','f','i','g','u','r','a','t','i','o','n',0}; - static const WCHAR verticalresolutionW[] = - {'V','e','r','t','i','c','a','l','R','e','s','o','l','u','t','i','o','n',0}; - BSTR wql = SysAllocString( wqlW ), query = SysAllocString( queryW ); + BSTR wql = SysAllocString( L"wql" ); + BSTR query = SysAllocString( L"SELECT * FROM Win32_DisplayControllerConfiguration" ); IEnumWbemClassObject *result; IWbemClassObject *obj; HRESULT hr; @@ -1768,11 +1472,11 @@ static void test_Win32_DisplayControllerConfiguration( IWbemServices *services ) hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); if (hr != S_OK) break; - check_property( obj, bitsperpixelW, VT_I4, CIM_UINT32 ); - check_property( obj, captionW, VT_BSTR, CIM_STRING ); - check_property( obj, horizontalresolutionW, VT_I4, CIM_UINT32 ); - check_property( obj, nameW, VT_BSTR, CIM_STRING ); - check_property( obj, verticalresolutionW, VT_I4, CIM_UINT32 ); + check_property( obj, L"BitsPerPixel", VT_I4, CIM_UINT32 ); + check_property( obj, L"Caption", VT_BSTR, CIM_STRING ); + check_property( obj, L"HorizontalResolution", VT_I4, CIM_UINT32 ); + check_property( obj, L"Name", VT_BSTR, CIM_STRING ); + check_property( obj, L"VerticalResolution", VT_I4, CIM_UINT32 ); IWbemClassObject_Release( obj ); } @@ -1783,14 +1487,7 @@ static void test_Win32_DisplayControllerConfiguration( IWbemServices *services ) static void test_Win32_QuickFixEngineering( IWbemServices *services ) { - static const WCHAR captionW[] = - {'C','a','p','t','i','o','n',0}; - static const WCHAR hotfixidW[] = - {'H','o','t','F','i','x','I','D',0}; - static const WCHAR queryW[] = - {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_', - 'Q','u','i','c','k','F','i','x','E','n','g','i','n','e','e','r','i','n','g',0}; - BSTR wql = SysAllocString( wqlW ), query = SysAllocString( queryW ); + BSTR wql = SysAllocString( L"wql" ), query = SysAllocString( L"SELECT * FROM Win32_QuickFixEngineering" ); IEnumWbemClassObject *result; IWbemClassObject *obj; HRESULT hr; @@ -1808,13 +1505,13 @@ static void test_Win32_QuickFixEngineering( IWbemServices *services ) type = 0xdeadbeef; VariantInit( &caption ); - hr = IWbemClassObject_Get( obj, captionW, 0, &caption, &type, NULL ); + hr = IWbemClassObject_Get( obj, L"Caption", 0, &caption, &type, NULL ); ok( hr == S_OK, "failed to get caption %08x\n", hr ); ok( V_VT( &caption ) == VT_BSTR || V_VT( &caption ) == VT_NULL /* winxp */, "unexpected variant type 0x%x\n", V_VT( &caption ) ); ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); - check_property( obj, hotfixidW, VT_BSTR, CIM_STRING ); + check_property( obj, L"HotFixID", VT_BSTR, CIM_STRING ); IWbemClassObject_Release( obj ); if (total++ >= 10) break; } @@ -1826,8 +1523,7 @@ static void test_Win32_QuickFixEngineering( IWbemServices *services ) START_TEST(query) { - static const WCHAR cimv2W[] = {'R','O','O','T','\\','C','I','M','V','2',0}; - BSTR path = SysAllocString( cimv2W ); + BSTR path = SysAllocString( L"ROOT\\CIMV2" ); IWbemLocator *locator; IWbemServices *services; HRESULT hr; diff --git a/dlls/wbemprox/tests/services.c b/dlls/wbemprox/tests/services.c index da10e72fe1..cf45ed712b 100644 --- a/dlls/wbemprox/tests/services.c +++ b/dlls/wbemprox/tests/services.c @@ -26,12 +26,11 @@ static void test_IClientSecurity(void) { - static const WCHAR rootW[] = {'R','O','O','T','\\','C','I','M','V','2',0}; HRESULT hr; IWbemLocator *locator; IWbemServices *services; IClientSecurity *security; - BSTR path = SysAllocString( rootW ); + BSTR path = SysAllocString( L"ROOT\\CIMV2" ); ULONG refs; hr = CoCreateInstance( &CLSID_WbemLocator, NULL, CLSCTX_INPROC_SERVER, &IID_IWbemLocator, (void **)&locator ); @@ -86,33 +85,6 @@ static void test_IClientSecurity(void) static void test_IWbemLocator(void) { - static const WCHAR path0W[] = {0}; - static const WCHAR path1W[] = {'\\',0}; - static const WCHAR path2W[] = {'\\','\\',0}; - static const WCHAR path3W[] = {'\\','\\','.',0}; - static const WCHAR path4W[] = {'\\','\\','.','\\',0}; - static const WCHAR path5W[] = {'\\','R','O','O','T',0}; - static const WCHAR path6W[] = {'\\','\\','R','O','O','T',0}; - static const WCHAR path7W[] = {'\\','\\','.','R','O','O','T',0}; - static const WCHAR path8W[] = {'\\','\\','.','\\','N','O','N','E',0}; - static const WCHAR path9W[] = {'\\','\\','.','\\','R','O','O','T',0}; - static const WCHAR path10W[] = {'\\','\\','\\','.','\\','R','O','O','T',0}; - static const WCHAR path11W[] = {'\\','/','.','\\','R','O','O','T',0}; - static const WCHAR path12W[] = {'/','/','.','\\','R','O','O','T',0}; - static const WCHAR path13W[] = {'\\','\\','.','/','R','O','O','T',0}; - static const WCHAR path14W[] = {'/','/','.','/','R','O','O','T',0}; - static const WCHAR path15W[] = {'N','O','N','E',0}; - static const WCHAR path16W[] = {'R','O','O','T',0}; - static const WCHAR path17W[] = {'R','O','O','T','\\','N','O','N','E',0}; - static const WCHAR path18W[] = {'R','O','O','T','\\','C','I','M','V','2',0}; - static const WCHAR path19W[] = {'R','O','O','T','\\','\\','C','I','M','V','2',0}; - static const WCHAR path20W[] = {'R','O','O','T','\\','C','I','M','V','2','\\',0}; - static const WCHAR path21W[] = {'R','O','O','T','/','C','I','M','V','2',0}; - static const WCHAR path22W[] = {'r','o','o','t','\\','d','e','f','a','u','l','t',0}; - static const WCHAR path23W[] = {'r','o','o','t','\\','c','i','m','v','0',0}; - static const WCHAR path24W[] = {'r','o','o','t','\\','c','i','m','v','1',0}; - static const WCHAR path25W[] = {'\\','\\','l','o','c','a','l','h','o','s','t','\\','R','O','O','T',0}; - static const WCHAR path26W[] = {'\\','\\','L','O','C','A','L','H','O','S','T','\\','R','O','O','T',0}; static const struct { const WCHAR *path; @@ -122,33 +94,33 @@ static void test_IWbemLocator(void) } test[] = { - { path0W, WBEM_E_INVALID_NAMESPACE }, - { path1W, WBEM_E_INVALID_NAMESPACE }, - { path2W, WBEM_E_INVALID_NAMESPACE }, - { path3W, WBEM_E_INVALID_NAMESPACE }, - { path4W, WBEM_E_INVALID_NAMESPACE, FALSE, WBEM_E_INVALID_PARAMETER }, - { path5W, WBEM_E_INVALID_NAMESPACE }, - { path6W, 0x800706ba, TRUE }, - { path7W, 0x800706ba, TRUE }, - { path8W, WBEM_E_INVALID_NAMESPACE }, - { path9W, S_OK }, - { path10W, WBEM_E_INVALID_PARAMETER }, - { path11W, S_OK, FALSE, WBEM_E_INVALID_PARAMETER }, - { path12W, S_OK }, - { path13W, S_OK }, - { path14W, S_OK }, - { path15W, WBEM_E_INVALID_NAMESPACE }, - { path16W, S_OK }, - { path17W, WBEM_E_INVALID_NAMESPACE }, - { path18W, S_OK }, - { path19W, WBEM_E_INVALID_NAMESPACE, FALSE, WBEM_E_INVALID_PARAMETER }, - { path20W, WBEM_E_INVALID_NAMESPACE, FALSE, WBEM_E_INVALID_PARAMETER }, - { path21W, S_OK }, - { path22W, S_OK }, - { path23W, WBEM_E_INVALID_NAMESPACE }, - { path24W, WBEM_E_INVALID_NAMESPACE }, - { path25W, S_OK }, - { path26W, S_OK } + { L"", WBEM_E_INVALID_NAMESPACE }, + { L"\\", WBEM_E_INVALID_NAMESPACE }, + { L"\\\\", WBEM_E_INVALID_NAMESPACE }, + { L"\\\\.", WBEM_E_INVALID_NAMESPACE }, + { L"\\\\.\\", WBEM_E_INVALID_NAMESPACE, FALSE, WBEM_E_INVALID_PARAMETER }, + { L"\\ROOT", WBEM_E_INVALID_NAMESPACE }, + { L"\\\\ROOT", 0x800706ba, TRUE }, + { L"\\\\.ROOT", 0x800706ba, TRUE }, + { L"\\\\.\\NONE", WBEM_E_INVALID_NAMESPACE }, + { L"\\\\.\\ROOT", S_OK }, + { L"\\\\\\.\\ROOT", WBEM_E_INVALID_PARAMETER }, + { L"\\/.\\ROOT", S_OK, FALSE, WBEM_E_INVALID_PARAMETER }, + { L"//.\\ROOT", S_OK }, + { L"\\\\./ROOT", S_OK }, + { L"//./ROOT", S_OK }, + { L"NONE", WBEM_E_INVALID_NAMESPACE }, + { L"ROOT", S_OK }, + { L"ROOT\\NONE", WBEM_E_INVALID_NAMESPACE }, + { L"ROOT\\CIMV2", S_OK }, + { L"ROOT\\\\CIMV2", WBEM_E_INVALID_NAMESPACE, FALSE, WBEM_E_INVALID_PARAMETER }, + { L"ROOT\\CIMV2\\", WBEM_E_INVALID_NAMESPACE, FALSE, WBEM_E_INVALID_PARAMETER }, + { L"ROOT/CIMV2", S_OK }, + { L"root\\default", S_OK }, + { L"root\\cimv0", WBEM_E_INVALID_NAMESPACE }, + { L"root\\cimv1", WBEM_E_INVALID_NAMESPACE }, + { L"\\\\localhost\\ROOT", S_OK }, + { L"\\\\LOCALHOST\\ROOT", S_OK } }; IWbemLocator *locator; IWbemServices *services; -- 2.20.1

1 0

[PATCH 2/3] wbemprox: Implement Win32_DesktopMonitor.Name.
by Hans Leidekker 25 Feb '20

25 Feb '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48646 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wbemprox/builtin.c | 3 +++ dlls/wbemprox/tests/query.c | 27 +++++++++++++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index f422e9c61d..06c9d722aa 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -557,6 +557,7 @@ static const struct column col_datafile[] = }; static const struct column col_desktopmonitor[] = { + { prop_nameW, CIM_STRING }, { prop_pixelsperxlogicalinchW, CIM_UINT32 } }; static const struct column col_directory[] = @@ -1041,6 +1042,7 @@ struct record_datafile }; struct record_desktopmonitor { + const WCHAR *name; UINT32 pixelsperxlogicalinch; }; struct record_directory @@ -2490,6 +2492,7 @@ static enum fill_status fill_desktopmonitor( struct table *table, const struct e if (!resize_table( table, 1, sizeof(*rec) )) return FILL_STATUS_FAILED; rec = (struct record_desktopmonitor *)table->data; + rec->name = L"Generic Non-PnP Monitor"; rec->pixelsperxlogicalinch = get_pixelsperxlogicalinch(); if (match_row( table, row, cond, &status )) row++; diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 97f8dca561..02e4f564e7 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1712,6 +1712,32 @@ static void test_Win32_WinSAT( IWbemServices *services ) SysFreeString( wql ); } +static void test_Win32_DesktopMonitor( IWbemServices *services ) +{ + BSTR wql = SysAllocString( wqlW ), query = SysAllocString( L"SELECT * FROM Win32_DesktopMonitor" ); + IEnumWbemClassObject *result; + IWbemClassObject *obj; + HRESULT hr; + DWORD count; + + hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); + ok( hr == S_OK, "got %08x\n", hr ); + + for (;;) + { + hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); + if (hr != S_OK) break; + + check_property( obj, L"Name", VT_BSTR, CIM_STRING ); + check_property( obj, L"PixelsPerXlogicalInch", VT_I4, CIM_UINT32 ); + IWbemClassObject_Release( obj ); + } + + IEnumWbemClassObject_Release( result ); + SysFreeString( query ); + SysFreeString( wql ); +} + static void test_Win32_DisplayControllerConfiguration( IWbemServices *services ) { static const WCHAR bitsperpixelW[] = @@ -1837,6 +1863,7 @@ START_TEST(query) test_Win32_ComputerSystem( services ); test_Win32_ComputerSystemProduct( services ); test_Win32_Bios( services ); + test_Win32_DesktopMonitor( services ); test_Win32_DisplayControllerConfiguration( services ); test_Win32_IP4RouteTable( services ); test_Win32_OperatingSystem( services ); -- 2.20.1

1 0

[PATCH 1/3] wbemprox: Implement Win32_PhysicalMemory.FormFactor.
by Hans Leidekker 25 Feb '20

25 Feb '20

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wbemprox/builtin.c | 5 +++++ dlls/wbemprox/tests/query.c | 2 ++ 2 files changed, 7 insertions(+) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index bfe913a32a..f422e9c61d 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -264,6 +264,8 @@ static const WCHAR prop_filesystemW[] = {'F','i','l','e','S','y','s','t','e','m',0}; static const WCHAR prop_flavorW[] = {'F','l','a','v','o','r',0}; +static const WCHAR prop_formfactorW[] = + {'F','o','r','m','F','a','c','t','o','r',0}; static const WCHAR prop_freespaceW[] = {'F','r','e','e','S','p','a','c','e',0}; static const WCHAR prop_freephysicalmemoryW[] = @@ -703,6 +705,7 @@ static const struct column col_physicalmemory[] = { prop_capacityW, CIM_UINT64 }, { prop_configuredclockspeedW, CIM_UINT32 }, { prop_devicelocatorW, CIM_STRING }, + { prop_formfactorW, CIM_UINT16 }, { prop_memorytypeW, CIM_UINT16 }, { prop_partnumberW, CIM_STRING } }; @@ -1186,6 +1189,7 @@ struct record_physicalmemory UINT64 capacity; UINT32 configuredclockspeed; const WCHAR *devicelocator; + UINT16 formfactor; UINT16 memorytype; const WCHAR *partnumber; }; @@ -3438,6 +3442,7 @@ static enum fill_status fill_physicalmemory( struct table *table, const struct e rec->capacity = get_total_physical_memory(); rec->configuredclockspeed = 0; rec->devicelocator = dimm0W; + rec->formfactor = 8; /* DIMM */ rec->memorytype = 9; /* RAM */ rec->partnumber = NULL; if (!match_row( table, row, cond, &status )) free_row_values( table, row ); diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 40eaefee4c..97f8dca561 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1338,6 +1338,7 @@ static void test_Win32_PhysicalMemory( IWbemServices *services ) { static const WCHAR capacityW[] = {'C','a','p','a','c','i','t','y',0}; static const WCHAR memorytypeW[] = {'M','e','m','o','r','y','T','y','p','e',0}; + static const WCHAR formfactorW[] = {'F','o','r','m','F','a','c','t','o','r',0}; static const WCHAR devicelocatorW[] = {'D','e','v','i','c','e','L','o','c','a','t','o','r',0}; static const WCHAR queryW[] = {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_', @@ -1362,6 +1363,7 @@ static void test_Win32_PhysicalMemory( IWbemServices *services ) { check_property( obj, capacityW, VT_BSTR, CIM_UINT64 ); check_property( obj, devicelocatorW, VT_BSTR, CIM_STRING ); + check_property( obj, formfactorW, VT_I4, CIM_UINT16 ); check_property( obj, memorytypeW, VT_I4, CIM_UINT16 ); IWbemClassObject_Release( obj ); } -- 2.20.1

1 0

[PATCH] wbemprox: Add embedded controller and system BIOS release numbers to Win32_BIOS.
by Brendan Shanks 25 Feb '20

25 Feb '20

Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- dlls/wbemprox/builtin.c | 73 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index c680ae23c3..bfe913a32a 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -254,6 +254,10 @@ static const WCHAR prop_driverversionW[] = {'D','r','i','v','e','r','V','e','r','s','i','o','n',0}; static const WCHAR prop_drivetypeW[] = {'D','r','i','v','e','T','y','p','e',0}; +static const WCHAR prop_embeddedcontrollermajorversionW[] = + {'E','m','b','e','d','d','e','d','C','o','n','t','r','o','l','l','e','r','M','a','j','o','r','V','e','r','s','i','o','n',0}; +static const WCHAR prop_embeddedcontrollerminorversionW[] = + {'E','m','b','e','d','d','e','d','C','o','n','t','r','o','l','l','e','r','M','i','n','o','r','V','e','r','s','i','o','n',0}; static const WCHAR prop_familyW[] = {'F','a','m','i','l','y',0}; static const WCHAR prop_filesystemW[] = @@ -424,6 +428,10 @@ static const WCHAR prop_strvalueW[] = {'S','t','r','i','n','g','V','a','l','u','e',0}; static const WCHAR prop_suitemaskW[] = {'S','u','i','t','e','M','a','s','k',0}; +static const WCHAR prop_systembiosmajorversionW[] = + {'S','y','s','t','e','m','B','i','o','s','M','a','j','o','r','V','e','r','s','i','o','n',0}; +static const WCHAR prop_systembiosminorversionW[] = + {'S','y','s','t','e','m','B','i','o','s','M','i','n','o','r','V','e','r','s','i','o','n',0}; static const WCHAR prop_systemdirectoryW[] = {'S','y','s','t','e','m','D','i','r','e','c','t','o','r','y',0}; static const WCHAR prop_systemdriveW[] = @@ -496,6 +504,8 @@ static const struct column col_bios[] = { { prop_currentlanguageW, CIM_STRING }, { prop_descriptionW, CIM_STRING }, + { prop_embeddedcontrollermajorversionW, CIM_UINT8 }, + { prop_embeddedcontrollerminorversionW, CIM_UINT8 }, { prop_identificationcodeW, CIM_STRING }, { prop_manufacturerW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_nameW, CIM_STRING }, @@ -504,6 +514,8 @@ static const struct column col_bios[] = { prop_smbiosbiosversionW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_smbiosmajorversionW, CIM_UINT16 }, { prop_smbiosminorversionW, CIM_UINT16 }, + { prop_systembiosmajorversionW, CIM_UINT8 }, + { prop_systembiosminorversionW, CIM_UINT8 }, { prop_versionW, CIM_STRING|COL_FLAG_KEY } }; static const struct column col_cdromdrive[] = @@ -975,6 +987,8 @@ struct record_bios { const WCHAR *currentlanguage; const WCHAR *description; + UINT8 ecmajorversion; + UINT8 ecminorversion; const WCHAR *identificationcode; const WCHAR *manufacturer; const WCHAR *name; @@ -983,6 +997,8 @@ struct record_bios const WCHAR *smbiosbiosversion; UINT16 smbiosmajorversion; UINT16 smbiosminorversion; + UINT8 systembiosmajorversion; + UINT8 systembiosminorversion; const WCHAR *version; }; struct record_cdromdrive @@ -1495,6 +1511,11 @@ struct smbios_bios BYTE date; BYTE size; UINT64 characteristics; + BYTE characteristics_ext[2]; + BYTE system_bios_major_release; + BYTE system_bios_minor_release; + BYTE ec_firmware_major_release; + BYTE ec_firmware_minor_release; }; struct smbios_chassis @@ -1729,6 +1750,54 @@ static WCHAR *get_bios_smbiosbiosversion( const char *buf, UINT len ) return ret; } +static BYTE get_bios_ec_firmware_major_release( const char *buf, UINT len ) +{ + const struct smbios_header *hdr; + const struct smbios_bios *bios; + + if (!(hdr = find_smbios_entry( SMBIOS_TYPE_BIOS, buf, len ))) return 0xFF; + + bios = (const struct smbios_bios *)hdr; + if (bios->hdr.length >= 0x18) return bios->ec_firmware_major_release; + else return 0xFF; +} + +static BYTE get_bios_ec_firmware_minor_release( const char *buf, UINT len ) +{ + const struct smbios_header *hdr; + const struct smbios_bios *bios; + + if (!(hdr = find_smbios_entry( SMBIOS_TYPE_BIOS, buf, len ))) return 0xFF; + + bios = (const struct smbios_bios *)hdr; + if (bios->hdr.length >= 0x18) return bios->ec_firmware_minor_release; + else return 0xFF; +} + +static BYTE get_bios_system_bios_major_release( const char *buf, UINT len ) +{ + const struct smbios_header *hdr; + const struct smbios_bios *bios; + + if (!(hdr = find_smbios_entry( SMBIOS_TYPE_BIOS, buf, len ))) return 0xFF; + + bios = (const struct smbios_bios *)hdr; + if (bios->hdr.length >= 0x18) return bios->system_bios_major_release; + else return 0xFF; +} + +static BYTE get_bios_system_bios_minor_release( const char *buf, UINT len ) +{ + const struct smbios_header *hdr; + const struct smbios_bios *bios; + + if (!(hdr = find_smbios_entry( SMBIOS_TYPE_BIOS, buf, len ))) return 0xFF; + + bios = (const struct smbios_bios *)hdr; + if (bios->hdr.length >= 0x18) return bios->system_bios_minor_release; + else return 0xFF; +} + static enum fill_status fill_bios( struct table *table, const struct expr *cond ) { struct record_bios *rec; @@ -1745,6 +1814,8 @@ static enum fill_status fill_bios( struct table *table, const struct expr *cond rec = (struct record_bios *)table->data; rec->currentlanguage = NULL; rec->description = bios_descriptionW; + rec->ecmajorversion = get_bios_ec_firmware_major_release( buf, len ); + rec->ecminorversion = get_bios_ec_firmware_minor_release( buf, len ); rec->identificationcode = NULL; rec->manufacturer = get_bios_manufacturer( buf, len ); rec->name = bios_descriptionW; @@ -1753,6 +1824,8 @@ static enum fill_status fill_bios( struct table *table, const struct expr *cond rec->smbiosbiosversion = get_bios_smbiosbiosversion( buf, len ); rec->smbiosmajorversion = get_bios_smbiosmajorversion( buf, len ); rec->smbiosminorversion = get_bios_smbiosminorversion( buf, len ); + rec->systembiosmajorversion = get_bios_system_bios_major_release( buf, len ); + rec->systembiosminorversion = get_bios_system_bios_minor_release( buf, len ); rec->version = bios_versionW; if (!match_row( table, row, cond, &status )) free_row_values( table, row ); else row++; -- 2.24.1

2 1

[PATCH 4/4] corecrt_wstdio.h: Add ucrt wscanf and wscanf_s declarations.
by Jacek Caban 25 Feb '20

25 Feb '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/msvcrt/corecrt_wstdio.h | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-)

1 0

[PATCH 3/4] corecrt_wstdio.h: Add ucrt wprintf_s and vwprintf_s declarations.
by Jacek Caban 25 Feb '20

25 Feb '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/msvcrt/corecrt_wstdio.h | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-)

1 0

[PATCH 2/4] corecrt_wstdio.h: Add ucrt wprintf and vwprintf declarations.
by Jacek Caban 25 Feb '20

25 Feb '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/msvcrt/corecrt_wstdio.h | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-)

1 0

[PATCH 1/4] corecrt_wstdio.h: Add ucrt swscanf and swscanf_s declarations.
by Jacek Caban 25 Feb '20

25 Feb '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/msvcrt/corecrt_wstdio.h | 31 +++++++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-)

1 0

[PATCH] wintrust: Set last error in WinVerifyTrust.
by Daniel Lehman 25 Feb '20

25 Feb '20

From: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> --- dlls/wintrust/tests/softpub.c | 10 ++++++++++ dlls/wintrust/wintrust_main.c | 1 + 2 files changed, 11 insertions(+) diff --git a/dlls/wintrust/tests/softpub.c b/dlls/wintrust/tests/softpub.c index 5a150e684d..25d458faad 100644 --- a/dlls/wintrust/tests/softpub.c +++ b/dlls/wintrust/tests/softpub.c @@ -845,7 +845,9 @@ static void test_wintrust(void) file.pcwszFilePath = pathW; /* Test with an empty file */ file.hFile = create_temp_file(pathW); + SetLastError(0xdeadbeef); r = WinVerifyTrust(INVALID_HANDLE_VALUE, &generic_action_v2, &wtd); + ok(r == GetLastError(), "expected %08x, got %08x\n", GetLastError(), r); ok(r == TRUST_E_SUBJECT_FORM_UNKNOWN, "expected TRUST_E_SUBJECT_FORM_UNKNOWN, got %08x\n", r); CloseHandle(file.hFile); @@ -853,18 +855,26 @@ static void test_wintrust(void) file.hFile = NULL; /* Test with a known file path, which we expect not have a signature */ getNotepadPath(pathW, MAX_PATH); + SetLastError(0xdeadbeef); r = WinVerifyTrust(INVALID_HANDLE_VALUE, &generic_action_v2, &wtd); + ok(r == GetLastError(), "expected %08x, got %08x\n", GetLastError(), r); ok(r == TRUST_E_NOSIGNATURE || r == CRYPT_E_FILE_ERROR, "expected TRUST_E_NOSIGNATURE or CRYPT_E_FILE_ERROR, got %08x\n", r); wtd.dwStateAction = WTD_STATEACTION_CLOSE; + SetLastError(0xdeadbeef); r = WinVerifyTrust(INVALID_HANDLE_VALUE, &generic_action_v2, &wtd); + ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %08x\n", GetLastError()); ok(r == S_OK, "WinVerifyTrust failed: %08x\n", r); wtd.dwStateAction = WTD_STATEACTION_VERIFY; + SetLastError(0xdeadbeef); hr = WinVerifyTrustEx(INVALID_HANDLE_VALUE, &generic_action_v2, &wtd); + ok(hr == GetLastError(), "expected %08x, got %08x\n", GetLastError(), hr); ok(hr == TRUST_E_NOSIGNATURE || hr == CRYPT_E_FILE_ERROR, "expected TRUST_E_NOSIGNATURE or CRYPT_E_FILE_ERROR, got %08x\n", hr); wtd.dwStateAction = WTD_STATEACTION_CLOSE; + SetLastError(0xdeadbeef); r = WinVerifyTrust(INVALID_HANDLE_VALUE, &generic_action_v2, &wtd); + ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %08x\n", GetLastError()); ok(r == S_OK, "WinVerifyTrust failed: %08x\n", r); } diff --git a/dlls/wintrust/wintrust_main.c b/dlls/wintrust/wintrust_main.c index a0b8a137ed..768522ea4a 100644 --- a/dlls/wintrust/wintrust_main.c +++ b/dlls/wintrust/wintrust_main.c @@ -732,6 +732,7 @@ LONG WINAPI WinVerifyTrust( HWND hwnd, GUID *ActionID, LPVOID ActionData ) } } + if (err) SetLastError(err); TRACE("returning %08x\n", err); return err; } -- 2.17.1

1 0

[PATCH 1/4] mp3dmod: Implement IMediaObject::GetOutputType().
by Zebediah Figura 25 Feb '20

25 Feb '20

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/mp3dmod/Makefile.in | 2 +- dlls/mp3dmod/mp3dmod.c | 32 +++++++++++++++- dlls/mp3dmod/tests/Makefile.in | 2 +- dlls/mp3dmod/tests/mp3dmod.c | 69 +++++++++++++++++++++++++++++++++- 4 files changed, 100 insertions(+), 5 deletions(-) diff --git a/dlls/mp3dmod/Makefile.in b/dlls/mp3dmod/Makefile.in index 0ac6d9680bc..56a5ef38eb5 100644 --- a/dlls/mp3dmod/Makefile.in +++ b/dlls/mp3dmod/Makefile.in @@ -1,5 +1,5 @@ MODULE = mp3dmod.dll -IMPORTS = dmoguids msdmo uuid wmcodecdspuuid +IMPORTS = dmoguids msdmo ole32 uuid wmcodecdspuuid EXTRAINCL = $(MPG123_CFLAGS) EXTRALIBS = $(MPG123_LIBS) diff --git a/dlls/mp3dmod/mp3dmod.c b/dlls/mp3dmod/mp3dmod.c index 50b6803ff81..c89f32e9ed6 100644 --- a/dlls/mp3dmod/mp3dmod.c +++ b/dlls/mp3dmod/mp3dmod.c @@ -187,9 +187,37 @@ static HRESULT WINAPI MediaObject_GetInputType(IMediaObject *iface, DWORD index, static HRESULT WINAPI MediaObject_GetOutputType(IMediaObject *iface, DWORD index, DWORD type_index, DMO_MEDIA_TYPE *type) { - FIXME("(%p)->(%d, %d, %p) stub!\n", iface, index, type_index, type); + struct mp3_decoder *dmo = impl_from_IMediaObject(iface); + const WAVEFORMATEX *input_format; + WAVEFORMATEX *format; - return E_NOTIMPL; + TRACE("iface %p, index %u, type_index %u, type %p.\n", iface, index, type_index, type); + + if (!dmo->intype_set) + return DMO_E_TYPE_NOT_SET; + + input_format = (WAVEFORMATEX *)dmo->intype.pbFormat; + + if (type_index >= (2 * input_format->nChannels)) + return DMO_E_NO_MORE_ITEMS; + + type->majortype = WMMEDIATYPE_Audio; + type->subtype = WMMEDIASUBTYPE_PCM; + type->formattype = WMFORMAT_WaveFormatEx; + type->pUnk = NULL; + type->cbFormat = sizeof(WAVEFORMATEX); + if (!(type->pbFormat = CoTaskMemAlloc(sizeof(WAVEFORMATEX)))) + return E_OUTOFMEMORY; + format = (WAVEFORMATEX *)type->pbFormat; + format->wFormatTag = WAVE_FORMAT_PCM; + format->nSamplesPerSec = input_format->nSamplesPerSec; + format->nChannels = (type_index / 2) ? 1 : input_format->nChannels; + format->wBitsPerSample = (type_index % 2) ? 8 : 16; + format->nBlockAlign = format->nChannels * format->wBitsPerSample / 8; + format->nAvgBytesPerSec = format->nSamplesPerSec * format->nBlockAlign; + format->cbSize = 0; + + return S_OK; } static HRESULT WINAPI MediaObject_SetInputType(IMediaObject *iface, DWORD index, const DMO_MEDIA_TYPE *type, DWORD flags) diff --git a/dlls/mp3dmod/tests/Makefile.in b/dlls/mp3dmod/tests/Makefile.in index 3cbe4feb018..f5d54e48533 100644 --- a/dlls/mp3dmod/tests/Makefile.in +++ b/dlls/mp3dmod/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = mp3dmod.dll -IMPORTS = dmoguids ole32 strmiids uuid wmcodecdspuuid +IMPORTS = dmoguids msdmo ole32 strmiids uuid wmcodecdspuuid C_SRCS = \ mp3dmod.c diff --git a/dlls/mp3dmod/tests/mp3dmod.c b/dlls/mp3dmod/tests/mp3dmod.c index dcf0820afb1..1e410861eed 100644 --- a/dlls/mp3dmod/tests/mp3dmod.c +++ b/dlls/mp3dmod/tests/mp3dmod.c @@ -21,7 +21,7 @@ #include "wingdi.h" #include "mmreg.h" #include "mmsystem.h" -#include "mediaerr.h" +#include "dmo.h" #include "wmcodecdsp.h" #include "uuids.h" #include "wine/test.h" @@ -330,9 +330,16 @@ static void test_media_types(void) .pbFormat = (BYTE *)&mp3fmt, }; + WAVEFORMATEX expect_wfx = + { + .wFormatTag = WAVE_FORMAT_PCM, + .nSamplesPerSec = 48000, + }; + DMO_MEDIA_TYPE mt; IMediaObject *dmo; HRESULT hr; + DWORD i; hr = CoCreateInstance(&CLSID_CMP3DecMediaObject, NULL, CLSCTX_INPROC_SERVER, &IID_IMediaObject, (void **)&dmo); @@ -355,6 +362,10 @@ static void test_media_types(void) hr = IMediaObject_GetInputType(dmo, 0, 1, &mt); ok(hr == DMO_E_NO_MORE_ITEMS, "Got hr %#x.\n", hr); + memset(&mt, 0xcc, sizeof(DMO_MEDIA_TYPE)); + hr = IMediaObject_GetOutputType(dmo, 0, 0, &mt); + ok(hr == DMO_E_TYPE_NOT_SET, "Got hr %#x.\n", hr); + hr = IMediaObject_SetInputType(dmo, 0, &input_mt, DMO_SET_TYPEF_TEST_ONLY); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -385,10 +396,66 @@ static void test_media_types(void) hr = IMediaObject_SetInputType(dmo, 0, &input_mt, 0); ok(hr == S_OK, "Got hr %#x.\n", hr); + for (i = 0; i < 4; ++i) + { + memset(&mt, 0xcc, sizeof(DMO_MEDIA_TYPE)); + hr = IMediaObject_GetOutputType(dmo, 0, i, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(IsEqualGUID(&mt.majortype, &MEDIATYPE_Audio), "Got major type %s.\n", wine_dbgstr_guid(&mt.majortype)); + ok(IsEqualGUID(&mt.subtype, &MEDIASUBTYPE_PCM), "Got subtype %s.\n", wine_dbgstr_guid(&mt.subtype)); + ok(mt.bFixedSizeSamples == 0xcccccccc, "Got fixed size %d.\n", mt.bFixedSizeSamples); + ok(mt.bTemporalCompression == 0xcccccccc, "Got temporal compression %d.\n", mt.bTemporalCompression); + ok(mt.lSampleSize == 0xcccccccc, "Got sample size %u.\n", mt.lSampleSize); + ok(IsEqualGUID(&mt.formattype, &FORMAT_WaveFormatEx), "Got format type %s.\n", + wine_dbgstr_guid(&mt.formattype)); + ok(!mt.pUnk, "Got pUnk %p.\n", mt.pUnk); + ok(mt.cbFormat >= sizeof(WAVEFORMATEX), "Got format size %u.\n", mt.cbFormat); + ok(!!mt.pbFormat, "Got format block %p.\n", mt.pbFormat); + + expect_wfx.nChannels = (i / 2) ? 1 : 2; + expect_wfx.wBitsPerSample = (i % 2) ? 8 : 16; + expect_wfx.nBlockAlign = expect_wfx.nChannels * expect_wfx.wBitsPerSample / 8; + expect_wfx.nAvgBytesPerSec = 48000 * expect_wfx.nBlockAlign; + ok(!memcmp(mt.pbFormat, &expect_wfx, sizeof(WAVEFORMATEX)), "Format blocks didn't match.\n"); + + MoFreeMediaType(&mt); + } + + hr = IMediaObject_GetOutputType(dmo, 0, 4, &mt); + ok(hr == DMO_E_NO_MORE_ITEMS, "Got hr %#x.\n", hr); + mp3fmt.wfx.nChannels = 1; hr = IMediaObject_SetInputType(dmo, 0, &input_mt, 0); ok(hr == S_OK, "Got hr %#x.\n", hr); + for (i = 0; i < 2; ++i) + { + memset(&mt, 0xcc, sizeof(DMO_MEDIA_TYPE)); + hr = IMediaObject_GetOutputType(dmo, 0, i, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(IsEqualGUID(&mt.majortype, &MEDIATYPE_Audio), "Got major type %s.\n", wine_dbgstr_guid(&mt.majortype)); + ok(IsEqualGUID(&mt.subtype, &MEDIASUBTYPE_PCM), "Got subtype %s.\n", wine_dbgstr_guid(&mt.subtype)); + ok(mt.bFixedSizeSamples == 0xcccccccc, "Got fixed size %d.\n", mt.bFixedSizeSamples); + ok(mt.bTemporalCompression == 0xcccccccc, "Got temporal compression %d.\n", mt.bTemporalCompression); + ok(mt.lSampleSize == 0xcccccccc, "Got sample size %u.\n", mt.lSampleSize); + ok(IsEqualGUID(&mt.formattype, &FORMAT_WaveFormatEx), "Got format type %s.\n", + wine_dbgstr_guid(&mt.formattype)); + ok(!mt.pUnk, "Got pUnk %p.\n", mt.pUnk); + ok(mt.cbFormat >= sizeof(WAVEFORMATEX), "Got format size %u.\n", mt.cbFormat); + ok(!!mt.pbFormat, "Got format block %p.\n", mt.pbFormat); + + expect_wfx.nChannels = 1; + expect_wfx.wBitsPerSample = (i % 2) ? 8 : 16; + expect_wfx.nBlockAlign = expect_wfx.nChannels * expect_wfx.wBitsPerSample / 8; + expect_wfx.nAvgBytesPerSec = 48000 * expect_wfx.nBlockAlign; + ok(!memcmp(mt.pbFormat, &expect_wfx, sizeof(WAVEFORMATEX)), "Format blocks didn't match.\n"); + + MoFreeMediaType(&mt); + } + + hr = IMediaObject_GetOutputType(dmo, 0, 2, &mt); + ok(hr == DMO_E_NO_MORE_ITEMS, "Got hr %#x.\n", hr); + IMediaObject_Release(dmo); } -- 2.25.0

1 3

[PATCH] tzres: Add Aleutian Time Zone.
by Daniel Lehman 25 Feb '20

25 Feb '20

Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> --- using time zone name from: https://github.com/unicode-org/cldr/blob/master/common/supplemental/windows… using information from: https://github.com/eggert/tz/blob/master/northamerica https://www.timeanddate.com/time/zone/usa/adak --- dlls/tzres/tzres.rc | 2 ++ loader/wine.inf.in | 10 ++++++++++ 2 files changed, 12 insertions(+) diff --git a/dlls/tzres/tzres.rc b/dlls/tzres/tzres.rc index 65b8283570..975590c998 100644 --- a/dlls/tzres/tzres.rc +++ b/dlls/tzres/tzres.rc @@ -30,6 +30,8 @@ STRINGTABLE 39617 "Afghanistan Daylight Time" 50192 "Alaskan Standard Time" 50193 "Alaskan Daylight Time" + 55200 "Aleutian Standard Time" + 55201 "Aleutian Daylight Time" 41968 "Arab Standard Time" 41969 "Arab Daylight Time" 42704 "Arabian Standard Time" diff --git a/loader/wine.inf.in b/loader/wine.inf.in index f83309a951..bca478e6d7 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2814,6 +2814,16 @@ HKLM,%CurrentVersionNT%\Time Zones\Alaskan Standard Time\Dynamic DST,"2006",1,1c HKLM,%CurrentVersionNT%\Time Zones\Alaskan Standard Time\Dynamic DST,"2007",1,1c,02,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Alaskan Standard Time\Dynamic DST,"FirstEntry",0x10001,"2006" HKLM,%CurrentVersionNT%\Time Zones\Alaskan Standard Time\Dynamic DST,"LastEntry",0x10001,"2007" +HKLM,%CurrentVersionNT%\Time Zones\Aleutian Standard Time,"Display",,"America/Adak" +HKLM,%CurrentVersionNT%\Time Zones\Aleutian Standard Time,"Dlt",,"Aleutian Daylight Time" +HKLM,%CurrentVersionNT%\Time Zones\Aleutian Standard Time,"MUI_Dlt",,"@tzres.dll,-55201" +HKLM,%CurrentVersionNT%\Time Zones\Aleutian Standard Time,"MUI_Std",,"@tzres.dll,-55200" +HKLM,%CurrentVersionNT%\Time Zones\Aleutian Standard Time,"Std",,"Aleutian Standard Time" +HKLM,%CurrentVersionNT%\Time Zones\Aleutian Standard Time,"TZI",1,58,02,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Aleutian Standard Time\Dynamic DST,"2006",1,58,02,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Aleutian Standard Time\Dynamic DST,"2007",1,58,02,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Aleutian Standard Time\Dynamic DST,"FirstEntry",0x10001,"2006" +HKLM,%CurrentVersionNT%\Time Zones\Aleutian Standard Time\Dynamic DST,"LastEntry",0x10001,"2007" HKLM,%CurrentVersionNT%\Time Zones\Arab Standard Time,"Display",,"Asia/Riyadh" HKLM,%CurrentVersionNT%\Time Zones\Arab Standard Time,"Dlt",,"Arab Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Arab Standard Time,"MUI_Dlt",,"@tzres.dll,-41969" -- 2.17.1

1 0

[tools] testbot: Share the patch subject parsing code.
by Francois Gouget 24 Feb '20

24 Feb '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48353 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Patches.pm | 73 ++++++++++++--------- testbot/lib/WineTestBot/PendingPatchSets.pm | 24 +++---- 2 files changed, 50 insertions(+), 47 deletions(-) diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index 6af51d7655..2b52f4baff 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -110,6 +110,31 @@ sub FromSubmission($$) $self->Disposition("Processing"); } +sub ParseSubject($) +{ + my ($self) = @_; + + my $Title = $self->Subject; + $Title =~ s/32\/64//; + $Title =~ s/64\/32//; + + my $SubjectInfo; + if ($Title =~ s~[[$](\d+)/(\d+)[]$]~~ or + $Title =~ s~\b(\d+)/(\d+)\b~~) + { + $SubjectInfo->{PartNo} = int($1); + $SubjectInfo->{MaxPartNo} = int($2); + } + + $Title =~ s/\[PATCH[^]]*\]//i; + $Title =~ s/\s+/ /g; + $Title =~ s/^\s//; + $Title =~ s/\s$//; + $SubjectInfo->{Title} = $Title; + + return $SubjectInfo; +} + =pod =over 12 @@ -129,22 +154,23 @@ WineTestBot::PendingPatchSet::SubmitSubset(). =back =cut -sub Submit($$$) +sub Submit($$;$) { - my ($self, $PatchFileName, $IsSet) = @_; + my ($self, $PatchFileName, $SubjectInfo) = @_; + $SubjectInfo ||= $self->ParseSubject(); my $Impacts = GetPatchImpacts($PatchFileName); if (!$Impacts->{PatchedRoot} and !$Impacts->{PatchedModules} and !$Impacts->{PatchedTests}) { if ($Impacts->{IsWinePatch}) { - $self->Disposition(($IsSet ? "Part does" : "Does") + $self->Disposition(($SubjectInfo->{PartNo} ? "Part does" : "Does") ." not impact the Wine build"); } else { - $self->Disposition(($IsSet ? "Part is not" : "Not") ." a Wine patch"); + $self->Disposition(($SubjectInfo->{PartNo} ? "Part is not" : "Not") ." a Wine patch"); } return undef; } @@ -155,12 +181,8 @@ sub Submit($$$) my $Priority = 5; $NewJob->Priority($Priority); my $PropertyDescriptor = $Jobs->GetPropertyDescriptorByName("Remarks"); - my $Subject = $self->Subject; - $Subject =~ s/\[PATCH[^\]]*]//i; - $Subject =~ s/[[$]?\d+\/\d+[$\]]?//; - $Subject =~ s/^\s*//; - $NewJob->Remarks(substr("[$PatchesMailingList] " . $Subject, 0, - $PropertyDescriptor->GetMaxLength())); + my $Remarks = "[$PatchesMailingList] $SubjectInfo->{Title}"; + $NewJob->Remarks(substr($Remarks, 0, $PropertyDescriptor->GetMaxLength())); $NewJob->Patch($self); my $User; @@ -301,7 +323,7 @@ sub Submit($$$) } else { - $self->Disposition(($IsSet ? "Part does" : "Does") ." not impact the ". + $self->Disposition(($SubjectInfo->{PartNo} ? "Part does" : "Does") ." not impact the ". ($WineVMs->IsEmpty() ? "Windows " : "") ."tests"); } return undef; @@ -464,28 +486,15 @@ sub NewPatch($$$) my $ErrMessage; if (scalar(@PatchBodies) == 1) { - my $Subject = $Patch->Subject; - $Subject =~ s/32\/64//; - $Subject =~ s/64\/32//; - if ($Subject =~ m/\d+\/\d+/) - { - $Patch->Disposition("Checking series"); - (my $_ErrKey, my $_ErrProperty, $ErrMessage) = $self->Save(); - link($PatchBodies[0]->path, "$DataDir/patches/" . $Patch->Id); - if (! defined($ErrMessage)) - { - $ErrMessage = CreatePendingPatchSets()->NewSubmission($Patch); - } - } - else + my $SubjectInfo = $Patch->ParseSubject(); + $Patch->Disposition($SubjectInfo->{PartNo} ? "Checking series" : "Checking patch"); + (my $_ErrKey, my $_ErrProperty, $ErrMessage) = $self->Save(); + link($PatchBodies[0]->path, "$DataDir/patches/" . $Patch->Id); + if (!defined $ErrMessage) { - $Patch->Disposition("Checking patch"); - (my $_ErrKey, my $_ErrProperty, $ErrMessage) = $self->Save(); - link($PatchBodies[0]->path, "$DataDir/patches/" . $Patch->Id); - if (! defined($ErrMessage)) - { - $ErrMessage = $Patch->Submit($PatchBodies[0]->path, !1); - } + $ErrMessage = $SubjectInfo->{PartNo} ? + CreatePendingPatchSets()->NewSubmission($Patch, $SubjectInfo) : + $Patch->Submit($PatchBodies[0]->path, $SubjectInfo); } } elsif (scalar(@PatchBodies) == 0) diff --git a/testbot/lib/WineTestBot/PendingPatchSets.pm b/testbot/lib/WineTestBot/PendingPatchSets.pm index 53395130e7..adabf2e6c1 100644 --- a/testbot/lib/WineTestBot/PendingPatchSets.pm +++ b/testbot/lib/WineTestBot/PendingPatchSets.pm @@ -136,7 +136,7 @@ sub SubmitSubset($$$) if (!defined $ErrMessage) { - $ErrMessage = $FinalPatch->Submit($CombinedFileName, 1); + $ErrMessage = $FinalPatch->Submit($CombinedFileName); } unlink($CombinedFileName); @@ -224,36 +224,29 @@ makes the patchset complete, then the patchset itself is deleted. =back =cut -sub NewSubmission($$) +sub NewSubmission($$$) { - my ($self, $Patch) = @_; + my ($self, $Patch, $SubjectInfo) = @_; if (! defined($Patch->FromEMail)) { $Patch->Disposition("Unable to determine series author"); return undef; } - my $Subject = $Patch->Subject; - $Subject =~ s/32\/64//; - $Subject =~ s/64\/32//; - $Subject =~ m/(\d+)\/(\d+)/; - my $PartNo = int($1); - my $MaxPartNo = int($2); - - my $Set = $self->GetItem($self->CombineKey($Patch->FromEMail, $MaxPartNo)); + my $Set = $self->GetItem($self->CombineKey($Patch->FromEMail, $SubjectInfo->{MaxPartNo})); if (! defined($Set)) { $Set = $self->Add(); $Set->EMail($Patch->FromEMail); - $Set->TotalParts($MaxPartNo); + $Set->TotalParts($SubjectInfo->{MaxPartNo}); } my $Parts = $Set->Parts; - my $Part = $Parts->GetItem($PartNo); + my $Part = $Parts->GetItem($SubjectInfo->{PartNo}); if (! defined($Part)) { $Part = $Parts->Add(); - $Part->No($PartNo); + $Part->No($SubjectInfo->{PartNo}); } $Part->Patch($Patch); @@ -264,12 +257,13 @@ sub NewSubmission($$) $Patch->Disposition("Error occurred during series processing"); } - if (! $Set->CheckSubsetComplete($PartNo)) + if (! $Set->CheckSubsetComplete($SubjectInfo->{PartNo})) { $Patch->Disposition("Set not complete yet"); } else { + my $PartNo = $SubjectInfo->{PartNo}; my $AllPartsAvailable = 1; while ($PartNo <= $Set->TotalParts && $AllPartsAvailable && ! defined($ErrMessage)) -- 2.20.1

1 0

[tools] testbot/LogUtils: Defend against invalid .errors lines.
by Francois Gouget 24 Feb '20

24 Feb '20

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/LogUtils.pm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index e309753188..4cc8aaa413 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -855,7 +855,13 @@ sub LoadLogErrors($) $LineNo++; chomp $Line; my ($Type, $Property, $Value) = split / /, $Line, 3; - if ($Type eq "p") + if (!defined $Value) + { + $LogInfo->{BadLog} = "$LineNo: Found an invalid line"; + last; + } + # else $Type, $Property and $Value are all defined + elsif ($Type eq "p") { if (!defined $LogInfo->{$Property}) { -- 2.20.1

1 0

[tools] testbot: Use the three parameter open() form.
by Francois Gouget 24 Feb '20

24 Feb '20

This avoids potential issues if the filename starts with '<', '>', etc. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Patches.pm | 2 +- testbot/lib/WineTestBot/Tasks.pm | 2 +- testbot/web/OldSubmit.pl | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index 46b17e52a1..6af51d7655 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -404,7 +404,7 @@ sub IsPatch($$) { my ($self, $Body) = @_; - if (open(BODY, "<" . $Body->path)) + if (open(BODY, "<", $Body->path)) { my $Line; while (defined($Line = <BODY>)) diff --git a/testbot/lib/WineTestBot/Tasks.pm b/testbot/lib/WineTestBot/Tasks.pm index 3568c9b8be..a5125f3420 100644 --- a/testbot/lib/WineTestBot/Tasks.pm +++ b/testbot/lib/WineTestBot/Tasks.pm @@ -280,7 +280,7 @@ sub UpdateStatus($$) my ($JobId, $StepNo, $TaskNo) = @{$self->GetMasterKey()}; my $OldUMask = umask(002); my $TaskDir = $self->CreateDir(); - if (open TASKLOG, ">>$TaskDir/testbot.log") + if (open TASKLOG, ">>", "$TaskDir/testbot.log") { print TASKLOG "TestBot process got stuck or died unexpectedly\n"; close TASKLOG; diff --git a/testbot/web/OldSubmit.pl b/testbot/web/OldSubmit.pl index e0ccda3a33..06ce27565b 100644 --- a/testbot/web/OldSubmit.pl +++ b/testbot/web/OldSubmit.pl @@ -636,7 +636,7 @@ sub OnPage1Next($) { my $StagingFile = $self->GetTmpStagingFullPath($BaseName); my $OldUMask = umask(002); - if (! open (OUTFILE,">$StagingFile")) + if (! open (OUTFILE,">", $StagingFile)) { umask($OldUMask); $self->{ErrField} = "File"; -- 2.20.1

1 0

[PATCH 3/3] comdlg32.dll - Make 3.1-style OpenFileName() function display dir tree Added #defines for SETITEMDATA indent storage
by Dirk Niggemann 24 Feb '20

24 Feb '20

Signed-off-by: Dirk Niggemann <dirk.niggemann(a)gmail.com> --- dlls/comdlg32/filedlg31.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/dlls/comdlg32/filedlg31.c b/dlls/comdlg32/filedlg31.c index 43dbf7f9af..0d9293421a 100644 --- a/dlls/comdlg32/filedlg31.c +++ b/dlls/comdlg32/filedlg31.c @@ -43,6 +43,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(commdlg); #define BUFFILE 512 #define BUFFILEALLOC 512 * sizeof(WCHAR) +#define FLAG_FLDR_OPEN 0x10000 +#define INDENT_MASK 0xffff + static const WCHAR FILE_star[] = {'*','.','*', 0}; static const WCHAR FILE_bslash[] = {'\\', 0}; static const WCHAR FILE_specc[] = {'%','c',':', 0}; @@ -206,9 +209,8 @@ static LRESULT FD31_Directory( HWND hdlg, LPCWSTR filespec, int pos, int indent, else lstrcpyW( buffer , entry.cFileName ); if (!long_names) CharLowerW( buffer ); - /* pos = LISTBOX_FindFileStrPos( descr, buffer ); */ SendMessageW(hdlg, LB_INSERTSTRING, pos+n, (LPARAM)buffer); - SendMessageW(hdlg, LB_SETITEMDATA, pos+n, curropen == (pos+n) ? indent | 0x10000 : indent); + SendMessageW(hdlg, LB_SETITEMDATA, pos+n, curropen == (pos+n) ? indent | FLAG_FLDR_OPEN : indent); if (ret <= maxinsert) maxinsert++; else maxinsert = ret; n++; } @@ -267,7 +269,7 @@ static BOOL FD31_ScanDir(const OPENFILENAMEW *ofn, HWND hWnd, LPCWSTR newPath, WCHAR * sepptr; UINT n = 0; WCHAR pathcomp[BUFFILE]; - SendMessageW(hdlg, LB_RESETCONTENT, 0, 0); + SendMessageW(hdlg, LB_RESETCONTENT, 0, 0); while (dir) { sepptr = wcschr(dir, FILE_bslash[0]); @@ -285,9 +287,9 @@ static BOOL FD31_ScanDir(const OPENFILENAMEW *ofn, HWND hWnd, LPCWSTR newPath, dir = (sepptr) ? (sepptr + 1) : 0; /* last entry sets open folder if -1 */ if (curropen == -1 && !dir) - SendMessageW(hdlg, LB_SETITEMDATA, n, n | 0x10000 ); + SendMessageW(hdlg, LB_SETITEMDATA, n, n | FLAG_FLDR_OPEN ); else - SendMessageW(hdlg, LB_SETITEMDATA, n,n == curropen ? n | 0x10000 : n); + SendMessageW(hdlg, LB_SETITEMDATA, n,n == curropen ? n | FLAG_FLDR_OPEN : n); n++; } FD31_Directory(hdlg, buffer, n, n, curropen, TRUE); @@ -307,9 +309,9 @@ static LONG FD31_WMDrawItem(HWND hWnd, WPARAM wParam, LPARAM lParam, COLORREF oldText = 0, oldBk = 0; ULONG indent = 0; - if (lpdis->itemData) + if (lpdis->itemData) { - indent = lpdis->itemData & 0xffff; + indent = lpdis->itemData & INDENT_MASK; } if (lpdis->CtlType == ODT_LISTBOX && lpdis->CtlID == lst1) { @@ -365,7 +367,7 @@ static LONG FD31_WMDrawItem(HWND hWnd, WPARAM wParam, LPARAM lParam, SetBkColor( lpdis->hDC, oldBk ); SetTextColor( lpdis->hDC, oldText ); } - if (lpdis->itemData & 0x10000) + if (lpdis->itemData & FLAG_FLDR_OPEN) DrawIconEx( lpdis->hDC, lpdis->rcItem.left + indent*indentWidth, lpdis->rcItem.top, hFolder2, 16, 16, 0, 0, DI_NORMAL ); else DrawIconEx( lpdis->hDC, lpdis->rcItem.left + indent*indentWidth, lpdis->rcItem.top, hFolder, 16, 16, 0, 0, DI_NORMAL ); @@ -508,7 +510,7 @@ static LRESULT FD31_DirListDblClick( FD31_DATA *lfs ) if (lRet == LB_ERR) return TRUE; pstr = heap_alloc(BUFFILEALLOC); SendDlgItemMessageW(hWnd, lst2, LB_GETTEXT, lRet, (LPARAM)pstr); - currindent = SendDlgItemMessageW(hWnd, lst2, LB_GETITEMDATA, lRet, 0) & 0xffff; + currindent = SendDlgItemMessageW(hWnd, lst2, LB_GETITEMDATA, lRet, 0) & INDENT_MASK; lfs->curropen = currindent; lstrcpyW( tmpstr, pstr ); /* get the selected directory in tmpstr */ @@ -521,7 +523,7 @@ static LRESULT FD31_DirListDblClick( FD31_DATA *lfs ) while (n >= 0) { SendDlgItemMessageW(hWnd, lst2, LB_GETTEXT, n, (LPARAM)pstr); - indent = SendDlgItemMessageW(hWnd, lst2, LB_GETITEMDATA, n, 0) & 0xffff; + indent = SendDlgItemMessageW(hWnd, lst2, LB_GETITEMDATA, n, 0) & INDENT_MASK; if (indent < currindent) { lstrcpyW(tmpstr2, pstr); @@ -1178,7 +1180,7 @@ static LONG FD31_WMInitDialog(HWND hWnd, WPARAM wParam, LPARAM lParam) if (ofn->Flags & OFN_HIDEREADONLY) ShowWindow(GetDlgItem(hWnd, chx1), SW_HIDE); if (lfs->hook) - return FD31_CallWindowProc(lfs, WM_INITDIALOG, wParam, lfs->lParam); + return FD31_CallWindowProc(lfs, WM_INITDIALOG, wParam, lfs->lParam); return TRUE; } -- 2.17.2 (Apple Git-113)

1 0

[PATCH 2/3] comdlg32.dll - Make 3.1-style OpenFileName() function display dir tree Remove curropen variable from DrawItem function
by Dirk Niggemann 24 Feb '20

24 Feb '20

Signed-off-by: Dirk Niggemann <dirk.niggemann(a)gmail.com> --- dlls/comdlg32/filedlg31.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/filedlg31.c b/dlls/comdlg32/filedlg31.c index 0e8f316f52..43dbf7f9af 100644 --- a/dlls/comdlg32/filedlg31.c +++ b/dlls/comdlg32/filedlg31.c @@ -300,7 +300,7 @@ static BOOL FD31_ScanDir(const OPENFILENAMEW *ofn, HWND hWnd, LPCWSTR newPath, * FD31_WMDrawItem [internal] */ static LONG FD31_WMDrawItem(HWND hWnd, WPARAM wParam, LPARAM lParam, - int savedlg, int curropen, const DRAWITEMSTRUCT *lpdis) + int savedlg, const DRAWITEMSTRUCT *lpdis) { WCHAR *str; HICON hIcon; @@ -1225,7 +1225,7 @@ static INT_PTR CALLBACK FD31_FileOpenDlgProc(HWND hWnd, UINT wMsg, return FD31_WMMeasureItem( lParam ); case WM_DRAWITEM: - return FD31_WMDrawItem( hWnd, wParam, lParam, !lfs->open, lfs->curropen, (DRAWITEMSTRUCT *)lParam ); + return FD31_WMDrawItem( hWnd, wParam, lParam, !lfs->open, (DRAWITEMSTRUCT *)lParam ); case WM_COMMAND: return FD31_WMCommand( hWnd, lParam, HIWORD(wParam), LOWORD(wParam), lfs ); -- 2.17.2 (Apple Git-113)

1 0

[PATCH] ntdll: Partially implement JobObjectBasicAccountingInformation.
by Derek Lesho 24 Feb '20

24 Feb '20

Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> --- v2: - Fix a typo breaking the patch. --- dlls/kernel32/tests/process.c | 9 +++++++++ dlls/ntdll/sync.c | 20 +++++++++++++++++--- server/process.c | 14 ++++++++++++++ server/protocol.def | 8 ++++++++ 4 files changed, 48 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 323f8092d7..421d030e63 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -2543,6 +2543,7 @@ static void test_QueryInformationJobObject(void) PJOBOBJECT_BASIC_PROCESS_ID_LIST pid_list = (JOBOBJECT_BASIC_PROCESS_ID_LIST *)buf; JOBOBJECT_EXTENDED_LIMIT_INFORMATION ext_limit_info; JOBOBJECT_BASIC_LIMIT_INFORMATION *basic_limit_info = &ext_limit_info.BasicLimitInformation; + JOBOBJECT_BASIC_ACCOUNTING_INFORMATION basic_accounting_info; DWORD dwret, ret_len; PROCESS_INFORMATION pi[2]; HANDLE job; @@ -2647,6 +2648,14 @@ static void test_QueryInformationJobObject(void) ok(ret_len == sizeof(ext_limit_info), "QueryInformationJobObject returned ret_len=%u\n", ret_len); expect_eq_d(0, basic_limit_info->LimitFlags); + /* test JobObjectBasicAccountingInformation */ + ret = pQueryInformationJobObject(job, JobObjectBasicAccountingInformation, &basic_accounting_info, + sizeof(basic_accounting_info), &ret_len); + ok(ret, "QueryInformationJobObject error %u\n", GetLastError()); + ok(ret_len == sizeof(basic_accounting_info), "QueryInformationJobObject returned ret_len=%u\n", ret_len); + expect_eq_d(3, basic_accounting_info.TotalProcesses); + expect_eq_d(2, basic_accounting_info.ActiveProcesses); + TerminateProcess(pi[0].hProcess, 0); CloseHandle(pi[0].hProcess); CloseHandle(pi[0].hThread); diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index 2b5b6ce44a..69d6e60888 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -694,7 +694,9 @@ NTSTATUS WINAPI NtTerminateJobObject( HANDLE handle, NTSTATUS status ) NTSTATUS WINAPI NtQueryInformationJobObject( HANDLE handle, JOBOBJECTINFOCLASS class, PVOID info, ULONG len, PULONG ret_len ) { - FIXME( "stub: %p %u %p %u %p\n", handle, class, info, len, ret_len ); + NTSTATUS ret; + + TRACE( "semi-stub: %p %u %p %u %p\n", handle, class, info, len, ret_len ); if (class >= MaxJobObjectInfoClass) return STATUS_INVALID_PARAMETER; @@ -708,9 +710,21 @@ NTSTATUS WINAPI NtQueryInformationJobObject( HANDLE handle, JOBOBJECTINFOCLASS c return STATUS_INFO_LENGTH_MISMATCH; accounting = (JOBOBJECT_BASIC_ACCOUNTING_INFORMATION *)info; - memset(accounting, 0, sizeof(*accounting)); + + SERVER_START_REQ(get_job_info) + { + req->handle = wine_server_obj_handle( handle ); + if ((ret = wine_server_call( req )) == STATUS_SUCCESS) + { + memset(accounting, 0, sizeof(*accounting)); + accounting->TotalProcesses = reply->total_processes; + accounting->ActiveProcesses = reply->active_processes; + } + } + SERVER_END_REQ; + if (ret_len) *ret_len = sizeof(*accounting); - return STATUS_SUCCESS; + return ret; } case JobObjectBasicProcessIdList: diff --git a/server/process.c b/server/process.c index 73984f363f..8a1edfeac9 100644 --- a/server/process.c +++ b/server/process.c @@ -156,6 +156,7 @@ struct job struct object obj; /* object header */ struct list process_list; /* list of all processes */ int num_processes; /* count of running processes */ + int assign_counter; /* Number of processes which have been assigned */ unsigned int limit_flags; /* limit flags */ int terminating; /* job is terminating */ int signaled; /* job is signaled */ @@ -198,6 +199,7 @@ static struct job *create_job_object( struct object *root, const struct unicode_ /* initialize it if it didn't already exist */ list_init( &job->process_list ); job->num_processes = 0; + job->assign_counter = 0; job->limit_flags = 0; job->terminating = 0; job->signaled = 0; @@ -240,6 +242,7 @@ static void add_job_process( struct job *job, struct process *process ) process->job = (struct job *)grab_object( job ); list_add_tail( &job->process_list, &process->job_entry ); job->num_processes++; + job->assign_counter++; add_job_completion( job, JOB_OBJECT_MSG_NEW_PROCESS, get_process_id(process) ); } @@ -1715,6 +1718,17 @@ DECL_HANDLER(process_in_job) release_object( process ); } +/* retrieve information about a job */ +DECL_HANDLER(get_job_info) +{ + struct job *job = get_job_obj( current->process, req->handle, JOB_OBJECT_QUERY ); + + reply->total_processes = job->assign_counter; + reply->active_processes = job->num_processes; + + release_object( job ); +} + /* terminate all processes associated with the job */ DECL_HANDLER(terminate_job) { diff --git a/server/protocol.def b/server/protocol.def index 6c44b2b43f..3956a2815d 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -3938,6 +3938,14 @@ struct handle_info client_ptr_t key; /* key to send with completion messages */ @END +/* Retrieve information about a job */ +@REQ(get_job_info) + obj_handle_t handle; +@REPLY + unsigned int total_processes; + unsigned int active_processes; +@END + /* Terminate all processes associated with the job */ @REQ(terminate_job) -- 2.25.1

2 1

[PATCH 2/3] amstream: Implement AMAudioStream::SetFormat.
by Anton Baskanov 24 Feb '20

24 Feb '20

Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> --- dlls/amstream/audiostream.c | 41 +++++++++- dlls/amstream/tests/amstream.c | 142 +++++++++++++++++++++++++++++++++ 2 files changed, 181 insertions(+), 2 deletions(-) diff --git a/dlls/amstream/audiostream.c b/dlls/amstream/audiostream.c index 8a16512dcd..abc82f3a0e 100644 --- a/dlls/amstream/audiostream.c +++ b/dlls/amstream/audiostream.c @@ -183,6 +183,7 @@ struct audio_stream IPin *peer; IMemAllocator *allocator; AM_MEDIA_TYPE mt; + WAVEFORMATEX format; }; static inline struct audio_stream *impl_from_IAMMediaStream(IAMMediaStream *iface) @@ -512,13 +513,49 @@ static HRESULT WINAPI audio_IAudioMediaStream_GetFormat(IAudioMediaStream *iface return S_OK; } +static BOOL is_format_compatible(const WAVEFORMATEX *current_format, const WAVEFORMATEX *format) +{ + if (format->wFormatTag != WAVE_FORMAT_PCM) + return FALSE; + + if (current_format->wFormatTag == WAVE_FORMAT_PCM) + { + if (current_format->nChannels != format->nChannels) + return FALSE; + + if (current_format->nSamplesPerSec != format->nSamplesPerSec) + return FALSE; + + if (current_format->nAvgBytesPerSec != format->nAvgBytesPerSec) + return FALSE; + + if (current_format->nBlockAlign != format->nBlockAlign) + return FALSE; + + if (current_format->wBitsPerSample != format->wBitsPerSample) + return FALSE; + } + return TRUE; +} + static HRESULT WINAPI audio_IAudioMediaStream_SetFormat(IAudioMediaStream *iface, const WAVEFORMATEX *wave_format) { struct audio_stream *This = impl_from_IAudioMediaStream(iface); + const WAVEFORMATEX *ref_format; - FIXME("(%p/%p)->(%p) stub!\n", iface, This, wave_format); + TRACE("(%p/%p)->(%p)\n", iface, This, wave_format); - return E_NOTIMPL; + if (!wave_format) + return E_POINTER; + + ref_format = This->peer ? (WAVEFORMATEX *)This->mt.pbFormat : &This->format; + + if (!is_format_compatible(ref_format, wave_format)) + return E_INVALIDARG; + + This->format = *wave_format; + + return S_OK; } static HRESULT WINAPI audio_IAudioMediaStream_CreateSample(IAudioMediaStream *iface, IAudioData *audio_data, diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 1fb3cc239b..853949a87b 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -2627,6 +2627,147 @@ static void test_audiostream_get_format(void) IAMMultiMediaStream_Release(mmstream); } +static void check_audiostream_format(const WAVEFORMATEX *format, HRESULT expected_hr) +{ + IAMMultiMediaStream *mmstream = create_ammultimediastream(); + IMediaStream *stream = NULL; + IAudioMediaStream *audio_stream = NULL; + HRESULT hr; + + hr = IAMMultiMediaStream_AddMediaStream(mmstream, NULL, &MSPID_PrimaryAudio, 0, &stream); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaStream_QueryInterface(stream, &IID_IAudioMediaStream, (void **)&audio_stream); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAudioMediaStream_SetFormat(audio_stream, format); + ok(hr == expected_hr, "Got hr %#x.\n", hr); + + IAudioMediaStream_Release(audio_stream); + IMediaStream_Release(stream); + IAMMultiMediaStream_Release(mmstream); +} + +static void test_audiostream_set_format(void) +{ + IAMMultiMediaStream *mmstream; + IMediaStream *stream = NULL; + IAudioMediaStream *audio_stream = NULL; + IPin *pin = NULL; + WAVEFORMATPCMEX valid_format = {{0}}; + WAVEFORMATPCMEX format; + AM_MEDIA_TYPE valid_media_type = {0}; + HRESULT hr; + + valid_format.Format.wFormatTag = WAVE_FORMAT_PCM; + valid_format.Format.nChannels = 2; + valid_format.Format.nSamplesPerSec = 44100; + valid_format.Format.nAvgBytesPerSec = 176400; + valid_format.Format.nBlockAlign = 4; + valid_format.Format.wBitsPerSample = 16; + valid_format.Format.cbSize = 0; + + valid_media_type.majortype = MEDIATYPE_Audio; + valid_media_type.subtype = MEDIASUBTYPE_PCM; + valid_media_type.bFixedSizeSamples = TRUE; + valid_media_type.bTemporalCompression = FALSE; + valid_media_type.lSampleSize = 2; + valid_media_type.formattype = FORMAT_WaveFormatEx; + valid_media_type.pUnk = NULL; + valid_media_type.cbFormat = sizeof(WAVEFORMATEX); + valid_media_type.pbFormat = (BYTE *)&valid_format; + + check_audiostream_format(&valid_format.Format, S_OK); + check_audiostream_format(NULL, E_POINTER); + + format = valid_format; + format.Format.wFormatTag = WAVE_FORMAT_EXTENSIBLE; + format.Format.cbSize = 22; + format.Samples.wValidBitsPerSample = 16; + format.dwChannelMask = KSAUDIO_SPEAKER_STEREO; + format.SubFormat = KSDATAFORMAT_SUBTYPE_PCM; + check_audiostream_format(&format.Format, E_INVALIDARG); + + format = valid_format; + format.Format.nBlockAlign = 1; + check_audiostream_format(&format.Format, S_OK); + + format = valid_format; + format.Format.nAvgBytesPerSec = 1234; + check_audiostream_format(&format.Format, S_OK); + + mmstream = create_ammultimediastream(); + + hr = IAMMultiMediaStream_AddMediaStream(mmstream, NULL, &MSPID_PrimaryAudio, 0, &stream); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaStream_QueryInterface(stream, &IID_IAudioMediaStream, (void **)&audio_stream); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAudioMediaStream_SetFormat(audio_stream, &valid_format.Format); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + format = valid_format; + format.Format.nChannels = 1; + hr = IAudioMediaStream_SetFormat(audio_stream, &format.Format); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + + format = valid_format; + format.Format.nSamplesPerSec = 11025; + hr = IAudioMediaStream_SetFormat(audio_stream, &format.Format); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + + format = valid_format; + format.Format.nAvgBytesPerSec = 1234; + hr = IAudioMediaStream_SetFormat(audio_stream, &format.Format); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + + format = valid_format; + format.Format.nBlockAlign = 1; + hr = IAudioMediaStream_SetFormat(audio_stream, &format.Format); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + + format = valid_format; + format.Format.wBitsPerSample = 8; + hr = IAudioMediaStream_SetFormat(audio_stream, &format.Format); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + + hr = IAudioMediaStream_SetFormat(audio_stream, &valid_format.Format); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + IAudioMediaStream_Release(audio_stream); + IMediaStream_Release(stream); + IAMMultiMediaStream_Release(mmstream); + + mmstream = create_ammultimediastream(); + + hr = IAMMultiMediaStream_AddMediaStream(mmstream, NULL, &MSPID_PrimaryAudio, 0, &stream); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaStream_QueryInterface(stream, &IID_IAudioMediaStream, (void **)&audio_stream); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaStream_QueryInterface(stream, &IID_IPin, (void **)&pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IPin_ReceiveConnection(pin, &output_pin, &valid_media_type); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + format = valid_format; + format.Format.nChannels = 1; + hr = IAudioMediaStream_SetFormat(audio_stream, &format.Format); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + + hr = IPin_Disconnect(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + format = valid_format; + format.Format.nChannels = 1; + hr = IAudioMediaStream_SetFormat(audio_stream, &format.Format); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + IPin_Release(pin); + IAudioMediaStream_Release(audio_stream); + IMediaStream_Release(stream); + IAMMultiMediaStream_Release(mmstream); +} + START_TEST(amstream) { HANDLE file; @@ -2661,6 +2802,7 @@ START_TEST(amstream) test_audiodata_set_format(); test_audiostream_get_format(); + test_audiostream_set_format(); CoUninitialize(); } -- 2.17.1

3 2

[PATCH 1/3] amstream: Implement AMAudioStream::GetFormat.
by Anton Baskanov 24 Feb '20

24 Feb '20

Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> --- dlls/amstream/audiostream.c | 8 +- dlls/amstream/tests/amstream.c | 336 +++++++++++++++++++++++++++++++++ 2 files changed, 342 insertions(+), 2 deletions(-) diff --git a/dlls/amstream/audiostream.c b/dlls/amstream/audiostream.c index 2875e1f59b..8a16512dcd 100644 --- a/dlls/amstream/audiostream.c +++ b/dlls/amstream/audiostream.c @@ -499,13 +499,17 @@ static HRESULT WINAPI audio_IAudioMediaStream_GetFormat(IAudioMediaStream *iface { struct audio_stream *This = impl_from_IAudioMediaStream(iface); - FIXME("(%p/%p)->(%p) stub!\n", iface, This, wave_format_current); + TRACE("(%p/%p)->(%p)\n", iface, This, wave_format_current); if (!wave_format_current) return E_POINTER; - return MS_E_NOSTREAM; + if (!This->peer) + return MS_E_NOSTREAM; + *wave_format_current = *(WAVEFORMATEX *)This->mt.pbFormat; + + return S_OK; } static HRESULT WINAPI audio_IAudioMediaStream_SetFormat(IAudioMediaStream *iface, const WAVEFORMATEX *wave_format) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 6497dde91c..1fb3cc239b 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -2293,6 +2293,340 @@ out_unknown: IUnknown_Release(unknown); } +static LONG filter_ref_count = 1; + +static HRESULT WINAPI filter_QueryInterface(IBaseFilter *iface, REFIID riid, void **ret_iface) +{ + if (IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_IPersist, riid) || + IsEqualGUID(&IID_IMediaFilter, riid) || IsEqualGUID(&IID_IBaseFilter, riid)) + { + *ret_iface = iface; + IBaseFilter_AddRef(iface); + return S_OK; + } + return E_NOINTERFACE; +} + +static ULONG WINAPI filter_AddRef(IBaseFilter *iface) +{ + return InterlockedIncrement(&filter_ref_count); +} + +static ULONG WINAPI filter_Release(IBaseFilter *iface) +{ + return InterlockedDecrement(&filter_ref_count); +} + +static HRESULT WINAPI filter_GetClassID(IBaseFilter *iface, CLSID *clsid) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI filter_Stop(IBaseFilter *iface) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI filter_Pause(IBaseFilter *iface) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI filter_Run(IBaseFilter *iface, REFERENCE_TIME start) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI filter_GetState(IBaseFilter *iface, DWORD timeout, FILTER_STATE *state) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI filter_SetSyncSource(IBaseFilter *iface, IReferenceClock *clock) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI filter_GetSyncSource(IBaseFilter *iface, IReferenceClock **clock) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI filter_EnumPins(IBaseFilter *iface, IEnumPins **enum_pins) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI filter_FindPin(IBaseFilter *iface, const WCHAR *id, IPin **out) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI filter_QueryFilterInfo(IBaseFilter *iface, FILTER_INFO *info) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI filter_JoinFilterGraph(IBaseFilter *iface, + IFilterGraph *graph, const WCHAR *name) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI filter_QueryVendorInfo(IBaseFilter *iface, LPWSTR *vendor_info) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static const IBaseFilterVtbl filter_vtbl = +{ + filter_QueryInterface, + filter_AddRef, + filter_Release, + filter_GetClassID, + filter_Stop, + filter_Pause, + filter_Run, + filter_GetState, + filter_SetSyncSource, + filter_GetSyncSource, + filter_EnumPins, + filter_FindPin, + filter_QueryFilterInfo, + filter_JoinFilterGraph, + filter_QueryVendorInfo, +}; + +static IBaseFilter filter = {&filter_vtbl}; + +static LONG output_pin_ref_count = 1; + +static HRESULT WINAPI output_pin_QueryInterface(IPin *iface, REFIID iid, void **out) +{ + if (IsEqualGUID(&IID_IUnknown, iid) || IsEqualGUID(&IID_IPin, iid)) + { + *out = iface; + IPin_AddRef(iface); + return S_OK; + } + return E_NOINTERFACE; +} + +static ULONG WINAPI output_pin_AddRef(IPin *iface) +{ + return InterlockedIncrement(&output_pin_ref_count); +} + +static ULONG WINAPI output_pin_Release(IPin *iface) +{ + return InterlockedDecrement(&output_pin_ref_count); +} + +static HRESULT WINAPI output_pin_Connect(IPin *iface, IPin *peer, const AM_MEDIA_TYPE *mt) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI output_pin_ReceiveConnection(IPin *iface, IPin *peer, const AM_MEDIA_TYPE *mt) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI output_pin_Disconnect(IPin *iface) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI output_pin_ConnectedTo(IPin *iface, IPin **peer) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI output_pin_ConnectionMediaType(IPin *iface, AM_MEDIA_TYPE *mt) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI output_pin_QueryPinInfo(IPin *iface, PIN_INFO *info) +{ + if (winetest_debug > 1) trace("QueryPinInfo\n"); + info->pFilter = &filter; + info->dir = PINDIR_OUTPUT; + lstrcpyW(info->achName, L"output"); + IBaseFilter_AddRef(info->pFilter); + return S_OK; +} + +static HRESULT WINAPI output_pin_QueryDirection(IPin *iface, PIN_DIRECTION *dir) +{ + if (winetest_debug > 1) trace("QueryDirection\n"); + *dir = PINDIR_OUTPUT; + return S_OK; +} + +static HRESULT WINAPI output_pin_QueryId(IPin *iface, WCHAR **id) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI output_pin_QueryAccept(IPin *iface, const AM_MEDIA_TYPE *mt) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI output_pin_EnumMediaTypes(IPin *iface, IEnumMediaTypes **out) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI output_pin_QueryInternalConnections(IPin *iface, IPin **pins, ULONG *count) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI output_pin_EndOfStream(IPin *iface) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI output_pin_BeginFlush(IPin *iface) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI output_pin_EndFlush(IPin *iface) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI output_pin_NewSegment(IPin *iface, REFERENCE_TIME start, REFERENCE_TIME stop, double rate) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static const IPinVtbl output_pin_vtbl = +{ + output_pin_QueryInterface, + output_pin_AddRef, + output_pin_Release, + output_pin_Connect, + output_pin_ReceiveConnection, + output_pin_Disconnect, + output_pin_ConnectedTo, + output_pin_ConnectionMediaType, + output_pin_QueryPinInfo, + output_pin_QueryDirection, + output_pin_QueryId, + output_pin_QueryAccept, + output_pin_EnumMediaTypes, + output_pin_QueryInternalConnections, + output_pin_EndOfStream, + output_pin_BeginFlush, + output_pin_EndFlush, + output_pin_NewSegment, +}; + +static IPin output_pin = {&output_pin_vtbl}; + +static void test_audiostream_get_format(void) +{ + IAMMultiMediaStream *mmstream = create_ammultimediastream(); + IMediaStream *stream = NULL; + IAudioMediaStream *audio_stream = NULL; + IPin *pin = NULL; + WAVEFORMATEX stream_format = {0}; + WAVEFORMATEX media_type_format = {0}; + AM_MEDIA_TYPE media_type = {0}; + HRESULT hr; + + hr = IAMMultiMediaStream_AddMediaStream(mmstream, NULL, &MSPID_PrimaryAudio, 0, &stream); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaStream_QueryInterface(stream, &IID_IAudioMediaStream, (void **)&audio_stream); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaStream_QueryInterface(stream, &IID_IPin, (void **)&pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAudioMediaStream_GetFormat(audio_stream, NULL); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + + hr = IAudioMediaStream_GetFormat(audio_stream, &stream_format); + ok(hr == MS_E_NOSTREAM, "Got hr %#x.\n", hr); + + media_type_format.wFormatTag = WAVE_FORMAT_PCM; + media_type_format.nChannels = 2; + media_type_format.nSamplesPerSec = 44100; + media_type_format.nAvgBytesPerSec = 176400; + media_type_format.nBlockAlign = 4; + media_type_format.wBitsPerSample = 16; + media_type_format.cbSize = 0; + + media_type.majortype = MEDIATYPE_Audio; + media_type.subtype = MEDIASUBTYPE_PCM; + media_type.bFixedSizeSamples = TRUE; + media_type.bTemporalCompression = FALSE; + media_type.lSampleSize = 2; + media_type.formattype = FORMAT_WaveFormatEx; + media_type.pUnk = NULL; + media_type.cbFormat = sizeof(media_type_format); + media_type.pbFormat = (BYTE *)&media_type_format; + + hr = IPin_ReceiveConnection(pin, &output_pin, &media_type); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + stream_format.wFormatTag = 0xdead; + stream_format.nChannels = 0xdead; + stream_format.nSamplesPerSec = 0xdeadbeef; + stream_format.nAvgBytesPerSec = 0xdeadbeef; + stream_format.nBlockAlign = 0xdead; + stream_format.wBitsPerSample = 0xdead; + stream_format.cbSize = 0xdead; + hr = IAudioMediaStream_GetFormat(audio_stream, &stream_format); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(WAVE_FORMAT_PCM == stream_format.wFormatTag, "got %u\n", stream_format.wFormatTag); + ok(2 == stream_format.nChannels, "got %u\n", stream_format.nChannels); + ok(44100 == stream_format.nSamplesPerSec, "got %u\n", stream_format.nSamplesPerSec); + ok(176400 == stream_format.nAvgBytesPerSec, "got %u\n", stream_format.nAvgBytesPerSec); + ok(4 == stream_format.nBlockAlign, "got %u\n", stream_format.nBlockAlign); + ok(16 == stream_format.wBitsPerSample, "got %u\n", stream_format.wBitsPerSample); + ok(0 == stream_format.cbSize, "got %u\n", stream_format.cbSize); + + hr = IPin_Disconnect(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAudioMediaStream_GetFormat(audio_stream, &stream_format); + ok(hr == MS_E_NOSTREAM, "Got hr %#x.\n", hr); + + IPin_Release(pin); + IAudioMediaStream_Release(audio_stream); + IMediaStream_Release(stream); + IAMMultiMediaStream_Release(mmstream); +} + START_TEST(amstream) { HANDLE file; @@ -2326,5 +2660,7 @@ START_TEST(amstream) test_audiodata_get_format(); test_audiodata_set_format(); + test_audiostream_get_format(); + CoUninitialize(); } -- 2.17.1

3 2

New crypt32:chain failures
by Francois Gouget 24 Feb '20

24 Feb '20

crypt32:chain started failing on all Windows machines on the 2020-02-18: https://test.winehq.org/data/tests/crypt32:chain.html chain.c:4154: Test failed: chain->TrustStatus.dwErrorStatus = 1000040 chain.c:4159: Test failed: chain->TrustStatus.dwErrorStatus = 1000040 chain.c:4167: Test failed: chain->TrustStatus.dwErrorStatus = 1000040 Where 1000040 is CERT_TRUST_IS_OFFLINE_REVOCATION | CERT_TRUST_REVOCATION_STATUS_UNKNOWN Yet there has been no commit to that test. Did a certificate go bad? -- Francois Gouget <fgouget(a)codeweavers.com>

1 0

[PATCH 3/3] amstream: Reject incompatible media types in AMAudioStream::ReceiveConnection.
by Anton Baskanov 24 Feb '20

24 Feb '20

Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> --- dlls/amstream/audiostream.c | 11 ++++ dlls/amstream/tests/amstream.c | 117 +++++++++++++++++++++++++++++++++ 2 files changed, 128 insertions(+) diff --git a/dlls/amstream/audiostream.c b/dlls/amstream/audiostream.c index abc82f3a0e..f1bfb8da71 100644 --- a/dlls/amstream/audiostream.c +++ b/dlls/amstream/audiostream.c @@ -760,6 +760,17 @@ static HRESULT WINAPI audio_sink_ReceiveConnection(IPin *iface, IPin *peer, cons return VFW_E_INVALID_DIRECTION; } + if (!IsEqualGUID(&mt->majortype, &MEDIATYPE_Audio) || + !IsEqualGUID(&mt->formattype, &FORMAT_WaveFormatEx) || + !mt->pbFormat || mt->cbFormat < sizeof(WAVEFORMATEX)) + { + LeaveCriticalSection(&stream->cs); + return VFW_E_TYPE_NOT_ACCEPTED; + } + + if (!is_format_compatible(&stream->format, (const WAVEFORMATEX *)mt->pbFormat)) + return E_INVALIDARG; + CopyMediaType(&stream->mt, mt); IPin_AddRef(stream->peer = peer); diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 853949a87b..2bac733484 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -2768,6 +2768,122 @@ static void test_audiostream_set_format(void) IAMMultiMediaStream_Release(mmstream); } +static void check_audiostream_media_type(const AM_MEDIA_TYPE *media_type, HRESULT expected_hr) +{ + IAMMultiMediaStream *mmstream = create_ammultimediastream(); + IMediaStream *stream = NULL; + IPin *pin = NULL; + HRESULT hr; + + hr = IAMMultiMediaStream_AddMediaStream(mmstream, NULL, &MSPID_PrimaryAudio, 0, &stream); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaStream_QueryInterface(stream, &IID_IPin, (void **)&pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IPin_ReceiveConnection(pin, &output_pin, media_type); + ok(hr == expected_hr, "Got hr %#x.\n", hr); + + if (SUCCEEDED(hr)) + { + hr = IPin_Disconnect(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + } + + IPin_Release(pin); + IMediaStream_Release(stream); + IAMMultiMediaStream_Release(mmstream); +} + +static void test_audiostream_receive_connection(void) +{ + IAMMultiMediaStream *mmstream; + IMediaStream *stream = NULL; + IAudioMediaStream *audio_stream = NULL; + IPin *pin = NULL; + WAVEFORMATPCMEX valid_format = {0}; + WAVEFORMATPCMEX format; + AM_MEDIA_TYPE valid_media_type = {0}; + AM_MEDIA_TYPE media_type; + HRESULT hr; + + valid_format.Format.wFormatTag = WAVE_FORMAT_PCM; + valid_format.Format.nChannels = 2; + valid_format.Format.nSamplesPerSec = 44100; + valid_format.Format.nAvgBytesPerSec = 176400; + valid_format.Format.nBlockAlign = 4; + valid_format.Format.wBitsPerSample = 16; + valid_format.Format.cbSize = 0; + + valid_media_type.majortype = MEDIATYPE_Audio; + valid_media_type.subtype = MEDIASUBTYPE_PCM; + valid_media_type.bFixedSizeSamples = TRUE; + valid_media_type.bTemporalCompression = FALSE; + valid_media_type.lSampleSize = 2; + valid_media_type.formattype = FORMAT_WaveFormatEx; + valid_media_type.pUnk = NULL; + valid_media_type.cbFormat = sizeof(WAVEFORMATEX); + valid_media_type.pbFormat = (BYTE *)&valid_format; + + check_audiostream_media_type(&valid_media_type, S_OK); + + media_type = valid_media_type; + media_type.majortype = GUID_NULL; + check_audiostream_media_type(&media_type, VFW_E_TYPE_NOT_ACCEPTED); + + media_type = valid_media_type; + media_type.subtype = MEDIASUBTYPE_RGB24; + check_audiostream_media_type(&media_type, S_OK); + + media_type = valid_media_type; + media_type.formattype = GUID_NULL; + check_audiostream_media_type(&media_type, VFW_E_TYPE_NOT_ACCEPTED); + + media_type = valid_media_type; + media_type.cbFormat = sizeof(WAVEFORMATEX) - 1; + check_audiostream_media_type(&media_type, VFW_E_TYPE_NOT_ACCEPTED); + + format = valid_format; + format.Format.wFormatTag = WAVE_FORMAT_EXTENSIBLE; + format.Format.cbSize = 22; + format.Samples.wValidBitsPerSample = 16; + format.dwChannelMask = KSAUDIO_SPEAKER_STEREO; + format.SubFormat = KSDATAFORMAT_SUBTYPE_PCM; + media_type = valid_media_type; + media_type.cbFormat = sizeof(format); + media_type.pbFormat = (BYTE *)&format; + check_audiostream_media_type(&media_type, E_INVALIDARG); + + mmstream = create_ammultimediastream(); + + hr = IAMMultiMediaStream_AddMediaStream(mmstream, NULL, &MSPID_PrimaryAudio, 0, &stream); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaStream_QueryInterface(stream, &IID_IAudioMediaStream, (void **)&audio_stream); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaStream_QueryInterface(stream, &IID_IPin, (void **)&pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAudioMediaStream_SetFormat(audio_stream, &valid_format.Format); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + format = valid_format; + format.Format.nChannels = 1; + media_type = valid_media_type; + media_type.pbFormat = (BYTE *)&format; + hr = IPin_ReceiveConnection(pin, &output_pin, &media_type); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + + hr = IPin_ReceiveConnection(pin, &output_pin, &valid_media_type); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IPin_Disconnect(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + IPin_Release(pin); + IAudioMediaStream_Release(audio_stream); + IMediaStream_Release(stream); + IAMMultiMediaStream_Release(mmstream); +} + START_TEST(amstream) { HANDLE file; @@ -2803,6 +2919,7 @@ START_TEST(amstream) test_audiostream_get_format(); test_audiostream_set_format(); + test_audiostream_receive_connection(); CoUninitialize(); } -- 2.17.1

2 1

[PATCH] gdiplus: Fix a possible NULL pointer reference in GdipGetNearestColor().
by Zhiyi Zhang 24 Feb '20

24 Feb '20

Fix a regression from 5ca9da2c0197ac1260975c1b7b643dbd11185715 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48657 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/gdiplus/graphics.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index e8606f6b60..af95c7aeea 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -4783,7 +4783,7 @@ GpStatus WINGDIPAPI GdipGetNearestColor(GpGraphics *graphics, ARGB* argb) if(graphics->busy) return ObjectBusy; - if (graphics->image->type == ImageTypeBitmap) + if (graphics->image && graphics->image->type == ImageTypeBitmap) { static int once; GpBitmap *bitmap = (GpBitmap *)graphics->image; -- 2.20.1

2 1

[PATCH] include: Add corecrt_wstdlib.h header.
by Jacek Caban 24 Feb '20

24 Feb '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/msvcrt/corecrt_wstdlib.h | 60 ++++++++++++++++++++++++++++++++ include/msvcrt/stdlib.h | 46 +----------------------- include/msvcrt/wchar.h | 43 ++--------------------- 3 files changed, 63 insertions(+), 86 deletions(-) create mode 100644 include/msvcrt/corecrt_wstdlib.h

1 0

[PATCH 8/8] corecrt_wstdio.h: Add ucrt swprintf_s and vswprintf_s declarations.
by Jacek Caban 24 Feb '20

24 Feb '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/msvcrt/corecrt_wstdio.h | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-)

1 0

[PATCH 7/8] corecrt_wstdio.h: Add ucrt fwscanf and fwscanf_s declarations.
by Jacek Caban 24 Feb '20

24 Feb '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/msvcrt/corecrt_wstdio.h | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-)

1 0

[PATCH 6/8] corecrt_wstdio.h: Add ucrt fwprintf_s and vfwprintf_s declarations.
by Jacek Caban 24 Feb '20

24 Feb '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/msvcrt/corecrt_wstdio.h | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-)

1 0

[PATCH 5/8] corecrt_wstdio.h: Add ucrt fwprintf and vfwprintf declarations.
by Jacek Caban 24 Feb '20

24 Feb '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/msvcrt/corecrt_wstdio.h | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-)

1 0

[PATCH 4/8] corecrt_wstdio.h: Add ucrt _vscwprintf_p_l and _vswprintf_p_l declarations.
by Jacek Caban 24 Feb '20

24 Feb '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/msvcrt/corecrt_wstdio.h | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-)

1 0

[PATCH 3/8] corecrt_wstdio.h: Add ucrt _scwprintf and _vscwprintf declarations.
by Jacek Caban 24 Feb '20

24 Feb '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/msvcrt/corecrt_wstdio.h | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-)

1 0

[PATCH 2/8] corecrt_wstdio.h: Add ucrt _snwprintf_s and _vsnwprintf_s declarations.
by Jacek Caban 24 Feb '20

24 Feb '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/msvcrt/corecrt_wstdio.h | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-)

1 0

[PATCH 1/8] corecrt_wstdio.h: Add ucrt _snwprintf, swprintf and _swprintf declarations.
by Jacek Caban 24 Feb '20

24 Feb '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/msvcrt/corecrt_wstdio.h | 64 +++++++++++++++++++++++++++++++-- 1 file changed, 62 insertions(+), 2 deletions(-)

1 0

[PATCH] mf: Add MFCreateSimpleTypeHandler().
by Nikolay Sivov 24 Feb '20

24 Feb '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/main.c | 180 +++++++++++++++++++++++++++++++++++++++++++++ dlls/mf/mf.spec | 2 +- dlls/mf/tests/mf.c | 66 +++++++++++++++++ include/mfidl.idl | 1 + 4 files changed, 248 insertions(+), 1 deletion(-) diff --git a/dlls/mf/main.c b/dlls/mf/main.c index 251d59e1c0..5d645db200 100644 --- a/dlls/mf/main.c +++ b/dlls/mf/main.c @@ -1168,3 +1168,183 @@ HRESULT WINAPI MFCreateVideoRendererActivate(HWND hwnd, IMFActivate **activate) return create_activation_object(hwnd, &evr_activate_funcs, activate); } + +struct simple_type_handler +{ + IMFMediaTypeHandler IMFMediaTypeHandler_iface; + LONG refcount; + IMFMediaType *media_type; + CRITICAL_SECTION cs; +}; + +static struct simple_type_handler *impl_from_IMFMediaTypeHandler(IMFMediaTypeHandler *iface) +{ + return CONTAINING_RECORD(iface, struct simple_type_handler, IMFMediaTypeHandler_iface); +} + +static HRESULT WINAPI simple_type_handler_QueryInterface(IMFMediaTypeHandler *iface, REFIID riid, void **obj) +{ + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj); + + if (IsEqualIID(riid, &IID_IMFMediaTypeHandler) || + IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + IMFMediaTypeHandler_AddRef(iface); + return S_OK; + } + + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI simple_type_handler_AddRef(IMFMediaTypeHandler *iface) +{ + struct simple_type_handler *handler = impl_from_IMFMediaTypeHandler(iface); + ULONG refcount = InterlockedIncrement(&handler->refcount); + + TRACE("%p, refcount %u.\n", iface, refcount); + + return refcount; +} + +static ULONG WINAPI simple_type_handler_Release(IMFMediaTypeHandler *iface) +{ + struct simple_type_handler *handler = impl_from_IMFMediaTypeHandler(iface); + ULONG refcount = InterlockedDecrement(&handler->refcount); + + TRACE("%p, refcount %u.\n", iface, refcount); + + if (!refcount) + { + if (handler->media_type) + IMFMediaType_Release(handler->media_type); + DeleteCriticalSection(&handler->cs); + heap_free(handler); + } + + return refcount; +} + +static HRESULT WINAPI simple_type_handler_IsMediaTypeSupported(IMFMediaTypeHandler *iface, IMFMediaType *in_type, + IMFMediaType **out_type) +{ + FIXME("%p, %p, %p.\n", iface, in_type, out_type); + + return E_NOTIMPL; +} + +static HRESULT WINAPI simple_type_handler_GetMediaTypeCount(IMFMediaTypeHandler *iface, DWORD *count) +{ + TRACE("%p, %p.\n", iface, count); + + if (!count) + return E_POINTER; + + *count = 1; + + return S_OK; +} + +static HRESULT WINAPI simple_type_handler_GetMediaTypeByIndex(IMFMediaTypeHandler *iface, DWORD index, + IMFMediaType **type) +{ + struct simple_type_handler *handler = impl_from_IMFMediaTypeHandler(iface); + + TRACE("%p, %u, %p.\n", iface, index, type); + + if (index > 0) + return MF_E_NO_MORE_TYPES; + + EnterCriticalSection(&handler->cs); + *type = handler->media_type; + if (*type) + IMFMediaType_AddRef(*type); + LeaveCriticalSection(&handler->cs); + + return S_OK; +} + +static HRESULT WINAPI simple_type_handler_SetCurrentMediaType(IMFMediaTypeHandler *iface, IMFMediaType *media_type) +{ + struct simple_type_handler *handler = impl_from_IMFMediaTypeHandler(iface); + + TRACE("%p, %p.\n", iface, media_type); + + EnterCriticalSection(&handler->cs); + if (handler->media_type) + IMFMediaType_Release(handler->media_type); + handler->media_type = media_type; + if (handler->media_type) + IMFMediaType_AddRef(handler->media_type); + LeaveCriticalSection(&handler->cs); + + return S_OK; +} + +static HRESULT WINAPI simple_type_handler_GetCurrentMediaType(IMFMediaTypeHandler *iface, IMFMediaType **media_type) +{ + struct simple_type_handler *handler = impl_from_IMFMediaTypeHandler(iface); + + TRACE("%p, %p.\n", iface, media_type); + + if (!media_type) + return E_POINTER; + + EnterCriticalSection(&handler->cs); + *media_type = handler->media_type; + if (*media_type) + IMFMediaType_AddRef(*media_type); + LeaveCriticalSection(&handler->cs); + + return S_OK; +} + +static HRESULT WINAPI simple_type_handler_GetMajorType(IMFMediaTypeHandler *iface, GUID *type) +{ + struct simple_type_handler *handler = impl_from_IMFMediaTypeHandler(iface); + HRESULT hr; + + TRACE("%p, %p.\n", iface, type); + + EnterCriticalSection(&handler->cs); + if (handler->media_type) + hr = IMFMediaType_GetGUID(handler->media_type, &MF_MT_MAJOR_TYPE, type); + else + hr = MF_E_NOT_INITIALIZED; + LeaveCriticalSection(&handler->cs); + + return hr; +} + +static const IMFMediaTypeHandlerVtbl simple_type_handler_vtbl = +{ + simple_type_handler_QueryInterface, + simple_type_handler_AddRef, + simple_type_handler_Release, + simple_type_handler_IsMediaTypeSupported, + simple_type_handler_GetMediaTypeCount, + simple_type_handler_GetMediaTypeByIndex, + simple_type_handler_SetCurrentMediaType, + simple_type_handler_GetCurrentMediaType, + simple_type_handler_GetMajorType, +}; + +HRESULT WINAPI MFCreateSimpleTypeHandler(IMFMediaTypeHandler **handler) +{ + struct simple_type_handler *object; + + TRACE("%p.\n", handler); + + object = heap_alloc_zero(sizeof(*object)); + if (!object) + return E_OUTOFMEMORY; + + object->IMFMediaTypeHandler_iface.lpVtbl = &simple_type_handler_vtbl; + object->refcount = 1; + InitializeCriticalSection(&object->cs); + + *handler = &object->IMFMediaTypeHandler_iface; + + return S_OK; +} diff --git a/dlls/mf/mf.spec b/dlls/mf/mf.spec index a8dd314aa3..e396d01519 100644 --- a/dlls/mf/mf.spec +++ b/dlls/mf/mf.spec @@ -56,7 +56,7 @@ @ stub MFCreateSequencerSegmentOffset @ stdcall MFCreateSequencerSource(ptr ptr) @ stub MFCreateSequencerSourceRemoteStream -@ stub MFCreateSimpleTypeHandler +@ stdcall MFCreateSimpleTypeHandler(ptr) @ stdcall MFCreateSourceResolver(ptr) mfplat.MFCreateSourceResolver @ stdcall MFCreateStandardQualityManager(ptr) @ stdcall MFCreateTopoLoader(ptr) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index b353df780b..a1a7d2b05a 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -2595,6 +2595,71 @@ static void test_evr(void) IMFActivate_Release(activate); } +static void test_MFCreateSimpleTypeHandler(void) +{ + IMFMediaType *media_type, *media_type2; + IMFMediaTypeHandler *handler; + DWORD count; + HRESULT hr; + GUID guid; + + hr = MFCreateSimpleTypeHandler(&handler); + ok(hr == S_OK, "Failed to create object, hr %#x.\n", hr); + + hr = IMFMediaTypeHandler_GetMediaTypeCount(handler, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + count = 0; + hr = IMFMediaTypeHandler_GetMediaTypeCount(handler, &count); + ok(hr == S_OK, "Failed to get type count, hr %#x.\n", hr); + ok(count == 1, "Unexpected count %u.\n", count); + + hr = IMFMediaTypeHandler_GetCurrentMediaType(handler, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + media_type = (void *)0xdeadbeef; + hr = IMFMediaTypeHandler_GetCurrentMediaType(handler, &media_type); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!media_type, "Unexpected pointer.\n"); + + hr = MFCreateMediaType(&media_type); + ok(hr == S_OK, "Failed to create media type, hr %#x.\n", hr); + + hr = IMFMediaTypeHandler_SetCurrentMediaType(handler, media_type); + ok(hr == S_OK, "Failed to set current type, hr %#x.\n", hr); + + hr = IMFMediaTypeHandler_GetMediaTypeByIndex(handler, 0, &media_type2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(media_type2 == media_type, "Unexpected type.\n"); + IMFMediaType_Release(media_type2); + + hr = IMFMediaTypeHandler_GetMediaTypeByIndex(handler, 1, &media_type2); + ok(hr == MF_E_NO_MORE_TYPES, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaTypeHandler_GetCurrentMediaType(handler, &media_type2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(media_type == media_type2, "Unexpected pointer.\n"); + IMFMediaType_Release(media_type2); + + IMFMediaType_Release(media_type); + + hr = IMFMediaTypeHandler_GetMajorType(handler, &guid); + ok(hr == MF_E_ATTRIBUTENOTFOUND, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaTypeHandler_SetCurrentMediaType(handler, NULL); + ok(hr == S_OK, "Failed to set current type, hr %#x.\n", hr); + + media_type = (void *)0xdeadbeef; + hr = IMFMediaTypeHandler_GetCurrentMediaType(handler, &media_type); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!media_type, "Unexpected pointer.\n"); + + hr = IMFMediaTypeHandler_GetMajorType(handler, &guid); + ok(hr == MF_E_NOT_INITIALIZED, "Unexpected hr %#x.\n", hr); + + IMFMediaTypeHandler_Release(handler); +} + START_TEST(mf) { test_topology(); @@ -2609,4 +2674,5 @@ START_TEST(mf) test_quality_manager(); test_sar(); test_evr(); + test_MFCreateSimpleTypeHandler(); } diff --git a/include/mfidl.idl b/include/mfidl.idl index b301edbbdd..b1568b9b56 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -580,6 +580,7 @@ cpp_quote("HRESULT WINAPI MFCreateMFByteStreamOnStreamEx(IUnknown *stream, IMFBy cpp_quote("HRESULT WINAPI MFCreatePresentationClock(IMFPresentationClock **clock);") cpp_quote("HRESULT WINAPI MFCreatePresentationDescriptor(DWORD count, IMFStreamDescriptor **descriptors,") cpp_quote(" IMFPresentationDescriptor **presentation_desc);") +cpp_quote("HRESULT WINAPI MFCreateSimpleTypeHandler(IMFMediaTypeHandler **handler);") cpp_quote("HRESULT WINAPI MFCreateSampleGrabberSinkActivate(IMFMediaType *media_type,") cpp_quote(" IMFSampleGrabberSinkCallback *callback, IMFActivate **activate);") cpp_quote("HRESULT WINAPI MFCreateSequencerSource(IUnknown *reserved, IMFSequencerSource **seq_source);" ) -- 2.25.0

2 1

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