- wine-devel - winehq.org

[PATCH] user32/tests: Use the correct procedure for dialog tests (Valgrind)
by Sven Baars 16 Sep '18

16 Sep '18

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- dlls/user32/tests/class.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/tests/class.c b/dlls/user32/tests/class.c index 53fa2f12e3..5db37d4a9a 100644 --- a/dlls/user32/tests/class.c +++ b/dlls/user32/tests/class.c @@ -877,7 +877,7 @@ static void test_builtinproc(void) static LRESULT WINAPI TestDlgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { - return DefWindowProcA(hWnd, uMsg, wParam, lParam); + return DefDlgProcA(hWnd, uMsg, wParam, lParam); } static BOOL RegisterTestDialog(HINSTANCE hInstance) -- 2.17.1

1 0

WineConf 2018 videos
by Henri Verbeet 16 Sep '18

16 Sep '18

The first few WineConf 2018 videos are up at [1]. Currently we have the keynote and the CodeWeavers company update on there. We'll hopefully be uploading more over the next couple of days. We may also upload copies to other hosts like YouTube in the future. [1] https://peertube.mastodon.host/accounts/wineconf2018/videos

1 1

Applications running in WINE look like Windows 98
by mrt303xx＠aol.com 16 Sep '18

16 Sep '18

Is there anyway to allow Mac to paint the window itself? Tarie

1 0

C++ .NET code crashes in WINE
by mrt303xx＠aol.com 16 Sep '18

16 Sep '18

I'm a developer working on porting an application to Mac using WINE and the main windows show up however, the application crashes if I try to use any .NET code. We have a few windows in the NET framework and use managed C++ to create them. The allocation of the class using new generates an untrappable exception. Tarie

1 0

[PATCH] kernel32: Add stub for SetProcessWorkingSetSizeEx
by André Hentschel 16 Sep '18

16 Sep '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45523 Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- .../api-ms-win-core-memory-l1-1-1.spec | 2 +- .../api-ms-win-core-memory-l1-1-2.spec | 2 +- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/process.c | 29 +++++++++++++++---- dlls/kernelbase/kernelbase.spec | 2 +- include/winbase.h | 1 + 6 files changed, 29 insertions(+), 9 deletions(-) diff --git a/dlls/api-ms-win-core-memory-l1-1-1/api-ms-win-core-memory-l1-1-1.spec b/dlls/api-ms-win-core-memory-l1-1-1/api-ms-win-core-memory-l1-1-1.spec index 42630c1048..3200be9a78 100644 --- a/dlls/api-ms-win-core-memory-l1-1-1/api-ms-win-core-memory-l1-1-1.spec +++ b/dlls/api-ms-win-core-memory-l1-1-1/api-ms-win-core-memory-l1-1-1.spec @@ -15,7 +15,7 @@ @ stdcall QueryMemoryResourceNotification(ptr ptr) kernel32.QueryMemoryResourceNotification @ stdcall ReadProcessMemory(long ptr ptr long ptr) kernel32.ReadProcessMemory @ stdcall ResetWriteWatch(ptr long) kernel32.ResetWriteWatch -@ stub SetProcessWorkingSetSizeEx +@ stdcall SetProcessWorkingSetSizeEx(long long long long) kernel32.SetProcessWorkingSetSizeEx @ stdcall SetSystemFileCacheSize(long long long) kernel32.SetSystemFileCacheSize @ stdcall UnmapViewOfFile(ptr) kernel32.UnmapViewOfFile @ stub UnmapViewOfFileEx diff --git a/dlls/api-ms-win-core-memory-l1-1-2/api-ms-win-core-memory-l1-1-2.spec b/dlls/api-ms-win-core-memory-l1-1-2/api-ms-win-core-memory-l1-1-2.spec index 6100213eb7..57a5b10562 100644 --- a/dlls/api-ms-win-core-memory-l1-1-2/api-ms-win-core-memory-l1-1-2.spec +++ b/dlls/api-ms-win-core-memory-l1-1-2/api-ms-win-core-memory-l1-1-2.spec @@ -21,7 +21,7 @@ @ stdcall ReadProcessMemory(long ptr ptr long ptr) kernel32.ReadProcessMemory @ stub RegisterBadMemoryNotification @ stdcall ResetWriteWatch(ptr long) kernel32.ResetWriteWatch -@ stub SetProcessWorkingSetSizeEx +@ stdcall SetProcessWorkingSetSizeEx(long long long long) kernel32.SetProcessWorkingSetSizeEx @ stdcall SetSystemFileCacheSize(long long long) kernel32.SetSystemFileCacheSize @ stdcall UnmapViewOfFile(ptr) kernel32.UnmapViewOfFile @ stub UnmapViewOfFileEx diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index f1d75b8e1c..9db7d98f41 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1434,7 +1434,7 @@ @ stdcall SetProcessShutdownParameters(long long) # @ stub SetProcessUserModeExceptionPolicy @ stdcall SetProcessWorkingSetSize(long long long) -# @ stub SetProcessWorkingSetSizeEx +@ stdcall SetProcessWorkingSetSizeEx(long long long long) @ stdcall SetSearchPathMode(long) @ stdcall SetStdHandle(long long) # @ stub SetStdHandleEx diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 85e0042024..eacc8e67b8 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -3390,22 +3390,22 @@ err: /*********************************************************************** - * SetProcessWorkingSetSize [KERNEL32.@] + * SetProcessWorkingSetSizeEx [KERNEL32.@] * Sets the min/max working set sizes for a specified process. * * PARAMS - * hProcess [I] Handle to the process of interest + * process [I] Handle to the process of interest * minset [I] Specifies minimum working set size * maxset [I] Specifies maximum working set size + * flags [I] Flags to enforce working set sizes * * RETURNS * Success: TRUE * Failure: FALSE */ -BOOL WINAPI SetProcessWorkingSetSize(HANDLE hProcess, SIZE_T minset, - SIZE_T maxset) +BOOL WINAPI SetProcessWorkingSetSizeEx(HANDLE process, SIZE_T minset, SIZE_T maxset, DWORD flags) { - WARN("(%p,%ld,%ld): stub - harmless\n",hProcess,minset,maxset); + WARN("(%p,%ld,%ld,%x): stub - harmless\n", process, minset, maxset, flags); if(( minset == (SIZE_T)-1) && (maxset == (SIZE_T)-1)) { /* Trim the working set to zero */ /* Swap the process out of physical RAM */ @@ -3413,6 +3413,25 @@ BOOL WINAPI SetProcessWorkingSetSize(HANDLE hProcess, SIZE_T minset, return TRUE; } +/*********************************************************************** + * SetProcessWorkingSetSize [KERNEL32.@] + * Sets the min/max working set sizes for a specified process. + * + * PARAMS + * process [I] Handle to the process of interest + * minset [I] Specifies minimum working set size + * maxset [I] Specifies maximum working set size + * + * RETURNS + * Success: TRUE + * Failure: FALSE + */ +BOOL WINAPI SetProcessWorkingSetSize(HANDLE process, SIZE_T minset, SIZE_T maxset) +{ + WARN("(%p,%ld,%ld): stub - harmless\n", process, minset, maxset); + return SetProcessWorkingSetSizeEx(process, minset, maxset, 0); +} + /*********************************************************************** * K32EmptyWorkingSet (KERNEL32.@) */ diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 89fad2c835..29805760da 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1461,7 +1461,7 @@ @ stdcall SetProcessPriorityBoost(long long) kernel32.SetProcessPriorityBoost @ stdcall SetProcessShutdownParameters(long long) kernel32.SetProcessShutdownParameters # @ stub SetProcessValidCallTargets -# @ stub SetProcessWorkingSetSizeEx +@ stdcall SetProcessWorkingSetSizeEx(long long long long) kernel32.SetProcessWorkingSetSizeEx # @ stub SetProtectedPolicy # @ stub SetRoamingLastObservedChangeTime @ stub SetSecurityAccessMask diff --git a/include/winbase.h b/include/winbase.h index 8b26308b95..4d959d0da6 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2597,6 +2597,7 @@ WINBASEAPI BOOL WINAPI SetProcessAffinityMask(HANDLE,DWORD_PTR); WINBASEAPI BOOL WINAPI SetProcessPriorityBoost(HANDLE,BOOL); WINBASEAPI BOOL WINAPI SetProcessShutdownParameters(DWORD,DWORD); WINBASEAPI BOOL WINAPI SetProcessWorkingSetSize(HANDLE,SIZE_T,SIZE_T); +WINBASEAPI BOOL WINAPI SetProcessWorkingSetSizeEx(HANDLE,SIZE_T,SIZE_T,DWORD); WINBASEAPI BOOL WINAPI SetSearchPathMode(DWORD); WINADVAPI BOOL WINAPI SetSecurityDescriptorControl(PSECURITY_DESCRIPTOR,SECURITY_DESCRIPTOR_CONTROL,SECURITY_DESCRIPTOR_CONTROL); WINADVAPI BOOL WINAPI SetSecurityDescriptorDacl(PSECURITY_DESCRIPTOR,BOOL,PACL,BOOL); -- 2.17.1

1 0

[PATCH] propsys: Add InitPropVariantFromCLSID().
by Nikolay Sivov 16 Sep '18

16 Sep '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45347 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/propsys/propsys.spec | 2 +- dlls/propsys/propvar.c | 13 +++++++++++++ dlls/propsys/tests/propsys.c | 19 +++++++++++++++++++ include/propvarutil.h | 1 + 4 files changed, 34 insertions(+), 1 deletion(-) diff --git a/dlls/propsys/propsys.spec b/dlls/propsys/propsys.spec index db20fd39c9..bbc71654a8 100644 --- a/dlls/propsys/propsys.spec +++ b/dlls/propsys/propsys.spec @@ -29,7 +29,7 @@ @ stdcall -private DllUnregisterServer() @ stub InitPropVariantFromBooleanVector @ stdcall InitPropVariantFromBuffer(ptr long ptr) -@ stub InitPropVariantFromCLSID +@ stdcall InitPropVariantFromCLSID(ptr ptr) @ stub InitPropVariantFromDoubleVector @ stub InitPropVariantFromFileTime @ stub InitPropVariantFromFileTimeVector diff --git a/dlls/propsys/propvar.c b/dlls/propsys/propvar.c index e6d4eba57c..ae96e4ee69 100644 --- a/dlls/propsys/propvar.c +++ b/dlls/propsys/propvar.c @@ -570,6 +570,19 @@ HRESULT WINAPI InitPropVariantFromBuffer(const VOID *pv, UINT cb, PROPVARIANT *p return S_OK; } +HRESULT WINAPI InitPropVariantFromCLSID(REFCLSID clsid, PROPVARIANT *ppropvar) +{ + TRACE("(%s %p)\n", debugstr_guid(clsid), ppropvar); + + ppropvar->u.puuid = CoTaskMemAlloc(sizeof(*ppropvar->u.puuid)); + if(!ppropvar->u.puuid) + return E_OUTOFMEMORY; + + ppropvar->vt = VT_CLSID; + memcpy(ppropvar->u.puuid, clsid, sizeof(*ppropvar->u.puuid)); + return S_OK; +} + HRESULT WINAPI InitVariantFromBuffer(const VOID *pv, UINT cb, VARIANT *pvar) { SAFEARRAY *arr; diff --git a/dlls/propsys/tests/propsys.c b/dlls/propsys/tests/propsys.c index e899ff9dc4..34c51b382b 100644 --- a/dlls/propsys/tests/propsys.c +++ b/dlls/propsys/tests/propsys.c @@ -1230,6 +1230,24 @@ static void test_PropVariantChangeType_LPWSTR(void) PropVariantClear(&src); } +static void test_InitPropVariantFromCLSID(void) +{ + PROPVARIANT propvar; + GUID clsid; + HRESULT hr; + + memset(&propvar, 0, sizeof(propvar)); + propvar.vt = VT_I4; + propvar.u.lVal = 15; + + memset(&clsid, 0xcc, sizeof(clsid)); + hr = InitPropVariantFromCLSID(&clsid, &propvar); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(propvar.vt == VT_CLSID, "Unexpected type %d.\n", propvar.vt); + ok(IsEqualGUID(propvar.u.puuid, &clsid), "Unexpected puuid value.\n"); + PropVariantClear(&propvar); +} + START_TEST(propsys) { test_PSStringFromPropertyKey(); @@ -1244,4 +1262,5 @@ START_TEST(propsys) test_PropVariantChangeType_LPWSTR(); test_PropVariantToBoolean(); test_PropVariantToStringWithDefault(); + test_InitPropVariantFromCLSID(); } diff --git a/include/propvarutil.h b/include/propvarutil.h index ced51ec295..0285cafbb4 100644 --- a/include/propvarutil.h +++ b/include/propvarutil.h @@ -64,6 +64,7 @@ HRESULT WINAPI PropVariantChangeType(PROPVARIANT *ppropvarDest, REFPROPVARIANT p HRESULT WINAPI InitPropVariantFromGUIDAsString(REFGUID guid, PROPVARIANT *ppropvar); HRESULT WINAPI InitVariantFromGUIDAsString(REFGUID guid, VARIANT *pvar); HRESULT WINAPI InitPropVariantFromBuffer(const VOID *pv, UINT cb, PROPVARIANT *ppropvar); +HRESULT WINAPI InitPropVariantFromCLSID(REFCLSID clsid, PROPVARIANT *ppropvar); HRESULT WINAPI InitVariantFromBuffer(const VOID *pv, UINT cb, VARIANT *pvar); HRESULT WINAPI PropVariantToGUID(const PROPVARIANT *ppropvar, GUID *guid); HRESULT WINAPI VariantToGUID(const VARIANT *pvar, GUID *guid); -- 2.18.0

1 0

[PATCH] comctl32/button: Fix text buffer leak (Coverity).
by Nikolay Sivov 16 Sep '18

16 Sep '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/button.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 5621fda4f3..56a47302c9 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -1293,7 +1293,6 @@ static UINT BUTTON_CalcLayoutRects(const BUTTON_INFO *infoPtr, HDC hdc, RECT *la /* Get text rect */ maxTextWidth = labelRc->right - labelRc->left; textRect = BUTTON_GetTextRect(infoPtr, hdc, text, maxTextWidth); - heap_free(text); /* Show image and text */ if (show_image_and_text(infoPtr)) @@ -1361,6 +1360,7 @@ static UINT BUTTON_CalcLayoutRects(const BUTTON_INFO *infoPtr, HDC hdc, RECT *la SetRectEmpty(&imageRect); } } + heap_free(text); CopyRect(labelRc, &labelRect); CopyRect(imageRc, &imageRect); -- 2.18.0

1 0

[PATCH] scrrun: Add MoveFile().
by Nikolay Sivov 16 Sep '18

16 Sep '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/scrrun/filesystem.c | 21 +++++++++++++++++---- dlls/scrrun/tests/filesystem.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 4 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index aa1660085e..daac75f1e1 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -3596,12 +3596,25 @@ static HRESULT WINAPI filesys_DeleteFolder(IFileSystem3 *iface, BSTR FolderSpec, return delete_folder(FolderSpec, SysStringLen(FolderSpec), Force); } -static HRESULT WINAPI filesys_MoveFile(IFileSystem3 *iface, BSTR Source, - BSTR Destination) +static HRESULT WINAPI filesys_MoveFile(IFileSystem3 *iface, BSTR src, BSTR dest) { - FIXME("%p %s %s\n", iface, debugstr_w(Source), debugstr_w(Destination)); + DWORD error; - return E_NOTIMPL; + TRACE("%p %s %s\n", iface, debugstr_w(src), debugstr_w(dest)); + + if (MoveFileW(src, dest)) + return S_OK; + + error = GetLastError(); + switch (error) + { + case ERROR_ALREADY_EXISTS: + return CTL_E_FILEALREADYEXISTS; + case ERROR_FILE_NOT_FOUND: + return CTL_E_FILENOTFOUND; + default: + return HRESULT_FROM_WIN32(error); + } } static HRESULT WINAPI filesys_MoveFolder(IFileSystem3 *iface,BSTR Source, diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 29ee73f243..925a889a3a 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -2217,6 +2217,39 @@ static void test_GetSpecialFolder(void) IFolder_Release(folder); } +static void test_MoveFile(void) +{ + WCHAR source[MAX_PATH], dest[MAX_PATH], tempdir[MAX_PATH]; + static const WCHAR prefixW[] = {'p','f','x',0}; + BSTR str1, str2; + HRESULT hr; + DWORD ret; + + ret = GetTempPathW(ARRAY_SIZE(tempdir), tempdir); + ok(ret != 0, "Failed to get temp path, error %d\n", GetLastError()); + + ret = GetTempFileNameW(tempdir, prefixW, 0, source); + ok(ret != 0, "Failed to get temp name, error %d\n", GetLastError()); + + ret = GetTempFileNameW(tempdir, prefixW, 0, dest); + ok(ret != 0, "Failed to get temp name, error %d\n", GetLastError()); + + str1 = SysAllocString(source); + str2 = SysAllocString(dest); + + hr = IFileSystem3_MoveFile(fs3, str1, str2); + ok(hr == CTL_E_FILEALREADYEXISTS, "Unexpected hr %#x.\n", hr); + + DeleteFileW(source); + DeleteFileW(dest); + + hr = IFileSystem3_MoveFile(fs3, str1, str2); + ok(hr == CTL_E_FILENOTFOUND, "Unexpected hr %#x.\n", hr); + + SysFreeString(str1); + SysFreeString(str2); +} + START_TEST(filesystem) { HRESULT hr; @@ -2255,6 +2288,7 @@ START_TEST(filesystem) test_SerialNumber(); test_GetExtensionName(); test_GetSpecialFolder(); + test_MoveFile(); IFileSystem3_Release(fs3); -- 2.18.0

2 2

[PATCH] comctl32/taskdialog: Use parentheses around & operator
by Fabian Maurer 16 Sep '18

16 Sep '18

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/comctl32/taskdialog.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c index f69fa6aaa3..1d91e1d55d 100644 --- a/dlls/comctl32/taskdialog.c +++ b/dlls/comctl32/taskdialog.c @@ -118,7 +118,7 @@ static unsigned int taskdialog_get_reference_rect(const TASKDIALOGCONFIG *taskco info.cbSize = sizeof(info); GetMonitorInfoW(monitor, &info); - if (taskconfig->dwFlags & TDF_POSITION_RELATIVE_TO_WINDOW && taskconfig->hwndParent) + if ((taskconfig->dwFlags & TDF_POSITION_RELATIVE_TO_WINDOW) && taskconfig->hwndParent) GetWindowRect(taskconfig->hwndParent, ret); else *ret = info.rcWork; -- 2.19.0

2 3

[PATCH] oleview: Add missing break (coverity)
by Fabian Maurer 16 Sep '18

16 Sep '18

Not 100% sure, but I guess this wasn't intended. If it was, it would warrant a comment, at least. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- programs/oleview/typelib.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/oleview/typelib.c b/programs/oleview/typelib.c index 4912a5fb00..99de87b43b 100644 --- a/programs/oleview/typelib.c +++ b/programs/oleview/typelib.c @@ -1598,6 +1598,7 @@ static LRESULT CALLBACK TypeLibProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM } case WM_COMMAND: TypeLibMenuCommand(LOWORD(wParam), hWnd); + break; case WM_MENUSELECT: UpdateTypeLibStatusBar(LOWORD(wParam)); break; -- 2.19.0

1 0

Wine staging 3.16 release
by Alistair Leslie-Hughes 16 Sep '18

16 Sep '18

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary of the past few weeks * Rebased to current wine 3.16 (880 patches are applied to wine vanilla) * Reviewed and upstreamed patches. Added * [34711] hnetcfg: Add Support for interface UPnPNAT Where can you help * Run Steam/Battle.net/UPlay. * Try you favorite game: Terraria * Test your favorite applications. * Steal 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] qcap/tests: AVICo might be unavaiable on newer Win10
by André Hentschel 15 Sep '18

15 Sep '18

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/qcap/tests/qcap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/qcap/tests/qcap.c b/dlls/qcap/tests/qcap.c index d7fe288f4a..2f6fe1d026 100644 --- a/dlls/qcap/tests/qcap.c +++ b/dlls/qcap/tests/qcap.c @@ -1803,8 +1803,8 @@ static void test_AviCo(void) static const WCHAR outputW[] = {'O','u','t','p','u','t',0}; hres = CoCreateInstance(&CLSID_AVICo, NULL, CLSCTX_INPROC_SERVER, &IID_IBaseFilter, (void**)&avico); - if(hres == REGDB_E_CLASSNOTREG) { - win_skip("CLSID_AVICo not registered\n"); + if(hres == REGDB_E_CLASSNOTREG || hres == CLASS_E_CLASSNOTAVAILABLE) { + win_skip("CLSID_AVICo not registered/available\n"); return; } ok(hres == S_OK, "Could not create CLSID_AVICo class: %08x\n", hres); -- 2.17.1

1 0

[PATCH] advapi32/tests: Allow ERROR_ACCESS_DENIED for newer Win10
by André Hentschel 15 Sep '18

15 Sep '18

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/advapi32/tests/security.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 3ca151d0fd..41b1fe0713 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -6566,7 +6566,7 @@ static void test_system_security_access(void) /* privilege is checked on access */ err = GetSecurityInfo( hkey, SE_REGISTRY_KEY, SACL_SECURITY_INFORMATION, NULL, NULL, NULL, &sacl, &sd ); - todo_wine ok( err == ERROR_PRIVILEGE_NOT_HELD, "got %u\n", err ); + todo_wine ok( err == ERROR_PRIVILEGE_NOT_HELD || err == ERROR_ACCESS_DENIED, "got %u\n", err ); if (err == ERROR_SUCCESS) LocalFree( sd ); @@ -6603,7 +6603,7 @@ static void test_system_security_access(void) ok( res == ERROR_SUCCESS, "got %d\n", res ); err = GetSecurityInfo( hkey, SE_REGISTRY_KEY, SACL_SECURITY_INFORMATION, NULL, NULL, NULL, &sacl, &sd ); - todo_wine ok( err == ERROR_PRIVILEGE_NOT_HELD, "got %u\n", err ); + ok( err == ERROR_PRIVILEGE_NOT_HELD || err == ERROR_ACCESS_DENIED, "got %u\n", err ); RegCloseKey( hkey ); res = RegDeleteKeyW( HKEY_LOCAL_MACHINE, testkeyW ); -- 2.17.1

1 0

[PATCH v2] quartz/filtergraph: Return correct interface for IID_IGraphVersion.
by Zebediah Figura 14 Sep '18

14 Sep '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- v2: rebased on top of master dlls/quartz/filtergraph.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index d6e8c90..20dd5fd 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -442,8 +442,8 @@ static HRESULT WINAPI FilterGraphInner_QueryInterface(IUnknown *iface, REFIID ri TRACE(" returning IFilterMapper3 interface from aggregated filtermapper (%p)\n", *ppvObj); return IUnknown_QueryInterface(This->punkFilterMapper2, riid, ppvObj); } else if (IsEqualGUID(&IID_IGraphVersion, riid)) { - *ppvObj = &This->IGraphConfig_iface; - TRACE(" returning IGraphConfig interface (%p)\n", *ppvObj); + *ppvObj = &This->IGraphVersion_iface; + TRACE(" returning IGraphVersion interface (%p)\n", *ppvObj); } else { *ppvObj = NULL; FIXME("unknown interface %s\n", debugstr_guid(riid)); -- 2.7.4

1 0

[PATCH] quartz/filtergraph: Return correct interface for IID_IGraphVersion.
by Zebediah Figura 14 Sep '18

14 Sep '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/filtergraph.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 03fdd19..ac915f6 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -442,8 +442,8 @@ static HRESULT WINAPI FilterGraphInner_QueryInterface(IUnknown *iface, REFIID ri TRACE(" returning IFilterMapper3 interface from aggregated filtermapper (%p)\n", *ppvObj); return IUnknown_QueryInterface(This->punkFilterMapper2, riid, ppvObj); } else if (IsEqualGUID(&IID_IGraphVersion, riid)) { - *ppvObj = &This->IGraphConfig_iface; - TRACE(" returning IGraphConfig interface (%p)\n", *ppvObj); + *ppvObj = &This->IGraphVersion_iface; + TRACE(" returning IGraphVersion interface (%p)\n", *ppvObj); } else if (IsEqualGUID(&IID_IVideoFrameStep, riid)) { *ppvObj = &This->IVideoFrameStep_iface; TRACE(" returning IVideoFrameStep interface (%p)\n", *ppvObj); -- 2.7.4

2 1

[PATCH] shlwapi: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 14 Sep '18

14 Sep '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shlwapi/assoc.c | 2 +- dlls/shlwapi/ordinal.c | 18 +++++++++--------- dlls/shlwapi/path.c | 18 +++++++++--------- dlls/shlwapi/reg.c | 10 +++++----- dlls/shlwapi/string.c | 14 ++++++-------- dlls/shlwapi/url.c | 29 ++++++++++++++--------------- 6 files changed, 44 insertions(+), 47 deletions(-) diff --git a/dlls/shlwapi/assoc.c b/dlls/shlwapi/assoc.c index 31569908b3..5faeab64fb 100644 --- a/dlls/shlwapi/assoc.c +++ b/dlls/shlwapi/assoc.c @@ -276,7 +276,7 @@ HRESULT WINAPI AssocQueryStringA(ASSOCF cfFlags, ASSOCSTR str, LPCSTR pszAssoc, lpszReturnW = HeapAlloc(GetProcessHeap(), 0, (dwLenOut + 1) * sizeof(WCHAR)); else - dwLenOut = sizeof(szReturnW) / sizeof(szReturnW[0]); + dwLenOut = ARRAY_SIZE(szReturnW); if (!lpszReturnW) hRet = E_OUTOFMEMORY; diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index 903df91aa0..449b47b2f7 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -2440,7 +2440,7 @@ HMODULE WINAPI SHPinDllOfCLSID(REFIID refiid) CHAR value[MAX_PATH], string[MAX_PATH]; strcpy(string, "CLSID\\"); - SHStringFromGUIDA(refiid, string + 6, sizeof(string)/sizeof(char) - 6); + SHStringFromGUIDA(refiid, string + 6, ARRAY_SIZE(string) - 6); strcat(string, "\\InProcServer32"); count = MAX_PATH; @@ -2778,7 +2778,7 @@ VOID WINAPI SHWeakReleaseInterface(IUnknown *lpDest, IUnknown **lppUnknown) BOOL WINAPI GUIDFromStringA(LPCSTR idstr, CLSID *id) { WCHAR wClsid[40]; - MultiByteToWideChar(CP_ACP, 0, idstr, -1, wClsid, sizeof(wClsid)/sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, idstr, -1, wClsid, ARRAY_SIZE(wClsid)); return SUCCEEDED(CLSIDFromString(wClsid, id)); } @@ -3600,8 +3600,8 @@ HMODULE WINAPI MLLoadLibraryW(LPCWSTR new_mod, HMODULE inst_hwnd, DWORD dwCrossC DWORD len; FIXME("(%s,%p,%d) semi-stub!\n", debugstr_w(new_mod), inst_hwnd, dwCrossCodePage); - len = GetModuleFileNameW(inst_hwnd, mod_path, sizeof(mod_path) / sizeof(WCHAR)); - if (!len || len >= sizeof(mod_path) / sizeof(WCHAR)) return NULL; + len = GetModuleFileNameW(inst_hwnd, mod_path, ARRAY_SIZE(mod_path)); + if (!len || len >= ARRAY_SIZE(mod_path)) return NULL; ptr = strrchrW(mod_path, '\\'); if (ptr) { @@ -4755,7 +4755,7 @@ INT WINAPIV ShellMessageBoxWrapW(HINSTANCE hInstance, HWND hWnd, LPCWSTR lpText, TRACE("(%p,%p,%p,%p,%08x)\n", hInstance, hWnd, lpText, lpCaption, uType); if (IS_INTRESOURCE(lpCaption)) - LoadStringW(hInstance, LOWORD(lpCaption), szTitle, sizeof(szTitle)/sizeof(szTitle[0])); + LoadStringW(hInstance, LOWORD(lpCaption), szTitle, ARRAY_SIZE(szTitle)); else pszTitle = lpCaption; @@ -5280,8 +5280,8 @@ DWORD WINAPI SHGetObjectCompatFlags(IUnknown *pUnk, const CLSID *clsid) 'W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', 'S','h','e','l','l','C','o','m','p','a','t','i','b','i','l','i','t','y','\\', 'O','b','j','e','c','t','s','\\','%','s',0}; - WCHAR strW[sizeof(compatpathW)/sizeof(WCHAR) + 38 /* { CLSID } */]; - DWORD ret, length = sizeof(strW)/sizeof(WCHAR); + WCHAR strW[ARRAY_SIZE(compatpathW) + 38 /* { CLSID } */]; + DWORD ret, length = ARRAY_SIZE(strW); OLECHAR *clsid_str; HKEY key; INT i; @@ -5311,7 +5311,7 @@ DWORD WINAPI SHGetObjectCompatFlags(IUnknown *pUnk, const CLSID *clsid) /* search in table */ left = 0; - right = sizeof(objcompat_table) / sizeof(struct objcompat_entry) - 1; + right = ARRAY_SIZE(objcompat_table) - 1; while (right >= left) { x = (left + right) / 2; @@ -5327,7 +5327,7 @@ DWORD WINAPI SHGetObjectCompatFlags(IUnknown *pUnk, const CLSID *clsid) left = x + 1; } - length = sizeof(strW)/sizeof(WCHAR); + length = ARRAY_SIZE(strW); } return ret; diff --git a/dlls/shlwapi/path.c b/dlls/shlwapi/path.c index e24835f238..ad78c5d224 100644 --- a/dlls/shlwapi/path.c +++ b/dlls/shlwapi/path.c @@ -3264,7 +3264,7 @@ HRESULT WINAPI PathCreateFromUrlA(LPCSTR pszUrl, LPSTR pszPath, WCHAR *pathW = bufW; UNICODE_STRING urlW; HRESULT ret; - DWORD lenW = sizeof(bufW)/sizeof(WCHAR), lenA; + DWORD lenW = ARRAY_SIZE(bufW), lenA; if (!pszUrl || !pszPath || !pcchPath || !*pcchPath) return E_INVALIDARG; @@ -3684,7 +3684,7 @@ VOID WINAPI PathSetDlgItemPathW(HWND hDlg, int id, LPCWSTR lpszPath) return; if (lpszPath) - lstrcpynW(path, lpszPath, sizeof(path) / sizeof(WCHAR)); + lstrcpynW(path, lpszPath, ARRAY_SIZE(path)); else path[0] = '\0'; @@ -4122,7 +4122,7 @@ static void init_envvars_map(struct envvars_map *map) { while (map->var) { - map->len = ExpandEnvironmentStringsW(map->var, map->path, sizeof(map->path)/sizeof(WCHAR)); + map->len = ExpandEnvironmentStringsW(map->var, map->path, ARRAY_SIZE(map->path)); /* exclude null from length */ if (map->len) map->len--; map++; @@ -4139,12 +4139,12 @@ BOOL WINAPI PathUnExpandEnvStringsW(LPCWSTR path, LPWSTR buffer, UINT buf_len) static struct envvars_map null_var = {NULL, 0, {0}, 0}; struct envvars_map *match = &null_var, *cur; struct envvars_map envvars[] = { - { allusersprofileW, sizeof(allusersprofileW)/sizeof(WCHAR) }, - { appdataW, sizeof(appdataW)/sizeof(WCHAR) }, - { programfilesW, sizeof(programfilesW)/sizeof(WCHAR) }, - { systemrootW, sizeof(systemrootW)/sizeof(WCHAR) }, - { systemdriveW, sizeof(systemdriveW)/sizeof(WCHAR) }, - { userprofileW, sizeof(userprofileW)/sizeof(WCHAR) }, + { allusersprofileW, ARRAY_SIZE(allusersprofileW) }, + { appdataW, ARRAY_SIZE(appdataW) }, + { programfilesW, ARRAY_SIZE(programfilesW) }, + { systemrootW, ARRAY_SIZE(systemrootW) }, + { systemdriveW, ARRAY_SIZE(systemdriveW) }, + { userprofileW, ARRAY_SIZE(userprofileW) }, { NULL } }; DWORD pathlen; diff --git a/dlls/shlwapi/reg.c b/dlls/shlwapi/reg.c index 375c25429d..163351995c 100644 --- a/dlls/shlwapi/reg.c +++ b/dlls/shlwapi/reg.c @@ -134,7 +134,7 @@ LONG WINAPI SHRegOpenUSKeyW(LPCWSTR Path, REGSAM AccessType, HUSKEY hRelativeUSK /* Create internal HUSKEY */ hKey = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*hKey)); - lstrcpynW(hKey->lpszPath, Path, sizeof(hKey->lpszPath)/sizeof(WCHAR)); + lstrcpynW(hKey->lpszPath, Path, ARRAY_SIZE(hKey->lpszPath)); if (hRelativeUSKey) { @@ -275,7 +275,7 @@ LONG WINAPI SHRegCreateUSKeyW(LPCWSTR path, REGSAM samDesired, HUSKEY relative_k } ret_key = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*ret_key)); - lstrcpynW(ret_key->lpszPath, path, sizeof(ret_key->lpszPath)/sizeof(WCHAR)); + lstrcpynW(ret_key->lpszPath, path, ARRAY_SIZE(ret_key->lpszPath)); if (relative_key) { @@ -1534,7 +1534,7 @@ DWORD WINAPI SHDeleteKeyA(HKEY hKey, LPCSTR lpszSubKey) { WCHAR subkeyW[MAX_PATH]; - MultiByteToWideChar (CP_ACP, 0, lpszSubKey, -1, subkeyW, sizeof(subkeyW)/sizeof(WCHAR)); + MultiByteToWideChar (CP_ACP, 0, lpszSubKey, -1, subkeyW, ARRAY_SIZE(subkeyW)); return SHDeleteKeyW(hKey, subkeyW); } @@ -1560,7 +1560,7 @@ DWORD WINAPI SHDeleteKeyW(HKEY hKey, LPCWSTR lpszSubKey) if(!dwRet) { dwMaxSubkeyLen++; - if (dwMaxSubkeyLen > sizeof(szNameBuf)/sizeof(WCHAR)) + if (dwMaxSubkeyLen > ARRAY_SIZE(szNameBuf)) /* Name too big: alloc a buffer for it */ lpszName = HeapAlloc(GetProcessHeap(), 0, dwMaxSubkeyLen*sizeof(WCHAR)); @@ -2409,7 +2409,7 @@ HRESULT WINAPI SHRegGetCLSIDKeyA(REFGUID guid, LPCSTR lpszValue, BOOL bUseHKCU, WCHAR szValue[MAX_PATH]; if (lpszValue) - MultiByteToWideChar(CP_ACP, 0, lpszValue, -1, szValue, sizeof(szValue)/sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, lpszValue, -1, szValue, ARRAY_SIZE(szValue)); return SHRegGetCLSIDKeyW(guid, lpszValue ? szValue : NULL, bUseHKCU, bCreate, phKey); } diff --git a/dlls/shlwapi/string.c b/dlls/shlwapi/string.c index 0b34d43624..b190ffc9e4 100644 --- a/dlls/shlwapi/string.c +++ b/dlls/shlwapi/string.c @@ -71,7 +71,7 @@ static void FillNumberFmt(NUMBERFMTW *fmt, LPWSTR decimal_buffer, int decimal_bu * http://blogs.msdn.com/oldnewthing/archive/2006/04/18/578251.aspx */ fmt->Grouping = 0; - GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SGROUPING, grouping, sizeof(grouping)/sizeof(WCHAR)); + GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SGROUPING, grouping, ARRAY_SIZE(grouping)); for (c = grouping; *c; c++) if (*c >= '0' && *c < '9') { @@ -101,8 +101,7 @@ static int FormatInt(LONGLONG qdwValue, LPWSTR pszBuf, int cchBuf) WCHAR *c; BOOL neg = (qdwValue < 0); - FillNumberFmt(&fmt, decimal, sizeof decimal / sizeof (WCHAR), - thousand, sizeof thousand / sizeof (WCHAR)); + FillNumberFmt(&fmt, decimal, ARRAY_SIZE(decimal), thousand, ARRAY_SIZE(thousand)); c = &buf[24]; *(--c) = 0; @@ -135,8 +134,7 @@ static int FormatDouble(double value, int decimals, LPWSTR pszBuf, int cchBuf) snprintfW(buf, 64, flfmt, value); - FillNumberFmt(&fmt, decimal, sizeof decimal / sizeof (WCHAR), - thousand, sizeof thousand / sizeof (WCHAR)); + FillNumberFmt(&fmt, decimal, ARRAY_SIZE(decimal), thousand, ARRAY_SIZE(thousand)); fmt.NumDigits = decimals; return GetNumberFormatW(LOCALE_USER_DEFAULT, 0, buf, &fmt, pszBuf, cchBuf); } @@ -2124,7 +2122,7 @@ INT WINAPI StrFromTimeIntervalA(LPSTR lpszStr, UINT cchMax, DWORD dwMS, if (lpszStr && cchMax) { WCHAR szBuff[128]; - StrFromTimeIntervalW(szBuff, sizeof(szBuff)/sizeof(WCHAR), dwMS, iDigits); + StrFromTimeIntervalW(szBuff, ARRAY_SIZE(szBuff), dwMS, iDigits); WideCharToMultiByte(CP_ACP,0,szBuff,-1,lpszStr,cchMax,0,0); } return iRet; @@ -2420,7 +2418,7 @@ LPWSTR WINAPI StrFormatByteSizeW(LONGLONG llBytes, LPWSTR lpszDest, UINT cchMax) /* Note that if this loop completes without finding a match, i will be * pointing at the last entry, which is a catch all for > 1000 PB */ - while (i < sizeof(bfFormats) / sizeof(SHLWAPI_BYTEFORMATS) - 1) + while (i < ARRAY_SIZE(bfFormats) - 1) { if (llBytes < bfFormats[i].dLimit) break; @@ -2455,7 +2453,7 @@ LPSTR WINAPI StrFormatByteSize64A(LONGLONG llBytes, LPSTR lpszDest, UINT cchMax) { WCHAR wszBuff[32]; - StrFormatByteSizeW(llBytes, wszBuff, sizeof(wszBuff)/sizeof(WCHAR)); + StrFormatByteSizeW(llBytes, wszBuff, ARRAY_SIZE(wszBuff)); if (lpszDest) WideCharToMultiByte(CP_ACP, 0, wszBuff, -1, lpszDest, cchMax, 0, 0); diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c index 92b4a216cb..8313b98fb2 100644 --- a/dlls/shlwapi/url.c +++ b/dlls/shlwapi/url.c @@ -136,7 +136,7 @@ static DWORD get_scheme_code(LPCWSTR scheme, DWORD scheme_len) { unsigned int i; - for(i=0; i < sizeof(shlwapi_schemes)/sizeof(shlwapi_schemes[0]); i++) { + for(i = 0; i < ARRAY_SIZE(shlwapi_schemes); i++) { if(scheme_len == strlenW(shlwapi_schemes[i].scheme_name) && !memicmpW(scheme, shlwapi_schemes[i].scheme_name, scheme_len)) return shlwapi_schemes[i].scheme_number; @@ -182,8 +182,7 @@ HRESULT WINAPI ParseURLA(LPCSTR x, PARSEDURLA *y) y->pszSuffix = ptr+1; y->cchSuffix = strlen(y->pszSuffix); - len = MultiByteToWideChar(CP_ACP, 0, x, ptr-x, - scheme, sizeof(scheme)/sizeof(WCHAR)); + len = MultiByteToWideChar(CP_ACP, 0, x, ptr-x, scheme, ARRAY_SIZE(scheme)); y->nScheme = get_scheme_code(scheme, len); return S_OK; @@ -331,7 +330,7 @@ HRESULT WINAPI UrlCanonicalizeW(LPCWSTR pszUrl, LPWSTR pszCanonicalized, return E_OUTOFMEMORY; } - is_file_url = !strncmpW(wszFile, url, sizeof(wszFile)/sizeof(WCHAR)); + is_file_url = !strncmpW(wszFile, url, ARRAY_SIZE(wszFile)); if ((nByteLen >= sizeof(wszHttp) && !memcmp(wszHttp, url, sizeof(wszHttp))) || is_file_url) @@ -362,7 +361,7 @@ HRESULT WINAPI UrlCanonicalizeW(LPCWSTR pszUrl, LPWSTR pszCanonicalized, if(url[1] == ':') { /* Assume path */ memcpy(wk2, wszFilePrefix, sizeof(wszFilePrefix)); - wk2 += sizeof(wszFilePrefix)/sizeof(WCHAR); + wk2 += ARRAY_SIZE(wszFilePrefix); if (dwFlags & (URL_FILE_USE_PATHURL | URL_WININET_COMPATIBILITY)) { slash = '\\'; @@ -397,7 +396,7 @@ HRESULT WINAPI UrlCanonicalizeW(LPCWSTR pszUrl, LPWSTR pszCanonicalized, if((dwFlags & URL_FILE_USE_PATHURL) && nByteLen >= sizeof(wszLocalhost) && is_file_url && !memcmp(wszLocalhost, wk1, sizeof(wszLocalhost))){ - wk1 += sizeof(wszLocalhost)/sizeof(WCHAR); + wk1 += ARRAY_SIZE(wszLocalhost); while(*wk1 == '\\' && (dwFlags & URL_FILE_USE_PATHURL)) wk1++; } @@ -954,7 +953,7 @@ HRESULT WINAPI UrlEscapeA( WCHAR *escapedW = bufW; UNICODE_STRING urlW; HRESULT ret; - DWORD lenW = sizeof(bufW)/sizeof(WCHAR), lenA; + DWORD lenW = ARRAY_SIZE(bufW), lenA; if (!pszEscaped || !pcchEscaped || !*pcchEscaped) return E_INVALIDARG; @@ -1162,7 +1161,7 @@ HRESULT WINAPI UrlEscapeW( len = 0; if((int_flags & WINE_URL_COLLAPSE_SLASHES) && src == pszUrl + parsed_url.cchProtocol + 1) { - int localhost_len = sizeof(localhost)/sizeof(WCHAR) - 1; + int localhost_len = ARRAY_SIZE(localhost) - 1; while(cur == '/' || cur == '\\') { slashes++; cur = *++src; @@ -2442,7 +2441,7 @@ HRESULT WINAPI UrlCreateFromPathA(LPCSTR pszPath, LPSTR pszUrl, LPDWORD pcchUrl, WCHAR *urlW = bufW; UNICODE_STRING pathW; HRESULT ret; - DWORD lenW = sizeof(bufW)/sizeof(WCHAR), lenA; + DWORD lenW = ARRAY_SIZE(bufW), lenA; if(!RtlCreateUnicodeStringFromAsciiz(&pathW, pszPath)) return E_INVALIDARG; @@ -2545,13 +2544,13 @@ HRESULT WINAPI MLBuildResURLA(LPCSTR lpszLibName, HMODULE hMod, DWORD dwFlags, HRESULT hRet; if (lpszLibName) - MultiByteToWideChar(CP_ACP, 0, lpszLibName, -1, szLibName, sizeof(szLibName)/sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, lpszLibName, -1, szLibName, ARRAY_SIZE(szLibName)); if (lpszRes) - MultiByteToWideChar(CP_ACP, 0, lpszRes, -1, szRes, sizeof(szRes)/sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, lpszRes, -1, szRes, ARRAY_SIZE(szRes)); - if (dwDestLen > sizeof(szLibName)/sizeof(WCHAR)) - dwDestLen = sizeof(szLibName)/sizeof(WCHAR); + if (dwDestLen > ARRAY_SIZE(szLibName)) + dwDestLen = ARRAY_SIZE(szLibName); hRet = MLBuildResURLW(lpszLibName ? szLibName : NULL, hMod, dwFlags, lpszRes ? szRes : NULL, lpszDest ? szDest : NULL, dwDestLen); @@ -2592,8 +2591,8 @@ HRESULT WINAPI MLBuildResURLW(LPCWSTR lpszLibName, HMODULE hMod, DWORD dwFlags, WCHAR szBuff[MAX_PATH]; DWORD len; - len = GetModuleFileNameW(hMod, szBuff, sizeof(szBuff)/sizeof(WCHAR)); - if (len && len < sizeof(szBuff)/sizeof(WCHAR)) + len = GetModuleFileNameW(hMod, szBuff, ARRAY_SIZE(szBuff)); + if (len && len < ARRAY_SIZE(szBuff)) { DWORD dwPathLen = strlenW(szBuff) + 1; -- 2.14.4

1 0

[PATCH] shlwapi: Avoid a temporary variable
by Michael Stefaniuc 14 Sep '18

14 Sep '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shlwapi/thread.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/shlwapi/thread.c b/dlls/shlwapi/thread.c index eb2c35d6dc..5726b855dc 100644 --- a/dlls/shlwapi/thread.c +++ b/dlls/shlwapi/thread.c @@ -491,7 +491,6 @@ HANDLE WINAPI SHGlobalCounterCreateNamedW(LPCWSTR lpszName, DWORD iInitial) static const WCHAR szPrefix[] = { 's', 'h', 'e', 'l', 'l', '.', '\0' }; const int iPrefixLen = 6; WCHAR szBuff[MAX_PATH]; - const int iBuffLen = sizeof(szBuff)/sizeof(WCHAR); SECURITY_DESCRIPTOR sd; SECURITY_ATTRIBUTES sAttr, *pSecAttr; HANDLE hRet; @@ -501,7 +500,7 @@ HANDLE WINAPI SHGlobalCounterCreateNamedW(LPCWSTR lpszName, DWORD iInitial) /* Create Semaphore name */ memcpy(szBuff, szPrefix, (iPrefixLen + 1) * sizeof(WCHAR)); if (lpszName) - StrCpyNW(szBuff + iPrefixLen, lpszName, iBuffLen - iPrefixLen); + StrCpyNW(szBuff + iPrefixLen, lpszName, ARRAY_SIZE(szBuff) - iPrefixLen); /* Initialise security attributes */ pSecAttr = CreateAllAccessSecurityAttributes(&sAttr, &sd, 0); -- 2.14.4

1 0

[PATCH] setupapi: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 14 Sep '18

14 Sep '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/setupapi/devinst.c | 23 ++++++++++------------- dlls/setupapi/dialog.c | 15 +++++---------- dlls/setupapi/fakedll.c | 12 ++++++------ dlls/setupapi/install.c | 27 ++++++++++++--------------- dlls/setupapi/misc.c | 8 ++++---- dlls/setupapi/parser.c | 9 ++++----- dlls/setupapi/query.c | 3 +-- dlls/setupapi/queue.c | 10 +++++----- 8 files changed, 47 insertions(+), 60 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 71356e8021..7134a8b58c 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -901,7 +901,7 @@ BOOL WINAPI SetupDiClassGuidsFromNameExW( for (dwIndex = 0; ; dwIndex++) { - dwLength = sizeof(szKeyName) / sizeof(WCHAR); + dwLength = ARRAY_SIZE(szKeyName); lError = RegEnumKeyExW(hClassesKey, dwIndex, szKeyName, @@ -1995,7 +1995,7 @@ static void SETUPDI_AddDeviceInterfaces(struct device *device, HKEY key, for (i = 0; !l; i++) { - len = sizeof(subKeyName) / sizeof(subKeyName[0]); + len = ARRAY_SIZE(subKeyName); l = RegEnumKeyExW(key, i, subKeyName, &len, NULL, NULL, NULL, NULL); if (!l) { @@ -2046,7 +2046,7 @@ static void SETUPDI_EnumerateMatchingInterfaces(HDEVINFO DeviceInfoSet, &enumKey, NULL); for (i = 0; !l; i++) { - len = sizeof(subKeyName) / sizeof(subKeyName[0]); + len = ARRAY_SIZE(subKeyName); l = RegEnumKeyExW(key, i, subKeyName, &len, NULL, NULL, NULL, NULL); if (!l) { @@ -2124,7 +2124,7 @@ static void SETUPDI_EnumerateInterfaces(HDEVINFO DeviceInfoSet, for (i = 0; !l; i++) { - len = sizeof(interfaceGuidStr) / sizeof(interfaceGuidStr[0]); + len = ARRAY_SIZE(interfaceGuidStr); l = RegEnumKeyExW(interfacesKey, i, interfaceGuidStr, &len, NULL, NULL, NULL, NULL); if (!l) @@ -2175,7 +2175,7 @@ static void SETUPDI_EnumerateMatchingDeviceInstances(struct DeviceInfoSet *set, for (i = 0; !l; i++) { - len = sizeof(deviceInstance) / sizeof(deviceInstance[0]); + len = ARRAY_SIZE(deviceInstance); l = RegEnumKeyExW(deviceKey, i, deviceInstance, &len, NULL, NULL, NULL, NULL); if (!l) @@ -2240,7 +2240,7 @@ static void SETUPDI_EnumerateMatchingDevices(HDEVINFO DeviceInfoSet, for (i = 0; !l; i++) { - len = sizeof(subKeyName) / sizeof(subKeyName[0]); + len = ARRAY_SIZE(subKeyName); l = RegEnumKeyExW(key, i, subKeyName, &len, NULL, NULL, NULL, NULL); if (!l) { @@ -2294,7 +2294,7 @@ static void SETUPDI_EnumerateDevices(HDEVINFO DeviceInfoSet, const GUID *class, l = ERROR_SUCCESS; for (i = 0; !l; i++) { - len = sizeof(subKeyName) / sizeof(subKeyName[0]); + len = ARRAY_SIZE(subKeyName); l = RegEnumKeyExW(enumKey, i, subKeyName, &len, NULL, NULL, NULL, NULL); if (!l) @@ -2999,8 +2999,7 @@ BOOL WINAPI SetupDiGetDeviceRegistryPropertyA( return FALSE; } device = (struct device *)DeviceInfoData->Reserved; - if (Property < sizeof(PropertyMap) / sizeof(PropertyMap[0]) - && PropertyMap[Property].nameA) + if (Property < ARRAY_SIZE(PropertyMap) && PropertyMap[Property].nameA) { DWORD size = PropertyBufferSize; LONG l = RegQueryValueExA(device->key, PropertyMap[Property].nameA, @@ -3062,8 +3061,7 @@ BOOL WINAPI SetupDiGetDeviceRegistryPropertyW( return FALSE; } device = (struct device *)DeviceInfoData->Reserved; - if (Property < sizeof(PropertyMap) / sizeof(PropertyMap[0]) - && PropertyMap[Property].nameW) + if (Property < ARRAY_SIZE(PropertyMap) && PropertyMap[Property].nameW) { DWORD size = PropertyBufferSize; LONG l = RegQueryValueExW(device->key, PropertyMap[Property].nameW, @@ -3117,8 +3115,7 @@ BOOL WINAPI SetupDiSetDeviceRegistryPropertyA( return FALSE; } device = (struct device *)DeviceInfoData->Reserved; - if (Property < sizeof(PropertyMap) / sizeof(PropertyMap[0]) - && PropertyMap[Property].nameA) + if (Property < ARRAY_SIZE(PropertyMap) && PropertyMap[Property].nameA) { LONG l = RegSetValueExA(device->key, PropertyMap[Property].nameA, 0, PropertyMap[Property].regType, PropertyBuffer, diff --git a/dlls/setupapi/dialog.c b/dlls/setupapi/dialog.c index 24a46e8535..fc74cfc172 100644 --- a/dlls/setupapi/dialog.c +++ b/dlls/setupapi/dialog.c @@ -64,28 +64,23 @@ static void promptdisk_init(HWND hwnd, struct promptdisk_params *params) WCHAR format[256]; WCHAR unknown[256]; DWORD_PTR args[2]; - LoadStringW(SETUPAPI_hInstance, IDS_PROMPTDISK, format, - sizeof(format)/sizeof(format[0])); + LoadStringW(SETUPAPI_hInstance, IDS_PROMPTDISK, format, ARRAY_SIZE(format)); args[0] = (DWORD_PTR)params->FileSought; if(params->DiskName) args[1] = (DWORD_PTR)params->DiskName; else { - LoadStringW(SETUPAPI_hInstance, IDS_UNKNOWN, unknown, - sizeof(unknown)/sizeof(unknown[0])); + LoadStringW(SETUPAPI_hInstance, IDS_UNKNOWN, unknown, ARRAY_SIZE(unknown)); args[1] = (DWORD_PTR)unknown; } FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ARGUMENT_ARRAY, - format, 0, 0, message, sizeof(message)/sizeof(*message), - (__ms_va_list*)args); + format, 0, 0, message, ARRAY_SIZE(message), (__ms_va_list*)args); SetDlgItemTextW(hwnd, IDC_FILENEEDED, message); - LoadStringW(SETUPAPI_hInstance, IDS_INFO, message, - sizeof(message)/sizeof(message[0])); + LoadStringW(SETUPAPI_hInstance, IDS_INFO, message, ARRAY_SIZE(message)); SetDlgItemTextW(hwnd, IDC_INFO, message); - LoadStringW(SETUPAPI_hInstance, IDS_COPYFROM, message, - sizeof(message)/sizeof(message[0])); + LoadStringW(SETUPAPI_hInstance, IDS_COPYFROM, message, ARRAY_SIZE(message)); SetDlgItemTextW(hwnd, IDC_COPYFROM, message); } if(params->DiskPromptStyle & IDF_NOBROWSE) diff --git a/dlls/setupapi/fakedll.c b/dlls/setupapi/fakedll.c index d310cc9c31..e0d012a034 100644 --- a/dlls/setupapi/fakedll.c +++ b/dlls/setupapi/fakedll.c @@ -637,14 +637,14 @@ static BOOL create_winsxs_dll( const WCHAR *dll_name, const xmlstr_t *arch, cons if (!(filename = strrchrW( dll_name, '\\' ))) filename = dll_name; else filename++; - path_len = GetWindowsDirectoryW( NULL, 0 ) + 1 + sizeof(winsxsW)/sizeof(WCHAR) + path_len = GetWindowsDirectoryW( NULL, 0 ) + 1 + ARRAY_SIZE( winsxsW ) + arch->len + name->len + key->len + version->len + 18 + strlenW( filename ) + 1; path = HeapAlloc( GetProcessHeap(), 0, path_len * sizeof(WCHAR) ); pos = GetWindowsDirectoryW( path, path_len ); path[pos++] = '\\'; memcpy( path + pos, winsxsW, sizeof(winsxsW) ); - pos += sizeof(winsxsW) / sizeof(WCHAR); + pos += ARRAY_SIZE( winsxsW ); get_manifest_filename( arch, name, key, version, lang, path + pos, path_len - pos ); pos += strlenW( path + pos ); path[pos++] = '\\'; @@ -672,14 +672,14 @@ static BOOL create_manifest( const xmlstr_t *arch, const xmlstr_t *name, const x HANDLE handle; BOOL ret = FALSE; - path_len = GetWindowsDirectoryW( NULL, 0 ) + 1 + sizeof(winsxsW)/sizeof(WCHAR) - + arch->len + name->len + key->len + version->len + 18 + sizeof(extensionW)/sizeof(WCHAR); + path_len = GetWindowsDirectoryW( NULL, 0 ) + 1 + ARRAY_SIZE( winsxsW ) + + arch->len + name->len + key->len + version->len + 18 + ARRAY_SIZE( extensionW ); path = HeapAlloc( GetProcessHeap(), 0, path_len * sizeof(WCHAR) ); pos = GetWindowsDirectoryW( path, MAX_PATH ); path[pos++] = '\\'; memcpy( path + pos, winsxsW, sizeof(winsxsW) ); - pos += sizeof(winsxsW) / sizeof(WCHAR); + pos += ARRAY_SIZE( winsxsW ); get_manifest_filename( arch, name, key, version, lang, path + pos, MAX_PATH - pos ); strcatW( path + pos, extensionW ); handle = CreateFileW( path, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL ); @@ -730,7 +730,7 @@ static BOOL CALLBACK register_manifest( HMODULE module, const WCHAR *type, WCHAR SIZE_T len; HRSRC rsrc; - if (IS_INTRESOURCE(res_name) || strncmpW( res_name, manifestW, sizeof(manifestW)/sizeof(WCHAR) )) + if (IS_INTRESOURCE( res_name ) || strncmpW( res_name, manifestW, ARRAY_SIZE( manifestW ))) return TRUE; rsrc = FindResourceW( module, res_name, type ); diff --git a/dlls/setupapi/install.c b/dlls/setupapi/install.c index 5a76e3a581..5b2d4b8ee3 100644 --- a/dlls/setupapi/install.c +++ b/dlls/setupapi/install.c @@ -435,13 +435,13 @@ static BOOL registry_callback( HINF hinf, PCWSTR field, void *arg ) INT flags; /* get root */ - if (!SetupGetStringFieldW( &context, 1, buffer, sizeof(buffer)/sizeof(WCHAR), NULL )) + if (!SetupGetStringFieldW( &context, 1, buffer, ARRAY_SIZE( buffer ), NULL )) continue; if (!(root_key = get_root_key( buffer, info->default_root ))) continue; /* get key */ - if (!SetupGetStringFieldW( &context, 2, buffer, sizeof(buffer)/sizeof(WCHAR), NULL )) + if (!SetupGetStringFieldW( &context, 2, buffer, ARRAY_SIZE( buffer ), NULL )) *buffer = 0; /* get flags */ @@ -480,7 +480,7 @@ static BOOL registry_callback( HINF hinf, PCWSTR field, void *arg ) TRACE( "key %p %s\n", root_key, debugstr_w(buffer) ); /* get value name */ - if (!SetupGetStringFieldW( &context, 3, buffer, sizeof(buffer)/sizeof(WCHAR), NULL )) + if (!SetupGetStringFieldW( &context, 3, buffer, ARRAY_SIZE( buffer ), NULL )) *buffer = 0; /* and now do it */ @@ -669,7 +669,7 @@ static BOOL register_dlls_callback( HINF hinf, PCWSTR field, void *arg ) if (!(path = PARSER_get_dest_dir( &context ))) continue; /* get dll name */ - if (!SetupGetStringFieldW( &context, 3, buffer, sizeof(buffer)/sizeof(WCHAR), NULL )) + if (!SetupGetStringFieldW( &context, 3, buffer, ARRAY_SIZE( buffer ), NULL )) goto done; if (!(p = HeapReAlloc( GetProcessHeap(), 0, path, (strlenW(path) + strlenW(buffer) + 2) * sizeof(WCHAR) ))) goto done; @@ -686,7 +686,7 @@ static BOOL register_dlls_callback( HINF hinf, PCWSTR field, void *arg ) /* get command line */ args = NULL; - if (SetupGetStringFieldW( &context, 6, buffer, sizeof(buffer)/sizeof(WCHAR), NULL )) + if (SetupGetStringFieldW( &context, 6, buffer, ARRAY_SIZE( buffer ), NULL )) args = buffer; ret = do_register_dll( info, path, flags, timeout, args ); @@ -717,7 +717,7 @@ static BOOL fake_dlls_callback( HINF hinf, PCWSTR field, void *arg ) if (!(path = PARSER_get_dest_dir( &context ))) continue; /* get dll name */ - if (!SetupGetStringFieldW( &context, 3, buffer, sizeof(buffer)/sizeof(WCHAR), NULL )) + if (!SetupGetStringFieldW( &context, 3, buffer, ARRAY_SIZE( buffer ), NULL )) goto done; if (!(p = HeapReAlloc( GetProcessHeap(), 0, path, (strlenW(path) + strlenW(buffer) + 2) * sizeof(WCHAR) ))) goto done; @@ -727,7 +727,7 @@ static BOOL fake_dlls_callback( HINF hinf, PCWSTR field, void *arg ) strcpyW( p, buffer ); /* get source dll */ - if (SetupGetStringFieldW( &context, 4, buffer, sizeof(buffer)/sizeof(WCHAR), NULL )) + if (SetupGetStringFieldW( &context, 4, buffer, ARRAY_SIZE( buffer ), NULL )) p = buffer; /* otherwise use target base name as default source */ create_fake_dll( path, p ); /* ignore errors */ @@ -758,16 +758,13 @@ static BOOL update_ini_callback( HINF hinf, PCWSTR field, void *arg ) WCHAR string[MAX_INF_STRING_LENGTH]; LPWSTR divider; - if (!SetupGetStringFieldW( &context, 1, filename, - sizeof(filename)/sizeof(WCHAR), NULL )) + if (!SetupGetStringFieldW( &context, 1, filename, ARRAY_SIZE( filename ), NULL )) continue; - if (!SetupGetStringFieldW( &context, 2, section, - sizeof(section)/sizeof(WCHAR), NULL )) + if (!SetupGetStringFieldW( &context, 2, section, ARRAY_SIZE( section ), NULL )) continue; - if (!SetupGetStringFieldW( &context, 4, buffer, - sizeof(buffer)/sizeof(WCHAR), NULL )) + if (!SetupGetStringFieldW( &context, 4, buffer, ARRAY_SIZE( buffer ), NULL )) continue; divider = strchrW(buffer,'='); @@ -949,7 +946,7 @@ static BOOL iterate_section_fields( HINF hinf, PCWSTR section, PCWSTR key, { WCHAR static_buffer[200]; WCHAR *buffer = static_buffer; - DWORD size = sizeof(static_buffer)/sizeof(WCHAR); + DWORD size = ARRAY_SIZE( static_buffer ); INFCONTEXT context; BOOL ret = FALSE; @@ -1211,7 +1208,7 @@ void WINAPI InstallHinfSectionW( HWND hwnd, HINSTANCE handle, LPCWSTR cmdline, I static const WCHAR nt_genericW[] = {'.','n','t',0}; static const WCHAR servicesW[] = {'.','S','e','r','v','i','c','e','s',0}; - WCHAR *s, *path, section[MAX_PATH + (sizeof(nt_platformW) + sizeof(servicesW)) / sizeof(WCHAR)]; + WCHAR *s, *path, section[MAX_PATH + ARRAY_SIZE( nt_platformW ) + ARRAY_SIZE( servicesW )]; void *callback_context; UINT mode; HINF hinf; diff --git a/dlls/setupapi/misc.c b/dlls/setupapi/misc.c index 98a6ed7e89..c83df698ad 100644 --- a/dlls/setupapi/misc.c +++ b/dlls/setupapi/misc.c @@ -934,7 +934,7 @@ BOOL WINAPI SetupCopyOEMInfW( PCWSTR source, PCWSTR location, return FALSE; } - if (!GetWindowsDirectoryW( target, sizeof(target)/sizeof(WCHAR) )) return FALSE; + if (!GetWindowsDirectoryW( target, ARRAY_SIZE( target ))) return FALSE; strcatW( target, inf ); if ((p = strrchrW( source, '\\' ))) @@ -963,7 +963,7 @@ BOOL WINAPI SetupCopyOEMInfW( PCWSTR source, PCWSTR location, p = strrchrW( target, '\\' ) + 1; memcpy( p, oem, sizeof(oem) ); - p += sizeof(oem)/sizeof(oem[0]) - 1; + p += ARRAY_SIZE( oem ) - 1; /* generate OEMnnn.inf ending */ for (i = 0; i < OEM_INDEX_LIMIT; i++) @@ -1004,7 +1004,7 @@ BOOL WINAPI SetupCopyOEMInfW( PCWSTR source, PCWSTR location, if (hinf == INVALID_HANDLE_VALUE) return FALSE; if (SetupGetLineTextW( NULL, hinf, wszVersion, wszCatalogFile, catalog_file, - sizeof(catalog_file)/sizeof(catalog_file[0]), NULL )) + ARRAY_SIZE( catalog_file ), NULL )) { WCHAR source_cat[MAX_PATH]; HCATADMIN handle; @@ -1099,7 +1099,7 @@ BOOL WINAPI SetupUninstallOEMInfW( PCWSTR inf_file, DWORD flags, PVOID reserved return FALSE; } - if (!GetWindowsDirectoryW( target, sizeof(target)/sizeof(WCHAR) )) return FALSE; + if (!GetWindowsDirectoryW( target, ARRAY_SIZE( target ))) return FALSE; strcatW( target, infW ); strcatW( target, inf_file ); diff --git a/dlls/setupapi/parser.c b/dlls/setupapi/parser.c index 5cc3ef58ce..bc5dba0454 100644 --- a/dlls/setupapi/parser.c +++ b/dlls/setupapi/parser.c @@ -226,7 +226,7 @@ static int add_section( struct inf_file *file, const WCHAR *name ) if (!(section = HeapAlloc( GetProcessHeap(), 0, sizeof(*section) ))) return -1; section->name = name; section->nb_lines = 0; - section->alloc_lines = sizeof(section->lines)/sizeof(section->lines[0]); + section->alloc_lines = ARRAY_SIZE( section->lines ); file->sections[file->nb_sections] = section; return file->nb_sections++; } @@ -425,7 +425,7 @@ static unsigned int PARSER_string_substA( const struct inf_file *file, const WCH WCHAR buffW[MAX_STRING_LEN+1]; DWORD ret; - unsigned int len = PARSER_string_substW( file, text, buffW, sizeof(buffW)/sizeof(WCHAR) ); + unsigned int len = PARSER_string_substW( file, text, buffW, ARRAY_SIZE( buffW )); if (!buffer) RtlUnicodeToMultiByteSize( &ret, buffW, len * sizeof(WCHAR) ); else { @@ -449,7 +449,7 @@ static WCHAR *push_string( struct inf_file *file, const WCHAR *string ) /* push the current state on the parser stack */ static inline void push_state( struct parser *parser, enum parser_state state ) { - assert( parser->stack_pos < sizeof(parser->stack)/sizeof(parser->stack[0]) ); + assert( parser->stack_pos < ARRAY_SIZE( parser->stack )); parser->stack[parser->stack_pos++] = state; } @@ -1217,8 +1217,7 @@ BOOL WINAPI SetupOpenAppendInfFileW( PCWSTR name, HINF parent_hinf, UINT *error int idx = 1; if (!SetupFindFirstLineW( parent_hinf, Version, LayoutFile, &context )) return FALSE; - while (SetupGetStringFieldW( &context, idx++, filename, - sizeof(filename)/sizeof(WCHAR), NULL )) + while (SetupGetStringFieldW( &context, idx++, filename, ARRAY_SIZE( filename ), NULL )) { child_hinf = SetupOpenInfFileW( filename, NULL, INF_STYLE_WIN4, error ); if (child_hinf == INVALID_HANDLE_VALUE) return FALSE; diff --git a/dlls/setupapi/query.c b/dlls/setupapi/query.c index eaeadc0f2b..627c543d6b 100644 --- a/dlls/setupapi/query.c +++ b/dlls/setupapi/query.c @@ -689,8 +689,7 @@ BOOL WINAPI SetupQueryInfOriginalFileInformationW( if (!SetupGetLineTextW(NULL, hinf, wszVersion, wszCatalogFile, OriginalFileInfo->OriginalCatalogName, - sizeof(OriginalFileInfo->OriginalCatalogName)/sizeof(OriginalFileInfo->OriginalCatalogName[0]), - NULL)) + ARRAY_SIZE(OriginalFileInfo->OriginalCatalogName), NULL)) { OriginalFileInfo->OriginalCatalogName[0] = '\0'; } diff --git a/dlls/setupapi/queue.c b/dlls/setupapi/queue.c index d2e2a1d9d5..cc17966770 100644 --- a/dlls/setupapi/queue.c +++ b/dlls/setupapi/queue.c @@ -755,9 +755,9 @@ BOOL WINAPI SetupQueueCopySectionW( HSPFILEQ queue, PCWSTR src_root, HINF hinf, if (!(params.TargetDirectory = dest_dir = get_destination_dir( hinf, section ))) return FALSE; do { - if (!SetupGetStringFieldW( &context, 1, dest, sizeof(dest)/sizeof(WCHAR), NULL )) + if (!SetupGetStringFieldW( &context, 1, dest, ARRAY_SIZE( dest ), NULL )) goto end; - if (!SetupGetStringFieldW( &context, 2, src, sizeof(src)/sizeof(WCHAR), NULL )) *src = 0; + if (!SetupGetStringFieldW( &context, 2, src, ARRAY_SIZE( src ), NULL )) *src = 0; if (!SetupGetIntField( &context, 4, &flags )) flags = 0; /* FIXME */ params.SourceFilename = *src ? src : NULL; @@ -806,7 +806,7 @@ BOOL WINAPI SetupQueueDeleteSectionW( HSPFILEQ queue, HINF hinf, HINF hlist, PCW if (!(dest_dir = get_destination_dir( hinf, section ))) return FALSE; do { - if (!SetupGetStringFieldW( &context, 1, buffer, sizeof(buffer)/sizeof(WCHAR), NULL )) + if (!SetupGetStringFieldW( &context, 1, buffer, ARRAY_SIZE( buffer ), NULL )) goto done; if (!SetupGetIntField( &context, 4, &flags )) flags = 0; if (!SetupQueueDeleteW( queue, dest_dir, buffer )) goto done; @@ -854,9 +854,9 @@ BOOL WINAPI SetupQueueRenameSectionW( HSPFILEQ queue, HINF hinf, HINF hlist, PCW if (!(dest_dir = get_destination_dir( hinf, section ))) return FALSE; do { - if (!SetupGetStringFieldW( &context, 1, dst, sizeof(dst)/sizeof(WCHAR), NULL )) + if (!SetupGetStringFieldW( &context, 1, dst, ARRAY_SIZE( dst ), NULL )) goto done; - if (!SetupGetStringFieldW( &context, 2, src, sizeof(src)/sizeof(WCHAR), NULL )) + if (!SetupGetStringFieldW( &context, 2, src, ARRAY_SIZE( src ), NULL )) goto done; if (!SetupQueueRenameW( queue, dest_dir, src, NULL, dst )) goto done; } while (SetupFindNextLine( &context, &context )); -- 2.14.4

1 0

[PATCH 1/2] shell32/brsfolder: Add shortcut to rename folders with the F2 key
by Fabian Maurer 14 Sep '18

14 Sep '18

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/shell32/brsfolder.c | 36 +++++++++++++++++++++++++++++------- 1 file changed, 29 insertions(+), 7 deletions(-) diff --git a/dlls/shell32/brsfolder.c b/dlls/shell32/brsfolder.c index daddf1e9ec..91936bd9ce 100644 --- a/dlls/shell32/brsfolder.c +++ b/dlls/shell32/brsfolder.c @@ -613,6 +613,32 @@ static LRESULT BrsFolder_Treeview_Rename(browse_info *info, NMTVDISPINFOW *pnmtv return 0; } +static HRESULT BrsFolder_Rename(browse_info *info, HTREEITEM rename) +{ + SendMessageW(info->hwndTreeView, TVM_SELECTITEM, TVGN_CARET, (LPARAM)rename); + SendMessageW(info->hwndTreeView, TVM_EDITLABELW, 0, (LPARAM)rename); + return S_OK; +} + +static LRESULT BrsFolder_Treeview_Keydown(browse_info *info, LPNMTVKEYDOWN keydown) +{ + HTREEITEM selected_item; + + /* Old dialog doesn't support those advanced features */ + if (!(info->lpBrowseInfo->ulFlags & BIF_NEWDIALOGSTYLE)) + return 0; + + selected_item = (HTREEITEM)SendMessageW(info->hwndTreeView, TVM_GETNEXTITEM, TVGN_CARET, 0); + + switch (keydown->wVKey) + { + case VK_F2: + BrsFolder_Rename(info, selected_item); + break; + } + return 0; +} + static LRESULT BrsFolder_OnNotify( browse_info *info, UINT CtlID, LPNMHDR lpnmh ) { NMTREEVIEWW *pnmtv = (NMTREEVIEWW *)lpnmh; @@ -640,6 +666,9 @@ static LRESULT BrsFolder_OnNotify( browse_info *info, UINT CtlID, LPNMHDR lpnmh case TVN_ENDLABELEDITW: return BrsFolder_Treeview_Rename( info, (LPNMTVDISPINFOW)pnmtv ); + case TVN_KEYDOWN: + return BrsFolder_Treeview_Keydown( info, (LPNMTVKEYDOWN)pnmtv ); + default: WARN("unhandled (%d)\n", pnmtv->hdr.code); break; @@ -721,13 +750,6 @@ static BOOL BrsFolder_OnCreate( HWND hWnd, browse_info *info ) return TRUE; } -static HRESULT BrsFolder_Rename(browse_info *info, HTREEITEM rename) -{ - SendMessageW(info->hwndTreeView, TVM_SELECTITEM, TVGN_CARET, (LPARAM)rename); - SendMessageW(info->hwndTreeView, TVM_EDITLABELW, 0, (LPARAM)rename); - return S_OK; -} - static HRESULT BrsFolder_NewFolder(browse_info *info) { DWORD flags = BrowseFlagsToSHCONTF(info->lpBrowseInfo->ulFlags); -- 2.19.0

1 1

[PATCH] wined3d: Make the resource parameter to wined3d_resource_get_decompress_format() const.
by Henri Verbeet 14 Sep '18

14 Sep '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/resource.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 95c9b7ff197..a3dadec3ab1 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -478,7 +478,7 @@ void wined3d_resource_update_draw_binding(struct wined3d_resource *resource) } } -const struct wined3d_format *wined3d_resource_get_decompress_format(struct wined3d_resource *resource) +const struct wined3d_format *wined3d_resource_get_decompress_format(const struct wined3d_resource *resource) { const struct wined3d_adapter *adapter = resource->device->adapter; if (resource->format_flags & (WINED3DFMT_FLAG_SRGB_READ | WINED3DFMT_FLAG_SRGB_WRITE) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index aea874f84ea..88e0756704a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3126,7 +3126,7 @@ void resource_unload(struct wined3d_resource *resource) DECLSPEC_HIDDEN; BOOL wined3d_resource_allocate_sysmem(struct wined3d_resource *resource) DECLSPEC_HIDDEN; void wined3d_resource_free_sysmem(struct wined3d_resource *resource) DECLSPEC_HIDDEN; const struct wined3d_format *wined3d_resource_get_decompress_format( - struct wined3d_resource *resource) DECLSPEC_HIDDEN; + const struct wined3d_resource *resource) DECLSPEC_HIDDEN; GLbitfield wined3d_resource_gl_map_flags(DWORD d3d_flags) DECLSPEC_HIDDEN; GLenum wined3d_resource_gl_legacy_map_flags(DWORD d3d_flags) DECLSPEC_HIDDEN; BOOL wined3d_resource_is_offscreen(struct wined3d_resource *resource) DECLSPEC_HIDDEN; -- 2.11.0

1 0

[PATCH 2/2] hidclass.sys: use IoRegisterDeviceInterface
by Aric Stewart 14 Sep '18

14 Sep '18

Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- dlls/hidclass.sys/device.c | 60 ++++++++++++++++------------------------------ dlls/hidclass.sys/hid.h | 2 +- dlls/hidclass.sys/pnp.c | 4 +--- 3 files changed, 22 insertions(+), 44 deletions(-)

1 0

[PATCH 1/2] d2d1: Implement GetSurface() for bitmaps.
by Nikolay Sivov 14 Sep '18

14 Sep '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/bitmap.c | 69 ++++++++++++++++++++++++---------------- dlls/d2d1/d2d1_private.h | 12 +++++-- dlls/d2d1/device.c | 9 ++---- dlls/d2d1/tests/d2d1.c | 63 ++++++++++++++++++++---------------- 4 files changed, 90 insertions(+), 63 deletions(-) diff --git a/dlls/d2d1/bitmap.c b/dlls/d2d1/bitmap.c index 8b5b6aa0a9..f7db91b652 100644 --- a/dlls/d2d1/bitmap.c +++ b/dlls/d2d1/bitmap.c @@ -70,6 +70,8 @@ static ULONG STDMETHODCALLTYPE d2d_bitmap_Release(ID2D1Bitmap1 *iface) if (!refcount) { ID3D10ShaderResourceView_Release(bitmap->view); + if (bitmap->surface) + IDXGISurface_Release(bitmap->surface); ID2D1Factory_Release(bitmap->factory); heap_free(bitmap); } @@ -188,9 +190,15 @@ static D2D1_BITMAP_OPTIONS STDMETHODCALLTYPE d2d_bitmap_GetOptions(ID2D1Bitmap1 static HRESULT STDMETHODCALLTYPE d2d_bitmap_GetSurface(ID2D1Bitmap1 *iface, IDXGISurface **surface) { - FIXME("iface %p, surface %p stub!\n", iface, surface); + struct d2d_bitmap *bitmap = impl_from_ID2D1Bitmap1(iface); - return E_NOTIMPL; + TRACE("iface %p, surface %p.\n", iface, surface); + + *surface = bitmap->surface; + if (*surface) + IDXGISurface_AddRef(*surface); + + return *surface ? S_OK : D2DERR_INVALID_CALL; } static HRESULT STDMETHODCALLTYPE d2d_bitmap_Map(ID2D1Bitmap1 *iface, D2D1_MAP_OPTIONS options, @@ -264,7 +272,7 @@ static BOOL format_supported(const D2D1_PIXEL_FORMAT *format) } static void d2d_bitmap_init(struct d2d_bitmap *bitmap, ID2D1Factory *factory, - ID3D10ShaderResourceView *view, D2D1_SIZE_U size, const D2D1_BITMAP_PROPERTIES1 *desc) + ID3D10ShaderResourceView *view, IDXGISurface *surface, D2D1_SIZE_U size, const D2D1_BITMAP_PROPERTIES1 *desc) { bitmap->ID2D1Bitmap1_iface.lpVtbl = &d2d_bitmap_vtbl; bitmap->refcount = 1; @@ -275,6 +283,9 @@ static void d2d_bitmap_init(struct d2d_bitmap *bitmap, ID2D1Factory *factory, bitmap->dpi_x = desc->dpiX; bitmap->dpi_y = desc->dpiY; bitmap->options = desc->bitmapOptions; + bitmap->surface = surface; + if (bitmap->surface) + IDXGISurface_AddRef(bitmap->surface); if (bitmap->dpi_x == 0.0f && bitmap->dpi_y == 0.0f) { @@ -283,13 +294,14 @@ static void d2d_bitmap_init(struct d2d_bitmap *bitmap, ID2D1Factory *factory, } } -HRESULT d2d_bitmap_create(ID2D1Factory *factory, ID3D10Device *device, D2D1_SIZE_U size, const void *src_data, +HRESULT d2d_bitmap_create(struct d2d_device_context *context, D2D1_SIZE_U size, const void *src_data, UINT32 pitch, const D2D1_BITMAP_PROPERTIES1 *desc, struct d2d_bitmap **bitmap) { D3D10_SUBRESOURCE_DATA resource_data; D3D10_TEXTURE2D_DESC texture_desc; ID3D10ShaderResourceView *view; ID3D10Texture2D *texture; + IDXGISurface *surface; HRESULT hr; if (!format_supported(&desc->pixelFormat)) @@ -314,37 +326,46 @@ HRESULT d2d_bitmap_create(ID2D1Factory *factory, ID3D10Device *device, D2D1_SIZE resource_data.pSysMem = src_data; resource_data.SysMemPitch = pitch; - if (FAILED(hr = ID3D10Device_CreateTexture2D(device, &texture_desc, + if (FAILED(hr = ID3D10Device_CreateTexture2D(context->device, &texture_desc, src_data ? &resource_data : NULL, &texture))) { ERR("Failed to create texture, hr %#x.\n", hr); return hr; } - hr = ID3D10Device_CreateShaderResourceView(device, (ID3D10Resource *)texture, NULL, &view); + if (FAILED(hr = ID3D10Texture2D_QueryInterface(texture, &IID_IDXGISurface, (void **)&surface))) + { + WARN("Failed to get surface interface, hr %#x.\n", hr); + ID3D10Texture2D_Release(texture); + return hr; + } + + hr = ID3D10Device_CreateShaderResourceView(context->device, (ID3D10Resource *)texture, NULL, &view); ID3D10Texture2D_Release(texture); if (FAILED(hr)) { ERR("Failed to create view, hr %#x.\n", hr); + IDXGISurface_Release(surface); return hr; } if ((*bitmap = heap_alloc_zero(sizeof(**bitmap)))) { - d2d_bitmap_init(*bitmap, factory, view, size, desc); + d2d_bitmap_init(*bitmap, context->factory, view, d2d_device_context_is_dxgi_target(context) ? surface : NULL, + size, desc); TRACE("Created bitmap %p.\n", *bitmap); } ID3D10ShaderResourceView_Release(view); + IDXGISurface_Release(surface); return *bitmap ? S_OK : E_OUTOFMEMORY; } -HRESULT d2d_bitmap_create_shared(ID2D1DeviceContext *context, ID3D10Device *target_device, - REFIID iid, void *data, const D2D1_BITMAP_PROPERTIES1 *desc, struct d2d_bitmap **bitmap) +HRESULT d2d_bitmap_create_shared(struct d2d_device_context *context, REFIID iid, void *data, + const D2D1_BITMAP_PROPERTIES1 *desc, struct d2d_bitmap **bitmap) { D2D1_BITMAP_PROPERTIES1 d; - ID2D1Factory *factory; if (IsEqualGUID(iid, &IID_ID2D1Bitmap)) { @@ -352,8 +373,7 @@ HRESULT d2d_bitmap_create_shared(ID2D1DeviceContext *context, ID3D10Device *targ ID3D10Device *device; HRESULT hr = S_OK; - ID2D1DeviceContext_GetFactory(context, &factory); - if (src_impl->factory != factory) + if (src_impl->factory != context->factory) { hr = D2DERR_WRONG_FACTORY; goto failed; @@ -361,7 +381,7 @@ HRESULT d2d_bitmap_create_shared(ID2D1DeviceContext *context, ID3D10Device *targ ID3D10ShaderResourceView_GetDevice(src_impl->view, &device); ID3D10Device_Release(device); - if (device != target_device) + if (device != context->device) { hr = D2DERR_UNSUPPORTED_OPERATION; goto failed; @@ -391,11 +411,10 @@ HRESULT d2d_bitmap_create_shared(ID2D1DeviceContext *context, ID3D10Device *targ goto failed; } - d2d_bitmap_init(*bitmap, factory, src_impl->view, src_impl->pixel_size, desc); + d2d_bitmap_init(*bitmap, context->factory, src_impl->view, NULL, src_impl->pixel_size, desc); TRACE("Created bitmap %p.\n", *bitmap); failed: - ID2D1Factory_Release(factory); return hr; } @@ -417,13 +436,13 @@ HRESULT d2d_bitmap_create_shared(ID2D1DeviceContext *context, ID3D10Device *targ ID3D10Resource_GetDevice(resource, &device); ID3D10Device_Release(device); - if (device != target_device) + if (device != context->device) { ID3D10Resource_Release(resource); return D2DERR_UNSUPPORTED_OPERATION; } - hr = ID3D10Device_CreateShaderResourceView(target_device, resource, NULL, &view); + hr = ID3D10Device_CreateShaderResourceView(context->device, resource, NULL, &view); ID3D10Resource_Release(resource); if (FAILED(hr)) { @@ -455,22 +474,18 @@ HRESULT d2d_bitmap_create_shared(ID2D1DeviceContext *context, ID3D10Device *targ if (d.dpiX == 0.0f || d.dpiY == 0.0f) { - float dpi_x, dpi_y; - - ID2D1DeviceContext_GetDpi(context, &dpi_x, &dpi_y); if (d.dpiX == 0.0f) - d.dpiX = dpi_x; + d.dpiX = context->desc.dpiX; if (d.dpiY == 0.0f) - d.dpiY = dpi_y; + d.dpiY = context->desc.dpiY; } pixel_size.width = surface_desc.Width; pixel_size.height = surface_desc.Height; - ID2D1DeviceContext_GetFactory(context, &factory); - d2d_bitmap_init(*bitmap, factory, view, pixel_size, &d); + d2d_bitmap_init(*bitmap, context->factory, view, d2d_device_context_is_dxgi_target(context) ? surface : NULL, + pixel_size, &d); ID3D10ShaderResourceView_Release(view); - ID2D1Factory_Release(factory); TRACE("Created bitmap %p.\n", *bitmap); return S_OK; @@ -481,7 +496,7 @@ HRESULT d2d_bitmap_create_shared(ID2D1DeviceContext *context, ID3D10Device *targ return E_INVALIDARG; } -HRESULT d2d_bitmap_create_from_wic_bitmap(ID2D1Factory *factory, ID3D10Device *device, IWICBitmapSource *bitmap_source, +HRESULT d2d_bitmap_create_from_wic_bitmap(struct d2d_device_context *context, IWICBitmapSource *bitmap_source, const D2D1_BITMAP_PROPERTIES1 *desc, struct d2d_bitmap **bitmap) { const D2D1_PIXEL_FORMAT *d2d_format; @@ -581,7 +596,7 @@ HRESULT d2d_bitmap_create_from_wic_bitmap(ID2D1Factory *factory, ID3D10Device *d return hr; } - hr = d2d_bitmap_create(factory, device, size, data, pitch, &bitmap_desc, bitmap); + hr = d2d_bitmap_create(context, size, data, pitch, &bitmap_desc, bitmap); heap_free(data); diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 5f83f8fde2..510b61b219 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -160,6 +160,11 @@ HRESULT d2d_d3d_create_render_target(ID2D1Factory *factory, IDXGISurface *surfac void **render_target) DECLSPEC_HIDDEN; HRESULT d2d_d3d_render_target_create_rtv(ID2D1RenderTarget *render_target, IDXGISurface1 *surface) DECLSPEC_HIDDEN; +static inline BOOL d2d_device_context_is_dxgi_target(const struct d2d_device_context *context) +{ + return !context->ops; +} + struct d2d_wic_render_target { IUnknown IUnknown_iface; @@ -339,6 +344,7 @@ struct d2d_bitmap ID2D1Factory *factory; ID3D10ShaderResourceView *view; + IDXGISurface *surface; D2D1_SIZE_U pixel_size; D2D1_PIXEL_FORMAT format; float dpi_x; @@ -346,11 +352,11 @@ struct d2d_bitmap D2D1_BITMAP_OPTIONS options; }; -HRESULT d2d_bitmap_create(ID2D1Factory *factory, ID3D10Device *device, D2D1_SIZE_U size, const void *src_data, +HRESULT d2d_bitmap_create(struct d2d_device_context *context, D2D1_SIZE_U size, const void *src_data, UINT32 pitch, const D2D1_BITMAP_PROPERTIES1 *desc, struct d2d_bitmap **bitmap) DECLSPEC_HIDDEN; -HRESULT d2d_bitmap_create_shared(ID2D1DeviceContext *context, ID3D10Device *device, REFIID iid, void *data, +HRESULT d2d_bitmap_create_shared(struct d2d_device_context *context, REFIID iid, void *data, const D2D1_BITMAP_PROPERTIES1 *desc, struct d2d_bitmap **bitmap) DECLSPEC_HIDDEN; -HRESULT d2d_bitmap_create_from_wic_bitmap(ID2D1Factory *factory, ID3D10Device *device, IWICBitmapSource *bitmap_source, +HRESULT d2d_bitmap_create_from_wic_bitmap(struct d2d_device_context *context, IWICBitmapSource *bitmap_source, const D2D1_BITMAP_PROPERTIES1 *desc, struct d2d_bitmap **bitmap) DECLSPEC_HIDDEN; struct d2d_bitmap *unsafe_impl_from_ID2D1Bitmap(ID2D1Bitmap *iface) DECLSPEC_HIDDEN; diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index 649fcc4311..041cb33c90 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -343,8 +343,7 @@ static HRESULT STDMETHODCALLTYPE d2d_device_context_CreateBitmap(ID2D1DeviceCont bitmap_desc.colorContext = NULL; } - if (SUCCEEDED(hr = d2d_bitmap_create(context->factory, context->device, - size, src_data, pitch, desc ? &bitmap_desc : NULL, &object))) + if (SUCCEEDED(hr = d2d_bitmap_create(context, size, src_data, pitch, desc ? &bitmap_desc : NULL, &object))) *bitmap = (ID2D1Bitmap *)&object->ID2D1Bitmap1_iface; return hr; @@ -368,8 +367,7 @@ static HRESULT STDMETHODCALLTYPE d2d_device_context_CreateBitmapFromWicBitmap(ID bitmap_desc.colorContext = NULL; } - if (SUCCEEDED(hr = d2d_bitmap_create_from_wic_bitmap(context->factory, context->device, - bitmap_source, desc ? &bitmap_desc : NULL, &object))) + if (SUCCEEDED(hr = d2d_bitmap_create_from_wic_bitmap(context, bitmap_source, desc ? &bitmap_desc : NULL, &object))) *bitmap = (ID2D1Bitmap *)&object->ID2D1Bitmap1_iface; return hr; @@ -393,8 +391,7 @@ static HRESULT STDMETHODCALLTYPE d2d_device_context_CreateSharedBitmap(ID2D1Devi bitmap_desc.colorContext = NULL; } - if (SUCCEEDED(hr = d2d_bitmap_create_shared(iface, context->device, - iid, data, desc ? &bitmap_desc : NULL, &object))) + if (SUCCEEDED(hr = d2d_bitmap_create_shared(context, iid, data, desc ? &bitmap_desc : NULL, &object))) *bitmap = (ID2D1Bitmap *)&object->ID2D1Bitmap1_iface; return hr; diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 467d61314d..379edc1ff0 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -774,29 +774,30 @@ static ID2D1RenderTarget *create_render_target(IDXGISurface *surface) } #define check_bitmap_surface(b, s, o) check_bitmap_surface_(__LINE__, b, s, o) -static void check_bitmap_surface_(unsigned int line, ID2D1Bitmap1 *bitmap, BOOL has_surface, DWORD expected_options) +static void check_bitmap_surface_(unsigned int line, ID2D1Bitmap *bitmap, BOOL has_surface, DWORD expected_options) { D2D1_BITMAP_OPTIONS options; IDXGISurface *surface; + ID2D1Bitmap1 *bitmap1; HRESULT hr; - options = ID2D1Bitmap1_GetOptions(bitmap); + hr = ID2D1Bitmap_QueryInterface(bitmap, &IID_ID2D1Bitmap1, (void **)&bitmap1); + ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to get ID2D1Bitmap1 interface, hr %#x.\n", hr); + + options = ID2D1Bitmap1_GetOptions(bitmap1); ok_(__FILE__, line)(options == expected_options, "Unexpected bitmap options %#x, expected %#x.\n", options, expected_options); surface = (void *)0xdeadbeef; - hr = ID2D1Bitmap1_GetSurface(bitmap, &surface); + hr = ID2D1Bitmap1_GetSurface(bitmap1, &surface); if (has_surface) { D3D10_TEXTURE2D_DESC desc; ID3D10Texture2D *texture; - todo_wine ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to get bitmap surface, hr %#x.\n", hr); ok_(__FILE__, line)(!!surface, "Expected surface instance.\n"); - if (SUCCEEDED(hr)) - { /* Correlate with resource configuration. */ hr = IDXGISurface_QueryInterface(surface, &IID_ID3D10Texture2D, (void **)&texture); ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to get texture pointer, hr %#x.\n", hr); @@ -813,14 +814,13 @@ static void check_bitmap_surface_(unsigned int line, ID2D1Bitmap1 *bitmap, BOOL IDXGISurface_Release(surface); } - } else { - todo_wine { ok_(__FILE__, line)(hr == D2DERR_INVALID_CALL, "Unexpected hr %#x.\n", hr); ok_(__FILE__, line)(!surface, "Unexpected surface instance.\n"); } - } + + ID2D1Bitmap1_Release(bitmap1); } static inline struct geometry_sink *impl_from_ID2D1SimplifiedGeometrySink(ID2D1SimplifiedGeometrySink *iface) @@ -4162,18 +4162,12 @@ static void test_shared_bitmap(void) if (SUCCEEDED(hr)) { - ID2D1Bitmap1 *bitmap3; - size = ID2D1Bitmap_GetPixelSize(bitmap2); hr = IDXGISurface_GetDesc(surface2, &surface_desc); ok(SUCCEEDED(hr), "Failed to get surface description, hr %#x.\n", hr); ok(size.width == surface_desc.Width && size.height == surface_desc.Height, "Got wrong bitmap size.\n"); - hr = ID2D1Bitmap_QueryInterface(bitmap2, &IID_ID2D1Bitmap1, (void **)&bitmap3); - ok(SUCCEEDED(hr), "Failed to get ID2D1Bitmap1 pointer, hr %#x.\n", hr); - - check_bitmap_surface(bitmap3, TRUE, D2D1_BITMAP_OPTIONS_TARGET | D2D1_BITMAP_OPTIONS_CANNOT_DRAW); - ID2D1Bitmap1_Release(bitmap3); + check_bitmap_surface(bitmap2, TRUE, D2D1_BITMAP_OPTIONS_TARGET | D2D1_BITMAP_OPTIONS_CANNOT_DRAW); ID2D1Bitmap_Release(bitmap2); @@ -6592,8 +6586,9 @@ static void check_rt_bitmap_surface_(unsigned int line, ID2D1RenderTarget *rt, B { D2D1_BITMAP_PROPERTIES bitmap_desc; ID2D1RenderTarget *compatible_rt; + IWICImagingFactory *wic_factory; ID2D1DeviceContext *context; - ID2D1Bitmap1 *bitmap1; + IWICBitmap *wic_bitmap; ID2D1Bitmap *bitmap; D2D1_SIZE_U size; HRESULT hr; @@ -6603,6 +6598,7 @@ static void check_rt_bitmap_surface_(unsigned int line, ID2D1RenderTarget *rt, B 0x7f7f0000, }; + /* Raw data bitmap. */ set_size_u(&size, 1, 1); bitmap_desc.pixelFormat.format = DXGI_FORMAT_B8G8R8A8_UNORM; bitmap_desc.pixelFormat.alphaMode = D2D1_ALPHA_MODE_IGNORE; @@ -6611,14 +6607,31 @@ static void check_rt_bitmap_surface_(unsigned int line, ID2D1RenderTarget *rt, B hr = ID2D1RenderTarget_CreateBitmap(rt, size, bitmap_data, sizeof(*bitmap_data), &bitmap_desc, &bitmap); ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to create bitmap, hr %#x.\n", hr); - hr = ID2D1Bitmap_QueryInterface(bitmap, &IID_ID2D1Bitmap1, (void **)&bitmap1); - ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to get ID2D1Bitmap1 interface, hr %#x.\n", hr); + check_bitmap_surface_(line, bitmap, has_surface, options); - check_bitmap_surface_(line, bitmap1, has_surface, options); + ID2D1Bitmap_Release(bitmap); + + /* WIC bitmap. */ + CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + + hr = CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICImagingFactory, (void **)&wic_factory); + ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to create WIC imaging factory, hr %#x.\n", hr); + + hr = IWICImagingFactory_CreateBitmap(wic_factory, 16, 16, + &GUID_WICPixelFormat32bppPBGRA, WICBitmapCacheOnDemand, &wic_bitmap); + ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to create WIC bitmap, hr %#x.\n", hr); + IWICImagingFactory_Release(wic_factory); + + hr = ID2D1RenderTarget_CreateBitmapFromWicBitmap(rt, (IWICBitmapSource *)wic_bitmap, NULL, &bitmap); + ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to create bitmap from WIC source, hr %#x.\n", hr); + + check_bitmap_surface_(line, bitmap, has_surface, options); - ID2D1Bitmap1_Release(bitmap1); ID2D1Bitmap_Release(bitmap); + CoUninitialize(); + if (FAILED(ID2D1RenderTarget_QueryInterface(rt, &IID_ID2D1DeviceContext, (void **)&context))) { /* Compatible target follows its parent. */ @@ -6629,13 +6642,9 @@ static void check_rt_bitmap_surface_(unsigned int line, ID2D1RenderTarget *rt, B hr = ID2D1RenderTarget_CreateBitmap(compatible_rt, size, bitmap_data, sizeof(*bitmap_data), &bitmap_desc, &bitmap); ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to create bitmap, hr %#x.\n", hr); - hr = ID2D1Bitmap_QueryInterface(bitmap, &IID_ID2D1Bitmap1, (void **)&bitmap1); - ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to get ID2D1Bitmap1 interface, hr %#x.\n", hr); - - check_bitmap_surface_(line, bitmap1, has_surface, options); + check_bitmap_surface_(line, bitmap, has_surface, options); ID2D1RenderTarget_Release(compatible_rt); - ID2D1Bitmap1_Release(bitmap1); ID2D1Bitmap_Release(bitmap); } else @@ -6707,7 +6716,7 @@ if (SUCCEEDED(hr)) hr = ID2D1DeviceContext_CreateBitmapFromDxgiSurface(device_context, surface, NULL, &bitmap); ok(SUCCEEDED(hr), "Failed to create a bitmap, hr %#x.\n", hr); - check_bitmap_surface(bitmap, TRUE, D2D1_BITMAP_OPTIONS_TARGET | D2D1_BITMAP_OPTIONS_CANNOT_DRAW); + check_bitmap_surface((ID2D1Bitmap *)bitmap, TRUE, D2D1_BITMAP_OPTIONS_TARGET | D2D1_BITMAP_OPTIONS_CANNOT_DRAW); check_rt_bitmap_surface((ID2D1RenderTarget *)device_context, TRUE, D2D1_BITMAP_OPTIONS_NONE); ID2D1DeviceContext_Release(device_context); -- 2.18.0

3 6

[PATCH vkd3d] vkd3d: Do not hardcode aspect mask in d3d12_command_list_ClearUnorderedAccessViewUint().
by Józef Kucia 14 Sep '18

14 Sep '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 2 +- libs/vkd3d/resource.c | 1 + libs/vkd3d/vkd3d_private.h | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index decff143d0a3..a7cac8f72653 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -3921,7 +3921,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_ClearUnorderedAccessViewUint(ID color.uint32[2] = values[2]; color.uint32[3] = values[3]; - range.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT; + range.aspectMask = cpu_descriptor->uav.texture.vk_aspect_mask; range.baseMipLevel = cpu_descriptor->uav.texture.miplevel_idx; range.levelCount = 1; range.baseArrayLayer = cpu_descriptor->uav.texture.layer_idx; diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 4490ae23dab9..10f1d835e792 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1692,6 +1692,7 @@ static void vkd3d_create_texture_uav(struct d3d12_desc *descriptor, descriptor->vk_descriptor_type = VK_DESCRIPTOR_TYPE_STORAGE_IMAGE; descriptor->u.view = view; + descriptor->uav.texture.vk_aspect_mask = vkd3d_desc.format->vk_aspect_mask; descriptor->uav.texture.miplevel_idx = vkd3d_desc.miplevel_idx; descriptor->uav.texture.layer_idx = vkd3d_desc.layer_idx; descriptor->uav.texture.layer_count = vkd3d_desc.layer_count; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 6ba12f9ca1d2..5aaa56505db0 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -281,6 +281,7 @@ struct d3d12_desc } buffer; struct { + VkImageAspectFlags vk_aspect_mask; unsigned int miplevel_idx; unsigned int layer_idx; unsigned int layer_count; -- 2.16.4

2 1

[PATCH vkd3d] build: Fix the "missing widl" message.
by Henri Verbeet 14 Sep '18

14 Sep '18

I.e., print the name of the target instead of the prerequisite. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 3ee2f13..1fdc916 100644 --- a/Makefile.am +++ b/Makefile.am @@ -157,7 +157,7 @@ if HAVE_WIDL $(AM_V_at)$(SED) -e '/#include <rpc.h>/d' -e '/#include <rpcndr.h>/d' <$@.tmp >$@ $(AM_V_at)$(RM) $@.tmp else - @echo "widl is required to generate $<" + @echo "widl is required to generate $@" endif EXTRA_DIST += $(vkd3d_demos_shaders) -- 2.11.0

1 0

[PATCH 2/3] wined3d: Set WINED3DFMT_FLAG_COMPRESSED based on format block info.
by Józef Kucia 14 Sep '18

14 Sep '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/utils.c | 103 +++++++++++++++++++++++---------------------------- 1 file changed, 47 insertions(+), 56 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 17aa8c077323..2ae9b944d375 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -571,29 +571,30 @@ struct wined3d_format_block_info UINT block_height; UINT block_byte_count; BOOL verify; + BOOL compressed; }; static const struct wined3d_format_block_info format_block_info[] = { - {WINED3DFMT_DXT1, 4, 4, 8, TRUE}, - {WINED3DFMT_DXT2, 4, 4, 16, TRUE}, - {WINED3DFMT_DXT3, 4, 4, 16, TRUE}, - {WINED3DFMT_DXT4, 4, 4, 16, TRUE}, - {WINED3DFMT_DXT5, 4, 4, 16, TRUE}, - {WINED3DFMT_BC1_UNORM, 4, 4, 8, TRUE}, - {WINED3DFMT_BC2_UNORM, 4, 4, 16, TRUE}, - {WINED3DFMT_BC3_UNORM, 4, 4, 16, TRUE}, - {WINED3DFMT_BC4_UNORM, 4, 4, 8, TRUE}, - {WINED3DFMT_BC4_SNORM, 4, 4, 8, TRUE}, - {WINED3DFMT_BC5_UNORM, 4, 4, 16, TRUE}, - {WINED3DFMT_BC5_SNORM, 4, 4, 16, TRUE}, - {WINED3DFMT_BC6H_UF16, 4, 4, 16, TRUE}, - {WINED3DFMT_BC6H_SF16, 4, 4, 16, TRUE}, - {WINED3DFMT_BC7_UNORM, 4, 4, 16, TRUE}, - {WINED3DFMT_ATI1N, 4, 4, 8, FALSE}, - {WINED3DFMT_ATI2N, 4, 4, 16, FALSE}, - {WINED3DFMT_YUY2, 2, 1, 4, FALSE}, - {WINED3DFMT_UYVY, 2, 1, 4, FALSE}, + {WINED3DFMT_DXT1, 4, 4, 8, TRUE, TRUE}, + {WINED3DFMT_DXT2, 4, 4, 16, TRUE, TRUE}, + {WINED3DFMT_DXT3, 4, 4, 16, TRUE, TRUE}, + {WINED3DFMT_DXT4, 4, 4, 16, TRUE, TRUE}, + {WINED3DFMT_DXT5, 4, 4, 16, TRUE, TRUE}, + {WINED3DFMT_BC1_UNORM, 4, 4, 8, TRUE, TRUE}, + {WINED3DFMT_BC2_UNORM, 4, 4, 16, TRUE, TRUE}, + {WINED3DFMT_BC3_UNORM, 4, 4, 16, TRUE, TRUE}, + {WINED3DFMT_BC4_UNORM, 4, 4, 8, TRUE, TRUE}, + {WINED3DFMT_BC4_SNORM, 4, 4, 8, TRUE, TRUE}, + {WINED3DFMT_BC5_UNORM, 4, 4, 16, TRUE, TRUE}, + {WINED3DFMT_BC5_SNORM, 4, 4, 16, TRUE, TRUE}, + {WINED3DFMT_BC6H_UF16, 4, 4, 16, TRUE, TRUE}, + {WINED3DFMT_BC6H_SF16, 4, 4, 16, TRUE, TRUE}, + {WINED3DFMT_BC7_UNORM, 4, 4, 16, TRUE, TRUE}, + {WINED3DFMT_ATI1N, 4, 4, 8, FALSE, TRUE}, + {WINED3DFMT_ATI2N, 4, 4, 16, FALSE, TRUE}, + {WINED3DFMT_YUY2, 2, 1, 4, FALSE, FALSE}, + {WINED3DFMT_UYVY, 2, 1, 4, FALSE, FALSE}, }; struct wined3d_format_vertex_info @@ -1346,77 +1347,67 @@ static const struct wined3d_format_texture_info format_texture_info[] = {WINED3DFMT_DXT1, GL_COMPRESSED_RGBA_S3TC_DXT1_EXT, GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT, 0, GL_RGBA, GL_UNSIGNED_BYTE, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING - | WINED3DFMT_FLAG_SRGB_READ | WINED3DFMT_FLAG_COMPRESSED, + | WINED3DFMT_FLAG_SRGB_READ, EXT_TEXTURE_COMPRESSION_S3TC, NULL}, {WINED3DFMT_DXT2, GL_COMPRESSED_RGBA_S3TC_DXT3_EXT, GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT, 0, GL_RGBA, GL_UNSIGNED_BYTE, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING - | WINED3DFMT_FLAG_SRGB_READ | WINED3DFMT_FLAG_COMPRESSED, + | WINED3DFMT_FLAG_SRGB_READ, EXT_TEXTURE_COMPRESSION_S3TC, NULL}, {WINED3DFMT_DXT3, GL_COMPRESSED_RGBA_S3TC_DXT3_EXT, GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT, 0, GL_RGBA, GL_UNSIGNED_BYTE, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING - | WINED3DFMT_FLAG_SRGB_READ | WINED3DFMT_FLAG_COMPRESSED, + | WINED3DFMT_FLAG_SRGB_READ, EXT_TEXTURE_COMPRESSION_S3TC, NULL}, {WINED3DFMT_DXT4, GL_COMPRESSED_RGBA_S3TC_DXT5_EXT, GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT, 0, GL_RGBA, GL_UNSIGNED_BYTE, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING - | WINED3DFMT_FLAG_SRGB_READ | WINED3DFMT_FLAG_COMPRESSED, + | WINED3DFMT_FLAG_SRGB_READ, EXT_TEXTURE_COMPRESSION_S3TC, NULL}, {WINED3DFMT_DXT5, GL_COMPRESSED_RGBA_S3TC_DXT5_EXT, GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT, 0, GL_RGBA, GL_UNSIGNED_BYTE, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING - | WINED3DFMT_FLAG_SRGB_READ | WINED3DFMT_FLAG_COMPRESSED, + | WINED3DFMT_FLAG_SRGB_READ, EXT_TEXTURE_COMPRESSION_S3TC, NULL}, {WINED3DFMT_BC1_UNORM, GL_COMPRESSED_RGBA_S3TC_DXT1_EXT, GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT, 0, GL_RGBA, GL_UNSIGNED_BYTE, 0, - WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING - | WINED3DFMT_FLAG_COMPRESSED, + WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, EXT_TEXTURE_COMPRESSION_S3TC, NULL}, {WINED3DFMT_BC2_UNORM, GL_COMPRESSED_RGBA_S3TC_DXT3_EXT, GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT, 0, GL_RGBA, GL_UNSIGNED_BYTE, 0, - WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING - | WINED3DFMT_FLAG_COMPRESSED, + WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, EXT_TEXTURE_COMPRESSION_S3TC, NULL}, {WINED3DFMT_BC3_UNORM, GL_COMPRESSED_RGBA_S3TC_DXT5_EXT, GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT, 0, GL_RGBA, GL_UNSIGNED_BYTE, 0, - WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING - | WINED3DFMT_FLAG_COMPRESSED, + WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, EXT_TEXTURE_COMPRESSION_S3TC, NULL}, {WINED3DFMT_BC4_UNORM, GL_COMPRESSED_RED_RGTC1, GL_COMPRESSED_RED_RGTC1, 0, GL_RED, GL_UNSIGNED_BYTE, 0, - WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING - | WINED3DFMT_FLAG_COMPRESSED, + WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, ARB_TEXTURE_COMPRESSION_RGTC, NULL}, {WINED3DFMT_BC4_SNORM, GL_COMPRESSED_SIGNED_RED_RGTC1, GL_COMPRESSED_SIGNED_RED_RGTC1, 0, GL_RED, GL_UNSIGNED_BYTE, 0, - WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING - | WINED3DFMT_FLAG_COMPRESSED, + WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, ARB_TEXTURE_COMPRESSION_RGTC, NULL}, {WINED3DFMT_BC5_UNORM, GL_COMPRESSED_RG_RGTC2, GL_COMPRESSED_RG_RGTC2, 0, GL_RG, GL_UNSIGNED_BYTE, 0, - WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING - | WINED3DFMT_FLAG_COMPRESSED, + WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, ARB_TEXTURE_COMPRESSION_RGTC, NULL}, {WINED3DFMT_BC5_SNORM, GL_COMPRESSED_SIGNED_RG_RGTC2, GL_COMPRESSED_SIGNED_RG_RGTC2, 0, GL_RG, GL_UNSIGNED_BYTE, 0, - WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING - | WINED3DFMT_FLAG_COMPRESSED, + WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, ARB_TEXTURE_COMPRESSION_RGTC, NULL}, {WINED3DFMT_BC6H_UF16, GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT_ARB, GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT_ARB, 0, GL_RGB, GL_UNSIGNED_BYTE, 0, - WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING - | WINED3DFMT_FLAG_COMPRESSED, + WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, ARB_TEXTURE_COMPRESSION_BPTC, NULL}, {WINED3DFMT_BC6H_SF16, GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT_ARB, GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT_ARB, 0, GL_RGB, GL_UNSIGNED_BYTE, 0, - WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING - | WINED3DFMT_FLAG_COMPRESSED, + WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, ARB_TEXTURE_COMPRESSION_BPTC, NULL}, {WINED3DFMT_BC7_UNORM, GL_COMPRESSED_RGBA_BPTC_UNORM_ARB, GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM_ARB, 0, GL_RGBA, GL_UNSIGNED_BYTE, 0, - WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING - | WINED3DFMT_FLAG_COMPRESSED, + WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, ARB_TEXTURE_COMPRESSION_BPTC, NULL}, /* IEEE formats */ {WINED3DFMT_R32_FLOAT, GL_RGB32F_ARB, GL_RGB32F_ARB, 0, @@ -1867,23 +1858,19 @@ static const struct wined3d_format_texture_info format_texture_info[] = /* Vendor-specific formats */ {WINED3DFMT_ATI1N, GL_COMPRESSED_RED_RGTC1, GL_COMPRESSED_RED_RGTC1, 0, GL_RED, GL_UNSIGNED_BYTE, 0, - WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING - | WINED3DFMT_FLAG_COMPRESSED, + WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, ARB_TEXTURE_COMPRESSION_RGTC, NULL}, {WINED3DFMT_ATI2N, GL_COMPRESSED_LUMINANCE_ALPHA_3DC_ATI, GL_COMPRESSED_LUMINANCE_ALPHA_3DC_ATI, 0, GL_LUMINANCE_ALPHA, GL_UNSIGNED_BYTE, 0, - WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING - | WINED3DFMT_FLAG_COMPRESSED, + WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, ATI_TEXTURE_COMPRESSION_3DC, NULL}, {WINED3DFMT_ATI2N, GL_COMPRESSED_RG_RGTC2, GL_COMPRESSED_RG_RGTC2, 0, GL_LUMINANCE_ALPHA, GL_UNSIGNED_BYTE, 0, - WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING - | WINED3DFMT_FLAG_COMPRESSED, + WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, EXT_TEXTURE_COMPRESSION_RGTC, NULL}, {WINED3DFMT_ATI2N, GL_COMPRESSED_RG_RGTC2, GL_COMPRESSED_RG_RGTC2, 0, GL_RG, GL_UNSIGNED_BYTE, 0, - WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING - | WINED3DFMT_FLAG_COMPRESSED, + WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, ARB_TEXTURE_COMPRESSION_RGTC, NULL}, {WINED3DFMT_INTZ, GL_DEPTH24_STENCIL8_EXT, GL_DEPTH24_STENCIL8_EXT, 0, GL_DEPTH_STENCIL_EXT, GL_UNSIGNED_INT_24_8_EXT, 0, @@ -2116,19 +2103,23 @@ fail: static BOOL init_format_block_info(struct wined3d_adapter *adapter) { struct wined3d_format *format; - unsigned int i; + unsigned int flags, i; for (i = 0; i < ARRAY_SIZE(format_block_info); ++i) { if (!(format = get_format_internal(adapter, format_block_info[i].id))) return FALSE; + flags = WINED3DFMT_FLAG_BLOCKS; + if (!format_block_info[i].verify) + flags |= WINED3DFMT_FLAG_BLOCKS_NO_VERIFY; + if (format_block_info[i].compressed) + flags |= WINED3DFMT_FLAG_COMPRESSED; + format->block_width = format_block_info[i].block_width; format->block_height = format_block_info[i].block_height; format->block_byte_count = format_block_info[i].block_byte_count; - format_set_flag(format, WINED3DFMT_FLAG_BLOCKS); - if (!format_block_info[i].verify) - format_set_flag(format, WINED3DFMT_FLAG_BLOCKS_NO_VERIFY); + format_set_flag(format, flags); } return TRUE; -- 2.16.4

2 1

[PATCH 1/3] wined3d: Use >= for shader model checks in feature_level_from_caps().
by Józef Kucia 14 Sep '18

14 Sep '18

Spotted by Matteo Bruni. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/adapter_gl.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index af17df83cd02..6f39a3e0c668 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -1265,15 +1265,15 @@ static enum wined3d_feature_level feature_level_from_caps(const struct wined3d_g && gl_info->supported[ARB_TEXTURE_COMPRESSION_BPTC]) return WINED3D_FEATURE_LEVEL_11; - if (shader_model == 4) + if (shader_model >= 4) return WINED3D_FEATURE_LEVEL_10; } - if (shader_model == 3) + if (shader_model >= 3) return WINED3D_FEATURE_LEVEL_9_SM3; - if (shader_model == 2) + if (shader_model >= 2) return WINED3D_FEATURE_LEVEL_9_SM2; - if (shader_model == 1) + if (shader_model >= 1) return WINED3D_FEATURE_LEVEL_8; if (fragment_caps->TextureOpCaps & WINED3DTEXOPCAPS_DOTPRODUCT3) -- 2.16.4

2 1

[PATCH 3/3] wined3d: Factor out wined3d_texture_get_gl_internal_format().
by Józef Kucia 14 Sep '18

14 Sep '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/texture.c | 38 +++++++++++++++++++++----------------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 8f499d4ada60..61439d7f03c7 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1706,6 +1706,25 @@ static void wined3d_texture_force_reload(struct wined3d_texture *texture) } } +static GLenum wined3d_texture_get_gl_internal_format(struct wined3d_texture *texture, BOOL srgb) +{ + const struct wined3d_format *format = texture->resource.format; + GLenum internal; + + if (srgb) + internal = format->glGammaInternal; + else if (texture->resource.usage & WINED3DUSAGE_RENDERTARGET + && wined3d_resource_is_offscreen(&texture->resource)) + internal = format->rtInternal; + else + internal = format->glInternal; + + if (!internal) + FIXME("No GL internal format for format %s.\n", debug_d3dformat(format->id)); + + return internal; +} + /* Context activation is done by the caller. */ void wined3d_texture_prepare_texture(struct wined3d_texture *texture, struct wined3d_context *context, BOOL srgb) { @@ -1751,16 +1770,7 @@ void wined3d_texture_prepare_texture(struct wined3d_texture *texture, struct win wined3d_texture_bind_and_dirtify(texture, context, srgb); - if (srgb) - internal = format->glGammaInternal; - else if (texture->resource.usage & WINED3DUSAGE_RENDERTARGET - && wined3d_resource_is_offscreen(&texture->resource)) - internal = format->rtInternal; - else - internal = format->glInternal; - - if (!internal) - FIXME("No GL internal format for format %s.\n", debug_d3dformat(format->id)); + internal = wined3d_texture_get_gl_internal_format(texture, srgb); TRACE("internal %#x, format %#x, type %#x.\n", internal, format->glFormat, format->glType); @@ -2019,13 +2029,7 @@ void wined3d_texture_upload_data(struct wined3d_texture *texture, unsigned int s const BYTE *addr = bo.addr; GLenum internal; - if (srgb) - internal = format->glGammaInternal; - else if (texture->resource.usage & WINED3DUSAGE_RENDERTARGET - && wined3d_resource_is_offscreen(&texture->resource)) - internal = format->rtInternal; - else - internal = format->glInternal; + internal = wined3d_texture_get_gl_internal_format(texture, srgb); wined3d_format_calculate_pitch(format, 1, update_w, update_h, &dst_row_pitch, &dst_slice_pitch); -- 2.16.4

2 1

[PATCH] testbot: Use tighter build timeouts.
by Francois Gouget 14 Sep '18

14 Sep '18

There is no need to allow for a full rebuild if the patch only touches a few modules. This is particularly significant for Wine builds since they take longer. Reducing the timeouts ensures the TestBot will not be blocked longer than necessary should a task get stuck either due to an issue in the patch, or to a network issue. This also centralizes all build timeout calcultations in GetBuildTimeout(). Finally this slightly changes a couple of timeouts in the scheduler and activity modules because the $BuildTimeout and $ReconfigTimeout parameters are going away. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/CheckForWinetestUpdate.pl | 16 ++++-- testbot/lib/WineTestBot/Activity.pm | 2 +- testbot/lib/WineTestBot/Config.pm | 53 ++++++++++-------- testbot/lib/WineTestBot/Engine/Scheduler.pm | 2 +- testbot/lib/WineTestBot/PatchUtils.pm | 62 +++++++++++++++++---- testbot/lib/WineTestBot/Patches.pm | 19 ++++--- testbot/web/Submit.pl | 20 ++++++- 7 files changed, 122 insertions(+), 52 deletions(-) diff --git a/testbot/bin/CheckForWinetestUpdate.pl b/testbot/bin/CheckForWinetestUpdate.pl index a7d77f02f..991cdeb0f 100755 --- a/testbot/bin/CheckForWinetestUpdate.pl +++ b/testbot/bin/CheckForWinetestUpdate.pl @@ -50,12 +50,13 @@ use HTTP::Response; use HTTP::Status; use WineTestBot::Config; +use WineTestBot::Engine::Notify; use WineTestBot::Jobs; -use WineTestBot::Users; use WineTestBot::Log; +use WineTestBot::PatchUtils; +use WineTestBot::Users; use WineTestBot::Utils; use WineTestBot::VMs; -use WineTestBot::Engine::Notify; my %WineTestUrls = ( @@ -245,6 +246,9 @@ sub AddJob($$$) return 1; } +my @ExeBuilds = qw(exe32 exe64); +my @WineBuilds = qw(win32 wow32 wow64); + sub AddReconfigJob($) { my ($VMType) = @_; @@ -283,9 +287,9 @@ sub AddReconfigJob($) Debug(" $VMKey $VMType reconfig\n"); my $Task = $BuildStep->Tasks->Add(); $Task->VM($VM); - $Task->Timeout($VMType eq "wine" ? - 3 * $WineReconfigTimeout : # 3 full Wine builds - $ReconfigTimeout); # 1 overall timeout + my $Builds; + map { $Builds->{$_} = 1 } ($VMType eq "wine" ? @WineBuilds : @ExeBuilds); + $Task->Timeout(GetBuildTimeout(undef, $Builds)); } # Save the build step so the others can reference it. @@ -299,7 +303,7 @@ sub AddReconfigJob($) if ($VMType eq "wine") { # Add steps to run WineTest on Wine - foreach my $Build ("win32", "wow32", "wow64") + foreach my $Build (@WineBuilds) { # Add a step to the job my $NewStep = $Steps->Add(); diff --git a/testbot/lib/WineTestBot/Activity.pm b/testbot/lib/WineTestBot/Activity.pm index a8885a4e1..eba45a039 100644 --- a/testbot/lib/WineTestBot/Activity.pm +++ b/testbot/lib/WineTestBot/Activity.pm @@ -438,7 +438,7 @@ sub GetStatistics($;$) # Of course this only works for statistics about VM operations and running # tasks (so running.time, reverting.time, etc) not for those about idle or # off VMs (idle.time, etc.). - $ActivitySeconds = $Seconds + 60 + max($SuiteTimeout, $ReconfigTimeout); + $ActivitySeconds = $Seconds + 60 + max($SuiteTimeout, 2 * $WineBuildTimeout); } my ($Activity, $Counters) = GetActivity($VMs, $ActivitySeconds); $GlobalStats->{"recordgroups.count"} = $Counters->{recordgroups}; diff --git a/testbot/lib/WineTestBot/Config.pm b/testbot/lib/WineTestBot/Config.pm index 1ffff262f..a83085d44 100644 --- a/testbot/lib/WineTestBot/Config.pm +++ b/testbot/lib/WineTestBot/Config.pm @@ -30,10 +30,11 @@ use vars qw (@ISA @EXPORT @EXPORT_OK $UseSSL $LogDir $DataDir $BinDir $MaxRevertsWhileRunningVMs $MaxActiveVMs $MaxRunningVMs $MaxVMsWhenIdle $SleepAfterRevert $WaitForToolsInVM $VMToolTimeout $MaxVMErrors $MaxTaskTries $AdminEMail $RobotEMail - $WinePatchToOverride $WinePatchCc $SuiteTimeout $SingleTimeout - $BuildTimeout $ReconfigTimeout $WineReconfigTimeout $TimeoutMargin - $TagPrefix - $MaxUnitSize $ProjectName $PatchesMailingList $LDAPServer + $WinePatchToOverride $WinePatchCc + $ExeBuildNativeTimeout $ExeBuildTestTimeout $ExeModuleTimeout + $WineBuildTimeout $WineModuleTimeout $TimeoutMargin + $SuiteTimeout $SingleTimeout $MaxUnitSize + $TagPrefix $ProjectName $PatchesMailingList $LDAPServer $LDAPBindDN $LDAPSearchBase $LDAPSearchFilter $LDAPRealNameAttribute $LDAPEMailAttribute $AgentPort $Tunnel $TunnelDefaults $PrettyHostNames $JobPurgeDays @@ -46,9 +47,10 @@ require Exporter; $MaxRunningVMs $MaxVMsWhenIdle $SleepAfterRevert $WaitForToolsInVM $VMToolTimeout $MaxVMErrors $MaxTaskTries $AdminEMail $RobotEMail $WinePatchToOverride $WinePatchCc $SuiteTimeout - $SingleTimeout $BuildTimeout $ReconfigTimeout $WineReconfigTimeout - $TimeoutMargin - $TagPrefix $MaxUnitSize $ProjectName $PatchesMailingList + $ExeBuildNativeTimeout $ExeBuildTestTimeout $ExeModuleTimeout + $WineBuildTimeout $WineModuleTimeout $TimeoutMargin + $SuiteTimeout $SingleTimeout $MaxUnitSize + $TagPrefix $ProjectName $PatchesMailingList $LDAPServer $LDAPBindDN $LDAPSearchBase $LDAPSearchFilter $LDAPRealNameAttribute $LDAPEMailAttribute $AgentPort $Tunnel $TunnelDefaults $PrettyHostNames $JobPurgeDays @@ -90,24 +92,29 @@ $MaxVMErrors = 3; # How many times to run a test that fails before giving up. $MaxTaskTries = 3; -# How long to let a test suite run before forcibly shutting it down -# (in seconds). -$SuiteTimeout = 30 * 60; -# How long to let a regular test run before forcibly shutting it down -# (in seconds). -$SingleTimeout = 2 * 60; -# How long to let a regular build run before forcibly shutting it down -# (in seconds). -$BuildTimeout = 5 * 60; -# How long to let a reconfig task run before forcibly shutting it down -# (in seconds). Note that this includes building the native Wine build tools, -# and the 32 and 64 bit test executables. -$ReconfigTimeout = (1 + 2 * 5) * 60; -# How long to let a full Wine recompilation run before forcibly shutting it -# down (in seconds). -$WineReconfigTimeout = 20 * 60; +# Exe build timeouts (in seconds) +# - For a full build +$ExeBuildNativeTimeout = 60; +$ExeBuildTestTimeout = 2 * 60; +# - For a single module +$ExeModuleTimeout = 30; + +# Wine build timeouts (in seconds) +# - For a full build +$WineBuildTimeout = 20 * 60; +# - For a single module +$WineModuleTimeout = 60; + # How much to add to the task timeout to account for file transfers, etc. +# (in seconds) $TimeoutMargin = 2 * 60; + +# Test timeouts (in seconds) +# - For the whole test suite +$SuiteTimeout = 30 * 60; +# - For a single test +$SingleTimeout = 2 * 60; + # Maximum amount of traces for a test unit. $MaxUnitSize = 32 * 1024; diff --git a/testbot/lib/WineTestBot/Engine/Scheduler.pm b/testbot/lib/WineTestBot/Engine/Scheduler.pm index 4c49f5a1a..ffcc3cdbd 100644 --- a/testbot/lib/WineTestBot/Engine/Scheduler.pm +++ b/testbot/lib/WineTestBot/Engine/Scheduler.pm @@ -640,7 +640,7 @@ sub _ScheduleTasks($) } # It's not worth preparing the next step for tasks that take so long - $StepVMs{$Step} = undef if ($Task->Timeout > $BuildTimeout); + $StepVMs{$Step} = undef if ($Task->Timeout > $VMToolTimeout); my $VMKey = $VM->GetKey(); if ($VM->Status eq "idle") diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index d399ced54..7049694aa 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -31,7 +31,9 @@ the Wine builds. =cut use Exporter 'import'; -our @EXPORT = qw(GetPatchImpact UpdateWineData); +our @EXPORT = qw(GetPatchImpact UpdateWineData GetBuildTimeout); + +use List::Util qw(min max); use WineTestBot::Config; @@ -166,11 +168,12 @@ sub _HandleFile($$$) if ($FilePath =~ m~^(dlls|programs)/([^/]+)/tests/([^/\s]+)$~) { my ($Root, $Dir, $File) = ($1, $2, $3); - $Impacts->{IsWinePatch} = 1; + my $Module = ($Root eq "programs") ? "$Dir.exe" : $Dir; + $Impacts->{BuildModules}->{$Module} = 1; $Impacts->{TestBuild} = 1; + $Impacts->{IsWinePatch} = 1; my $Tests = $Impacts->{Tests}; - my $Module = ($Root eq "programs") ? "$Dir.exe" : $Dir; if (!$Tests->{$Module}) { $Tests->{$Module} = { @@ -205,8 +208,9 @@ sub _HandleFile($$$) { my ($Root, $Dir, $File) = ($1, $2, $3); my $Module = ($Root eq "programs") ? "$Dir.exe" : $Dir; - $Impacts->{IsWinePatch} = 1; + $Impacts->{BuildModules}->{$Module} = 1; $Impacts->{ModuleBuild} = 1; + $Impacts->{IsWinePatch} = 1; if ($File eq "Makefile.in" and $Change ne "modify") { @@ -263,6 +267,11 @@ sub GetPatchImpact($;$$) my $Impacts = { NoUnits => $NoUnits, + # Number of patched test units. + UnitCount => 0, + # The modules that need a rebuild, even if only for the tests. + BuildModules => {}, + # Information about 'tests' directories. Tests => {}, }; _LoadWineFiles(); @@ -277,6 +286,9 @@ sub GetPatchImpact($;$$) map { $Impacts->{WineFiles}->{$_} = 1 } keys %{$WineFiles}; map { $Impacts->{WineFiles}->{$_} = 1 } keys %{$PastImpacts->{NewFiles}}; map { delete $Impacts->{WineFiles}->{$_} } keys %{$PastImpacts->{DeletedFiles}}; + # Modules impacted by previous parts of a patchset still need to be + # rebuilt. + $Impacts->{BuildModules} = { %{$PastImpacts->{BuildModules}} }; } else { @@ -341,8 +353,6 @@ sub GetPatchImpact($;$$) } close($fh); - $Impacts->{ModuleCount} = 0; - $Impacts->{UnitCount} = 0; foreach my $TestInfo (values %{$Impacts->{Tests}}) { # For each module, identify modifications to non-C files and helper dlls @@ -390,14 +400,44 @@ sub GetPatchImpact($;$$) } $TestInfo->{UnitCount} = scalar(keys %{$TestInfo->{Units}}); - if ($TestInfo->{UnitCount}) - { - $Impacts->{ModuleCount}++; - $Impacts->{UnitCount} += $TestInfo->{UnitCount}; - } + $Impacts->{UnitCount} += $TestInfo->{UnitCount}; } return $Impacts; } + +# +# Compute task timeouts based on the patch data +# + +sub GetBuildTimeout($$) +{ + my ($Impacts, $Builds) = @_; + + my ($ExeCount, $WineCount); + map {$_ =~ /^exe/ ? $ExeCount++ : $WineCount++ } keys %$Builds; + + # Set $ModuleCount to 0 if a full rebuild is needed + my $ModuleCount = (!$Impacts or $Impacts->{WineBuild}) ? 0 : + scalar(keys %{$Impacts->{BuildModules}}); + + my ($ExeTimeout, $WineTimeout) = (0, 0); + if ($ExeCount) + { + my $OneBuild = $ModuleCount ? $ModuleCount * $ExeModuleTimeout : + $ExeBuildTestTimeout; + $ExeTimeout = ($ModuleCount ? 0 : $ExeBuildNativeTimeout) + + $ExeCount * min($ExeBuildTestTimeout, $OneBuild); + } + if ($WineCount) + { + my $OneBuild = $ModuleCount ? $ModuleCount * $WineModuleTimeout : + $WineBuildTimeout; + $WineTimeout = $WineCount * min($WineBuildTimeout, $OneBuild); + } + + return $ExeTimeout + $WineTimeout; +} + 1; diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index f5ef431eb..390b1611c 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -185,12 +185,6 @@ sub Submit($$$) $BuildStep->Type("build"); $BuildStep->DebugLevel(0); - # Add build task - my $BuildVM = ${$BuildVMs->GetItems()}[0]; - my $Task = $BuildStep->Tasks->Add(); - $Task->VM($BuildVM); - $Task->Timeout($BuildTimeout); - # Save the build step so the others can reference it. my ($ErrKey, $ErrProperty, $ErrMessage) = $Jobs->Save(); if (defined($ErrMessage)) @@ -200,6 +194,7 @@ sub Submit($$$) } # Create steps for the Windows tests + my $Builds; foreach my $Module (sort keys %{$Impacts->{Tests}}) { my $TestInfo = $Impacts->{Tests}->{$Module}; @@ -219,6 +214,7 @@ sub Submit($$$) $FileName .= "64" if ($Bits eq "64"); $NewStep->FileName("$FileName.exe"); $NewStep->FileType("exe$Bits"); + $Builds->{"exe$Bits"} = 1; # And a task for each VM my $Tasks = $NewStep->Tasks; @@ -235,6 +231,12 @@ sub Submit($$$) } } } + + # Add the build task + my $BuildVM = ${$BuildVMs->GetItems()}[0]; + my $BuildTask = $BuildStep->Tasks->Add(); + $BuildTask->VM($BuildVM); + $BuildTask->Timeout(GetBuildTimeout($Impacts, $Builds)); } my $WineVMs = CreateVMs(); @@ -258,8 +260,9 @@ sub Submit($$$) my $Task = $Tasks->Add(); $Task->VM($VM); # Only verify that the win32 version compiles - $Task->Timeout($WineReconfigTimeout); - $Task->CmdLineArg("win32"); + my $Builds = { "win32" => 1 }; + $Task->Timeout(GetBuildTimeout($Impacts, $Builds)); + $Task->CmdLineArg(join(",", keys %$Builds)); } } diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 440bd8e5b..e755b5758 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -777,6 +777,13 @@ sub OnSubmit($) # Add steps and tasks for the 32 and 64-bit tests my $FileType = $self->GetParam("FileType"); + my $Impacts; + if ($FileType eq "patch") + { + my $TmpStagingFullPath = $self->GetTmpStagingFullPath($BaseName); + $Impacts = GetPatchImpact($TmpStagingFullPath); + } + my $BuildStep; foreach my $Bits ("32", "64") { @@ -812,7 +819,10 @@ sub OnSubmit($) my $BuildVM = ${$VMs->GetItems()}[0]; my $Task = $BuildStep->Tasks->Add(); $Task->VM($BuildVM); - $Task->Timeout($BuildTimeout); + + my $Builds = { "exe32" => 1 }; + $Builds->{"exe64"} = 1 if (defined $self->GetParam("Run64"); + $Task->Timeout(GetBuildTimeout($Impacts, $Builds)); # Save the build step so the others can reference it my ($ErrKey, $ErrProperty, $ErrMessage) = $Jobs->Save(); @@ -861,6 +871,7 @@ sub OnSubmit($) { next if ($Build eq "wow64" and !defined($self->GetParam("Run64"))); + my $Timeout; foreach my $VMKey (@$SortedKeys) { my $VM = $VMs->GetItem($VMKey); @@ -878,12 +889,17 @@ sub OnSubmit($) $WineStep->ReportSuccessfulTests(defined($self->GetParam("ReportSuccessfulTests"))); $Tasks = $WineStep->Tasks; } + if (!defined $Timeout) + { + my $Builds = { $Build => 1 }; + $Timeout = GetBuildTimeout($Impacts, $Builds); + } # Then add a task for this VM my $Task = $Tasks->Add(); $Task->VM($VM); $Task->CmdLineArg($Build); - $Task->Timeout($WineReconfigTimeout); + $Task->Timeout($Timeout); } } } -- 2.18.0

1 0

[PATCH] ole32/tests: Fix spelling of a variable name.
by Francois Gouget 14 Sep '18

14 Sep '18

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/ole32/tests/ole2.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 9b82e49b367..18cfb19c034 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -4620,7 +4620,7 @@ static void test_OleCreateStaticFromData(void) IOleObject *ole_obj = NULL; IStorage *storage; ILockBytes *ilb; - IPersist *presist; + IPersist *persist; CLSID clsid; STATSTG statstg; int enumerated_streams, matched_streams; @@ -4699,9 +4699,9 @@ static void test_OleCreateStaticFromData(void) hr = OleCreateStaticFromData(&DataObject, &IID_IOleObject, OLERENDER_FORMAT, dib_fmt, NULL, storage, (void **)&ole_obj); ok(hr == S_OK, "OleCreateStaticFromData failed: 0x%08x.\n", hr); - hr = IOleObject_QueryInterface(ole_obj, &IID_IPersist, (void **)&presist); + hr = IOleObject_QueryInterface(ole_obj, &IID_IPersist, (void **)&persist); ok(hr == S_OK, "IOleObject_QueryInterface failed: 0x%08x.\n", hr); - hr = IPersist_GetClassID(presist, &clsid); + hr = IPersist_GetClassID(persist, &clsid); ok(hr == S_OK, "IPersist_GetClassID failed: 0x%08x.\n", hr); ok(IsEqualCLSID(&clsid, &CLSID_Picture_Dib), "Got wrong clsid: %s, expected: %s.\n", wine_dbgstr_guid(&clsid), wine_dbgstr_guid(&CLSID_Picture_Dib)); @@ -4717,7 +4717,7 @@ static void test_OleCreateStaticFromData(void) ok(enumerated_streams == stg_def_dib.stream_count, "created %d != def streams %d\n", enumerated_streams, stg_def_dib.stream_count); ReleaseStgMedium(&stgmed); - IPersist_Release(presist); + IPersist_Release(persist); IStorage_Release(storage); IOleObject_Release(ole_obj); @@ -4733,9 +4733,9 @@ static void test_OleCreateStaticFromData(void) hr = OleCreateStaticFromData(&DataObject, &IID_IOleObject, OLERENDER_FORMAT, emf_fmt, NULL, storage, (void **)&ole_obj); ok(hr == S_OK, "OleCreateStaticFromData failed: 0x%08x.\n", hr); - hr = IOleObject_QueryInterface(ole_obj, &IID_IPersist, (void **)&presist); + hr = IOleObject_QueryInterface(ole_obj, &IID_IPersist, (void **)&persist); ok(hr == S_OK, "IOleObject_QueryInterface failed: 0x%08x.\n", hr); - hr = IPersist_GetClassID(presist, &clsid); + hr = IPersist_GetClassID(persist, &clsid); ok(hr == S_OK, "IPersist_GetClassID failed: 0x%08x.\n", hr); ok(IsEqualCLSID(&clsid, &CLSID_Picture_EnhMetafile), "Got wrong clsid: %s, expected: %s.\n", wine_dbgstr_guid(&clsid), wine_dbgstr_guid(&CLSID_Picture_EnhMetafile)); @@ -4751,7 +4751,7 @@ static void test_OleCreateStaticFromData(void) ok(enumerated_streams == stg_def_emf.stream_count, "created %d != def streams %d\n", enumerated_streams, stg_def_emf.stream_count); ReleaseStgMedium(&stgmed); - IPersist_Release(presist); + IPersist_Release(persist); IStorage_Release(storage); IOleObject_Release(ole_obj); -- 2.18.0

1 0

[PATCH] cmd: A spelling fix in a comment.
by Francois Gouget 14 Sep '18

14 Sep '18

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- programs/cmd/builtins.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index e6a9ce3ad09..25b98813ba4 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1628,7 +1628,7 @@ static void WCMD_part_execute(CMD_LIST **cmdList, const WCHAR *firstcmd, } if (curPosition == *cmdList) *cmdList = (*cmdList)->nextcommand; - /* If we were in an IF statement and we didnt find an else and yet we get back to + /* If we were in an IF statement and we didn't find an else and yet we get back to the same bracket depth as the IF, then the IF statement is over. This is required to handle nested ifs properly */ } else if (isIF && (*cmdList)->bracketDepth == myDepth) { -- 2.18.0

1 0

[PATCH 1/2] comctl32/listbox: Don't update scrollbar during window creation
by Fabian Maurer 14 Sep '18

14 Sep '18

This is needed for the linked bug, although it doesn't fix it yet. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=43465 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/comctl32/listbox.c | 7 +++++++ dlls/comctl32/tests/listbox.c | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index 2137ef86e0..a9d1db458b 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -91,6 +91,7 @@ typedef struct HFONT font; /* Current font */ LCID locale; /* Current locale for string comparisons */ HEADCOMBO *lphc; /* ComboLBox */ + BOOL got_wm_size; /* Did we get already a WM_SIZE? */ } LB_DESCR; @@ -200,6 +201,10 @@ static void LISTBOX_UpdateScroll( LB_DESCR *descr ) the programmer use it for his/her own purposes. */ if (descr->style & LBS_NOREDRAW) return; + + /* When height is 0 don't update scrollbar during CreateWindowEx, that is until we receive our first WM_SIZE */ + if (!descr->got_wm_size && descr->height == 0) return; + info.cbSize = sizeof(info); if (descr->style & LBS_MULTICOLUMN) @@ -2502,6 +2507,7 @@ static BOOL LISTBOX_Create( HWND hwnd, LPHEADCOMBO lphc ) descr->font = 0; descr->locale = GetUserDefaultLCID(); descr->lphc = lphc; + descr->got_wm_size = FALSE; if( lphc ) { @@ -2887,6 +2893,7 @@ static LRESULT CALLBACK LISTBOX_WindowProc( HWND hwnd, UINT msg, WPARAM wParam, case WM_SIZE: LISTBOX_UpdateSize( descr ); + descr->got_wm_size = TRUE; return 0; case WM_GETFONT: return (LRESULT)descr->font; diff --git a/dlls/comctl32/tests/listbox.c b/dlls/comctl32/tests/listbox.c index c9d13a8d67..e3a3b42c2f 100644 --- a/dlls/comctl32/tests/listbox.c +++ b/dlls/comctl32/tests/listbox.c @@ -2176,6 +2176,40 @@ static void test_WM_MEASUREITEM(void) DestroyWindow(parent); } +static void test_WS_VSCROLL(void) +{ + HWND parent, listbox; + UINT style; + + parent = create_parent(); + + /* Listbox must always have WS_VSCROLL after creating when height 0 was specified */ + listbox = CreateWindowA("LISTBOX", "TestList", (LBS_STANDARD & ~LBS_SORT) | WS_CHILD | WS_VSCROLL, 0, 0, 100, 0, parent, NULL, NULL, 0); + style = GetWindowLongW(listbox, GWL_STYLE); + ok((style & WS_VSCROLL) != 0, "Listbox must have WS_VSCROLL\n"); + SendMessageA(listbox, WM_SIZE, SIZE_RESTORED, 0); + style = GetWindowLongW(listbox, GWL_STYLE); + ok((style & WS_VSCROLL) == 0, "Listbox must not have WS_VSCROLL\n"); + DestroyWindow(listbox); + + /* Listbox must not have WS_VSCROLL after creating when height > 0 was specified */ + listbox = CreateWindowA("LISTBOX", "TestList", (LBS_STANDARD & ~LBS_SORT) | WS_CHILD | WS_VSCROLL, 0, 0, 100, 100, parent, NULL, NULL, 0); + style = GetWindowLongW(listbox, GWL_STYLE); + ok((style & WS_VSCROLL) == 0, "Listbox must not have WS_VSCROLL\n"); + DestroyWindow(listbox); + + /* Adding elements must change WS_VSCROLL flag */ + listbox = CreateWindowA("LISTBOX", "TestList", (LBS_STANDARD & ~LBS_SORT) | WS_CHILD | WS_VSCROLL, 0, 0, 100, 0, parent, NULL, NULL, 0); + SendMessageA(listbox, LB_ADDSTRING, 0, (LPARAM)"test1"); + style = GetWindowLongW(listbox, GWL_STYLE); + ok((style & WS_VSCROLL) == 0, "Listbox must not have WS_VSCROLL\n"); + SendMessageA(listbox, LB_ADDSTRING, 0, (LPARAM)"test1"); + style = GetWindowLongW(listbox, GWL_STYLE); + ok((style & WS_VSCROLL) != 0, "Listbox must have WS_VSCROLL\n"); + + DestroyWindow(parent); +} + START_TEST(listbox) { ULONG_PTR ctx_cookie; @@ -2202,6 +2236,7 @@ START_TEST(listbox) test_extents(); test_WM_MEASUREITEM(); test_LB_SETSEL(); + test_WS_VSCROLL(); unload_v6_module(ctx_cookie, hCtx); } -- 2.19.0

3 8

[PATCH v3] find: First simple implementation and tests
by Fabian Maurer 14 Sep '18

14 Sep '18

The message text is the same as on windows, since the exit code doesn't seem reliable. v2: Read input text line by line v3: Use unicode Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- programs/find/Makefile.in | 3 + programs/find/find.c | 153 ++++++++++++++++++++- programs/find/resources.h | 27 ++++ programs/find/rsrc.rc | 25 ++++ programs/find/tests/Makefile.in | 5 + programs/find/tests/find.c | 231 ++++++++++++++++++++++++++++++++ 6 files changed, 440 insertions(+), 4 deletions(-) create mode 100644 programs/find/resources.h create mode 100644 programs/find/rsrc.rc create mode 100644 programs/find/tests/Makefile.in create mode 100644 programs/find/tests/find.c diff --git a/programs/find/Makefile.in b/programs/find/Makefile.in index ef8d61b7ce..edc23ec094 100644 --- a/programs/find/Makefile.in +++ b/programs/find/Makefile.in @@ -1,4 +1,7 @@ MODULE = find.exe APPMODE = -mconsole -municode +IMPORTS = user32 shlwapi C_SRCS = find.c + +RC_SRCS = rsrc.rc diff --git a/programs/find/find.c b/programs/find/find.c index 9d7aecd402..c7933fff42 100644 --- a/programs/find/find.c +++ b/programs/find/find.c @@ -16,18 +16,163 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <windows.h> +#include <stdlib.h> +#include <shlwapi.h> + +#include "wine/heap.h" #include "wine/debug.h" +#include "resources.h" WINE_DEFAULT_DEBUG_CHANNEL(find); +/* Reads a line from a handle, returns TRUE if there is more to be read */ +BOOL read_line_from_handle(HANDLE handle, WCHAR **line_out) +{ + int buffer_size = 4096; + char c; + DWORD bytes_read; + int length = 0; + WCHAR *line_converted; + int line_converted_length; + BOOL success; + char *line = heap_alloc(buffer_size); + + for (;;) + { + success = ReadFile(handle, &c, 1, &bytes_read, NULL); + + if (c == '\n') + break; + + /* Check for EOF */ + if (!success || !bytes_read) + { + if (length == 0) + return FALSE; + else + break; + } + + /* Make sure buffer is large enough */ + if (length + bytes_read >= buffer_size) + { + buffer_size *= 2; + line = heap_realloc(line, buffer_size); + } + + line[length++] = c; + } + + line[length] = 0; + if (length - 1 >= 0 && line[length - 1] == '\r') + line[length - 1] = 0; + + line_converted_length = MultiByteToWideChar(CP_ACP, 0, line, -1, 0, 0); + line_converted = heap_alloc(line_converted_length * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, line, -1, line_converted, line_converted_length); + + heap_free(line); + + *line_out = line_converted; + return TRUE; +} + +void write_to_handle(HANDLE handle, const WCHAR *str) +{ + DWORD bytes_written_sum = 0; + char *str_converted; + UINT str_converted_length; + UINT str_length = lstrlenW(str); + + str_converted_length = WideCharToMultiByte(CP_ACP, 0, str, str_length, NULL, 0, NULL, NULL); + str_converted = heap_alloc(str_converted_length); + WideCharToMultiByte(CP_ACP, 0, str, str_length, str_converted, str_converted_length, NULL, NULL); + + do + { + DWORD bytes_written; + WriteFile(handle, str_converted, str_converted_length, &bytes_written, NULL); + bytes_written_sum += bytes_written; + } while (bytes_written_sum < str_converted_length); + + heap_free(str_converted); +} + +void find_printf(const WCHAR *str) +{ + write_to_handle(GetStdHandle(STD_OUTPUT_HANDLE), str); +} + +BOOL run_find_for_line(const WCHAR *line, const WCHAR *tofind) +{ + void *found; + WCHAR lineending[] = {'\r', '\n', 0}; + + if (lstrlenW(line) == 0) + return FALSE; + + found = StrStrW(line, tofind); + + if (found) + { + find_printf(line); + find_printf(lineending); + return TRUE; + } + + return FALSE; +} + int wmain(int argc, WCHAR *argv[]) { + WCHAR *line; + WCHAR *tofind = NULL; + WCHAR message_parameter_invalid[64]; + WCHAR message_switch_invalid[64]; int i; + int exitcode; + HANDLE input; - WINE_FIXME("stub:"); + TRACE("running find:"); for (i = 0; i < argc; i++) - WINE_FIXME(" %s", wine_dbgstr_w(argv[i])); - WINE_FIXME("\n"); + { + TRACE(" %s", wine_dbgstr_w(argv[i])); + } + TRACE("\n"); + + LoadStringW(GetModuleHandleW(NULL), IDS_INVALID_PARAMETER, message_parameter_invalid, sizeof(message_parameter_invalid)); + LoadStringW(GetModuleHandleW(NULL), IDS_INVALID_SWITCH, message_switch_invalid, sizeof(message_switch_invalid)); + + input = GetStdHandle(STD_INPUT_HANDLE); + + for (i = 1; i < argc; i++) + { + if (argv[i][0] == '/') + { + find_printf(message_switch_invalid); + return 2; + } + else if(tofind == NULL) + { + tofind = argv[i]; + } + } + + if (tofind == NULL) + { + find_printf(message_parameter_invalid); + return 2; + } + + exitcode = 1; + while (read_line_from_handle(input, &line)) + { + if (run_find_for_line(line, tofind)) + exitcode = 0; + + heap_free(line); + } - return 0; + return exitcode; } diff --git a/programs/find/resources.h b/programs/find/resources.h new file mode 100644 index 0000000000..8712d91e36 --- /dev/null +++ b/programs/find/resources.h @@ -0,0 +1,27 @@ +/* + * Resource IDs + * + * Copyright 2018 Fabian Maurer + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_FIND_RESOURCES_H +#define __WINE_FIND_RESOURCES_H + +#define IDS_INVALID_PARAMETER 1000 +#define IDS_INVALID_SWITCH 1001 + +#endif /* __WINE_FIND_RESOURCES_H */ diff --git a/programs/find/rsrc.rc b/programs/find/rsrc.rc new file mode 100644 index 0000000000..f10fb6285f --- /dev/null +++ b/programs/find/rsrc.rc @@ -0,0 +1,25 @@ +/* + * Copyright 2018 Fabian Maurer + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "resources.h" + +STRINGTABLE +{ + IDS_INVALID_PARAMETER "FIND: Parameter format not correct\r\n" + IDS_INVALID_SWITCH "FIND: Invalid switch\r\n" +} diff --git a/programs/find/tests/Makefile.in b/programs/find/tests/Makefile.in new file mode 100644 index 0000000000..c5b359bd98 --- /dev/null +++ b/programs/find/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = find.exe +IMPORTS = user32 + +C_SRCS = \ + find.c diff --git a/programs/find/tests/find.c b/programs/find/tests/find.c new file mode 100644 index 0000000000..fa10919c8d --- /dev/null +++ b/programs/find/tests/find.c @@ -0,0 +1,231 @@ +/* + * Copyright 2018 Fabian Maurer + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <windows.h> +#include <stdio.h> + +#include "wine/heap.h" +#include "wine/test.h" + +WCHAR* read_all_from_handle(HANDLE handle) +{ + char buffer[4096]; + DWORD bytes_read; + DWORD length = 0; + BOOL success; + char *ret = heap_alloc_zero(1); + WCHAR *ret_converted; + int ret_converted_length; + + for (;;) + { + success = ReadFile(handle, buffer, sizeof(buffer), &bytes_read, NULL); + if (!success || !bytes_read) + break; + ret = heap_realloc(ret, length + bytes_read); + memcpy((char *)ret + length, buffer, bytes_read); + length += bytes_read; + } + + ret[length] = 0; + + ret_converted_length = MultiByteToWideChar(CP_UTF8, 0, ret, -1, 0, 0); + ret_converted = heap_alloc(ret_converted_length * sizeof(WCHAR)); + MultiByteToWideChar(CP_UTF8, 0, ret, -1, ret_converted, ret_converted_length); + + heap_free(ret); + + return ret_converted; +} + +/* Copied from find.exe implementation */ +void write_to_handle(HANDLE handle, const WCHAR *str) +{ + DWORD bytes_written_sum = 0; + char *str_converted; + UINT str_converted_length; + UINT str_length = lstrlenW(str); + + str_converted_length = WideCharToMultiByte(CP_UTF8, 0, str, str_length, NULL, 0, NULL, NULL); + str_converted = heap_alloc(str_converted_length); + WideCharToMultiByte(CP_UTF8, 0, str, str_length, str_converted, str_converted_length, NULL, NULL); + + do + { + DWORD bytes_written; + WriteFile(handle, str_converted, str_converted_length, &bytes_written, NULL); + bytes_written_sum += bytes_written; + } while (bytes_written_sum < str_converted_length); + + heap_free(str_converted); +} + +#define run_findW(commandline, input, out_expected, exitcode_expected) \ + run_findW_(commandline, input, out_expected, exitcode_expected, __FILE__, __LINE__) + +static void run_findW_(const WCHAR *commandline, const WCHAR *input, const WCHAR *out_expected, int exitcode_expected, const char *file, int line) +{ + static const WCHAR find_exe[] = {'f','i','n','d','.','e','x','e',' ','%','s'}; + HANDLE child_stdin_read; + HANDLE child_stdout_write; + HANDLE parent_stdin_write; + HANDLE parent_stdout_read; + STARTUPINFOW startup_info = {0}; + SECURITY_ATTRIBUTES security_attributes; + PROCESS_INFORMATION process_info = {0}; + WCHAR *child_output = NULL; + WCHAR cmd[4096]; + int comparison; + DWORD exitcode; + + security_attributes.nLength = sizeof(SECURITY_ATTRIBUTES); + security_attributes.bInheritHandle = TRUE; + security_attributes.lpSecurityDescriptor = NULL; + + CreatePipe(&parent_stdout_read, &child_stdout_write, &security_attributes, 0); + CreatePipe(&child_stdin_read, &parent_stdin_write, &security_attributes, 0); + + SetHandleInformation(parent_stdout_read, HANDLE_FLAG_INHERIT, 0); + SetHandleInformation(parent_stdin_write, HANDLE_FLAG_INHERIT, 0); + + startup_info.cb = sizeof(STARTUPINFOW); + startup_info.hStdInput = child_stdin_read; + startup_info.hStdOutput = child_stdout_write; + startup_info.hStdError = NULL; + startup_info.dwFlags |= STARTF_USESTDHANDLES; + + wsprintfW(cmd, find_exe, commandline); + CreateProcessW(NULL, cmd, NULL, NULL, TRUE, 0, NULL, NULL, &startup_info, &process_info); + CloseHandle(child_stdin_read); + CloseHandle(child_stdout_write); + + write_to_handle(parent_stdin_write, input); + CloseHandle(parent_stdin_write); + + child_output = read_all_from_handle(parent_stdout_read); + CloseHandle(parent_stdout_read); + + GetExitCodeProcess(process_info.hProcess, &exitcode); + CloseHandle(process_info.hProcess); + CloseHandle(process_info.hThread); + + comparison = lstrcmpW(child_output, out_expected); + + ok_(file, line)(comparison == 0, "\n#################### Expected:\n" + "%s\n" + "#################### But got:\n" + "%s\n" + "####################\n", + wine_dbgstr_w(out_expected), wine_dbgstr_w(child_output)); + ok_(file, line)(exitcode == exitcode_expected, "Expected exitcode %d, got %d\n", exitcode_expected, exitcode); + + heap_free(child_output); +} + +#define run_findA(commandline, input, out_expected, exitcode_expected) \ + run_findA_(commandline, input, out_expected, exitcode_expected, __FILE__, __LINE__) + +static void run_findA_(const char *commandline, const char *input, const char *out_expected, int exitcode_expected, const char *file, int line) +{ + WCHAR *commandlineW; + WCHAR *inputW; + WCHAR *out_expectedW; + int len_commandlineW, len_inputW, len_out_expectedW; + + + len_commandlineW = MultiByteToWideChar(CP_UTF8, 0, commandline, -1, 0, 0); + commandlineW = heap_alloc(len_commandlineW * sizeof(WCHAR)); + MultiByteToWideChar(CP_UTF8, 0, commandline, -1, commandlineW, len_commandlineW); + + len_inputW = MultiByteToWideChar(CP_UTF8, 0, input, -1, 0, 0); + inputW = heap_alloc(len_inputW * sizeof(WCHAR)); + MultiByteToWideChar(CP_UTF8, 0, input, -1, inputW, len_inputW); + + len_out_expectedW = MultiByteToWideChar(CP_UTF8, 0, out_expected, -1, 0, 0); + out_expectedW = heap_alloc(len_out_expectedW * sizeof(WCHAR)); + MultiByteToWideChar(CP_UTF8, 0, out_expected, -1, out_expectedW, len_out_expectedW); + + run_findW_(commandlineW, inputW, out_expectedW, exitcode_expected, file, line); + + heap_free(commandlineW); + heap_free(inputW); + heap_free(out_expectedW); +} + +static void test_errors(void) +{ + run_findA("", "", "FIND: Parameter format not correct\r\n", 2); + todo_wine + run_findA("test", "", "FIND: Parameter format not correct\r\n", 2); + todo_wine + run_findA("\"test", "", "FIND: Parameter format not correct\r\n", 2); + run_findA("\"test\" /XYZ", "", "FIND: Invalid switch\r\n", 2); +} + +static void test_singleline_without_switches(void) +{ + run_findA("\"\"", "test", "", 1); + run_findA("\"test\"", "", "", 1); + run_findA("\"test\"", "test", "test\r\n", 0); + run_findA("\"test\"", "test2", "test2\r\n", 0); + run_findA("\"test2\"", "test", "", 1); + +} + +static void test_multiline(void) +{ + /* Newline in input shouldn't work */ + run_findA("\"t1\r\nt1\"", "t1\r\nt1", "", 1); + run_findA("\"t1\nt1\"", "t1\nt1", "", 1); + + /* Newline should always be displayed as \r\n */ + run_findA("\"test1\"", "test1\ntest2", "test1\r\n", 0); + run_findA("\"test1\"", "test1\r\ntest2", "test1\r\n", 0); + + /* Test with empty line */ + run_findA("\"test1\"", "test1\n\ntest2", "test1\r\n", 0); + + /* Two strings to be found */ + run_findA("\"test\"", "junk1\ntest1\ntest2\r\njunk", "test1\r\ntest2\r\n", 0); +} + +static void test_unicode_support(void) +{ + static const WCHAR str_empty[] = {0}; + static const WCHAR str_hello_in_russian[] = {'H', 'e', 'l', 'l', 'o', ' ', 0x043F, 0x0440, 0x0438, 0x0432, 0x0435, 0x0442, 0}; + static const WCHAR str_quoted_part_of_hello_in_russian[] = {'"', 0x0438, 0x0432, 0x0435, '"', 0}; + static const WCHAR str_hello_in_russian_with_endl[] = {'H', 'e', 'l', 'l', 'o', ' ', 0x043F, 0x0440, 0x0438, 0x0432, 0x0435, 0x0442, '\r', '\n', 0}; + static const WCHAR str_quoted_hello[] = {'"', 'H', 'e', 'l', 'l', 'o', '"', 0}; + + run_findW(str_quoted_hello, str_hello_in_russian, str_hello_in_russian_with_endl, 0); + run_findW(str_quoted_part_of_hello_in_russian, str_hello_in_russian, str_empty, 1); +} + +START_TEST(find) +{ + if (PRIMARYLANGID(GetUserDefaultUILanguage()) != LANG_ENGLISH) + { + skip("Tests only work with english locale.\n"); + return; + } + + test_errors(); + test_singleline_without_switches(); + test_multiline(); + test_unicode_support(); +} -- 2.19.0

2 2

[PATCH 1/5] xmllite/writer: Free finished element data (Valgrind).
by Nikolay Sivov 14 Sep '18

14 Sep '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/xmllite/writer.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/xmllite/writer.c b/dlls/xmllite/writer.c index aa6ff7f92a..92217b8a4d 100644 --- a/dlls/xmllite/writer.c +++ b/dlls/xmllite/writer.c @@ -1221,6 +1221,7 @@ static HRESULT WINAPI xmlwriter_WriteEndElement(IXmlWriter *iface) write_output_buffer(This->output, element->qname, element->len); write_output_buffer(This->output, gtW, ARRAY_SIZE(gtW)); } + writer_free_element(This, element); return S_OK; } @@ -1287,6 +1288,8 @@ static HRESULT WINAPI xmlwriter_WriteFullEndElement(IXmlWriter *iface) write_output_buffer(This->output, element->qname, element->len); write_output_buffer(This->output, gtW, ARRAY_SIZE(gtW)); + writer_free_element(This, element); + return S_OK; } -- 2.18.0

1 4

[PATCH] ntoskrnl: Add FsRtlIsNameInExpression stub.
by Jactry Zeng 14 Sep '18

14 Sep '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=41039 Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 10 ++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 18524afb07..9fbf22d71f 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2047,6 +2047,16 @@ NTSTATUS WINAPI ExInitializeZone(PZONE_HEADER Zone, return STATUS_NOT_IMPLEMENTED; } +/*********************************************************************** +* FsRtlIsNameInExpression (NTOSKRNL.EXE.@) +*/ +BOOLEAN WINAPI FsRtlIsNameInExpression(PUNICODE_STRING expression, PUNICODE_STRING name, + BOOLEAN ignore, PWCH upcase) +{ + FIXME("stub: %p %p %d %p\n", expression, name, ignore, upcase); + return FALSE; +} + /*********************************************************************** * FsRtlRegisterUncProvider (NTOSKRNL.EXE.@) */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 12f9ddb096..422d575926 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -234,7 +234,7 @@ @ stub FsRtlIsDbcsInExpression @ stub FsRtlIsFatDbcsLegal @ stub FsRtlIsHpfsDbcsLegal -@ stub FsRtlIsNameInExpression +@ stdcall FsRtlIsNameInExpression(ptr ptr long ptr) @ stub FsRtlIsNtstatusExpected @ stub FsRtlIsPagingFile @ stub FsRtlIsTotalDeviceFailure -- 2.18.0

3 2

[PATCH v2] ntoskrnl: Add FsRtlIsNameInExpression stub.
by Jactry Zeng 14 Sep '18

14 Sep '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=41039 Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 10 ++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/ntifs.h | 1 + 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 18524afb07..9fbf22d71f 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2047,6 +2047,16 @@ NTSTATUS WINAPI ExInitializeZone(PZONE_HEADER Zone, return STATUS_NOT_IMPLEMENTED; } +/*********************************************************************** +* FsRtlIsNameInExpression (NTOSKRNL.EXE.@) +*/ +BOOLEAN WINAPI FsRtlIsNameInExpression(PUNICODE_STRING expression, PUNICODE_STRING name, + BOOLEAN ignore, PWCH upcase) +{ + FIXME("stub: %p %p %d %p\n", expression, name, ignore, upcase); + return FALSE; +} + /*********************************************************************** * FsRtlRegisterUncProvider (NTOSKRNL.EXE.@) */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 12f9ddb096..422d575926 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -234,7 +234,7 @@ @ stub FsRtlIsDbcsInExpression @ stub FsRtlIsFatDbcsLegal @ stub FsRtlIsHpfsDbcsLegal -@ stub FsRtlIsNameInExpression +@ stdcall FsRtlIsNameInExpression(ptr ptr long ptr) @ stub FsRtlIsNtstatusExpected @ stub FsRtlIsPagingFile @ stub FsRtlIsTotalDeviceFailure diff --git a/include/ddk/ntifs.h b/include/ddk/ntifs.h index 50aaabe25e..a1ed847502 100644 --- a/include/ddk/ntifs.h +++ b/include/ddk/ntifs.h @@ -129,6 +129,7 @@ typedef struct _FS_FILTER_CALLBACKS PFS_FILTER_COMPLETION_CALLBACK PostReleaseForModifiedPageWriter; } FS_FILTER_CALLBACKS, *PFS_FILTER_CALLBACKS; +BOOLEAN WINAPI FsRtlIsNameInExpression(PUNICODE_STRING, PUNICODE_STRING, BOOLEAN, PWCH); NTSTATUS WINAPI ObQueryNameString(PVOID,POBJECT_NAME_INFORMATION,ULONG,PULONG); #endif -- 2.18.0

1 0

[PATCH] mpr: Properly handle device-less connections.
by Pierre Schweitzer 14 Sep '18

14 Sep '18

Hi, Please find attached a patch that handles the case where a connection without device is returned in the connected resources enumeration. This allows cancel all connections without device. Cf. https://msdn.microsoft.com/fr-fr/c53d078e-188a-4371-bdb9-fc023bc0c1ba https://docs.microsoft.com/en-us/windows/desktop/api/winnetwk/nf-winnetwk-w… Cheers, Pierre -- Pierre Schweitzer <pierre at reactos.org> System & Network Administrator Senior Kernel Developer ReactOS Deutschland e.V.

1 0

[PATCH v2 2/2] kernel32/tests: tests for ProcessCookie in NtQueryInformationProcess.
by Alistair Leslie-Hughes 14 Sep '18

14 Sep '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/kernel32/tests/process.c | 246 ++++++++++++++++++++++++++++-------------- 1 file changed, 166 insertions(+), 80 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 0eb113b..696ef7b 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -3461,86 +3461,88 @@ static void test_session_info(void) trace("active_session = %x\n", active_session); } -static void test_process_info(void) -{ - char buf[4096]; - static const ULONG info_size[] = - { - sizeof(PROCESS_BASIC_INFORMATION) /* ProcessBasicInformation */, - sizeof(QUOTA_LIMITS) /* ProcessQuotaLimits */, - sizeof(IO_COUNTERS) /* ProcessIoCounters */, - sizeof(VM_COUNTERS) /* ProcessVmCounters */, - sizeof(KERNEL_USER_TIMES) /* ProcessTimes */, - sizeof(ULONG) /* ProcessBasePriority */, - sizeof(ULONG) /* ProcessRaisePriority */, - sizeof(HANDLE) /* ProcessDebugPort */, - sizeof(HANDLE) /* ProcessExceptionPort */, - 0 /* FIXME: sizeof(PROCESS_ACCESS_TOKEN) ProcessAccessToken */, - 0 /* FIXME: sizeof(PROCESS_LDT_INFORMATION) ProcessLdtInformation */, - 0 /* FIXME: sizeof(PROCESS_LDT_SIZE) ProcessLdtSize */, - sizeof(ULONG) /* ProcessDefaultHardErrorMode */, - 0 /* ProcessIoPortHandlers: kernel-mode only */, - 0 /* FIXME: sizeof(POOLED_USAGE_AND_LIMITS) ProcessPooledUsageAndLimits */, - 0 /* FIXME: sizeof(PROCESS_WS_WATCH_INFORMATION) ProcessWorkingSetWatch */, - sizeof(ULONG) /* ProcessUserModeIOPL */, - sizeof(BOOLEAN) /* ProcessEnableAlignmentFaultFixup */, - sizeof(PROCESS_PRIORITY_CLASS) /* ProcessPriorityClass */, - sizeof(ULONG) /* ProcessWx86Information */, - sizeof(ULONG) /* ProcessHandleCount */, - sizeof(ULONG_PTR) /* ProcessAffinityMask */, - sizeof(ULONG) /* ProcessPriorityBoost */, - 0 /* sizeof(PROCESS_DEVICEMAP_INFORMATION) ProcessDeviceMap */, - 0 /* sizeof(PROCESS_SESSION_INFORMATION) ProcessSessionInformation */, - 0 /* sizeof(PROCESS_FOREGROUND_BACKGROUND) ProcessForegroundInformation */, - sizeof(ULONG_PTR) /* ProcessWow64Information */, - sizeof(buf) /* ProcessImageFileName */, - sizeof(ULONG) /* ProcessLUIDDeviceMapsEnabled */, - sizeof(ULONG) /* ProcessBreakOnTermination */, - sizeof(HANDLE) /* ProcessDebugObjectHandle */, - sizeof(ULONG) /* ProcessDebugFlags */, - sizeof(buf) /* ProcessHandleTracing */, - sizeof(ULONG) /* ProcessIoPriority */, - sizeof(ULONG) /* ProcessExecuteFlags */, - 0 /* FIXME: sizeof(?) ProcessTlsInformation */, - 0 /* FIXME: sizeof(?) ProcessCookie */, - sizeof(SECTION_IMAGE_INFORMATION) /* ProcessImageInformation */, - 0 /* FIXME: sizeof(PROCESS_CYCLE_TIME_INFORMATION) ProcessCycleTime */, - sizeof(ULONG) /* ProcessPagePriority */, - 40 /* ProcessInstrumentationCallback */, - 0 /* FIXME: sizeof(PROCESS_STACK_ALLOCATION_INFORMATION) ProcessThreadStackAllocation */, - 0 /* FIXME: sizeof(PROCESS_WS_WATCH_INFORMATION_EX[]) ProcessWorkingSetWatchEx */, - sizeof(buf) /* ProcessImageFileNameWin32 */, +#define BUFFER_SIZE 4096 +static const ULONG info_size[] = +{ + sizeof(PROCESS_BASIC_INFORMATION) /* ProcessBasicInformation */, + sizeof(QUOTA_LIMITS) /* ProcessQuotaLimits */, + sizeof(IO_COUNTERS) /* ProcessIoCounters */, + sizeof(VM_COUNTERS) /* ProcessVmCounters */, + sizeof(KERNEL_USER_TIMES) /* ProcessTimes */, + sizeof(ULONG) /* ProcessBasePriority */, + sizeof(ULONG) /* ProcessRaisePriority */, + sizeof(HANDLE) /* ProcessDebugPort */, + sizeof(HANDLE) /* ProcessExceptionPort */, + 0 /* FIXME: sizeof(PROCESS_ACCESS_TOKEN) ProcessAccessToken */, + 0 /* FIXME: sizeof(PROCESS_LDT_INFORMATION) ProcessLdtInformation */, + 0 /* FIXME: sizeof(PROCESS_LDT_SIZE) ProcessLdtSize */, + sizeof(ULONG) /* ProcessDefaultHardErrorMode */, + 0 /* ProcessIoPortHandlers: kernel-mode only */, + 0 /* FIXME: sizeof(POOLED_USAGE_AND_LIMITS) ProcessPooledUsageAndLimits */, + 0 /* FIXME: sizeof(PROCESS_WS_WATCH_INFORMATION) ProcessWorkingSetWatch */, + sizeof(ULONG) /* ProcessUserModeIOPL */, + sizeof(BOOLEAN) /* ProcessEnableAlignmentFaultFixup */, + sizeof(PROCESS_PRIORITY_CLASS) /* ProcessPriorityClass */, + sizeof(ULONG) /* ProcessWx86Information */, + sizeof(ULONG) /* ProcessHandleCount */, + sizeof(ULONG_PTR) /* ProcessAffinityMask */, + sizeof(ULONG) /* ProcessPriorityBoost */, + 0 /* sizeof(PROCESS_DEVICEMAP_INFORMATION) ProcessDeviceMap */, + 0 /* sizeof(PROCESS_SESSION_INFORMATION) ProcessSessionInformation */, + 0 /* sizeof(PROCESS_FOREGROUND_BACKGROUND) ProcessForegroundInformation */, + sizeof(ULONG_PTR) /* ProcessWow64Information */, + BUFFER_SIZE /* ProcessImageFileName */, + sizeof(ULONG) /* ProcessLUIDDeviceMapsEnabled */, + sizeof(ULONG) /* ProcessBreakOnTermination */, + sizeof(HANDLE) /* ProcessDebugObjectHandle */, + sizeof(ULONG) /* ProcessDebugFlags */, + BUFFER_SIZE /* ProcessHandleTracing */, + sizeof(ULONG) /* ProcessIoPriority */, + sizeof(ULONG) /* ProcessExecuteFlags */, + 0 /* FIXME: sizeof(?) ProcessTlsInformation */, + sizeof(ULONG) /* ProcessCookie */, + sizeof(SECTION_IMAGE_INFORMATION) /* ProcessImageInformation */, + 0 /* FIXME: sizeof(PROCESS_CYCLE_TIME_INFORMATION) ProcessCycleTime */, + sizeof(ULONG) /* ProcessPagePriority */, + 40 /* ProcessInstrumentationCallback */, + 0 /* FIXME: sizeof(PROCESS_STACK_ALLOCATION_INFORMATION) ProcessThreadStackAllocation */, + 0 /* FIXME: sizeof(PROCESS_WS_WATCH_INFORMATION_EX[]) ProcessWorkingSetWatchEx */, + BUFFER_SIZE /* ProcessImageFileNameWin32 */, #if 0 /* FIXME: Add remaining classes */ - sizeof(HANDLE) /* ProcessImageFileMapping */, - sizeof(PROCESS_AFFINITY_UPDATE_MODE) /* ProcessAffinityUpdateMode */, - sizeof(PROCESS_MEMORY_ALLOCATION_MODE) /* ProcessMemoryAllocationMode */, - sizeof(USHORT[]) /* ProcessGroupInformation */, - sizeof(ULONG) /* ProcessTokenVirtualizationEnabled */, - sizeof(ULONG_PTR) /* ProcessConsoleHostProcess */, - sizeof(PROCESS_WINDOW_INFORMATION) /* ProcessWindowInformation */, - sizeof(PROCESS_HANDLE_SNAPSHOT_INFORMATION) /* ProcessHandleInformation */, - sizeof(PROCESS_MITIGATION_POLICY_INFORMATION) /* ProcessMitigationPolicy */, - sizeof(ProcessDynamicFunctionTableInformation) /* ProcessDynamicFunctionTableInformation */, - sizeof(?) /* ProcessHandleCheckingMode */, - sizeof(PROCESS_KEEPALIVE_COUNT_INFORMATION) /* ProcessKeepAliveCount */, - sizeof(PROCESS_REVOKE_FILE_HANDLES_INFORMATION) /* ProcessRevokeFileHandles */, - sizeof(PROCESS_WORKING_SET_CONTROL) /* ProcessWorkingSetControl */, - sizeof(?) /* ProcessHandleTable */, - sizeof(?) /* ProcessCheckStackExtentsMode */, - sizeof(buf) /* ProcessCommandLineInformation */, - sizeof(PS_PROTECTION) /* ProcessProtectionInformation */, - sizeof(PROCESS_MEMORY_EXHAUSTION_INFO) /* ProcessMemoryExhaustion */, - sizeof(PROCESS_FAULT_INFORMATION) /* ProcessFaultInformation */, - sizeof(PROCESS_TELEMETRY_ID_INFORMATION) /* ProcessTelemetryIdInformation */, - sizeof(PROCESS_COMMIT_RELEASE_INFORMATION) /* ProcessCommitReleaseInformation */, - sizeof(?) /* ProcessDefaultCpuSetsInformation */, - sizeof(?) /* ProcessAllowedCpuSetsInformation */, - 0 /* ProcessReserved1Information */, - 0 /* ProcessReserved2Information */, - sizeof(?) /* ProcessSubsystemProcess */, - sizeof(PROCESS_JOB_MEMORY_INFO) /* ProcessJobMemoryInformation */, + sizeof(HANDLE) /* ProcessImageFileMapping */, + sizeof(PROCESS_AFFINITY_UPDATE_MODE) /* ProcessAffinityUpdateMode */, + sizeof(PROCESS_MEMORY_ALLOCATION_MODE) /* ProcessMemoryAllocationMode */, + sizeof(USHORT[]) /* ProcessGroupInformation */, + sizeof(ULONG) /* ProcessTokenVirtualizationEnabled */, + sizeof(ULONG_PTR) /* ProcessConsoleHostProcess */, + sizeof(PROCESS_WINDOW_INFORMATION) /* ProcessWindowInformation */, + sizeof(PROCESS_HANDLE_SNAPSHOT_INFORMATION) /* ProcessHandleInformation */, + sizeof(PROCESS_MITIGATION_POLICY_INFORMATION) /* ProcessMitigationPolicy */, + sizeof(ProcessDynamicFunctionTableInformation) /* ProcessDynamicFunctionTableInformation */, + sizeof(?) /* ProcessHandleCheckingMode */, + sizeof(PROCESS_KEEPALIVE_COUNT_INFORMATION) /* ProcessKeepAliveCount */, + sizeof(PROCESS_REVOKE_FILE_HANDLES_INFORMATION) /* ProcessRevokeFileHandles */, + sizeof(PROCESS_WORKING_SET_CONTROL) /* ProcessWorkingSetControl */, + sizeof(?) /* ProcessHandleTable */, + sizeof(?) /* ProcessCheckStackExtentsMode */, + sizeof(buf) /* ProcessCommandLineInformation */, + sizeof(PS_PROTECTION) /* ProcessProtectionInformation */, + sizeof(PROCESS_MEMORY_EXHAUSTION_INFO) /* ProcessMemoryExhaustion */, + sizeof(PROCESS_FAULT_INFORMATION) /* ProcessFaultInformation */, + sizeof(PROCESS_TELEMETRY_ID_INFORMATION) /* ProcessTelemetryIdInformation */, + sizeof(PROCESS_COMMIT_RELEASE_INFORMATION) /* ProcessCommitReleaseInformation */, + sizeof(?) /* ProcessDefaultCpuSetsInformation */, + sizeof(?) /* ProcessAllowedCpuSetsInformation */, + 0 /* ProcessReserved1Information */, + 0 /* ProcessReserved2Information */, + sizeof(?) /* ProcessSubsystemProcess */, + sizeof(PROCESS_JOB_MEMORY_INFO) /* ProcessJobMemoryInformation */, #endif - }; +}; + +static void test_process_info(void) +{ + char buf[BUFFER_SIZE]; HANDLE hproc; ULONG i, status, ret_len, size; @@ -3598,11 +3600,13 @@ static void test_process_info(void) ok(status == STATUS_ACCESS_DENIED || status == STATUS_PORT_NOT_SET, "for info %u expected STATUS_ACCESS_DENIED, got %08x (ret_len %u)\n", i, status, ret_len); break; - + case ProcessCookie: + ok(status == STATUS_INVALID_PARAMETER /* before win8 */ || status == STATUS_ACCESS_DENIED, + "for info %u got %08x (ret_len %u)\n", i, status, ret_len); + break; case ProcessExecuteFlags: case ProcessDebugPort: case ProcessDebugFlags: - case ProcessCookie: todo_wine ok(status == STATUS_ACCESS_DENIED, "for info %u expected STATUS_ACCESS_DENIED, got %08x (ret_len %u)\n", i, status, ret_len); break; @@ -3616,6 +3620,87 @@ todo_wine CloseHandle(hproc); } +static void test_process_info_current(void) +{ + char buf[BUFFER_SIZE]; + HANDLE hproc; + ULONG i, status, ret_len, size; + + if (!pNtQueryInformationProcess) + { + win_skip("NtQueryInformationProcess is not available on this platform\n"); + return; + } + + hproc = GetCurrentProcess(); + if (!hproc) + { + win_skip("PROCESS_QUERY_LIMITED_INFORMATION is not supported on this platform\n"); + return; + } + + for (i = 0; i < MaxProcessInfoClass; i++) + { + size = info_size[i]; + if (!size) size = sizeof(buf); + ret_len = 0; + status = pNtQueryInformationProcess(hproc, i, buf, info_size[i], &ret_len); + if (status == STATUS_NOT_IMPLEMENTED) continue; + if (status == STATUS_INVALID_INFO_CLASS) continue; + if (status == STATUS_INFO_LENGTH_MISMATCH) continue; + + switch (i) + { + case ProcessBasicInformation: + case ProcessQuotaLimits: + case ProcessTimes: + case ProcessPriorityClass: + case ProcessPriorityBoost: + case ProcessLUIDDeviceMapsEnabled: + case 33 /* ProcessIoPriority */: + case ProcessIoCounters: + case ProcessVmCounters: + case ProcessWow64Information: + case ProcessDefaultHardErrorMode: + case ProcessHandleCount: + case ProcessImageFileName: + case ProcessImageInformation: + case ProcessPagePriority: + case ProcessImageFileNameWin32: + ok(status == STATUS_SUCCESS, "for info %u expected STATUS_SUCCESS, got %08x (ret_len %u)\n", i, status, ret_len); + break; + + case ProcessAffinityMask: + case ProcessBreakOnTermination: + ok(status == STATUS_ACCESS_DENIED /* before win8 */ || status == STATUS_SUCCESS /* win8 is less strict */, + "for info %u expected STATUS_SUCCESS, got %08x (ret_len %u)\n", i, status, ret_len); + break; + + case ProcessDebugObjectHandle: + ok(status == STATUS_ACCESS_DENIED || status == STATUS_PORT_NOT_SET, + "for info %u expected STATUS_ACCESS_DENIED, got %08x (ret_len %u)\n", i, status, ret_len); + break; + case ProcessCookie: + ok(status == STATUS_SUCCESS || status == STATUS_INVALID_PARAMETER /* before win8 */, + "for info %u got %08x (ret_len %u)\n", i, status, ret_len); + break; + case ProcessExecuteFlags: + case ProcessDebugPort: + case ProcessDebugFlags: + ok(status == STATUS_SUCCESS || status == STATUS_INVALID_PARAMETER, + "for info %u, got %08x (ret_len %u)\n", i, status, ret_len); + break; + + default: + ok(status == STATUS_SUCCESS || status == STATUS_UNSUCCESSFUL || status == STATUS_INVALID_PARAMETER, + "for info %u, got %08x (ret_len %u)\n", i, status, ret_len); + break; + } + } + + CloseHandle(hproc); +} + static void test_GetLogicalProcessorInformationEx(void) { SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *info; @@ -3825,6 +3910,7 @@ START_TEST(process) } test_process_info(); + test_process_info_current(); test_TerminateProcess(); test_Startup(); test_CommandLine(); -- 1.9.1

1 0

[PATCH v2 1/2] ntdll: Stub for ProcessCookie in NtQueryInformationProcess.
by Alistair Leslie-Hughes 14 Sep '18

14 Sep '18

From: Andrew Wesie <awesie(a)gmail.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/ntdll/process.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index b299287..c5057da 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -572,6 +572,22 @@ NTSTATUS WINAPI NtQueryInformationProcess( else ret = STATUS_INFO_LENGTH_MISMATCH; break; + case ProcessCookie: + FIXME("ProcessCookie (%p,%p,0x%08x,%p) stub\n", + ProcessHandle,ProcessInformation, + ProcessInformationLength,ReturnLength); + + if(ProcessHandle == NtCurrentProcess()) + { + len = sizeof(ULONG); + if (ProcessInformationLength == len) + *(ULONG *)ProcessInformation = 0; + else + ret = STATUS_INFO_LENGTH_MISMATCH; + } + else + ret = STATUS_INVALID_PARAMETER; + break; default: FIXME("(%p,info_class=%d,%p,0x%08x,%p) Unknown information class\n", ProcessHandle,ProcessInformationClass, -- 1.9.1

1 0

[PATCH 2/2] kernel32/tests: Tests for ProcessCookie in NtQueryInformationProcess.
by Alistair Leslie-Hughes 14 Sep '18

14 Sep '18

From: Andrew Wesie <awesie(a)gmail.com> Querying for ProcessCookie must be called in the current process for it to return a valid value. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/kernel32/tests/process.c | 246 ++++++++++++++++++++++++++++-------------- 1 file changed, 166 insertions(+), 80 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 0eb113b..696ef7b 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -3461,86 +3461,88 @@ static void test_session_info(void) trace("active_session = %x\n", active_session); } -static void test_process_info(void) -{ - char buf[4096]; - static const ULONG info_size[] = - { - sizeof(PROCESS_BASIC_INFORMATION) /* ProcessBasicInformation */, - sizeof(QUOTA_LIMITS) /* ProcessQuotaLimits */, - sizeof(IO_COUNTERS) /* ProcessIoCounters */, - sizeof(VM_COUNTERS) /* ProcessVmCounters */, - sizeof(KERNEL_USER_TIMES) /* ProcessTimes */, - sizeof(ULONG) /* ProcessBasePriority */, - sizeof(ULONG) /* ProcessRaisePriority */, - sizeof(HANDLE) /* ProcessDebugPort */, - sizeof(HANDLE) /* ProcessExceptionPort */, - 0 /* FIXME: sizeof(PROCESS_ACCESS_TOKEN) ProcessAccessToken */, - 0 /* FIXME: sizeof(PROCESS_LDT_INFORMATION) ProcessLdtInformation */, - 0 /* FIXME: sizeof(PROCESS_LDT_SIZE) ProcessLdtSize */, - sizeof(ULONG) /* ProcessDefaultHardErrorMode */, - 0 /* ProcessIoPortHandlers: kernel-mode only */, - 0 /* FIXME: sizeof(POOLED_USAGE_AND_LIMITS) ProcessPooledUsageAndLimits */, - 0 /* FIXME: sizeof(PROCESS_WS_WATCH_INFORMATION) ProcessWorkingSetWatch */, - sizeof(ULONG) /* ProcessUserModeIOPL */, - sizeof(BOOLEAN) /* ProcessEnableAlignmentFaultFixup */, - sizeof(PROCESS_PRIORITY_CLASS) /* ProcessPriorityClass */, - sizeof(ULONG) /* ProcessWx86Information */, - sizeof(ULONG) /* ProcessHandleCount */, - sizeof(ULONG_PTR) /* ProcessAffinityMask */, - sizeof(ULONG) /* ProcessPriorityBoost */, - 0 /* sizeof(PROCESS_DEVICEMAP_INFORMATION) ProcessDeviceMap */, - 0 /* sizeof(PROCESS_SESSION_INFORMATION) ProcessSessionInformation */, - 0 /* sizeof(PROCESS_FOREGROUND_BACKGROUND) ProcessForegroundInformation */, - sizeof(ULONG_PTR) /* ProcessWow64Information */, - sizeof(buf) /* ProcessImageFileName */, - sizeof(ULONG) /* ProcessLUIDDeviceMapsEnabled */, - sizeof(ULONG) /* ProcessBreakOnTermination */, - sizeof(HANDLE) /* ProcessDebugObjectHandle */, - sizeof(ULONG) /* ProcessDebugFlags */, - sizeof(buf) /* ProcessHandleTracing */, - sizeof(ULONG) /* ProcessIoPriority */, - sizeof(ULONG) /* ProcessExecuteFlags */, - 0 /* FIXME: sizeof(?) ProcessTlsInformation */, - 0 /* FIXME: sizeof(?) ProcessCookie */, - sizeof(SECTION_IMAGE_INFORMATION) /* ProcessImageInformation */, - 0 /* FIXME: sizeof(PROCESS_CYCLE_TIME_INFORMATION) ProcessCycleTime */, - sizeof(ULONG) /* ProcessPagePriority */, - 40 /* ProcessInstrumentationCallback */, - 0 /* FIXME: sizeof(PROCESS_STACK_ALLOCATION_INFORMATION) ProcessThreadStackAllocation */, - 0 /* FIXME: sizeof(PROCESS_WS_WATCH_INFORMATION_EX[]) ProcessWorkingSetWatchEx */, - sizeof(buf) /* ProcessImageFileNameWin32 */, +#define BUFFER_SIZE 4096 +static const ULONG info_size[] = +{ + sizeof(PROCESS_BASIC_INFORMATION) /* ProcessBasicInformation */, + sizeof(QUOTA_LIMITS) /* ProcessQuotaLimits */, + sizeof(IO_COUNTERS) /* ProcessIoCounters */, + sizeof(VM_COUNTERS) /* ProcessVmCounters */, + sizeof(KERNEL_USER_TIMES) /* ProcessTimes */, + sizeof(ULONG) /* ProcessBasePriority */, + sizeof(ULONG) /* ProcessRaisePriority */, + sizeof(HANDLE) /* ProcessDebugPort */, + sizeof(HANDLE) /* ProcessExceptionPort */, + 0 /* FIXME: sizeof(PROCESS_ACCESS_TOKEN) ProcessAccessToken */, + 0 /* FIXME: sizeof(PROCESS_LDT_INFORMATION) ProcessLdtInformation */, + 0 /* FIXME: sizeof(PROCESS_LDT_SIZE) ProcessLdtSize */, + sizeof(ULONG) /* ProcessDefaultHardErrorMode */, + 0 /* ProcessIoPortHandlers: kernel-mode only */, + 0 /* FIXME: sizeof(POOLED_USAGE_AND_LIMITS) ProcessPooledUsageAndLimits */, + 0 /* FIXME: sizeof(PROCESS_WS_WATCH_INFORMATION) ProcessWorkingSetWatch */, + sizeof(ULONG) /* ProcessUserModeIOPL */, + sizeof(BOOLEAN) /* ProcessEnableAlignmentFaultFixup */, + sizeof(PROCESS_PRIORITY_CLASS) /* ProcessPriorityClass */, + sizeof(ULONG) /* ProcessWx86Information */, + sizeof(ULONG) /* ProcessHandleCount */, + sizeof(ULONG_PTR) /* ProcessAffinityMask */, + sizeof(ULONG) /* ProcessPriorityBoost */, + 0 /* sizeof(PROCESS_DEVICEMAP_INFORMATION) ProcessDeviceMap */, + 0 /* sizeof(PROCESS_SESSION_INFORMATION) ProcessSessionInformation */, + 0 /* sizeof(PROCESS_FOREGROUND_BACKGROUND) ProcessForegroundInformation */, + sizeof(ULONG_PTR) /* ProcessWow64Information */, + BUFFER_SIZE /* ProcessImageFileName */, + sizeof(ULONG) /* ProcessLUIDDeviceMapsEnabled */, + sizeof(ULONG) /* ProcessBreakOnTermination */, + sizeof(HANDLE) /* ProcessDebugObjectHandle */, + sizeof(ULONG) /* ProcessDebugFlags */, + BUFFER_SIZE /* ProcessHandleTracing */, + sizeof(ULONG) /* ProcessIoPriority */, + sizeof(ULONG) /* ProcessExecuteFlags */, + 0 /* FIXME: sizeof(?) ProcessTlsInformation */, + sizeof(ULONG) /* ProcessCookie */, + sizeof(SECTION_IMAGE_INFORMATION) /* ProcessImageInformation */, + 0 /* FIXME: sizeof(PROCESS_CYCLE_TIME_INFORMATION) ProcessCycleTime */, + sizeof(ULONG) /* ProcessPagePriority */, + 40 /* ProcessInstrumentationCallback */, + 0 /* FIXME: sizeof(PROCESS_STACK_ALLOCATION_INFORMATION) ProcessThreadStackAllocation */, + 0 /* FIXME: sizeof(PROCESS_WS_WATCH_INFORMATION_EX[]) ProcessWorkingSetWatchEx */, + BUFFER_SIZE /* ProcessImageFileNameWin32 */, #if 0 /* FIXME: Add remaining classes */ - sizeof(HANDLE) /* ProcessImageFileMapping */, - sizeof(PROCESS_AFFINITY_UPDATE_MODE) /* ProcessAffinityUpdateMode */, - sizeof(PROCESS_MEMORY_ALLOCATION_MODE) /* ProcessMemoryAllocationMode */, - sizeof(USHORT[]) /* ProcessGroupInformation */, - sizeof(ULONG) /* ProcessTokenVirtualizationEnabled */, - sizeof(ULONG_PTR) /* ProcessConsoleHostProcess */, - sizeof(PROCESS_WINDOW_INFORMATION) /* ProcessWindowInformation */, - sizeof(PROCESS_HANDLE_SNAPSHOT_INFORMATION) /* ProcessHandleInformation */, - sizeof(PROCESS_MITIGATION_POLICY_INFORMATION) /* ProcessMitigationPolicy */, - sizeof(ProcessDynamicFunctionTableInformation) /* ProcessDynamicFunctionTableInformation */, - sizeof(?) /* ProcessHandleCheckingMode */, - sizeof(PROCESS_KEEPALIVE_COUNT_INFORMATION) /* ProcessKeepAliveCount */, - sizeof(PROCESS_REVOKE_FILE_HANDLES_INFORMATION) /* ProcessRevokeFileHandles */, - sizeof(PROCESS_WORKING_SET_CONTROL) /* ProcessWorkingSetControl */, - sizeof(?) /* ProcessHandleTable */, - sizeof(?) /* ProcessCheckStackExtentsMode */, - sizeof(buf) /* ProcessCommandLineInformation */, - sizeof(PS_PROTECTION) /* ProcessProtectionInformation */, - sizeof(PROCESS_MEMORY_EXHAUSTION_INFO) /* ProcessMemoryExhaustion */, - sizeof(PROCESS_FAULT_INFORMATION) /* ProcessFaultInformation */, - sizeof(PROCESS_TELEMETRY_ID_INFORMATION) /* ProcessTelemetryIdInformation */, - sizeof(PROCESS_COMMIT_RELEASE_INFORMATION) /* ProcessCommitReleaseInformation */, - sizeof(?) /* ProcessDefaultCpuSetsInformation */, - sizeof(?) /* ProcessAllowedCpuSetsInformation */, - 0 /* ProcessReserved1Information */, - 0 /* ProcessReserved2Information */, - sizeof(?) /* ProcessSubsystemProcess */, - sizeof(PROCESS_JOB_MEMORY_INFO) /* ProcessJobMemoryInformation */, + sizeof(HANDLE) /* ProcessImageFileMapping */, + sizeof(PROCESS_AFFINITY_UPDATE_MODE) /* ProcessAffinityUpdateMode */, + sizeof(PROCESS_MEMORY_ALLOCATION_MODE) /* ProcessMemoryAllocationMode */, + sizeof(USHORT[]) /* ProcessGroupInformation */, + sizeof(ULONG) /* ProcessTokenVirtualizationEnabled */, + sizeof(ULONG_PTR) /* ProcessConsoleHostProcess */, + sizeof(PROCESS_WINDOW_INFORMATION) /* ProcessWindowInformation */, + sizeof(PROCESS_HANDLE_SNAPSHOT_INFORMATION) /* ProcessHandleInformation */, + sizeof(PROCESS_MITIGATION_POLICY_INFORMATION) /* ProcessMitigationPolicy */, + sizeof(ProcessDynamicFunctionTableInformation) /* ProcessDynamicFunctionTableInformation */, + sizeof(?) /* ProcessHandleCheckingMode */, + sizeof(PROCESS_KEEPALIVE_COUNT_INFORMATION) /* ProcessKeepAliveCount */, + sizeof(PROCESS_REVOKE_FILE_HANDLES_INFORMATION) /* ProcessRevokeFileHandles */, + sizeof(PROCESS_WORKING_SET_CONTROL) /* ProcessWorkingSetControl */, + sizeof(?) /* ProcessHandleTable */, + sizeof(?) /* ProcessCheckStackExtentsMode */, + sizeof(buf) /* ProcessCommandLineInformation */, + sizeof(PS_PROTECTION) /* ProcessProtectionInformation */, + sizeof(PROCESS_MEMORY_EXHAUSTION_INFO) /* ProcessMemoryExhaustion */, + sizeof(PROCESS_FAULT_INFORMATION) /* ProcessFaultInformation */, + sizeof(PROCESS_TELEMETRY_ID_INFORMATION) /* ProcessTelemetryIdInformation */, + sizeof(PROCESS_COMMIT_RELEASE_INFORMATION) /* ProcessCommitReleaseInformation */, + sizeof(?) /* ProcessDefaultCpuSetsInformation */, + sizeof(?) /* ProcessAllowedCpuSetsInformation */, + 0 /* ProcessReserved1Information */, + 0 /* ProcessReserved2Information */, + sizeof(?) /* ProcessSubsystemProcess */, + sizeof(PROCESS_JOB_MEMORY_INFO) /* ProcessJobMemoryInformation */, #endif - }; +}; + +static void test_process_info(void) +{ + char buf[BUFFER_SIZE]; HANDLE hproc; ULONG i, status, ret_len, size; @@ -3598,11 +3600,13 @@ static void test_process_info(void) ok(status == STATUS_ACCESS_DENIED || status == STATUS_PORT_NOT_SET, "for info %u expected STATUS_ACCESS_DENIED, got %08x (ret_len %u)\n", i, status, ret_len); break; - + case ProcessCookie: + ok(status == STATUS_INVALID_PARAMETER /* before win8 */ || status == STATUS_ACCESS_DENIED, + "for info %u got %08x (ret_len %u)\n", i, status, ret_len); + break; case ProcessExecuteFlags: case ProcessDebugPort: case ProcessDebugFlags: - case ProcessCookie: todo_wine ok(status == STATUS_ACCESS_DENIED, "for info %u expected STATUS_ACCESS_DENIED, got %08x (ret_len %u)\n", i, status, ret_len); break; @@ -3616,6 +3620,87 @@ todo_wine CloseHandle(hproc); } +static void test_process_info_current(void) +{ + char buf[BUFFER_SIZE]; + HANDLE hproc; + ULONG i, status, ret_len, size; + + if (!pNtQueryInformationProcess) + { + win_skip("NtQueryInformationProcess is not available on this platform\n"); + return; + } + + hproc = GetCurrentProcess(); + if (!hproc) + { + win_skip("PROCESS_QUERY_LIMITED_INFORMATION is not supported on this platform\n"); + return; + } + + for (i = 0; i < MaxProcessInfoClass; i++) + { + size = info_size[i]; + if (!size) size = sizeof(buf); + ret_len = 0; + status = pNtQueryInformationProcess(hproc, i, buf, info_size[i], &ret_len); + if (status == STATUS_NOT_IMPLEMENTED) continue; + if (status == STATUS_INVALID_INFO_CLASS) continue; + if (status == STATUS_INFO_LENGTH_MISMATCH) continue; + + switch (i) + { + case ProcessBasicInformation: + case ProcessQuotaLimits: + case ProcessTimes: + case ProcessPriorityClass: + case ProcessPriorityBoost: + case ProcessLUIDDeviceMapsEnabled: + case 33 /* ProcessIoPriority */: + case ProcessIoCounters: + case ProcessVmCounters: + case ProcessWow64Information: + case ProcessDefaultHardErrorMode: + case ProcessHandleCount: + case ProcessImageFileName: + case ProcessImageInformation: + case ProcessPagePriority: + case ProcessImageFileNameWin32: + ok(status == STATUS_SUCCESS, "for info %u expected STATUS_SUCCESS, got %08x (ret_len %u)\n", i, status, ret_len); + break; + + case ProcessAffinityMask: + case ProcessBreakOnTermination: + ok(status == STATUS_ACCESS_DENIED /* before win8 */ || status == STATUS_SUCCESS /* win8 is less strict */, + "for info %u expected STATUS_SUCCESS, got %08x (ret_len %u)\n", i, status, ret_len); + break; + + case ProcessDebugObjectHandle: + ok(status == STATUS_ACCESS_DENIED || status == STATUS_PORT_NOT_SET, + "for info %u expected STATUS_ACCESS_DENIED, got %08x (ret_len %u)\n", i, status, ret_len); + break; + case ProcessCookie: + ok(status == STATUS_SUCCESS || status == STATUS_INVALID_PARAMETER /* before win8 */, + "for info %u got %08x (ret_len %u)\n", i, status, ret_len); + break; + case ProcessExecuteFlags: + case ProcessDebugPort: + case ProcessDebugFlags: + ok(status == STATUS_SUCCESS || status == STATUS_INVALID_PARAMETER, + "for info %u, got %08x (ret_len %u)\n", i, status, ret_len); + break; + + default: + ok(status == STATUS_SUCCESS || status == STATUS_UNSUCCESSFUL || status == STATUS_INVALID_PARAMETER, + "for info %u, got %08x (ret_len %u)\n", i, status, ret_len); + break; + } + } + + CloseHandle(hproc); +} + static void test_GetLogicalProcessorInformationEx(void) { SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *info; @@ -3825,6 +3910,7 @@ START_TEST(process) } test_process_info(); + test_process_info_current(); test_TerminateProcess(); test_Startup(); test_CommandLine(); -- 1.9.1

2 1

[PATCH 1/2] ntdll: Stub for ProcessCookie in NtQueryInformationProcess.
by Alistair Leslie-Hughes 14 Sep '18

14 Sep '18

From: Andrew Wesie <awesie(a)gmail.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/ntdll/process.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index b299287..c5057da 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -572,6 +572,22 @@ NTSTATUS WINAPI NtQueryInformationProcess( else ret = STATUS_INFO_LENGTH_MISMATCH; break; + case ProcessCookie: + FIXME("ProcessCookie (%p,%p,0x%08x,%p) stub\n", + ProcessHandle,ProcessInformation, + ProcessInformationLength,ReturnLength); + + if(ProcessHandle == NtCurrentProcess()) + { + len = sizeof(ULONG); + if (ProcessInformationLength == len) + *(ULONG *)ProcessInformation = 0; + else + ret = STATUS_INFO_LENGTH_MISMATCH; + } + else + ret = STATUS_INVALID_PARAMETER; + break; default: FIXME("(%p,info_class=%d,%p,0x%08x,%p) Unknown information class\n", ProcessHandle,ProcessInformationClass, -- 1.9.1

1 0

[PATCH] wined3d: Introduce WINED3DFMT_FLAG_VERTEX_ATTRIBUTE.
by Henri Verbeet 13 Sep '18

13 Sep '18

To indicate a format can be used for vertex attributes. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/utils.c | 1 + dlls/wined3d/vertexdeclaration.c | 2 +- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 17aa8c07732..d463a086803 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3692,6 +3692,7 @@ static BOOL init_format_vertex_info(const struct wined3d_adapter *adapter, format->emit_idx = format_vertex_info[i].emit_idx; format->gl_vtx_type = format_vertex_info[i].gl_vtx_type; format->gl_vtx_format = format->component_count; + format->flags[WINED3D_GL_RES_TYPE_BUFFER] |= WINED3DFMT_FLAG_VERTEX_ATTRIBUTE; } if (gl_info->supported[ARB_VERTEX_ARRAY_BGRA]) diff --git a/dlls/wined3d/vertexdeclaration.c b/dlls/wined3d/vertexdeclaration.c index 89329d42034..863366b9243 100644 --- a/dlls/wined3d/vertexdeclaration.c +++ b/dlls/wined3d/vertexdeclaration.c @@ -220,7 +220,7 @@ static HRESULT vertexdeclaration_init(struct wined3d_vertex_declaration *declara if (e->input_slot >= MAX_STREAMS) continue; - if (!e->format->gl_vtx_format) + if (!(e->format->flags[WINED3D_GL_RES_TYPE_BUFFER] & WINED3DFMT_FLAG_VERTEX_ATTRIBUTE)) { FIXME("The application tries to use an unsupported format (%s), returning E_FAIL.\n", debug_d3dformat(elements[i].format)); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 2673de0c4eb..aea874f84ea 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4293,6 +4293,7 @@ extern enum wined3d_format_id pixelformat_for_depth(DWORD depth) DECLSPEC_HIDDEN #define WINED3DFMT_FLAG_INTEGER 0x00200000 #define WINED3DFMT_FLAG_GEN_MIPMAP 0x00400000 #define WINED3DFMT_FLAG_NORMALISED 0x00800000 +#define WINED3DFMT_FLAG_VERTEX_ATTRIBUTE 0x01000000 struct wined3d_rational { -- 2.11.0

1 0

[PATCH] advapi32: add stub for TraceSetInformation
by Louis Lenders 13 Sep '18

13 Sep '18

fix https://bugs.winehq.org/show_bug.cgi?id=45813 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- dlls/advapi32/advapi32.spec | 2 +- dlls/advapi32/eventlog.c | 9 +++++++++ .../api-ms-win-eventing-controller-l1-1-0.spec | 2 +- include/evntrace.h | 15 +++++++++++++++ 4 files changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index bb817a593c..5845ae0878 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -818,7 +818,7 @@ @ varargs TraceMessage(int64 long ptr long) @ stdcall TraceMessageVa(int64 long ptr long ptr) # @ stub TraceQueryInformation -# @ stub TraceSetInformation +@ stdcall TraceSetInformation(int64 long ptr long) # @ stub TreeResetNamedSecurityInfoA @ stdcall TreeResetNamedSecurityInfoW(wstr long long ptr ptr ptr ptr long ptr long ptr) # @ stub TreeSetNamedSecurityInfoA diff --git a/dlls/advapi32/eventlog.c b/dlls/advapi32/eventlog.c index fbab8e8332..32066c5fef 100644 --- a/dlls/advapi32/eventlog.c +++ b/dlls/advapi32/eventlog.c @@ -931,3 +931,12 @@ ULONG WINAPI EnumerateTraceGuids(PTRACE_GUID_PROPERTIES *propertiesarray, FIXME("%p %d %p: stub\n", propertiesarray, arraycount, guidcount); return ERROR_INVALID_PARAMETER; } + +/****************************************************************************** + * TraceSetInformation [ADVAPI32.@] + */ +ULONG WINAPI TraceSetInformation(TRACEHANDLE handle, TRACE_INFO_CLASS infoclass, VOID* info, ULONG len) +{ + FIXME("%s %d %p %d: stub\n", wine_dbgstr_longlong(handle), infoclass, info, len); + return ERROR_CALL_NOT_IMPLEMENTED; +} diff --git a/dlls/api-ms-win-eventing-controller-l1-1-0/api-ms-win-eventing-controller-l1-1-0.spec b/dlls/api-ms-win-eventing-controller-l1-1-0/api-ms-win-eventing-controller-l1-1-0.spec index 0b58510b31..60a4ff546e 100644 --- a/dlls/api-ms-win-eventing-controller-l1-1-0/api-ms-win-eventing-controller-l1-1-0.spec +++ b/dlls/api-ms-win-eventing-controller-l1-1-0/api-ms-win-eventing-controller-l1-1-0.spec @@ -8,4 +8,4 @@ @ stdcall StartTraceW(ptr wstr ptr) advapi32.StartTraceW @ stdcall StopTraceW(int64 wstr ptr) advapi32.StopTraceW @ stub TraceQueryInformation -@ stub TraceSetInformation +@ stdcall TraceSetInformation(int64 long ptr long) advapi32.TraceSetInformation diff --git a/include/evntrace.h b/include/evntrace.h index 5722b28e47..d55d328ad4 100644 --- a/include/evntrace.h +++ b/include/evntrace.h @@ -259,6 +259,21 @@ typedef struct _ENABLE_TRACE_PARAMETERS ULONG FilterDescCount; } ENABLE_TRACE_PARAMETERS, *PENABLE_TRACE_PARAMETERS; +typedef enum _TRACE_QUERY_INFO_CLASS +{ + TraceGuidQueryList, + TraceGuidQueryInfo, + TraceGuidQueryProcess, + TraceStackTracingInfo, + TraceSystemTraceEnableFlagsInfo, + TraceSampledProfileIntervalInfo, + TraceProfileSourceConfigInfo, + TraceProfileSourceListInfo, + TracePmcEventListInfo, + TracePmcCounterListInfo, + MaxTraceSetInfoClass +} TRACE_QUERY_INFO_CLASS, TRACE_INFO_CLASS; + #define INVALID_PROCESSTRACE_HANDLE ((TRACEHANDLE)~(ULONG_PTR)0) ULONG WINAPI CloseTrace(TRACEHANDLE); -- 2.17.1

1 0

[PATCH v5 1/7] shell32/autocomplete: Dynamically allocate hwndText so it can handle arbitrary sizes
by Gabriel Ivăncescu 13 Sep '18

13 Sep '18

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- v5: Fix heap_realloc size mistake dlls/shell32/autocomplete.c | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index 6f97665..9f35ff7 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -134,10 +134,11 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, { IAutoCompleteImpl *This = GetPropW(hwnd, autocomplete_propertyW); HRESULT hr; - WCHAR hwndText[255]; + WCHAR *hwndText; + UINT len, size, cpt; RECT r; BOOL displayall = FALSE; - int cpt, height, sel; + int height, sel; if (!This->enabled) return CallWindowProcW(This->wpOrigEditProc, hwnd, uMsg, wParam, lParam); @@ -154,10 +155,11 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, } return CallWindowProcW(This->wpOrigEditProc, hwnd, uMsg, wParam, lParam); case WM_KEYUP: - { - int len; - - GetWindowTextW(hwnd, hwndText, ARRAY_SIZE(hwndText)); + len = SendMessageW(hwnd, WM_GETTEXTLENGTH, 0, 0); + size = len + 1; + if (!(hwndText = heap_alloc(size * sizeof(WCHAR)))) + return 0; + len = SendMessageW(hwnd, WM_GETTEXT, size, (LPARAM)hwndText); switch(wParam) { case VK_RETURN: @@ -165,7 +167,6 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, if (This->quickComplete && (GetKeyState(VK_CONTROL) & 0x8000)) { WCHAR *buf; - size_t len = strlenW(hwndText); size_t sz = strlenW(This->quickComplete) + 1 + len; if ((buf = heap_alloc(sz * sizeof(WCHAR)))) { @@ -178,9 +179,11 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, if (This->options & ACO_AUTOSUGGEST) ShowWindow(This->hwndListBox, SW_HIDE); + heap_free(hwndText); return 0; case VK_LEFT: case VK_RIGHT: + heap_free(hwndText); return 0; case VK_UP: case VK_DOWN: @@ -196,6 +199,7 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, /* We must display all the entries */ displayall = TRUE; } else { + heap_free(hwndText); if (IsWindowVisible(This->hwndListBox)) { int count; @@ -231,21 +235,23 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, case VK_BACK: case VK_DELETE: if ((! *hwndText) && (This->options & ACO_AUTOSUGGEST)) { + heap_free(hwndText); ShowWindow(This->hwndListBox, SW_HIDE); return CallWindowProcW(This->wpOrigEditProc, hwnd, uMsg, wParam, lParam); } break; } + if (len + 1 != size) + hwndText = heap_realloc(hwndText, (len + 1) * sizeof(WCHAR)); + SendMessageW(This->hwndListBox, LB_RESETCONTENT, 0, 0); + /* Set txtbackup to point to hwndText itself (which must not be released) */ heap_free(This->txtbackup); - len = strlenW(hwndText); - This->txtbackup = heap_alloc((len + 1)*sizeof(WCHAR)); - lstrcpyW(This->txtbackup, hwndText); + This->txtbackup = hwndText; - /* Returns if there is no text to search and we doesn't want to display all the entries */ - if ((!displayall) && (! *hwndText) ) + if (!displayall && !len) break; IEnumString_Reset(This->enumstr); @@ -297,7 +303,6 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, } break; - } case WM_DESTROY: { WNDPROC proc = This->wpOrigEditProc; -- 1.9.1

2 13

[PATCH 4/4] d2d1: Return bitmap options.
by Henri Verbeet 13 Sep '18

13 Sep '18

From: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d2d1/bitmap.c | 47 ++++++++++++++------- dlls/d2d1/d2d1_private.h | 7 +-- dlls/d2d1/device.c | 40 +++++++++++++++--- dlls/d2d1/tests/d2d1.c | 108 +++++++++++++++++++++++++---------------------- 4 files changed, 126 insertions(+), 76 deletions(-) diff --git a/dlls/d2d1/bitmap.c b/dlls/d2d1/bitmap.c index 8282dca0435..8b5b6aa0a9a 100644 --- a/dlls/d2d1/bitmap.c +++ b/dlls/d2d1/bitmap.c @@ -179,9 +179,11 @@ static void STDMETHODCALLTYPE d2d_bitmap_GetColorContext(ID2D1Bitmap1 *iface, ID static D2D1_BITMAP_OPTIONS STDMETHODCALLTYPE d2d_bitmap_GetOptions(ID2D1Bitmap1 *iface) { - FIXME("iface %p stub!\n", iface); + struct d2d_bitmap *bitmap = impl_from_ID2D1Bitmap1(iface); + + TRACE("iface %p.\n", iface); - return D2D1_BITMAP_OPTIONS_NONE; + return bitmap->options; } static HRESULT STDMETHODCALLTYPE d2d_bitmap_GetSurface(ID2D1Bitmap1 *iface, IDXGISurface **surface) @@ -262,7 +264,7 @@ static BOOL format_supported(const D2D1_PIXEL_FORMAT *format) } static void d2d_bitmap_init(struct d2d_bitmap *bitmap, ID2D1Factory *factory, - ID3D10ShaderResourceView *view, D2D1_SIZE_U size, const D2D1_BITMAP_PROPERTIES *desc) + ID3D10ShaderResourceView *view, D2D1_SIZE_U size, const D2D1_BITMAP_PROPERTIES1 *desc) { bitmap->ID2D1Bitmap1_iface.lpVtbl = &d2d_bitmap_vtbl; bitmap->refcount = 1; @@ -272,6 +274,7 @@ static void d2d_bitmap_init(struct d2d_bitmap *bitmap, ID2D1Factory *factory, bitmap->format = desc->pixelFormat; bitmap->dpi_x = desc->dpiX; bitmap->dpi_y = desc->dpiY; + bitmap->options = desc->bitmapOptions; if (bitmap->dpi_x == 0.0f && bitmap->dpi_y == 0.0f) { @@ -281,7 +284,7 @@ static void d2d_bitmap_init(struct d2d_bitmap *bitmap, ID2D1Factory *factory, } HRESULT d2d_bitmap_create(ID2D1Factory *factory, ID3D10Device *device, D2D1_SIZE_U size, const void *src_data, - UINT32 pitch, const D2D1_BITMAP_PROPERTIES *desc, struct d2d_bitmap **bitmap) + UINT32 pitch, const D2D1_BITMAP_PROPERTIES1 *desc, struct d2d_bitmap **bitmap) { D3D10_SUBRESOURCE_DATA resource_data; D3D10_TEXTURE2D_DESC texture_desc; @@ -338,9 +341,9 @@ HRESULT d2d_bitmap_create(ID2D1Factory *factory, ID3D10Device *device, D2D1_SIZE } HRESULT d2d_bitmap_create_shared(ID2D1DeviceContext *context, ID3D10Device *target_device, - REFIID iid, void *data, const D2D1_BITMAP_PROPERTIES *desc, struct d2d_bitmap **bitmap) + REFIID iid, void *data, const D2D1_BITMAP_PROPERTIES1 *desc, struct d2d_bitmap **bitmap) { - D2D1_BITMAP_PROPERTIES d; + D2D1_BITMAP_PROPERTIES1 d; ID2D1Factory *factory; if (IsEqualGUID(iid, &IID_ID2D1Bitmap)) @@ -369,6 +372,8 @@ HRESULT d2d_bitmap_create_shared(ID2D1DeviceContext *context, ID3D10Device *targ d.pixelFormat = src_impl->format; d.dpiX = src_impl->dpi_x; d.dpiY = src_impl->dpi_y; + d.bitmapOptions = src_impl->options; + d.colorContext = NULL; desc = &d; } @@ -432,7 +437,22 @@ HRESULT d2d_bitmap_create_shared(ID2D1DeviceContext *context, ID3D10Device *targ return E_OUTOFMEMORY; } - d = *desc; + + if (FAILED(hr = IDXGISurface_GetDesc(surface, &surface_desc))) + { + WARN("Failed to get surface desc, hr %#x.\n", hr); + ID3D10ShaderResourceView_Release(view); + return hr; + } + + if (!desc) + { + memset(&d, 0, sizeof(d)); + d.pixelFormat.format = surface_desc.Format; + } + else + d = *desc; + if (d.dpiX == 0.0f || d.dpiY == 0.0f) { float dpi_x, dpi_y; @@ -444,13 +464,6 @@ HRESULT d2d_bitmap_create_shared(ID2D1DeviceContext *context, ID3D10Device *targ d.dpiY = dpi_y; } - if (FAILED(hr = IDXGISurface_GetDesc(surface, &surface_desc))) - { - WARN("Failed to get surface desc, hr %#x.\n", hr); - ID3D10ShaderResourceView_Release(view); - return hr; - } - pixel_size.width = surface_desc.Width; pixel_size.height = surface_desc.Height; @@ -469,10 +482,10 @@ HRESULT d2d_bitmap_create_shared(ID2D1DeviceContext *context, ID3D10Device *targ } HRESULT d2d_bitmap_create_from_wic_bitmap(ID2D1Factory *factory, ID3D10Device *device, IWICBitmapSource *bitmap_source, - const D2D1_BITMAP_PROPERTIES *desc, struct d2d_bitmap **bitmap) + const D2D1_BITMAP_PROPERTIES1 *desc, struct d2d_bitmap **bitmap) { const D2D1_PIXEL_FORMAT *d2d_format; - D2D1_BITMAP_PROPERTIES bitmap_desc; + D2D1_BITMAP_PROPERTIES1 bitmap_desc; WICPixelFormatGUID wic_format; unsigned int bpp, data_size; D2D1_SIZE_U size; @@ -505,6 +518,8 @@ HRESULT d2d_bitmap_create_from_wic_bitmap(ID2D1Factory *factory, ID3D10Device *d bitmap_desc.pixelFormat.alphaMode = D2D1_ALPHA_MODE_UNKNOWN; bitmap_desc.dpiX = 0.0f; bitmap_desc.dpiY = 0.0f; + bitmap_desc.bitmapOptions = 0; + bitmap_desc.colorContext = NULL; } else { diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 4148a685bac..5f83f8fde22 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -343,14 +343,15 @@ struct d2d_bitmap D2D1_PIXEL_FORMAT format; float dpi_x; float dpi_y; + D2D1_BITMAP_OPTIONS options; }; HRESULT d2d_bitmap_create(ID2D1Factory *factory, ID3D10Device *device, D2D1_SIZE_U size, const void *src_data, - UINT32 pitch, const D2D1_BITMAP_PROPERTIES *desc, struct d2d_bitmap **bitmap) DECLSPEC_HIDDEN; + UINT32 pitch, const D2D1_BITMAP_PROPERTIES1 *desc, struct d2d_bitmap **bitmap) DECLSPEC_HIDDEN; HRESULT d2d_bitmap_create_shared(ID2D1DeviceContext *context, ID3D10Device *device, REFIID iid, void *data, - const D2D1_BITMAP_PROPERTIES *desc, struct d2d_bitmap **bitmap) DECLSPEC_HIDDEN; + const D2D1_BITMAP_PROPERTIES1 *desc, struct d2d_bitmap **bitmap) DECLSPEC_HIDDEN; HRESULT d2d_bitmap_create_from_wic_bitmap(ID2D1Factory *factory, ID3D10Device *device, IWICBitmapSource *bitmap_source, - const D2D1_BITMAP_PROPERTIES *desc, struct d2d_bitmap **bitmap) DECLSPEC_HIDDEN; + const D2D1_BITMAP_PROPERTIES1 *desc, struct d2d_bitmap **bitmap) DECLSPEC_HIDDEN; struct d2d_bitmap *unsafe_impl_from_ID2D1Bitmap(ID2D1Bitmap *iface) DECLSPEC_HIDDEN; struct d2d_state_block diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index 4478a19f9fd..649fcc43117 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -328,14 +328,23 @@ static void STDMETHODCALLTYPE d2d_device_context_GetFactory(ID2D1DeviceContext * static HRESULT STDMETHODCALLTYPE d2d_device_context_CreateBitmap(ID2D1DeviceContext *iface, D2D1_SIZE_U size, const void *src_data, UINT32 pitch, const D2D1_BITMAP_PROPERTIES *desc, ID2D1Bitmap **bitmap) { - struct d2d_device_context *render_target = impl_from_ID2D1DeviceContext(iface); + struct d2d_device_context *context = impl_from_ID2D1DeviceContext(iface); + D2D1_BITMAP_PROPERTIES1 bitmap_desc; struct d2d_bitmap *object; HRESULT hr; TRACE("iface %p, size {%u, %u}, src_data %p, pitch %u, desc %p, bitmap %p.\n", iface, size.width, size.height, src_data, pitch, desc, bitmap); - if (SUCCEEDED(hr = d2d_bitmap_create(render_target->factory, render_target->device, size, src_data, pitch, desc, &object))) + if (desc) + { + memcpy(&bitmap_desc, desc, sizeof(*desc)); + bitmap_desc.bitmapOptions = 0; + bitmap_desc.colorContext = NULL; + } + + if (SUCCEEDED(hr = d2d_bitmap_create(context->factory, context->device, + size, src_data, pitch, desc ? &bitmap_desc : NULL, &object))) *bitmap = (ID2D1Bitmap *)&object->ID2D1Bitmap1_iface; return hr; @@ -344,15 +353,23 @@ static HRESULT STDMETHODCALLTYPE d2d_device_context_CreateBitmap(ID2D1DeviceCont static HRESULT STDMETHODCALLTYPE d2d_device_context_CreateBitmapFromWicBitmap(ID2D1DeviceContext *iface, IWICBitmapSource *bitmap_source, const D2D1_BITMAP_PROPERTIES *desc, ID2D1Bitmap **bitmap) { - struct d2d_device_context *render_target = impl_from_ID2D1DeviceContext(iface); + struct d2d_device_context *context = impl_from_ID2D1DeviceContext(iface); + D2D1_BITMAP_PROPERTIES1 bitmap_desc; struct d2d_bitmap *object; HRESULT hr; TRACE("iface %p, bitmap_source %p, desc %p, bitmap %p.\n", iface, bitmap_source, desc, bitmap); - if (SUCCEEDED(hr = d2d_bitmap_create_from_wic_bitmap(render_target->factory, render_target->device, bitmap_source, - desc, &object))) + if (desc) + { + memcpy(&bitmap_desc, desc, sizeof(*desc)); + bitmap_desc.bitmapOptions = 0; + bitmap_desc.colorContext = NULL; + } + + if (SUCCEEDED(hr = d2d_bitmap_create_from_wic_bitmap(context->factory, context->device, + bitmap_source, desc ? &bitmap_desc : NULL, &object))) *bitmap = (ID2D1Bitmap *)&object->ID2D1Bitmap1_iface; return hr; @@ -361,14 +378,23 @@ static HRESULT STDMETHODCALLTYPE d2d_device_context_CreateBitmapFromWicBitmap(ID static HRESULT STDMETHODCALLTYPE d2d_device_context_CreateSharedBitmap(ID2D1DeviceContext *iface, REFIID iid, void *data, const D2D1_BITMAP_PROPERTIES *desc, ID2D1Bitmap **bitmap) { - struct d2d_device_context *render_target = impl_from_ID2D1DeviceContext(iface); + struct d2d_device_context *context = impl_from_ID2D1DeviceContext(iface); + D2D1_BITMAP_PROPERTIES1 bitmap_desc; struct d2d_bitmap *object; HRESULT hr; TRACE("iface %p, iid %s, data %p, desc %p, bitmap %p.\n", iface, debugstr_guid(iid), data, desc, bitmap); - if (SUCCEEDED(hr = d2d_bitmap_create_shared(iface, render_target->device, iid, data, desc, &object))) + if (desc) + { + memcpy(&bitmap_desc, desc, sizeof(*desc)); + bitmap_desc.bitmapOptions = D2D1_BITMAP_OPTIONS_TARGET | D2D1_BITMAP_OPTIONS_CANNOT_DRAW; + bitmap_desc.colorContext = NULL; + } + + if (SUCCEEDED(hr = d2d_bitmap_create_shared(iface, context->device, + iid, data, desc ? &bitmap_desc : NULL, &object))) *bitmap = (ID2D1Bitmap *)&object->ID2D1Bitmap1_iface; return hr; diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index eeae75f8413..467d61314d8 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -773,6 +773,56 @@ static ID2D1RenderTarget *create_render_target(IDXGISurface *surface) return create_render_target_desc(surface, &desc); } +#define check_bitmap_surface(b, s, o) check_bitmap_surface_(__LINE__, b, s, o) +static void check_bitmap_surface_(unsigned int line, ID2D1Bitmap1 *bitmap, BOOL has_surface, DWORD expected_options) +{ + D2D1_BITMAP_OPTIONS options; + IDXGISurface *surface; + HRESULT hr; + + options = ID2D1Bitmap1_GetOptions(bitmap); + ok_(__FILE__, line)(options == expected_options, "Unexpected bitmap options %#x, expected %#x.\n", + options, expected_options); + + surface = (void *)0xdeadbeef; + hr = ID2D1Bitmap1_GetSurface(bitmap, &surface); + if (has_surface) + { + D3D10_TEXTURE2D_DESC desc; + ID3D10Texture2D *texture; + + todo_wine + ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to get bitmap surface, hr %#x.\n", hr); + ok_(__FILE__, line)(!!surface, "Expected surface instance.\n"); + + if (SUCCEEDED(hr)) + { + /* Correlate with resource configuration. */ + hr = IDXGISurface_QueryInterface(surface, &IID_ID3D10Texture2D, (void **)&texture); + ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to get texture pointer, hr %#x.\n", hr); + + ID3D10Texture2D_GetDesc(texture, &desc); + ok_(__FILE__, line)(desc.Usage == 0, "Unexpected usage %#x.\n", desc.Usage); + ok_(__FILE__, line)(desc.BindFlags == (options & D2D1_BITMAP_OPTIONS_TARGET ? + D3D10_BIND_RENDER_TARGET : D3D10_BIND_SHADER_RESOURCE), + "Unexpected bind flags %#x, bitmap options %#x.\n", desc.BindFlags, options); + ok_(__FILE__, line)(desc.CPUAccessFlags == 0, "Unexpected cpu access flags %#x.\n", desc.CPUAccessFlags); + ok_(__FILE__, line)(desc.MiscFlags == 0, "Unexpected misc flags %#x.\n", desc.MiscFlags); + + ID3D10Texture2D_Release(texture); + + IDXGISurface_Release(surface); + } + } + else + { + todo_wine { + ok_(__FILE__, line)(hr == D2DERR_INVALID_CALL, "Unexpected hr %#x.\n", hr); + ok_(__FILE__, line)(!surface, "Unexpected surface instance.\n"); + } + } +} + static inline struct geometry_sink *impl_from_ID2D1SimplifiedGeometrySink(ID2D1SimplifiedGeometrySink *iface) { return CONTAINING_RECORD(iface, struct geometry_sink, ID2D1SimplifiedGeometrySink_iface); @@ -4112,11 +4162,19 @@ static void test_shared_bitmap(void) if (SUCCEEDED(hr)) { + ID2D1Bitmap1 *bitmap3; + size = ID2D1Bitmap_GetPixelSize(bitmap2); hr = IDXGISurface_GetDesc(surface2, &surface_desc); ok(SUCCEEDED(hr), "Failed to get surface description, hr %#x.\n", hr); ok(size.width == surface_desc.Width && size.height == surface_desc.Height, "Got wrong bitmap size.\n"); + hr = ID2D1Bitmap_QueryInterface(bitmap2, &IID_ID2D1Bitmap1, (void **)&bitmap3); + ok(SUCCEEDED(hr), "Failed to get ID2D1Bitmap1 pointer, hr %#x.\n", hr); + + check_bitmap_surface(bitmap3, TRUE, D2D1_BITMAP_OPTIONS_TARGET | D2D1_BITMAP_OPTIONS_CANNOT_DRAW); + ID2D1Bitmap1_Release(bitmap3); + ID2D1Bitmap_Release(bitmap2); /* IDXGISurface1 is supported too. */ @@ -6529,56 +6587,6 @@ static void test_create_device(void) ok(!refcount, "Factory has %u references left.\n", refcount); } -#define check_bitmap_surface(b, s, o) check_bitmap_surface_(__LINE__, b, s, o) -static void check_bitmap_surface_(unsigned int line, ID2D1Bitmap1 *bitmap, BOOL has_surface, DWORD expected_options) -{ - D2D1_BITMAP_OPTIONS options; - IDXGISurface *surface; - HRESULT hr; - - options = ID2D1Bitmap1_GetOptions(bitmap); - ok_(__FILE__, line)(options == expected_options, "Unexpected bitmap options %#x, expected %#x.\n", - options, expected_options); - - surface = (void *)0xdeadbeef; - hr = ID2D1Bitmap1_GetSurface(bitmap, &surface); - if (has_surface) - { - D3D10_TEXTURE2D_DESC desc; - ID3D10Texture2D *texture; - - todo_wine - ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to get bitmap surface, hr %#x.\n", hr); - ok_(__FILE__, line)(!!surface, "Expected surface instance.\n"); - - if (SUCCEEDED(hr)) - { - /* Correlate with resource configuration. */ - hr = IDXGISurface_QueryInterface(surface, &IID_ID3D10Texture2D, (void **)&texture); - ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to get texture pointer, hr %#x.\n", hr); - - ID3D10Texture2D_GetDesc(texture, &desc); - ok_(__FILE__, line)(desc.Usage == 0, "Unexpected usage %#x.\n", desc.Usage); - ok_(__FILE__, line)(desc.BindFlags == (options & D2D1_BITMAP_OPTIONS_TARGET ? - D3D10_BIND_RENDER_TARGET : D3D10_BIND_SHADER_RESOURCE), - "Unexpected bind flags %#x, bitmap options %#x.\n", desc.BindFlags, options); - ok_(__FILE__, line)(desc.CPUAccessFlags == 0, "Unexpected cpu access flags %#x.\n", desc.CPUAccessFlags); - ok_(__FILE__, line)(desc.MiscFlags == 0, "Unexpected misc flags %#x.\n", desc.MiscFlags); - - ID3D10Texture2D_Release(texture); - - IDXGISurface_Release(surface); - } - } - else - { - todo_wine { - ok_(__FILE__, line)(hr == D2DERR_INVALID_CALL, "Unexpected hr %#x.\n", hr); - ok_(__FILE__, line)(!surface, "Unexpected surface instance.\n"); - } - } -} - #define check_rt_bitmap_surface(r, s, o) check_rt_bitmap_surface_(__LINE__, r, s, o) static void check_rt_bitmap_surface_(unsigned int line, ID2D1RenderTarget *rt, BOOL has_surface, DWORD options) { -- 2.11.0

1 0

[PATCH 3/4] wined3d: Use a table for colour fixups in apply_format_fixups().
by Henri Verbeet 13 Sep '18

13 Sep '18

This ends up being slightly more code, but I think the table is much more readable. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/utils.c | 200 ++++++++++++++++++++++------------------- dlls/wined3d/wined3d_private.h | 14 --- 2 files changed, 109 insertions(+), 105 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 3a74fc8f281..17aa8c07732 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3403,85 +3403,129 @@ static void init_format_filter_info(struct wined3d_adapter *adapter, } } -static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_gl_info *gl_info) +static enum fixup_channel_source fixup_source_from_char(char c) { - struct wined3d_format *format; - unsigned int i; + switch (c) + { + default: + case '0': + return CHANNEL_SOURCE_ZERO; + case '1': + return CHANNEL_SOURCE_ONE; + case 'x': + case 'X': + return CHANNEL_SOURCE_X; + case 'y': + case 'Y': + return CHANNEL_SOURCE_Y; + case 'z': + case 'Z': + return CHANNEL_SOURCE_Z; + case 'w': + case 'W': + return CHANNEL_SOURCE_W; + } +} + +static unsigned int fixup_sign_from_char(char c) +{ + if (c == 'x' || c == 'y' || c == 'z' || c == 'w') + return 1; + return 0; +} - format = get_format_internal(adapter, WINED3DFMT_R16_FLOAT); - format->color_fixup = create_color_fixup_desc( - 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_ONE, 0, CHANNEL_SOURCE_ONE, 0, CHANNEL_SOURCE_W); +static struct color_fixup_desc create_color_fixup_desc_from_string(const char *s) +{ + struct color_fixup_desc fixup; - format = get_format_internal(adapter, WINED3DFMT_R32_FLOAT); - format->color_fixup = create_color_fixup_desc( - 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_ONE, 0, CHANNEL_SOURCE_ONE, 0, CHANNEL_SOURCE_W); + if (strlen(s) != 4) + { + ERR("Invalid fixup string %s.\n", wine_dbgstr_a(s)); + return COLOR_FIXUP_IDENTITY; + } - format = get_format_internal(adapter, WINED3DFMT_R16G16_UNORM); - format->color_fixup = create_color_fixup_desc( - 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_Y, 0, CHANNEL_SOURCE_ONE, 0, CHANNEL_SOURCE_W); + fixup.x_sign_fixup = fixup_sign_from_char(s[0]); + fixup.x_source = fixup_source_from_char(s[0]); + fixup.y_sign_fixup = fixup_sign_from_char(s[1]); + fixup.y_source = fixup_source_from_char(s[1]); + fixup.z_sign_fixup = fixup_sign_from_char(s[2]); + fixup.z_source = fixup_source_from_char(s[2]); + fixup.w_sign_fixup = fixup_sign_from_char(s[3]); + fixup.w_source = fixup_source_from_char(s[3]); - format = get_format_internal(adapter, WINED3DFMT_R16G16_FLOAT); - format->color_fixup = create_color_fixup_desc( - 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_Y, 0, CHANNEL_SOURCE_ONE, 0, CHANNEL_SOURCE_W); + return fixup; +} - format = get_format_internal(adapter, WINED3DFMT_R32G32_FLOAT); - format->color_fixup = create_color_fixup_desc( - 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_Y, 0, CHANNEL_SOURCE_ONE, 0, CHANNEL_SOURCE_W); +static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_gl_info *gl_info) +{ + struct wined3d_format *format; + unsigned int i; - /* GL_ATI_envmap_bumpmap in theory supports R8G8_SNORM but is no longer supported by - * any driver. */ - if (gl_info->supported[NV_TEXTURE_SHADER] || gl_info->supported[EXT_TEXTURE_SNORM]) + static const struct { - /* R8G8_SNORM and R16G16_SNORM need a fixup of the undefined blue channel. OpenGL - * returns 0.0 when sampling from it, DirectX 1.0. So we always have in-shader - * conversion for this format. */ - format = get_format_internal(adapter, WINED3DFMT_R8G8_SNORM); - format->color_fixup = create_color_fixup_desc( - 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_Y, 0, CHANNEL_SOURCE_ONE, 0, CHANNEL_SOURCE_ONE); - format = get_format_internal(adapter, WINED3DFMT_R16G16_SNORM); - format->color_fixup = create_color_fixup_desc( - 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_Y, 0, CHANNEL_SOURCE_ONE, 0, CHANNEL_SOURCE_ONE); + enum wined3d_format_id id; + const char *fixup; + enum wined3d_gl_extension extension; } - else + fixups[] = { - /* Emulate using unsigned formats. This requires load-time conversion in addition to the - * fixups here. */ - format = get_format_internal(adapter, WINED3DFMT_R8G8_SNORM); - format->color_fixup = create_color_fixup_desc( - 1, CHANNEL_SOURCE_X, 1, CHANNEL_SOURCE_Y, 0, CHANNEL_SOURCE_ONE, 0, CHANNEL_SOURCE_ONE); - format = get_format_internal(adapter, WINED3DFMT_R16G16_SNORM); - format->color_fixup = create_color_fixup_desc( - 1, CHANNEL_SOURCE_X, 1, CHANNEL_SOURCE_Y, 0, CHANNEL_SOURCE_ONE, 0, CHANNEL_SOURCE_ONE); - format = get_format_internal(adapter, WINED3DFMT_R8G8B8A8_SNORM); - format->color_fixup = create_color_fixup_desc( - 1, CHANNEL_SOURCE_X, 1, CHANNEL_SOURCE_Y, 1, CHANNEL_SOURCE_Z, 1, CHANNEL_SOURCE_W); - format = get_format_internal(adapter, WINED3DFMT_R5G5_SNORM_L6_UNORM); - format->color_fixup = create_color_fixup_desc( - 1, CHANNEL_SOURCE_X, 1, CHANNEL_SOURCE_Z, 0, CHANNEL_SOURCE_Y, 0, CHANNEL_SOURCE_ONE); - } + {WINED3DFMT_R16_FLOAT, "X11W", WINED3D_GL_EXT_NONE}, + {WINED3DFMT_R32_FLOAT, "X11W", WINED3D_GL_EXT_NONE}, + {WINED3DFMT_R16G16_UNORM, "XY1W", WINED3D_GL_EXT_NONE}, + {WINED3DFMT_R16G16_FLOAT, "XY1W", WINED3D_GL_EXT_NONE}, + {WINED3DFMT_R32G32_FLOAT, "XY1W", WINED3D_GL_EXT_NONE}, - if (!gl_info->supported[NV_TEXTURE_SHADER]) - { - format = get_format_internal(adapter, WINED3DFMT_R8G8_SNORM_L8X8_UNORM); - format->color_fixup = create_color_fixup_desc( - 1, CHANNEL_SOURCE_X, 1, CHANNEL_SOURCE_Y, 0, CHANNEL_SOURCE_Z, 0, CHANNEL_SOURCE_W); - } + {WINED3DFMT_R8G8_SNORM, "xy11", WINED3D_GL_EXT_NONE}, + {WINED3DFMT_R8G8_SNORM, "XY11", NV_TEXTURE_SHADER}, + {WINED3DFMT_R8G8_SNORM, "XY11", EXT_TEXTURE_SNORM}, - if (gl_info->supported[ARB_TEXTURE_COMPRESSION_RGTC] || gl_info->supported[EXT_TEXTURE_COMPRESSION_RGTC]) - { - format = get_format_internal(adapter, WINED3DFMT_ATI1N); - format->color_fixup = create_color_fixup_desc( - 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_X); + {WINED3DFMT_R16G16_SNORM, "xy11", WINED3D_GL_EXT_NONE}, + {WINED3DFMT_R16G16_SNORM, "XY11", NV_TEXTURE_SHADER}, + {WINED3DFMT_R16G16_SNORM, "XY11", EXT_TEXTURE_SNORM}, - format = get_format_internal(adapter, WINED3DFMT_ATI2N); - format->color_fixup = create_color_fixup_desc( - 0, CHANNEL_SOURCE_Y, 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_ONE, 0, CHANNEL_SOURCE_ONE); - } - else if (gl_info->supported[ATI_TEXTURE_COMPRESSION_3DC]) + {WINED3DFMT_R8G8B8A8_SNORM, "xyzw", WINED3D_GL_EXT_NONE}, + {WINED3DFMT_R8G8B8A8_SNORM, "XYZW", NV_TEXTURE_SHADER}, + {WINED3DFMT_R8G8B8A8_SNORM, "XYZW", EXT_TEXTURE_SNORM}, + + {WINED3DFMT_R5G5_SNORM_L6_UNORM, "xzY1", WINED3D_GL_EXT_NONE}, + {WINED3DFMT_R5G5_SNORM_L6_UNORM, "XYZW", NV_TEXTURE_SHADER}, + {WINED3DFMT_R5G5_SNORM_L6_UNORM, "XYZW", EXT_TEXTURE_SNORM}, + + {WINED3DFMT_R8G8_SNORM_L8X8_UNORM, "xyZW", WINED3D_GL_EXT_NONE}, + {WINED3DFMT_R8G8_SNORM_L8X8_UNORM, "XYZW", NV_TEXTURE_SHADER}, + + {WINED3DFMT_ATI1N, "XXXX", EXT_TEXTURE_COMPRESSION_RGTC}, + {WINED3DFMT_ATI1N, "XXXX", ARB_TEXTURE_COMPRESSION_RGTC}, + + {WINED3DFMT_ATI2N, "XW11", ATI_TEXTURE_COMPRESSION_3DC}, + {WINED3DFMT_ATI2N, "YX11", EXT_TEXTURE_COMPRESSION_RGTC}, + {WINED3DFMT_ATI2N, "YX11", ARB_TEXTURE_COMPRESSION_RGTC}, + + {WINED3DFMT_A8_UNORM, "000X", WINED3D_GL_EXT_NONE}, + {WINED3DFMT_A8_UNORM, "XYZW", WINED3D_GL_LEGACY_CONTEXT}, + + {WINED3DFMT_L8A8_UNORM, "XXXY", WINED3D_GL_EXT_NONE}, + {WINED3DFMT_L8A8_UNORM, "XYZW", WINED3D_GL_LEGACY_CONTEXT}, + + {WINED3DFMT_L4A4_UNORM, "XXXY", WINED3D_GL_EXT_NONE}, + {WINED3DFMT_L4A4_UNORM, "XYZW", WINED3D_GL_LEGACY_CONTEXT}, + + {WINED3DFMT_L16_UNORM, "XXX1", WINED3D_GL_EXT_NONE}, + {WINED3DFMT_L16_UNORM, "XYZW", WINED3D_GL_LEGACY_CONTEXT}, + + {WINED3DFMT_INTZ, "XXXX", WINED3D_GL_EXT_NONE}, + {WINED3DFMT_INTZ, "XYZW", WINED3D_GL_LEGACY_CONTEXT}, + + {WINED3DFMT_L8_UNORM, "XXX1", ARB_TEXTURE_RG}, + }; + + for (i = 0; i < ARRAY_SIZE(fixups); ++i) { - format = get_format_internal(adapter, WINED3DFMT_ATI2N); - format->color_fixup = create_color_fixup_desc( - 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_W, 0, CHANNEL_SOURCE_ONE, 0, CHANNEL_SOURCE_ONE); + if (!gl_info->supported[fixups[i].extension]) + continue; + + format = get_format_internal(adapter, fixups[i].id); + format->color_fixup = create_color_fixup_desc_from_string(fixups[i].fixup); } if (!gl_info->supported[APPLE_YCBCR_422] && (gl_info->supported[ARB_FRAGMENT_PROGRAM] @@ -3527,32 +3571,6 @@ static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_ format->glInternal = 0; } - if (!gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) - { - format = get_format_internal(adapter, WINED3DFMT_A8_UNORM); - format->color_fixup = create_color_fixup_desc( - 0, CHANNEL_SOURCE_ZERO, 0, CHANNEL_SOURCE_ZERO, 0, CHANNEL_SOURCE_ZERO, 0, CHANNEL_SOURCE_X); - format = get_format_internal(adapter, WINED3DFMT_L8A8_UNORM); - format->color_fixup = create_color_fixup_desc( - 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_Y); - format = get_format_internal(adapter, WINED3DFMT_L4A4_UNORM); - format->color_fixup = create_color_fixup_desc( - 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_Y); - format = get_format_internal(adapter, WINED3DFMT_L16_UNORM); - format->color_fixup = create_color_fixup_desc( - 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_ONE); - format = get_format_internal(adapter, WINED3DFMT_INTZ); - format->color_fixup = create_color_fixup_desc( - 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_X); - } - - if (gl_info->supported[ARB_TEXTURE_RG]) - { - format = get_format_internal(adapter, WINED3DFMT_L8_UNORM); - format->color_fixup = create_color_fixup_desc( - 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_ONE); - } - if (gl_info->supported[ARB_FRAGMENT_PROGRAM] || gl_info->supported[ARB_FRAGMENT_SHADER]) { format = get_format_internal(adapter, WINED3DFMT_P8_UINT); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7c8beb87535..2673de0c4eb 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -201,20 +201,6 @@ struct wined3d_d3d_info static const struct color_fixup_desc COLOR_FIXUP_IDENTITY = {0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_Y, 0, CHANNEL_SOURCE_Z, 0, CHANNEL_SOURCE_W}; -static inline struct color_fixup_desc create_color_fixup_desc( - int sign0, enum fixup_channel_source src0, int sign1, enum fixup_channel_source src1, - int sign2, enum fixup_channel_source src2, int sign3, enum fixup_channel_source src3) -{ - struct color_fixup_desc fixup = - { - sign0, src0, - sign1, src1, - sign2, src2, - sign3, src3, - }; - return fixup; -} - static inline struct color_fixup_desc create_complex_fixup_desc(enum complex_fixup complex_fixup) { struct color_fixup_desc fixup = -- 2.11.0

1 0

[PATCH 2/4] wined3d: Handle lack of ARB_half_float_vertex in format_vertex_info[].
by Henri Verbeet 13 Sep '18

13 Sep '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/utils.c | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 0c230da878d..3a74fc8f281 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -624,8 +624,11 @@ static const struct wined3d_format_vertex_info format_vertex_info[] = {WINED3DFMT_R10G10B10X2_SNORM, WINED3D_FFP_EMIT_DEC3N, GL_SHORT}, {WINED3DFMT_R10G10B10A2_UNORM, WINED3D_FFP_EMIT_INVALID, GL_UNSIGNED_INT_2_10_10_10_REV, ARB_VERTEX_TYPE_2_10_10_10_REV}, - {WINED3DFMT_R16G16_FLOAT, WINED3D_FFP_EMIT_FLOAT16_2, GL_HALF_FLOAT}, - {WINED3DFMT_R16G16B16A16_FLOAT, WINED3D_FFP_EMIT_FLOAT16_4, GL_HALF_FLOAT}, + /* Without ARB_half_float_vertex we convert these on upload. */ + {WINED3DFMT_R16G16_FLOAT, WINED3D_FFP_EMIT_FLOAT16_2, GL_FLOAT}, + {WINED3DFMT_R16G16_FLOAT, WINED3D_FFP_EMIT_FLOAT16_2, GL_HALF_FLOAT, ARB_HALF_FLOAT_VERTEX}, + {WINED3DFMT_R16G16B16A16_FLOAT, WINED3D_FFP_EMIT_FLOAT16_4, GL_FLOAT}, + {WINED3DFMT_R16G16B16A16_FLOAT, WINED3D_FFP_EMIT_FLOAT16_4, GL_HALF_FLOAT, ARB_HALF_FLOAT_VERTEX}, {WINED3DFMT_R8G8B8A8_SNORM, WINED3D_FFP_EMIT_INVALID, GL_BYTE}, {WINED3DFMT_R8G8B8A8_SINT, WINED3D_FFP_EMIT_INVALID, GL_BYTE}, {WINED3DFMT_R16G16B16A16_UINT, WINED3D_FFP_EMIT_INVALID, GL_UNSIGNED_SHORT}, @@ -3556,17 +3559,6 @@ static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_ format->color_fixup = create_complex_fixup_desc(COMPLEX_FIXUP_P8); } - if (!gl_info->supported[ARB_HALF_FLOAT_VERTEX]) - { - /* Do not change the size of the type, it is CPU side. We have to change the GPU-side information though. - * It is the job of the vertex buffer code to make sure that the vbos have the right format */ - format = get_format_internal(adapter, WINED3DFMT_R16G16_FLOAT); - format->gl_vtx_type = GL_FLOAT; - - format = get_format_internal(adapter, WINED3DFMT_R16G16B16A16_FLOAT); - format->gl_vtx_type = GL_FLOAT; - } - if (!gl_info->supported[ARB_HALF_FLOAT_PIXEL]) { format = get_format_internal(adapter, WINED3DFMT_R16_FLOAT); -- 2.11.0

1 0

[v2 PATCH 1/2] d2d1: Return bitmap options.
by Nikolay Sivov 13 Sep '18

13 Sep '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/bitmap.c | 43 ++++++++++------ dlls/d2d1/d2d1_private.h | 7 +-- dlls/d2d1/device.c | 39 +++++++++++--- dlls/d2d1/tests/d2d1.c | 108 +++++++++++++++++++++------------------ 4 files changed, 121 insertions(+), 76 deletions(-) diff --git a/dlls/d2d1/bitmap.c b/dlls/d2d1/bitmap.c index 8282dca043..79dbabbea9 100644 --- a/dlls/d2d1/bitmap.c +++ b/dlls/d2d1/bitmap.c @@ -179,9 +179,11 @@ static void STDMETHODCALLTYPE d2d_bitmap_GetColorContext(ID2D1Bitmap1 *iface, ID static D2D1_BITMAP_OPTIONS STDMETHODCALLTYPE d2d_bitmap_GetOptions(ID2D1Bitmap1 *iface) { - FIXME("iface %p stub!\n", iface); + struct d2d_bitmap *bitmap = impl_from_ID2D1Bitmap1(iface); + + TRACE("iface %p.\n", iface); - return D2D1_BITMAP_OPTIONS_NONE; + return bitmap->options; } static HRESULT STDMETHODCALLTYPE d2d_bitmap_GetSurface(ID2D1Bitmap1 *iface, IDXGISurface **surface) @@ -262,7 +264,7 @@ static BOOL format_supported(const D2D1_PIXEL_FORMAT *format) } static void d2d_bitmap_init(struct d2d_bitmap *bitmap, ID2D1Factory *factory, - ID3D10ShaderResourceView *view, D2D1_SIZE_U size, const D2D1_BITMAP_PROPERTIES *desc) + ID3D10ShaderResourceView *view, D2D1_SIZE_U size, const D2D1_BITMAP_PROPERTIES1 *desc) { bitmap->ID2D1Bitmap1_iface.lpVtbl = &d2d_bitmap_vtbl; bitmap->refcount = 1; @@ -272,6 +274,7 @@ static void d2d_bitmap_init(struct d2d_bitmap *bitmap, ID2D1Factory *factory, bitmap->format = desc->pixelFormat; bitmap->dpi_x = desc->dpiX; bitmap->dpi_y = desc->dpiY; + bitmap->options = desc->bitmapOptions; if (bitmap->dpi_x == 0.0f && bitmap->dpi_y == 0.0f) { @@ -281,7 +284,7 @@ static void d2d_bitmap_init(struct d2d_bitmap *bitmap, ID2D1Factory *factory, } HRESULT d2d_bitmap_create(ID2D1Factory *factory, ID3D10Device *device, D2D1_SIZE_U size, const void *src_data, - UINT32 pitch, const D2D1_BITMAP_PROPERTIES *desc, struct d2d_bitmap **bitmap) + UINT32 pitch, const D2D1_BITMAP_PROPERTIES1 *desc, struct d2d_bitmap **bitmap) { D3D10_SUBRESOURCE_DATA resource_data; D3D10_TEXTURE2D_DESC texture_desc; @@ -338,9 +341,9 @@ HRESULT d2d_bitmap_create(ID2D1Factory *factory, ID3D10Device *device, D2D1_SIZE } HRESULT d2d_bitmap_create_shared(ID2D1DeviceContext *context, ID3D10Device *target_device, - REFIID iid, void *data, const D2D1_BITMAP_PROPERTIES *desc, struct d2d_bitmap **bitmap) + REFIID iid, void *data, const D2D1_BITMAP_PROPERTIES1 *desc, struct d2d_bitmap **bitmap) { - D2D1_BITMAP_PROPERTIES d; + D2D1_BITMAP_PROPERTIES1 d; ID2D1Factory *factory; if (IsEqualGUID(iid, &IID_ID2D1Bitmap)) @@ -432,7 +435,22 @@ HRESULT d2d_bitmap_create_shared(ID2D1DeviceContext *context, ID3D10Device *targ return E_OUTOFMEMORY; } - d = *desc; + + if (FAILED(hr = IDXGISurface_GetDesc(surface, &surface_desc))) + { + WARN("Failed to get surface desc, hr %#x.\n", hr); + ID3D10ShaderResourceView_Release(view); + return hr; + } + + if (!desc) + { + memset(&d, 0, sizeof(d)); + d.pixelFormat.format = surface_desc.Format; + } + else + d = *desc; + if (d.dpiX == 0.0f || d.dpiY == 0.0f) { float dpi_x, dpi_y; @@ -444,13 +462,6 @@ HRESULT d2d_bitmap_create_shared(ID2D1DeviceContext *context, ID3D10Device *targ d.dpiY = dpi_y; } - if (FAILED(hr = IDXGISurface_GetDesc(surface, &surface_desc))) - { - WARN("Failed to get surface desc, hr %#x.\n", hr); - ID3D10ShaderResourceView_Release(view); - return hr; - } - pixel_size.width = surface_desc.Width; pixel_size.height = surface_desc.Height; @@ -469,10 +480,10 @@ HRESULT d2d_bitmap_create_shared(ID2D1DeviceContext *context, ID3D10Device *targ } HRESULT d2d_bitmap_create_from_wic_bitmap(ID2D1Factory *factory, ID3D10Device *device, IWICBitmapSource *bitmap_source, - const D2D1_BITMAP_PROPERTIES *desc, struct d2d_bitmap **bitmap) + const D2D1_BITMAP_PROPERTIES1 *desc, struct d2d_bitmap **bitmap) { const D2D1_PIXEL_FORMAT *d2d_format; - D2D1_BITMAP_PROPERTIES bitmap_desc; + D2D1_BITMAP_PROPERTIES1 bitmap_desc; WICPixelFormatGUID wic_format; unsigned int bpp, data_size; D2D1_SIZE_U size; diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 4148a685ba..5f83f8fde2 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -343,14 +343,15 @@ struct d2d_bitmap D2D1_PIXEL_FORMAT format; float dpi_x; float dpi_y; + D2D1_BITMAP_OPTIONS options; }; HRESULT d2d_bitmap_create(ID2D1Factory *factory, ID3D10Device *device, D2D1_SIZE_U size, const void *src_data, - UINT32 pitch, const D2D1_BITMAP_PROPERTIES *desc, struct d2d_bitmap **bitmap) DECLSPEC_HIDDEN; + UINT32 pitch, const D2D1_BITMAP_PROPERTIES1 *desc, struct d2d_bitmap **bitmap) DECLSPEC_HIDDEN; HRESULT d2d_bitmap_create_shared(ID2D1DeviceContext *context, ID3D10Device *device, REFIID iid, void *data, - const D2D1_BITMAP_PROPERTIES *desc, struct d2d_bitmap **bitmap) DECLSPEC_HIDDEN; + const D2D1_BITMAP_PROPERTIES1 *desc, struct d2d_bitmap **bitmap) DECLSPEC_HIDDEN; HRESULT d2d_bitmap_create_from_wic_bitmap(ID2D1Factory *factory, ID3D10Device *device, IWICBitmapSource *bitmap_source, - const D2D1_BITMAP_PROPERTIES *desc, struct d2d_bitmap **bitmap) DECLSPEC_HIDDEN; + const D2D1_BITMAP_PROPERTIES1 *desc, struct d2d_bitmap **bitmap) DECLSPEC_HIDDEN; struct d2d_bitmap *unsafe_impl_from_ID2D1Bitmap(ID2D1Bitmap *iface) DECLSPEC_HIDDEN; struct d2d_state_block diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index 4478a19f9f..21092f65c2 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -328,14 +328,23 @@ static void STDMETHODCALLTYPE d2d_device_context_GetFactory(ID2D1DeviceContext * static HRESULT STDMETHODCALLTYPE d2d_device_context_CreateBitmap(ID2D1DeviceContext *iface, D2D1_SIZE_U size, const void *src_data, UINT32 pitch, const D2D1_BITMAP_PROPERTIES *desc, ID2D1Bitmap **bitmap) { - struct d2d_device_context *render_target = impl_from_ID2D1DeviceContext(iface); + struct d2d_device_context *context = impl_from_ID2D1DeviceContext(iface); + D2D1_BITMAP_PROPERTIES1 bitmap_desc; struct d2d_bitmap *object; HRESULT hr; TRACE("iface %p, size {%u, %u}, src_data %p, pitch %u, desc %p, bitmap %p.\n", iface, size.width, size.height, src_data, pitch, desc, bitmap); - if (SUCCEEDED(hr = d2d_bitmap_create(render_target->factory, render_target->device, size, src_data, pitch, desc, &object))) + if (desc) + { + memcpy(&bitmap_desc, desc, sizeof(*desc)); + bitmap_desc.bitmapOptions = 0; + bitmap_desc.colorContext = NULL; + } + + if (SUCCEEDED(hr = d2d_bitmap_create(context->factory, context->device, size, src_data, pitch, + desc ? &bitmap_desc : NULL, &object))) *bitmap = (ID2D1Bitmap *)&object->ID2D1Bitmap1_iface; return hr; @@ -344,15 +353,23 @@ static HRESULT STDMETHODCALLTYPE d2d_device_context_CreateBitmap(ID2D1DeviceCont static HRESULT STDMETHODCALLTYPE d2d_device_context_CreateBitmapFromWicBitmap(ID2D1DeviceContext *iface, IWICBitmapSource *bitmap_source, const D2D1_BITMAP_PROPERTIES *desc, ID2D1Bitmap **bitmap) { - struct d2d_device_context *render_target = impl_from_ID2D1DeviceContext(iface); + struct d2d_device_context *context = impl_from_ID2D1DeviceContext(iface); + D2D1_BITMAP_PROPERTIES1 bitmap_desc; struct d2d_bitmap *object; HRESULT hr; TRACE("iface %p, bitmap_source %p, desc %p, bitmap %p.\n", iface, bitmap_source, desc, bitmap); - if (SUCCEEDED(hr = d2d_bitmap_create_from_wic_bitmap(render_target->factory, render_target->device, bitmap_source, - desc, &object))) + if (desc) + { + memcpy(&bitmap_desc, desc, sizeof(*desc)); + bitmap_desc.bitmapOptions = 0; + bitmap_desc.colorContext = NULL; + } + + if (SUCCEEDED(hr = d2d_bitmap_create_from_wic_bitmap(context->factory, context->device, bitmap_source, + desc ? &bitmap_desc : NULL, &object))) *bitmap = (ID2D1Bitmap *)&object->ID2D1Bitmap1_iface; return hr; @@ -361,14 +378,22 @@ static HRESULT STDMETHODCALLTYPE d2d_device_context_CreateBitmapFromWicBitmap(ID static HRESULT STDMETHODCALLTYPE d2d_device_context_CreateSharedBitmap(ID2D1DeviceContext *iface, REFIID iid, void *data, const D2D1_BITMAP_PROPERTIES *desc, ID2D1Bitmap **bitmap) { - struct d2d_device_context *render_target = impl_from_ID2D1DeviceContext(iface); + struct d2d_device_context *context = impl_from_ID2D1DeviceContext(iface); + D2D1_BITMAP_PROPERTIES1 bitmap_desc; struct d2d_bitmap *object; HRESULT hr; TRACE("iface %p, iid %s, data %p, desc %p, bitmap %p.\n", iface, debugstr_guid(iid), data, desc, bitmap); - if (SUCCEEDED(hr = d2d_bitmap_create_shared(iface, render_target->device, iid, data, desc, &object))) + if (desc) + { + memcpy(&bitmap_desc, desc, sizeof(*desc)); + bitmap_desc.bitmapOptions = D2D1_BITMAP_OPTIONS_TARGET | D2D1_BITMAP_OPTIONS_CANNOT_DRAW; + bitmap_desc.colorContext = NULL; + } + + if (SUCCEEDED(hr = d2d_bitmap_create_shared(iface, context->device, iid, data, desc ? &bitmap_desc : NULL, &object))) *bitmap = (ID2D1Bitmap *)&object->ID2D1Bitmap1_iface; return hr; diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index eeae75f841..467d61314d 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -773,6 +773,56 @@ static ID2D1RenderTarget *create_render_target(IDXGISurface *surface) return create_render_target_desc(surface, &desc); } +#define check_bitmap_surface(b, s, o) check_bitmap_surface_(__LINE__, b, s, o) +static void check_bitmap_surface_(unsigned int line, ID2D1Bitmap1 *bitmap, BOOL has_surface, DWORD expected_options) +{ + D2D1_BITMAP_OPTIONS options; + IDXGISurface *surface; + HRESULT hr; + + options = ID2D1Bitmap1_GetOptions(bitmap); + ok_(__FILE__, line)(options == expected_options, "Unexpected bitmap options %#x, expected %#x.\n", + options, expected_options); + + surface = (void *)0xdeadbeef; + hr = ID2D1Bitmap1_GetSurface(bitmap, &surface); + if (has_surface) + { + D3D10_TEXTURE2D_DESC desc; + ID3D10Texture2D *texture; + + todo_wine + ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to get bitmap surface, hr %#x.\n", hr); + ok_(__FILE__, line)(!!surface, "Expected surface instance.\n"); + + if (SUCCEEDED(hr)) + { + /* Correlate with resource configuration. */ + hr = IDXGISurface_QueryInterface(surface, &IID_ID3D10Texture2D, (void **)&texture); + ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to get texture pointer, hr %#x.\n", hr); + + ID3D10Texture2D_GetDesc(texture, &desc); + ok_(__FILE__, line)(desc.Usage == 0, "Unexpected usage %#x.\n", desc.Usage); + ok_(__FILE__, line)(desc.BindFlags == (options & D2D1_BITMAP_OPTIONS_TARGET ? + D3D10_BIND_RENDER_TARGET : D3D10_BIND_SHADER_RESOURCE), + "Unexpected bind flags %#x, bitmap options %#x.\n", desc.BindFlags, options); + ok_(__FILE__, line)(desc.CPUAccessFlags == 0, "Unexpected cpu access flags %#x.\n", desc.CPUAccessFlags); + ok_(__FILE__, line)(desc.MiscFlags == 0, "Unexpected misc flags %#x.\n", desc.MiscFlags); + + ID3D10Texture2D_Release(texture); + + IDXGISurface_Release(surface); + } + } + else + { + todo_wine { + ok_(__FILE__, line)(hr == D2DERR_INVALID_CALL, "Unexpected hr %#x.\n", hr); + ok_(__FILE__, line)(!surface, "Unexpected surface instance.\n"); + } + } +} + static inline struct geometry_sink *impl_from_ID2D1SimplifiedGeometrySink(ID2D1SimplifiedGeometrySink *iface) { return CONTAINING_RECORD(iface, struct geometry_sink, ID2D1SimplifiedGeometrySink_iface); @@ -4112,11 +4162,19 @@ static void test_shared_bitmap(void) if (SUCCEEDED(hr)) { + ID2D1Bitmap1 *bitmap3; + size = ID2D1Bitmap_GetPixelSize(bitmap2); hr = IDXGISurface_GetDesc(surface2, &surface_desc); ok(SUCCEEDED(hr), "Failed to get surface description, hr %#x.\n", hr); ok(size.width == surface_desc.Width && size.height == surface_desc.Height, "Got wrong bitmap size.\n"); + hr = ID2D1Bitmap_QueryInterface(bitmap2, &IID_ID2D1Bitmap1, (void **)&bitmap3); + ok(SUCCEEDED(hr), "Failed to get ID2D1Bitmap1 pointer, hr %#x.\n", hr); + + check_bitmap_surface(bitmap3, TRUE, D2D1_BITMAP_OPTIONS_TARGET | D2D1_BITMAP_OPTIONS_CANNOT_DRAW); + ID2D1Bitmap1_Release(bitmap3); + ID2D1Bitmap_Release(bitmap2); /* IDXGISurface1 is supported too. */ @@ -6529,56 +6587,6 @@ static void test_create_device(void) ok(!refcount, "Factory has %u references left.\n", refcount); } -#define check_bitmap_surface(b, s, o) check_bitmap_surface_(__LINE__, b, s, o) -static void check_bitmap_surface_(unsigned int line, ID2D1Bitmap1 *bitmap, BOOL has_surface, DWORD expected_options) -{ - D2D1_BITMAP_OPTIONS options; - IDXGISurface *surface; - HRESULT hr; - - options = ID2D1Bitmap1_GetOptions(bitmap); - ok_(__FILE__, line)(options == expected_options, "Unexpected bitmap options %#x, expected %#x.\n", - options, expected_options); - - surface = (void *)0xdeadbeef; - hr = ID2D1Bitmap1_GetSurface(bitmap, &surface); - if (has_surface) - { - D3D10_TEXTURE2D_DESC desc; - ID3D10Texture2D *texture; - - todo_wine - ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to get bitmap surface, hr %#x.\n", hr); - ok_(__FILE__, line)(!!surface, "Expected surface instance.\n"); - - if (SUCCEEDED(hr)) - { - /* Correlate with resource configuration. */ - hr = IDXGISurface_QueryInterface(surface, &IID_ID3D10Texture2D, (void **)&texture); - ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to get texture pointer, hr %#x.\n", hr); - - ID3D10Texture2D_GetDesc(texture, &desc); - ok_(__FILE__, line)(desc.Usage == 0, "Unexpected usage %#x.\n", desc.Usage); - ok_(__FILE__, line)(desc.BindFlags == (options & D2D1_BITMAP_OPTIONS_TARGET ? - D3D10_BIND_RENDER_TARGET : D3D10_BIND_SHADER_RESOURCE), - "Unexpected bind flags %#x, bitmap options %#x.\n", desc.BindFlags, options); - ok_(__FILE__, line)(desc.CPUAccessFlags == 0, "Unexpected cpu access flags %#x.\n", desc.CPUAccessFlags); - ok_(__FILE__, line)(desc.MiscFlags == 0, "Unexpected misc flags %#x.\n", desc.MiscFlags); - - ID3D10Texture2D_Release(texture); - - IDXGISurface_Release(surface); - } - } - else - { - todo_wine { - ok_(__FILE__, line)(hr == D2DERR_INVALID_CALL, "Unexpected hr %#x.\n", hr); - ok_(__FILE__, line)(!surface, "Unexpected surface instance.\n"); - } - } -} - #define check_rt_bitmap_surface(r, s, o) check_rt_bitmap_surface_(__LINE__, r, s, o) static void check_rt_bitmap_surface_(unsigned int line, ID2D1RenderTarget *rt, BOOL has_surface, DWORD options) { -- 2.18.0

2 2

[PATCH 1/4] wined3d: Move ARB_vertex_array_bgra handling to init_format_vertex_info().
by Henri Verbeet 13 Sep '18

13 Sep '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/utils.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 54b7bceebb9..0c230da878d 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3556,12 +3556,6 @@ static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_ format->color_fixup = create_complex_fixup_desc(COMPLEX_FIXUP_P8); } - if (gl_info->supported[ARB_VERTEX_ARRAY_BGRA]) - { - format = get_format_internal(adapter, WINED3DFMT_B8G8R8A8_UNORM); - format->gl_vtx_format = GL_BGRA; - } - if (!gl_info->supported[ARB_HALF_FLOAT_VERTEX]) { /* Do not change the size of the type, it is CPU side. We have to change the GPU-side information though. @@ -3690,6 +3684,12 @@ static BOOL init_format_vertex_info(const struct wined3d_adapter *adapter, format->gl_vtx_format = format->component_count; } + if (gl_info->supported[ARB_VERTEX_ARRAY_BGRA]) + { + format = get_format_internal(adapter, WINED3DFMT_B8G8R8A8_UNORM); + format->gl_vtx_format = GL_BGRA; + } + return TRUE; } -- 2.11.0

1 0

[PATCH v3 1/2] virtdisk: Add GetStorageDependencyInformation stub.
by Gijs Vermeulen 13 Sep '18

13 Sep '18

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/virtdisk/virtdisk.spec | 2 +- dlls/virtdisk/virtdisk_main.c | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/dlls/virtdisk/virtdisk.spec b/dlls/virtdisk/virtdisk.spec index 2946b66d50..6bd5f146db 100644 --- a/dlls/virtdisk/virtdisk.spec +++ b/dlls/virtdisk/virtdisk.spec @@ -8,7 +8,7 @@ @ stub EnumerateVirtualDiskMetadata @ stub ExpandVirtualDisk @ stub GetAllAttachedVirtualDiskPhysicalPaths -@ stub GetStorageDependencyInformation +@ stdcall GetStorageDependencyInformation(long long long ptr ptr) @ stub GetVirtualDiskInformation @ stub GetVirtualDiskMetadata @ stub GetVirtualDiskOperationProgress diff --git a/dlls/virtdisk/virtdisk_main.c b/dlls/virtdisk/virtdisk_main.c index 0da0dca461..3e6c5c14dc 100644 --- a/dlls/virtdisk/virtdisk_main.c +++ b/dlls/virtdisk/virtdisk_main.c @@ -22,6 +22,8 @@ #include "windef.h" #include "winbase.h" +#include "virtdisk.h" + #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(virtdisk); @@ -44,3 +46,22 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, void *reserved) return TRUE; } + +DWORD WINAPI GetStorageDependencyInformation(HANDLE obj, GET_STORAGE_DEPENDENCY_FLAG flags, ULONG size, STORAGE_DEPENDENCY_INFO *info, ULONG *used) +{ + ULONG temp_size = sizeof(STORAGE_DEPENDENCY_INFO); + + FIXME("(%p, 0x%x, %u, %p, %p): stub\n", obj, flags, size, info, used); + + if (used) *used = temp_size; + + if (!info || !size) + return ERROR_INVALID_PARAMETER; + + if (size < temp_size) + return ERROR_INSUFFICIENT_BUFFER; + + info->NumberEntries = 0; + + return ERROR_SUCCESS; +} -- 2.18.0

1 1

[PATCH vkd3d 8/8] tests: Clear command list before uint tests in test_shader_instructions().
by Józef Kucia 13 Sep '18

13 Sep '18

From: Józef Kucia <jkucia(a)codeweavers.com> Avoids referencing a destroyed render target in the command list. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 85e480c240d9..808562e86127 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -5272,6 +5272,7 @@ static void test_shader_instructions(void) ID3D12CommandQueue *queue; unsigned int i, x, y; ID3D12Resource *cb; + HRESULT hr; static const DWORD ps_div_code[] = { @@ -7392,6 +7393,9 @@ static void test_shader_instructions(void) D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); } + hr = ID3D12GraphicsCommandList_Close(command_list); + ok(hr == S_OK, "Failed to close command list, hr %#x.\n", hr); + reset_command_list(command_list, context.allocator); ID3D12Resource_Release(context.render_target); desc.rt_format = DXGI_FORMAT_R32G32B32A32_UINT; create_render_target(&context, &desc, &context.render_target, &context.rtv); -- 2.16.4

2 1

[PATCH vkd3d 7/8] tests: Add missing resource barrier to test_texture().
by Józef Kucia 13 Sep '18

13 Sep '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 659a5c6a2208..85e480c240d9 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -9203,6 +9203,8 @@ static void test_texture(void) ID3D12Resource_Release(texture); reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); } ID3D12DescriptorHeap_Release(heap); -- 2.16.4

2 1

[PATCH vkd3d 6/8] vkd3d: Partially implement clears for texture UAVs.
by Józef Kucia 13 Sep '18

13 Sep '18

From: Józef Kucia <jkucia(a)codeweavers.com> In the long term, we may want to use shaders to clear UAVs. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 37 +++++++++++++++++++++++++++---------- libs/vkd3d/resource.c | 8 ++++++-- libs/vkd3d/vkd3d_private.h | 16 ++++++++++++++-- 3 files changed, 47 insertions(+), 14 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 5e67e6674e95..decff143d0a3 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -3881,6 +3881,8 @@ static void STDMETHODCALLTYPE d3d12_command_list_ClearUnorderedAccessViewUint(ID const struct vkd3d_vk_device_procs *vk_procs; const struct d3d12_desc *cpu_descriptor; struct d3d12_resource *resource_impl; + VkImageSubresourceRange range; + VkClearColorValue color; TRACE("iface %p, gpu_handle %#"PRIx64", cpu_handle %lx, resource %p, values %p, rect_count %u, rects %p.\n", iface, gpu_handle.ptr, cpu_handle.ptr, resource, values, rect_count, rects); @@ -3891,11 +3893,6 @@ static void STDMETHODCALLTYPE d3d12_command_list_ClearUnorderedAccessViewUint(ID d3d12_command_list_track_resource_usage(list, resource_impl); - if (d3d12_resource_is_texture(resource_impl)) - { - FIXME("Not implemented for textures.\n"); - return; - } if (rect_count) { FIXME("Clear rects not supported.\n"); @@ -3905,14 +3902,34 @@ static void STDMETHODCALLTYPE d3d12_command_list_ClearUnorderedAccessViewUint(ID d3d12_command_list_end_current_render_pass(list); cpu_descriptor = d3d12_desc_from_cpu_handle(cpu_handle); - if (!cpu_descriptor->view_size) + + if (d3d12_resource_is_buffer(resource_impl)) { - FIXME("Not supported for UAV descriptor %p.\n", cpu_descriptor); - return; + if (!cpu_descriptor->uav.buffer.size) + { + FIXME("Not supported for UAV descriptor %p.\n", cpu_descriptor); + return; + } + + VK_CALL(vkCmdFillBuffer(list->vk_command_buffer, resource_impl->u.vk_buffer, + cpu_descriptor->uav.buffer.offset, cpu_descriptor->uav.buffer.size, values[0])); } + else + { + color.uint32[0] = values[0]; + color.uint32[1] = values[1]; + color.uint32[2] = values[2]; + color.uint32[3] = values[3]; + + range.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT; + range.baseMipLevel = cpu_descriptor->uav.texture.miplevel_idx; + range.levelCount = 1; + range.baseArrayLayer = cpu_descriptor->uav.texture.layer_idx; + range.layerCount = cpu_descriptor->uav.texture.layer_count; - VK_CALL(vkCmdFillBuffer(list->vk_command_buffer, resource_impl->u.vk_buffer, - cpu_descriptor->view_offset, cpu_descriptor->view_size, values[0])); + VK_CALL(vkCmdClearColorImage(list->vk_command_buffer, + resource_impl->u.vk_image, VK_IMAGE_LAYOUT_GENERAL, &color, 1, &range)); + } } static void STDMETHODCALLTYPE d3d12_command_list_ClearUnorderedAccessViewFloat(ID3D12GraphicsCommandList *iface, diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 88ab64552bb5..4490ae23dab9 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1635,8 +1635,8 @@ static void vkd3d_create_buffer_uav(struct d3d12_desc *descriptor, struct d3d12_ { const struct vkd3d_format *format = vkd3d_get_format(DXGI_FORMAT_R32_UINT, false); - descriptor->view_offset = desc->u.Buffer.FirstElement * format->byte_count; - descriptor->view_size = desc->u.Buffer.NumElements * format->byte_count; + descriptor->uav.buffer.offset = desc->u.Buffer.FirstElement * format->byte_count; + descriptor->uav.buffer.size = desc->u.Buffer.NumElements * format->byte_count; } } @@ -1691,6 +1691,10 @@ static void vkd3d_create_texture_uav(struct d3d12_desc *descriptor, descriptor->magic = VKD3D_DESCRIPTOR_MAGIC_UAV; descriptor->vk_descriptor_type = VK_DESCRIPTOR_TYPE_STORAGE_IMAGE; descriptor->u.view = view; + + descriptor->uav.texture.miplevel_idx = vkd3d_desc.miplevel_idx; + descriptor->uav.texture.layer_idx = vkd3d_desc.layer_idx; + descriptor->uav.texture.layer_count = vkd3d_desc.layer_count; } void d3d12_desc_create_uav(struct d3d12_desc *descriptor, struct d3d12_device *device, diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 5461cc3d36e1..6ba12f9ca1d2 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -272,8 +272,20 @@ struct d3d12_desc struct vkd3d_view *view; } u; - VkDeviceSize view_offset; - VkDeviceSize view_size; + union + { + struct + { + VkDeviceSize offset; + VkDeviceSize size; + } buffer; + struct + { + unsigned int miplevel_idx; + unsigned int layer_idx; + unsigned int layer_count; + } texture; + } uav; }; static inline struct d3d12_desc *d3d12_desc_from_cpu_handle(D3D12_CPU_DESCRIPTOR_HANDLE cpu_handle) -- 2.16.4

2 1

[PATCH vkd3d 5/8] vkd3d: Fix leaks if d3d12_device_init_pipeline_cache() fails.
by Józef Kucia 13 Sep '18

13 Sep '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/device.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index c1db7d30a9e8..b57e3ceb99e5 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1280,6 +1280,14 @@ static HRESULT d3d12_device_init_pipeline_cache(struct d3d12_device *device) VkResult vr; int rc; + if ((rc = pthread_mutex_init(&device->pipeline_cache_mutex, NULL))) + { + ERR("Failed to initialize mutex, error %d.\n", rc); + return E_FAIL; + } + + rb_init(&device->pipeline_cache, compare_pipeline_cache_entry); + cache_info.sType = VK_STRUCTURE_TYPE_PIPELINE_CACHE_CREATE_INFO; cache_info.pNext = NULL; cache_info.flags = 0; @@ -1292,14 +1300,6 @@ static HRESULT d3d12_device_init_pipeline_cache(struct d3d12_device *device) device->vk_pipeline_cache = VK_NULL_HANDLE; } - rb_init(&device->pipeline_cache, compare_pipeline_cache_entry); - - if ((rc = pthread_mutex_init(&device->pipeline_cache_mutex, NULL))) - { - ERR("Failed to initialize mutex, error %d.\n", rc); - return E_FAIL; - } - return S_OK; } -- 2.16.4

2 1

[PATCH vkd3d 4/8] tests: Add test for ld instruction with texel offsets.
by Józef Kucia 13 Sep '18

13 Sep '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 219 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 219 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 221157faa53f..659a5c6a2208 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -9209,6 +9209,224 @@ static void test_texture(void) destroy_test_context(&context); } +static void test_texture_ld(void) +{ + ID3D12GraphicsCommandList *command_list; + D3D12_GPU_DESCRIPTOR_HANDLE gpu_handle; + struct test_context_desc desc; + struct test_context context; + ID3D12DescriptorHeap *heap; + ID3D12CommandQueue *queue; + ID3D12Resource *texture; + unsigned int i; + + static const DWORD ps_ld_code[] = + { +#if 0 + Texture2D t; + + int2 offset; + uint2 location; + + float4 main() : SV_Target + { + switch (offset.x) + { + case -1: + switch (offset.y) + { + case -2: return t.Load(uint3(location, 0), int2(-1, -2)); + case -1: return t.Load(uint3(location, 0), int2(-1, -1)); + case 0: return t.Load(uint3(location, 0), int2(-1, 0)); + case 1: return t.Load(uint3(location, 0), int2(-1, 1)); + case 2: return t.Load(uint3(location, 0), int2(-1, 2)); + } + break; + case 0: + switch (offset.y) + { + case -2: return t.Load(uint3(location, 0), int2(0, -2)); + case -1: return t.Load(uint3(location, 0), int2(0, -1)); + case 0: return t.Load(uint3(location, 0), int2(0, 0)); + case 1: return t.Load(uint3(location, 0), int2(0, 1)); + case 2: return t.Load(uint3(location, 0), int2(0, 2)); + } + break; + case 1: + switch (offset.y) + { + case -2: return t.Load(uint3(location, 0), int2(1, -2)); + case -1: return t.Load(uint3(location, 0), int2(1, -1)); + case 0: return t.Load(uint3(location, 0), int2(1, 0)); + case 1: return t.Load(uint3(location, 0), int2(1, 1)); + case 2: return t.Load(uint3(location, 0), int2(1, 2)); + } + break; + } + + return t.Load(uint3(location, 0)); + } +#endif + 0x43425844, 0xe925cc02, 0x43ea9623, 0xb67c6425, 0xb4503305, 0x00000001, 0x00000844, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x000007cc, 0x00000050, 0x000001f3, + 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x04001858, 0x00107000, 0x00000000, + 0x00005555, 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000001, 0x0400004c, 0x0020800a, + 0x00000000, 0x00000000, 0x03000006, 0x00004001, 0xffffffff, 0x0400004c, 0x0020801a, 0x00000000, + 0x00000000, 0x03000006, 0x00004001, 0xfffffffe, 0x06000036, 0x00100032, 0x00000000, 0x00208ae6, + 0x00000000, 0x00000000, 0x08000036, 0x001000c2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x8a00002d, 0x8001de01, 0x800000c2, 0x00155543, 0x001020f2, 0x00000000, + 0x00100e46, 0x00000000, 0x00107e46, 0x00000000, 0x0100003e, 0x03000006, 0x00004001, 0xffffffff, + 0x06000036, 0x00100032, 0x00000000, 0x00208ae6, 0x00000000, 0x00000000, 0x08000036, 0x001000c2, + 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8a00002d, 0x8001fe01, + 0x800000c2, 0x00155543, 0x001020f2, 0x00000000, 0x00100e46, 0x00000000, 0x00107e46, 0x00000000, + 0x0100003e, 0x03000006, 0x00004001, 0x00000000, 0x06000036, 0x00100032, 0x00000000, 0x00208ae6, + 0x00000000, 0x00000000, 0x08000036, 0x001000c2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x8a00002d, 0x80001e01, 0x800000c2, 0x00155543, 0x001020f2, 0x00000000, + 0x00100e46, 0x00000000, 0x00107e46, 0x00000000, 0x0100003e, 0x03000006, 0x00004001, 0x00000001, + 0x06000036, 0x00100032, 0x00000000, 0x00208ae6, 0x00000000, 0x00000000, 0x08000036, 0x001000c2, + 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8a00002d, 0x80003e01, + 0x800000c2, 0x00155543, 0x001020f2, 0x00000000, 0x00100e46, 0x00000000, 0x00107e46, 0x00000000, + 0x0100003e, 0x03000006, 0x00004001, 0x00000002, 0x06000036, 0x00100032, 0x00000000, 0x00208ae6, + 0x00000000, 0x00000000, 0x08000036, 0x001000c2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x8a00002d, 0x80005e01, 0x800000c2, 0x00155543, 0x001020f2, 0x00000000, + 0x00100e46, 0x00000000, 0x00107e46, 0x00000000, 0x0100003e, 0x0100000a, 0x01000002, 0x01000017, + 0x01000002, 0x03000006, 0x00004001, 0x00000000, 0x0400004c, 0x0020801a, 0x00000000, 0x00000000, + 0x03000006, 0x00004001, 0xfffffffe, 0x06000036, 0x00100032, 0x00000000, 0x00208ae6, 0x00000000, + 0x00000000, 0x08000036, 0x001000c2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x8a00002d, 0x8001c001, 0x800000c2, 0x00155543, 0x001020f2, 0x00000000, 0x00100e46, + 0x00000000, 0x00107e46, 0x00000000, 0x0100003e, 0x03000006, 0x00004001, 0xffffffff, 0x06000036, + 0x00100032, 0x00000000, 0x00208ae6, 0x00000000, 0x00000000, 0x08000036, 0x001000c2, 0x00000000, + 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8a00002d, 0x8001e001, 0x800000c2, + 0x00155543, 0x001020f2, 0x00000000, 0x00100e46, 0x00000000, 0x00107e46, 0x00000000, 0x0100003e, + 0x03000006, 0x00004001, 0x00000000, 0x06000036, 0x00100032, 0x00000000, 0x00208ae6, 0x00000000, + 0x00000000, 0x08000036, 0x001000c2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x8900002d, 0x800000c2, 0x00155543, 0x001020f2, 0x00000000, 0x00100e46, 0x00000000, + 0x00107e46, 0x00000000, 0x0100003e, 0x03000006, 0x00004001, 0x00000001, 0x06000036, 0x00100032, + 0x00000000, 0x00208ae6, 0x00000000, 0x00000000, 0x08000036, 0x001000c2, 0x00000000, 0x00004002, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8a00002d, 0x80002001, 0x800000c2, 0x00155543, + 0x001020f2, 0x00000000, 0x00100e46, 0x00000000, 0x00107e46, 0x00000000, 0x0100003e, 0x03000006, + 0x00004001, 0x00000002, 0x06000036, 0x00100032, 0x00000000, 0x00208ae6, 0x00000000, 0x00000000, + 0x08000036, 0x001000c2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x8a00002d, 0x80004001, 0x800000c2, 0x00155543, 0x001020f2, 0x00000000, 0x00100e46, 0x00000000, + 0x00107e46, 0x00000000, 0x0100003e, 0x0100000a, 0x01000002, 0x01000017, 0x01000002, 0x03000006, + 0x00004001, 0x00000001, 0x0400004c, 0x0020801a, 0x00000000, 0x00000000, 0x03000006, 0x00004001, + 0xfffffffe, 0x06000036, 0x00100032, 0x00000000, 0x00208ae6, 0x00000000, 0x00000000, 0x08000036, + 0x001000c2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8a00002d, + 0x8001c201, 0x800000c2, 0x00155543, 0x001020f2, 0x00000000, 0x00100e46, 0x00000000, 0x00107e46, + 0x00000000, 0x0100003e, 0x03000006, 0x00004001, 0xffffffff, 0x06000036, 0x00100032, 0x00000000, + 0x00208ae6, 0x00000000, 0x00000000, 0x08000036, 0x001000c2, 0x00000000, 0x00004002, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x8a00002d, 0x8001e201, 0x800000c2, 0x00155543, 0x001020f2, + 0x00000000, 0x00100e46, 0x00000000, 0x00107e46, 0x00000000, 0x0100003e, 0x03000006, 0x00004001, + 0x00000000, 0x06000036, 0x00100032, 0x00000000, 0x00208ae6, 0x00000000, 0x00000000, 0x08000036, + 0x001000c2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8a00002d, + 0x80000201, 0x800000c2, 0x00155543, 0x001020f2, 0x00000000, 0x00100e46, 0x00000000, 0x00107e46, + 0x00000000, 0x0100003e, 0x03000006, 0x00004001, 0x00000001, 0x06000036, 0x00100032, 0x00000000, + 0x00208ae6, 0x00000000, 0x00000000, 0x08000036, 0x001000c2, 0x00000000, 0x00004002, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x8a00002d, 0x80002201, 0x800000c2, 0x00155543, 0x001020f2, + 0x00000000, 0x00100e46, 0x00000000, 0x00107e46, 0x00000000, 0x0100003e, 0x03000006, 0x00004001, + 0x00000002, 0x06000036, 0x00100032, 0x00000000, 0x00208ae6, 0x00000000, 0x00000000, 0x08000036, + 0x001000c2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8a00002d, + 0x80004201, 0x800000c2, 0x00155543, 0x001020f2, 0x00000000, 0x00100e46, 0x00000000, 0x00107e46, + 0x00000000, 0x0100003e, 0x0100000a, 0x01000002, 0x01000017, 0x01000002, 0x0100000a, 0x01000002, + 0x01000017, 0x06000036, 0x00100032, 0x00000000, 0x00208ae6, 0x00000000, 0x00000000, 0x08000036, + 0x001000c2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8900002d, + 0x800000c2, 0x00155543, 0x001020f2, 0x00000000, 0x00100e46, 0x00000000, 0x00107e46, 0x00000000, + 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE ps_ld = {ps_ld_code, sizeof(ps_ld_code)}; + static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; + static const unsigned int texture_data[] = + { + 0xff0008ff, 0xff00ffff, 0xff00ff05, 0xffffff01, + 0xffff0007, 0xffff00ff, 0x11111101, 0xff7f7f7f, + 0x44444f44, 0x88888888, 0x22222222, 0xff000002, + 0x66f66666, 0xff000000, 0xff000003, 0x55555555, + }; + static const D3D12_SUBRESOURCE_DATA resource_data = {&texture_data, sizeof(texture_data) / 4}; + static const struct + { + int32_t constants[4]; + unsigned int expected_color; + } + tests[] = + { + {{ 0, 0, 0, 0}, 0xff0008ff}, + {{ 1, 0, 0, 0}, 0xff00ffff}, + {{ 0, 1, 0, 0}, 0xffff0007}, + {{ 1, 1, 0, 0}, 0xffff00ff}, + {{ 3, 3, 0, 0}, 0xff0008ff}, + {{ 3, 3, 1, 1}, 0xffff00ff}, + {{ 0, 0, 3, 3}, 0x55555555}, + {{-1, -1, 3, 3}, 0x22222222}, + {{-1, -2, 3, 3}, 0x11111101}, + {{ 0, -1, 3, 3}, 0xff000002}, + {{ 0, -2, 3, 3}, 0xff7f7f7f}, + {{ 3, 3, 3, 3}, 0x55555555}, + }; + + if (use_warp_device) + { + skip("WARP device is removed when ps_ld is used.\n"); + return; + } + + memset(&desc, 0, sizeof(desc)); + desc.rt_width = desc.rt_height = 32; + desc.no_root_signature = true; + if (!init_test_context(&context, &desc)) + return; + command_list = context.list; + queue = context.queue; + + context.root_signature = create_texture_root_signature(context.device, + D3D12_SHADER_VISIBILITY_PIXEL, 4, 0); + context.pipeline_state = create_pipeline_state(context.device, + context.root_signature, context.render_target_desc.Format, NULL, &ps_ld, NULL); + + heap = create_gpu_descriptor_heap(context.device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 1); + gpu_handle = ID3D12DescriptorHeap_GetGPUDescriptorHandleForHeapStart(heap); + + texture = create_default_texture(context.device, + 4, 4, DXGI_FORMAT_R8G8B8A8_UNORM, 0, D3D12_RESOURCE_STATE_COPY_DEST); + upload_texture_data(texture, &resource_data, 1, queue, command_list); + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, texture, + D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE); + ID3D12Device_CreateShaderResourceView(context.device, texture, NULL, + ID3D12DescriptorHeap_GetCPUDescriptorHandleForHeapStart(heap)); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); + + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, FALSE, NULL); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, 1, &heap); + ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list, 0, gpu_handle); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 1, + ARRAY_SIZE(tests[i].constants), &tests[i].constants, 0); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + check_sub_resource_uint(context.render_target, 0, queue, command_list, tests[i].expected_color, 0); + + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + } + + ID3D12Resource_Release(texture); + ID3D12DescriptorHeap_Release(heap); + destroy_test_context(&context); +} + static void test_gather(void) { struct @@ -19285,6 +19503,7 @@ START_TEST(d3d12) run_test(test_immediate_constant_buffer); run_test(test_root_constants); run_test(test_texture); + run_test(test_texture_ld); run_test(test_gather); run_test(test_cube_maps); run_test(test_descriptor_tables); -- 2.16.4

2 1

[PATCH vkd3d 3/8] vkd3d-shader: Implement texel offset for sample instructions.
by Józef Kucia 13 Sep '18

13 Sep '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index f0e2491a68bd..964bc49b3179 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -5322,7 +5322,7 @@ static void vkd3d_dxbc_compiler_emit_sample(struct vkd3d_dxbc_compiler *compiler SpvImageOperandsMask operands_mask = 0; unsigned int image_operand_count = 0; struct vkd3d_shader_image image; - uint32_t image_operands[1]; + uint32_t image_operands[2]; SpvOp op; switch (instruction->handler_idx) @@ -5341,11 +5341,16 @@ static void vkd3d_dxbc_compiler_emit_sample(struct vkd3d_dxbc_compiler *compiler return; } - if (vkd3d_shader_instruction_has_texel_offset(instruction)) - FIXME("Texel offset not supported.\n"); - vkd3d_dxbc_compiler_prepare_sampled_image(compiler, &image, &src[1].reg, &src[2].reg, VKD3D_IMAGE_FLAG_NONE); + + if (vkd3d_shader_instruction_has_texel_offset(instruction)) + { + operands_mask |= SpvImageOperandsConstOffsetMask; + image_operands[image_operand_count++] = vkd3d_dxbc_compiler_emit_texel_offset(compiler, + instruction, image.resource_type_info); + } + sampled_type_id = vkd3d_spirv_get_type_id(builder, image.sampled_type, VKD3D_VEC4_SIZE); coordinate_id = vkd3d_dxbc_compiler_emit_load_src(compiler, &src[0], VKD3DSP_WRITEMASK_ALL); val_id = vkd3d_spirv_build_op_image_sample(builder, op, sampled_type_id, -- 2.16.4

2 1

[PATCH vkd3d 2/8] vkd3d-shader: Implement texel offsets for ld instructions.
by Józef Kucia 13 Sep '18

13 Sep '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 10134bf97369..f0e2491a68bd 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -5262,6 +5262,17 @@ static void vkd3d_dxbc_compiler_prepare_sampled_image(struct vkd3d_dxbc_compiler vkd3d_dxbc_compiler_get_register_id(compiler, sampler_reg), depth_comparison); } +static uint32_t vkd3d_dxbc_compiler_emit_texel_offset(struct vkd3d_dxbc_compiler *compiler, + const struct vkd3d_shader_instruction *instruction, + const struct vkd3d_spirv_resource_type *resource_type_info) +{ + const struct vkd3d_shader_texel_offset *offset = &instruction->texel_offset; + unsigned int component_count = resource_type_info->offset_component_count; + int32_t data[4] = {offset->u, offset->v, offset->w, 0}; + return vkd3d_dxbc_compiler_get_constant(compiler, + VKD3D_TYPE_INT, component_count, (const uint32_t *)data); +} + static void vkd3d_dxbc_compiler_emit_ld(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_instruction *instruction) { @@ -5275,9 +5286,6 @@ static void vkd3d_dxbc_compiler_emit_ld(struct vkd3d_dxbc_compiler *compiler, uint32_t image_operands[2]; DWORD coordinate_mask; - if (vkd3d_shader_instruction_has_texel_offset(instruction)) - FIXME("Texel offset not supported.\n"); - /* OpImageFetch must be used with a sampled image. */ vkd3d_dxbc_compiler_prepare_dummy_sampled_image(compiler, &image, &src[1].reg); image_id = vkd3d_spirv_build_op_image(builder, image.image_type_id, image.sampled_image_id); @@ -5291,6 +5299,12 @@ static void vkd3d_dxbc_compiler_emit_ld(struct vkd3d_dxbc_compiler *compiler, image_operands[image_operand_count++] = vkd3d_dxbc_compiler_emit_load_src(compiler, &src[0], VKD3DSP_WRITEMASK_3); } + if (vkd3d_shader_instruction_has_texel_offset(instruction)) + { + operands_mask |= SpvImageOperandsConstOffsetMask; + image_operands[image_operand_count++] = vkd3d_dxbc_compiler_emit_texel_offset(compiler, + instruction, image.resource_type_info); + } val_id = vkd3d_spirv_build_op_image_fetch(builder, type_id, image_id, coordinate_id, operands_mask, image_operands, image_operand_count); @@ -5386,17 +5400,6 @@ static void vkd3d_dxbc_compiler_emit_sample_c(struct vkd3d_dxbc_compiler *compil dst, val_id, image.sampled_type, src[1].swizzle); } -static uint32_t vkd3d_dxbc_compiler_emit_texel_offset(struct vkd3d_dxbc_compiler *compiler, - const struct vkd3d_shader_instruction *instruction, - const struct vkd3d_spirv_resource_type *resource_type_info) -{ - const struct vkd3d_shader_texel_offset *offset = &instruction->texel_offset; - unsigned int component_count = resource_type_info->offset_component_count; - int32_t data[4] = {offset->u, offset->v, offset->w, 0}; - return vkd3d_dxbc_compiler_get_constant(compiler, - VKD3D_TYPE_INT, component_count, (const uint32_t *)data); -} - static void vkd3d_dxbc_compiler_emit_gather4(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_instruction *instruction) { -- 2.16.4

2 1

[PATCH vkd3d 1/8] vkd3d-shader: Add support for more interpolation modifiers.
by Józef Kucia 13 Sep '18

13 Sep '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 1181c8404f35..10134bf97369 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -3973,6 +3973,12 @@ static void vkd3d_dxbc_compiler_emit_interpolation_decorations(struct vkd3d_dxbc break; case VKD3DSIM_LINEAR: break; + case VKD3DSIM_LINEAR_CENTROID: + vkd3d_spirv_build_op_decorate(builder, id, SpvDecorationCentroid, NULL, 0); + break; + case VKD3DSIM_LINEAR_NOPERSPECTIVE: + vkd3d_spirv_build_op_decorate(builder, id, SpvDecorationNoPerspective, NULL, 0); + break; case VKD3DSIM_LINEAR_SAMPLE: vkd3d_spirv_enable_capability(builder, SpvCapabilitySampleRateShading); vkd3d_spirv_build_op_decorate(builder, id, SpvDecorationSample, NULL, 0); -- 2.16.4

2 1

[PATCH] wintab32: Correct ordinal in comment to the same as in the spec file.
by Bernhard Übelacker 13 Sep '18

13 Sep '18

Signed-off-by: Bernhard Übelacker <bernhardu(a)mailbox.org> --- dlls/wintab32/context.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wintab32/context.c b/dlls/wintab32/context.c index 6f8f69ce96..d9cfe85168 100644 --- a/dlls/wintab32/context.c +++ b/dlls/wintab32/context.c @@ -471,7 +471,7 @@ UINT WINAPI WTInfoW(UINT wCategory, UINT nIndex, LPVOID lpOutput) } /*********************************************************************** - * WTOpenW (WINTAB32.2021) + * WTOpenW (WINTAB32.1021) */ HCTX WINAPI WTOpenW(HWND hWnd, LPLOGCONTEXTW lpLogCtx, BOOL fEnable) { @@ -767,7 +767,7 @@ BOOL WINAPI WTOverlap(HCTX hCtx, BOOL fToTop) } /*********************************************************************** - * WTConfig (WINTAB32.61) + * WTConfig (WINTAB32.60) */ BOOL WINAPI WTConfig(HCTX hCtx, HWND hWnd) { -- 2.18.0

1 0

[PATCH] ntoskrnl: Allow space for the '\0'.
by Huw Davies 13 Sep '18

13 Sep '18

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 804a938372..18524afb07 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1353,7 +1353,7 @@ NTSTATUS WINAPI IoSetDeviceInterfaceState( UNICODE_STRING *name, BOOLEAN enable if (!guid_from_string( (refstr ? refstr : name->Buffer + namelen) - 38, &class )) return STATUS_INVALID_PARAMETER; - len = strlenW(DeviceClassesW) + 38 + 1 + namelen + 2; + len = strlenW(DeviceClassesW) + 38 + 1 + namelen + 2 + 1; if (!(path = heap_alloc( len * sizeof(WCHAR) ))) return STATUS_NO_MEMORY; -- 2.18.0

1 0

[PATCH v2 1/3] comctl32/pager: Support toolbar notification conversion.
by Zhiyi Zhang 13 Sep '18

13 Sep '18

Fix BibleWorks 10 not displaying toolbar. Pager always wants Unicode notifications from its children. And the parent of pager may want ANSI notifications. In this case, pager need to convert Unicode notifications to ANSI ones before sending them to parent and convert ANSI notifications from parent to Unicode before returning the result to its children. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v2: Rewrote tests with static test data. dlls/comctl32/pager.c | 96 +++++++++ dlls/comctl32/tests/pager.c | 404 ++++++++++++++++++++++++++++++++++++ 2 files changed, 500 insertions(+) diff --git a/dlls/comctl32/pager.c b/dlls/comctl32/pager.c index de63cad717..be9bccbbc7 100644 --- a/dlls/comctl32/pager.c +++ b/dlls/comctl32/pager.c @@ -91,6 +91,17 @@ typedef struct #define INITIAL_DELAY 500 #define REPEAT_DELAY 50 +/* Text field conversion behavior flags for PAGER_SendConvertedNotify() */ +enum conversion_flags +{ + /* Convert Unicode text to ANSI for parent before sending. If not set, do nothing */ + CONVERT_SEND = 0x01, + /* Convert ANSI text from parent back to Unicode for children */ + CONVERT_RECEIVE = 0x02, + /* Send empty text to parent if text is NULL. Original text pointer still remains NULL */ + NULL_SEND_EMPTY = 0x04 +}; + static void PAGER_GetButtonRects(const PAGER_INFO* infoPtr, RECT* prcTopLeft, RECT* prcBottomRight, BOOL bClientCoords) { @@ -1020,6 +1031,89 @@ static LRESULT PAGER_NotifyFormat(PAGER_INFO *infoPtr, INT command) } } +static UINT PAGER_GetAnsiNtfCode(UINT code) +{ + switch (code) + { + /* Toolbar */ + case TBN_GETBUTTONINFOW: return TBN_GETBUTTONINFOA; + case TBN_GETINFOTIPW: return TBN_GETINFOTIPA; + } + return code; +} + +static LRESULT PAGER_SendConvertedNotify(PAGER_INFO *infoPtr, NMHDR *hdr, WCHAR **text, INT *textMax, DWORD flags) +{ + CHAR *sendBuffer = NULL; + CHAR *receiveBuffer; + INT bufferSize; + WCHAR *oldText; + INT oldTextMax; + LRESULT ret = NO_ERROR; + + oldText = *text; + oldTextMax = textMax ? *textMax : 0; + + hdr->code = PAGER_GetAnsiNtfCode(hdr->code); + + if (oldTextMax < 0) goto done; + + if ((*text && flags & CONVERT_SEND) || (!*text && flags & NULL_SEND_EMPTY)) + { + bufferSize = textMax ? *textMax : lstrlenW(*text) + 1; + sendBuffer = heap_alloc_zero(bufferSize); + if (!sendBuffer) goto done; + WideCharToMultiByte(CP_ACP, 0, *text, -1, sendBuffer, bufferSize, NULL, FALSE); + *text = (WCHAR *)sendBuffer; + } + + ret = SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, hdr->idFrom, (LPARAM)hdr); + + if (*text && oldText && flags & CONVERT_RECEIVE) + { + /* MultiByteToWideChar requires that source and destination are not the same buffer */ + if (*text == oldText) + { + bufferSize = lstrlenA((CHAR *)*text) + 1; + receiveBuffer = heap_alloc_zero(bufferSize); + if (!receiveBuffer) goto done; + memcpy(receiveBuffer, *text, bufferSize); + MultiByteToWideChar(CP_ACP, 0, receiveBuffer, bufferSize, oldText, oldTextMax); + heap_free(receiveBuffer); + } + else + MultiByteToWideChar(CP_ACP, 0, (CHAR *)*text, -1, oldText, oldTextMax); + } + +done: + heap_free(sendBuffer); + *text = oldText; + return ret; +} + +static LRESULT PAGER_Notify(PAGER_INFO *infoPtr, NMHDR *hdr) +{ + if (infoPtr->bUnicode) return SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, hdr->idFrom, (LPARAM)hdr); + + switch (hdr->code) + { + /* Toolbar */ + case TBN_GETBUTTONINFOW: + { + NMTOOLBARW *nmtb = (NMTOOLBARW *)hdr; + return PAGER_SendConvertedNotify(infoPtr, hdr, &nmtb->pszText, &nmtb->cchText, + NULL_SEND_EMPTY | CONVERT_SEND | CONVERT_RECEIVE); + } + case TBN_GETINFOTIPW: + { + NMTBGETINFOTIPW *nmtbgit = (NMTBGETINFOTIPW *)hdr; + return PAGER_SendConvertedNotify(infoPtr, hdr, &nmtbgit->pszText, &nmtbgit->cchTextMax, CONVERT_RECEIVE); + } + } + /* Other notifications, no need to convert */ + return SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, hdr->idFrom, (LPARAM)hdr); +} + static LRESULT WINAPI PAGER_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { @@ -1115,6 +1209,8 @@ PAGER_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return PAGER_NotifyFormat (infoPtr, lParam); case WM_NOTIFY: + return PAGER_Notify (infoPtr, (NMHDR *)lParam); + case WM_COMMAND: return SendMessageW (infoPtr->hwndNotify, uMsg, wParam, lParam); diff --git a/dlls/comctl32/tests/pager.c b/dlls/comctl32/tests/pager.c index a1f6683a57..8cc990a702 100644 --- a/dlls/comctl32/tests/pager.c +++ b/dlls/comctl32/tests/pager.c @@ -30,6 +30,107 @@ static HWND parent_wnd, child1_wnd, child2_wnd; static INT notify_format; static BOOL notify_query_received; +static WCHAR test_w[] = {'t', 'e', 's', 't', 0}; +static CHAR test_a[] = {'t', 'e', 's', 't', 0}; +static WCHAR empty_w[] = {0}; +static CHAR empty_a[] = {0}; +static CHAR large_a[] = "You should have received a copy of the GNU Lesser General Public License along with this ..."; +static WCHAR large_truncated_65_w[65] = +{ + 'Y', 'o', 'u', ' ', 's', 'h', 'o', 'u', 'l', 'd', ' ', 'h', 'a', 'v', 'e', ' ', 'r', 'e', 'c', 'e', 'i', 'v', + 'e', 'd', ' ', 'a', ' ', 'c', 'o', 'p', 'y', ' ', 'o', 'f', ' ', 't', 'h', 'e', ' ', 'G', 'N', 'U', ' ', 'L', + 'e', 's', 's', 'e', 'r', ' ', 'G', 'e', 'n', 'e', 'r', 'a', 'l', ' ', 'P', 'u', 'b', 'l', 'i', 'c', 0 +}; +static WCHAR buffer[64]; + +/* Text field conversion test behavior flags. */ +enum test_conversion_flags +{ + CONVERT_SEND = 0x01, + NOT_CONVERT_SEND = 0x02, + CONVERT_RECEIVE = 0x04, + NOT_CONVERT_RECEIVE = 0x08, + NULL_SEND_EMPTY = 0x10, + NOT_NULL_SEND_EMPTY = 0x20 +}; + +static struct notify_test_info +{ + UINT unicode; + UINT ansi; + UINT_PTR id_from; + HWND hwnd_from; + /* Whether parent received notification */ + BOOL received; + UINT test_id; + UINT sub_test_id; + /* Text field conversion test behavior flag */ + DWORD flags; +} notify_test_info; + +struct notify_test_send_data +{ + /* Data sent to pager */ + WCHAR *send_text; + INT send_text_size; + INT send_text_max; + /* Data expected by parent of pager */ + void *expect_text; +}; + +struct notify_test_receive_data +{ + /* Data sent to pager */ + WCHAR *send_text; + INT send_text_size; + INT send_text_max; + /* Data for parent to write */ + CHAR *write_pointer; + CHAR *write_text; + INT write_text_size; + INT write_text_max; + /* Data when message returned */ + void *return_text; + INT return_text_max; +}; + +struct generic_text_helper_para +{ + void *ptr; + size_t size; + UINT *mask; + UINT required_mask; + WCHAR **text; + INT *text_max; + UINT code_unicode; + UINT code_ansi; + DWORD flags; +}; + +static const struct notify_test_send_data test_convert_send_datas[] = +{ + {test_w, sizeof(test_w), ARRAY_SIZE(buffer), test_a} +}; + +static const struct notify_test_send_data test_not_convert_send_datas[] = +{ + {test_w, sizeof(test_w), ARRAY_SIZE(buffer), test_w} +}; + +static const struct notify_test_receive_data test_convert_receive_datas[] = +{ + {empty_w, sizeof(empty_w), ARRAY_SIZE(buffer), NULL, test_a, sizeof(test_a), -1, test_w, ARRAY_SIZE(buffer)}, + {empty_w, sizeof(empty_w), ARRAY_SIZE(buffer), test_a, NULL, 0, -1, test_w, ARRAY_SIZE(buffer)}, + {NULL, sizeof(empty_w), ARRAY_SIZE(buffer), test_a, NULL, 0, -1, NULL, ARRAY_SIZE(buffer)}, + {empty_w, sizeof(empty_w), ARRAY_SIZE(buffer), large_a, NULL, 0, -1, large_truncated_65_w, ARRAY_SIZE(buffer)}, + {empty_w, sizeof(empty_w), ARRAY_SIZE(buffer), empty_a, 0, 0, 1, empty_w, 1}, +}; + +static const struct notify_test_receive_data test_not_convert_receive_datas[] = +{ + {empty_w, sizeof(empty_w), ARRAY_SIZE(buffer), NULL, test_a, sizeof(test_a), -1, test_a, ARRAY_SIZE(buffer)}, + {empty_w, sizeof(empty_w), ARRAY_SIZE(buffer), test_a, NULL, 0, -1, test_a, ARRAY_SIZE(buffer)}, +}; #define CHILD1_ID 1 #define CHILD2_ID 2 @@ -419,6 +520,308 @@ static void test_wm_notifyformat(void) UnregisterClassW(class_w, GetModuleHandleW(NULL)); } +static void notify_generic_text_handler(CHAR **text, INT *text_max) +{ + switch (notify_test_info.test_id) + { + case CONVERT_SEND: + case NOT_CONVERT_SEND: + { + const struct notify_test_send_data *data = + (notify_test_info.test_id == CONVERT_SEND ? test_convert_send_datas : test_not_convert_send_datas) + + notify_test_info.sub_test_id; + if (notify_test_info.flags & CONVERT_SEND) + ok(!lstrcmpA(data->expect_text, *text), "Code 0x%08x test 0x%08x sub test %d expect %s, got %s\n", + notify_test_info.unicode, notify_test_info.test_id, notify_test_info.sub_test_id, + (CHAR *)data->expect_text, *text); + else + ok(!lstrcmpW((WCHAR *)data->expect_text, (WCHAR *)*text), + "Code 0x%08x test 0x%08x sub test %d expect %s, got %s\n", notify_test_info.unicode, + notify_test_info.test_id, notify_test_info.sub_test_id, wine_dbgstr_w((WCHAR *)data->expect_text), + wine_dbgstr_w((WCHAR *)*text)); + if (text_max) + ok(*text_max == data->send_text_max, "Code 0x%08x test 0x%08x sub test %d expect %d, got %d\n", + notify_test_info.unicode, notify_test_info.test_id, notify_test_info.sub_test_id, data->send_text_max, + *text_max); + break; + } + case CONVERT_RECEIVE: + case NOT_CONVERT_RECEIVE: + { + const struct notify_test_receive_data *data = + (notify_test_info.test_id == CONVERT_RECEIVE ? test_convert_receive_datas : test_not_convert_receive_datas) + + notify_test_info.sub_test_id; + if (text_max) + ok(*text_max == data->send_text_max, "Code 0x%08x test 0x%08x sub test %d expect %d, got %d\n", + notify_test_info.unicode, notify_test_info.test_id, notify_test_info.sub_test_id, data->send_text_max, + *text_max); + + if (data->write_text) + memcpy(*text, data->write_text, data->write_text_size); + else + *text = data->write_pointer; + if (text_max && data->write_text_max != -1) *text_max = data->write_text_max; + break; + } + case NULL_SEND_EMPTY: + ok(!lstrcmpA(*text, empty_a), "Code 0x%08x test 0x%08x sub test %d expect empty text, got %s\n", + notify_test_info.unicode, notify_test_info.test_id, notify_test_info.sub_test_id, *text); + break; + case NOT_NULL_SEND_EMPTY: + ok(!*text, "Code 0x%08x test 0x%08x sub test %d expect null text\n", notify_test_info.unicode, + notify_test_info.test_id, notify_test_info.sub_test_id); + break; + } +} + +static LRESULT WINAPI test_notify_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + static const WCHAR test[] = {'t', 'e', 's', 't', 0}; + switch (message) + { + case WM_NOTIFY: + { + NMHDR *hdr = (NMHDR *)lParam; + + /* Not notifications we want to test */ + if (!notify_test_info.unicode) break; + ok(!notify_test_info.received, "Extra notification received\n"); + + ok(wParam == notify_test_info.id_from, "Expect %ld, got %ld\n", notify_test_info.id_from, wParam); + ok(hdr->code == notify_test_info.ansi, "Expect 0x%08x, got 0x%08x\n", notify_test_info.ansi, hdr->code); + ok(hdr->idFrom == notify_test_info.id_from, "Expect %ld, got %ld\n", notify_test_info.id_from, wParam); + ok(hdr->hwndFrom == notify_test_info.hwnd_from, "Expect %p, got %p\n", notify_test_info.hwnd_from, hdr->hwndFrom); + + if (hdr->code != notify_test_info.ansi) + { + skip("Notification code mismatch, skipping lParam check\n"); + return 0; + } + switch (hdr->code) + { + /* Toolbar */ + case TBN_SAVE: + { + NMTBSAVE *nmtbs = (NMTBSAVE *)hdr; + notify_generic_text_handler((CHAR **)&nmtbs->tbButton.iString, NULL); + break; + } + case TBN_RESTORE: + { + NMTBRESTORE *nmtbr = (NMTBRESTORE *)hdr; + notify_generic_text_handler((CHAR **)&nmtbr->tbButton.iString, NULL); + break; + } + case TBN_GETBUTTONINFOA: + { + NMTOOLBARA *nmtb = (NMTOOLBARA *)hdr; + notify_generic_text_handler(&nmtb->pszText, &nmtb->cchText); + break; + } + case TBN_GETDISPINFOW: + { + NMTBDISPINFOW *nmtbdi = (NMTBDISPINFOW *)hdr; + notify_generic_text_handler((CHAR **)&nmtbdi->pszText, &nmtbdi->cchText); + break; + } + case TBN_GETINFOTIPA: + { + NMTBGETINFOTIPA *nmtbgit = (NMTBGETINFOTIPA *)hdr; + notify_generic_text_handler(&nmtbgit->pszText, &nmtbgit->cchTextMax); + break; + } + default: + ok(0, "Unexpected message 0x%08x\n", hdr->code); + } + notify_test_info.received = TRUE; + ok(!lstrcmpA(test_a, "test"), "test_a got modified\n"); + ok(!lstrcmpW(test_w, test), "test_w got modified\n"); + return 0; + } + case WM_NOTIFYFORMAT: + if (lParam == NF_QUERY) return NFR_ANSI; + break; + } + return DefWindowProcA(hwnd, message, wParam, lParam); +} + +static BOOL register_test_notify_class(void) +{ + WNDCLASSA cls = {0}; + + cls.lpfnWndProc = test_notify_proc; + cls.hInstance = GetModuleHandleA(NULL); + cls.lpszClassName = "Pager notify class"; + return RegisterClassA(&cls); +} + +static void _send_notify(HWND pager, UINT unicode, UINT ansi, LPARAM lParam, BOOL code_change) +{ + NMHDR *hdr = (NMHDR *)lParam; + + notify_test_info.unicode = unicode; + notify_test_info.id_from = 1; + notify_test_info.hwnd_from = child1_wnd; + notify_test_info.ansi = ansi; + notify_test_info.received = FALSE; + + hdr->code = unicode; + hdr->idFrom = 1; + hdr->hwndFrom = child1_wnd; + + SendMessageW(pager, WM_NOTIFY, hdr->idFrom, lParam); + ok(notify_test_info.received, "Expect notification received\n"); + ok(hdr->code == code_change ? ansi : unicode, "Expect 0x%08x, got 0x%08x\n", hdr->code, + code_change ? ansi : unicode); +} + +#define send_notify(a, b, c, d) _send_notify(pager, a, b, c, d) + +/* Send notify to test text field conversion. In parent proc notify_generic_text_handler() handles these messages */ +static void test_notify_generic_text_helper(HWND pager, void *ptr, size_t size, UINT *mask, UINT required_mask, + WCHAR **text, INT *text_max, UINT code_unicode, UINT code_ansi, DWORD flags) +{ + const struct notify_test_send_data *send_datas; + const struct notify_test_receive_data *receive_datas; + INT array_size; + INT i; + + notify_test_info.flags = flags; + + if (flags & (CONVERT_SEND | NOT_CONVERT_SEND)) + { + if(flags & CONVERT_SEND) + { + notify_test_info.test_id = CONVERT_SEND; + send_datas = test_convert_send_datas; + array_size = ARRAY_SIZE(test_convert_send_datas); + } + else + { + notify_test_info.test_id = NOT_CONVERT_SEND; + send_datas = test_not_convert_send_datas; + array_size = ARRAY_SIZE(test_not_convert_send_datas); + } + + for (i = 0; i < array_size; i++) + { + const struct notify_test_send_data *data = send_datas + i; + notify_test_info.sub_test_id = i; + + memset(ptr, 0, size); + if (mask) *mask = required_mask; + if (data->send_text) + { + memcpy(buffer, data->send_text, data->send_text_size); + *text = buffer; + } + if (text_max) *text_max = data->send_text_max; + send_notify(code_unicode, code_ansi, (LPARAM)ptr, TRUE); + } + } + + if (flags & (CONVERT_RECEIVE | NOT_CONVERT_RECEIVE)) + { + if (flags & CONVERT_RECEIVE) + { + notify_test_info.test_id = CONVERT_RECEIVE; + receive_datas = test_convert_receive_datas; + array_size = ARRAY_SIZE(test_convert_receive_datas); + } + else + { + notify_test_info.test_id = NOT_CONVERT_RECEIVE; + receive_datas = test_not_convert_receive_datas; + array_size = ARRAY_SIZE(test_not_convert_receive_datas); + } + + for (i = 0; i < array_size; i++) + { + const struct notify_test_receive_data *data = receive_datas + i; + notify_test_info.sub_test_id = i; + + memset(ptr, 0, size); + if (mask) *mask = required_mask; + if (data->send_text) + { + memcpy(buffer, data->send_text, data->send_text_size); + *text = buffer; + } + if (text_max) *text_max = data->send_text_max; + send_notify(code_unicode, code_ansi, (LPARAM)ptr, TRUE); + if (data->return_text) + { + if (flags & CONVERT_RECEIVE) + ok(!lstrcmpW(data->return_text, *text), "Code 0x%08x sub test %d expect %s, got %s\n", code_unicode, + i, wine_dbgstr_w((WCHAR *)data->return_text), wine_dbgstr_w(*text)); + else + ok(!lstrcmpA(data->return_text, (CHAR *)*text), "Code 0x%08x sub test %d expect %s, got %s\n", + code_unicode, i, (CHAR *)data->return_text, (CHAR *)*text); + } + if (text_max) + ok(data->return_text_max == *text_max, "Code 0x%08x sub test %d expect %d, got %d\n", code_unicode, i, + data->return_text_max, *text_max); + } + } + + /* Extra tests for other behavior flags that are not worth it to create their own test arrays */ + memset(ptr, 0, size); + if (mask) *mask = required_mask; + if (text_max) *text_max = 1; + if(flags & NULL_SEND_EMPTY) + notify_test_info.test_id = NULL_SEND_EMPTY; + else + notify_test_info.test_id = NOT_NULL_SEND_EMPTY; + send_notify(code_unicode, code_ansi, (LPARAM)ptr, TRUE); +} + +static void test_wm_notify(void) +{ + static const CHAR *class = "Pager notify class"; + HWND parent, pager; + /* Tool Bar */ + static NMTBRESTORE nmtbr; + static NMTBSAVE nmtbs; + static NMTOOLBARW nmtb; + static NMTBDISPINFOW nmtbdi; + static NMTBGETINFOTIPW nmtbgit; + static const struct generic_text_helper_para paras[] = + { + /* Tool Bar */ + {&nmtbs, sizeof(nmtbs), NULL, 0, (WCHAR **)&nmtbs.tbButton.iString, NULL, TBN_SAVE, TBN_SAVE, + NOT_CONVERT_SEND | NOT_CONVERT_RECEIVE}, + {&nmtbr, sizeof(nmtbr), NULL, 0, (WCHAR **)&nmtbr.tbButton.iString, NULL, TBN_RESTORE, TBN_RESTORE, + NOT_CONVERT_SEND | NOT_CONVERT_RECEIVE}, + {&nmtbdi, sizeof(nmtbdi), &nmtbdi.dwMask, TBNF_TEXT, &nmtbdi.pszText, &nmtbdi.cchText, TBN_GETDISPINFOW, + TBN_GETDISPINFOW, NOT_CONVERT_SEND | NOT_CONVERT_RECEIVE}, + {&nmtb, sizeof(nmtb), NULL, 0, &nmtb.pszText, &nmtb.cchText, TBN_GETBUTTONINFOW, TBN_GETBUTTONINFOA, + NULL_SEND_EMPTY | CONVERT_SEND | CONVERT_RECEIVE}, + {&nmtbgit, sizeof(nmtbgit), NULL, 0, &nmtbgit.pszText, &nmtbgit.cchTextMax, TBN_GETINFOTIPW, TBN_GETINFOTIPA, + NOT_CONVERT_SEND | CONVERT_RECEIVE} + }; + INT i; + + ok(register_test_notify_class(), "Register test class failed, error 0x%08x\n", GetLastError()); + + parent = CreateWindowA(class, "parent", WS_OVERLAPPED, 0, 0, 100, 100, 0, 0, GetModuleHandleA(0), 0); + ok(parent != NULL, "CreateWindow failed\n"); + pager = CreateWindowA(WC_PAGESCROLLERA, "pager", WS_CHILD, 0, 0, 100, 100, parent, 0, GetModuleHandleA(0), 0); + ok(pager != NULL, "CreateWindow failed\n"); + child1_wnd = CreateWindowA(class, "child", WS_CHILD, 0, 0, 100, 100, pager, (HMENU)1, GetModuleHandleA(0), 0); + ok(child1_wnd != NULL, "CreateWindow failed\n"); + SendMessageW(pager, PGM_SETCHILD, 0, (LPARAM)child1_wnd); + + for (i = 0; i < ARRAY_SIZE(paras); i++) + { + const struct generic_text_helper_para *p = paras + i; + test_notify_generic_text_helper(pager, p->ptr, p->size, p->mask, p->required_mask, p->text, p->text_max, + p->code_unicode, p->code_ansi, p->flags); + } + + DestroyWindow(parent); + UnregisterClassA(class, GetModuleHandleA(NULL)); +} + static void init_functions(void) { HMODULE mod = LoadLibraryA("comctl32.dll"); @@ -447,6 +850,7 @@ START_TEST(pager) test_pager(); test_wm_notifyformat(); + test_wm_notify(); DestroyWindow(parent_wnd); } -- 2.18.0

3 3

[PATCH 8/8] wsdapi: Prefer Wine version.
by Owen Rudge 13 Sep '18

13 Sep '18

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/main.c | 2 -- 1 file changed, 2 deletions(-)

1 0

[PATCH 7/8] wsdapi: Don't include null character at the end of sent messages.
by Owen Rudge 13 Sep '18

13 Sep '18

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/soap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[PATCH 6/8] wsdapi: Send Probe Matches message via UDP unicast.
by Owen Rudge 13 Sep '18

13 Sep '18

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/network.c | 32 ++++++++++++++++++++++++++++++++ dlls/wsdapi/soap.c | 4 ++-- dlls/wsdapi/tests/discovery.c | 22 +++++++++++----------- dlls/wsdapi/wsdapi_internal.h | 1 + 4 files changed, 46 insertions(+), 13 deletions(-)

1 0

[PATCH 5/8] wsdapi: Implement generation of ProbeMatches message.
by Owen Rudge 13 Sep '18

13 Sep '18

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/soap.c | 169 +++++++++++++++++++++++++++++++++- dlls/wsdapi/tests/discovery.c | 2 +- 2 files changed, 169 insertions(+), 2 deletions(-)

1 0

[PATCH 4/8] wsdapi: Implement matching of names in MatchProbeEx.
by Owen Rudge 13 Sep '18

13 Sep '18

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/discovery.c | 58 ++++++++++++++++++++++++++++++++--- dlls/wsdapi/soap.c | 9 ++++++ dlls/wsdapi/wsdapi_internal.h | 6 ++++ 3 files changed, 69 insertions(+), 4 deletions(-)

1 0

[PATCH 3/8] wsdapi: Ignore duplicate messages.
by Owen Rudge 13 Sep '18

13 Sep '18

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/discovery.c | 12 +++++++++ dlls/wsdapi/network.c | 2 +- dlls/wsdapi/soap.c | 47 ++++++++++++++++++++++++++++++++++- dlls/wsdapi/tests/discovery.c | 2 +- dlls/wsdapi/wsdapi_internal.h | 11 +++++++- 5 files changed, 70 insertions(+), 4 deletions(-)

1 0

[PATCH 2/2] ntdll: Add stub for ApiSetQueryApiSetPresence.
by Alistair Leslie-Hughes 13 Sep '18

13 Sep '18

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- .../api-ms-win-core-apiquery-l1-1-0.spec | 2 +- dlls/ntdll/misc.c | 12 ++++++++++++ dlls/ntdll/ntdll.spec | 1 + 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/api-ms-win-core-apiquery-l1-1-0/api-ms-win-core-apiquery-l1-1-0.spec b/dlls/api-ms-win-core-apiquery-l1-1-0/api-ms-win-core-apiquery-l1-1-0.spec index 6d63b5b..1d99dd7 100644 --- a/dlls/api-ms-win-core-apiquery-l1-1-0/api-ms-win-core-apiquery-l1-1-0.spec +++ b/dlls/api-ms-win-core-apiquery-l1-1-0/api-ms-win-core-apiquery-l1-1-0.spec @@ -1 +1 @@ -@ stub ApiSetQueryApiSetPresence +@ stdcall ApiSetQueryApiSetPresence(ptr ptr) ntdll.ApiSetQueryApiSetPresence diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c index 2431662..f2c0e14 100644 --- a/dlls/ntdll/misc.c +++ b/dlls/ntdll/misc.c @@ -504,3 +504,15 @@ NTSTATUS WINAPI NtCreateLowBoxToken(HANDLE *token_handle, HANDLE existing_token_ *token_handle = NULL; return STATUS_SUCCESS; } + +/********************************************************************* + * ApiSetQueryApiSetPresence (NTDLL.@) + */ +BOOL WINAPI ApiSetQueryApiSetPresence(const UNICODE_STRING *namespace, BOOLEAN *present) +{ + FIXME("(%s, %p) stub!\n", debugstr_us(namespace), present); + + if(present) + *present = TRUE; + return TRUE; +} diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 003e4f9..5e7c463 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -3,6 +3,7 @@ #if you change a Nt.. function DON'T FORGET to change the #Zw one too. +@ stdcall ApiSetQueryApiSetPresence(ptr ptr) @ stub CsrAllocateCaptureBuffer @ stub CsrAllocateCapturePointer @ stub CsrAllocateMessagePointer -- 1.9.1

2 2

[PATCH v4 4/4] msftedit: Add tests for interfaces.
by Jactry Zeng 13 Sep '18

13 Sep '18

Superseded patch 151078. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- configure | 1 + configure.ac | 1 + dlls/msftedit/tests/Makefile.in | 5 + dlls/msftedit/tests/richole.c | 197 ++++++++++++++++++++++++++++++++ 4 files changed, 204 insertions(+) create mode 100644 dlls/msftedit/tests/Makefile.in create mode 100644 dlls/msftedit/tests/richole.c diff --git a/configure b/configure index a3916ee233..818cb40fce 100755 --- a/configure +++ b/configure @@ -19595,6 +19595,7 @@ wine_fn_config_makefile dlls/msdmo enable_msdmo wine_fn_config_makefile dlls/msdmo/tests enable_tests wine_fn_config_makefile dlls/msdrm enable_msdrm wine_fn_config_makefile dlls/msftedit enable_msftedit +wine_fn_config_makefile dlls/msftedit/tests enable_tests wine_fn_config_makefile dlls/msg711.acm enable_msg711_acm wine_fn_config_makefile dlls/msgsm32.acm enable_msgsm32_acm wine_fn_config_makefile dlls/mshtml.tlb enable_mshtml_tlb diff --git a/configure.ac b/configure.ac index 006f7d9fc2..605ad1690d 100644 --- a/configure.ac +++ b/configure.ac @@ -3451,6 +3451,7 @@ WINE_CONFIG_MAKEFILE(dlls/msdmo) WINE_CONFIG_MAKEFILE(dlls/msdmo/tests) WINE_CONFIG_MAKEFILE(dlls/msdrm) WINE_CONFIG_MAKEFILE(dlls/msftedit) +WINE_CONFIG_MAKEFILE(dlls/msftedit/tests) WINE_CONFIG_MAKEFILE(dlls/msg711.acm) WINE_CONFIG_MAKEFILE(dlls/msgsm32.acm) WINE_CONFIG_MAKEFILE(dlls/mshtml.tlb) diff --git a/dlls/msftedit/tests/Makefile.in b/dlls/msftedit/tests/Makefile.in new file mode 100644 index 0000000000..99cc46a007 --- /dev/null +++ b/dlls/msftedit/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = msftedit.dll +IMPORTS = ole32 oleaut32 user32 + +C_SRCS = \ + richole.c diff --git a/dlls/msftedit/tests/richole.c b/dlls/msftedit/tests/richole.c new file mode 100644 index 0000000000..1d336f1099 --- /dev/null +++ b/dlls/msftedit/tests/richole.c @@ -0,0 +1,197 @@ +/* + * Tests for IRichEditOle and friends. + * + * Copyright 2008 Google (Dan Hipschman) + * Copyright 2018 Jactry Zeng 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 <stdarg.h> + +#include <windef.h> +#include <winbase.h> +#include <initguid.h> +#include <ole2.h> +#include <richedit.h> +#include <richole.h> +#include <tom.h> +#include <wine/test.h> + +static HMODULE msftedit_hmodule; + +#define EXPECT_REF(obj,ref) _expect_ref((IUnknown*)obj, ref, __LINE__) +static void _expect_ref(IUnknown* obj, ULONG ref, int line) +{ + ULONG rc; + IUnknown_AddRef(obj); + rc = IUnknown_Release(obj); + ok_(__FILE__,line)(rc == ref, "expected refcount %d, got %d.\n", ref, rc); +} + +static HWND new_window(LPCWSTR classname, DWORD dwstyle, HWND parent) +{ + HWND hwnd = CreateWindowW(classname, NULL, + dwstyle | WS_POPUP | WS_HSCROLL | WS_VSCROLL | WS_VISIBLE, + 0, 0, 200, 60, parent, NULL, msftedit_hmodule, NULL); + ok(hwnd != NULL, "class: %s, error: %d.\n", wine_dbgstr_w(classname), (int) GetLastError()); + return hwnd; +} + +static void test_Interfaces(void) +{ + IRichEditOle *reole = NULL, *reole1 = NULL; + ITextDocument *txtdoc = NULL; + ITextDocument2Old *txtdoc2old = NULL; + ITextDocument2 *txtdoc2 = NULL; + ITextSelection *txtsel = NULL, *txtsel2; + IUnknown *punk; + HRESULT hres; + LRESULT res; + HWND hwnd; + ULONG refcount; + + hwnd = new_window(MSFTEDIT_CLASS, ES_MULTILINE, NULL); + if (!hwnd) + { + skip("Couldn't create window.\n"); + return; + } + + res = SendMessageA(hwnd, EM_GETOLEINTERFACE, 0, (LPARAM)&reole); + ok(res, "SendMessage\n"); + ok(reole != NULL, "EM_GETOLEINTERFACE\n"); + EXPECT_REF(reole, 2); + + res = SendMessageA(hwnd, EM_GETOLEINTERFACE, 0, (LPARAM)&reole1); + ok(res == 1, "SendMessage\n"); + ok(reole1 == reole, "Should not return a new IRichEditOle interface.\n"); + EXPECT_REF(reole, 3); + + hres = IRichEditOle_QueryInterface(reole, &IID_ITextDocument, (void **)&txtdoc); + ok(hres == S_OK, "IRichEditOle_QueryInterface failed: 0x%08x.\n", hres); + ok(txtdoc != NULL, "IRichEditOle_QueryInterface\n"); + + hres = ITextDocument_GetSelection(txtdoc, NULL); + ok(hres == E_INVALIDARG, "ITextDocument_GetSelection: 0x%08x.\n", hres); + + EXPECT_REF(txtdoc, 4); + + hres = ITextDocument_GetSelection(txtdoc, &txtsel); + ok(hres == S_OK, "ITextDocument_GetSelection failed 0x%08x.\n", hres); + + EXPECT_REF(txtdoc, 4); + EXPECT_REF(txtsel, 2); + + hres = ITextDocument_GetSelection(txtdoc, &txtsel2); + ok(hres == S_OK, "ITextDocument_GetSelection failed: 0x%08x.\n", hres); + ok(txtsel2 == txtsel, "got %p, %p\n", txtsel, txtsel2); + + EXPECT_REF(txtdoc, 4); + EXPECT_REF(txtsel, 3); + + ITextSelection_Release(txtsel2); + + punk = NULL; + hres = ITextSelection_QueryInterface(txtsel, &IID_ITextSelection, (void **)&punk); + ok(hres == S_OK, "ITextSelection_QueryInterface failed: 0x%08x.\n", hres); + ok(punk != NULL, "ITextSelection_QueryInterface\n"); + IUnknown_Release(punk); + + punk = NULL; + hres = ITextSelection_QueryInterface(txtsel, &IID_ITextRange, (void **)&punk); + ok(hres == S_OK, "ITextSelection_QueryInterface failed: 0x%08x.\n", hres); + ok(punk != NULL, "ITextSelection_QueryInterface\n"); + IUnknown_Release(punk); + + punk = NULL; + hres = ITextSelection_QueryInterface(txtsel, &IID_IDispatch, (void **)&punk); + ok(hres == S_OK, "ITextSelection_QueryInterface failed: 0x%08x.\n", hres); + ok(punk != NULL, "ITextSelection_QueryInterface\n"); + IUnknown_Release(punk); + + punk = NULL; + hres = IRichEditOle_QueryInterface(reole, &IID_IOleClientSite, (void **)&punk); + ok(hres == E_NOINTERFACE, "IRichEditOle_QueryInterface: 0x%08x.\n", hres); + + punk = NULL; + hres = IRichEditOle_QueryInterface(reole, &IID_IOleWindow, (void **)&punk); + ok(hres == E_NOINTERFACE, "IRichEditOle_QueryInterface: 0x%08x.\n", hres); + + punk = NULL; + hres = IRichEditOle_QueryInterface(reole, &IID_IOleInPlaceSite, (void **)&punk); + ok(hres == E_NOINTERFACE, "IRichEditOle_QueryInterface: 0x%08x.\n", hres); + + /* ITextDocument2 is implemented on msftedit after win8 for superseding ITextDocument2Old */ + hres = IRichEditOle_QueryInterface(reole, &IID_ITextDocument2, (void **)&txtdoc2); + ok(hres == S_OK || + hres == E_NOINTERFACE /* before win8 */, "IRichEditOle_QueryInterface: 0x%08x.\n", hres); + if (hres != E_NOINTERFACE) + { + ok(txtdoc2 != NULL, "IRichEditOle_QueryInterface\n"); + ok((ITextDocument *)txtdoc2 == txtdoc, "Interface pointer isn't equal.\n"); + EXPECT_REF(txtdoc2, 5); + EXPECT_REF(reole, 5); + + hres = ITextDocument2_QueryInterface(txtdoc2, &IID_ITextDocument2Old, (void **)&txtdoc2old); + ok(hres == S_OK, "ITextDocument2_QueryInterface failed: 0x%08x.\n", hres); + EXPECT_REF(txtdoc2, 5); + EXPECT_REF(reole, 5); + EXPECT_REF(txtdoc2old, 1); + ITextDocument2Old_Release(txtdoc2old); + ITextDocument2_Release(txtdoc2); + + hres = IRichEditOle_QueryInterface(reole, &IID_ITextDocument2Old, (void **)&txtdoc2old); + ok(hres == S_OK, "IRichEditOle_QueryInterface failed: 0x%08x.\n", hres); + ok(txtdoc2old != NULL, "IRichEditOle_QueryInterface\n"); + ok((ITextDocument *)txtdoc2old != txtdoc, "Interface pointer is equal.\n"); + EXPECT_REF(txtdoc2old, 1); + EXPECT_REF(reole, 4); + ITextDocument2Old_Release(txtdoc2old); + } + else + { + hres = IRichEditOle_QueryInterface(reole, &IID_ITextDocument2Old, (void **)&txtdoc2old); + ok(hres == S_OK, "IRichEditOle_QueryInterface failed: 0x%08x.\n", hres); + ok(txtdoc2old != NULL, "IRichEditOle_QueryInterface\n"); + ok((ITextDocument *)txtdoc2old == txtdoc, "Interface pointer is equal.\n"); + EXPECT_REF(txtdoc2old, 5); + EXPECT_REF(reole, 5); + ITextDocument2Old_Release(txtdoc2old); + } + + ITextDocument_Release(txtdoc); + IRichEditOle_Release(reole); + refcount = IRichEditOle_Release(reole); + ok(refcount == 1, "Got wrong ref count: %d.\n", refcount); + DestroyWindow(hwnd); + + /* Methods should return CO_E_RELEASED if the backing document has + been released. One test should suffice. */ + hres = ITextSelection_CanEdit(txtsel, NULL); + ok(hres == CO_E_RELEASED, "ITextSelection after ITextDocument destroyed\n"); + + ITextSelection_Release(txtsel); +} + +START_TEST(richole) +{ + msftedit_hmodule = LoadLibraryA("msftedit.dll"); + ok(msftedit_hmodule != NULL, "error: %d\n", (int) GetLastError()); + + test_Interfaces(); +} -- 2.18.0

1 0

[PATCH v3 3/4] riched20: Add IID_ITextDocument2Old support for ITextServices_QueryInterface().
by Jactry Zeng 13 Sep '18

13 Sep '18

Superseded patch 151077. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=20613 Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/riched20/tests/txtsrv.c | 34 ++++++++++++++++++++++++++++++++++ dlls/riched20/txtsrv.c | 5 +++-- 2 files changed, 37 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/tests/txtsrv.c b/dlls/riched20/tests/txtsrv.c index a8cf6ff1ad..1aa08f89a4 100644 --- a/dlls/riched20/tests/txtsrv.c +++ b/dlls/riched20/tests/txtsrv.c @@ -904,6 +904,7 @@ static void test_QueryInterface(void) HRESULT hres; IRichEditOle *reole, *txtsrv_reole; ITextDocument *txtdoc, *txtsrv_txtdoc; + ITextDocument2Old *txtdoc2old, *txtsrv_txtdoc2old; ULONG refcount; if(!init_texthost(&txtserv, &host)) @@ -930,6 +931,17 @@ static void test_QueryInterface(void) ITextDocument_Release(txtdoc); refcount = get_refcount((IUnknown *)txtserv); ok(refcount == 2, "got wrong ref count: %d\n", refcount); + + hres = IRichEditOle_QueryInterface(txtsrv_reole, &IID_ITextDocument2Old, (void **)&txtdoc2old); + ok(hres == S_OK, "IRichEditOle_QueryInterface: 0x%08x\n", hres); + refcount = get_refcount((IUnknown *)txtserv); + ok(refcount == 3, "got wrong ref count: %d\n", refcount); + refcount = get_refcount((IUnknown *)txtsrv_reole); + ok(refcount == 3, "got wrong ref count: %d\n", refcount); + + ITextDocument2Old_Release(txtdoc2old); + refcount = get_refcount((IUnknown *)txtserv); + ok(refcount == 2, "got wrong ref count: %d\n", refcount); IRichEditOle_Release(txtsrv_reole); refcount = get_refcount((IUnknown *)txtserv); ok(refcount == 1, "got wrong ref count: %d\n", refcount); @@ -956,6 +968,28 @@ static void test_QueryInterface(void) refcount = get_refcount((IUnknown *)txtserv); ok(refcount == 1, "got wrong ref count: %d\n", refcount); + /* ITextDocument2Old */ + hres = ITextServices_QueryInterface(txtserv, &IID_ITextDocument2Old, (void **)&txtsrv_txtdoc2old); + ok(hres == S_OK, "ITextServices_QueryInterface: 0x%08x\n", hres); + refcount = get_refcount((IUnknown *)txtserv); + ok(refcount == 2, "got wrong ref count: %d\n", refcount); + refcount = get_refcount((IUnknown *)txtsrv_txtdoc2old); + ok(refcount == 2, "got wrong ref count: %d\n", refcount); + + hres = ITextDocument2Old_QueryInterface(txtsrv_txtdoc2old, &IID_IRichEditOle, (void **)&reole); + ok(hres == S_OK, "ITextDocument2Old_QueryInterface: 0x%08x\n", hres); + refcount = get_refcount((IUnknown *)txtserv); + ok(refcount == 3, "got wrong ref count: %d\n", refcount); + refcount = get_refcount((IUnknown *)txtsrv_txtdoc2old); + ok(refcount == 3, "got wrong ref count: %d\n", refcount); + + IRichEditOle_Release(reole); + refcount = get_refcount((IUnknown *)txtserv); + ok(refcount == 2, "got wrong ref count: %d\n", refcount); + ITextDocument2Old_Release(txtsrv_txtdoc2old); + refcount = get_refcount((IUnknown *)txtserv); + ok(refcount == 1, "got wrong ref count: %d\n", refcount); + ITextServices_Release(txtserv); ITextHost_Release(host); } diff --git a/dlls/riched20/txtsrv.c b/dlls/riched20/txtsrv.c index 5ab3322e6b..cf957cff89 100644 --- a/dlls/riched20/txtsrv.c +++ b/dlls/riched20/txtsrv.c @@ -78,11 +78,12 @@ static HRESULT WINAPI ITextServicesImpl_QueryInterface(IUnknown *iface, REFIID r *ppv = &This->IUnknown_inner; else if (IsEqualIID(riid, &IID_ITextServices)) *ppv = &This->ITextServices_iface; - else if (IsEqualIID(riid, &IID_IRichEditOle) || IsEqualIID(riid, &IID_ITextDocument)) { + else if (IsEqualIID(riid, &IID_IRichEditOle) || IsEqualIID(riid, &IID_ITextDocument) || + IsEqualIID(riid, &IID_ITextDocument2Old)) { if (!This->editor->reOle) if (!CreateIRichEditOle(This->outer_unk, This->editor, (void **)(&This->editor->reOle))) return E_OUTOFMEMORY; - if (IsEqualIID(riid, &IID_ITextDocument)) + if (IsEqualIID(riid, &IID_ITextDocument) || IsEqualIID(riid, &IID_ITextDocument2Old)) ME_GetITextDocument2OldInterface(This->editor->reOle, ppv); else *ppv = This->editor->reOle; -- 2.18.0

1 0

[PATCH v3 1/4] include: Add ITextDocument2Old and ITextDocument2 interface.
by Jactry Zeng 13 Sep '18

13 Sep '18

Sorry for the spam. This fixed a test failure in [4/4]. Superseded patch 151075. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- include/tom.idl | 91 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 91 insertions(+) diff --git a/include/tom.idl b/include/tom.idl index 357b0457a5..afc24ca5fb 100644 --- a/include/tom.idl +++ b/include/tom.idl @@ -237,6 +237,97 @@ interface ITextDocument : IDispatch HRESULT RangeFromPoint([in]LONG x, [in]LONG y, [retval, out]ITextRange **ppRange); } +[ + object, + uuid(01C25500-4268-11D1-883A-3C8B00C10000) +] +interface ITextDocument2Old : ITextDocument +{ + HRESULT AttachMsgFilter([in]IUnknown *filter); + HRESULT SetEffectColor([in]LONG index, [in]COLORREF cr); + HRESULT GetEffectColor([in]LONG index, [out]COLORREF *cr); + HRESULT GetCaretType([retval, out]LONG *type); + HRESULT SetCaretType([in]LONG type); + HRESULT GetImmContext([retval, out]LONG *context); + HRESULT ReleaseImmContext([in]LONG context); + HRESULT GetPreferredFont([in]LONG cp, [in]LONG codepage, [in]LONG option, [in]LONG current_codepage, [in]LONG current_fontsize, + [out]BSTR *bstr, [out]LONG *pitch_family, [out]LONG *new_fontsize); + HRESULT GetNotificationMode([retval, out]LONG *mode); + HRESULT SetNotificationMode([in]LONG mode); + HRESULT GetClientRect([in]LONG type, [out]LONG *left, [out]LONG *top, [out]LONG *right, [out]LONG *bottom); + HRESULT GetSelectionEx([retval, out]ITextSelection **selection); + HRESULT GetWindow([out]LONG *hwnd); + HRESULT GetFEFlags([out]LONG *flags); + HRESULT UpdateWindow(); + HRESULT CheckTextLimit([in]LONG cch, [out]LONG *exceed); + HRESULT IMEInProgress([in]LONG mode); + HRESULT SysBeep(); + HRESULT Update([in]LONG mode); + HRESULT Notify([in]LONG notify); +} + +interface ITextDisplays; +interface ITextFont2; +interface ITextPara2; +interface ITextRange2; +interface ITextSelection2; +interface ITextStory; +interface ITextStoryRanges2; +interface ITextStrings; + +[ + object, + uuid(c241f5e0-7206-11d8-a2c7-00a0d1d6c6b3) +] +interface ITextDocument2 : ITextDocument +{ + HRESULT GetCaretType([retval, out]LONG *value); + HRESULT SetCaretType([in]LONG value); + HRESULT GetDisplays([retval, out]ITextDisplays **displays); + HRESULT GetDocumentFont([retval, out]ITextFont2 **font); + HRESULT SetDocumentFont([in]ITextFont2 *font); + HRESULT GetDocumentPara([retval, out]ITextPara2 **para); + HRESULT SetDocumentPara([in]ITextPara2 *para); + HRESULT GetEastAsianFlags([retval, out]LONG *flags); + HRESULT GetGenerator([retval, out]BSTR *bstr); + HRESULT SetIMEInProgress([in]LONG value); + HRESULT GetNotificationMode([retval, out]LONG *mode); + HRESULT SetNotificationMode([in]LONG mode); + HRESULT GetSelection2([retval, out]ITextSelection2 **selection); + HRESULT GetStoryRanges2([retval, out]ITextStoryRanges2 **stories); + HRESULT GetTypographyOptions([retval, out]LONG *options); + HRESULT GetVersion([retval, out]LONG *value); + HRESULT GetWindow([retval, out]LONG *hwnd); + HRESULT AttachMsgFilter([in]IUnknown *filter); + HRESULT CheckTextLimit([in]LONG cch, [out]LONG *exceed); + HRESULT GetCallManager([retval, out]IUnknown **manager); + HRESULT GetClientRect([in]LONG type, [out]LONG *left, [out]LONG *top, [out]LONG *right, [out]LONG *bottom); + HRESULT GetEffectColor([in]LONG index, [out]COLORREF *cr); + HRESULT GetImmContext([retval, out]LONG *context); + HRESULT GetPreferredFont([in]LONG cp, [in]LONG codepage, [in]LONG option, [in]LONG current_codepage, [in]LONG current_fontsize, + [out]BSTR *bstr, [out]LONG *pitch_family, [out]LONG *new_fontsize); + HRESULT GetProperty([in]LONG type, [out]LONG *value); + HRESULT GetStrings([out]ITextStrings **strings); + HRESULT Notify([in]LONG notify); + HRESULT Range2([in]LONG cp_active, [in]LONG cp_anchor, [retval, out]ITextRange2 **range); + HRESULT RangeFromPoint2([in]LONG x, [in]LONG y, [in]LONG type, [retval, out]ITextRange2 **range); + HRESULT ReleaseCallManager([in]IUnknown *manager); + HRESULT ReleaseImmContext([in]LONG context); + HRESULT SetEffectColor([in]LONG index, [in]LONG value); + HRESULT SetProperty([in]LONG type, [in]LONG value); + HRESULT SetTypographyOptions([in]LONG options, [in]LONG mask); + HRESULT SysBeep(); + HRESULT Update([in]LONG value); + HRESULT UpdateWindow(); + HRESULT GetMathProperties([out]LONG *options); + HRESULT SetMathProperties([in]LONG options, [in]LONG mask); + HRESULT GetActiveStory([retval, out]ITextStory **story); + HRESULT SetActiveStory([in]ITextStory *story); + HRESULT GetMainStory([retval, out]ITextStory **story); + HRESULT GetNewStory([retval, out]ITextStory **story); + HRESULT GetStory([in]LONG index, [retval, out]ITextStory **story); +} + interface ITextFont; interface ITextPara; -- 2.18.0

1 0

[PATCH v3 4/4] msftedit: Add tests for interfaces.
by Jactry Zeng 13 Sep '18

13 Sep '18

Superseded patch 150978. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- configure | 1 + configure.ac | 1 + dlls/msftedit/tests/Makefile.in | 5 + dlls/msftedit/tests/richole.c | 198 ++++++++++++++++++++++++++++++++ 4 files changed, 205 insertions(+) create mode 100644 dlls/msftedit/tests/Makefile.in create mode 100644 dlls/msftedit/tests/richole.c diff --git a/configure b/configure index a3916ee233..818cb40fce 100755 --- a/configure +++ b/configure @@ -19595,6 +19595,7 @@ wine_fn_config_makefile dlls/msdmo enable_msdmo wine_fn_config_makefile dlls/msdmo/tests enable_tests wine_fn_config_makefile dlls/msdrm enable_msdrm wine_fn_config_makefile dlls/msftedit enable_msftedit +wine_fn_config_makefile dlls/msftedit/tests enable_tests wine_fn_config_makefile dlls/msg711.acm enable_msg711_acm wine_fn_config_makefile dlls/msgsm32.acm enable_msgsm32_acm wine_fn_config_makefile dlls/mshtml.tlb enable_mshtml_tlb diff --git a/configure.ac b/configure.ac index 006f7d9fc2..605ad1690d 100644 --- a/configure.ac +++ b/configure.ac @@ -3451,6 +3451,7 @@ WINE_CONFIG_MAKEFILE(dlls/msdmo) WINE_CONFIG_MAKEFILE(dlls/msdmo/tests) WINE_CONFIG_MAKEFILE(dlls/msdrm) WINE_CONFIG_MAKEFILE(dlls/msftedit) +WINE_CONFIG_MAKEFILE(dlls/msftedit/tests) WINE_CONFIG_MAKEFILE(dlls/msg711.acm) WINE_CONFIG_MAKEFILE(dlls/msgsm32.acm) WINE_CONFIG_MAKEFILE(dlls/mshtml.tlb) diff --git a/dlls/msftedit/tests/Makefile.in b/dlls/msftedit/tests/Makefile.in new file mode 100644 index 0000000000..99cc46a007 --- /dev/null +++ b/dlls/msftedit/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = msftedit.dll +IMPORTS = ole32 oleaut32 user32 + +C_SRCS = \ + richole.c diff --git a/dlls/msftedit/tests/richole.c b/dlls/msftedit/tests/richole.c new file mode 100644 index 0000000000..1f0db4b7e4 --- /dev/null +++ b/dlls/msftedit/tests/richole.c @@ -0,0 +1,198 @@ +/* + * Tests for IRichEditOle and friends. + * + * Copyright 2008 Google (Dan Hipschman) + * Copyright 2018 Jactry Zeng 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 <stdarg.h> + +#include <windef.h> +#include <winbase.h> +#include <initguid.h> +#include <ole2.h> +#include <richedit.h> +#include <richole.h> +#include <tom.h> +#include <wine/test.h> + +static HMODULE msftedit_hmodule; + +#define EXPECT_REF(obj,ref) _expect_ref((IUnknown*)obj, ref, __LINE__) +static void _expect_ref(IUnknown* obj, ULONG ref, int line) +{ + ULONG rc; + IUnknown_AddRef(obj); + rc = IUnknown_Release(obj); + ok_(__FILE__,line)(rc == ref, "expected refcount %d, got %d.\n", ref, rc); +} + +static HWND new_window(LPCWSTR classname, DWORD dwstyle, HWND parent) +{ + HWND hwnd = CreateWindowW(classname, NULL, + dwstyle | WS_POPUP | WS_HSCROLL | WS_VSCROLL | WS_VISIBLE, + 0, 0, 200, 60, parent, NULL, msftedit_hmodule, NULL); + ok(hwnd != NULL, "class: %s, error: %d.\n", wine_dbgstr_w(classname), (int) GetLastError()); + return hwnd; +} + +static void test_Interfaces(void) +{ + IRichEditOle *reole = NULL, *reole1 = NULL; + ITextDocument *txtdoc = NULL; + ITextDocument2Old *txtdoc2old = NULL; + ITextDocument2 *txtdoc2 = NULL; + ITextSelection *txtsel = NULL, *txtsel2; + IUnknown *punk; + HRESULT hres; + LRESULT res; + HWND hwnd; + ULONG refcount; + + hwnd = new_window(MSFTEDIT_CLASS, ES_MULTILINE, NULL); + if (!hwnd) + { + skip("Couldn't create window.\n"); + return; + } + + res = SendMessageA(hwnd, EM_GETOLEINTERFACE, 0, (LPARAM)&reole); + ok(res, "SendMessage\n"); + ok(reole != NULL, "EM_GETOLEINTERFACE\n"); + EXPECT_REF(reole, 2); + + res = SendMessageA(hwnd, EM_GETOLEINTERFACE, 0, (LPARAM)&reole1); + ok(res == 1, "SendMessage\n"); + ok(reole1 == reole, "Should not return a new IRichEditOle interface.\n"); + EXPECT_REF(reole, 3); + IRichEditOle_Release(reole1); + + hres = IRichEditOle_QueryInterface(reole, &IID_ITextDocument, (void **)&txtdoc); + ok(hres == S_OK, "IRichEditOle_QueryInterface failed: 0x%08x.\n", hres); + ok(txtdoc != NULL, "IRichEditOle_QueryInterface\n"); + + hres = ITextDocument_GetSelection(txtdoc, NULL); + ok(hres == E_INVALIDARG, "ITextDocument_GetSelection: 0x%08x.\n", hres); + + EXPECT_REF(txtdoc, 3); + + hres = ITextDocument_GetSelection(txtdoc, &txtsel); + ok(hres == S_OK, "ITextDocument_GetSelection failed 0x%08x.\n", hres); + + EXPECT_REF(txtdoc, 3); + EXPECT_REF(txtsel, 2); + + hres = ITextDocument_GetSelection(txtdoc, &txtsel2); + ok(hres == S_OK, "ITextDocument_GetSelection failed: 0x%08x.\n", hres); + ok(txtsel2 == txtsel, "got %p, %p\n", txtsel, txtsel2); + + EXPECT_REF(txtdoc, 3); + EXPECT_REF(txtsel, 3); + + ITextSelection_Release(txtsel2); + + punk = NULL; + hres = ITextSelection_QueryInterface(txtsel, &IID_ITextSelection, (void **)&punk); + ok(hres == S_OK, "ITextSelection_QueryInterface failed: 0x%08x.\n", hres); + ok(punk != NULL, "ITextSelection_QueryInterface\n"); + IUnknown_Release(punk); + + punk = NULL; + hres = ITextSelection_QueryInterface(txtsel, &IID_ITextRange, (void **)&punk); + ok(hres == S_OK, "ITextSelection_QueryInterface failed: 0x%08x.\n", hres); + ok(punk != NULL, "ITextSelection_QueryInterface\n"); + IUnknown_Release(punk); + + punk = NULL; + hres = ITextSelection_QueryInterface(txtsel, &IID_IDispatch, (void **)&punk); + ok(hres == S_OK, "ITextSelection_QueryInterface failed: 0x%08x.\n", hres); + ok(punk != NULL, "ITextSelection_QueryInterface\n"); + IUnknown_Release(punk); + + punk = NULL; + hres = IRichEditOle_QueryInterface(reole, &IID_IOleClientSite, (void **)&punk); + ok(hres == E_NOINTERFACE, "IRichEditOle_QueryInterface: 0x%08x.\n", hres); + + punk = NULL; + hres = IRichEditOle_QueryInterface(reole, &IID_IOleWindow, (void **)&punk); + ok(hres == E_NOINTERFACE, "IRichEditOle_QueryInterface: 0x%08x.\n", hres); + + punk = NULL; + hres = IRichEditOle_QueryInterface(reole, &IID_IOleInPlaceSite, (void **)&punk); + ok(hres == E_NOINTERFACE, "IRichEditOle_QueryInterface: 0x%08x.\n", hres); + + /* ITextDocument2 is implemented on msftedit after win8 for superseding ITextDocument2Old */ + hres = IRichEditOle_QueryInterface(reole, &IID_ITextDocument2, (void **)&txtdoc2); + ok(hres == S_OK || + hres == E_NOINTERFACE /* before win8 */, "IRichEditOle_QueryInterface: 0x%08x.\n", hres); + if (hres != E_NOINTERFACE) + { + ok(txtdoc2 != NULL, "IRichEditOle_QueryInterface\n"); + ok((ITextDocument *)txtdoc2 == txtdoc, "Interface pointer isn't equal.\n"); + EXPECT_REF(txtdoc2, 4); + EXPECT_REF(reole, 4); + + hres = ITextDocument2_QueryInterface(txtdoc2, &IID_ITextDocument2Old, (void **)&txtdoc2old); + ok(hres == S_OK, "ITextDocument2_QueryInterface failed: 0x%08x.\n", hres); + EXPECT_REF(txtdoc2, 4); + EXPECT_REF(reole, 4); + EXPECT_REF(txtdoc2old, 1); + ITextDocument2Old_Release(txtdoc2old); + ITextDocument2_Release(txtdoc2); + + hres = IRichEditOle_QueryInterface(reole, &IID_ITextDocument2Old, (void **)&txtdoc2old); + ok(hres == S_OK, "IRichEditOle_QueryInterface failed: 0x%08x.\n", hres); + ok(txtdoc2old != NULL, "IRichEditOle_QueryInterface\n"); + ok((ITextDocument *)txtdoc2old != txtdoc, "Interface pointer is equal.\n"); + EXPECT_REF(txtdoc2old, 1); + EXPECT_REF(reole, 3); + ITextDocument2Old_Release(txtdoc2old); + } + else + { + hres = IRichEditOle_QueryInterface(reole, &IID_ITextDocument2Old, (void **)&txtdoc2old); + ok(hres == S_OK, "IRichEditOle_QueryInterface failed: 0x%08x.\n", hres); + ok(txtdoc2old != NULL, "IRichEditOle_QueryInterface\n"); + ok((ITextDocument *)txtdoc2old == txtdoc, "Interface pointer is equal.\n"); + EXPECT_REF(txtdoc2old, 4); + EXPECT_REF(reole, 4); + ITextDocument2Old_Release(txtdoc2old); + } + + ITextDocument_Release(txtdoc); + IRichEditOle_Release(reole); + refcount = IRichEditOle_Release(reole); + ok(refcount == 0, "Got wrong ref count: %d.\n", refcount); + DestroyWindow(hwnd); + + /* Methods should return CO_E_RELEASED if the backing document has + been released. One test should suffice. */ + hres = ITextSelection_CanEdit(txtsel, NULL); + ok(hres == CO_E_RELEASED, "ITextSelection after ITextDocument destroyed\n"); + + ITextSelection_Release(txtsel); +} + +START_TEST(richole) +{ + msftedit_hmodule = LoadLibraryA("msftedit.dll"); + ok(msftedit_hmodule != NULL, "error: %d\n", (int) GetLastError()); + + test_Interfaces(); +} -- 2.18.0

2 1

[PATCH v3 3/4] riched20: Add IID_ITextDocument2Old support for ITextServices_QueryInterface().
by Jactry Zeng 13 Sep '18

13 Sep '18

Superseded patch 150977. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=20613 Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/riched20/tests/txtsrv.c | 34 ++++++++++++++++++++++++++++++++++ dlls/riched20/txtsrv.c | 5 +++-- 2 files changed, 37 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/tests/txtsrv.c b/dlls/riched20/tests/txtsrv.c index a8cf6ff1ad..1aa08f89a4 100644 --- a/dlls/riched20/tests/txtsrv.c +++ b/dlls/riched20/tests/txtsrv.c @@ -904,6 +904,7 @@ static void test_QueryInterface(void) HRESULT hres; IRichEditOle *reole, *txtsrv_reole; ITextDocument *txtdoc, *txtsrv_txtdoc; + ITextDocument2Old *txtdoc2old, *txtsrv_txtdoc2old; ULONG refcount; if(!init_texthost(&txtserv, &host)) @@ -930,6 +931,17 @@ static void test_QueryInterface(void) ITextDocument_Release(txtdoc); refcount = get_refcount((IUnknown *)txtserv); ok(refcount == 2, "got wrong ref count: %d\n", refcount); + + hres = IRichEditOle_QueryInterface(txtsrv_reole, &IID_ITextDocument2Old, (void **)&txtdoc2old); + ok(hres == S_OK, "IRichEditOle_QueryInterface: 0x%08x\n", hres); + refcount = get_refcount((IUnknown *)txtserv); + ok(refcount == 3, "got wrong ref count: %d\n", refcount); + refcount = get_refcount((IUnknown *)txtsrv_reole); + ok(refcount == 3, "got wrong ref count: %d\n", refcount); + + ITextDocument2Old_Release(txtdoc2old); + refcount = get_refcount((IUnknown *)txtserv); + ok(refcount == 2, "got wrong ref count: %d\n", refcount); IRichEditOle_Release(txtsrv_reole); refcount = get_refcount((IUnknown *)txtserv); ok(refcount == 1, "got wrong ref count: %d\n", refcount); @@ -956,6 +968,28 @@ static void test_QueryInterface(void) refcount = get_refcount((IUnknown *)txtserv); ok(refcount == 1, "got wrong ref count: %d\n", refcount); + /* ITextDocument2Old */ + hres = ITextServices_QueryInterface(txtserv, &IID_ITextDocument2Old, (void **)&txtsrv_txtdoc2old); + ok(hres == S_OK, "ITextServices_QueryInterface: 0x%08x\n", hres); + refcount = get_refcount((IUnknown *)txtserv); + ok(refcount == 2, "got wrong ref count: %d\n", refcount); + refcount = get_refcount((IUnknown *)txtsrv_txtdoc2old); + ok(refcount == 2, "got wrong ref count: %d\n", refcount); + + hres = ITextDocument2Old_QueryInterface(txtsrv_txtdoc2old, &IID_IRichEditOle, (void **)&reole); + ok(hres == S_OK, "ITextDocument2Old_QueryInterface: 0x%08x\n", hres); + refcount = get_refcount((IUnknown *)txtserv); + ok(refcount == 3, "got wrong ref count: %d\n", refcount); + refcount = get_refcount((IUnknown *)txtsrv_txtdoc2old); + ok(refcount == 3, "got wrong ref count: %d\n", refcount); + + IRichEditOle_Release(reole); + refcount = get_refcount((IUnknown *)txtserv); + ok(refcount == 2, "got wrong ref count: %d\n", refcount); + ITextDocument2Old_Release(txtsrv_txtdoc2old); + refcount = get_refcount((IUnknown *)txtserv); + ok(refcount == 1, "got wrong ref count: %d\n", refcount); + ITextServices_Release(txtserv); ITextHost_Release(host); } diff --git a/dlls/riched20/txtsrv.c b/dlls/riched20/txtsrv.c index 5ab3322e6b..cf957cff89 100644 --- a/dlls/riched20/txtsrv.c +++ b/dlls/riched20/txtsrv.c @@ -78,11 +78,12 @@ static HRESULT WINAPI ITextServicesImpl_QueryInterface(IUnknown *iface, REFIID r *ppv = &This->IUnknown_inner; else if (IsEqualIID(riid, &IID_ITextServices)) *ppv = &This->ITextServices_iface; - else if (IsEqualIID(riid, &IID_IRichEditOle) || IsEqualIID(riid, &IID_ITextDocument)) { + else if (IsEqualIID(riid, &IID_IRichEditOle) || IsEqualIID(riid, &IID_ITextDocument) || + IsEqualIID(riid, &IID_ITextDocument2Old)) { if (!This->editor->reOle) if (!CreateIRichEditOle(This->outer_unk, This->editor, (void **)(&This->editor->reOle))) return E_OUTOFMEMORY; - if (IsEqualIID(riid, &IID_ITextDocument)) + if (IsEqualIID(riid, &IID_ITextDocument) || IsEqualIID(riid, &IID_ITextDocument2Old)) ME_GetITextDocument2OldInterface(This->editor->reOle, ppv); else *ppv = This->editor->reOle; -- 2.18.0

1 0

[PATCH v3 2/4] riched20: Add stub for ITextDocument2Old interface.
by Jactry Zeng 13 Sep '18

13 Sep '18

Superseded patch 150976. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/riched20/editor.h | 2 +- dlls/riched20/richole.c | 445 ++++++++++++++++++++++++---------- dlls/riched20/tests/richole.c | 9 + dlls/riched20/txtsrv.c | 2 +- 4 files changed, 325 insertions(+), 133 deletions(-) diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 141c63aca9..eba6d35fc7 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -233,7 +233,7 @@ void ME_DrawOLE(ME_Context *c, int x, int y, ME_Run* run, BOOL selected) DECLSPE void ME_GetOLEObjectSize(const ME_Context *c, ME_Run *run, SIZE *pSize) DECLSPEC_HIDDEN; void ME_CopyReObject(REOBJECT *dst, const REOBJECT *src, DWORD flags) DECLSPEC_HIDDEN; void ME_DeleteReObject(struct re_object *re_object) DECLSPEC_HIDDEN; -void ME_GetITextDocumentInterface(IRichEditOle *iface, LPVOID *ppvObj) DECLSPEC_HIDDEN; +void ME_GetITextDocument2OldInterface(IRichEditOle *iface, LPVOID *ppvObj) DECLSPEC_HIDDEN; /* editor.c */ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 11b9920b57..8d43ce6ce1 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -46,6 +46,7 @@ DEFINE_GUID(IID_ITextServices, 0x8d33f740, 0xcf58, 0x11ce, 0xa8, 0x9d, 0x00, 0xa DEFINE_GUID(IID_ITextHost, 0x13e670f4,0x1a5a,0x11cf,0xab,0xeb,0x00,0xaa,0x00,0xb6,0x5e,0xa1); DEFINE_GUID(IID_ITextHost2, 0x13e670f5,0x1a5a,0x11cf,0xab,0xeb,0x00,0xaa,0x00,0xb6,0x5e,0xa1); DEFINE_GUID(IID_ITextDocument, 0x8cc497c0, 0xa1df, 0x11ce, 0x80, 0x98, 0x00, 0xaa, 0x00, 0x47, 0xbe, 0x5d); +DEFINE_GUID(IID_ITextDocument2Old, 0x01c25500, 0x4268, 0x11d1, 0x88, 0x3a, 0x3c, 0x8b, 0x00, 0xc1, 0x00, 0x00); DEFINE_GUID(IID_ITextRange, 0x8cc497c2, 0xa1df, 0x11ce, 0x80, 0x98, 0x00, 0xaa, 0x00, 0x47, 0xbe, 0x5d); DEFINE_GUID(IID_ITextSelection, 0x8cc497c1, 0xa1df, 0x11ce, 0x80, 0x98, 0x00, 0xaa, 0x00, 0x47, 0xbe, 0x5d); DEFINE_GUID(IID_ITextFont, 0x8cc497c3, 0xa1df, 0x11ce, 0x80, 0x98, 0x00, 0xaa, 0x00, 0x47, 0xbe, 0x5d); @@ -55,7 +56,7 @@ static ITypeLib *typelib; enum tid_t { NULL_tid, - ITextDocument_tid, + ITextDocument2Old_tid, ITextRange_tid, ITextSelection_tid, ITextFont_tid, @@ -66,7 +67,7 @@ enum tid_t { static const IID * const tid_ids[] = { &IID_NULL, - &IID_ITextDocument, + &IID_ITextDocument2Old, &IID_ITextRange, &IID_ITextSelection, &IID_ITextFont, @@ -208,7 +209,7 @@ enum range_update_op { typedef struct IRichEditOleImpl { IUnknown IUnknown_inner; IRichEditOle IRichEditOle_iface; - ITextDocument ITextDocument_iface; + ITextDocument2Old ITextDocument2Old_iface; IUnknown *outer_unk; LONG ref; @@ -267,9 +268,9 @@ static inline IRichEditOleImpl *impl_from_IRichEditOle(IRichEditOle *iface) return CONTAINING_RECORD(iface, IRichEditOleImpl, IRichEditOle_iface); } -static inline IRichEditOleImpl *impl_from_ITextDocument(ITextDocument *iface) +static inline IRichEditOleImpl *impl_from_ITextDocument2Old(ITextDocument2Old *iface) { - return CONTAINING_RECORD(iface, IRichEditOleImpl, ITextDocument_iface); + return CONTAINING_RECORD(iface, IRichEditOleImpl, ITextDocument2Old_iface); } static inline IRichEditOleImpl *impl_from_IUnknown(IUnknown *iface) @@ -943,8 +944,8 @@ static HRESULT WINAPI IRichEditOleImpl_inner_fnQueryInterface(IUnknown *iface, R *ppvObj = &This->IUnknown_inner; else if (IsEqualGUID(riid, &IID_IRichEditOle)) *ppvObj = &This->IRichEditOle_iface; - else if (IsEqualGUID(riid, &IID_ITextDocument)) - *ppvObj = &This->ITextDocument_iface; + else if (IsEqualGUID(riid, &IID_ITextDocument) || IsEqualGUID(riid, &IID_ITextDocument2Old)) + *ppvObj = &This->ITextDocument2Old_iface; if (*ppvObj) { IUnknown_AddRef((IUnknown *)*ppvObj); @@ -3859,76 +3860,71 @@ static HRESULT create_textpara(ITextRange *range, ITextPara **ret) } /* ITextDocument */ -static HRESULT WINAPI -ITextDocument_fnQueryInterface(ITextDocument* me, REFIID riid, - void** ppvObject) +static HRESULT WINAPI ITextDocument2Old_fnQueryInterface(ITextDocument2Old* iface, REFIID riid, + void **ppvObject) { - IRichEditOleImpl *This = impl_from_ITextDocument(me); + IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); return IRichEditOle_QueryInterface(&This->IRichEditOle_iface, riid, ppvObject); } -static ULONG WINAPI -ITextDocument_fnAddRef(ITextDocument* me) +static ULONG WINAPI ITextDocument2Old_fnAddRef(ITextDocument2Old *iface) { - IRichEditOleImpl *This = impl_from_ITextDocument(me); + IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); return IRichEditOle_AddRef(&This->IRichEditOle_iface); } -static ULONG WINAPI -ITextDocument_fnRelease(ITextDocument* me) +static ULONG WINAPI ITextDocument2Old_fnRelease(ITextDocument2Old *iface) { - IRichEditOleImpl *This = impl_from_ITextDocument(me); + IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); return IRichEditOle_Release(&This->IRichEditOle_iface); } -static HRESULT WINAPI -ITextDocument_fnGetTypeInfoCount(ITextDocument* me, - UINT* pctinfo) +static HRESULT WINAPI ITextDocument2Old_fnGetTypeInfoCount(ITextDocument2Old *iface, + UINT *pctinfo) { - IRichEditOleImpl *This = impl_from_ITextDocument(me); + IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); TRACE("(%p)->(%p)\n", This, pctinfo); *pctinfo = 1; return S_OK; } -static HRESULT WINAPI -ITextDocument_fnGetTypeInfo(ITextDocument* me, UINT iTInfo, LCID lcid, - ITypeInfo** ppTInfo) +static HRESULT WINAPI ITextDocument2Old_fnGetTypeInfo(ITextDocument2Old *iface, UINT iTInfo, LCID lcid, + ITypeInfo **ppTInfo) { - IRichEditOleImpl *This = impl_from_ITextDocument(me); + IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); HRESULT hr; TRACE("(%p)->(%u,%d,%p)\n", This, iTInfo, lcid, ppTInfo); - hr = get_typeinfo(ITextDocument_tid, ppTInfo); + hr = get_typeinfo(ITextDocument2Old_tid, ppTInfo); if (SUCCEEDED(hr)) ITypeInfo_AddRef(*ppTInfo); return hr; } -static HRESULT WINAPI -ITextDocument_fnGetIDsOfNames(ITextDocument* me, REFIID riid, - LPOLESTR* rgszNames, UINT cNames, LCID lcid, DISPID* rgDispId) +static HRESULT WINAPI ITextDocument2Old_fnGetIDsOfNames(ITextDocument2Old *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, + LCID lcid, DISPID *rgDispId) { - IRichEditOleImpl *This = impl_from_ITextDocument(me); + IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); ITypeInfo *ti; HRESULT hr; TRACE("(%p)->(%s, %p, %u, %d, %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); - hr = get_typeinfo(ITextDocument_tid, &ti); + hr = get_typeinfo(ITextDocument2Old_tid, &ti); if (SUCCEEDED(hr)) hr = ITypeInfo_GetIDsOfNames(ti, rgszNames, cNames, rgDispId); return hr; } -static HRESULT WINAPI -ITextDocument_fnInvoke(ITextDocument* me, DISPID dispIdMember, - REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS* pDispParams, - VARIANT* pVarResult, EXCEPINFO* pExcepInfo, UINT* puArgErr) +static HRESULT WINAPI ITextDocument2Old_fnInvoke(ITextDocument2Old *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, + DISPPARAMS *pDispParams, VARIANT *pVarResult, + EXCEPINFO *pExcepInfo, UINT *puArgErr) { - IRichEditOleImpl *This = impl_from_ITextDocument(me); + IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); ITypeInfo *ti; HRESULT hr; @@ -3936,26 +3932,24 @@ ITextDocument_fnInvoke(ITextDocument* me, DISPID dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); - hr = get_typeinfo(ITextDocument_tid, &ti); + hr = get_typeinfo(ITextDocument2Old_tid, &ti); if (SUCCEEDED(hr)) - hr = ITypeInfo_Invoke(ti, me, dispIdMember, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); + hr = ITypeInfo_Invoke(ti, iface, dispIdMember, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); return hr; } -static HRESULT WINAPI -ITextDocument_fnGetName(ITextDocument* me, BSTR* pName) +static HRESULT WINAPI ITextDocument2Old_fnGetName(ITextDocument2Old *iface, BSTR *pName) { - IRichEditOleImpl *This = impl_from_ITextDocument(me); + IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); FIXME("stub %p\n",This); return E_NOTIMPL; } -static HRESULT WINAPI -ITextDocument_fnGetSelection(ITextDocument *me, ITextSelection **selection) +static HRESULT WINAPI ITextDocument2Old_fnGetSelection(ITextDocument2Old *iface, ITextSelection **selection) { - IRichEditOleImpl *This = impl_from_ITextDocument(me); + IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); - TRACE("(%p)->(%p)\n", me, selection); + TRACE("(%p)->(%p)\n", iface, selection); if (!selection) return E_INVALIDARG; @@ -3973,125 +3967,110 @@ ITextDocument_fnGetSelection(ITextDocument *me, ITextSelection **selection) return S_OK; } -static HRESULT WINAPI -ITextDocument_fnGetStoryCount(ITextDocument* me, LONG* pCount) +static HRESULT WINAPI ITextDocument2Old_fnGetStoryCount(ITextDocument2Old *iface, LONG *pCount) { - IRichEditOleImpl *This = impl_from_ITextDocument(me); + IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); FIXME("stub %p\n",This); return E_NOTIMPL; } -static HRESULT WINAPI -ITextDocument_fnGetStoryRanges(ITextDocument* me, - ITextStoryRanges** ppStories) +static HRESULT WINAPI ITextDocument2Old_fnGetStoryRanges(ITextDocument2Old *iface, + ITextStoryRanges **ppStories) { - IRichEditOleImpl *This = impl_from_ITextDocument(me); + IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); FIXME("stub %p\n",This); return E_NOTIMPL; } -static HRESULT WINAPI -ITextDocument_fnGetSaved(ITextDocument* me, LONG* pValue) +static HRESULT WINAPI ITextDocument2Old_fnGetSaved(ITextDocument2Old *iface, LONG *pValue) { - IRichEditOleImpl *This = impl_from_ITextDocument(me); + IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); FIXME("stub %p\n",This); return E_NOTIMPL; } -static HRESULT WINAPI -ITextDocument_fnSetSaved(ITextDocument* me, LONG Value) +static HRESULT WINAPI ITextDocument2Old_fnSetSaved(ITextDocument2Old *iface, LONG Value) { - IRichEditOleImpl *This = impl_from_ITextDocument(me); + IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); FIXME("stub %p\n",This); return E_NOTIMPL; } -static HRESULT WINAPI -ITextDocument_fnGetDefaultTabStop(ITextDocument* me, float* pValue) +static HRESULT WINAPI ITextDocument2Old_fnGetDefaultTabStop(ITextDocument2Old *iface, float *pValue) { - IRichEditOleImpl *This = impl_from_ITextDocument(me); + IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); FIXME("stub %p\n",This); return E_NOTIMPL; } -static HRESULT WINAPI -ITextDocument_fnSetDefaultTabStop(ITextDocument* me, float Value) +static HRESULT WINAPI ITextDocument2Old_fnSetDefaultTabStop(ITextDocument2Old *iface, float Value) { - IRichEditOleImpl *This = impl_from_ITextDocument(me); + IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); FIXME("stub %p\n",This); return E_NOTIMPL; } -static HRESULT WINAPI -ITextDocument_fnNew(ITextDocument* me) +static HRESULT WINAPI ITextDocument2Old_fnNew(ITextDocument2Old *iface) { - IRichEditOleImpl *This = impl_from_ITextDocument(me); + IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); FIXME("stub %p\n",This); return E_NOTIMPL; } -static HRESULT WINAPI -ITextDocument_fnOpen(ITextDocument* me, VARIANT* pVar, LONG Flags, - LONG CodePage) +static HRESULT WINAPI ITextDocument2Old_fnOpen(ITextDocument2Old *iface, VARIANT *pVar, + LONG Flags, LONG CodePage) { - IRichEditOleImpl *This = impl_from_ITextDocument(me); + IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); FIXME("stub %p\n",This); return E_NOTIMPL; } -static HRESULT WINAPI -ITextDocument_fnSave(ITextDocument* me, VARIANT* pVar, LONG Flags, - LONG CodePage) +static HRESULT WINAPI ITextDocument2Old_fnSave(ITextDocument2Old *iface, VARIANT *pVar, + LONG Flags, LONG CodePage) { - IRichEditOleImpl *This = impl_from_ITextDocument(me); + IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); FIXME("stub %p\n",This); return E_NOTIMPL; } -static HRESULT WINAPI -ITextDocument_fnFreeze(ITextDocument* me, LONG* pCount) +static HRESULT WINAPI ITextDocument2Old_fnFreeze(ITextDocument2Old *iface, LONG *pCount) { - IRichEditOleImpl *This = impl_from_ITextDocument(me); + IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); FIXME("stub %p\n",This); return E_NOTIMPL; } -static HRESULT WINAPI -ITextDocument_fnUnfreeze(ITextDocument* me, LONG* pCount) +static HRESULT WINAPI ITextDocument2Old_fnUnfreeze(ITextDocument2Old *iface, LONG *pCount) { - IRichEditOleImpl *This = impl_from_ITextDocument(me); + IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); FIXME("stub %p\n",This); return E_NOTIMPL; } -static HRESULT WINAPI -ITextDocument_fnBeginEditCollection(ITextDocument* me) +static HRESULT WINAPI ITextDocument2Old_fnBeginEditCollection(ITextDocument2Old *iface) { - IRichEditOleImpl *This = impl_from_ITextDocument(me); + IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); FIXME("stub %p\n",This); return E_NOTIMPL; } -static HRESULT WINAPI -ITextDocument_fnEndEditCollection(ITextDocument* me) +static HRESULT WINAPI ITextDocument2Old_fnEndEditCollection(ITextDocument2Old *iface) { - IRichEditOleImpl *This = impl_from_ITextDocument(me); + IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); FIXME("stub %p\n",This); return E_NOTIMPL; } -static HRESULT WINAPI -ITextDocument_fnUndo(ITextDocument* me, LONG Count, LONG* prop) +static HRESULT WINAPI ITextDocument2Old_fnUndo(ITextDocument2Old *iface, LONG Count, LONG *prop) { - IRichEditOleImpl *This = impl_from_ITextDocument(me); + IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); FIXME("stub %p\n",This); return E_NOTIMPL; } -static HRESULT WINAPI -ITextDocument_fnRedo(ITextDocument* me, LONG Count, LONG* prop) +static HRESULT WINAPI ITextDocument2Old_fnRedo(ITextDocument2Old *iface, LONG Count, LONG *prop) { - IRichEditOleImpl *This = impl_from_ITextDocument(me); + IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); FIXME("stub %p\n",This); return E_NOTIMPL; } @@ -4112,11 +4091,10 @@ static HRESULT CreateITextRange(IRichEditOleImpl *reOle, LONG start, LONG end, I return S_OK; } -static HRESULT WINAPI -ITextDocument_fnRange(ITextDocument* me, LONG cp1, LONG cp2, - ITextRange** ppRange) +static HRESULT WINAPI ITextDocument2Old_fnRange(ITextDocument2Old *iface, LONG cp1, LONG cp2, + ITextRange **ppRange) { - IRichEditOleImpl *This = impl_from_ITextDocument(me); + IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); const int len = ME_GetTextLength(This->editor) + 1; TRACE("%p %p %d %d\n", This, ppRange, cp1, cp2); @@ -4140,42 +4118,247 @@ ITextDocument_fnRange(ITextDocument* me, LONG cp1, LONG cp2, return CreateITextRange(This, cp1, cp2, ppRange); } -static HRESULT WINAPI -ITextDocument_fnRangeFromPoint(ITextDocument* me, LONG x, LONG y, - ITextRange** ppRange) +static HRESULT WINAPI ITextDocument2Old_fnRangeFromPoint(ITextDocument2Old *iface, LONG x, LONG y, + ITextRange **ppRange) { - IRichEditOleImpl *This = impl_from_ITextDocument(me); + IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); FIXME("stub %p\n",This); return E_NOTIMPL; } -static const ITextDocumentVtbl tdvt = { - ITextDocument_fnQueryInterface, - ITextDocument_fnAddRef, - ITextDocument_fnRelease, - ITextDocument_fnGetTypeInfoCount, - ITextDocument_fnGetTypeInfo, - ITextDocument_fnGetIDsOfNames, - ITextDocument_fnInvoke, - ITextDocument_fnGetName, - ITextDocument_fnGetSelection, - ITextDocument_fnGetStoryCount, - ITextDocument_fnGetStoryRanges, - ITextDocument_fnGetSaved, - ITextDocument_fnSetSaved, - ITextDocument_fnGetDefaultTabStop, - ITextDocument_fnSetDefaultTabStop, - ITextDocument_fnNew, - ITextDocument_fnOpen, - ITextDocument_fnSave, - ITextDocument_fnFreeze, - ITextDocument_fnUnfreeze, - ITextDocument_fnBeginEditCollection, - ITextDocument_fnEndEditCollection, - ITextDocument_fnUndo, - ITextDocument_fnRedo, - ITextDocument_fnRange, - ITextDocument_fnRangeFromPoint +/* ITextDocument2Old methods */ +static HRESULT WINAPI ITextDocument2Old_fnAttachMsgFilter(ITextDocument2Old *iface, IUnknown *filter) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); + + FIXME("(%p)->(%p): stub\n", This, filter); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextDocument2Old_fnSetEffectColor(ITextDocument2Old *iface, LONG index, COLORREF cr) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); + + FIXME("(%p)->(%d, 0x%x): stub\n", This, index, cr); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextDocument2Old_fnGetEffectColor(ITextDocument2Old *iface, LONG index, COLORREF *cr) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); + + FIXME("(%p)->(%d, %p): stub\n", This, index, cr); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextDocument2Old_fnGetCaretType(ITextDocument2Old *iface, LONG *type) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); + + FIXME("(%p)->(%p): stub\n", This, type); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextDocument2Old_fnSetCaretType(ITextDocument2Old *iface, LONG type) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); + + FIXME("(%p)->(%d): stub\n", This, type); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextDocument2Old_fnGetImmContext(ITextDocument2Old *iface, LONG *context) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); + + FIXME("(%p)->(%p): stub\n", This, context); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextDocument2Old_fnReleaseImmContext(ITextDocument2Old *iface, LONG context) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); + + FIXME("(%p)->(%d): stub\n", This, context); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextDocument2Old_fnGetPreferredFont(ITextDocument2Old *iface, LONG cp, LONG charrep, + LONG options, LONG current_charrep, LONG current_fontsize, + BSTR *bstr, LONG *pitch_family, LONG *new_fontsize) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); + + FIXME("(%p)->(%d, %d, %d, %d, %d, %p, %p, %p): stub\n", This, cp, charrep, options, current_charrep, + current_fontsize, bstr, pitch_family, new_fontsize); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextDocument2Old_fnGetNotificationMode(ITextDocument2Old *iface, LONG *mode) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); + + FIXME("(%p)->(%p): stub\n", This, mode); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextDocument2Old_fnSetNotificationMode(ITextDocument2Old *iface, LONG mode) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); + + FIXME("(%p)->(0x%x): stub\n", This, mode); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextDocument2Old_fnGetClientRect(ITextDocument2Old *iface, LONG type, LONG *left, LONG *top, + LONG *right, LONG *bottom) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); + + FIXME("(%p)->(%d, %p, %p, %p, %p): stub\n", This, type, left, top, right, bottom); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextDocument2Old_fnGetSelectionEx(ITextDocument2Old *iface, ITextSelection **selection) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); + + FIXME("(%p)->(%p): stub\n", This, selection); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextDocument2Old_fnGetWindow(ITextDocument2Old *iface, LONG *hwnd) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); + + FIXME("(%p)->(%p): stub\n", This, hwnd); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextDocument2Old_fnGetFEFlags(ITextDocument2Old *iface, LONG *flags) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); + + FIXME("(%p)->(%p): stub\n", This, flags); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextDocument2Old_fnUpdateWindow(ITextDocument2Old *iface) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); + + FIXME("(%p): stub\n", This); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextDocument2Old_fnCheckTextLimit(ITextDocument2Old *iface, LONG cch, LONG *exceed) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); + + FIXME("(%p)->(%d, %p): stub\n", This, cch, exceed); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextDocument2Old_fnIMEInProgress(ITextDocument2Old *iface, LONG mode) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); + + FIXME("(%p)->(0x%x): stub\n", This, mode); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextDocument2Old_fnSysBeep(ITextDocument2Old *iface) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); + + FIXME("(%p): stub\n", This); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextDocument2Old_fnUpdate(ITextDocument2Old *iface, LONG mode) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); + + FIXME("(%p)->(0x%x): stub\n", This, mode); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextDocument2Old_fnNotify(ITextDocument2Old *iface, LONG notify) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); + + FIXME("(%p)->(%d): stub\n", This, notify); + + return E_NOTIMPL; +} + +static const ITextDocument2OldVtbl tdvt = { + ITextDocument2Old_fnQueryInterface, + ITextDocument2Old_fnAddRef, + ITextDocument2Old_fnRelease, + ITextDocument2Old_fnGetTypeInfoCount, + ITextDocument2Old_fnGetTypeInfo, + ITextDocument2Old_fnGetIDsOfNames, + ITextDocument2Old_fnInvoke, + ITextDocument2Old_fnGetName, + ITextDocument2Old_fnGetSelection, + ITextDocument2Old_fnGetStoryCount, + ITextDocument2Old_fnGetStoryRanges, + ITextDocument2Old_fnGetSaved, + ITextDocument2Old_fnSetSaved, + ITextDocument2Old_fnGetDefaultTabStop, + ITextDocument2Old_fnSetDefaultTabStop, + ITextDocument2Old_fnNew, + ITextDocument2Old_fnOpen, + ITextDocument2Old_fnSave, + ITextDocument2Old_fnFreeze, + ITextDocument2Old_fnUnfreeze, + ITextDocument2Old_fnBeginEditCollection, + ITextDocument2Old_fnEndEditCollection, + ITextDocument2Old_fnUndo, + ITextDocument2Old_fnRedo, + ITextDocument2Old_fnRange, + ITextDocument2Old_fnRangeFromPoint, + /* ITextDocument2Old methods */ + ITextDocument2Old_fnAttachMsgFilter, + ITextDocument2Old_fnSetEffectColor, + ITextDocument2Old_fnGetEffectColor, + ITextDocument2Old_fnGetCaretType, + ITextDocument2Old_fnSetCaretType, + ITextDocument2Old_fnGetImmContext, + ITextDocument2Old_fnReleaseImmContext, + ITextDocument2Old_fnGetPreferredFont, + ITextDocument2Old_fnGetNotificationMode, + ITextDocument2Old_fnSetNotificationMode, + ITextDocument2Old_fnGetClientRect, + ITextDocument2Old_fnGetSelectionEx, + ITextDocument2Old_fnGetWindow, + ITextDocument2Old_fnGetFEFlags, + ITextDocument2Old_fnUpdateWindow, + ITextDocument2Old_fnCheckTextLimit, + ITextDocument2Old_fnIMEInProgress, + ITextDocument2Old_fnSysBeep, + ITextDocument2Old_fnUpdate, + ITextDocument2Old_fnNotify }; /* ITextSelection */ @@ -5276,7 +5459,7 @@ LRESULT CreateIRichEditOle(IUnknown *outer_unk, ME_TextEditor *editor, LPVOID *p reo->IUnknown_inner.lpVtbl = &reo_unk_vtbl; reo->IRichEditOle_iface.lpVtbl = &revt; - reo->ITextDocument_iface.lpVtbl = &tdvt; + reo->ITextDocument2Old_iface.lpVtbl = &tdvt; reo->ref = 1; reo->editor = editor; reo->txtSel = NULL; @@ -5509,8 +5692,8 @@ void ME_CopyReObject(REOBJECT *dst, const REOBJECT *src, DWORD flags) } } -void ME_GetITextDocumentInterface(IRichEditOle *iface, LPVOID *ppvObj) +void ME_GetITextDocument2OldInterface(IRichEditOle *iface, LPVOID *ppvObj) { IRichEditOleImpl *This = impl_from_IRichEditOle(iface); - *ppvObj = &This->ITextDocument_iface; + *ppvObj = &This->ITextDocument2Old_iface; } diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index aaf52bcfdd..3e42047a57 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -117,6 +117,7 @@ static void test_Interfaces(void) { IRichEditOle *reOle = NULL, *reOle1 = NULL; ITextDocument *txtDoc = NULL; + ITextDocument2Old *txtDoc2Old = NULL; ITextSelection *txtSel = NULL, *txtSel2; IUnknown *punk; HRESULT hres; @@ -195,6 +196,14 @@ static void test_Interfaces(void) hres = IRichEditOle_QueryInterface(reOle, &IID_IOleInPlaceSite, (void **) &punk); ok(hres == E_NOINTERFACE, "IRichEditOle_QueryInterface\n"); + hres = IRichEditOle_QueryInterface(reOle, &IID_ITextDocument2Old, (void **)&txtDoc2Old); + ok(hres == S_OK, "IRichEditOle_QueryInterface\n"); + ok(txtDoc2Old != NULL, "IRichEditOle_QueryInterface\n"); + ok((ITextDocument *)txtDoc2Old == txtDoc, "interface pointer isn't equal.\n"); + EXPECT_REF(txtDoc2Old, 5); + EXPECT_REF(reOle, 5); + ITextDocument2Old_Release(txtDoc2Old); + ITextDocument_Release(txtDoc); IRichEditOle_Release(reOle); refcount = IRichEditOle_Release(reOle); diff --git a/dlls/riched20/txtsrv.c b/dlls/riched20/txtsrv.c index ee65621b1d..5ab3322e6b 100644 --- a/dlls/riched20/txtsrv.c +++ b/dlls/riched20/txtsrv.c @@ -83,7 +83,7 @@ static HRESULT WINAPI ITextServicesImpl_QueryInterface(IUnknown *iface, REFIID r if (!CreateIRichEditOle(This->outer_unk, This->editor, (void **)(&This->editor->reOle))) return E_OUTOFMEMORY; if (IsEqualIID(riid, &IID_ITextDocument)) - ME_GetITextDocumentInterface(This->editor->reOle, ppv); + ME_GetITextDocument2OldInterface(This->editor->reOle, ppv); else *ppv = This->editor->reOle; } else { -- 2.18.0

1 0

[PATCH v3 1/4] include: Add ITextDocument2Old and ITextDocument2 interface.
by Jactry Zeng 13 Sep '18

13 Sep '18

Superseded patch 150975. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- include/tom.idl | 91 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 91 insertions(+) diff --git a/include/tom.idl b/include/tom.idl index 357b0457a5..afc24ca5fb 100644 --- a/include/tom.idl +++ b/include/tom.idl @@ -237,6 +237,97 @@ interface ITextDocument : IDispatch HRESULT RangeFromPoint([in]LONG x, [in]LONG y, [retval, out]ITextRange **ppRange); } +[ + object, + uuid(01C25500-4268-11D1-883A-3C8B00C10000) +] +interface ITextDocument2Old : ITextDocument +{ + HRESULT AttachMsgFilter([in]IUnknown *filter); + HRESULT SetEffectColor([in]LONG index, [in]COLORREF cr); + HRESULT GetEffectColor([in]LONG index, [out]COLORREF *cr); + HRESULT GetCaretType([retval, out]LONG *type); + HRESULT SetCaretType([in]LONG type); + HRESULT GetImmContext([retval, out]LONG *context); + HRESULT ReleaseImmContext([in]LONG context); + HRESULT GetPreferredFont([in]LONG cp, [in]LONG codepage, [in]LONG option, [in]LONG current_codepage, [in]LONG current_fontsize, + [out]BSTR *bstr, [out]LONG *pitch_family, [out]LONG *new_fontsize); + HRESULT GetNotificationMode([retval, out]LONG *mode); + HRESULT SetNotificationMode([in]LONG mode); + HRESULT GetClientRect([in]LONG type, [out]LONG *left, [out]LONG *top, [out]LONG *right, [out]LONG *bottom); + HRESULT GetSelectionEx([retval, out]ITextSelection **selection); + HRESULT GetWindow([out]LONG *hwnd); + HRESULT GetFEFlags([out]LONG *flags); + HRESULT UpdateWindow(); + HRESULT CheckTextLimit([in]LONG cch, [out]LONG *exceed); + HRESULT IMEInProgress([in]LONG mode); + HRESULT SysBeep(); + HRESULT Update([in]LONG mode); + HRESULT Notify([in]LONG notify); +} + +interface ITextDisplays; +interface ITextFont2; +interface ITextPara2; +interface ITextRange2; +interface ITextSelection2; +interface ITextStory; +interface ITextStoryRanges2; +interface ITextStrings; + +[ + object, + uuid(c241f5e0-7206-11d8-a2c7-00a0d1d6c6b3) +] +interface ITextDocument2 : ITextDocument +{ + HRESULT GetCaretType([retval, out]LONG *value); + HRESULT SetCaretType([in]LONG value); + HRESULT GetDisplays([retval, out]ITextDisplays **displays); + HRESULT GetDocumentFont([retval, out]ITextFont2 **font); + HRESULT SetDocumentFont([in]ITextFont2 *font); + HRESULT GetDocumentPara([retval, out]ITextPara2 **para); + HRESULT SetDocumentPara([in]ITextPara2 *para); + HRESULT GetEastAsianFlags([retval, out]LONG *flags); + HRESULT GetGenerator([retval, out]BSTR *bstr); + HRESULT SetIMEInProgress([in]LONG value); + HRESULT GetNotificationMode([retval, out]LONG *mode); + HRESULT SetNotificationMode([in]LONG mode); + HRESULT GetSelection2([retval, out]ITextSelection2 **selection); + HRESULT GetStoryRanges2([retval, out]ITextStoryRanges2 **stories); + HRESULT GetTypographyOptions([retval, out]LONG *options); + HRESULT GetVersion([retval, out]LONG *value); + HRESULT GetWindow([retval, out]LONG *hwnd); + HRESULT AttachMsgFilter([in]IUnknown *filter); + HRESULT CheckTextLimit([in]LONG cch, [out]LONG *exceed); + HRESULT GetCallManager([retval, out]IUnknown **manager); + HRESULT GetClientRect([in]LONG type, [out]LONG *left, [out]LONG *top, [out]LONG *right, [out]LONG *bottom); + HRESULT GetEffectColor([in]LONG index, [out]COLORREF *cr); + HRESULT GetImmContext([retval, out]LONG *context); + HRESULT GetPreferredFont([in]LONG cp, [in]LONG codepage, [in]LONG option, [in]LONG current_codepage, [in]LONG current_fontsize, + [out]BSTR *bstr, [out]LONG *pitch_family, [out]LONG *new_fontsize); + HRESULT GetProperty([in]LONG type, [out]LONG *value); + HRESULT GetStrings([out]ITextStrings **strings); + HRESULT Notify([in]LONG notify); + HRESULT Range2([in]LONG cp_active, [in]LONG cp_anchor, [retval, out]ITextRange2 **range); + HRESULT RangeFromPoint2([in]LONG x, [in]LONG y, [in]LONG type, [retval, out]ITextRange2 **range); + HRESULT ReleaseCallManager([in]IUnknown *manager); + HRESULT ReleaseImmContext([in]LONG context); + HRESULT SetEffectColor([in]LONG index, [in]LONG value); + HRESULT SetProperty([in]LONG type, [in]LONG value); + HRESULT SetTypographyOptions([in]LONG options, [in]LONG mask); + HRESULT SysBeep(); + HRESULT Update([in]LONG value); + HRESULT UpdateWindow(); + HRESULT GetMathProperties([out]LONG *options); + HRESULT SetMathProperties([in]LONG options, [in]LONG mask); + HRESULT GetActiveStory([retval, out]ITextStory **story); + HRESULT SetActiveStory([in]ITextStory *story); + HRESULT GetMainStory([retval, out]ITextStory **story); + HRESULT GetNewStory([retval, out]ITextStory **story); + HRESULT GetStory([in]LONG index, [retval, out]ITextStory **story); +} + interface ITextFont; interface ITextPara; -- 2.18.0

1 0

[PATCH v2] mpr: Implement WNetClearConnections().
by Pierre Schweitzer 13 Sep '18

13 Sep '18

Hi, Please find attached the v2 of the patch. It's only cosmetic changes related to documentation linked in the associated Wine bug report. Cheers, Pierre -- Pierre Schweitzer <pierre at reactos.org> System & Network Administrator Senior Kernel Developer ReactOS Deutschland e.V.

2 3

[PATCH 1/6] opcservices/tests: Fix uninitialized variable access (Valgrind).
by Nikolay Sivov 13 Sep '18

13 Sep '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/opcservices/tests/opcservices.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/opcservices/tests/opcservices.c b/dlls/opcservices/tests/opcservices.c index f6194609ed..a9c25a5924 100644 --- a/dlls/opcservices/tests/opcservices.c +++ b/dlls/opcservices/tests/opcservices.c @@ -518,7 +518,7 @@ static void test_rel_part_uri(void) IOpcPartUri *rel_uri2; IOpcUri *source_uri2; IUnknown *unk = NULL; - BOOL ret; + BOOL ret = FALSE; BSTR str; hr = IOpcPartUri_GetSourceUri(rel_uri, &source_uri); -- 2.18.0

1 5

[PATCH] wine.inf: Add TCP/IP DataBasePath value
by Alex Henrie 13 Sep '18

13 Sep '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45821 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- loader/wine.inf.in | 1 + 1 file changed, 1 insertion(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index f10284bedc..e1f7bc386c 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -3417,6 +3417,7 @@ HKLM,%CurrentVersion%\RunServices,"winemenubuilder",2,"%11%\winemenubuilder.exe HKLM,"System\CurrentControlSet\Services\Eventlog\Application",,16 HKLM,"System\CurrentControlSet\Services\Eventlog\System","Sources",0x10000,"" HKLM,"System\CurrentControlSet\Services\Tcpip\Parameters",,16 +HKLM,"System\CurrentControlSet\Services\Tcpip\Parameters","DataBasePath",2,"%SystemRoot%\System32\drivers" HKLM,"System\CurrentControlSet\Services\VxD\MSTCP",,16 HKLM,"System\CurrentControlSet\Services\Winsock\Parameters",,16 HKLM,"System\CurrentControlSet\Services\Winsock2\Parameters\Protocol_Catalog9\Catalog_Entries",,16 -- 2.19.0

1 0

[PATCH 2/2] mfplat: Implement MFCreateSample
by Alistair Leslie-Hughes 12 Sep '18

12 Sep '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45617 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/mfplat/main.c | 443 +++++++++++++++++++++++++++++++++++++++++++++ dlls/mfplat/mfplat.spec | 2 +- dlls/mfplat/tests/mfplat.c | 17 ++ include/mfapi.h | 1 + 4 files changed, 462 insertions(+), 1 deletion(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index ff04429..de3926f 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -2349,3 +2349,446 @@ HRESULT WINAPI MFCreateMemoryBuffer(DWORD max_length, IMFMediaBuffer **buffer) return S_OK; } + +typedef struct _mfsample +{ + mfattributes attributes; + IMFSample IMFSample_iface; +} mfsample; + +static inline mfsample *impl_from_IMFSample(IMFSample *iface) +{ + return CONTAINING_RECORD(iface, mfsample, IMFSample_iface); +} + +static HRESULT WINAPI mfsample_QueryInterface(IMFSample *iface, REFIID riid, void **out) +{ + mfsample *This = impl_from_IMFSample(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), out); + + if(IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_IMFAttributes) || + IsEqualGUID(riid, &IID_IMFSample)) + { + *out = &This->IMFSample_iface; + } + else + { + FIXME("(%s, %p)\n", debugstr_guid(riid), out); + *out = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*out); + return S_OK; +} + +static ULONG WINAPI mfsample_AddRef(IMFSample *iface) +{ + mfsample *This = impl_from_IMFSample(iface); + ULONG ref = InterlockedIncrement(&This->attributes.ref); + + TRACE("(%p) ref=%u\n", This, ref); + + return ref; +} + +static ULONG WINAPI mfsample_Release(IMFSample *iface) +{ + mfsample *This = impl_from_IMFSample(iface); + ULONG ref = InterlockedDecrement(&This->attributes.ref); + + TRACE("(%p) ref=%u\n", This, ref); + + if (!ref) + { + heap_free(This); + } + + return ref; +} + +static HRESULT WINAPI mfsample_GetItem(IMFSample *iface, REFGUID key, PROPVARIANT *value) +{ + mfsample *This = impl_from_IMFSample(iface); + return IMFAttributes_GetItem(&This->attributes.IMFAttributes_iface, key, value); +} + +static HRESULT WINAPI mfsample_GetItemType(IMFSample *iface, REFGUID key, MF_ATTRIBUTE_TYPE *type) +{ + mfsample *This = impl_from_IMFSample(iface); + return IMFAttributes_GetItemType(&This->attributes.IMFAttributes_iface, key, type); +} + +static HRESULT WINAPI mfsample_CompareItem(IMFSample *iface, REFGUID key, REFPROPVARIANT value, BOOL *result) +{ + mfsample *This = impl_from_IMFSample(iface); + return IMFAttributes_CompareItem(&This->attributes.IMFAttributes_iface, key, value, result); +} + +static HRESULT WINAPI mfsample_Compare(IMFSample *iface, IMFAttributes *theirs, MF_ATTRIBUTES_MATCH_TYPE type, + BOOL *result) +{ + mfsample *This = impl_from_IMFSample(iface); + return IMFAttributes_Compare(&This->attributes.IMFAttributes_iface, theirs, type, result); +} + +static HRESULT WINAPI mfsample_GetUINT32(IMFSample *iface, REFGUID key, UINT32 *value) +{ + mfsample *This = impl_from_IMFSample(iface); + return IMFAttributes_GetUINT32(&This->attributes.IMFAttributes_iface, key, value); +} + +static HRESULT WINAPI mfsample_GetUINT64(IMFSample *iface, REFGUID key, UINT64 *value) +{ + mfsample *This = impl_from_IMFSample(iface); + return IMFAttributes_GetUINT64(&This->attributes.IMFAttributes_iface, key, value); +} + +static HRESULT WINAPI mfsample_GetDouble(IMFSample *iface, REFGUID key, double *value) +{ + mfsample *This = impl_from_IMFSample(iface); + return IMFAttributes_GetDouble(&This->attributes.IMFAttributes_iface, key, value); +} + +static HRESULT WINAPI mfsample_GetGUID(IMFSample *iface, REFGUID key, GUID *value) +{ + mfsample *This = impl_from_IMFSample(iface); + return IMFAttributes_GetGUID(&This->attributes.IMFAttributes_iface, key, value); +} + +static HRESULT WINAPI mfsample_GetStringLength(IMFSample *iface, REFGUID key, UINT32 *length) +{ + mfsample *This = impl_from_IMFSample(iface); + return IMFAttributes_GetStringLength(&This->attributes.IMFAttributes_iface, key, length); +} + +static HRESULT WINAPI mfsample_GetString(IMFSample *iface, REFGUID key, WCHAR *value, + UINT32 size, UINT32 *length) +{ + mfsample *This = impl_from_IMFSample(iface); + return IMFAttributes_GetString(&This->attributes.IMFAttributes_iface, key, value, size, length); +} + +static HRESULT WINAPI mfsample_GetAllocatedString(IMFSample *iface, REFGUID key, + WCHAR **value, UINT32 *length) +{ + mfsample *This = impl_from_IMFSample(iface); + return IMFAttributes_GetAllocatedString(&This->attributes.IMFAttributes_iface, key, value, length); +} + +static HRESULT WINAPI mfsample_GetBlobSize(IMFSample *iface, REFGUID key, UINT32 *size) +{ + mfsample *This = impl_from_IMFSample(iface); + return IMFAttributes_GetBlobSize(&This->attributes.IMFAttributes_iface, key, size); +} + +static HRESULT WINAPI mfsample_GetBlob(IMFSample *iface, REFGUID key, UINT8 *buf, + UINT32 bufsize, UINT32 *blobsize) +{ + mfsample *This = impl_from_IMFSample(iface); + return IMFAttributes_GetBlob(&This->attributes.IMFAttributes_iface, key, buf, bufsize, blobsize); +} + +static HRESULT WINAPI mfsample_GetAllocatedBlob(IMFSample *iface, REFGUID key, UINT8 **buf, UINT32 *size) +{ + mfsample *This = impl_from_IMFSample(iface); + return IMFAttributes_GetAllocatedBlob(&This->attributes.IMFAttributes_iface, key, buf, size); +} + +static HRESULT WINAPI mfsample_GetUnknown(IMFSample *iface, REFGUID key, REFIID riid, void **ppv) +{ + mfsample *This = impl_from_IMFSample(iface); + return IMFAttributes_GetUnknown(&This->attributes.IMFAttributes_iface, key, riid, ppv); +} + +static HRESULT WINAPI mfsample_SetItem(IMFSample *iface, REFGUID key, REFPROPVARIANT value) +{ + mfsample *This = impl_from_IMFSample(iface); + return IMFAttributes_SetItem(&This->attributes.IMFAttributes_iface, key, value); +} + +static HRESULT WINAPI mfsample_DeleteItem(IMFSample *iface, REFGUID key) +{ + mfsample *This = impl_from_IMFSample(iface); + return IMFAttributes_DeleteItem(&This->attributes.IMFAttributes_iface, key); +} + +static HRESULT WINAPI mfsample_DeleteAllItems(IMFSample *iface) +{ + mfsample *This = impl_from_IMFSample(iface); + return IMFAttributes_DeleteAllItems(&This->attributes.IMFAttributes_iface); +} + +static HRESULT WINAPI mfsample_SetUINT32(IMFSample *iface, REFGUID key, UINT32 value) +{ + mfsample *This = impl_from_IMFSample(iface); + return IMFAttributes_SetUINT32(&This->attributes.IMFAttributes_iface, key, value); +} + +static HRESULT WINAPI mfsample_SetUINT64(IMFSample *iface, REFGUID key, UINT64 value) +{ + mfsample *This = impl_from_IMFSample(iface); + return IMFAttributes_SetUINT64(&This->attributes.IMFAttributes_iface, key, value); +} + +static HRESULT WINAPI mfsample_SetDouble(IMFSample *iface, REFGUID key, double value) +{ + mfsample *This = impl_from_IMFSample(iface); + return IMFAttributes_SetDouble(&This->attributes.IMFAttributes_iface, key, value); +} + +static HRESULT WINAPI mfsample_SetGUID(IMFSample *iface, REFGUID key, REFGUID value) +{ + mfsample *This = impl_from_IMFSample(iface); + return IMFAttributes_SetGUID(&This->attributes.IMFAttributes_iface, key, value); +} + +static HRESULT WINAPI mfsample_SetString(IMFSample *iface, REFGUID key, const WCHAR *value) +{ + mfsample *This = impl_from_IMFSample(iface); + return IMFAttributes_SetString(&This->attributes.IMFAttributes_iface, key, value); +} + +static HRESULT WINAPI mfsample_SetBlob(IMFSample *iface, REFGUID key, const UINT8 *buf, UINT32 size) +{ + mfsample *This = impl_from_IMFSample(iface); + return IMFAttributes_SetBlob(&This->attributes.IMFAttributes_iface, key, buf, size); +} + +static HRESULT WINAPI mfsample_SetUnknown(IMFSample *iface, REFGUID key, IUnknown *unknown) +{ + mfsample *This = impl_from_IMFSample(iface); + return IMFAttributes_SetUnknown(&This->attributes.IMFAttributes_iface, key, unknown); +} + +static HRESULT WINAPI mfsample_LockStore(IMFSample *iface) +{ + mfsample *This = impl_from_IMFSample(iface); + return IMFAttributes_LockStore(&This->attributes.IMFAttributes_iface); +} + +static HRESULT WINAPI mfsample_UnlockStore(IMFSample *iface) +{ + mfsample *This = impl_from_IMFSample(iface); + return IMFAttributes_UnlockStore(&This->attributes.IMFAttributes_iface); +} + +static HRESULT WINAPI mfsample_GetCount(IMFSample *iface, UINT32 *items) +{ + mfsample *This = impl_from_IMFSample(iface); + return IMFAttributes_GetCount(&This->attributes.IMFAttributes_iface, items); +} + +static HRESULT WINAPI mfsample_GetItemByIndex(IMFSample *iface, UINT32 index, GUID *key, PROPVARIANT *value) +{ + mfsample *This = impl_from_IMFSample(iface); + return IMFAttributes_GetItemByIndex(&This->attributes.IMFAttributes_iface, index, key, value); +} + +static HRESULT WINAPI mfsample_CopyAllItems(IMFSample *iface, IMFAttributes *dest) +{ + mfsample *This = impl_from_IMFSample(iface); + + FIXME("%p, %p\n", This, dest); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfsample_GetSampleFlags(IMFSample *iface, DWORD *flags) +{ + mfsample *This = impl_from_IMFSample(iface); + + FIXME("%p, %p\n", This, flags); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfsample_SetSampleFlags(IMFSample *iface, DWORD flags) +{ + mfsample *This = impl_from_IMFSample(iface); + + FIXME("%p, %x\n", This, flags); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfsample_GetSampleTime(IMFSample *iface, LONGLONG *sampletime) +{ + mfsample *This = impl_from_IMFSample(iface); + + FIXME("%p, %p\n", This, sampletime); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfsample_SetSampleTime(IMFSample *iface, LONGLONG sampletime) +{ + mfsample *This = impl_from_IMFSample(iface); + + FIXME("%p, %s\n", This, wine_dbgstr_longlong(sampletime)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfsample_GetSampleDuration(IMFSample *iface, LONGLONG *duration) +{ + mfsample *This = impl_from_IMFSample(iface); + + FIXME("%p, %p\n", This, duration); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfsample_SetSampleDuration(IMFSample *iface, LONGLONG duration) +{ + mfsample *This = impl_from_IMFSample(iface); + + FIXME("%p, %s\n", This, wine_dbgstr_longlong(duration)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfsample_GetBufferCount(IMFSample *iface, DWORD *count) +{ + mfsample *This = impl_from_IMFSample(iface); + + FIXME("%p, %p\n", This, count); + + if(*count) + *count = 0; + + return S_OK; +} + +static HRESULT WINAPI mfsample_GetBufferByIndex(IMFSample *iface, DWORD index, IMFMediaBuffer **buffer) +{ + mfsample *This = impl_from_IMFSample(iface); + + FIXME("%p, %u, %p\n", This, index, buffer); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfsample_ConvertToContiguousBuffer(IMFSample *iface, IMFMediaBuffer **buffer) +{ + mfsample *This = impl_from_IMFSample(iface); + + FIXME("%p, %p\n", This, buffer); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfsample_AddBuffer(IMFSample *iface, IMFMediaBuffer *buffer) +{ + mfsample *This = impl_from_IMFSample(iface); + + FIXME("%p, %p\n", This, buffer); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfsample_RemoveBufferByIndex(IMFSample *iface, DWORD index) +{ + mfsample *This = impl_from_IMFSample(iface); + + FIXME("%p, %u\n", This, index); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfsample_RemoveAllBuffers(IMFSample *iface) +{ + mfsample *This = impl_from_IMFSample(iface); + + FIXME("%p\n", This); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfsample_GetTotalLength(IMFSample *iface, DWORD *length) +{ + mfsample *This = impl_from_IMFSample(iface); + + FIXME("%p, %p\n", This, length); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfsample_CopyToBuffer(IMFSample *iface, IMFMediaBuffer *buffer) +{ + mfsample *This = impl_from_IMFSample(iface); + + FIXME("%p, %p\n", This, buffer); + + return E_NOTIMPL; +} + +static const IMFSampleVtbl mfsample_vtbl = +{ + mfsample_QueryInterface, + mfsample_AddRef, + mfsample_Release, + mfsample_GetItem, + mfsample_GetItemType, + mfsample_CompareItem, + mfsample_Compare, + mfsample_GetUINT32, + mfsample_GetUINT64, + mfsample_GetDouble, + mfsample_GetGUID, + mfsample_GetStringLength, + mfsample_GetString, + mfsample_GetAllocatedString, + mfsample_GetBlobSize, + mfsample_GetBlob, + mfsample_GetAllocatedBlob, + mfsample_GetUnknown, + mfsample_SetItem, + mfsample_DeleteItem, + mfsample_DeleteAllItems, + mfsample_SetUINT32, + mfsample_SetUINT64, + mfsample_SetDouble, + mfsample_SetGUID, + mfsample_SetString, + mfsample_SetBlob, + mfsample_SetUnknown, + mfsample_LockStore, + mfsample_UnlockStore, + mfsample_GetCount, + mfsample_GetItemByIndex, + mfsample_CopyAllItems, + mfsample_GetSampleFlags, + mfsample_SetSampleFlags, + mfsample_GetSampleTime, + mfsample_SetSampleTime, + mfsample_GetSampleDuration, + mfsample_SetSampleDuration, + mfsample_GetBufferCount, + mfsample_GetBufferByIndex, + mfsample_ConvertToContiguousBuffer, + mfsample_AddBuffer, + mfsample_RemoveBufferByIndex, + mfsample_RemoveAllBuffers, + mfsample_GetTotalLength, + mfsample_CopyToBuffer +}; + +HRESULT WINAPI MFCreateSample(IMFSample **sample) +{ + mfsample *object; + + TRACE("%p\n", sample); + + object = heap_alloc(sizeof(*object)); + if(!object) + return E_OUTOFMEMORY; + + init_attribute_object(&object->attributes, 0); + object->IMFSample_iface.lpVtbl = &mfsample_vtbl; + *sample = &object->IMFSample_iface; + + return S_OK; +} diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index f606447..1ab2826 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -55,7 +55,7 @@ @ stub MFCreateMemoryStream @ stub MFCreatePathFromURL @ stub MFCreatePresentationDescriptor -@ stub MFCreateSample +@ stdcall MFCreateSample(ptr) @ stub MFCreateSocket @ stub MFCreateSocketListener @ stdcall MFCreateSourceResolver(ptr) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index ccbbfb7..17cdc46 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -363,6 +363,22 @@ static void test_MFCreateMemoryBuffer(void) IMFMediaBuffer_Release(buffer); } +static void test_MFSample(void) +{ + IMFSample *sample; + HRESULT hr; + UINT32 count; + + hr = MFCreateSample( &sample ); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IMFSample_GetBufferCount(sample, &count); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(count == 0, "got %d\n", count); + + IMFSample_Release(sample); +} + START_TEST(mfplat) { CoInitialize(NULL); @@ -373,6 +389,7 @@ START_TEST(mfplat) test_source_resolver(); test_MFCreateMediaType(); test_MFCreateAttributes(); + test_MFSample(); test_MFCreateMFByteStreamOnStream(); test_MFCreateMemoryBuffer(); diff --git a/include/mfapi.h b/include/mfapi.h index 5b98187..45449b1 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -67,6 +67,7 @@ HRESULT WINAPI MFCancelWorkItem(MFWORKITEM_KEY key); HRESULT WINAPI MFCreateAttributes(IMFAttributes **attributes, UINT32 size); HRESULT WINAPI MFCreateEventQueue(IMFMediaEventQueue **queue); HRESULT WINAPI MFCreateMediaType(IMFMediaType **type); +HRESULT WINAPI MFCreateSample(IMFSample **sample); HRESULT WINAPI MFCreateMemoryBuffer(DWORD max_length, IMFMediaBuffer **buffer); HRESULT WINAPI MFGetTimerPeriodicity(DWORD *periodicity); HRESULT WINAPI MFTEnum(GUID category, UINT32 flags, MFT_REGISTER_TYPE_INFO *input_type, -- 1.9.1

1 0

[PATCH 1/2] mfplat: Forward IMFStreamDescriptor to IMFAttributes
by Alistair Leslie-Hughes 12 Sep '18

12 Sep '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/mfplat/main.c | 164 ++++++++++++----------------------------------------- 1 file changed, 37 insertions(+), 127 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 1c10561..ff04429 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -1855,8 +1855,8 @@ HRESULT WINAPI MFCreateEventQueue(IMFMediaEventQueue **queue) typedef struct _mfdescriptor { + mfattributes attributes; IMFStreamDescriptor IMFStreamDescriptor_iface; - LONG ref; } mfdescriptor; static inline mfdescriptor *impl_from_IMFStreamDescriptor(IMFStreamDescriptor *iface) @@ -1890,7 +1890,7 @@ static HRESULT WINAPI mfdescriptor_QueryInterface(IMFStreamDescriptor *iface, RE static ULONG WINAPI mfdescriptor_AddRef(IMFStreamDescriptor *iface) { mfdescriptor *This = impl_from_IMFStreamDescriptor(iface); - ULONG ref = InterlockedIncrement(&This->ref); + ULONG ref = InterlockedIncrement(&This->attributes.ref); TRACE("(%p) ref=%u\n", This, ref); @@ -1900,13 +1900,13 @@ static ULONG WINAPI mfdescriptor_AddRef(IMFStreamDescriptor *iface) static ULONG WINAPI mfdescriptor_Release(IMFStreamDescriptor *iface) { mfdescriptor *This = impl_from_IMFStreamDescriptor(iface); - ULONG ref = InterlockedDecrement(&This->ref); + ULONG ref = InterlockedDecrement(&This->attributes.ref); TRACE("(%p) ref=%u\n", This, ref); if (!ref) { - HeapFree(GetProcessHeap(), 0, This); + heap_free(This); } return ref; @@ -1915,269 +1915,179 @@ static ULONG WINAPI mfdescriptor_Release(IMFStreamDescriptor *iface) static HRESULT WINAPI mfdescriptor_GetItem(IMFStreamDescriptor *iface, REFGUID key, PROPVARIANT *value) { mfdescriptor *This = impl_from_IMFStreamDescriptor(iface); - - FIXME("%p, %s, %p\n", This, debugstr_guid(key), value); - - return E_NOTIMPL; + return IMFAttributes_GetItem(&This->attributes.IMFAttributes_iface, key, value); } static HRESULT WINAPI mfdescriptor_GetItemType(IMFStreamDescriptor *iface, REFGUID key, MF_ATTRIBUTE_TYPE *type) { mfdescriptor *This = impl_from_IMFStreamDescriptor(iface); - - FIXME("%p, %s, %p\n", This, debugstr_guid(key), type); - - return E_NOTIMPL; + return IMFAttributes_GetItemType(&This->attributes.IMFAttributes_iface, key, type); } static HRESULT WINAPI mfdescriptor_CompareItem(IMFStreamDescriptor *iface, REFGUID key, REFPROPVARIANT value, BOOL *result) { mfdescriptor *This = impl_from_IMFStreamDescriptor(iface); - - FIXME("%p, %s, %p, %p\n", This, debugstr_guid(key), value, result); - - return E_NOTIMPL; + return IMFAttributes_CompareItem(&This->attributes.IMFAttributes_iface, key, value, result); } static HRESULT WINAPI mfdescriptor_Compare(IMFStreamDescriptor *iface, IMFAttributes *theirs, MF_ATTRIBUTES_MATCH_TYPE type, BOOL *result) { mfdescriptor *This = impl_from_IMFStreamDescriptor(iface); - - FIXME("%p, %p, %d, %p\n", This, theirs, type, result); - - return E_NOTIMPL; + return IMFAttributes_Compare(&This->attributes.IMFAttributes_iface, theirs, type, result); } static HRESULT WINAPI mfdescriptor_GetUINT32(IMFStreamDescriptor *iface, REFGUID key, UINT32 *value) { mfdescriptor *This = impl_from_IMFStreamDescriptor(iface); - - FIXME("%p, %s, %p\n", This, debugstr_guid(key), value); - - return E_NOTIMPL; + return IMFAttributes_GetUINT32(&This->attributes.IMFAttributes_iface, key, value); } static HRESULT WINAPI mfdescriptor_GetUINT64(IMFStreamDescriptor *iface, REFGUID key, UINT64 *value) { mfdescriptor *This = impl_from_IMFStreamDescriptor(iface); - - FIXME("%p, %s, %p\n", This, debugstr_guid(key), value); - - return E_NOTIMPL; + return IMFAttributes_GetUINT64(&This->attributes.IMFAttributes_iface, key, value); } static HRESULT WINAPI mfdescriptor_GetDouble(IMFStreamDescriptor *iface, REFGUID key, double *value) { mfdescriptor *This = impl_from_IMFStreamDescriptor(iface); - - FIXME("%p, %s, %p\n", This, debugstr_guid(key), value); - - return E_NOTIMPL; + return IMFAttributes_GetDouble(&This->attributes.IMFAttributes_iface, key, value); } static HRESULT WINAPI mfdescriptor_GetGUID(IMFStreamDescriptor *iface, REFGUID key, GUID *value) { mfdescriptor *This = impl_from_IMFStreamDescriptor(iface); - - FIXME("%p, %s, %p\n", This, debugstr_guid(key), value); - - return E_NOTIMPL; + return IMFAttributes_GetGUID(&This->attributes.IMFAttributes_iface, key, value); } static HRESULT WINAPI mfdescriptor_GetStringLength(IMFStreamDescriptor *iface, REFGUID key, UINT32 *length) { mfdescriptor *This = impl_from_IMFStreamDescriptor(iface); - - FIXME("%p, %s, %p\n", This, debugstr_guid(key), length); - - return E_NOTIMPL; + return IMFAttributes_GetStringLength(&This->attributes.IMFAttributes_iface, key, length); } static HRESULT WINAPI mfdescriptor_GetString(IMFStreamDescriptor *iface, REFGUID key, WCHAR *value, UINT32 size, UINT32 *length) { mfdescriptor *This = impl_from_IMFStreamDescriptor(iface); - - FIXME("%p, %s, %p, %d, %p\n", This, debugstr_guid(key), value, size, length); - - return E_NOTIMPL; + return IMFAttributes_GetString(&This->attributes.IMFAttributes_iface, key, value, size, length); } static HRESULT WINAPI mfdescriptor_GetAllocatedString(IMFStreamDescriptor *iface, REFGUID key, WCHAR **value, UINT32 *length) { mfdescriptor *This = impl_from_IMFStreamDescriptor(iface); - - FIXME("%p, %s, %p, %p\n", This, debugstr_guid(key), value, length); - - return E_NOTIMPL; + return IMFAttributes_GetAllocatedString(&This->attributes.IMFAttributes_iface, key, value, length); } static HRESULT WINAPI mfdescriptor_GetBlobSize(IMFStreamDescriptor *iface, REFGUID key, UINT32 *size) { mfdescriptor *This = impl_from_IMFStreamDescriptor(iface); - - FIXME("%p, %s, %p\n", This, debugstr_guid(key), size); - - return E_NOTIMPL; + return IMFAttributes_GetBlobSize(&This->attributes.IMFAttributes_iface, key, size); } static HRESULT WINAPI mfdescriptor_GetBlob(IMFStreamDescriptor *iface, REFGUID key, UINT8 *buf, UINT32 bufsize, UINT32 *blobsize) { mfdescriptor *This = impl_from_IMFStreamDescriptor(iface); - - FIXME("%p, %s, %p, %d, %p\n", This, debugstr_guid(key), buf, bufsize, blobsize); - - return E_NOTIMPL; + return IMFAttributes_GetBlob(&This->attributes.IMFAttributes_iface, key, buf, bufsize, blobsize); } static HRESULT WINAPI mfdescriptor_GetAllocatedBlob(IMFStreamDescriptor *iface, REFGUID key, UINT8 **buf, UINT32 *size) { mfdescriptor *This = impl_from_IMFStreamDescriptor(iface); - - FIXME("%p, %s, %p, %p\n", This, debugstr_guid(key), buf, size); - - return E_NOTIMPL; + return IMFAttributes_GetAllocatedBlob(&This->attributes.IMFAttributes_iface, key, buf, size); } static HRESULT WINAPI mfdescriptor_GetUnknown(IMFStreamDescriptor *iface, REFGUID key, REFIID riid, void **ppv) { mfdescriptor *This = impl_from_IMFStreamDescriptor(iface); - - FIXME("%p, %s, %s, %p\n", This, debugstr_guid(key), debugstr_guid(riid), ppv); - - return E_NOTIMPL; + return IMFAttributes_GetUnknown(&This->attributes.IMFAttributes_iface, key, riid, ppv); } -static HRESULT WINAPI mfdescriptor_SetItem(IMFStreamDescriptor *iface, REFGUID key, REFPROPVARIANT Value) +static HRESULT WINAPI mfdescriptor_SetItem(IMFStreamDescriptor *iface, REFGUID key, REFPROPVARIANT value) { mfdescriptor *This = impl_from_IMFStreamDescriptor(iface); - - FIXME("%p, %s, %p\n", This, debugstr_guid(key), Value); - - return E_NOTIMPL; + return IMFAttributes_SetItem(&This->attributes.IMFAttributes_iface, key, value); } static HRESULT WINAPI mfdescriptor_DeleteItem(IMFStreamDescriptor *iface, REFGUID key) { mfdescriptor *This = impl_from_IMFStreamDescriptor(iface); - - FIXME("%p, %s\n", This, debugstr_guid(key)); - - return E_NOTIMPL; + return IMFAttributes_DeleteItem(&This->attributes.IMFAttributes_iface, key); } static HRESULT WINAPI mfdescriptor_DeleteAllItems(IMFStreamDescriptor *iface) { mfdescriptor *This = impl_from_IMFStreamDescriptor(iface); - - FIXME("%p\n", This); - - return E_NOTIMPL; + return IMFAttributes_DeleteAllItems(&This->attributes.IMFAttributes_iface); } static HRESULT WINAPI mfdescriptor_SetUINT32(IMFStreamDescriptor *iface, REFGUID key, UINT32 value) { mfdescriptor *This = impl_from_IMFStreamDescriptor(iface); - - FIXME("%p, %s, %d\n", This, debugstr_guid(key), value); - - return E_NOTIMPL; + return IMFAttributes_SetUINT32(&This->attributes.IMFAttributes_iface, key, value); } static HRESULT WINAPI mfdescriptor_SetUINT64(IMFStreamDescriptor *iface, REFGUID key, UINT64 value) { mfdescriptor *This = impl_from_IMFStreamDescriptor(iface); - - FIXME("%p, %s, %s\n", This, debugstr_guid(key), wine_dbgstr_longlong(value)); - - return E_NOTIMPL; + return IMFAttributes_SetUINT64(&This->attributes.IMFAttributes_iface, key, value); } static HRESULT WINAPI mfdescriptor_SetDouble(IMFStreamDescriptor *iface, REFGUID key, double value) { mfdescriptor *This = impl_from_IMFStreamDescriptor(iface); - - FIXME("%p, %s, %f\n", This, debugstr_guid(key), value); - - return E_NOTIMPL; + return IMFAttributes_SetDouble(&This->attributes.IMFAttributes_iface, key, value); } static HRESULT WINAPI mfdescriptor_SetGUID(IMFStreamDescriptor *iface, REFGUID key, REFGUID value) { mfdescriptor *This = impl_from_IMFStreamDescriptor(iface); - - FIXME("%p, %s, %s\n", This, debugstr_guid(key), debugstr_guid(value)); - - return E_NOTIMPL; + return IMFAttributes_SetGUID(&This->attributes.IMFAttributes_iface, key, value); } static HRESULT WINAPI mfdescriptor_SetString(IMFStreamDescriptor *iface, REFGUID key, const WCHAR *value) { mfdescriptor *This = impl_from_IMFStreamDescriptor(iface); - - FIXME("%p, %s, %s\n", This, debugstr_guid(key), debugstr_w(value)); - - return E_NOTIMPL; + return IMFAttributes_SetString(&This->attributes.IMFAttributes_iface, key, value); } static HRESULT WINAPI mfdescriptor_SetBlob(IMFStreamDescriptor *iface, REFGUID key, const UINT8 *buf, UINT32 size) { mfdescriptor *This = impl_from_IMFStreamDescriptor(iface); - - FIXME("%p, %s, %p, %d\n", This, debugstr_guid(key), buf, size); - - return E_NOTIMPL; + return IMFAttributes_SetBlob(&This->attributes.IMFAttributes_iface, key, buf, size); } static HRESULT WINAPI mfdescriptor_SetUnknown(IMFStreamDescriptor *iface, REFGUID key, IUnknown *unknown) { mfdescriptor *This = impl_from_IMFStreamDescriptor(iface); - - FIXME("%p, %s, %p\n", This, debugstr_guid(key), unknown); - - return E_NOTIMPL; + return IMFAttributes_SetUnknown(&This->attributes.IMFAttributes_iface, key, unknown); } static HRESULT WINAPI mfdescriptor_LockStore(IMFStreamDescriptor *iface) { mfdescriptor *This = impl_from_IMFStreamDescriptor(iface); - - FIXME("%p\n", This); - - return E_NOTIMPL; + return IMFAttributes_LockStore(&This->attributes.IMFAttributes_iface); } static HRESULT WINAPI mfdescriptor_UnlockStore(IMFStreamDescriptor *iface) { mfdescriptor *This = impl_from_IMFStreamDescriptor(iface); - - FIXME("%p\n", This); - - return E_NOTIMPL; + return IMFAttributes_UnlockStore(&This->attributes.IMFAttributes_iface); } static HRESULT WINAPI mfdescriptor_GetCount(IMFStreamDescriptor *iface, UINT32 *items) { mfdescriptor *This = impl_from_IMFStreamDescriptor(iface); - - FIXME("%p, %p\n", This, items); - - if(items) - *items = 0; - - return E_NOTIMPL; + return IMFAttributes_GetCount(&This->attributes.IMFAttributes_iface, items); } static HRESULT WINAPI mfdescriptor_GetItemByIndex(IMFStreamDescriptor *iface, UINT32 index, GUID *key, PROPVARIANT *value) { mfdescriptor *This = impl_from_IMFStreamDescriptor(iface); - - FIXME("%p, %d, %p, %p\n", This, index, key, value); - - return E_NOTIMPL; + return IMFAttributes_GetItemByIndex(&This->attributes.IMFAttributes_iface, index, key, value); } static HRESULT WINAPI mfdescriptor_CopyAllItems(IMFStreamDescriptor *iface, IMFAttributes *dest) @@ -2253,14 +2163,14 @@ HRESULT WINAPI MFCreateStreamDescriptor(DWORD identifier, DWORD count, TRACE("%d, %d, %p, %p\n", identifier, count, types, descriptor); - object = HeapAlloc( GetProcessHeap(), 0, sizeof(*object) ); + object = heap_alloc(sizeof(*object)); if(!object) return E_OUTOFMEMORY; - object->ref = 1; + init_attribute_object(&object->attributes, 0); object->IMFStreamDescriptor_iface.lpVtbl = &mfdescriptor_vtbl; - *descriptor = &object->IMFStreamDescriptor_iface; + return S_OK; } -- 1.9.1

1 0

[PATCH] wbemprox: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 12 Sep '18

12 Sep '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wbemprox/builtin.c | 20 ++++++++++---------- dlls/wbemprox/class.c | 4 ++-- dlls/wbemprox/query.c | 2 +- dlls/wbemprox/reg.c | 2 +- dlls/wbemprox/wbemlocator.c | 8 ++++---- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 9fe22d0034..a695e7c516 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -1782,7 +1782,7 @@ static WCHAR *get_file_version( const WCHAR *filename ) void *block; WCHAR *ret; - if (!(ret = heap_alloc( (4 * 5 + sizeof(fmtW) / sizeof(fmtW[0])) * sizeof(WCHAR) ))) return NULL; + if (!(ret = heap_alloc( (4 * 5 + ARRAY_SIZE( fmtW )) * sizeof(WCHAR) ))) return NULL; if (!(size = GetFileVersionInfoSizeW( filename, NULL )) || !(block = heap_alloc( size ))) { heap_free( ret ); @@ -2041,7 +2041,7 @@ static enum fill_status fill_diskdrive( struct table *table, const struct expr * { static const WCHAR fmtW[] = {'\\','\\','\\','\\','.','\\','\\','P','H','Y','S','I','C','A','L','D','R','I','V','E','%','u',0}; - WCHAR device_id[sizeof(fmtW)/sizeof(fmtW[0]) + 10], root[] = {'A',':','\\',0}; + WCHAR device_id[ARRAY_SIZE( fmtW ) + 10], root[] = {'A',':','\\',0}; struct record_diskdrive *rec; UINT i, row = 0, offset = 0, index = 0, type; UINT64 size = 1024 * 1024 * 1024; @@ -2208,7 +2208,7 @@ static enum fill_status fill_ip4routetable( struct table *table, const struct ex static WCHAR *get_volumename( const WCHAR *root ) { WCHAR buf[MAX_PATH + 1] = {0}; - GetVolumeInformationW( root, buf, sizeof(buf)/sizeof(buf[0]), NULL, NULL, NULL, NULL, 0 ); + GetVolumeInformationW( root, buf, ARRAY_SIZE( buf ), NULL, NULL, NULL, NULL, 0 ); return heap_strdupW( buf ); } static WCHAR *get_volumeserialnumber( const WCHAR *root ) @@ -2378,7 +2378,7 @@ static WCHAR *get_dnshostname( IP_ADAPTER_UNICAST_ADDRESS *addr ) WCHAR buf[WS_NI_MAXHOST]; if (!addr) return NULL; - if (GetNameInfoW( sa->lpSockaddr, sa->iSockaddrLength, buf, sizeof(buf)/sizeof(buf[0]), NULL, + if (GetNameInfoW( sa->lpSockaddr, sa->iSockaddrLength, buf, ARRAY_SIZE( buf ), NULL, 0, WS_NI_NAMEREQD )) return NULL; return heap_strdupW( buf ); } @@ -2400,7 +2400,7 @@ static struct array *get_defaultipgateway( IP_ADAPTER_GATEWAY_ADDRESS *list ) } for (gateway = list; gateway; gateway = gateway->Next) { - buflen = sizeof(buf)/sizeof(buf[0]); + buflen = ARRAY_SIZE( buf ); if (WSAAddressToStringW( gateway->Address.lpSockaddr, gateway->Address.iSockaddrLength, NULL, buf, &buflen) || !(ptr[i++] = heap_strdupW( buf ))) { @@ -2432,7 +2432,7 @@ static struct array *get_dnsserversearchorder( IP_ADAPTER_DNS_SERVER_ADDRESS *li } for (server = list; server; server = server->Next) { - buflen = sizeof(buf)/sizeof(buf[0]); + buflen = ARRAY_SIZE( buf ); if (WSAAddressToStringW( server->Address.lpSockaddr, server->Address.iSockaddrLength, NULL, buf, &buflen) || !(ptr[i++] = heap_strdupW( buf ))) { @@ -2465,7 +2465,7 @@ static struct array *get_ipaddress( IP_ADAPTER_UNICAST_ADDRESS_LH *list ) } for (address = list; address; address = address->Next) { - buflen = sizeof(buf)/sizeof(buf[0]); + buflen = ARRAY_SIZE( buf ); if (WSAAddressToStringW( address->Address.lpSockaddr, address->Address.iSockaddrLength, NULL, buf, &buflen) || !(ptr[i++] = heap_strdupW( buf ))) { @@ -2501,7 +2501,7 @@ static struct array *get_ipsubnet( IP_ADAPTER_UNICAST_ADDRESS_LH *list ) { WCHAR buf[INET_ADDRSTRLEN]; SOCKADDR_IN addr; - ULONG buflen = sizeof(buf)/sizeof(buf[0]); + ULONG buflen = ARRAY_SIZE( buf ); memset( &addr, 0, sizeof(addr) ); addr.sin_family = WS_AF_INET; @@ -3058,7 +3058,7 @@ static WCHAR *get_oscaption( OSVERSIONINFOEXW *ver ) {'8','.','1',' ','P','r','o',0}; static const WCHAR win10W[] = {'1','0',' ','P','r','o',0}; - int len = sizeof(windowsW)/sizeof(windowsW[0]); + int len = ARRAY_SIZE( windowsW ); WCHAR *ret; if (!(ret = heap_alloc( len * sizeof(WCHAR) + sizeof(win2003W) ))) return NULL; @@ -3240,7 +3240,7 @@ static enum fill_status fill_service( struct table *table, const struct expr *co ENUM_SERVICE_STATUS_PROCESSW *tmp, *services = NULL; SERVICE_STATUS_PROCESS *status; WCHAR sysnameW[MAX_COMPUTERNAME_LENGTH + 1]; - DWORD len = sizeof(sysnameW) / sizeof(sysnameW[0]); + DWORD len = ARRAY_SIZE( sysnameW ); UINT i, row = 0, offset = 0, size = 256, needed, count; enum fill_status fill_status = FILL_STATUS_FAILED; BOOL ret; diff --git a/dlls/wbemprox/class.c b/dlls/wbemprox/class.c index 27229bd69a..92c110f5f4 100644 --- a/dlls/wbemprox/class.c +++ b/dlls/wbemprox/class.c @@ -582,7 +582,7 @@ static BSTR get_body_text( const struct table *table, UINT row, UINT *len ) { if ((value = get_value_bstr( table, row, i ))) { - *len += sizeof(fmtW) / sizeof(fmtW[0]); + *len += ARRAY_SIZE( fmtW ); *len += strlenW( table->columns[i].name ); *len += SysStringLen( value ); SysFreeString( value ); @@ -608,7 +608,7 @@ static BSTR get_object_text( const struct view *view, UINT index ) UINT len, len_body, row = view->result[index]; BSTR ret, body; - len = sizeof(fmtW) / sizeof(fmtW[0]); + len = ARRAY_SIZE( fmtW ); len += strlenW( view->table->name ); if (!(body = get_body_text( view->table, row, &len_body ))) return NULL; len += len_body; diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index 76f5caa634..8a51266298 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -507,7 +507,7 @@ static BOOL is_system_prop( const WCHAR *name ) static BSTR build_servername( const struct view *view ) { WCHAR server[MAX_COMPUTERNAME_LENGTH + 1], *p; - DWORD len = sizeof(server)/sizeof(server[0]); + DWORD len = ARRAY_SIZE( server ); if (view->proplist) return NULL; diff --git a/dlls/wbemprox/reg.c b/dlls/wbemprox/reg.c index 9232db793b..79440dac8d 100644 --- a/dlls/wbemprox/reg.c +++ b/dlls/wbemprox/reg.c @@ -82,7 +82,7 @@ static HRESULT enum_key( HKEY root, const WCHAR *subkey, VARIANT *names, VARIANT HRESULT hr = S_OK; WCHAR buf[256]; BSTR *strings, *tmp; - DWORD count = 2, len = sizeof(buf)/sizeof(buf[0]); + DWORD count = 2, len = ARRAY_SIZE( buf ); LONG res, i = 0; TRACE("%p, %s\n", root, debugstr_w(subkey)); diff --git a/dlls/wbemprox/wbemlocator.c b/dlls/wbemprox/wbemlocator.c index 6ed0aed59e..fe26a871b5 100644 --- a/dlls/wbemprox/wbemlocator.c +++ b/dlls/wbemprox/wbemlocator.c @@ -91,7 +91,7 @@ static BOOL is_local_machine( const WCHAR *server ) static const WCHAR dotW[] = {'.',0}; static const WCHAR localhostW[] = {'l','o','c','a','l','h','o','s','t',0}; WCHAR buffer[MAX_COMPUTERNAME_LENGTH + 1]; - DWORD len = sizeof(buffer) / sizeof(buffer[0]); + DWORD len = ARRAY_SIZE( buffer ); if (!server || !strcmpW( server, dotW ) || !strcmpiW( server, localhostW )) return TRUE; if (GetComputerNameW( buffer, &len ) && !strcmpiW( server, buffer )) return TRUE; @@ -133,7 +133,7 @@ static HRESULT parse_resource( const WCHAR *resource, WCHAR **server, WCHAR **na p = q; while (*q && *q != '\\' && *q != '/') q++; len = q - p; - if (len >= sizeof(rootW) / sizeof(rootW[0]) && memicmpW( rootW, p, len )) goto done; + if (len >= ARRAY_SIZE( rootW ) && memicmpW( rootW, p, len )) goto done; if (!*q) { hr = S_OK; @@ -141,8 +141,8 @@ static HRESULT parse_resource( const WCHAR *resource, WCHAR **server, WCHAR **na } q++; len = strlenW( q ); - if ((len != sizeof(cimv2W) / sizeof(cimv2W[0]) || memicmpW( q, cimv2W, len )) && - (len != sizeof(defaultW) / sizeof(defaultW[0]) || memicmpW( q, defaultW, len ))) + if ((len != ARRAY_SIZE( cimv2W ) || memicmpW( q, cimv2W, len )) && + (len != ARRAY_SIZE( defaultW ) || memicmpW( q, defaultW, len ))) goto done; if (!(*namespace = heap_alloc( (len + 1) * sizeof(WCHAR) ))) hr = E_OUTOFMEMORY; else -- 2.14.4

2 2

[PATCH 3/3] mshtml: Expose CSS properties names from style object via IHTMLCSSStyleDeclaration dispids.
by Jacek Caban 12 Sep '18

12 Sep '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlstyle.c | 584 ++++++++++++++++++++++++++++++++------ dlls/mshtml/tests/documentmode.js | 1 + 2 files changed, 494 insertions(+), 91 deletions(-)

1 0

[PATCH 2/3] mshtml: Expose IHTMLCSSStyleDeclaration interface to scripts.
by Jacek Caban 12 Sep '18

12 Sep '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlstyle.c | 9 ++++++++- dlls/mshtml/tests/documentmode.js | 27 +++++++++++++++++++++++++++ dlls/mshtml/tests/elements.js | 37 ++++++++++++++++++++++++++++++++++++- 3 files changed, 71 insertions(+), 2 deletions(-)

1 0

[PATCH 1/3] mshtml: Use dispex_compat_mode in update_filter.
by Jacek Caban 12 Sep '18

12 Sep '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlstyle.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)

1 0

[PATCH] ws2_32: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 12 Sep '18

12 Sep '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ws2_32/socket.c | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 914df17aba..164a48ce75 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1341,7 +1341,7 @@ static int convert_flags(int flags) int i, out; if (!flags) return 0; - for (out = i = 0; flags && i < sizeof(ws_flags_map) / sizeof(ws_flags_map[0]); i++) + for (out = i = 0; flags && i < ARRAY_SIZE(ws_flags_map); i++) { if (ws_flags_map[i][0] & flags) { @@ -1370,7 +1370,7 @@ static int convert_sockopt(INT *level, INT *optname) { case WS_SOL_SOCKET: *level = SOL_SOCKET; - for(i=0; i<sizeof(ws_sock_map)/sizeof(ws_sock_map[0]); i++) { + for(i = 0; i < ARRAY_SIZE(ws_sock_map); i++) { if( ws_sock_map[i][0] == *optname ) { *optname = ws_sock_map[i][1]; @@ -1381,7 +1381,7 @@ static int convert_sockopt(INT *level, INT *optname) break; case WS_IPPROTO_TCP: *level = IPPROTO_TCP; - for(i=0; i<sizeof(ws_tcp_map)/sizeof(ws_tcp_map[0]); i++) { + for(i = 0; i < ARRAY_SIZE(ws_tcp_map); i++) { if ( ws_tcp_map[i][0] == *optname ) { *optname = ws_tcp_map[i][1]; @@ -1392,7 +1392,7 @@ static int convert_sockopt(INT *level, INT *optname) break; case WS_IPPROTO_IP: *level = IPPROTO_IP; - for(i=0; i<sizeof(ws_ip_map)/sizeof(ws_ip_map[0]); i++) { + for(i = 0; i < ARRAY_SIZE(ws_ip_map); i++) { if (ws_ip_map[i][0] == *optname ) { *optname = ws_ip_map[i][1]; @@ -1403,7 +1403,7 @@ static int convert_sockopt(INT *level, INT *optname) break; case WS_IPPROTO_IPV6: *level = IPPROTO_IPV6; - for(i=0; i<sizeof(ws_ipv6_map)/sizeof(ws_ipv6_map[0]); i++) { + for(i = 0; i < ARRAY_SIZE(ws_ipv6_map); i++) { if (ws_ipv6_map[i][0] == *optname ) { *optname = ws_ipv6_map[i][1]; @@ -1484,7 +1484,7 @@ static int convert_af_w2u(int windowsaf) { unsigned int i; - for (i=0;i<sizeof(ws_af_map)/sizeof(ws_af_map[0]);i++) + for (i = 0; i < ARRAY_SIZE(ws_af_map); i++) if (ws_af_map[i][0] == windowsaf) return ws_af_map[i][1]; FIXME("unhandled Windows address family %d\n", windowsaf); @@ -1495,7 +1495,7 @@ static int convert_af_u2w(int unixaf) { unsigned int i; - for (i=0;i<sizeof(ws_af_map)/sizeof(ws_af_map[0]);i++) + for (i = 0; i < ARRAY_SIZE(ws_af_map); i++) if (ws_af_map[i][1] == unixaf) return ws_af_map[i][0]; FIXME("unhandled UNIX address family %d\n", unixaf); @@ -1506,7 +1506,7 @@ static int convert_proto_w2u(int windowsproto) { unsigned int i; - for (i=0;i<sizeof(ws_proto_map)/sizeof(ws_proto_map[0]);i++) + for (i = 0; i < ARRAY_SIZE(ws_proto_map); i++) if (ws_proto_map[i][0] == windowsproto) return ws_proto_map[i][1]; @@ -1522,7 +1522,7 @@ static int convert_proto_u2w(int unixproto) { unsigned int i; - for (i=0;i<sizeof(ws_proto_map)/sizeof(ws_proto_map[0]);i++) + for (i = 0; i < ARRAY_SIZE(ws_proto_map); i++) if (ws_proto_map[i][1] == unixproto) return ws_proto_map[i][0]; @@ -1539,7 +1539,7 @@ static int convert_socktype_w2u(int windowssocktype) { unsigned int i; - for (i=0;i<sizeof(ws_socktype_map)/sizeof(ws_socktype_map[0]);i++) + for (i = 0; i < ARRAY_SIZE(ws_socktype_map); i++) if (ws_socktype_map[i][0] == windowssocktype) return ws_socktype_map[i][1]; FIXME("unhandled Windows socket type %d\n", windowssocktype); @@ -1550,7 +1550,7 @@ static int convert_socktype_u2w(int unixsocktype) { unsigned int i; - for (i=0;i<sizeof(ws_socktype_map)/sizeof(ws_socktype_map[0]);i++) + for (i = 0; i < ARRAY_SIZE(ws_socktype_map); i++) if (ws_socktype_map[i][1] == unixsocktype) return ws_socktype_map[i][0]; FIXME("unhandled UNIX socket type %d\n", unixsocktype); @@ -1560,7 +1560,7 @@ convert_socktype_u2w(int unixsocktype) { static int convert_poll_w2u(int events) { int i, ret; - for (i = ret = 0; events && i < sizeof(ws_poll_map) / sizeof(ws_poll_map[0]); i++) + for (i = ret = 0; events && i < ARRAY_SIZE(ws_poll_map); i++) { if (ws_poll_map[i][0] & events) { @@ -1577,7 +1577,7 @@ static int convert_poll_w2u(int events) static int convert_poll_u2w(int events) { int i, ret; - for (i = ret = 0; events && i < sizeof(ws_poll_map) / sizeof(ws_poll_map[0]); i++) + for (i = ret = 0; events && i < ARRAY_SIZE(ws_poll_map); i++) { if (ws_poll_map[i][1] & events) { @@ -1752,7 +1752,7 @@ static inline BOOL supported_pf(int pf) static inline BOOL supported_protocol(int protocol) { int i; - for (i = 0; i < sizeof(valid_protocols) / sizeof(valid_protocols[0]); i++) + for (i = 0; i < ARRAY_SIZE(valid_protocols); i++) if (protocol == valid_protocols[i]) return TRUE; return FALSE; @@ -4914,7 +4914,7 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID BOOL found = FALSE; unsigned int i; - for (i = 0; i < sizeof(guid_funcs) / sizeof(guid_funcs[0]); i++) + for (i = 0; i < ARRAY_SIZE(guid_funcs); i++) { if (IsEqualGUID(&guid_funcs[i].guid, in_buff)) { @@ -6478,7 +6478,7 @@ struct WS_protoent* WINAPI WS_getprotobyname(const char* name) if (!retval) { unsigned int i; - for (i = 0; i < sizeof(protocols) / sizeof(protocols[0]); i++) + for (i = 0; i < ARRAY_SIZE(protocols); i++) { if (strcasecmp( protocols[i].names[0], name )) continue; retval = WS_create_pe( protocols[i].names[0], (char **)protocols[i].names + 1, @@ -6512,7 +6512,7 @@ struct WS_protoent* WINAPI WS_getprotobynumber(int number) if (!retval) { unsigned int i; - for (i = 0; i < sizeof(protocols) / sizeof(protocols[0]); i++) + for (i = 0; i < ARRAY_SIZE(protocols); i++) { if (protocols[i].prot != number) continue; retval = WS_create_pe( protocols[i].names[0], (char **)protocols[i].names + 1, @@ -6586,7 +6586,7 @@ static int convert_aiflag_w2u(int winflags) { unsigned int i; int unixflags = 0; - for (i=0;i<sizeof(ws_aiflag_map)/sizeof(ws_aiflag_map[0]);i++) + for (i = 0; i < ARRAY_SIZE(ws_aiflag_map); i++) if (ws_aiflag_map[i][0] & winflags) { unixflags |= ws_aiflag_map[i][1]; winflags &= ~ws_aiflag_map[i][0]; @@ -6600,7 +6600,7 @@ static int convert_niflag_w2u(int winflags) { unsigned int i; int unixflags = 0; - for (i=0;i<sizeof(ws_niflag_map)/sizeof(ws_niflag_map[0]);i++) + for (i = 0; i < ARRAY_SIZE(ws_niflag_map); i++) if (ws_niflag_map[i][0] & winflags) { unixflags |= ws_niflag_map[i][1]; winflags &= ~ws_niflag_map[i][0]; @@ -6614,7 +6614,7 @@ static int convert_aiflag_u2w(int unixflags) { unsigned int i; int winflags = 0; - for (i=0;i<sizeof(ws_aiflag_map)/sizeof(ws_aiflag_map[0]);i++) + for (i = 0; i < ARRAY_SIZE(ws_aiflag_map); i++) if (ws_aiflag_map[i][1] & unixflags) { winflags |= ws_aiflag_map[i][0]; unixflags &= ~ws_aiflag_map[i][1]; @@ -8718,7 +8718,7 @@ INT WINAPI WSAAddressToStringW( LPSOCKADDR sockaddr, DWORD len, if (ret) return ret; - MultiByteToWideChar( CP_ACP, 0, bufAddr, size, buffer, sizeof( buffer )/sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, bufAddr, size, buffer, ARRAY_SIZE(buffer)); if (*lenstr < size) { -- 2.14.4

1 0

[PATCH v4 01/10] shell32/autocomplete: Fix a vulnerability by avoiding the use of snprintf
by Gabriel Ivăncescu 12 Sep '18

12 Sep '18

The quickComplete format can have more than one % argument, or stuff like %*.* or %1234s, which can be exploited since the format string can be read from the registry, so handle it manually instead of using sprintf. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- v4: Return the length to not overestimate. dlls/shell32/autocomplete.c | 42 ++++++++++++++++++++++++++++++++++++------ 1 file changed, 36 insertions(+), 6 deletions(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index 4ec7387..587d41f 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -93,6 +93,32 @@ static inline IAutoCompleteImpl *impl_from_IAutoCompleteDropDown(IAutoCompleteDr return CONTAINING_RECORD(iface, IAutoCompleteImpl, IAutoCompleteDropDown_iface); } +static size_t format_quick_complete(WCHAR *dst, const WCHAR *qc, const WCHAR *str, size_t str_len) +{ + /* Replace the first %s directly without using snprintf, to avoid + exploits since the format string can be retrieved from the registry */ + WCHAR *base = dst; + UINT args = 0; + while (*qc != '\0') + { + if (qc[0] == '%') + { + if (args < 1 && qc[1] == 's') + { + memcpy(dst, str, str_len * sizeof(WCHAR)); + dst += str_len; + qc += 2; + args++; + continue; + } + qc += (qc[1] == '%'); + } + *dst++ = *qc++; + } + *dst = '\0'; + return dst - base; +} + static void destroy_autocomplete_object(IAutoCompleteImpl *ac) { ac->hwndEdit = NULL; @@ -109,7 +135,6 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, IAutoCompleteImpl *This = GetPropW(hwnd, autocomplete_propertyW); HRESULT hr; WCHAR hwndText[255]; - WCHAR *hwndQCText; RECT r; BOOL control, filled, displayall = FALSE; int cpt, height, sel; @@ -138,11 +163,16 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, /* If quickComplete is set and control is pressed, replace the string */ control = GetKeyState(VK_CONTROL) & 0x8000; if (control && This->quickComplete) { - hwndQCText = heap_alloc((lstrlenW(This->quickComplete)+lstrlenW(hwndText))*sizeof(WCHAR)); - sel = sprintfW(hwndQCText, This->quickComplete, hwndText); - SendMessageW(hwnd, WM_SETTEXT, 0, (LPARAM)hwndQCText); - SendMessageW(hwnd, EM_SETSEL, 0, sel); - heap_free(hwndQCText); + WCHAR *buf; + size_t len = strlenW(hwndText); + size_t sz = strlenW(This->quickComplete) + 1 + len; + if ((buf = heap_alloc(sz * sizeof(WCHAR)))) + { + len = format_quick_complete(buf, This->quickComplete, hwndText, len); + SendMessageW(hwnd, WM_SETTEXT, 0, (LPARAM)buf); + SendMessageW(hwnd, EM_SETSEL, 0, len); + heap_free(buf); + } } ShowWindow(This->hwndListBox, SW_HIDE); -- 1.9.1

3 25

[PATCH vkd3d 07/11] vkd3d: Set pointer to NULL if heap creation fails.
by Józef Kucia 12 Sep '18

12 Sep '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/device.c | 3 +++ tests/d3d12.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index e8bf7c957b58..d39eef2c2499 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1946,7 +1946,10 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CreateHeap(ID3D12Device *iface, iface, desc, debugstr_guid(iid), heap); if (FAILED(hr = d3d12_heap_create(device, desc, &object))) + { + *heap = NULL; return hr; + } return return_interface(&object->ID3D12Heap_iface, &IID_ID3D12Heap, iid, heap); } diff --git a/tests/d3d12.c b/tests/d3d12.c index 5a39f0c1dfa1..221157faa53f 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -1854,9 +1854,12 @@ static void test_create_heap(void) desc.Flags = D3D12_HEAP_FLAG_ALLOW_ONLY_NON_RT_DS_TEXTURES | D3D12_HEAP_FLAG_ALLOW_DISPLAY; hr = ID3D12Device_CreateHeap(device, &desc, &IID_ID3D12Heap, (void **)&heap); ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + heap = (void *)0xdeadbeef; desc.Flags = D3D12_HEAP_FLAG_ALLOW_ONLY_RT_DS_TEXTURES | D3D12_HEAP_FLAG_ALLOW_DISPLAY; hr = ID3D12Device_CreateHeap(device, &desc, &IID_ID3D12Heap, (void **)&heap); ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(!heap, "Got unexpected pointer %p.\n", heap); for (i = 0; i < ARRAY_SIZE(tests); ++i) { -- 2.16.4

2 1

[PATCH vkd3d 10/11] vkd3d: Simplify d3d12_device_init().
by Józef Kucia 12 Sep '18

12 Sep '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/device.c | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index d39eef2c2499..cfb17ea17d99 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -2282,6 +2282,7 @@ struct d3d12_device *unsafe_impl_from_ID3D12Device(ID3D12Device *iface) static HRESULT d3d12_device_init(struct d3d12_device *device, struct vkd3d_instance *instance, const struct vkd3d_device_create_info *create_info) { + const struct vkd3d_vk_device_procs *vk_procs; HRESULT hr; device->ID3D12Device_iface.lpVtbl = &d3d12_device_vtbl; @@ -2295,30 +2296,22 @@ static HRESULT d3d12_device_init(struct d3d12_device *device, device->wchar_size = instance->wchar_size; device->adapter_luid = create_info->adapter_luid; + device->removed_reason = S_OK; + + device->vk_device = VK_NULL_HANDLE; + device->vk_dummy_sampler = VK_NULL_HANDLE; if (FAILED(hr = vkd3d_create_vk_device(device, create_info))) - { - vkd3d_instance_decref(device->vkd3d_instance); - return hr; - } + goto out_free_instance; if (FAILED(hr = d3d12_device_create_dummy_sampler(device))) { - const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; ERR("Failed to create dummy sampler, hr %#x.\n", hr); - VK_CALL(vkDestroyDevice(device->vk_device, NULL)); - vkd3d_instance_decref(device->vkd3d_instance); - return hr; + goto out_free_vk_resources; } if (FAILED(hr = vkd3d_fence_worker_start(&device->fence_worker, device))) - { - const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; - VK_CALL(vkDestroySampler(device->vk_device, device->vk_dummy_sampler, NULL)); - VK_CALL(vkDestroyDevice(device->vk_device, NULL)); - vkd3d_instance_decref(device->vkd3d_instance); - return hr; - } + goto out_free_vk_resources; vkd3d_gpu_va_allocator_init(&device->gpu_va_allocator); @@ -2327,9 +2320,15 @@ static HRESULT d3d12_device_init(struct d3d12_device *device, if ((device->parent = create_info->parent)) IUnknown_AddRef(device->parent); - device->removed_reason = S_OK; - return S_OK; + +out_free_vk_resources: + vk_procs = &device->vk_procs; + VK_CALL(vkDestroySampler(device->vk_device, device->vk_dummy_sampler, NULL)); + VK_CALL(vkDestroyDevice(device->vk_device, NULL)); +out_free_instance: + vkd3d_instance_decref(device->vkd3d_instance); + return hr; } HRESULT d3d12_device_create(struct vkd3d_instance *instance, -- 2.16.4

2 1

[PATCH vkd3d 11/11] vkd3d: Implement simple pipeline cache.
by Józef Kucia 12 Sep '18

12 Sep '18

From: Józef Kucia <jkucia(a)codeweavers.com> Ideally, we would like to introduce a Vulkan extension to make vertex buffer strides and primitive topology dynamic in Vulkan. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- Such extension should be quite easy to implement in RADV and Anvil. --- libs/vkd3d/command.c | 53 +++++++--------- libs/vkd3d/device.c | 151 ++++++++++++++++++++++++++++++++++++++++++--- libs/vkd3d/state.c | 12 +++- libs/vkd3d/vkd3d_private.h | 31 ++++++++-- 4 files changed, 201 insertions(+), 46 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 2fc564312f8e..5e67e6674e95 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -725,17 +725,6 @@ static bool d3d12_command_allocator_add_framebuffer(struct d3d12_command_allocat return true; } -static bool d3d12_command_allocator_add_pipeline(struct d3d12_command_allocator *allocator, VkPipeline pipeline) -{ - if (!vkd3d_array_reserve((void **)&allocator->pipelines, &allocator->pipelines_size, - allocator->pipeline_count + 1, sizeof(*allocator->pipelines))) - return false; - - allocator->pipelines[allocator->pipeline_count++] = pipeline; - - return true; -} - static bool d3d12_command_allocator_add_descriptor_pool(struct d3d12_command_allocator *allocator, VkDescriptorPool pool) { @@ -951,12 +940,6 @@ static void d3d12_command_allocator_free_resources(struct d3d12_command_allocato } allocator->descriptor_pool_count = 0; - for (i = 0; i < allocator->pipeline_count; ++i) - { - VK_CALL(vkDestroyPipeline(device->vk_device, allocator->pipelines[i], NULL)); - } - allocator->pipeline_count = 0; - for (i = 0; i < allocator->framebuffer_count; ++i) { VK_CALL(vkDestroyFramebuffer(device->vk_device, allocator->framebuffers[i], NULL)); @@ -1029,7 +1012,6 @@ static ULONG STDMETHODCALLTYPE d3d12_command_allocator_Release(ID3D12CommandAllo vkd3d_free(allocator->views); vkd3d_free(allocator->descriptor_pools); vkd3d_free(allocator->free_descriptor_pools); - vkd3d_free(allocator->pipelines); vkd3d_free(allocator->framebuffers); vkd3d_free(allocator->passes); @@ -1214,10 +1196,6 @@ static HRESULT d3d12_command_allocator_init(struct d3d12_command_allocator *allo allocator->framebuffers_size = 0; allocator->framebuffer_count = 0; - allocator->pipelines = NULL; - allocator->pipelines_size = 0; - allocator->pipeline_count = 0; - allocator->descriptor_pools = NULL; allocator->descriptor_pools_size = 0; allocator->descriptor_pool_count = 0; @@ -1837,8 +1815,8 @@ static bool d3d12_command_list_update_current_framebuffer(struct d3d12_command_l return true; } -static VkPipeline d3d12_command_list_create_graphics_pipeline(struct d3d12_command_list *list, - const struct d3d12_graphics_pipeline_state *state) +static VkPipeline d3d12_command_list_get_or_create_pipeline(struct d3d12_command_list *list, + struct d3d12_graphics_pipeline_state *state) { struct VkVertexInputBindingDescription bindings[D3D12_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT]; const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs; @@ -1846,7 +1824,8 @@ static VkPipeline d3d12_command_list_create_graphics_pipeline(struct d3d12_comma struct VkPipelineInputAssemblyStateCreateInfo ia_desc; struct VkPipelineColorBlendStateCreateInfo blend_desc; struct VkGraphicsPipelineCreateInfo pipeline_desc; - const struct d3d12_device *device = list->device; + struct d3d12_device *device = list->device; + struct vkd3d_pipeline_key pipeline_key; size_t binding_count = 0; VkPipeline vk_pipeline; unsigned int i; @@ -1878,6 +1857,10 @@ static VkPipeline d3d12_command_list_create_graphics_pipeline(struct d3d12_comma .pDynamicStates = dynamic_states, }; + memset(&pipeline_key, 0, sizeof(pipeline_key)); + pipeline_key.state = state; + pipeline_key.topology = list->primitive_topology; + for (i = 0, mask = 0; i < state->attribute_count; ++i) { struct VkVertexInputBindingDescription *b; @@ -1902,9 +1885,14 @@ static VkPipeline d3d12_command_list_create_graphics_pipeline(struct d3d12_comma if (!b->stride) FIXME("Invalid stride for input slot %u.\n", binding); + pipeline_key.strides[binding_count] = list->strides[binding]; + ++binding_count; } + if ((vk_pipeline = d3d12_device_find_cached_pipeline(device, &pipeline_key))) + return vk_pipeline; + input_desc.sType = VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_STATE_CREATE_INFO; input_desc.pNext = NULL; input_desc.flags = 0; @@ -1957,13 +1945,14 @@ static VkPipeline d3d12_command_list_create_graphics_pipeline(struct d3d12_comma return VK_NULL_HANDLE; } - if (!d3d12_command_allocator_add_pipeline(list->allocator, vk_pipeline)) - { - WARN("Failed to add pipeline.\n"); - VK_CALL(vkDestroyPipeline(device->vk_device, vk_pipeline, NULL)); - return VK_NULL_HANDLE; - } + if (d3d12_device_put_pipeline_to_cache(device, &pipeline_key, vk_pipeline, &state->compiled_pipelines)) + return vk_pipeline; + /* Other thread compiled the pipeline before us. */ + VK_CALL(vkDestroyPipeline(device->vk_device, vk_pipeline, NULL)); + vk_pipeline = d3d12_device_find_cached_pipeline(device, &pipeline_key); + if (!vk_pipeline) + ERR("Could not get the pipeline compiled by other thread from the cache.\n"); return vk_pipeline; } @@ -1981,7 +1970,7 @@ static bool d3d12_command_list_update_current_pipeline(struct d3d12_command_list return false; } - if (!(vk_pipeline = d3d12_command_list_create_graphics_pipeline(list, &list->state->u.graphics))) + if (!(vk_pipeline = d3d12_command_list_get_or_create_pipeline(list, &list->state->u.graphics))) return false; VK_CALL(vkCmdBindPipeline(list->vk_command_buffer, list->state->vk_bind_point, vk_pipeline)); diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index cfb17ea17d99..c1db7d30a9e8 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1169,11 +1169,116 @@ static HRESULT d3d12_device_create_dummy_sampler(struct d3d12_device *device) return vkd3d_create_static_sampler(device, &sampler_desc, &device->vk_dummy_sampler); } -static void d3d12_device_init_pipeline_cache(struct d3d12_device *device) +static void destroy_compiled_pipeline(struct vkd3d_compiled_pipeline *pipeline, + struct d3d12_device *device) +{ + const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; + + VK_CALL(vkDestroyPipeline(device->vk_device, pipeline->vk_pipeline, NULL)); + vkd3d_free(pipeline); +} + +static int compare_pipeline_cache_entry(const void *key, const struct rb_entry *entry) +{ + const struct vkd3d_compiled_pipeline *compiled_pipeline; + const struct vkd3d_pipeline_key *pipeline_key; + + pipeline_key = key; + compiled_pipeline = RB_ENTRY_VALUE(entry, const struct vkd3d_compiled_pipeline, entry); + return memcmp(&compiled_pipeline->key, pipeline_key, sizeof(*pipeline_key)); +} + +static void destroy_pipeline_cache_entry(struct rb_entry *entry, void *context) +{ + struct vkd3d_compiled_pipeline *pipeline; + struct d3d12_device *device = context; + + pipeline = RB_ENTRY_VALUE(entry, struct vkd3d_compiled_pipeline, entry); + destroy_compiled_pipeline(pipeline, device); +} + +VkPipeline d3d12_device_find_cached_pipeline(struct d3d12_device *device, + const struct vkd3d_pipeline_key *key) +{ + VkPipeline vk_pipeline = VK_NULL_HANDLE; + struct rb_entry *entry; + int rc; + + if (!(rc = pthread_mutex_lock(&device->pipeline_cache_mutex))) + { + if ((entry = rb_get(&device->pipeline_cache, key))) + vk_pipeline = RB_ENTRY_VALUE(entry, struct vkd3d_compiled_pipeline, entry)->vk_pipeline; + pthread_mutex_unlock(&device->pipeline_cache_mutex); + } + else + { + ERR("Failed to lock mutex, error %d.\n", rc); + } + + return vk_pipeline; +} + +bool d3d12_device_put_pipeline_to_cache(struct d3d12_device *device, + const struct vkd3d_pipeline_key *key, VkPipeline vk_pipeline, struct list *list) +{ + struct vkd3d_compiled_pipeline *compiled_pipeline; + bool ret = true; + int rc; + + if (!(compiled_pipeline = vkd3d_malloc(sizeof(*compiled_pipeline)))) + return false; + + compiled_pipeline->key = *key; + compiled_pipeline->vk_pipeline = vk_pipeline; + + if ((rc = pthread_mutex_lock(&device->pipeline_cache_mutex))) + { + ERR("Failed to lock mutex, error %d.\n", rc); + vkd3d_free(compiled_pipeline); + return false; + } + + if (rb_put(&device->pipeline_cache, key, &compiled_pipeline->entry) >= 0) + { + list_add_tail(list, &compiled_pipeline->list); + } + else + { + WARN("Failed to put pipeline to cache.\n"); + vkd3d_free(compiled_pipeline); + ret = false; + } + + pthread_mutex_unlock(&device->pipeline_cache_mutex); + return ret; +} + +void d3d12_device_destroy_compiled_pipelines(struct d3d12_device *device, struct list *list) +{ + struct vkd3d_compiled_pipeline *pipeline, *cursor; + int rc; + + if ((rc = pthread_mutex_lock(&device->pipeline_cache_mutex))) + { + ERR("Failed to lock mutex, error %d.\n", rc); + return; + } + + LIST_FOR_EACH_ENTRY_SAFE(pipeline, cursor, list, struct vkd3d_compiled_pipeline, list) + { + rb_remove(&device->pipeline_cache, &pipeline->entry); + destroy_compiled_pipeline(pipeline, device); + } + + pthread_mutex_unlock(&device->pipeline_cache_mutex); +} + +static HRESULT d3d12_device_init_pipeline_cache(struct d3d12_device *device) { const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; VkPipelineCacheCreateInfo cache_info; VkResult vr; + int rc; cache_info.sType = VK_STRUCTURE_TYPE_PIPELINE_CACHE_CREATE_INFO; cache_info.pNext = NULL; @@ -1183,9 +1288,39 @@ static void d3d12_device_init_pipeline_cache(struct d3d12_device *device) if ((vr = VK_CALL(vkCreatePipelineCache(device->vk_device, &cache_info, NULL, &device->vk_pipeline_cache))) < 0) { - ERR("Failed to create pipeline cache, vr %d.\n", vr); + ERR("Failed to create Vulkan pipeline cache, vr %d.\n", vr); device->vk_pipeline_cache = VK_NULL_HANDLE; } + + rb_init(&device->pipeline_cache, compare_pipeline_cache_entry); + + if ((rc = pthread_mutex_init(&device->pipeline_cache_mutex, NULL))) + { + ERR("Failed to initialize mutex, error %d.\n", rc); + return E_FAIL; + } + + return S_OK; +} + +static void d3d12_device_destroy_pipeline_cache(struct d3d12_device *device) +{ + const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; + int rc; + + if (device->vk_pipeline_cache) + VK_CALL(vkDestroyPipelineCache(device->vk_device, device->vk_pipeline_cache, NULL)); + + if ((rc = pthread_mutex_lock(&device->pipeline_cache_mutex))) + { + ERR("Failed to lock mutex, error %d.\n", rc); + return; + } + + rb_destroy(&device->pipeline_cache, destroy_pipeline_cache_entry, device); + + pthread_mutex_unlock(&device->pipeline_cache_mutex); + pthread_mutex_destroy(&device->pipeline_cache_mutex); } D3D12_GPU_VIRTUAL_ADDRESS vkd3d_gpu_va_allocator_allocate(struct vkd3d_gpu_va_allocator *allocator, @@ -1357,8 +1492,7 @@ static ULONG STDMETHODCALLTYPE d3d12_device_Release(ID3D12Device *iface) vkd3d_gpu_va_allocator_cleanup(&device->gpu_va_allocator); vkd3d_fence_worker_stop(&device->fence_worker, device); VK_CALL(vkDestroySampler(device->vk_device, device->vk_dummy_sampler, NULL)); - if (device->vk_pipeline_cache) - VK_CALL(vkDestroyPipelineCache(device->vk_device, device->vk_pipeline_cache, NULL)); + d3d12_device_destroy_pipeline_cache(device); d3d12_device_destroy_vkd3d_queues(device); VK_CALL(vkDestroyDevice(device->vk_device, NULL)); if (device->parent) @@ -2310,18 +2444,21 @@ static HRESULT d3d12_device_init(struct d3d12_device *device, goto out_free_vk_resources; } - if (FAILED(hr = vkd3d_fence_worker_start(&device->fence_worker, device))) + if (FAILED(hr = d3d12_device_init_pipeline_cache(device))) goto out_free_vk_resources; - vkd3d_gpu_va_allocator_init(&device->gpu_va_allocator); + if (FAILED(hr = vkd3d_fence_worker_start(&device->fence_worker, device))) + goto out_free_pipeline_cache; - d3d12_device_init_pipeline_cache(device); + vkd3d_gpu_va_allocator_init(&device->gpu_va_allocator); if ((device->parent = create_info->parent)) IUnknown_AddRef(device->parent); return S_OK; +out_free_pipeline_cache: + d3d12_device_destroy_pipeline_cache(device); out_free_vk_resources: vk_procs = &device->vk_procs; VK_CALL(vkDestroySampler(device->vk_device, device->vk_dummy_sampler, NULL)); diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 446e1a65029d..b60cebf26654 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1095,11 +1095,15 @@ static ULONG STDMETHODCALLTYPE d3d12_pipeline_state_Release(ID3D12PipelineState if (state->vk_bind_point == VK_PIPELINE_BIND_POINT_GRAPHICS) { - for (i = 0; i < state->u.graphics.stage_count; ++i) + struct d3d12_graphics_pipeline_state *graphics = &state->u.graphics; + + for (i = 0; i < graphics->stage_count; ++i) { - VK_CALL(vkDestroyShaderModule(device->vk_device, state->u.graphics.stages[i].module, NULL)); + VK_CALL(vkDestroyShaderModule(device->vk_device, graphics->stages[i].module, NULL)); } - VK_CALL(vkDestroyRenderPass(device->vk_device, state->u.graphics.render_pass, NULL)); + VK_CALL(vkDestroyRenderPass(device->vk_device, graphics->render_pass, NULL)); + + d3d12_device_destroy_compiled_pipelines(device, &graphics->compiled_pipelines); } else if (state->vk_bind_point == VK_PIPELINE_BIND_POINT_COMPUTE) { @@ -2185,6 +2189,8 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s graphics->root_signature = root_signature; + list_init(&graphics->compiled_pipelines); + state->vk_bind_point = VK_PIPELINE_BIND_POINT_GRAPHICS; state->device = device; ID3D12Device_AddRef(&device->ID3D12Device_iface); diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 37ad13c132cd..5461cc3d36e1 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -25,6 +25,8 @@ #include "vkd3d_common.h" #include "vkd3d_memory.h" +#include "list.h" +#include "rbtree.h" #include "vkd3d.h" #include "vkd3d_shader.h" @@ -489,6 +491,8 @@ struct d3d12_graphics_pipeline_state struct VkPipelineDepthStencilStateCreateInfo ds_desc; const struct d3d12_root_signature *root_signature; + + struct list compiled_pipelines; }; struct d3d12_compute_pipeline_state @@ -532,6 +536,21 @@ bool d3d12_pipeline_state_is_render_pass_compatible(const struct d3d12_pipeline_ const struct d3d12_pipeline_state *state_b) DECLSPEC_HIDDEN; struct d3d12_pipeline_state *unsafe_impl_from_ID3D12PipelineState(ID3D12PipelineState *iface) DECLSPEC_HIDDEN; +struct vkd3d_pipeline_key +{ + const struct d3d12_graphics_pipeline_state *state; + VkPrimitiveTopology topology; + uint32_t strides[D3D12_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT]; +}; + +struct vkd3d_compiled_pipeline +{ + struct rb_entry entry; + struct vkd3d_pipeline_key key; + VkPipeline vk_pipeline; + struct list list; +}; + struct vkd3d_buffer { VkBuffer vk_buffer; @@ -562,10 +581,6 @@ struct d3d12_command_allocator size_t framebuffers_size; size_t framebuffer_count; - VkPipeline *pipelines; - size_t pipelines_size; - size_t pipeline_count; - VkDescriptorPool *descriptor_pools; size_t descriptor_pools_size; size_t descriptor_pool_count; @@ -701,6 +716,8 @@ struct d3d12_device struct vkd3d_gpu_va_allocator gpu_va_allocator; struct vkd3d_fence_worker fence_worker; + pthread_mutex_t pipeline_cache_mutex; + struct rb_tree pipeline_cache; VkPipelineCache vk_pipeline_cache; /* A sampler used for SpvOpImageFetch. */ @@ -733,6 +750,12 @@ void d3d12_device_mark_as_removed(struct d3d12_device *device, HRESULT reason, const char *message, ...) VKD3D_PRINTF_FUNC(3, 4) DECLSPEC_HIDDEN; struct d3d12_device *unsafe_impl_from_ID3D12Device(ID3D12Device *iface) DECLSPEC_HIDDEN; +void d3d12_device_destroy_compiled_pipelines(struct d3d12_device *device, struct list *list) DECLSPEC_HIDDEN; +VkPipeline d3d12_device_find_cached_pipeline(struct d3d12_device *device, + const struct vkd3d_pipeline_key *key) DECLSPEC_HIDDEN; +bool d3d12_device_put_pipeline_to_cache(struct d3d12_device *device, + const struct vkd3d_pipeline_key *key, VkPipeline vk_pipeline, struct list *list) DECLSPEC_HIDDEN; + HRESULT vkd3d_create_buffer(struct d3d12_device *device, const D3D12_HEAP_PROPERTIES *heap_properties, D3D12_HEAP_FLAGS heap_flags, const D3D12_RESOURCE_DESC *desc, VkBuffer *vk_buffer) DECLSPEC_HIDDEN; -- 2.16.4

2 1

[PATCH vkd3d 06/11] vkd3d: Set pointer to NULL if committed resource creation fails.
by Józef Kucia 12 Sep '18

12 Sep '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/device.c | 11 +++++++---- tests/d3d12.c | 9 +++++++++ 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index c11f474a28d2..e8bf7c957b58 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1914,22 +1914,25 @@ static D3D12_HEAP_PROPERTIES * STDMETHODCALLTYPE d3d12_device_GetCustomHeapPrope static HRESULT STDMETHODCALLTYPE d3d12_device_CreateCommittedResource(ID3D12Device *iface, const D3D12_HEAP_PROPERTIES *heap_properties, D3D12_HEAP_FLAGS heap_flags, const D3D12_RESOURCE_DESC *desc, D3D12_RESOURCE_STATES initial_state, - const D3D12_CLEAR_VALUE *optimized_clear_value, REFIID riid, void **resource) + const D3D12_CLEAR_VALUE *optimized_clear_value, REFIID iid, void **resource) { struct d3d12_device *device = impl_from_ID3D12Device(iface); struct d3d12_resource *object; HRESULT hr; TRACE("iface %p, heap_properties %p, heap_flags %#x, desc %p, initial_state %#x, " - "optimized_clear_value %p, riid %s, resource %p.\n", + "optimized_clear_value %p, iid %s, resource %p.\n", iface, heap_properties, heap_flags, desc, initial_state, - optimized_clear_value, debugstr_guid(riid), resource); + optimized_clear_value, debugstr_guid(iid), resource); if (FAILED(hr = d3d12_committed_resource_create(device, heap_properties, heap_flags, desc, initial_state, optimized_clear_value, &object))) + { + *resource = NULL; return hr; + } - return return_interface(&object->ID3D12Resource_iface, &IID_ID3D12Resource, riid, resource); + return return_interface(&object->ID3D12Resource_iface, &IID_ID3D12Resource, iid, resource); } static HRESULT STDMETHODCALLTYPE d3d12_device_CreateHeap(ID3D12Device *iface, diff --git a/tests/d3d12.c b/tests/d3d12.c index 34b4fdf101fb..5a39f0c1dfa1 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -1656,10 +1656,19 @@ static void test_create_committed_resource(void) /* A texture cannot be created on a UPLOAD heap. */ heap_properties.Type = D3D12_HEAP_TYPE_UPLOAD; + resource = (void *)0xdeadbeef; hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc, D3D12_RESOURCE_STATE_GENERIC_READ, NULL, &IID_ID3D12Resource, (void **)&resource); ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(!resource, "Got unexpected pointer %p.\n", resource); + + resource = (void *)0xdeadbeef; + hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE, + &resource_desc, D3D12_RESOURCE_STATE_GENERIC_READ, NULL, + &IID_ID3D12Device, (void **)&resource); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(!resource, "Got unexpected pointer %p.\n", resource); /* A texture cannot be created on a READBACK heap. */ heap_properties.Type = D3D12_HEAP_TYPE_READBACK; -- 2.16.4

2 1

[PATCH vkd3d 09/11] vkd3d: Reset command list state in d3d12_command_list_Reset().
by Józef Kucia 12 Sep '18

12 Sep '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 61 +++++++++++++++++++++++++++------------------------- 1 file changed, 32 insertions(+), 29 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index d5bbee966ecd..2fc564312f8e 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -1713,15 +1713,39 @@ static HRESULT STDMETHODCALLTYPE d3d12_command_list_Close(ID3D12GraphicsCommandL return S_OK; } +static void d3d12_command_list_reset_state(struct d3d12_command_list *list, + ID3D12PipelineState *initial_pipeline_state) +{ + ID3D12GraphicsCommandList *iface = &list->ID3D12GraphicsCommandList_iface; + + memset(list->strides, 0, sizeof(list->strides)); + list->primitive_topology = VK_PRIMITIVE_TOPOLOGY_POINT_LIST; + + memset(list->views, 0, sizeof(list->views)); + list->fb_width = 0; + list->fb_height = 0; + list->fb_layer_count = 0; + + list->current_framebuffer = VK_NULL_HANDLE; + list->current_pipeline = VK_NULL_HANDLE; + list->current_render_pass = VK_NULL_HANDLE; + + memset(list->pipeline_bindings, 0, sizeof(list->pipeline_bindings)); + + list->state = NULL; + + ID3D12GraphicsCommandList_SetPipelineState(iface, initial_pipeline_state); +} + static HRESULT STDMETHODCALLTYPE d3d12_command_list_Reset(ID3D12GraphicsCommandList *iface, - ID3D12CommandAllocator *allocator, ID3D12PipelineState *initial_state) + ID3D12CommandAllocator *allocator, ID3D12PipelineState *initial_pipeline_state) { struct d3d12_command_allocator *allocator_impl = unsafe_impl_from_ID3D12CommandAllocator(allocator); struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList(iface); HRESULT hr; - TRACE("iface %p, allocator %p, initial_state %p.\n", - iface, allocator, initial_state); + TRACE("iface %p, allocator %p, initial_pipeline_state %p.\n", + iface, allocator, initial_pipeline_state); if (!allocator_impl) { @@ -1738,12 +1762,9 @@ static HRESULT STDMETHODCALLTYPE d3d12_command_list_Reset(ID3D12GraphicsCommandL if (SUCCEEDED(hr = d3d12_command_allocator_allocate_command_buffer(allocator_impl, list))) { list->allocator = allocator_impl; - - ID3D12GraphicsCommandList_SetPipelineState(&list->ID3D12GraphicsCommandList_iface, initial_state); + d3d12_command_list_reset_state(list, initial_pipeline_state); } - memset(list->pipeline_bindings, 0, sizeof(list->pipeline_bindings)); - return hr; } @@ -4239,30 +4260,12 @@ static HRESULT d3d12_command_list_init(struct d3d12_command_list *list, struct d list->allocator = allocator; - memset(list->strides, 0, sizeof(list->strides)); - list->primitive_topology = VK_PRIMITIVE_TOPOLOGY_POINT_LIST; - - memset(list->views, 0, sizeof(list->views)); - list->fb_width = 0; - list->fb_height = 0; - list->fb_layer_count = 0; - - list->current_framebuffer = VK_NULL_HANDLE; - list->current_pipeline = VK_NULL_HANDLE; - list->current_render_pass = VK_NULL_HANDLE; - memset(list->pipeline_bindings, 0, sizeof(list->pipeline_bindings)); - - list->state = NULL; - - if (FAILED(hr = d3d12_command_allocator_allocate_command_buffer(allocator, list))) - { + if (SUCCEEDED(hr = d3d12_command_allocator_allocate_command_buffer(allocator, list))) + d3d12_command_list_reset_state(list, initial_pipeline_state); + else ID3D12Device_Release(&device->ID3D12Device_iface); - return hr; - } - - ID3D12GraphicsCommandList_SetPipelineState(&list->ID3D12GraphicsCommandList_iface, initial_pipeline_state); - return S_OK; + return hr; } HRESULT d3d12_command_list_create(struct d3d12_device *device, -- 2.16.4

2 1

[PATCH vkd3d 08/11] vkd3d: Fix initial pipeline state.
by Józef Kucia 12 Sep '18

12 Sep '18

From: Józef Kucia <jkucia(a)codeweavers.com> d3d12_command_list_begin_command_buffer() was using the previous initial pipeline state when called from d3d12_command_list_Reset(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 8 ++++---- libs/vkd3d/vkd3d_private.h | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index f338707391bc..d5bbee966ecd 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -634,8 +634,6 @@ static HRESULT d3d12_command_list_begin_command_buffer(struct d3d12_command_list list->is_recording = true; list->is_valid = true; - ID3D12GraphicsCommandList_SetPipelineState(&list->ID3D12GraphicsCommandList_iface, list->pipeline_state); - return S_OK; } @@ -1740,7 +1738,8 @@ static HRESULT STDMETHODCALLTYPE d3d12_command_list_Reset(ID3D12GraphicsCommandL if (SUCCEEDED(hr = d3d12_command_allocator_allocate_command_buffer(allocator_impl, list))) { list->allocator = allocator_impl; - list->pipeline_state = initial_state; + + ID3D12GraphicsCommandList_SetPipelineState(&list->ID3D12GraphicsCommandList_iface, initial_state); } memset(list->pipeline_bindings, 0, sizeof(list->pipeline_bindings)); @@ -4239,7 +4238,6 @@ static HRESULT d3d12_command_list_init(struct d3d12_command_list *list, struct d ID3D12Device_AddRef(&device->ID3D12Device_iface); list->allocator = allocator; - list->pipeline_state = initial_pipeline_state; memset(list->strides, 0, sizeof(list->strides)); list->primitive_topology = VK_PRIMITIVE_TOPOLOGY_POINT_LIST; @@ -4262,6 +4260,8 @@ static HRESULT d3d12_command_list_init(struct d3d12_command_list *list, struct d return hr; } + ID3D12GraphicsCommandList_SetPipelineState(&list->ID3D12GraphicsCommandList_iface, initial_pipeline_state); + return S_OK; } diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index cb11866de66e..37ad13c132cd 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -614,7 +614,6 @@ struct d3d12_command_list LONG refcount; D3D12_COMMAND_LIST_TYPE type; - ID3D12PipelineState *pipeline_state; VkCommandBuffer vk_command_buffer; bool is_recording; -- 2.16.4

2 1

[PATCH vkd3d 05/11] vkd3d: Factor out d3d12_command_list_create_graphics_pipeline().
by Józef Kucia 12 Sep '18

12 Sep '18

From: Józef Kucia <jkucia(a)codeweavers.com> In preparation for pipeline cache. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 37 +++++++++++++++++++++++-------------- 1 file changed, 23 insertions(+), 14 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 09402699bfca..f338707391bc 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -1817,7 +1817,8 @@ static bool d3d12_command_list_update_current_framebuffer(struct d3d12_command_l return true; } -static bool d3d12_command_list_update_current_pipeline(struct d3d12_command_list *list) +static VkPipeline d3d12_command_list_create_graphics_pipeline(struct d3d12_command_list *list, + const struct d3d12_graphics_pipeline_state *state) { struct VkVertexInputBindingDescription bindings[D3D12_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT]; const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs; @@ -1826,7 +1827,6 @@ static bool d3d12_command_list_update_current_pipeline(struct d3d12_command_list struct VkPipelineColorBlendStateCreateInfo blend_desc; struct VkGraphicsPipelineCreateInfo pipeline_desc; const struct d3d12_device *device = list->device; - struct d3d12_graphics_pipeline_state *state; size_t binding_count = 0; VkPipeline vk_pipeline; unsigned int i; @@ -1858,17 +1858,6 @@ static bool d3d12_command_list_update_current_pipeline(struct d3d12_command_list .pDynamicStates = dynamic_states, }; - if (list->current_pipeline != VK_NULL_HANDLE) - return true; - - if (list->state->vk_bind_point != VK_PIPELINE_BIND_POINT_GRAPHICS) - { - WARN("Pipeline state %p has bind point %#x.\n", list->state, list->state->vk_bind_point); - return false; - } - - state = &list->state->u.graphics; - for (i = 0, mask = 0; i < state->attribute_count; ++i) { struct VkVertexInputBindingDescription *b; @@ -1945,16 +1934,36 @@ static bool d3d12_command_list_update_current_pipeline(struct d3d12_command_list 1, &pipeline_desc, NULL, &vk_pipeline))) < 0) { WARN("Failed to create Vulkan graphics pipeline, vr %d.\n", vr); - return false; + return VK_NULL_HANDLE; } if (!d3d12_command_allocator_add_pipeline(list->allocator, vk_pipeline)) { WARN("Failed to add pipeline.\n"); VK_CALL(vkDestroyPipeline(device->vk_device, vk_pipeline, NULL)); + return VK_NULL_HANDLE; + } + + return vk_pipeline; +} + +static bool d3d12_command_list_update_current_pipeline(struct d3d12_command_list *list) +{ + const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs; + VkPipeline vk_pipeline; + + if (list->current_pipeline != VK_NULL_HANDLE) + return true; + + if (list->state->vk_bind_point != VK_PIPELINE_BIND_POINT_GRAPHICS) + { + WARN("Pipeline state %p has bind point %#x.\n", list->state, list->state->vk_bind_point); return false; } + if (!(vk_pipeline = d3d12_command_list_create_graphics_pipeline(list, &list->state->u.graphics))) + return false; + VK_CALL(vkCmdBindPipeline(list->vk_command_buffer, list->state->vk_bind_point, vk_pipeline)); list->current_pipeline = vk_pipeline; -- 2.16.4

2 1

[PATCH vkd3d 04/11] vkd3d: Reuse descriptor pools.
by Józef Kucia 12 Sep '18

12 Sep '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 68 ++++++++++++++++++++++++++++++++++++---------- libs/vkd3d/vkd3d_private.h | 4 +++ 2 files changed, 58 insertions(+), 14 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 609edea1c9fb..09402699bfca 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -806,16 +806,25 @@ static VkDescriptorPool d3d12_command_allocator_allocate_descriptor_pool( VkDescriptorPool vk_pool; VkResult vr; - pool_desc.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO; - pool_desc.pNext = NULL; - pool_desc.flags = 0; - pool_desc.maxSets = 512; - pool_desc.poolSizeCount = ARRAY_SIZE(pool_sizes); - pool_desc.pPoolSizes = pool_sizes; - if ((vr = VK_CALL(vkCreateDescriptorPool(vk_device, &pool_desc, NULL, &vk_pool))) < 0) - { - ERR("Failed to create descriptor pool, vr %d.\n", vr); - return VK_NULL_HANDLE; + if (allocator->free_descriptor_pool_count > 0) + { + vk_pool = allocator->free_descriptor_pools[allocator->free_descriptor_pool_count - 1]; + allocator->free_descriptor_pools[allocator->free_descriptor_pool_count - 1] = VK_NULL_HANDLE; + --allocator->free_descriptor_pool_count; + } + else + { + pool_desc.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO; + pool_desc.pNext = NULL; + pool_desc.flags = 0; + pool_desc.maxSets = 512; + pool_desc.poolSizeCount = ARRAY_SIZE(pool_sizes); + pool_desc.pPoolSizes = pool_sizes; + if ((vr = VK_CALL(vkCreateDescriptorPool(vk_device, &pool_desc, NULL, &vk_pool))) < 0) + { + ERR("Failed to create descriptor pool, vr %d.\n", vr); + return VK_NULL_HANDLE; + } } if (!(d3d12_command_allocator_add_descriptor_pool(allocator, vk_pool))) @@ -886,14 +895,40 @@ static void vkd3d_buffer_destroy(struct vkd3d_buffer *buffer, struct d3d12_devic VK_CALL(vkDestroyBuffer(device->vk_device, buffer->vk_buffer, NULL)); } -static void d3d12_command_allocator_free_resources(struct d3d12_command_allocator *allocator) +static void d3d12_command_allocator_free_resources(struct d3d12_command_allocator *allocator, + bool keep_reusable_resources) { struct d3d12_device *device = allocator->device; const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; - unsigned int i; + unsigned int i, j; allocator->vk_descriptor_pool = VK_NULL_HANDLE; + if (keep_reusable_resources) + { + if (vkd3d_array_reserve((void **)&allocator->free_descriptor_pools, + &allocator->free_descriptor_pools_size, + allocator->free_descriptor_pool_count + allocator->descriptor_pool_count, + sizeof(*allocator->free_descriptor_pools))) + { + for (i = 0, j = allocator->free_descriptor_pool_count; i < allocator->descriptor_pool_count; ++i, ++j) + { + VK_CALL(vkResetDescriptorPool(device->vk_device, allocator->descriptor_pools[i], 0)); + allocator->free_descriptor_pools[j] = allocator->descriptor_pools[i]; + } + allocator->free_descriptor_pool_count += allocator->descriptor_pool_count; + allocator->descriptor_pool_count = 0; + } + } + else + { + for (i = 0; i < allocator->free_descriptor_pool_count; ++i) + { + VK_CALL(vkDestroyDescriptorPool(device->vk_device, allocator->free_descriptor_pools[i], NULL)); + } + allocator->free_descriptor_pool_count = 0; + } + for (i = 0; i < allocator->transfer_buffer_count; ++i) { vkd3d_buffer_destroy(&allocator->transfer_buffers[i], device); @@ -990,11 +1025,12 @@ static ULONG STDMETHODCALLTYPE d3d12_command_allocator_Release(ID3D12CommandAllo if (allocator->current_command_list) d3d12_command_list_allocator_destroyed(allocator->current_command_list); - d3d12_command_allocator_free_resources(allocator); + d3d12_command_allocator_free_resources(allocator, false); vkd3d_free(allocator->transfer_buffers); vkd3d_free(allocator->buffer_views); vkd3d_free(allocator->views); vkd3d_free(allocator->descriptor_pools); + vkd3d_free(allocator->free_descriptor_pools); vkd3d_free(allocator->pipelines); vkd3d_free(allocator->framebuffers); vkd3d_free(allocator->passes); @@ -1078,7 +1114,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_command_allocator_Reset(ID3D12CommandAllo device = allocator->device; vk_procs = &device->vk_procs; - d3d12_command_allocator_free_resources(allocator); + d3d12_command_allocator_free_resources(allocator, true); if (allocator->command_buffer_count) { VK_CALL(vkFreeCommandBuffers(device->vk_device, allocator->vk_command_pool, @@ -1168,6 +1204,10 @@ static HRESULT d3d12_command_allocator_init(struct d3d12_command_allocator *allo allocator->vk_descriptor_pool = VK_NULL_HANDLE; + allocator->free_descriptor_pools = NULL; + allocator->free_descriptor_pools_size = 0; + allocator->free_descriptor_pool_count = 0; + allocator->passes = NULL; allocator->passes_size = 0; allocator->pass_count = 0; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 286186b46757..cb11866de66e 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -550,6 +550,10 @@ struct d3d12_command_allocator VkDescriptorPool vk_descriptor_pool; + VkDescriptorPool *free_descriptor_pools; + size_t free_descriptor_pools_size; + size_t free_descriptor_pool_count; + VkRenderPass *passes; size_t passes_size; size_t pass_count; -- 2.16.4

2 1

[PATCH vkd3d 03/11] vkd3d: Use bigger descriptor pools.
by Józef Kucia 12 Sep '18

12 Sep '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 150 ++++++++++++++++++++++++++++----------------- libs/vkd3d/vkd3d_private.h | 2 + 2 files changed, 95 insertions(+), 57 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 16c61352ed76..609edea1c9fb 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -787,6 +787,89 @@ static bool d3d12_command_allocator_add_transfer_buffer(struct d3d12_command_all return true; } +static VkDescriptorPool d3d12_command_allocator_allocate_descriptor_pool( + struct d3d12_command_allocator *allocator) +{ + static const VkDescriptorPoolSize pool_sizes[] = + { + {VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, 1024}, + {VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER, 1024}, + {VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE, 1024}, + {VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER, 1024}, + {VK_DESCRIPTOR_TYPE_STORAGE_IMAGE, 1024}, + {VK_DESCRIPTOR_TYPE_SAMPLER, 1024}, + }; + struct d3d12_device *device = allocator->device; + const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; + struct VkDescriptorPoolCreateInfo pool_desc; + VkDevice vk_device = device->vk_device; + VkDescriptorPool vk_pool; + VkResult vr; + + pool_desc.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO; + pool_desc.pNext = NULL; + pool_desc.flags = 0; + pool_desc.maxSets = 512; + pool_desc.poolSizeCount = ARRAY_SIZE(pool_sizes); + pool_desc.pPoolSizes = pool_sizes; + if ((vr = VK_CALL(vkCreateDescriptorPool(vk_device, &pool_desc, NULL, &vk_pool))) < 0) + { + ERR("Failed to create descriptor pool, vr %d.\n", vr); + return VK_NULL_HANDLE; + } + + if (!(d3d12_command_allocator_add_descriptor_pool(allocator, vk_pool))) + { + ERR("Failed to add descriptor pool.\n"); + VK_CALL(vkDestroyDescriptorPool(vk_device, vk_pool, NULL)); + return VK_NULL_HANDLE; + } + + return vk_pool; +} + +static VkDescriptorSet d3d12_command_allocator_allocate_descriptor_set( + struct d3d12_command_allocator *allocator, VkDescriptorSetLayout vk_set_layout) +{ + struct d3d12_device *device = allocator->device; + const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; + struct VkDescriptorSetAllocateInfo set_desc; + VkDevice vk_device = device->vk_device; + VkDescriptorSet vk_descriptor_set; + VkResult vr; + + if (!allocator->vk_descriptor_pool) + allocator->vk_descriptor_pool = d3d12_command_allocator_allocate_descriptor_pool(allocator); + if (!allocator->vk_descriptor_pool) + return VK_NULL_HANDLE; + + set_desc.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOCATE_INFO; + set_desc.pNext = NULL; + set_desc.descriptorPool = allocator->vk_descriptor_pool; + set_desc.descriptorSetCount = 1; + set_desc.pSetLayouts = &vk_set_layout; + if ((vr = VK_CALL(vkAllocateDescriptorSets(vk_device, &set_desc, &vk_descriptor_set))) >= 0) + return vk_descriptor_set; + + allocator->vk_descriptor_pool = VK_NULL_HANDLE; + if (vr == VK_ERROR_FRAGMENTED_POOL || vr == VK_ERROR_OUT_OF_POOL_MEMORY_KHR) + allocator->vk_descriptor_pool = d3d12_command_allocator_allocate_descriptor_pool(allocator); + if (!allocator->vk_descriptor_pool) + { + ERR("Failed to allocate descriptor set, vr %d.\n", vr); + return VK_NULL_HANDLE; + } + + set_desc.descriptorPool = allocator->vk_descriptor_pool; + if ((vr = VK_CALL(vkAllocateDescriptorSets(vk_device, &set_desc, &vk_descriptor_set))) < 0) + { + FIXME("Failed to allocate descriptor set from a new pool, vr %d.\n", vr); + return VK_NULL_HANDLE; + } + + return vk_descriptor_set; +} + static void d3d12_command_list_allocator_destroyed(struct d3d12_command_list *list) { TRACE("list %p.\n", list); @@ -809,6 +892,8 @@ static void d3d12_command_allocator_free_resources(struct d3d12_command_allocato const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; unsigned int i; + allocator->vk_descriptor_pool = VK_NULL_HANDLE; + for (i = 0; i < allocator->transfer_buffer_count; ++i) { vkd3d_buffer_destroy(&allocator->transfer_buffers[i], device); @@ -1081,6 +1166,8 @@ static HRESULT d3d12_command_allocator_init(struct d3d12_command_allocator *allo return hresult_from_vk_result(vr); } + allocator->vk_descriptor_pool = VK_NULL_HANDLE; + allocator->passes = NULL; allocator->passes_size = 0; allocator->pass_count = 0; @@ -1834,55 +1921,6 @@ static bool d3d12_command_list_update_current_pipeline(struct d3d12_command_list return true; } -static VkDescriptorSet d3d12_command_list_allocate_descriptor_set(struct d3d12_command_list *list, - const VkDescriptorPoolSize *pool_sizes, unsigned int pool_size_count, - VkDescriptorSetLayout vk_set_layout) -{ - const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs; - VkDevice vk_device = list->device->vk_device; - struct VkDescriptorSetAllocateInfo set_desc; - struct VkDescriptorPoolCreateInfo pool_desc; - VkDescriptorSet vk_descriptor_set; - VkDescriptorPool vk_pool; - VkResult vr; - - if (!pool_size_count) - return VK_NULL_HANDLE; - - pool_desc.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO; - pool_desc.pNext = NULL; - pool_desc.flags = 0; - pool_desc.maxSets = 1; - pool_desc.poolSizeCount = pool_size_count; - pool_desc.pPoolSizes = pool_sizes; - if ((vr = VK_CALL(vkCreateDescriptorPool(vk_device, &pool_desc, NULL, &vk_pool))) < 0) - { - ERR("Failed to create descriptor pool, vr %d.\n", vr); - return VK_NULL_HANDLE; - } - - set_desc.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOCATE_INFO; - set_desc.pNext = NULL; - set_desc.descriptorPool = vk_pool; - set_desc.descriptorSetCount = 1; - set_desc.pSetLayouts = &vk_set_layout; - if ((vr = VK_CALL(vkAllocateDescriptorSets(vk_device, &set_desc, &vk_descriptor_set))) < 0) - { - ERR("Failed to allocate descriptor set, vr %d.\n", vr); - VK_CALL(vkDestroyDescriptorPool(vk_device, vk_pool, NULL)); - return VK_NULL_HANDLE; - } - - if (!(d3d12_command_allocator_add_descriptor_pool(list->allocator, vk_pool))) - { - ERR("Failed to add descriptor pool.\n"); - VK_CALL(vkDestroyDescriptorPool(vk_device, vk_pool, NULL)); - return VK_NULL_HANDLE; - } - - return vk_descriptor_set; -} - static void d3d12_command_list_copy_descriptors(struct d3d12_command_list *list, const struct vkd3d_pipeline_bindings *bindings, VkDescriptorSet src_set) { @@ -2010,8 +2048,8 @@ static void d3d12_command_list_prepare_descriptors(struct d3d12_command_list *li * by an update command, or freed) between when the command is recorded * and when the command completes executing on the queue." */ - bindings->descriptor_set = d3d12_command_list_allocate_descriptor_set(list, - root_signature->pool_sizes, root_signature->pool_size_count, root_signature->vk_set_layout); + bindings->descriptor_set = d3d12_command_allocator_allocate_descriptor_set(list->allocator, + root_signature->vk_set_layout); bindings->in_use = false; if (previous_descriptor_set) @@ -2175,7 +2213,6 @@ static void d3d12_command_list_update_uav_counter_descriptors(struct d3d12_comma VkDevice vk_device = list->device->vk_device; VkWriteDescriptorSet *vk_descriptor_writes; VkDescriptorSet vk_descriptor_set; - VkDescriptorPoolSize pool_size; unsigned int uav_counter_count; unsigned int i; @@ -2184,10 +2221,9 @@ static void d3d12_command_list_update_uav_counter_descriptors(struct d3d12_comma uav_counter_count = vkd3d_popcount(state->uav_counter_mask); - pool_size.type = VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER; - pool_size.descriptorCount = uav_counter_count; - vk_descriptor_set = d3d12_command_list_allocate_descriptor_set(list, - &pool_size, 1, state->vk_set_layout); + vk_descriptor_set = d3d12_command_allocator_allocate_descriptor_set(list->allocator, state->vk_set_layout); + if (!vk_descriptor_set) + return; if (!(vk_descriptor_writes = vkd3d_calloc(uav_counter_count, sizeof(*vk_descriptor_writes)))) return; @@ -2205,7 +2241,7 @@ static void d3d12_command_list_update_uav_counter_descriptors(struct d3d12_comma vk_descriptor_writes[i].dstBinding = uav_counter->binding.binding; vk_descriptor_writes[i].dstArrayElement = 0; vk_descriptor_writes[i].descriptorCount = 1; - vk_descriptor_writes[i].descriptorType = pool_size.type; + vk_descriptor_writes[i].descriptorType = VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER; vk_descriptor_writes[i].pImageInfo = NULL; vk_descriptor_writes[i].pBufferInfo = NULL; vk_descriptor_writes[i].pTexelBufferView = &vk_uav_counter_views[uav_counter->register_index]; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index df444471cf5b..286186b46757 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -548,6 +548,8 @@ struct d3d12_command_allocator VkCommandPool vk_command_pool; + VkDescriptorPool vk_descriptor_pool; + VkRenderPass *passes; size_t passes_size; size_t pass_count; -- 2.16.4

2 1

[PATCH vkd3d 02/11] vkd3d: Factor out d3d12_resource_init().
by Józef Kucia 12 Sep '18

12 Sep '18

From: Józef Kucia <jkucia(a)codeweavers.com> In preparation for placed resources. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/resource.c | 53 ++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 38 insertions(+), 15 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 37c8dff21073..88ab64552bb5 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -893,7 +893,7 @@ HRESULT d3d12_resource_validate_desc(const D3D12_RESOURCE_DESC *desc) return S_OK; } -static HRESULT d3d12_committed_resource_init(struct d3d12_resource *resource, struct d3d12_device *device, +static HRESULT d3d12_resource_init(struct d3d12_resource *resource, struct d3d12_device *device, const D3D12_HEAP_PROPERTIES *heap_properties, D3D12_HEAP_FLAGS heap_flags, const D3D12_RESOURCE_DESC *desc, D3D12_RESOURCE_STATES initial_state, const D3D12_CLEAR_VALUE *optimized_clear_value) @@ -941,6 +941,7 @@ static HRESULT d3d12_committed_resource_init(struct d3d12_resource *resource, st WARN("Ignoring optimized clear value.\n"); resource->gpu_address = 0; + resource->vk_memory = VK_NULL_HANDLE; resource->flags = 0; if (FAILED(hr = d3d12_resource_validate_desc(&resource->desc))) @@ -959,12 +960,6 @@ static HRESULT d3d12_committed_resource_init(struct d3d12_resource *resource, st d3d12_resource_destroy(resource, device); return E_OUTOFMEMORY; } - if (FAILED(hr = vkd3d_allocate_buffer_memory(device, resource->u.vk_buffer, - heap_properties, heap_flags, &resource->vk_memory))) - { - d3d12_resource_destroy(resource, device); - return hr; - } break; case D3D12_RESOURCE_DIMENSION_TEXTURE1D: @@ -975,12 +970,6 @@ static HRESULT d3d12_committed_resource_init(struct d3d12_resource *resource, st resource->flags |= VKD3D_RESOURCE_INITIAL_STATE_TRANSITION; if (FAILED(hr = vkd3d_create_image(resource, device, heap_properties, heap_flags))) return hr; - if (FAILED(hr = vkd3d_allocate_image_memory(device, resource->u.vk_image, - heap_properties, heap_flags, &resource->vk_memory))) - { - d3d12_resource_destroy(resource, device); - return hr; - } break; default: @@ -1001,7 +990,7 @@ static HRESULT d3d12_committed_resource_init(struct d3d12_resource *resource, st return S_OK; } -HRESULT d3d12_committed_resource_create(struct d3d12_device *device, +static HRESULT d3d12_resource_create(struct d3d12_device *device, const D3D12_HEAP_PROPERTIES *heap_properties, D3D12_HEAP_FLAGS heap_flags, const D3D12_RESOURCE_DESC *desc, D3D12_RESOURCE_STATES initial_state, const D3D12_CLEAR_VALUE *optimized_clear_value, struct d3d12_resource **resource) @@ -1012,13 +1001,47 @@ HRESULT d3d12_committed_resource_create(struct d3d12_device *device, if (!(object = vkd3d_malloc(sizeof(*object)))) return E_OUTOFMEMORY; - if (FAILED(hr = d3d12_committed_resource_init(object, device, heap_properties, heap_flags, + if (FAILED(hr = d3d12_resource_init(object, device, heap_properties, heap_flags, desc, initial_state, optimized_clear_value))) { vkd3d_free(object); return hr; } + *resource = object; + + return hr; +} + +HRESULT d3d12_committed_resource_create(struct d3d12_device *device, + const D3D12_HEAP_PROPERTIES *heap_properties, D3D12_HEAP_FLAGS heap_flags, + const D3D12_RESOURCE_DESC *desc, D3D12_RESOURCE_STATES initial_state, + const D3D12_CLEAR_VALUE *optimized_clear_value, struct d3d12_resource **resource) +{ + struct d3d12_resource *object; + HRESULT hr; + + if (FAILED(hr = d3d12_resource_create(device, heap_properties, heap_flags, + desc, initial_state, optimized_clear_value, &object))) + return hr; + + if (d3d12_resource_is_buffer(object)) + { + hr = vkd3d_allocate_buffer_memory(device, object->u.vk_buffer, + heap_properties, heap_flags, &object->vk_memory); + } + else + { + hr = vkd3d_allocate_image_memory(device, object->u.vk_image, + heap_properties, heap_flags, &object->vk_memory); + } + + if (FAILED(hr)) + { + d3d12_resource_Release(&object->ID3D12Resource_iface); + return hr; + } + TRACE("Created committed resource %p.\n", object); *resource = object; -- 2.16.4

2 1

[PATCH vkd3d 01/11] vkd3d: Pass VkImage to vkd3d_allocate_image_memory().
by Józef Kucia 12 Sep '18

12 Sep '18

From: Józef Kucia <jkucia(a)codeweavers.com> For consistency with vkd3d_allocate_buffer_memory(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/resource.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 219b95c37194..37c8dff21073 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -501,27 +501,25 @@ HRESULT vkd3d_allocate_buffer_memory(struct d3d12_device *device, VkBuffer vk_bu return S_OK; } -static HRESULT vkd3d_allocate_image_memory(struct d3d12_resource *resource, struct d3d12_device *device, - const D3D12_HEAP_PROPERTIES *heap_properties, D3D12_HEAP_FLAGS heap_flags) +static HRESULT vkd3d_allocate_image_memory(struct d3d12_device *device, VkImage vk_image, + const D3D12_HEAP_PROPERTIES *heap_properties, D3D12_HEAP_FLAGS heap_flags, + VkDeviceMemory *vk_memory) { const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; VkMemoryRequirements memory_requirements; VkResult vr; HRESULT hr; - assert(D3D12_RESOURCE_DIMENSION_TEXTURE1D <= resource->desc.Dimension - && resource->desc.Dimension <= D3D12_RESOURCE_DIMENSION_TEXTURE3D); - - VK_CALL(vkGetImageMemoryRequirements(device->vk_device, resource->u.vk_image, &memory_requirements)); + VK_CALL(vkGetImageMemoryRequirements(device->vk_device, vk_image, &memory_requirements)); if (FAILED(hr = vkd3d_allocate_device_memory(device, heap_properties, heap_flags, - &memory_requirements, &resource->vk_memory))) + &memory_requirements, vk_memory))) return hr; - if ((vr = VK_CALL(vkBindImageMemory(device->vk_device, resource->u.vk_image, resource->vk_memory, 0))) < 0) + if ((vr = VK_CALL(vkBindImageMemory(device->vk_device, vk_image, *vk_memory, 0))) < 0) { WARN("Failed to bind memory, vr %d.\n", vr); - VK_CALL(vkFreeMemory(device->vk_device, resource->vk_memory, NULL)); - resource->vk_memory = VK_NULL_HANDLE; + VK_CALL(vkFreeMemory(device->vk_device, *vk_memory, NULL)); + *vk_memory = VK_NULL_HANDLE; return hresult_from_vk_result(vr); } @@ -977,7 +975,8 @@ static HRESULT d3d12_committed_resource_init(struct d3d12_resource *resource, st resource->flags |= VKD3D_RESOURCE_INITIAL_STATE_TRANSITION; if (FAILED(hr = vkd3d_create_image(resource, device, heap_properties, heap_flags))) return hr; - if (FAILED(hr = vkd3d_allocate_image_memory(resource, device, heap_properties, heap_flags))) + if (FAILED(hr = vkd3d_allocate_image_memory(device, resource->u.vk_image, + heap_properties, heap_flags, &resource->vk_memory))) { d3d12_resource_destroy(resource, device); return hr; -- 2.16.4

2 1

[PATCH] winebus.sys: Implement IRP_MN_QUERY_DEVICE_RELATIONS
by Aric Stewart 12 Sep '18

12 Sep '18

Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- dlls/winebus.sys/main.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+)

1 0

[PATCH] winebus.sys: Improve unloading the winebus driver
by Aric Stewart 12 Sep '18

12 Sep '18

Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- dlls/winebus.sys/bus.h | 3 +++ dlls/winebus.sys/bus_iohid.c | 33 ++++++++++++++++++++++++--------- dlls/winebus.sys/bus_sdl.c | 10 ++++++++++ dlls/winebus.sys/bus_udev.c | 10 ++++++++++ dlls/winebus.sys/main.c | 9 +++++++++ 5 files changed, 56 insertions(+), 9 deletions(-)

1 0

[PATCH 2/2] d2d1: Simplify the WIC render target implementation.
by Henri Verbeet 12 Sep '18

12 Sep '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d2d1/d2d1_private.h | 2 +- dlls/d2d1/factory.c | 2 +- dlls/d2d1/wic_render_target.c | 654 +----------------------------------------- 3 files changed, 12 insertions(+), 646 deletions(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index f9fd8c72cd6..4148a685bac 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -162,7 +162,7 @@ HRESULT d2d_d3d_render_target_create_rtv(ID2D1RenderTarget *render_target, IDXGI struct d2d_wic_render_target { - ID2D1RenderTarget ID2D1RenderTarget_iface; + IUnknown IUnknown_iface; LONG refcount; IDXGISurface *dxgi_surface; diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c index b46d14c0d7e..1a28663e891 100644 --- a/dlls/d2d1/factory.c +++ b/dlls/d2d1/factory.c @@ -300,7 +300,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateWicBitmapRenderTarget(ID2D1Fa } TRACE("Created render target %p.\n", object); - *render_target = &object->ID2D1RenderTarget_iface; + *render_target = object->dxgi_target; return S_OK; } diff --git a/dlls/d2d1/wic_render_target.c b/dlls/d2d1/wic_render_target.c index e342535838f..27236e29631 100644 --- a/dlls/d2d1/wic_render_target.c +++ b/dlls/d2d1/wic_render_target.c @@ -27,7 +27,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d2d); static inline struct d2d_wic_render_target *impl_from_IUnknown(IUnknown *iface) { - return CONTAINING_RECORD(iface, struct d2d_wic_render_target, ID2D1RenderTarget_iface); + return CONTAINING_RECORD(iface, struct d2d_wic_render_target, IUnknown_iface); } static HRESULT d2d_wic_render_target_present(IUnknown *outer_unknown) @@ -102,32 +102,18 @@ end: return S_OK; } -static inline struct d2d_wic_render_target *impl_from_ID2D1RenderTarget(ID2D1RenderTarget *iface) +static HRESULT STDMETHODCALLTYPE d2d_wic_render_target_QueryInterface(IUnknown *iface, REFIID iid, void **out) { - return CONTAINING_RECORD(iface, struct d2d_wic_render_target, ID2D1RenderTarget_iface); -} - -static HRESULT STDMETHODCALLTYPE d2d_wic_render_target_QueryInterface(ID2D1RenderTarget *iface, REFIID iid, void **out) -{ - struct d2d_wic_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + struct d2d_wic_render_target *render_target = impl_from_IUnknown(iface); TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); - if (IsEqualGUID(iid, &IID_ID2D1RenderTarget) - || IsEqualGUID(iid, &IID_ID2D1Resource) - || IsEqualGUID(iid, &IID_IUnknown)) - { - ID2D1RenderTarget_AddRef(iface); - *out = iface; - return S_OK; - } - return IUnknown_QueryInterface(render_target->dxgi_inner, iid, out); } -static ULONG STDMETHODCALLTYPE d2d_wic_render_target_AddRef(ID2D1RenderTarget *iface) +static ULONG STDMETHODCALLTYPE d2d_wic_render_target_AddRef(IUnknown *iface) { - struct d2d_wic_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + struct d2d_wic_render_target *render_target = impl_from_IUnknown(iface); ULONG refcount = InterlockedIncrement(&render_target->refcount); TRACE("%p increasing refcount to %u.\n", iface, refcount); @@ -135,9 +121,9 @@ static ULONG STDMETHODCALLTYPE d2d_wic_render_target_AddRef(ID2D1RenderTarget *i return refcount; } -static ULONG STDMETHODCALLTYPE d2d_wic_render_target_Release(ID2D1RenderTarget *iface) +static ULONG STDMETHODCALLTYPE d2d_wic_render_target_Release(IUnknown *iface) { - struct d2d_wic_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + struct d2d_wic_render_target *render_target = impl_from_IUnknown(iface); ULONG refcount = InterlockedDecrement(&render_target->refcount); TRACE("%p decreasing refcount to %u.\n", iface, refcount); @@ -154,631 +140,11 @@ static ULONG STDMETHODCALLTYPE d2d_wic_render_target_Release(ID2D1RenderTarget * return refcount; } -static void STDMETHODCALLTYPE d2d_wic_render_target_GetFactory(ID2D1RenderTarget *iface, ID2D1Factory **factory) -{ - struct d2d_wic_render_target *render_target = impl_from_ID2D1RenderTarget(iface); - - TRACE("iface %p, factory %p.\n", iface, factory); - - ID2D1RenderTarget_GetFactory(render_target->dxgi_target, factory); -} - -static HRESULT STDMETHODCALLTYPE d2d_wic_render_target_CreateBitmap(ID2D1RenderTarget *iface, - D2D1_SIZE_U size, const void *src_data, UINT32 pitch, const D2D1_BITMAP_PROPERTIES *desc, ID2D1Bitmap **bitmap) -{ - struct d2d_wic_render_target *render_target = impl_from_ID2D1RenderTarget(iface); - - TRACE("iface %p, size {%u, %u}, src_data %p, pitch %u, desc %p, bitmap %p.\n", - iface, size.width, size.height, src_data, pitch, desc, bitmap); - - return ID2D1RenderTarget_CreateBitmap(render_target->dxgi_target, size, src_data, pitch, desc, bitmap); -} - -static HRESULT STDMETHODCALLTYPE d2d_wic_render_target_CreateBitmapFromWicBitmap(ID2D1RenderTarget *iface, - IWICBitmapSource *bitmap_source, const D2D1_BITMAP_PROPERTIES *desc, ID2D1Bitmap **bitmap) -{ - struct d2d_wic_render_target *render_target = impl_from_ID2D1RenderTarget(iface); - - TRACE("iface %p, bitmap_source %p, desc %p, bitmap %p.\n", - iface, bitmap_source, desc, bitmap); - - return ID2D1RenderTarget_CreateBitmapFromWicBitmap(render_target->dxgi_target, bitmap_source, desc, bitmap); -} - -static HRESULT STDMETHODCALLTYPE d2d_wic_render_target_CreateSharedBitmap(ID2D1RenderTarget *iface, - REFIID iid, void *data, const D2D1_BITMAP_PROPERTIES *desc, ID2D1Bitmap **bitmap) -{ - struct d2d_wic_render_target *render_target = impl_from_ID2D1RenderTarget(iface); - - TRACE("iface %p, iid %s, data %p, desc %p, bitmap %p.\n", - iface, debugstr_guid(iid), data, desc, bitmap); - - return ID2D1RenderTarget_CreateSharedBitmap(render_target->dxgi_target, iid, data, desc, bitmap); -} - -static HRESULT STDMETHODCALLTYPE d2d_wic_render_target_CreateBitmapBrush(ID2D1RenderTarget *iface, - ID2D1Bitmap *bitmap, const D2D1_BITMAP_BRUSH_PROPERTIES *bitmap_brush_desc, - const D2D1_BRUSH_PROPERTIES *brush_desc, ID2D1BitmapBrush **brush) -{ - struct d2d_wic_render_target *render_target = impl_from_ID2D1RenderTarget(iface); - - TRACE("iface %p, bitmap %p, bitmap_brush_desc %p, brush_desc %p, brush %p.\n", - iface, bitmap, bitmap_brush_desc, brush_desc, brush); - - return ID2D1RenderTarget_CreateBitmapBrush(render_target->dxgi_target, - bitmap, bitmap_brush_desc, brush_desc, brush); -} - -static HRESULT STDMETHODCALLTYPE d2d_wic_render_target_CreateSolidColorBrush(ID2D1RenderTarget *iface, - const D2D1_COLOR_F *color, const D2D1_BRUSH_PROPERTIES *desc, ID2D1SolidColorBrush **brush) -{ - struct d2d_wic_render_target *render_target = impl_from_ID2D1RenderTarget(iface); - - TRACE("iface %p, color %p, desc %p, brush %p.\n", iface, color, desc, brush); - - return ID2D1RenderTarget_CreateSolidColorBrush(render_target->dxgi_target, color, desc, brush); -} - -static HRESULT STDMETHODCALLTYPE d2d_wic_render_target_CreateGradientStopCollection(ID2D1RenderTarget *iface, - const D2D1_GRADIENT_STOP *stops, UINT32 stop_count, D2D1_GAMMA gamma, D2D1_EXTEND_MODE extend_mode, - ID2D1GradientStopCollection **gradient) -{ - struct d2d_wic_render_target *render_target = impl_from_ID2D1RenderTarget(iface); - - TRACE("iface %p, stops %p, stop_count %u, gamma %#x, extend_mode %#x, gradient %p.\n", - iface, stops, stop_count, gamma, extend_mode, gradient); - - return ID2D1RenderTarget_CreateGradientStopCollection(render_target->dxgi_target, - stops, stop_count, gamma, extend_mode, gradient); -} - -static HRESULT STDMETHODCALLTYPE d2d_wic_render_target_CreateLinearGradientBrush(ID2D1RenderTarget *iface, - const D2D1_LINEAR_GRADIENT_BRUSH_PROPERTIES *gradient_brush_desc, const D2D1_BRUSH_PROPERTIES *brush_desc, - ID2D1GradientStopCollection *gradient, ID2D1LinearGradientBrush **brush) -{ - struct d2d_wic_render_target *render_target = impl_from_ID2D1RenderTarget(iface); - - TRACE("iface %p, gradient_brush_desc %p, brush_desc %p, gradient %p, brush %p.\n", - iface, gradient_brush_desc, brush_desc, gradient, brush); - - return ID2D1RenderTarget_CreateLinearGradientBrush(render_target->dxgi_target, - gradient_brush_desc, brush_desc, gradient, brush); -} - -static HRESULT STDMETHODCALLTYPE d2d_wic_render_target_CreateRadialGradientBrush(ID2D1RenderTarget *iface, - const D2D1_RADIAL_GRADIENT_BRUSH_PROPERTIES *gradient_brush_desc, const D2D1_BRUSH_PROPERTIES *brush_desc, - ID2D1GradientStopCollection *gradient, ID2D1RadialGradientBrush **brush) -{ - struct d2d_wic_render_target *render_target = impl_from_ID2D1RenderTarget(iface); - - TRACE("iface %p, gradient_brush_desc %p, brush_desc %p, gradient %p, brush %p.\n", - iface, gradient_brush_desc, brush_desc, gradient, brush); - - return ID2D1RenderTarget_CreateRadialGradientBrush(render_target->dxgi_target, - gradient_brush_desc, brush_desc, gradient, brush); -} - -static HRESULT STDMETHODCALLTYPE d2d_wic_render_target_CreateCompatibleRenderTarget(ID2D1RenderTarget *iface, - const D2D1_SIZE_F *size, const D2D1_SIZE_U *pixel_size, const D2D1_PIXEL_FORMAT *format, - D2D1_COMPATIBLE_RENDER_TARGET_OPTIONS options, ID2D1BitmapRenderTarget **render_target) -{ - struct d2d_wic_render_target *rt = impl_from_ID2D1RenderTarget(iface); - - TRACE("iface %p, size %p, pixel_size %p, format %p, options %#x, render_target %p,\n", - iface, size, pixel_size, format, options, render_target); - - return ID2D1RenderTarget_CreateCompatibleRenderTarget(rt->dxgi_target, - size, pixel_size, format, options, render_target); -} - -static HRESULT STDMETHODCALLTYPE d2d_wic_render_target_CreateLayer(ID2D1RenderTarget *iface, - const D2D1_SIZE_F *size, ID2D1Layer **layer) -{ - struct d2d_wic_render_target *render_target = impl_from_ID2D1RenderTarget(iface); - - TRACE("iface %p, size %p, layer %p.\n", iface, size, layer); - - return ID2D1RenderTarget_CreateLayer(render_target->dxgi_target, size, layer); -} - -static HRESULT STDMETHODCALLTYPE d2d_wic_render_target_CreateMesh(ID2D1RenderTarget *iface, ID2D1Mesh **mesh) -{ - struct d2d_wic_render_target *render_target = impl_from_ID2D1RenderTarget(iface); - - TRACE("iface %p, mesh %p.\n", iface, mesh); - - return ID2D1RenderTarget_CreateMesh(render_target->dxgi_target, mesh); -} - -static void STDMETHODCALLTYPE d2d_wic_render_target_DrawLine(ID2D1RenderTarget *iface, - D2D1_POINT_2F p0, D2D1_POINT_2F p1, ID2D1Brush *brush, float stroke_width, ID2D1StrokeStyle *stroke_style) -{ - struct d2d_wic_render_target *render_target = impl_from_ID2D1RenderTarget(iface); - - TRACE("iface %p, p0 {%.8e, %.8e}, p1 {%.8e, %.8e}, brush %p, stroke_width %.8e, stroke_style %p.\n", - iface, p0.x, p0.y, p1.x, p1.y, brush, stroke_width, stroke_style); - - ID2D1RenderTarget_DrawLine(render_target->dxgi_target, p0, p1, brush, stroke_width, stroke_style); -} - -static void STDMETHODCALLTYPE d2d_wic_render_target_DrawRectangle(ID2D1RenderTarget *iface, - const D2D1_RECT_F *rect, ID2D1Brush *brush, float stroke_width, ID2D1StrokeStyle *stroke_style) -{ - struct d2d_wic_render_target *render_target = impl_from_ID2D1RenderTarget(iface); - - TRACE("iface %p, rect %s, brush %p, stroke_width %.8e, stroke_style %p.\n", - iface, debug_d2d_rect_f(rect), brush, stroke_width, stroke_style); - - ID2D1RenderTarget_DrawRectangle(render_target->dxgi_target, rect, brush, stroke_width, stroke_style); -} - -static void STDMETHODCALLTYPE d2d_wic_render_target_FillRectangle(ID2D1RenderTarget *iface, - const D2D1_RECT_F *rect, ID2D1Brush *brush) -{ - struct d2d_wic_render_target *render_target = impl_from_ID2D1RenderTarget(iface); - - TRACE("iface %p, rect %s, brush %p.\n", iface, debug_d2d_rect_f(rect), brush); - - ID2D1RenderTarget_FillRectangle(render_target->dxgi_target, rect, brush); -} - -static void STDMETHODCALLTYPE d2d_wic_render_target_DrawRoundedRectangle(ID2D1RenderTarget *iface, - const D2D1_ROUNDED_RECT *rect, ID2D1Brush *brush, float stroke_width, ID2D1StrokeStyle *stroke_style) -{ - struct d2d_wic_render_target *render_target = impl_from_ID2D1RenderTarget(iface); - - TRACE("iface %p, rect %p, brush %p, stroke_width %.8e, stroke_style %p.\n", - iface, rect, brush, stroke_width, stroke_style); - - ID2D1RenderTarget_DrawRoundedRectangle(render_target->dxgi_target, rect, brush, stroke_width, stroke_style); -} - -static void STDMETHODCALLTYPE d2d_wic_render_target_FillRoundedRectangle(ID2D1RenderTarget *iface, - const D2D1_ROUNDED_RECT *rect, ID2D1Brush *brush) -{ - struct d2d_wic_render_target *render_target = impl_from_ID2D1RenderTarget(iface); - - TRACE("iface %p, rect %p, brush %p.\n", iface, rect, brush); - - ID2D1RenderTarget_FillRoundedRectangle(render_target->dxgi_target, rect, brush); -} - -static void STDMETHODCALLTYPE d2d_wic_render_target_DrawEllipse(ID2D1RenderTarget *iface, - const D2D1_ELLIPSE *ellipse, ID2D1Brush *brush, float stroke_width, ID2D1StrokeStyle *stroke_style) -{ - struct d2d_wic_render_target *render_target = impl_from_ID2D1RenderTarget(iface); - - TRACE("iface %p, ellipse %p, brush %p, stroke_width %.8e, stroke_style %p.\n", - iface, ellipse, brush, stroke_width, stroke_style); - - ID2D1RenderTarget_DrawEllipse(render_target->dxgi_target, ellipse, brush, stroke_width, stroke_style); -} - -static void STDMETHODCALLTYPE d2d_wic_render_target_FillEllipse(ID2D1RenderTarget *iface, - const D2D1_ELLIPSE *ellipse, ID2D1Brush *brush) -{ - struct d2d_wic_render_target *render_target = impl_from_ID2D1RenderTarget(iface); - - TRACE("iface %p, ellipse %p, brush %p.\n", iface, ellipse, brush); - - ID2D1RenderTarget_FillEllipse(render_target->dxgi_target, ellipse, brush); -} - -static void STDMETHODCALLTYPE d2d_wic_render_target_DrawGeometry(ID2D1RenderTarget *iface, - ID2D1Geometry *geometry, ID2D1Brush *brush, float stroke_width, ID2D1StrokeStyle *stroke_style) -{ - struct d2d_wic_render_target *render_target = impl_from_ID2D1RenderTarget(iface); - - TRACE("iface %p, geometry %p, brush %p, stroke_width %.8e, stroke_style %p.\n", - iface, geometry, brush, stroke_width, stroke_style); - - ID2D1RenderTarget_DrawGeometry(render_target->dxgi_target, geometry, brush, stroke_width, stroke_style); -} - -static void STDMETHODCALLTYPE d2d_wic_render_target_FillGeometry(ID2D1RenderTarget *iface, - ID2D1Geometry *geometry, ID2D1Brush *brush, ID2D1Brush *opacity_brush) -{ - struct d2d_wic_render_target *render_target = impl_from_ID2D1RenderTarget(iface); - - TRACE("iface %p, geometry %p, brush %p, opacity_brush %p.\n", iface, geometry, brush, opacity_brush); - - ID2D1RenderTarget_FillGeometry(render_target->dxgi_target, geometry, brush, opacity_brush); -} - -static void STDMETHODCALLTYPE d2d_wic_render_target_FillMesh(ID2D1RenderTarget *iface, - ID2D1Mesh *mesh, ID2D1Brush *brush) -{ - struct d2d_wic_render_target *render_target = impl_from_ID2D1RenderTarget(iface); - - TRACE("iface %p, mesh %p, brush %p.\n", iface, mesh, brush); - - ID2D1RenderTarget_FillMesh(render_target->dxgi_target, mesh, brush); -} - -static void STDMETHODCALLTYPE d2d_wic_render_target_FillOpacityMask(ID2D1RenderTarget *iface, - ID2D1Bitmap *mask, ID2D1Brush *brush, D2D1_OPACITY_MASK_CONTENT content, - const D2D1_RECT_F *dst_rect, const D2D1_RECT_F *src_rect) -{ - struct d2d_wic_render_target *render_target = impl_from_ID2D1RenderTarget(iface); - - TRACE("iface %p, mask %p, brush %p, content %#x, dst_rect %s, src_rect %s.\n", - iface, mask, brush, content, debug_d2d_rect_f(dst_rect), debug_d2d_rect_f(src_rect)); - - ID2D1RenderTarget_FillOpacityMask(render_target->dxgi_target, - mask, brush, content, dst_rect, src_rect); -} - -static void STDMETHODCALLTYPE d2d_wic_render_target_DrawBitmap(ID2D1RenderTarget *iface, - ID2D1Bitmap *bitmap, const D2D1_RECT_F *dst_rect, float opacity, - D2D1_BITMAP_INTERPOLATION_MODE interpolation_mode, const D2D1_RECT_F *src_rect) -{ - struct d2d_wic_render_target *render_target = impl_from_ID2D1RenderTarget(iface); - - TRACE("iface %p, bitmap %p, dst_rect %s, opacity %.8e, interpolation_mode %#x, src_rect %s.\n", - iface, bitmap, debug_d2d_rect_f(dst_rect), opacity, interpolation_mode, debug_d2d_rect_f(src_rect)); - - ID2D1RenderTarget_DrawBitmap(render_target->dxgi_target, - bitmap, dst_rect, opacity, interpolation_mode, src_rect); -} - -static void STDMETHODCALLTYPE d2d_wic_render_target_DrawText(ID2D1RenderTarget *iface, - const WCHAR *string, UINT32 string_len, IDWriteTextFormat *text_format, const D2D1_RECT_F *layout_rect, - ID2D1Brush *brush, D2D1_DRAW_TEXT_OPTIONS options, DWRITE_MEASURING_MODE measuring_mode) -{ - struct d2d_wic_render_target *render_target = impl_from_ID2D1RenderTarget(iface); - - TRACE("iface %p, string %s, string_len %u, text_format %p, layout_rect %s, " - "brush %p, options %#x, measuring_mode %#x.\n", - iface, debugstr_wn(string, string_len), string_len, text_format, debug_d2d_rect_f(layout_rect), - brush, options, measuring_mode); - - ID2D1RenderTarget_DrawText(render_target->dxgi_target, string, string_len, - text_format, layout_rect, brush, options, measuring_mode); -} - -static void STDMETHODCALLTYPE d2d_wic_render_target_DrawTextLayout(ID2D1RenderTarget *iface, - D2D1_POINT_2F origin, IDWriteTextLayout *layout, ID2D1Brush *brush, D2D1_DRAW_TEXT_OPTIONS options) -{ - struct d2d_wic_render_target *render_target = impl_from_ID2D1RenderTarget(iface); - - TRACE("iface %p, origin {%.8e, %.8e}, layout %p, brush %p, options %#x.\n", - iface, origin.x, origin.y, layout, brush, options); - - ID2D1RenderTarget_DrawTextLayout(render_target->dxgi_target, origin, layout, brush, options); -} - -static void STDMETHODCALLTYPE d2d_wic_render_target_DrawGlyphRun(ID2D1RenderTarget *iface, - D2D1_POINT_2F baseline_origin, const DWRITE_GLYPH_RUN *glyph_run, ID2D1Brush *brush, - DWRITE_MEASURING_MODE measuring_mode) -{ - struct d2d_wic_render_target *render_target = impl_from_ID2D1RenderTarget(iface); - - TRACE("iface %p, baseline_origin {%.8e, %.8e}, glyph_run %p, brush %p, measuring_mode %#x.\n", - iface, baseline_origin.x, baseline_origin.y, glyph_run, brush, measuring_mode); - - ID2D1RenderTarget_DrawGlyphRun(render_target->dxgi_target, - baseline_origin, glyph_run, brush, measuring_mode); -} - -static void STDMETHODCALLTYPE d2d_wic_render_target_SetTransform(ID2D1RenderTarget *iface, - const D2D1_MATRIX_3X2_F *transform) -{ - struct d2d_wic_render_target *render_target = impl_from_ID2D1RenderTarget(iface); - - TRACE("iface %p, transform %p.\n", iface, transform); - - ID2D1RenderTarget_SetTransform(render_target->dxgi_target, transform); -} - -static void STDMETHODCALLTYPE d2d_wic_render_target_GetTransform(ID2D1RenderTarget *iface, - D2D1_MATRIX_3X2_F *transform) -{ - struct d2d_wic_render_target *render_target = impl_from_ID2D1RenderTarget(iface); - - TRACE("iface %p, transform %p.\n", iface, transform); - - ID2D1RenderTarget_GetTransform(render_target->dxgi_target, transform); -} - -static void STDMETHODCALLTYPE d2d_wic_render_target_SetAntialiasMode(ID2D1RenderTarget *iface, - D2D1_ANTIALIAS_MODE antialias_mode) -{ - struct d2d_wic_render_target *render_target = impl_from_ID2D1RenderTarget(iface); - - TRACE("iface %p, antialias_mode %#x.\n", iface, antialias_mode); - - ID2D1RenderTarget_SetAntialiasMode(render_target->dxgi_target, antialias_mode); -} - -static D2D1_ANTIALIAS_MODE STDMETHODCALLTYPE d2d_wic_render_target_GetAntialiasMode(ID2D1RenderTarget *iface) -{ - struct d2d_wic_render_target *render_target = impl_from_ID2D1RenderTarget(iface); - - TRACE("iface %p.\n", iface); - - return ID2D1RenderTarget_GetAntialiasMode(render_target->dxgi_target); -} - -static void STDMETHODCALLTYPE d2d_wic_render_target_SetTextAntialiasMode(ID2D1RenderTarget *iface, - D2D1_TEXT_ANTIALIAS_MODE antialias_mode) -{ - struct d2d_wic_render_target *render_target = impl_from_ID2D1RenderTarget(iface); - - TRACE("iface %p, antialias_mode %#x.\n", iface, antialias_mode); - - ID2D1RenderTarget_SetTextAntialiasMode(render_target->dxgi_target, antialias_mode); -} - -static D2D1_TEXT_ANTIALIAS_MODE STDMETHODCALLTYPE d2d_wic_render_target_GetTextAntialiasMode(ID2D1RenderTarget *iface) -{ - struct d2d_wic_render_target *render_target = impl_from_ID2D1RenderTarget(iface); - - TRACE("iface %p.\n", iface); - - return ID2D1RenderTarget_GetTextAntialiasMode(render_target->dxgi_target); -} - -static void STDMETHODCALLTYPE d2d_wic_render_target_SetTextRenderingParams(ID2D1RenderTarget *iface, - IDWriteRenderingParams *text_rendering_params) -{ - struct d2d_wic_render_target *render_target = impl_from_ID2D1RenderTarget(iface); - - TRACE("iface %p, text_rendering_params %p.\n", iface, text_rendering_params); - - ID2D1RenderTarget_SetTextRenderingParams(render_target->dxgi_target, text_rendering_params); -} - -static void STDMETHODCALLTYPE d2d_wic_render_target_GetTextRenderingParams(ID2D1RenderTarget *iface, - IDWriteRenderingParams **text_rendering_params) -{ - struct d2d_wic_render_target *render_target = impl_from_ID2D1RenderTarget(iface); - - TRACE("iface %p, text_rendering_params %p.\n", iface, text_rendering_params); - - ID2D1RenderTarget_GetTextRenderingParams(render_target->dxgi_target, text_rendering_params); -} - -static void STDMETHODCALLTYPE d2d_wic_render_target_SetTags(ID2D1RenderTarget *iface, D2D1_TAG tag1, D2D1_TAG tag2) -{ - struct d2d_wic_render_target *render_target = impl_from_ID2D1RenderTarget(iface); - - TRACE("iface %p, tag1 %s, tag2 %s.\n", iface, wine_dbgstr_longlong(tag1), wine_dbgstr_longlong(tag2)); - - ID2D1RenderTarget_SetTags(render_target->dxgi_target, tag1, tag2); -} - -static void STDMETHODCALLTYPE d2d_wic_render_target_GetTags(ID2D1RenderTarget *iface, D2D1_TAG *tag1, D2D1_TAG *tag2) -{ - struct d2d_wic_render_target *render_target = impl_from_ID2D1RenderTarget(iface); - - TRACE("iface %p, tag1 %p, tag2 %p.\n", iface, tag1, tag2); - - ID2D1RenderTarget_GetTags(render_target->dxgi_target, tag1, tag2); -} - -static void STDMETHODCALLTYPE d2d_wic_render_target_PushLayer(ID2D1RenderTarget *iface, - const D2D1_LAYER_PARAMETERS *layer_parameters, ID2D1Layer *layer) -{ - struct d2d_wic_render_target *render_target = impl_from_ID2D1RenderTarget(iface); - - TRACE("iface %p, layer_parameters %p, layer %p.\n", iface, layer_parameters, layer); - - ID2D1RenderTarget_PushLayer(render_target->dxgi_target, layer_parameters, layer); -} - -static void STDMETHODCALLTYPE d2d_wic_render_target_PopLayer(ID2D1RenderTarget *iface) -{ - struct d2d_wic_render_target *render_target = impl_from_ID2D1RenderTarget(iface); - - TRACE("iface %p.\n", iface); - - ID2D1RenderTarget_PopLayer(render_target->dxgi_target); -} - -static HRESULT STDMETHODCALLTYPE d2d_wic_render_target_Flush(ID2D1RenderTarget *iface, D2D1_TAG *tag1, D2D1_TAG *tag2) -{ - struct d2d_wic_render_target *render_target = impl_from_ID2D1RenderTarget(iface); - - TRACE("iface %p, tag1 %p, tag2 %p.\n", iface, tag1, tag2); - - return ID2D1RenderTarget_Flush(render_target->dxgi_target, tag1, tag2); -} - -static void STDMETHODCALLTYPE d2d_wic_render_target_SaveDrawingState(ID2D1RenderTarget *iface, - ID2D1DrawingStateBlock *state_block) -{ - struct d2d_wic_render_target *render_target = impl_from_ID2D1RenderTarget(iface); - - TRACE("iface %p, state_block %p.\n", iface, state_block); - - ID2D1RenderTarget_SaveDrawingState(render_target->dxgi_target, state_block); -} - -static void STDMETHODCALLTYPE d2d_wic_render_target_RestoreDrawingState(ID2D1RenderTarget *iface, - ID2D1DrawingStateBlock *state_block) -{ - struct d2d_wic_render_target *render_target = impl_from_ID2D1RenderTarget(iface); - - TRACE("iface %p, state_block %p.\n", iface, state_block); - - ID2D1RenderTarget_RestoreDrawingState(render_target->dxgi_target, state_block); -} - -static void STDMETHODCALLTYPE d2d_wic_render_target_PushAxisAlignedClip(ID2D1RenderTarget *iface, - const D2D1_RECT_F *clip_rect, D2D1_ANTIALIAS_MODE antialias_mode) -{ - struct d2d_wic_render_target *render_target = impl_from_ID2D1RenderTarget(iface); - - TRACE("iface %p, clip_rect %s, antialias_mode %#x.\n", iface, debug_d2d_rect_f(clip_rect), antialias_mode); - - ID2D1RenderTarget_PushAxisAlignedClip(render_target->dxgi_target, clip_rect, antialias_mode); -} - -static void STDMETHODCALLTYPE d2d_wic_render_target_PopAxisAlignedClip(ID2D1RenderTarget *iface) -{ - struct d2d_wic_render_target *render_target = impl_from_ID2D1RenderTarget(iface); - - TRACE("iface %p.\n", iface); - - ID2D1RenderTarget_PopAxisAlignedClip(render_target->dxgi_target); -} - -static void STDMETHODCALLTYPE d2d_wic_render_target_Clear(ID2D1RenderTarget *iface, const D2D1_COLOR_F *color) -{ - struct d2d_wic_render_target *render_target = impl_from_ID2D1RenderTarget(iface); - - TRACE("iface %p, color %p.\n", iface, color); - - ID2D1RenderTarget_Clear(render_target->dxgi_target, color); -} - -static void STDMETHODCALLTYPE d2d_wic_render_target_BeginDraw(ID2D1RenderTarget *iface) -{ - struct d2d_wic_render_target *render_target = impl_from_ID2D1RenderTarget(iface); - - TRACE("iface %p.\n", iface); - - ID2D1RenderTarget_BeginDraw(render_target->dxgi_target); -} - -static HRESULT STDMETHODCALLTYPE d2d_wic_render_target_EndDraw(ID2D1RenderTarget *iface, - D2D1_TAG *tag1, D2D1_TAG *tag2) -{ - struct d2d_wic_render_target *render_target = impl_from_ID2D1RenderTarget(iface); - - TRACE("iface %p, tag1 %p, tag2 %p.\n", iface, tag1, tag2); - - return ID2D1RenderTarget_EndDraw(render_target->dxgi_target, tag1, tag2); -} - -static D2D1_PIXEL_FORMAT * STDMETHODCALLTYPE d2d_wic_render_target_GetPixelFormat(ID2D1RenderTarget *iface, - D2D1_PIXEL_FORMAT *format) -{ - struct d2d_wic_render_target *render_target = impl_from_ID2D1RenderTarget(iface); - - TRACE("iface %p, format %p.\n", iface, format); - - *format = ID2D1RenderTarget_GetPixelFormat(render_target->dxgi_target); - return format; -} - -static void STDMETHODCALLTYPE d2d_wic_render_target_SetDpi(ID2D1RenderTarget *iface, float dpi_x, float dpi_y) -{ - struct d2d_wic_render_target *render_target = impl_from_ID2D1RenderTarget(iface); - - TRACE("iface %p, dpi_x %.8e, dpi_y %.8e.\n", iface, dpi_x, dpi_y); - - ID2D1RenderTarget_SetDpi(render_target->dxgi_target, dpi_x, dpi_y); -} - -static void STDMETHODCALLTYPE d2d_wic_render_target_GetDpi(ID2D1RenderTarget *iface, float *dpi_x, float *dpi_y) -{ - struct d2d_wic_render_target *render_target = impl_from_ID2D1RenderTarget(iface); - - TRACE("iface %p, dpi_x %p, dpi_y %p.\n", iface, dpi_x, dpi_y); - - ID2D1RenderTarget_GetDpi(render_target->dxgi_target, dpi_x, dpi_y); -} - -static D2D1_SIZE_F * STDMETHODCALLTYPE d2d_wic_render_target_GetSize(ID2D1RenderTarget *iface, D2D1_SIZE_F *size) -{ - struct d2d_wic_render_target *render_target = impl_from_ID2D1RenderTarget(iface); - - TRACE("iface %p, size %p.\n", iface, size); - - *size = ID2D1RenderTarget_GetSize(render_target->dxgi_target); - return size; -} - -static D2D1_SIZE_U * STDMETHODCALLTYPE d2d_wic_render_target_GetPixelSize(ID2D1RenderTarget *iface, - D2D1_SIZE_U *pixel_size) -{ - struct d2d_wic_render_target *render_target = impl_from_ID2D1RenderTarget(iface); - - TRACE("iface %p, pixel_size %p.\n", iface, pixel_size); - - *pixel_size = ID2D1RenderTarget_GetPixelSize(render_target->dxgi_target); - return pixel_size; -} - -static UINT32 STDMETHODCALLTYPE d2d_wic_render_target_GetMaximumBitmapSize(ID2D1RenderTarget *iface) -{ - struct d2d_wic_render_target *render_target = impl_from_ID2D1RenderTarget(iface); - - TRACE("iface %p.\n", iface); - - return ID2D1RenderTarget_GetMaximumBitmapSize(render_target->dxgi_target); -} - -static BOOL STDMETHODCALLTYPE d2d_wic_render_target_IsSupported(ID2D1RenderTarget *iface, - const D2D1_RENDER_TARGET_PROPERTIES *desc) -{ - struct d2d_wic_render_target *render_target = impl_from_ID2D1RenderTarget(iface); - - TRACE("iface %p, desc %p.\n", iface, desc); - - return ID2D1RenderTarget_IsSupported(render_target->dxgi_target, desc); -} - -static const struct ID2D1RenderTargetVtbl d2d_wic_render_target_vtbl = +static const struct IUnknownVtbl d2d_wic_render_target_vtbl = { d2d_wic_render_target_QueryInterface, d2d_wic_render_target_AddRef, d2d_wic_render_target_Release, - d2d_wic_render_target_GetFactory, - d2d_wic_render_target_CreateBitmap, - d2d_wic_render_target_CreateBitmapFromWicBitmap, - d2d_wic_render_target_CreateSharedBitmap, - d2d_wic_render_target_CreateBitmapBrush, - d2d_wic_render_target_CreateSolidColorBrush, - d2d_wic_render_target_CreateGradientStopCollection, - d2d_wic_render_target_CreateLinearGradientBrush, - d2d_wic_render_target_CreateRadialGradientBrush, - d2d_wic_render_target_CreateCompatibleRenderTarget, - d2d_wic_render_target_CreateLayer, - d2d_wic_render_target_CreateMesh, - d2d_wic_render_target_DrawLine, - d2d_wic_render_target_DrawRectangle, - d2d_wic_render_target_FillRectangle, - d2d_wic_render_target_DrawRoundedRectangle, - d2d_wic_render_target_FillRoundedRectangle, - d2d_wic_render_target_DrawEllipse, - d2d_wic_render_target_FillEllipse, - d2d_wic_render_target_DrawGeometry, - d2d_wic_render_target_FillGeometry, - d2d_wic_render_target_FillMesh, - d2d_wic_render_target_FillOpacityMask, - d2d_wic_render_target_DrawBitmap, - d2d_wic_render_target_DrawText, - d2d_wic_render_target_DrawTextLayout, - d2d_wic_render_target_DrawGlyphRun, - d2d_wic_render_target_SetTransform, - d2d_wic_render_target_GetTransform, - d2d_wic_render_target_SetAntialiasMode, - d2d_wic_render_target_GetAntialiasMode, - d2d_wic_render_target_SetTextAntialiasMode, - d2d_wic_render_target_GetTextAntialiasMode, - d2d_wic_render_target_SetTextRenderingParams, - d2d_wic_render_target_GetTextRenderingParams, - d2d_wic_render_target_SetTags, - d2d_wic_render_target_GetTags, - d2d_wic_render_target_PushLayer, - d2d_wic_render_target_PopLayer, - d2d_wic_render_target_Flush, - d2d_wic_render_target_SaveDrawingState, - d2d_wic_render_target_RestoreDrawingState, - d2d_wic_render_target_PushAxisAlignedClip, - d2d_wic_render_target_PopAxisAlignedClip, - d2d_wic_render_target_Clear, - d2d_wic_render_target_BeginDraw, - d2d_wic_render_target_EndDraw, - d2d_wic_render_target_GetPixelFormat, - d2d_wic_render_target_SetDpi, - d2d_wic_render_target_GetDpi, - d2d_wic_render_target_GetSize, - d2d_wic_render_target_GetPixelSize, - d2d_wic_render_target_GetMaximumBitmapSize, - d2d_wic_render_target_IsSupported, }; static const struct d2d_device_context_ops d2d_wic_render_target_ops = @@ -793,7 +159,7 @@ HRESULT d2d_wic_render_target_init(struct d2d_wic_render_target *render_target, ID3D10Texture2D *texture; HRESULT hr; - render_target->ID2D1RenderTarget_iface.lpVtbl = &d2d_wic_render_target_vtbl; + render_target->IUnknown_iface.lpVtbl = &d2d_wic_render_target_vtbl; if (FAILED(hr = IWICBitmap_GetSize(bitmap, &render_target->width, &render_target->height))) { @@ -875,7 +241,7 @@ HRESULT d2d_wic_render_target_init(struct d2d_wic_render_target *render_target, } if (FAILED(hr = d2d_d3d_create_render_target(factory, render_target->dxgi_surface, - (IUnknown *)&render_target->ID2D1RenderTarget_iface, &d2d_wic_render_target_ops, + &render_target->IUnknown_iface, &d2d_wic_render_target_ops, desc, (void **)&render_target->dxgi_inner))) { WARN("Failed to create DXGI surface render target, hr %#x.\n", hr); -- 2.11.0

1 0

[PATCH 1/2] d2d1: Properly aggregate render target implementations.
by Henri Verbeet 12 Sep '18

12 Sep '18

From: Nikolay Sivov <nsivov(a)codeweavers.com> In order to expose the ID2D1DeviceContext interface for them. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d2d1/bitmap_render_target.c | 23 ++++--- dlls/d2d1/d2d1_private.h | 14 ++++- dlls/d2d1/dc_render_target.c | 57 +++++++++-------- dlls/d2d1/device.c | 129 +++++++++++++++++++++++++++------------ dlls/d2d1/factory.c | 2 +- dlls/d2d1/hwnd_render_target.c | 51 +++++++++------- dlls/d2d1/wic_render_target.c | 61 ++++++++++-------- 7 files changed, 218 insertions(+), 119 deletions(-) diff --git a/dlls/d2d1/bitmap_render_target.c b/dlls/d2d1/bitmap_render_target.c index c106e211d61..57f5b23b511 100644 --- a/dlls/d2d1/bitmap_render_target.c +++ b/dlls/d2d1/bitmap_render_target.c @@ -45,13 +45,8 @@ static HRESULT STDMETHODCALLTYPE d2d_bitmap_render_target_QueryInterface(ID2D1Bi *out = iface; return S_OK; } - else if (IsEqualGUID(iid, &IID_ID2D1GdiInteropRenderTarget)) - return ID2D1RenderTarget_QueryInterface(render_target->dxgi_target, iid, out); - WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); - - *out = NULL; - return E_NOINTERFACE; + return IUnknown_QueryInterface(render_target->dxgi_inner, iid, out); } static ULONG STDMETHODCALLTYPE d2d_bitmap_render_target_AddRef(ID2D1BitmapRenderTarget *iface) @@ -73,7 +68,7 @@ static ULONG STDMETHODCALLTYPE d2d_bitmap_render_target_Release(ID2D1BitmapRende if (!refcount) { - ID2D1RenderTarget_Release(render_target->dxgi_target); + IUnknown_Release(render_target->dxgi_inner); ID2D1Bitmap_Release(render_target->bitmap); heap_free(render_target); } @@ -743,7 +738,6 @@ HRESULT d2d_bitmap_render_target_init(struct d2d_bitmap_render_target *render_ta FIXME("Compatible target options are ignored, %#x.\n", options); render_target->ID2D1BitmapRenderTarget_iface.lpVtbl = &d2d_bitmap_render_target_vtbl; - render_target->refcount = 1; dxgi_rt_desc.type = parent_target->desc.type; dxgi_rt_desc.usage = parent_target->desc.usage; @@ -811,13 +805,23 @@ HRESULT d2d_bitmap_render_target_init(struct d2d_bitmap_render_target *render_ta } if (FAILED(hr = d2d_d3d_create_render_target(parent_target->factory, dxgi_surface, - (IUnknown *)&render_target->ID2D1BitmapRenderTarget_iface, &dxgi_rt_desc, &render_target->dxgi_target))) + (IUnknown *)&render_target->ID2D1BitmapRenderTarget_iface, NULL, + &dxgi_rt_desc, (void **)&render_target->dxgi_inner))) { WARN("Failed to create DXGI surface render target, hr %#x.\n", hr); IDXGISurface_Release(dxgi_surface); return hr; } + if (FAILED(hr = IUnknown_QueryInterface(render_target->dxgi_inner, + &IID_ID2D1RenderTarget, (void **)&render_target->dxgi_target))) + { + WARN("Failed to retrieve ID2D1RenderTarget interface, hr %#x.\n", hr); + IUnknown_Release(render_target->dxgi_inner); + IDXGISurface_Release(dxgi_surface); + return hr; + } + bitmap_desc.pixelFormat = dxgi_rt_desc.pixelFormat; bitmap_desc.dpiX = dxgi_rt_desc.dpiX; bitmap_desc.dpiY = dxgi_rt_desc.dpiY; @@ -829,6 +833,7 @@ HRESULT d2d_bitmap_render_target_init(struct d2d_bitmap_render_target *render_ta { WARN("Failed to create shared bitmap, hr %#x.\n", hr); ID2D1RenderTarget_Release(render_target->dxgi_target); + IUnknown_Release(render_target->dxgi_inner); return hr; } diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index e00b9427977..f9fd8c72cd6 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -117,14 +117,21 @@ struct d2d_ps_cb struct d2d_brush_cb opacity_brush; }; +struct d2d_device_context_ops +{ + HRESULT (*device_context_present)(IUnknown *outer_unknown); +}; + struct d2d_device_context { ID2D1DeviceContext ID2D1DeviceContext_iface; ID2D1GdiInteropRenderTarget ID2D1GdiInteropRenderTarget_iface; IDWriteTextRenderer IDWriteTextRenderer_iface; + IUnknown IUnknown_iface; LONG refcount; IUnknown *outer_unknown; + const struct d2d_device_context_ops *ops; ID2D1Factory *factory; ID3D10Device *device; @@ -149,7 +156,8 @@ struct d2d_device_context }; HRESULT d2d_d3d_create_render_target(ID2D1Factory *factory, IDXGISurface *surface, IUnknown *outer_unknown, - const D2D1_RENDER_TARGET_PROPERTIES *desc, ID2D1RenderTarget **render_target) DECLSPEC_HIDDEN; + const struct d2d_device_context_ops *ops, const D2D1_RENDER_TARGET_PROPERTIES *desc, + void **render_target) DECLSPEC_HIDDEN; HRESULT d2d_d3d_render_target_create_rtv(ID2D1RenderTarget *render_target, IDXGISurface1 *surface) DECLSPEC_HIDDEN; struct d2d_wic_render_target @@ -159,6 +167,7 @@ struct d2d_wic_render_target IDXGISurface *dxgi_surface; ID2D1RenderTarget *dxgi_target; + IUnknown *dxgi_inner; ID3D10Texture2D *readback_texture; IWICBitmap *bitmap; @@ -177,6 +186,7 @@ struct d2d_dc_render_target IDXGISurface1 *dxgi_surface; ID2D1RenderTarget *dxgi_target; + IUnknown *dxgi_inner; RECT dst_rect; HDC hdc; @@ -191,6 +201,7 @@ struct d2d_hwnd_render_target LONG refcount; ID2D1RenderTarget *dxgi_target; + IUnknown *dxgi_inner; IDXGISwapChain *swapchain; UINT sync_interval; HWND hwnd; @@ -206,6 +217,7 @@ struct d2d_bitmap_render_target LONG refcount; ID2D1RenderTarget *dxgi_target; + IUnknown *dxgi_inner; ID2D1Bitmap *bitmap; }; diff --git a/dlls/d2d1/dc_render_target.c b/dlls/d2d1/dc_render_target.c index d5e4f47e6dd..8e43bcc3076 100644 --- a/dlls/d2d1/dc_render_target.c +++ b/dlls/d2d1/dc_render_target.c @@ -24,17 +24,26 @@ WINE_DEFAULT_DEBUG_CHANNEL(d2d); -static void sync_bitmap(struct d2d_dc_render_target *render_target) +static inline struct d2d_dc_render_target *impl_from_IUnknown(IUnknown *iface) { + return CONTAINING_RECORD(iface, struct d2d_dc_render_target, ID2D1DCRenderTarget_iface); +} + +static HRESULT d2d_dc_render_target_present(IUnknown *outer_unknown) +{ + struct d2d_dc_render_target *render_target = impl_from_IUnknown(outer_unknown); const RECT *dst_rect = &render_target->dst_rect; RECT empty_rect; HDC src_hdc; HRESULT hr; + if (!render_target->hdc) + return D2DERR_WRONG_STATE; + if (FAILED(hr = IDXGISurface1_GetDC(render_target->dxgi_surface, FALSE, &src_hdc))) { WARN("GetDC() failed, %#x.\n", hr); - return; + return S_OK; } BitBlt(render_target->hdc, dst_rect->left, dst_rect->top, dst_rect->right - dst_rect->left, @@ -42,6 +51,8 @@ static void sync_bitmap(struct d2d_dc_render_target *render_target) SetRectEmpty(&empty_rect); IDXGISurface1_ReleaseDC(render_target->dxgi_surface, &empty_rect); + + return S_OK; } static inline struct d2d_dc_render_target *impl_from_ID2D1DCRenderTarget(ID2D1DCRenderTarget *iface) @@ -64,13 +75,8 @@ static HRESULT STDMETHODCALLTYPE d2d_dc_render_target_QueryInterface(ID2D1DCRend *out = iface; return S_OK; } - else if (IsEqualGUID(iid, &IID_ID2D1GdiInteropRenderTarget)) - return ID2D1RenderTarget_QueryInterface(render_target->dxgi_target, iid, out); - - WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); - *out = NULL; - return E_NOINTERFACE; + return IUnknown_QueryInterface(render_target->dxgi_inner, iid, out); } static ULONG STDMETHODCALLTYPE d2d_dc_render_target_AddRef(ID2D1DCRenderTarget *iface) @@ -92,7 +98,7 @@ static ULONG STDMETHODCALLTYPE d2d_dc_render_target_Release(ID2D1DCRenderTarget if (!refcount) { - ID2D1RenderTarget_Release(render_target->dxgi_target); + IUnknown_Release(render_target->dxgi_inner); IDXGISurface1_Release(render_target->dxgi_surface); heap_free(render_target); } @@ -524,14 +530,10 @@ static void STDMETHODCALLTYPE d2d_dc_render_target_PopLayer(ID2D1DCRenderTarget static HRESULT STDMETHODCALLTYPE d2d_dc_render_target_Flush(ID2D1DCRenderTarget *iface, D2D1_TAG *tag1, D2D1_TAG *tag2) { struct d2d_dc_render_target *render_target = impl_from_ID2D1DCRenderTarget(iface); - HRESULT hr; TRACE("iface %p, tag1 %p, tag2 %p.\n", iface, tag1, tag2); - hr = ID2D1RenderTarget_Flush(render_target->dxgi_target, tag1, tag2); - sync_bitmap(render_target); - - return hr; + return ID2D1RenderTarget_Flush(render_target->dxgi_target, tag1, tag2); } static void STDMETHODCALLTYPE d2d_dc_render_target_SaveDrawingState(ID2D1DCRenderTarget *iface, @@ -595,17 +597,10 @@ static HRESULT STDMETHODCALLTYPE d2d_dc_render_target_EndDraw(ID2D1DCRenderTarge D2D1_TAG *tag1, D2D1_TAG *tag2) { struct d2d_dc_render_target *render_target = impl_from_ID2D1DCRenderTarget(iface); - HRESULT hr; TRACE("iface %p, tag1 %p, tag2 %p.\n", iface, tag1, tag2); - if (!render_target->hdc) - return D2DERR_WRONG_STATE; - - hr = ID2D1RenderTarget_EndDraw(render_target->dxgi_target, tag1, tag2); - sync_bitmap(render_target); - - return hr; + return ID2D1RenderTarget_EndDraw(render_target->dxgi_target, tag1, tag2); } static D2D1_PIXEL_FORMAT * STDMETHODCALLTYPE d2d_dc_render_target_GetPixelFormat(ID2D1DCRenderTarget *iface, @@ -813,6 +808,11 @@ static const struct ID2D1DCRenderTargetVtbl d2d_dc_render_target_vtbl = d2d_dc_render_target_BindDC, }; +static const struct d2d_device_context_ops d2d_dc_render_target_ops = +{ + d2d_dc_render_target_present, +}; + HRESULT d2d_dc_render_target_init(struct d2d_dc_render_target *render_target, ID2D1Factory *factory, ID3D10Device1 *device, const D2D1_RENDER_TARGET_PROPERTIES *desc) { @@ -821,7 +821,6 @@ HRESULT d2d_dc_render_target_init(struct d2d_dc_render_target *render_target, ID HRESULT hr; render_target->ID2D1DCRenderTarget_iface.lpVtbl = &d2d_dc_render_target_vtbl; - render_target->refcount = 1; /* Set with BindDC(). */ SetRectEmpty(&render_target->dst_rect); @@ -868,12 +867,22 @@ HRESULT d2d_dc_render_target_init(struct d2d_dc_render_target *render_target, ID } if (FAILED(hr = d2d_d3d_create_render_target(factory, (IDXGISurface *)render_target->dxgi_surface, - (IUnknown *)&render_target->ID2D1DCRenderTarget_iface, desc, &render_target->dxgi_target))) + (IUnknown *)&render_target->ID2D1DCRenderTarget_iface, &d2d_dc_render_target_ops, + desc, (void **)&render_target->dxgi_inner))) { WARN("Failed to create DXGI surface render target, hr %#x.\n", hr); IDXGISurface1_Release(render_target->dxgi_surface); return hr; } + if (FAILED(hr = IUnknown_QueryInterface(render_target->dxgi_inner, + &IID_ID2D1RenderTarget, (void **)&render_target->dxgi_target))) + { + WARN("Failed to retrieve ID2D1RenderTarget interface, hr %#x.\n", hr); + IUnknown_Release(render_target->dxgi_inner); + IDXGISurface1_Release(render_target->dxgi_surface); + return hr; + } + return S_OK; } diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index bba4870dd4e..4478a19f9fd 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -193,6 +193,11 @@ static void d2d_device_context_draw(struct d2d_device_context *render_target, en WARN("Failed to apply stateblock, hr %#x.\n", hr); } +static inline struct d2d_device_context *impl_from_IUnknown(IUnknown *iface) +{ + return CONTAINING_RECORD(iface, struct d2d_device_context, IUnknown_iface); +} + static inline struct d2d_device_context *impl_from_ID2D1DeviceContext(ID2D1DeviceContext *iface) { return CONTAINING_RECORD(iface, struct d2d_device_context, ID2D1DeviceContext_iface); @@ -203,9 +208,9 @@ static inline struct d2d_device_context *impl_from_ID2D1RenderTarget(ID2D1Render return CONTAINING_RECORD(iface, struct d2d_device_context, ID2D1DeviceContext_iface); } -static HRESULT STDMETHODCALLTYPE d2d_device_context_QueryInterface(ID2D1DeviceContext *iface, REFIID iid, void **out) +static HRESULT STDMETHODCALLTYPE d2d_device_context_inner_QueryInterface(IUnknown *iface, REFIID iid, void **out) { - struct d2d_device_context *render_target = impl_from_ID2D1DeviceContext(iface); + struct d2d_device_context *context = impl_from_IUnknown(iface); TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); @@ -214,14 +219,14 @@ static HRESULT STDMETHODCALLTYPE d2d_device_context_QueryInterface(ID2D1DeviceCo || IsEqualGUID(iid, &IID_ID2D1Resource) || IsEqualGUID(iid, &IID_IUnknown)) { - ID2D1DeviceContext_AddRef(iface); - *out = iface; + ID2D1DeviceContext_AddRef(&context->ID2D1DeviceContext_iface); + *out = &context->ID2D1DeviceContext_iface; return S_OK; } else if (IsEqualGUID(iid, &IID_ID2D1GdiInteropRenderTarget)) { - ID2D1GdiInteropRenderTarget_AddRef(&render_target->ID2D1GdiInteropRenderTarget_iface); - *out = &render_target->ID2D1GdiInteropRenderTarget_iface; + ID2D1GdiInteropRenderTarget_AddRef(&context->ID2D1GdiInteropRenderTarget_iface); + *out = &context->ID2D1GdiInteropRenderTarget_iface; return S_OK; } @@ -231,20 +236,20 @@ static HRESULT STDMETHODCALLTYPE d2d_device_context_QueryInterface(ID2D1DeviceCo return E_NOINTERFACE; } -static ULONG STDMETHODCALLTYPE d2d_device_context_AddRef(ID2D1DeviceContext *iface) +static ULONG STDMETHODCALLTYPE d2d_device_context_inner_AddRef(IUnknown *iface) { - struct d2d_device_context *render_target = impl_from_ID2D1DeviceContext(iface); - ULONG refcount = InterlockedIncrement(&render_target->refcount); + struct d2d_device_context *context = impl_from_IUnknown(iface); + ULONG refcount = InterlockedIncrement(&context->refcount); TRACE("%p increasing refcount to %u.\n", iface, refcount); return refcount; } -static ULONG STDMETHODCALLTYPE d2d_device_context_Release(ID2D1DeviceContext *iface) +static ULONG STDMETHODCALLTYPE d2d_device_context_inner_Release(IUnknown *iface) { - struct d2d_device_context *render_target = impl_from_ID2D1DeviceContext(iface); - ULONG refcount = InterlockedDecrement(&render_target->refcount); + struct d2d_device_context *context = impl_from_IUnknown(iface); + ULONG refcount = InterlockedDecrement(&context->refcount); TRACE("%p decreasing refcount to %u.\n", iface, refcount); @@ -252,30 +257,64 @@ static ULONG STDMETHODCALLTYPE d2d_device_context_Release(ID2D1DeviceContext *if { unsigned int i; - d2d_clip_stack_cleanup(&render_target->clip_stack); - IDWriteRenderingParams_Release(render_target->default_text_rendering_params); - if (render_target->text_rendering_params) - IDWriteRenderingParams_Release(render_target->text_rendering_params); - ID3D10BlendState_Release(render_target->bs); - ID3D10RasterizerState_Release(render_target->rs); - ID3D10Buffer_Release(render_target->vb); - ID3D10Buffer_Release(render_target->ib); - ID3D10PixelShader_Release(render_target->ps); + d2d_clip_stack_cleanup(&context->clip_stack); + IDWriteRenderingParams_Release(context->default_text_rendering_params); + if (context->text_rendering_params) + IDWriteRenderingParams_Release(context->text_rendering_params); + ID3D10BlendState_Release(context->bs); + ID3D10RasterizerState_Release(context->rs); + ID3D10Buffer_Release(context->vb); + ID3D10Buffer_Release(context->ib); + ID3D10PixelShader_Release(context->ps); for (i = 0; i < D2D_SHAPE_TYPE_COUNT; ++i) { - ID3D10VertexShader_Release(render_target->shape_resources[i].vs); - ID3D10InputLayout_Release(render_target->shape_resources[i].il); + ID3D10VertexShader_Release(context->shape_resources[i].vs); + ID3D10InputLayout_Release(context->shape_resources[i].il); } - render_target->stateblock->lpVtbl->Release(render_target->stateblock); - ID3D10RenderTargetView_Release(render_target->view); - ID3D10Device_Release(render_target->device); - ID2D1Factory_Release(render_target->factory); - heap_free(render_target); + context->stateblock->lpVtbl->Release(context->stateblock); + ID3D10RenderTargetView_Release(context->view); + ID3D10Device_Release(context->device); + ID2D1Factory_Release(context->factory); + heap_free(context); } return refcount; } +static const struct IUnknownVtbl d2d_device_context_inner_unknown_vtbl = +{ + d2d_device_context_inner_QueryInterface, + d2d_device_context_inner_AddRef, + d2d_device_context_inner_Release, +}; + +static HRESULT STDMETHODCALLTYPE d2d_device_context_QueryInterface(ID2D1DeviceContext *iface, REFIID iid, void **out) +{ + struct d2d_device_context *context = impl_from_ID2D1DeviceContext(iface); + + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); + + return IUnknown_QueryInterface(context->outer_unknown, iid, out); +} + +static ULONG STDMETHODCALLTYPE d2d_device_context_AddRef(ID2D1DeviceContext *iface) +{ + struct d2d_device_context *context = impl_from_ID2D1DeviceContext(iface); + + TRACE("iface %p.\n", iface); + + return IUnknown_AddRef(context->outer_unknown); +} + +static ULONG STDMETHODCALLTYPE d2d_device_context_Release(ID2D1DeviceContext *iface) +{ + struct d2d_device_context *context = impl_from_ID2D1DeviceContext(iface); + + TRACE("iface %p.\n", iface); + + return IUnknown_Release(context->outer_unknown); +} + static void STDMETHODCALLTYPE d2d_device_context_GetFactory(ID2D1DeviceContext *iface, ID2D1Factory **factory) { struct d2d_device_context *render_target = impl_from_ID2D1DeviceContext(iface); @@ -1448,8 +1487,13 @@ static void STDMETHODCALLTYPE d2d_device_context_PopLayer(ID2D1DeviceContext *if static HRESULT STDMETHODCALLTYPE d2d_device_context_Flush(ID2D1DeviceContext *iface, D2D1_TAG *tag1, D2D1_TAG *tag2) { + struct d2d_device_context *context = impl_from_ID2D1DeviceContext(iface); + FIXME("iface %p, tag1 %p, tag2 %p stub!\n", iface, tag1, tag2); + if (context->ops) + context->ops->device_context_present(context->outer_unknown); + return E_NOTIMPL; } @@ -1615,16 +1659,23 @@ static void STDMETHODCALLTYPE d2d_device_context_BeginDraw(ID2D1DeviceContext *i static HRESULT STDMETHODCALLTYPE d2d_device_context_EndDraw(ID2D1DeviceContext *iface, D2D1_TAG *tag1, D2D1_TAG *tag2) { - struct d2d_device_context *render_target = impl_from_ID2D1DeviceContext(iface); + struct d2d_device_context *context = impl_from_ID2D1DeviceContext(iface); + HRESULT hr; TRACE("iface %p, tag1 %p, tag2 %p.\n", iface, tag1, tag2); if (tag1) - *tag1 = render_target->error.tag1; + *tag1 = context->error.tag1; if (tag2) - *tag2 = render_target->error.tag2; + *tag2 = context->error.tag2; + + if (context->ops) + { + if (FAILED(hr = context->ops->device_context_present(context->outer_unknown))) + context->error.code = hr; + } - return render_target->error.code; + return context->error.code; } static D2D1_PIXEL_FORMAT * STDMETHODCALLTYPE d2d_device_context_GetPixelFormat(ID2D1DeviceContext *iface, @@ -2469,7 +2520,8 @@ static const struct ID2D1GdiInteropRenderTargetVtbl d2d_gdi_interop_render_targe }; static HRESULT d2d_device_context_init(struct d2d_device_context *render_target, ID2D1Factory *factory, - IDXGISurface *surface, IUnknown *outer_unknown, const D2D1_RENDER_TARGET_PROPERTIES *desc) + IDXGISurface *surface, IUnknown *outer_unknown, const struct d2d_device_context_ops *ops, + const D2D1_RENDER_TARGET_PROPERTIES *desc) { D3D10_SUBRESOURCE_DATA buffer_data; D3D10_STATE_BLOCK_MASK state_mask; @@ -3351,12 +3403,13 @@ static HRESULT d2d_device_context_init(struct d2d_device_context *render_target, render_target->ID2D1DeviceContext_iface.lpVtbl = &d2d_device_context_vtbl; render_target->ID2D1GdiInteropRenderTarget_iface.lpVtbl = &d2d_gdi_interop_render_target_vtbl; render_target->IDWriteTextRenderer_iface.lpVtbl = &d2d_text_renderer_vtbl; + render_target->IUnknown_iface.lpVtbl = &d2d_device_context_inner_unknown_vtbl; render_target->refcount = 1; render_target->factory = factory; ID2D1Factory_AddRef(render_target->factory); - render_target->outer_unknown = outer_unknown ? outer_unknown : - (IUnknown *)&render_target->ID2D1DeviceContext_iface; + render_target->outer_unknown = outer_unknown ? outer_unknown : &render_target->IUnknown_iface; + render_target->ops = ops; if (FAILED(hr = IDXGISurface_GetDevice(surface, &IID_ID3D10Device, (void **)&render_target->device))) { @@ -3555,7 +3608,7 @@ err: } HRESULT d2d_d3d_create_render_target(ID2D1Factory *factory, IDXGISurface *surface, IUnknown *outer_unknown, - const D2D1_RENDER_TARGET_PROPERTIES *desc, ID2D1RenderTarget **render_target) + const struct d2d_device_context_ops *ops, const D2D1_RENDER_TARGET_PROPERTIES *desc, void **render_target) { struct d2d_device_context *object; HRESULT hr; @@ -3563,7 +3616,7 @@ HRESULT d2d_d3d_create_render_target(ID2D1Factory *factory, IDXGISurface *surfac if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; - if (FAILED(hr = d2d_device_context_init(object, factory, surface, outer_unknown, desc))) + if (FAILED(hr = d2d_device_context_init(object, factory, surface, outer_unknown, ops, desc))) { WARN("Failed to initialize render target, hr %#x.\n", hr); heap_free(object); @@ -3571,7 +3624,7 @@ HRESULT d2d_d3d_create_render_target(ID2D1Factory *factory, IDXGISurface *surfac } TRACE("Created render target %p.\n", object); - *render_target = (ID2D1RenderTarget *)&object->ID2D1DeviceContext_iface; + *render_target = outer_unknown ? &object->IUnknown_iface : (IUnknown *)&object->ID2D1DeviceContext_iface; return S_OK; } diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c index d2e53879e69..b46d14c0d7e 100644 --- a/dlls/d2d1/factory.c +++ b/dlls/d2d1/factory.c @@ -340,7 +340,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDxgiSurfaceRenderTarget(ID2D1 { TRACE("iface %p, surface %p, desc %p, render_target %p.\n", iface, surface, desc, render_target); - return d2d_d3d_create_render_target((ID2D1Factory *)iface, surface, NULL, desc, render_target); + return d2d_d3d_create_render_target((ID2D1Factory *)iface, surface, NULL, NULL, desc, (void **)render_target); } static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDCRenderTarget(ID2D1Factory1 *iface, diff --git a/dlls/d2d1/hwnd_render_target.c b/dlls/d2d1/hwnd_render_target.c index 04d33536a6e..1e763261197 100644 --- a/dlls/d2d1/hwnd_render_target.c +++ b/dlls/d2d1/hwnd_render_target.c @@ -24,12 +24,20 @@ WINE_DEFAULT_DEBUG_CHANNEL(d2d); -static void render_target_present(struct d2d_hwnd_render_target *render_target) +static inline struct d2d_hwnd_render_target *impl_from_IUnknown(IUnknown *iface) { + return CONTAINING_RECORD(iface, struct d2d_hwnd_render_target, ID2D1HwndRenderTarget_iface); +} + +static HRESULT d2d_hwnd_render_target_present(IUnknown *outer_unknown) +{ + struct d2d_hwnd_render_target *render_target = impl_from_IUnknown(outer_unknown); HRESULT hr; if (FAILED(hr = IDXGISwapChain_Present(render_target->swapchain, render_target->sync_interval, 0))) WARN("Present failed, %#x.\n", hr); + + return S_OK; } static inline struct d2d_hwnd_render_target *impl_from_ID2D1HwndRenderTarget(ID2D1HwndRenderTarget *iface) @@ -53,13 +61,8 @@ static HRESULT STDMETHODCALLTYPE d2d_hwnd_render_target_QueryInterface(ID2D1Hwnd *out = iface; return S_OK; } - else if (IsEqualGUID(iid, &IID_ID2D1GdiInteropRenderTarget)) - return ID2D1RenderTarget_QueryInterface(render_target->dxgi_target, iid, out); - WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); - - *out = NULL; - return E_NOINTERFACE; + return IUnknown_QueryInterface(render_target->dxgi_inner, iid, out); } static ULONG STDMETHODCALLTYPE d2d_hwnd_render_target_AddRef(ID2D1HwndRenderTarget *iface) @@ -81,7 +84,7 @@ static ULONG STDMETHODCALLTYPE d2d_hwnd_render_target_Release(ID2D1HwndRenderTar if (!refcount) { - ID2D1RenderTarget_Release(render_target->dxgi_target); + IUnknown_Release(render_target->dxgi_inner); IDXGISwapChain_Release(render_target->swapchain); heap_free(render_target); } @@ -516,14 +519,10 @@ static HRESULT STDMETHODCALLTYPE d2d_hwnd_render_target_Flush(ID2D1HwndRenderTar D2D1_TAG *tag2) { struct d2d_hwnd_render_target *render_target = impl_from_ID2D1HwndRenderTarget(iface); - HRESULT hr; TRACE("iface %p, tag1 %p, tag2 %p.\n", iface, tag1, tag2); - hr = ID2D1RenderTarget_Flush(render_target->dxgi_target, tag1, tag2); - render_target_present(render_target); - - return hr; + return ID2D1RenderTarget_Flush(render_target->dxgi_target, tag1, tag2); } static void STDMETHODCALLTYPE d2d_hwnd_render_target_SaveDrawingState(ID2D1HwndRenderTarget *iface, @@ -587,14 +586,10 @@ static HRESULT STDMETHODCALLTYPE d2d_hwnd_render_target_EndDraw(ID2D1HwndRenderT D2D1_TAG *tag1, D2D1_TAG *tag2) { struct d2d_hwnd_render_target *render_target = impl_from_ID2D1HwndRenderTarget(iface); - HRESULT hr; TRACE("iface %p, tag1 %p, tag2 %p.\n", iface, tag1, tag2); - hr = ID2D1RenderTarget_EndDraw(render_target->dxgi_target, tag1, tag2); - render_target_present(render_target); - - return hr; + return ID2D1RenderTarget_EndDraw(render_target->dxgi_target, tag1, tag2); } static D2D1_PIXEL_FORMAT * STDMETHODCALLTYPE d2d_hwnd_render_target_GetPixelFormat(ID2D1HwndRenderTarget *iface, @@ -776,6 +771,11 @@ static const struct ID2D1HwndRenderTargetVtbl d2d_hwnd_render_target_vtbl = d2d_hwnd_render_target_GetHwnd }; +static const struct d2d_device_context_ops d2d_hwnd_render_target_ops = +{ + d2d_hwnd_render_target_present, +}; + HRESULT d2d_hwnd_render_target_init(struct d2d_hwnd_render_target *render_target, ID2D1Factory *factory, ID3D10Device1 *device, const D2D1_RENDER_TARGET_PROPERTIES *desc, const D2D1_HWND_RENDER_TARGET_PROPERTIES *hwnd_rt_desc) @@ -792,7 +792,6 @@ HRESULT d2d_hwnd_render_target_init(struct d2d_hwnd_render_target *render_target return HRESULT_FROM_WIN32(ERROR_INVALID_WINDOW_HANDLE); render_target->ID2D1HwndRenderTarget_iface.lpVtbl = &d2d_hwnd_render_target_vtbl; - render_target->refcount = 1; render_target->hwnd = hwnd_rt_desc->hwnd; render_target->sync_interval = hwnd_rt_desc->presentOptions & D2D1_PRESENT_OPTIONS_IMMEDIATELY ? 0 : 1; @@ -861,8 +860,9 @@ HRESULT d2d_hwnd_render_target_init(struct d2d_hwnd_render_target *render_target } render_target->ID2D1HwndRenderTarget_iface.lpVtbl = &d2d_hwnd_render_target_vtbl; - hr = d2d_d3d_create_render_target(factory, dxgi_surface, (IUnknown *)&render_target->ID2D1HwndRenderTarget_iface, - &dxgi_rt_desc, &render_target->dxgi_target); + hr = d2d_d3d_create_render_target(factory, dxgi_surface, + (IUnknown *)&render_target->ID2D1HwndRenderTarget_iface, &d2d_hwnd_render_target_ops, + &dxgi_rt_desc, (void **)&render_target->dxgi_inner); IDXGISurface_Release(dxgi_surface); if (FAILED(hr)) { @@ -871,5 +871,14 @@ HRESULT d2d_hwnd_render_target_init(struct d2d_hwnd_render_target *render_target return hr; } + if (FAILED(hr = IUnknown_QueryInterface(render_target->dxgi_inner, + &IID_ID2D1RenderTarget, (void **)&render_target->dxgi_target))) + { + WARN("Failed to retrieve ID2D1RenderTarget interface, hr %#x.\n", hr); + IUnknown_Release(render_target->dxgi_inner); + IDXGISwapChain_Release(render_target->swapchain); + return hr; + } + return S_OK; } diff --git a/dlls/d2d1/wic_render_target.c b/dlls/d2d1/wic_render_target.c index 5642fd44ff2..e342535838f 100644 --- a/dlls/d2d1/wic_render_target.c +++ b/dlls/d2d1/wic_render_target.c @@ -25,8 +25,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(d2d); -static void sync_bitmap(struct d2d_wic_render_target *render_target) +static inline struct d2d_wic_render_target *impl_from_IUnknown(IUnknown *iface) { + return CONTAINING_RECORD(iface, struct d2d_wic_render_target, ID2D1RenderTarget_iface); +} + +static HRESULT d2d_wic_render_target_present(IUnknown *outer_unknown) +{ + struct d2d_wic_render_target *render_target = impl_from_IUnknown(outer_unknown); D3D10_MAPPED_TEXTURE2D mapped_texture; ID3D10Resource *src_resource; IWICBitmapLock *bitmap_lock; @@ -41,7 +47,7 @@ static void sync_bitmap(struct d2d_wic_render_target *render_target) &IID_ID3D10Resource, (void **)&src_resource))) { ERR("Failed to get source resource interface, hr %#x.\n", hr); - return; + goto end; } ID3D10Texture2D_GetDevice(render_target->readback_texture, &device); @@ -56,28 +62,28 @@ static void sync_bitmap(struct d2d_wic_render_target *render_target) if (FAILED(hr = IWICBitmap_Lock(render_target->bitmap, &dst_rect, WICBitmapLockWrite, &bitmap_lock))) { ERR("Failed to lock destination bitmap, hr %#x.\n", hr); - return; + goto end; } if (FAILED(hr = IWICBitmapLock_GetDataPointer(bitmap_lock, &dst_size, &dst))) { ERR("Failed to get data pointer, hr %#x.\n", hr); IWICBitmapLock_Release(bitmap_lock); - return; + goto end; } if (FAILED(hr = IWICBitmapLock_GetStride(bitmap_lock, &dst_pitch))) { ERR("Failed to get stride, hr %#x.\n", hr); IWICBitmapLock_Release(bitmap_lock); - return; + goto end; } if (FAILED(hr = ID3D10Texture2D_Map(render_target->readback_texture, 0, D3D10_MAP_READ, 0, &mapped_texture))) { ERR("Failed to map readback texture, hr %#x.\n", hr); IWICBitmapLock_Release(bitmap_lock); - return; + goto end; } src = mapped_texture.pData; @@ -91,6 +97,9 @@ static void sync_bitmap(struct d2d_wic_render_target *render_target) ID3D10Texture2D_Unmap(render_target->readback_texture, 0); IWICBitmapLock_Release(bitmap_lock); + +end: + return S_OK; } static inline struct d2d_wic_render_target *impl_from_ID2D1RenderTarget(ID2D1RenderTarget *iface) @@ -112,13 +121,8 @@ static HRESULT STDMETHODCALLTYPE d2d_wic_render_target_QueryInterface(ID2D1Rende *out = iface; return S_OK; } - else if (IsEqualGUID(iid, &IID_ID2D1GdiInteropRenderTarget)) - return ID2D1RenderTarget_QueryInterface(render_target->dxgi_target, iid, out); - - WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); - *out = NULL; - return E_NOINTERFACE; + return IUnknown_QueryInterface(render_target->dxgi_inner, iid, out); } static ULONG STDMETHODCALLTYPE d2d_wic_render_target_AddRef(ID2D1RenderTarget *iface) @@ -142,7 +146,7 @@ static ULONG STDMETHODCALLTYPE d2d_wic_render_target_Release(ID2D1RenderTarget * { IWICBitmap_Release(render_target->bitmap); ID3D10Texture2D_Release(render_target->readback_texture); - ID2D1RenderTarget_Release(render_target->dxgi_target); + IUnknown_Release(render_target->dxgi_inner); IDXGISurface_Release(render_target->dxgi_surface); heap_free(render_target); } @@ -574,14 +578,10 @@ static void STDMETHODCALLTYPE d2d_wic_render_target_PopLayer(ID2D1RenderTarget * static HRESULT STDMETHODCALLTYPE d2d_wic_render_target_Flush(ID2D1RenderTarget *iface, D2D1_TAG *tag1, D2D1_TAG *tag2) { struct d2d_wic_render_target *render_target = impl_from_ID2D1RenderTarget(iface); - HRESULT hr; TRACE("iface %p, tag1 %p, tag2 %p.\n", iface, tag1, tag2); - hr = ID2D1RenderTarget_Flush(render_target->dxgi_target, tag1, tag2); - sync_bitmap(render_target); - - return hr; + return ID2D1RenderTarget_Flush(render_target->dxgi_target, tag1, tag2); } static void STDMETHODCALLTYPE d2d_wic_render_target_SaveDrawingState(ID2D1RenderTarget *iface, @@ -645,14 +645,10 @@ static HRESULT STDMETHODCALLTYPE d2d_wic_render_target_EndDraw(ID2D1RenderTarget D2D1_TAG *tag1, D2D1_TAG *tag2) { struct d2d_wic_render_target *render_target = impl_from_ID2D1RenderTarget(iface); - HRESULT hr; TRACE("iface %p, tag1 %p, tag2 %p.\n", iface, tag1, tag2); - hr = ID2D1RenderTarget_EndDraw(render_target->dxgi_target, tag1, tag2); - sync_bitmap(render_target); - - return hr; + return ID2D1RenderTarget_EndDraw(render_target->dxgi_target, tag1, tag2); } static D2D1_PIXEL_FORMAT * STDMETHODCALLTYPE d2d_wic_render_target_GetPixelFormat(ID2D1RenderTarget *iface, @@ -785,6 +781,11 @@ static const struct ID2D1RenderTargetVtbl d2d_wic_render_target_vtbl = d2d_wic_render_target_IsSupported, }; +static const struct d2d_device_context_ops d2d_wic_render_target_ops = +{ + d2d_wic_render_target_present, +}; + HRESULT d2d_wic_render_target_init(struct d2d_wic_render_target *render_target, ID2D1Factory *factory, ID3D10Device1 *device, IWICBitmap *bitmap, const D2D1_RENDER_TARGET_PROPERTIES *desc) { @@ -793,7 +794,6 @@ HRESULT d2d_wic_render_target_init(struct d2d_wic_render_target *render_target, HRESULT hr; render_target->ID2D1RenderTarget_iface.lpVtbl = &d2d_wic_render_target_vtbl; - render_target->refcount = 1; if (FAILED(hr = IWICBitmap_GetSize(bitmap, &render_target->width, &render_target->height))) { @@ -875,7 +875,8 @@ HRESULT d2d_wic_render_target_init(struct d2d_wic_render_target *render_target, } if (FAILED(hr = d2d_d3d_create_render_target(factory, render_target->dxgi_surface, - (IUnknown *)&render_target->ID2D1RenderTarget_iface, desc, &render_target->dxgi_target))) + (IUnknown *)&render_target->ID2D1RenderTarget_iface, &d2d_wic_render_target_ops, + desc, (void **)&render_target->dxgi_inner))) { WARN("Failed to create DXGI surface render target, hr %#x.\n", hr); ID3D10Texture2D_Release(render_target->readback_texture); @@ -883,6 +884,16 @@ HRESULT d2d_wic_render_target_init(struct d2d_wic_render_target *render_target, return hr; } + if (FAILED(hr = IUnknown_QueryInterface(render_target->dxgi_inner, + &IID_ID2D1RenderTarget, (void **)&render_target->dxgi_target))) + { + WARN("Failed to retrieve ID2D1RenderTarget interface, hr %#x.\n", hr); + IUnknown_Release(render_target->dxgi_inner); + ID3D10Texture2D_Release(render_target->readback_texture); + IDXGISurface_Release(render_target->dxgi_surface); + return hr; + } + render_target->bitmap = bitmap; IWICBitmap_AddRef(bitmap); -- 2.11.0

1 0

[PATCH v2 1/3] include: Add virtdisk.h.
by Gijs Vermeulen 12 Sep '18

12 Sep '18

Based on a patch by Louis Lenders. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- include/Makefile.in | 1 + include/virtdisk.h | 202 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 203 insertions(+) create mode 100644 include/virtdisk.h diff --git a/include/Makefile.in b/include/Makefile.in index ffecb98d9e..74dc293a29 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -637,6 +637,7 @@ SOURCES = \ verrsrc.h \ vfw.h \ vfwmsgs.h \ + virtdisk.h \ vmr9.idl \ vmrender.idl \ vss.idl \ diff --git a/include/virtdisk.h b/include/virtdisk.h new file mode 100644 index 0000000000..0927f609a8 --- /dev/null +++ b/include/virtdisk.h @@ -0,0 +1,202 @@ +/* + * Copyright 2017 Louis Lenders + * Copyright 2018 Gijs Vermeulen + * + * 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 + */ + +#ifndef __WINE_VIRTDISK_DLL_H +#define __WINE_VIRTDISK_DLL_H + +#include <windows.h> + +#ifdef __cplusplus +extern "C" { +#endif + +#define VIRTUAL_STORAGE_TYPE_DEVICE_UNKNOWN 0 +#define VIRTUAL_STORAGE_TYPE_DEVICE_ISO 1 +#define VIRTUAL_STORAGE_TYPE_DEVICE_VHD 2 + +typedef enum _ATTACH_VIRTUAL_DISK_FLAG { + ATTACH_VIRTUAL_DISK_FLAG_NONE = 0x00000000, + ATTACH_VIRTUAL_DISK_FLAG_READ_ONLY = 0x00000001, + ATTACH_VIRTUAL_DISK_FLAG_NO_DRIVE_LETTER = 0x00000002, + ATTACH_VIRTUAL_DISK_FLAG_PERMANENT_LIFETIME = 0x00000004, + ATTACH_VIRTUAL_DISK_FLAG_NO_LOCAL_HOST = 0x00000008 +} ATTACH_VIRTUAL_DISK_FLAG; + +typedef enum _ATTACH_VIRTUAL_DISK_VERSION { + ATTACH_VIRTUAL_DISK_VERSION_UNSPECIFIED = 0, + ATTACH_VIRTUAL_DISK_VERSION_1 = 1 +} ATTACH_VIRTUAL_DISK_VERSION; + +typedef enum _COMPACT_VIRTUAL_DISK_FLAG { + COMPACT_VIRTUAL_DISK_FLAG_NONE = 0x00000000 +} COMPACT_VIRTUAL_DISK_FLAG; + +typedef enum _COMPACT_VIRTUAL_DISK_VERSION { + COMPACT_VIRTUAL_DISK_VERSION_UNSPECIFIED = 0, + COMPACT_VIRTUAL_DISK_VERSION_1 = 1 +} COMPACT_VIRTUAL_DISK_VERSION; + +typedef enum _DEPENDENT_DISK_FLAG +{ + DEPENDENT_DISK_FLAG_NONE = 0x00000000, + DEPENDENT_DISK_FLAG_MULT_BACKING_FILES = 0x00000001, + DEPENDENT_DISK_FLAG_FULLY_ALLOCATED = 0x00000002, + DEPENDENT_DISK_FLAG_READ_ONLY = 0x00000004, + DEPENDENT_DISK_FLAG_REMOTE = 0x00000008, + DEPENDENT_DISK_FLAG_SYSTEM_VOLUME = 0x00000010, + DEPENDENT_DISK_FLAG_SYSTEM_VOLUME_PARENT = 0x00000020, + DEPENDENT_DISK_FLAG_REMOVABLE = 0x00000040, + DEPENDENT_DISK_FLAG_NO_DRIVE_LETTER = 0x00000080, + DEPENDENT_DISK_FLAG_PARENT = 0x00000100, + DEPENDENT_DISK_FLAG_NO_HOST_DISK = 0x00000200, + DEPENDENT_DISK_FLAG_PERMANENT_LIFETIME = 0x00000400 +} DEPENDENT_DISK_FLAG; + +typedef enum _EXPAND_VIRTUAL_DISK_VERSION { + EXPAND_VIRTUAL_DISK_VERSION_UNSPECIFIED = 0, + EXPAND_VIRTUAL_DISK_VERSION_1 = 1 +} EXPAND_VIRTUAL_DISK_VERSION; + +typedef enum _DETACH_VIRTUAL_DISK_FLAG { + DETACH_VIRTUAL_DISK_FLAG_NONE = 0x00000000 +} DETACH_VIRTUAL_DISK_FLAG; + +typedef enum _EXPAND_VIRTUAL_DISK_FLAG { + EXPAND_VIRTUAL_DISK_FLAG_NONE = 0x00000000 +} EXPAND_VIRTUAL_DISK_FLAG; + +typedef enum _GET_STORAGE_DEPENDENCY_FLAG +{ + GET_STORAGE_DEPENDENCY_FLAG_NONE = 0x00000000, + GET_STORAGE_DEPENDENCY_FLAG_HOST_VOLUMES = 0x00000001, + GET_STORAGE_DEPENDENCY_FLAG_DISK_HANDLE = 0x00000002 +} GET_STORAGE_DEPENDENCY_FLAG; + +typedef enum _MIRROR_VIRTUAL_DISK_FLAG { + MIRROR_VIRTUAL_DISK_FLAG_NONE = 0x00000000, + MIRROR_VIRTUAL_DISK_FLAG_EXISTING_FILE = 0x00000001 +} MIRROR_VIRTUAL_DISK_FLAG; + +typedef enum _MIRROR_VIRTUAL_DISK_VERSION { + MIRROR_VIRTUAL_DISK_VERSION_UNSPECIFIED = 0, + MIRROR_VIRTUAL_DISK_VERSION_1 = 1 +} MIRROR_VIRTUAL_DISK_VERSION; + +typedef enum _MERGE_VIRTUAL_DISK_FLAG { + MERGE_VIRTUAL_DISK_FLAG_NONE = 0x00000000 +} MERGE_VIRTUAL_DISK_FLAG; + +typedef enum _STORAGE_DEPENDENCY_INFO_VERSION +{ + STORAGE_DEPENDENCY_INFO_VERSION_UNSPECIFIED = 0x0, + STORAGE_DEPENDENCY_INFO_VERSION_1 = 0x1, + STORAGE_DEPENDENCY_INFO_VERSION_2 = 0x2 +} STORAGE_DEPENDENCY_INFO_VERSION; + +typedef enum _VIRTUAL_DISK_ACCESS_MASK { + VIRTUAL_DISK_ACCESS_NONE = 0x00000000, + VIRTUAL_DISK_ACCESS_ATTACH_RO = 0x00010000, + VIRTUAL_DISK_ACCESS_ATTACH_RW = 0x00020000, + VIRTUAL_DISK_ACCESS_DETACH = 0x00040000, + VIRTUAL_DISK_ACCESS_GET_INFO = 0x00080000, + VIRTUAL_DISK_ACCESS_CREATE = 0x00100000, + VIRTUAL_DISK_ACCESS_METAOPS = 0x00200000, + VIRTUAL_DISK_ACCESS_READ = 0x000d0000, + VIRTUAL_DISK_ACCESS_ALL = 0x003f0000, + VIRTUAL_DISK_ACCESS_WRITABLE = 0x00320000 +} VIRTUAL_DISK_ACCESS_MASK; + +typedef struct _VIRTUAL_STORAGE_TYPE +{ + ULONG DeviceId; + GUID VendorId; +} VIRTUAL_STORAGE_TYPE, *PVIRTUAL_STORAGE_TYPE; + +typedef struct _ATTACH_VIRTUAL_DISK_PARAMETERS { + ATTACH_VIRTUAL_DISK_VERSION Version; + __C89_NAMELESS union { + struct { + ULONG Reserved; + } Version1; + } DUMMYUNIONNAME; +} ATTACH_VIRTUAL_DISK_PARAMETERS, *PATTACH_VIRTUAL_DISK_PARAMETERS; + +typedef struct _COMPACT_VIRTUAL_DISK_PARAMETERS { + COMPACT_VIRTUAL_DISK_VERSION Version; + __C89_NAMELESS union { + struct { + ULONG Reserved; + } Version1; + } DUMMYUNIONNAME; +} COMPACT_VIRTUAL_DISK_PARAMETERS, *PCOMPACT_VIRTUAL_DISK_PARAMETERS; + +typedef struct _EXPAND_VIRTUAL_DISK_PARAMETERS { + EXPAND_VIRTUAL_DISK_VERSION Version; + __C89_NAMELESS union { + struct { + ULONGLONG NewSize; + } Version1; + } DUMMYUNIONNAME; +} EXPAND_VIRTUAL_DISK_PARAMETERS, *PEXPAND_VIRTUAL_DISK_PARAMETERS; + +typedef struct _STORAGE_DEPENDENCY_INFO_TYPE_1 +{ + DEPENDENT_DISK_FLAG DependencyTypeFlags; + ULONG ProviderSpecificFlags; + VIRTUAL_STORAGE_TYPE VirtualStorageType; +} STORAGE_DEPENDENCY_INFO_TYPE_1, *PSTORAGE_DEPENDENCY_INFO_TYPE_1; + +typedef struct _STORAGE_DEPENDENCY_INFO_TYPE_2 +{ + DEPENDENT_DISK_FLAG DependencyTypeFlags; + ULONG ProviderSpecificFlags; + VIRTUAL_STORAGE_TYPE VirtualStorageType; + ULONG AncestorLevel; + PWSTR DependencyDeviceName; + PWSTR HostVolumeName; + PWSTR DependentVolumeName; + PWSTR DependentVolumeRelativePath; +} STORAGE_DEPENDENCY_INFO_TYPE_2, *PSTORAGE_DEPENDENCY_INFO_TYPE_2; + +typedef struct _STORAGE_DEPENDENCY_INFO +{ + STORAGE_DEPENDENCY_INFO_VERSION Version; + ULONG NumberEntries; +#if !defined(__WINESRC__) && (defined(_MSC_EXTENSIONS) || ((defined(__GNUC__) && __GNUC__ >= 3))) + __C89_NAMELESS union + { + STORAGE_DEPENDENCY_INFO_TYPE_1 Version1Entries[]; + STORAGE_DEPENDENCY_INFO_TYPE_2 Version2Entries[]; + } __C89_NAMELESSUNIONNAME; +#endif +} STORAGE_DEPENDENCY_INFO, *PSTORAGE_DEPENDENCY_INFO; + +typedef struct _VIRTUAL_DISK_PROGRESS { + DWORD OperationStatus; + ULONGLONG CurrentValue; + ULONGLONG CompletionValue; +} VIRTUAL_DISK_PROGRESS, *PVIRTUAL_DISK_PROGRESS; + +DWORD WINAPI GetStorageDependencyInformation(HANDLE obj, GET_STORAGE_DEPENDENCY_FLAG flags, ULONG size, STORAGE_DEPENDENCY_INFO *info, ULONG *used); + +#ifdef __cplusplus +} +#endif + +#endif /* __WINE_VIRTDISK_DLL_H */ -- 2.18.0

2 3

[PATCH] opcservices: Partially implement content stream for package parts.
by Nikolay Sivov 12 Sep '18

12 Sep '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/opcservices/factory.c | 2 +- dlls/opcservices/package.c | 272 ++++++++++++++++++++++++++- dlls/opcservices/tests/opcservices.c | 35 ++++ 3 files changed, 306 insertions(+), 3 deletions(-) diff --git a/dlls/opcservices/factory.c b/dlls/opcservices/factory.c index 9036141495..1a98f3f49d 100644 --- a/dlls/opcservices/factory.c +++ b/dlls/opcservices/factory.c @@ -278,7 +278,7 @@ static HRESULT opc_filestream_create(const WCHAR *filename, OPC_STREAM_IO_MODE i stream->refcount = 1; *out = &stream->IStream_iface; - TRACE("Created file steam %p.\n", *out); + TRACE("Created file stream %p.\n", *out); return S_OK; } diff --git a/dlls/opcservices/package.c b/dlls/opcservices/package.c index 66cc49a16e..c7ae2581cc 100644 --- a/dlls/opcservices/package.c +++ b/dlls/opcservices/package.c @@ -31,6 +31,22 @@ WINE_DEFAULT_DEBUG_CHANNEL(msopc); +struct opc_content +{ + LONG refcount; + BYTE *data; + ULARGE_INTEGER size; +}; + +struct opc_content_stream +{ + IStream IStream_iface; + LONG refcount; + + struct opc_content *content; + ULARGE_INTEGER pos; +}; + struct opc_package { IOpcPackage IOpcPackage_iface; @@ -50,6 +66,7 @@ struct opc_part WCHAR *content_type; DWORD compression_options; IOpcRelationshipSet *relationship_set; + struct opc_content *content; }; struct opc_part_set @@ -110,6 +127,243 @@ static inline struct opc_relationship *impl_from_IOpcRelationship(IOpcRelationsh return CONTAINING_RECORD(iface, struct opc_relationship, IOpcRelationship_iface); } +static inline struct opc_content_stream *impl_from_IStream(IStream *iface) +{ + return CONTAINING_RECORD(iface, struct opc_content_stream, IStream_iface); +} + +static void opc_content_release(struct opc_content *content) +{ + ULONG refcount = InterlockedDecrement(&content->refcount); + + if (!refcount) + { + heap_free(content->data); + heap_free(content); + } +} + +static HRESULT WINAPI opc_content_stream_QueryInterface(IStream *iface, REFIID iid, void **out) +{ + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); + + if (IsEqualIID(iid, &IID_IStream) || + IsEqualIID(iid, &IID_ISequentialStream) || + IsEqualIID(iid, &IID_IUnknown)) + { + *out = iface; + IStream_AddRef(iface); + return S_OK; + } + + *out = NULL; + WARN("Unsupported interface %s.\n", debugstr_guid(iid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI opc_content_stream_AddRef(IStream *iface) +{ + struct opc_content_stream *stream = impl_from_IStream(iface); + ULONG refcount = InterlockedIncrement(&stream->refcount); + + TRACE("%p increasing refcount to %u.\n", iface, refcount); + + return refcount; +} + +static ULONG WINAPI opc_content_stream_Release(IStream *iface) +{ + struct opc_content_stream *stream = impl_from_IStream(iface); + ULONG refcount = InterlockedDecrement(&stream->refcount); + + TRACE("%p decreasing refcount to %u.\n", iface, refcount); + + if (!refcount) + { + opc_content_release(stream->content); + heap_free(stream); + } + + return refcount; +} + +static HRESULT WINAPI opc_content_stream_Read(IStream *iface, void *buff, ULONG size, ULONG *num_read) +{ + struct opc_content_stream *stream = impl_from_IStream(iface); + DWORD read = 0; + + TRACE("iface %p, buff %p, size %u, num_read %p.\n", iface, buff, size, num_read); + + if (!num_read) + num_read = &read; + + if (stream->content->size.QuadPart - stream->pos.QuadPart < size) + *num_read = stream->content->size.QuadPart - stream->pos.QuadPart; + else + *num_read = size; + + if (*num_read) + memcpy(buff, stream->content->data + stream->pos.QuadPart, *num_read); + + return S_OK; +} + +static HRESULT WINAPI opc_content_stream_Write(IStream *iface, const void *data, ULONG size, ULONG *num_written) +{ + struct opc_content_stream *stream = impl_from_IStream(iface); + DWORD written = 0; + + TRACE("iface %p, data %p, size %u, num_written %p.\n", iface, data, size, num_written); + + if (!num_written) + num_written = &written; + + *num_written = 0; + + if (size > stream->content->size.QuadPart - stream->pos.QuadPart) + { + void *ptr = heap_realloc(stream->content->data, stream->pos.QuadPart + size); + if (!ptr) + return E_OUTOFMEMORY; + stream->content->data = ptr; + } + + memcpy(stream->content->data + stream->pos.QuadPart, data, size); + stream->pos.QuadPart += size; + stream->content->size.QuadPart += size; + *num_written = size; + + return S_OK; +} + +static HRESULT WINAPI opc_content_stream_Seek(IStream *iface, LARGE_INTEGER move, DWORD origin, ULARGE_INTEGER *newpos) +{ + struct opc_content_stream *stream = impl_from_IStream(iface); + ULARGE_INTEGER pos; + + TRACE("iface %p, move %s, origin %d, newpos %p.\n", iface, wine_dbgstr_longlong(move.QuadPart), origin, newpos); + + switch (origin) + { + case STREAM_SEEK_SET: + pos.QuadPart = move.QuadPart; + break; + case STREAM_SEEK_CUR: + pos.QuadPart = stream->pos.QuadPart + move.QuadPart; + break; + case STREAM_SEEK_END: + pos.QuadPart = stream->content->size.QuadPart + move.QuadPart; + default: + WARN("Unknown origin mode %d.\n", origin); + return E_INVALIDARG; + } + + stream->pos = pos; + + if (newpos) + *newpos = stream->pos; + + return S_OK; +} + +static HRESULT WINAPI opc_content_stream_SetSize(IStream *iface, ULARGE_INTEGER size) +{ + FIXME("iface %p, size %s stub!\n", iface, wine_dbgstr_longlong(size.QuadPart)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI opc_content_stream_CopyTo(IStream *iface, IStream *dest, ULARGE_INTEGER size, + ULARGE_INTEGER *num_read, ULARGE_INTEGER *written) +{ + FIXME("iface %p, dest %p, size %s, num_read %p, written %p stub!\n", iface, dest, + wine_dbgstr_longlong(size.QuadPart), num_read, written); + + return E_NOTIMPL; +} + +static HRESULT WINAPI opc_content_stream_Commit(IStream *iface, DWORD flags) +{ + FIXME("iface %p, flags %#x stub!\n", iface, flags); + + return E_NOTIMPL; +} + +static HRESULT WINAPI opc_content_stream_Revert(IStream *iface) +{ + FIXME("iface %p stub!\n", iface); + + return E_NOTIMPL; +} + +static HRESULT WINAPI opc_content_stream_LockRegion(IStream *iface, ULARGE_INTEGER offset, + ULARGE_INTEGER size, DWORD lock_type) +{ + FIXME("iface %p, offset %s, size %s, lock_type %d stub!\n", iface, wine_dbgstr_longlong(offset.QuadPart), + wine_dbgstr_longlong(size.QuadPart), lock_type); + + return E_NOTIMPL; +} + +static HRESULT WINAPI opc_content_stream_UnlockRegion(IStream *iface, ULARGE_INTEGER offset, ULARGE_INTEGER size, + DWORD lock_type) +{ + FIXME("iface %p, offset %s, size %s, lock_type %d stub!\n", iface, wine_dbgstr_longlong(offset.QuadPart), + wine_dbgstr_longlong(size.QuadPart), lock_type); + + return E_NOTIMPL; +} + +static HRESULT WINAPI opc_content_stream_Stat(IStream *iface, STATSTG *statstg, DWORD flag) +{ + FIXME("iface %p, statstg %p, flag %d stub!\n", iface, statstg, flag); + + return E_NOTIMPL; +} + +static HRESULT WINAPI opc_content_stream_Clone(IStream *iface, IStream **result) +{ + FIXME("iface %p, result %p stub!\n", iface, result); + + return E_NOTIMPL; +} + +static const IStreamVtbl opc_content_stream_vtbl = +{ + opc_content_stream_QueryInterface, + opc_content_stream_AddRef, + opc_content_stream_Release, + opc_content_stream_Read, + opc_content_stream_Write, + opc_content_stream_Seek, + opc_content_stream_SetSize, + opc_content_stream_CopyTo, + opc_content_stream_Commit, + opc_content_stream_Revert, + opc_content_stream_LockRegion, + opc_content_stream_UnlockRegion, + opc_content_stream_Stat, + opc_content_stream_Clone, +}; + +static HRESULT opc_content_stream_create(struct opc_content *content, IStream **out) +{ + struct opc_content_stream *stream; + + if (!(stream = heap_alloc_zero(sizeof(*stream)))) + return E_OUTOFMEMORY; + + stream->IStream_iface.lpVtbl = &opc_content_stream_vtbl; + stream->refcount = 1; + stream->content = content; + InterlockedIncrement(&content->refcount); + + *out = &stream->IStream_iface; + + TRACE("Created content stream %p.\n", *out); + return S_OK; +} + static HRESULT opc_relationship_set_create(IOpcUri *source_uri, IOpcRelationshipSet **relationship_set); static WCHAR *opc_strdupW(const WCHAR *str) @@ -168,6 +422,7 @@ static ULONG WINAPI opc_part_Release(IOpcPart *iface) IOpcRelationshipSet_Release(part->relationship_set); IOpcPartUri_Release(part->name); CoTaskMemFree(part->content_type); + opc_content_release(part->content); heap_free(part); } @@ -192,9 +447,14 @@ static HRESULT WINAPI opc_part_GetRelationshipSet(IOpcPart *iface, IOpcRelations static HRESULT WINAPI opc_part_GetContentStream(IOpcPart *iface, IStream **stream) { - FIXME("iface %p, stream %p stub!\n", iface, stream); + struct opc_part *part = impl_from_IOpcPart(iface); - return E_NOTIMPL; + TRACE("iface %p, stream %p.\n", iface, stream); + + if (!stream) + return E_POINTER; + + return opc_content_stream_create(part->content, stream); } static HRESULT WINAPI opc_part_GetName(IOpcPart *iface, IOpcPartUri **name) @@ -266,6 +526,14 @@ static HRESULT opc_part_create(struct opc_part_set *set, IOpcPartUri *name, cons return E_OUTOFMEMORY; } + part->content = heap_alloc_zero(sizeof(*part->content)); + if (!part->content) + { + IOpcPart_Release(&part->IOpcPart_iface); + return E_OUTOFMEMORY; + } + part->content->refcount = 1; + set->parts[set->count++] = part; IOpcPart_AddRef(&part->IOpcPart_iface); diff --git a/dlls/opcservices/tests/opcservices.c b/dlls/opcservices/tests/opcservices.c index 84a8c12dc9..f6194609ed 100644 --- a/dlls/opcservices/tests/opcservices.c +++ b/dlls/opcservices/tests/opcservices.c @@ -44,12 +44,16 @@ static void test_package(void) static const WCHAR rootW[] = {'/',0}; IOpcRelationshipSet *relset, *relset2; IOpcPartSet *partset, *partset2; + IStream *stream, *stream2; IOpcRelationship *rel; IOpcPartUri *part_uri; IOpcFactory *factory; IOpcPackage *package; + LARGE_INTEGER move; + ULARGE_INTEGER pos; IUri *target_uri; IOpcPart *part; + char buff[16]; IOpcUri *uri; HRESULT hr; BSTR str; @@ -82,6 +86,37 @@ static void test_package(void) hr = IOpcPartSet_CreatePart(partset, part_uri, typeW, OPC_COMPRESSION_NONE, &part); ok(SUCCEEDED(hr), "Failed to create a part, hr %#x.\n", hr); + hr = IOpcPart_GetContentStream(part, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = IOpcPart_GetContentStream(part, &stream); + ok(SUCCEEDED(hr), "Failed to get content stream, hr %#x.\n", hr); + + hr = IStream_Write(stream, "abc", 3, NULL); + ok(hr == S_OK, "Failed to write content, hr %#x.\n", hr); + + move.QuadPart = 0; + hr = IStream_Seek(stream, move, STREAM_SEEK_CUR, &pos); + ok(SUCCEEDED(hr), "Seek failed, hr %#x.\n", hr); + ok(pos.QuadPart == 3, "Unexpected position.\n"); + + hr = IOpcPart_GetContentStream(part, &stream2); + ok(SUCCEEDED(hr), "Failed to get content stream, hr %#x.\n", hr); + ok(stream != stream2, "Unexpected instance.\n"); + + move.QuadPart = 0; + hr = IStream_Seek(stream2, move, STREAM_SEEK_CUR, &pos); + ok(SUCCEEDED(hr), "Seek failed, hr %#x.\n", hr); + ok(pos.QuadPart == 0, "Unexpected position.\n"); + + memset(buff, 0, sizeof(buff)); + hr = IStream_Read(stream2, buff, sizeof(buff), NULL); + ok(hr == S_OK, "Failed to read content, hr %#x.\n", hr); + ok(!memcmp(buff, "abc", 3), "Unexpected content.\n"); + + IStream_Release(stream); + IStream_Release(stream2); + hr = IOpcPart_GetRelationshipSet(part, &relset); ok(SUCCEEDED(hr), "Failed to get relationship set, hr %#x.\n", hr); -- 2.18.0

1 0

[PATCH 1/2] xmllite/tests: Add another test for WriteAttributeString().
by Nikolay Sivov 12 Sep '18

12 Sep '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/xmllite/tests/writer.c | 62 ++++++++++++++++++++----------------- 1 file changed, 33 insertions(+), 29 deletions(-) diff --git a/dlls/xmllite/tests/writer.c b/dlls/xmllite/tests/writer.c index 87cdaabce1..972eb96d9b 100644 --- a/dlls/xmllite/tests/writer.c +++ b/dlls/xmllite/tests/writer.c @@ -1572,6 +1572,27 @@ static void test_indentation(void) IXmlWriter_Release(writer); } +static HRESULT write_attribute_string(IXmlWriter *writer, const char *prefix, const char *local, + const char *uri, const char *value) +{ + WCHAR *prefixW, *localW, *uriW, *valueW; + HRESULT hr; + + prefixW = strdupAtoW(prefix); + localW = strdupAtoW(local); + uriW = strdupAtoW(uri); + valueW = strdupAtoW(value); + + hr = IXmlWriter_WriteAttributeString(writer, prefixW, localW, uriW, valueW); + + heap_free(prefixW); + heap_free(localW); + heap_free(uriW); + heap_free(valueW); + + return hr; +} + static void test_WriteAttributeString(void) { static const struct @@ -1589,6 +1610,7 @@ static void test_WriteAttributeString(void) { NULL, "a", NULL, "b", "<e a=\"b\" />", "<e a=\"b\"" }, { "prefix", "local", "uri", "b", "<e prefix:local=\"b\" xmlns:prefix=\"uri\" />", "<e prefix:local=\"b\"" }, { NULL, "a", "http://www.w3.org/2000/xmlns/", "defuri", "<e xmlns:a=\"defuri\" />", "<e xmlns:a=\"defuri\"" }, + { "xmlns", "a", NULL, "uri", "<e xmlns:a=\"uri\" />", "<e xmlns:a=\"uri\"" }, /* Autogenerated prefix names. */ { NULL, "a", "defuri", NULL, "<e p1:a=\"\" xmlns:p1=\"defuri\" />", "<e p1:a=\"\"" }, @@ -1606,12 +1628,6 @@ static void test_WriteAttributeString(void) { "prefix", "a", "http://www.w3.org/2000/xmlns/", "defuri", "<e />", "<e", WR_E_XMLNSURIDECLARATION }, }; - static const WCHAR prefixW[] = {'p','r','e','f','i','x',0}; - static const WCHAR localW[] = {'l','o','c','a','l',0}; - static const WCHAR uriW[] = {'u','r','i',0}; - static const WCHAR elementW[] = {'e',0}; - static const WCHAR aW[] = {'a',0}; - static const WCHAR bW[] = {'b',0}; IXmlWriter *writer; IStream *stream; unsigned int i; @@ -1624,22 +1640,16 @@ static void test_WriteAttributeString(void) for (i = 0; i < ARRAY_SIZE(attribute_tests); ++i) { - WCHAR *prefixW, *localW, *uriW, *valueW; - stream = writer_set_output(writer); hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Omit); ok(hr == S_OK, "Failed to start document, hr %#x.\n", hr); - hr = IXmlWriter_WriteStartElement(writer, NULL, elementW, NULL); + hr = write_start_element(writer, NULL, "e", NULL); ok(hr == S_OK, "Failed to start element, hr %#x.\n", hr); - prefixW = strdupAtoW(attribute_tests[i].prefix); - localW = strdupAtoW(attribute_tests[i].local); - uriW = strdupAtoW(attribute_tests[i].uri); - valueW = strdupAtoW(attribute_tests[i].value); - - hr = IXmlWriter_WriteAttributeString(writer, prefixW, localW, uriW, valueW); + hr = write_attribute_string(writer, attribute_tests[i].prefix, attribute_tests[i].local, + attribute_tests[i].uri, attribute_tests[i].value); todo_wine_if(i != 0) ok(hr == attribute_tests[i].hr, "%u: unexpected hr %#x.\n", i, hr); @@ -1654,11 +1664,6 @@ static void test_WriteAttributeString(void) hr = IXmlWriter_Flush(writer); ok(hr == S_OK, "Failed to flush, hr %#x.\n", hr); - heap_free(prefixW); - heap_free(localW); - heap_free(uriW); - heap_free(valueW); - check_output(stream, attribute_tests[i].output, i == 1 || i == 2 || i == 3 || i == 4, __LINE__); IStream_Release(stream); } @@ -1669,21 +1674,20 @@ static void test_WriteAttributeString(void) hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Omit); ok(hr == S_OK, "got 0x%08x\n", hr); - hr = IXmlWriter_WriteStartElement(writer, NULL, aW, NULL); + hr = write_start_element(writer, "p", "a", "outeruri"); ok(hr == S_OK, "got 0x%08x\n", hr); - hr = IXmlWriter_WriteAttributeString(writer, aW, NULL, NULL, bW); -todo_wine - ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); - - hr = IXmlWriter_WriteAttributeString(writer, prefixW, localW, uriW, bW); + hr = write_attribute_string(writer, "prefix", "local", "uri", "b"); todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); - hr = IXmlWriter_WriteAttributeString(writer, NULL, aW, NULL, bW); + hr = write_attribute_string(writer, NULL, "a", NULL, "b"); ok(hr == S_OK, "got 0x%08x\n", hr); - hr = IXmlWriter_WriteAttributeString(writer, prefixW, localW, NULL, bW); + hr = write_attribute_string(writer, "p", "attr", NULL, "value"); + ok(hr == S_OK, "Failed to write attribute string, hr %#x.\n", hr); + + hr = write_attribute_string(writer, "prefix", "local", NULL, "b"); todo_wine ok(hr == WR_E_DUPLICATEATTRIBUTE, "got 0x%08x\n", hr); @@ -1694,7 +1698,7 @@ todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); CHECK_OUTPUT_TODO(stream, - "<a prefix:local=\"b\" a=\"b\" xmlns:prefix=\"uri\" />"); + "<p:a prefix:local=\"b\" a=\"b\" p:attr=\"value\" xmlns:prefix=\"uri\" xmlns:p=\"outeruri\" />"); IXmlWriter_Release(writer); IStream_Release(stream); -- 2.18.0

1 1

[PATCH] user32: Make sure that passed window handle is scroll control before accessing wExtra in SCROLL_GetInternalInfo.
by Jacek Caban 12 Sep '18

12 Sep '18

Fixes memory corruption in Office 2016. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- I'm not sure a new window flag is the best way to handle it. I did it the same way as it's done for MDI client. dlls/user32/scroll.c | 7 ++++++- dlls/user32/tests/scroll.c | 21 +++++++++++++++++++++ dlls/user32/win.h | 1 + 3 files changed, 28 insertions(+), 1 deletion(-)

1 0

[PATCH] vcruntime140: Add __uncaught_exceptions implementation
by Piotr Caban 12 Sep '18

12 Sep '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/vcruntime140/Makefile.in | 1 + dlls/vcruntime140/misc.c | 7 +++++++ dlls/vcruntime140/vcruntime140.spec | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-)

1 0

[PATCH] winemac: Allow Command to be mapped to Ctrl.
by Ricky Zhou 12 Sep '18

12 Sep '18

Adds the following registry options, which configure the Mac driver to map Command to Ctrl: HKEY_CURRENT_USER\Software\Wine\Mac Driver\LeftCommandIsCtrl HKEY_CURRENT_USER\Software\Wine\Mac Driver\RightCommandIsCtrl Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=35351 Signed-off-by: Ricky Zhou <ricky(a)rzhou.org> --- dlls/winemac.drv/cocoa_window.m | 38 ++++++++++++++++++++------------- dlls/winemac.drv/macdrv_cocoa.h | 2 ++ dlls/winemac.drv/macdrv_main.c | 7 ++++++ 3 files changed, 32 insertions(+), 15 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 4143d147df..6eacf43151 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -140,22 +140,30 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) *modifiers &= ~NX_ALTERNATEMASK; } -static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modifiers) +static inline NSUInteger adjusted_modifiers_for_settings(NSUInteger modifiers) { fix_device_modifiers_by_generic(&modifiers); - if (left_option_is_alt && (modifiers & NX_DEVICELALTKEYMASK)) - { - modifiers |= NX_DEVICELCMDKEYMASK; - modifiers &= ~NX_DEVICELALTKEYMASK; - } - if (right_option_is_alt && (modifiers & NX_DEVICERALTKEYMASK)) - { - modifiers |= NX_DEVICERCMDKEYMASK; - modifiers &= ~NX_DEVICERALTKEYMASK; - } - fix_generic_modifiers_by_device(&modifiers); + NSUInteger new_modifiers = modifiers & ~(NX_DEVICELALTKEYMASK | NX_DEVICERALTKEYMASK | + NX_DEVICELCMDKEYMASK | NX_DEVICERCMDKEYMASK); - return modifiers; + // The MACDRV keyboard driver translates Alt modifiers in hotkeys to + // Command. For example, a call to user32!RegisterHotKey for Alt-c + // translates to a call to RegisterEventHotKey for Command-c. + // + // If the Option modifier should behave like Alt in Windows, rewrite + // it to Command. + if (modifiers & NX_DEVICELALTKEYMASK) + new_modifiers |= left_option_is_alt ? NX_DEVICELCMDKEYMASK : NX_DEVICELALTKEYMASK; + if (modifiers & NX_DEVICERALTKEYMASK) + new_modifiers |= right_option_is_alt ? NX_DEVICERCMDKEYMASK : NX_DEVICERALTKEYMASK; + + if (modifiers & NX_DEVICELCMDKEYMASK) + new_modifiers |= left_command_is_ctrl ? NX_DEVICELCTLKEYMASK : NX_DEVICELCMDKEYMASK; + if (modifiers & NX_DEVICERCMDKEYMASK) + new_modifiers |= right_command_is_ctrl ? NX_DEVICERCTLKEYMASK : NX_DEVICERCMDKEYMASK; + + fix_generic_modifiers_by_device(&new_modifiers); + return new_modifiers; } @@ -2059,7 +2067,7 @@ - (void) postKeyEvent:(NSEvent *)theEvent [self flagsChanged:theEvent]; [self postKey:[theEvent keyCode] pressed:[theEvent type] == NSKeyDown - modifiers:adjusted_modifiers_for_option_behavior([theEvent modifierFlags]) + modifiers:adjusted_modifiers_for_settings([theEvent modifierFlags]) event:theEvent]; } @@ -2679,7 +2687,7 @@ - (void) flagsChanged:(NSEvent *)theEvent { NX_DEVICERCMDKEYMASK, kVK_RightCommand }, }; - NSUInteger modifierFlags = adjusted_modifiers_for_option_behavior([theEvent modifierFlags]); + NSUInteger modifierFlags = adjusted_modifiers_for_settings([theEvent modifierFlags]); NSUInteger changed; int i, last_changed; diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index 6bad7903f6..011b1ffd37 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -159,6 +159,8 @@ extern int capture_displays_for_fullscreen DECLSPEC_HIDDEN; extern int left_option_is_alt DECLSPEC_HIDDEN; extern int right_option_is_alt DECLSPEC_HIDDEN; +extern int left_command_is_ctrl DECLSPEC_HIDDEN; +extern int right_command_is_ctrl DECLSPEC_HIDDEN; extern int allow_immovable_windows DECLSPEC_HIDDEN; extern int cursor_clipping_locks_windows DECLSPEC_HIDDEN; extern int use_precise_scrolling DECLSPEC_HIDDEN; diff --git a/dlls/winemac.drv/macdrv_main.c b/dlls/winemac.drv/macdrv_main.c index 7abeea9db8..8759e58641 100644 --- a/dlls/winemac.drv/macdrv_main.c +++ b/dlls/winemac.drv/macdrv_main.c @@ -52,6 +52,8 @@ BOOL allow_vsync = TRUE; BOOL allow_set_gamma = TRUE; int left_option_is_alt = 0; int right_option_is_alt = 0; +int left_command_is_ctrl = 0; +int right_command_is_ctrl = 0; BOOL allow_software_rendering = FALSE; BOOL disable_window_decorations = FALSE; int allow_immovable_windows = TRUE; @@ -172,6 +174,11 @@ static void setup_options(void) if (!get_config_key(hkey, appkey, "RightOptionIsAlt", buffer, sizeof(buffer))) right_option_is_alt = IS_OPTION_TRUE(buffer[0]); + if (!get_config_key(hkey, appkey, "LeftCommandIsCtrl", buffer, sizeof(buffer))) + left_command_is_ctrl = IS_OPTION_TRUE(buffer[0]); + if (!get_config_key(hkey, appkey, "RightCommandIsCtrl", buffer, sizeof(buffer))) + right_command_is_ctrl = IS_OPTION_TRUE(buffer[0]); + if (!get_config_key(hkey, appkey, "AllowSoftwareRendering", buffer, sizeof(buffer))) allow_software_rendering = IS_OPTION_TRUE(buffer[0]); -- 2.18.0

2 2

Re: [PATCH] mpr: Implement WNetClearConnections().
by Pierre Schweitzer 12 Sep '18

12 Sep '18

Hi, May I know why this patch wasn't merged? Thanks in advance. Cheers, Pierre Pierre Schweitzer <pierre(a)reactos.org> wrote on Sun, September 9th, 2018, 3:58 PM: > Hi, > > Please find attached a patch implements an undocumented Windows MPR API > that is used on logoff to disconnect any network share connection. > Implementation based on: > https://git.reactos.org/?p=reactos.git;a=blob;f=base/applications/network/n… > Successfully tested in: https://jira.reactos.org/browse/CORE-15012 > > Cheers,

1 0

[PATCH] ole32: Release marshal data before removing apartment from list.
by Sergio Gómez Del Real 12 Sep '18

12 Sep '18

For local servers, we are first removing the apartment from the list and then calling CoReleaseMarshalData(). This last function actually depends on the apartment still being in the list (because of apartment_findfromoxid()). The result is that CoReleaseMarshalData() is failing, as can be seen in marshal.ok tests. I only moved part of the code inside the critical section to keep it as small as possible. Signed-off-by: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> --- dlls/ole32/compobj.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 66b1683d98..bae5941438 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -1169,6 +1169,7 @@ static void apartment_freeunusedlibraries(struct apartment *apt, DWORD delay) DWORD apartment_release(struct apartment *apt) { DWORD ret; + LocalServer *local_server = NULL; EnterCriticalSection(&csApartment); @@ -1187,6 +1188,16 @@ DWORD apartment_release(struct apartment *apt) apt->being_destroyed = TRUE; if (apt == MTA) MTA = NULL; else if (apt == MainApartment) MainApartment = NULL; + /* we must release marshal data before removing apartment from its list */ + if(apt->local_server) { + LARGE_INTEGER zero; + local_server = apt->local_server; + + memset(&zero, 0, sizeof(zero)); + IStream_Seek(local_server->marshal_stream, zero, STREAM_SEEK_SET, NULL); + CoReleaseMarshalData(local_server->marshal_stream); + } + list_remove(&apt->entry); } @@ -1198,13 +1209,8 @@ DWORD apartment_release(struct apartment *apt) TRACE("destroying apartment %p, oxid %s\n", apt, wine_dbgstr_longlong(apt->oxid)); - if(apt->local_server) { - LocalServer *local_server = apt->local_server; - LARGE_INTEGER zero; - - memset(&zero, 0, sizeof(zero)); - IStream_Seek(local_server->marshal_stream, zero, STREAM_SEEK_SET, NULL); - CoReleaseMarshalData(local_server->marshal_stream); + if (local_server) + { IStream_Release(local_server->marshal_stream); local_server->marshal_stream = NULL; -- 2.17.1

2 1

[PATCH 4/4] wsdapi: Send Probe Matches message via UDP unicast.
by Owen Rudge 12 Sep '18

12 Sep '18

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/network.c | 32 ++++++++++++++++++++++++++++++++ dlls/wsdapi/soap.c | 4 ++-- dlls/wsdapi/tests/discovery.c | 22 +++++++++++----------- dlls/wsdapi/wsdapi_internal.h | 1 + 4 files changed, 46 insertions(+), 13 deletions(-)

2 1

[PATCH] webservices: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 12 Sep '18

12 Sep '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/webservices/channel.c | 4 ++-- dlls/webservices/error.c | 4 ++-- dlls/webservices/heap.c | 4 ++-- dlls/webservices/listener.c | 4 ++-- dlls/webservices/msg.c | 6 +++--- dlls/webservices/proxy.c | 4 ++-- dlls/webservices/reader.c | 4 ++-- dlls/webservices/string.c | 2 +- dlls/webservices/url.c | 20 ++++++++++---------- dlls/webservices/writer.c | 4 ++-- 10 files changed, 28 insertions(+), 28 deletions(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index 5963faf00d..0cd8b910e8 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -236,14 +236,14 @@ struct channel ULONG read_buflen; ULONG read_size; ULONG prop_count; - struct prop prop[sizeof(channel_props)/sizeof(channel_props[0])]; + struct prop prop[ARRAY_SIZE( channel_props )]; }; #define CHANNEL_MAGIC (('C' << 24) | ('H' << 16) | ('A' << 8) | 'N') static struct channel *alloc_channel(void) { - static const ULONG count = sizeof(channel_props)/sizeof(channel_props[0]); + static const ULONG count = ARRAY_SIZE( channel_props ); struct channel *ret; ULONG size = sizeof(*ret) + prop_size( channel_props, count ); diff --git a/dlls/webservices/error.c b/dlls/webservices/error.c index e4292db5bf..780040e51e 100644 --- a/dlls/webservices/error.c +++ b/dlls/webservices/error.c @@ -42,14 +42,14 @@ struct error ULONG magic; CRITICAL_SECTION cs; ULONG prop_count; - struct prop prop[sizeof(error_props)/sizeof(error_props[0])]; + struct prop prop[ARRAY_SIZE( error_props )]; }; #define ERROR_MAGIC (('E' << 24) | ('R' << 16) | ('R' << 8) | 'O') static struct error *alloc_error(void) { - static const ULONG count = sizeof(error_props)/sizeof(error_props[0]); + static const ULONG count = ARRAY_SIZE( error_props ); struct error *ret; ULONG size = sizeof(*ret) + prop_size( error_props, count ); diff --git a/dlls/webservices/heap.c b/dlls/webservices/heap.c index e44cf72e74..93e647abc6 100644 --- a/dlls/webservices/heap.c +++ b/dlls/webservices/heap.c @@ -46,7 +46,7 @@ struct heap SIZE_T max_size; SIZE_T allocated; ULONG prop_count; - struct prop prop[sizeof(heap_props)/sizeof(heap_props[0])]; + struct prop prop[ARRAY_SIZE( heap_props )]; }; #define HEAP_MAGIC (('H' << 24) | ('E' << 16) | ('A' << 8) | 'P') @@ -177,7 +177,7 @@ HRESULT WINAPI WsAlloc( WS_HEAP *handle, SIZE_T size, void **ptr, WS_ERROR *erro static struct heap *alloc_heap(void) { - static const ULONG count = sizeof(heap_props)/sizeof(heap_props[0]); + static const ULONG count = ARRAY_SIZE( heap_props ); struct heap *ret; ULONG size = sizeof(*ret) + prop_size( heap_props, count ); diff --git a/dlls/webservices/listener.c b/dlls/webservices/listener.c index 357a1c6a53..0189059aa7 100644 --- a/dlls/webservices/listener.c +++ b/dlls/webservices/listener.c @@ -113,14 +113,14 @@ struct listener } udp; } u; ULONG prop_count; - struct prop prop[sizeof(listener_props)/sizeof(listener_props[0])]; + struct prop prop[ARRAY_SIZE( listener_props )]; }; #define LISTENER_MAGIC (('L' << 24) | ('I' << 16) | ('S' << 8) | 'T') static struct listener *alloc_listener(void) { - static const ULONG count = sizeof(listener_props)/sizeof(listener_props[0]); + static const ULONG count = ARRAY_SIZE( listener_props ); struct listener *ret; ULONG size = sizeof(*ret) + prop_size( listener_props, count ); diff --git a/dlls/webservices/msg.c b/dlls/webservices/msg.c index 19a107629c..07063460be 100644 --- a/dlls/webservices/msg.c +++ b/dlls/webservices/msg.c @@ -83,7 +83,7 @@ struct msg WS_PROXY_MESSAGE_CALLBACK_CONTEXT ctx_send; WS_PROXY_MESSAGE_CALLBACK_CONTEXT ctx_receive; ULONG prop_count; - struct prop prop[sizeof(msg_props)/sizeof(msg_props[0])]; + struct prop prop[ARRAY_SIZE( msg_props )]; }; #define MSG_MAGIC (('M' << 24) | ('E' << 16) | ('S' << 8) | 'S') @@ -91,7 +91,7 @@ struct msg static struct msg *alloc_msg(void) { - static const ULONG count = sizeof(msg_props)/sizeof(msg_props[0]); + static const ULONG count = ARRAY_SIZE( msg_props ); struct msg *ret; ULONG size = sizeof(*ret) + prop_size( msg_props, count ); @@ -1785,7 +1785,7 @@ HRESULT message_insert_http_headers( WS_MESSAGE *handle, HINTERNET req ) case WS_ENVELOPE_VERSION_SOAP_1_2: { static const WCHAR actionW[] = {'a','c','t','i','o','n','=','"'}; - ULONG len_action = sizeof(actionW)/sizeof(actionW[0]); + ULONG len_action = ARRAY_SIZE( actionW ); if (!(len = MultiByteToWideChar( CP_UTF8, 0, (char *)msg->action->bytes, msg->action->length, NULL, 0 ))) break; diff --git a/dlls/webservices/proxy.c b/dlls/webservices/proxy.c index da30cb027a..5122892704 100644 --- a/dlls/webservices/proxy.c +++ b/dlls/webservices/proxy.c @@ -48,14 +48,14 @@ struct proxy WS_SERVICE_PROXY_STATE state; WS_CHANNEL *channel; ULONG prop_count; - struct prop prop[sizeof(proxy_props)/sizeof(proxy_props[0])]; + struct prop prop[ARRAY_SIZE( proxy_props )]; }; #define PROXY_MAGIC (('P' << 24) | ('R' << 16) | ('O' << 8) | 'X') static struct proxy *alloc_proxy(void) { - static const ULONG count = sizeof(proxy_props)/sizeof(proxy_props[0]); + static const ULONG count = ARRAY_SIZE( proxy_props ); struct proxy *ret; ULONG size = sizeof(*ret) + prop_size( proxy_props, count ); diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 087ad0a9cc..296043fa25 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -397,14 +397,14 @@ struct reader const WS_XML_DICTIONARY *dict_static; WS_XML_DICTIONARY *dict; ULONG prop_count; - struct prop prop[sizeof(reader_props)/sizeof(reader_props[0])]; + struct prop prop[ARRAY_SIZE( reader_props )]; }; #define READER_MAGIC (('R' << 24) | ('E' << 16) | ('A' << 8) | 'D') static struct reader *alloc_reader(void) { - static const ULONG count = sizeof(reader_props)/sizeof(reader_props[0]); + static const ULONG count = ARRAY_SIZE( reader_props ); struct reader *ret; ULONG size = sizeof(*ret) + prop_size( reader_props, count ); diff --git a/dlls/webservices/string.c b/dlls/webservices/string.c index 0bb77df946..42af8fd9c5 100644 --- a/dlls/webservices/string.c +++ b/dlls/webservices/string.c @@ -791,7 +791,7 @@ static const ULONG dict_sorted[] = const struct dictionary dict_builtin_static = { {{0xf93578f8,0x5852,0x4eb7,{0xa6,0xfc,0xe7,0x2b,0xb7,0x1d,0xb6,0x22}}, - (WS_XML_STRING *)dict_strings, sizeof(dict_strings)/sizeof(dict_strings[0]), TRUE}, + (WS_XML_STRING *)dict_strings, ARRAY_SIZE( dict_strings ), TRUE}, (ULONG *)dict_sorted }; diff --git a/dlls/webservices/url.c b/dlls/webservices/url.c index 465857aec4..731b74e7b4 100644 --- a/dlls/webservices/url.c +++ b/dlls/webservices/url.c @@ -39,19 +39,19 @@ static const WCHAR netpipe[] = {'n','e','t','.','p','i','p','e'}; static WS_URL_SCHEME_TYPE scheme_type( const WCHAR *str, ULONG len ) { - if (len == sizeof(http)/sizeof(http[0]) && !memicmpW( str, http, sizeof(http)/sizeof(http[0]) )) + if (len == ARRAY_SIZE( http ) && !memicmpW( str, http, ARRAY_SIZE( http ))) return WS_URL_HTTP_SCHEME_TYPE; - if (len == sizeof(https)/sizeof(https[0]) && !memicmpW( str, https, sizeof(https)/sizeof(https[0]) )) + if (len == ARRAY_SIZE( https ) && !memicmpW( str, https, ARRAY_SIZE( https ))) return WS_URL_HTTPS_SCHEME_TYPE; - if (len == sizeof(nettcp)/sizeof(nettcp[0]) && !memicmpW( str, nettcp, sizeof(nettcp)/sizeof(nettcp[0]) )) + if (len == ARRAY_SIZE( nettcp ) && !memicmpW( str, nettcp, ARRAY_SIZE( nettcp ))) return WS_URL_NETTCP_SCHEME_TYPE; - if (len == sizeof(soapudp)/sizeof(soapudp[0]) && !memicmpW( str, soapudp, sizeof(soapudp)/sizeof(soapudp[0]) )) + if (len == ARRAY_SIZE( soapudp ) && !memicmpW( str, soapudp, ARRAY_SIZE( soapudp ))) return WS_URL_SOAPUDP_SCHEME_TYPE; - if (len == sizeof(netpipe)/sizeof(netpipe[0]) && !memicmpW( str, netpipe, sizeof(netpipe)/sizeof(netpipe[0]) )) + if (len == ARRAY_SIZE( netpipe ) && !memicmpW( str, netpipe, ARRAY_SIZE( netpipe ))) return WS_URL_NETPIPE_SCHEME_TYPE; return ~0u; @@ -271,23 +271,23 @@ static const WCHAR *scheme_str( WS_URL_SCHEME_TYPE scheme, ULONG *len ) switch (scheme) { case WS_URL_HTTP_SCHEME_TYPE: - *len = sizeof(http)/sizeof(http[0]); + *len = ARRAY_SIZE( http ); return http; case WS_URL_HTTPS_SCHEME_TYPE: - *len = sizeof(https)/sizeof(https[0]); + *len = ARRAY_SIZE( https ); return https; case WS_URL_NETTCP_SCHEME_TYPE: - *len = sizeof(nettcp)/sizeof(nettcp[0]); + *len = ARRAY_SIZE( nettcp ); return nettcp; case WS_URL_SOAPUDP_SCHEME_TYPE: - *len = sizeof(soapudp)/sizeof(soapudp[0]); + *len = ARRAY_SIZE( soapudp ); return soapudp; case WS_URL_NETPIPE_SCHEME_TYPE: - *len = sizeof(netpipe)/sizeof(netpipe[0]); + *len = ARRAY_SIZE( netpipe ); return netpipe; default: diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 95d4caddb9..ef8f9193a0 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -92,14 +92,14 @@ struct writer WS_DYNAMIC_STRING_CALLBACK dict_cb; void *dict_cb_state; ULONG prop_count; - struct prop prop[sizeof(writer_props)/sizeof(writer_props[0])]; + struct prop prop[ARRAY_SIZE( writer_props )]; }; #define WRITER_MAGIC (('W' << 24) | ('R' << 16) | ('I' << 8) | 'T') static struct writer *alloc_writer(void) { - static const ULONG count = sizeof(writer_props)/sizeof(writer_props[0]); + static const ULONG count = ARRAY_SIZE( writer_props ); struct writer *ret; ULONG size = sizeof(*ret) + prop_size( writer_props, count ); -- 2.14.4

2 1

[v3 PATCH] d2d1: Return device context pointer for render targets.
by Nikolay Sivov 12 Sep '18

12 Sep '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/bitmap_render_target.c | 2 +- dlls/d2d1/d2d1_private.h | 9 ++++++- dlls/d2d1/dc_render_target.c | 41 +++++++++++++++++------------- dlls/d2d1/device.c | 36 ++++++++++++++++++-------- dlls/d2d1/factory.c | 2 +- dlls/d2d1/hwnd_render_target.c | 32 ++++++++++++++---------- dlls/d2d1/wic_render_target.c | 43 +++++++++++++++++++------------- 7 files changed, 104 insertions(+), 61 deletions(-) diff --git a/dlls/d2d1/bitmap_render_target.c b/dlls/d2d1/bitmap_render_target.c index c106e211d6..004dd2ed47 100644 --- a/dlls/d2d1/bitmap_render_target.c +++ b/dlls/d2d1/bitmap_render_target.c @@ -811,7 +811,7 @@ HRESULT d2d_bitmap_render_target_init(struct d2d_bitmap_render_target *render_ta } if (FAILED(hr = d2d_d3d_create_render_target(parent_target->factory, dxgi_surface, - (IUnknown *)&render_target->ID2D1BitmapRenderTarget_iface, &dxgi_rt_desc, &render_target->dxgi_target))) + (IUnknown *)&render_target->ID2D1BitmapRenderTarget_iface, NULL, &dxgi_rt_desc, &render_target->dxgi_target))) { WARN("Failed to create DXGI surface render target, hr %#x.\n", hr); IDXGISurface_Release(dxgi_surface); diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index e00b942797..aa078ed39c 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -117,6 +117,11 @@ struct d2d_ps_cb struct d2d_brush_cb opacity_brush; }; +struct d2d_device_context_ops +{ + HRESULT (*device_context_present)(IUnknown *outer_unknown); +}; + struct d2d_device_context { ID2D1DeviceContext ID2D1DeviceContext_iface; @@ -125,6 +130,7 @@ struct d2d_device_context LONG refcount; IUnknown *outer_unknown; + const struct d2d_device_context_ops *ops; ID2D1Factory *factory; ID3D10Device *device; @@ -149,7 +155,8 @@ struct d2d_device_context }; HRESULT d2d_d3d_create_render_target(ID2D1Factory *factory, IDXGISurface *surface, IUnknown *outer_unknown, - const D2D1_RENDER_TARGET_PROPERTIES *desc, ID2D1RenderTarget **render_target) DECLSPEC_HIDDEN; + const struct d2d_device_context_ops *ops, const D2D1_RENDER_TARGET_PROPERTIES *desc, + ID2D1RenderTarget **render_target) DECLSPEC_HIDDEN; HRESULT d2d_d3d_render_target_create_rtv(ID2D1RenderTarget *render_target, IDXGISurface1 *surface) DECLSPEC_HIDDEN; struct d2d_wic_render_target diff --git a/dlls/d2d1/dc_render_target.c b/dlls/d2d1/dc_render_target.c index d5e4f47e6d..8e97e99b5d 100644 --- a/dlls/d2d1/dc_render_target.c +++ b/dlls/d2d1/dc_render_target.c @@ -24,17 +24,26 @@ WINE_DEFAULT_DEBUG_CHANNEL(d2d); -static void sync_bitmap(struct d2d_dc_render_target *render_target) +static inline struct d2d_dc_render_target *impl_from_IUnknown(IUnknown *iface) { + return CONTAINING_RECORD(iface, struct d2d_dc_render_target, ID2D1DCRenderTarget_iface); +} + +static HRESULT d2d_dc_render_target_present(IUnknown *outer_unknown) +{ + struct d2d_dc_render_target *render_target = impl_from_IUnknown(outer_unknown); const RECT *dst_rect = &render_target->dst_rect; RECT empty_rect; HDC src_hdc; HRESULT hr; + if (!render_target->hdc) + return D2DERR_WRONG_STATE; + if (FAILED(hr = IDXGISurface1_GetDC(render_target->dxgi_surface, FALSE, &src_hdc))) { WARN("GetDC() failed, %#x.\n", hr); - return; + return S_OK; } BitBlt(render_target->hdc, dst_rect->left, dst_rect->top, dst_rect->right - dst_rect->left, @@ -42,6 +51,8 @@ static void sync_bitmap(struct d2d_dc_render_target *render_target) SetRectEmpty(&empty_rect); IDXGISurface1_ReleaseDC(render_target->dxgi_surface, &empty_rect); + + return S_OK; } static inline struct d2d_dc_render_target *impl_from_ID2D1DCRenderTarget(ID2D1DCRenderTarget *iface) @@ -64,7 +75,8 @@ static HRESULT STDMETHODCALLTYPE d2d_dc_render_target_QueryInterface(ID2D1DCRend *out = iface; return S_OK; } - else if (IsEqualGUID(iid, &IID_ID2D1GdiInteropRenderTarget)) + else if (IsEqualGUID(iid, &IID_ID2D1GdiInteropRenderTarget) + || IsEqualGUID(iid, &IID_ID2D1DeviceContext)) return ID2D1RenderTarget_QueryInterface(render_target->dxgi_target, iid, out); WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); @@ -524,14 +536,10 @@ static void STDMETHODCALLTYPE d2d_dc_render_target_PopLayer(ID2D1DCRenderTarget static HRESULT STDMETHODCALLTYPE d2d_dc_render_target_Flush(ID2D1DCRenderTarget *iface, D2D1_TAG *tag1, D2D1_TAG *tag2) { struct d2d_dc_render_target *render_target = impl_from_ID2D1DCRenderTarget(iface); - HRESULT hr; TRACE("iface %p, tag1 %p, tag2 %p.\n", iface, tag1, tag2); - hr = ID2D1RenderTarget_Flush(render_target->dxgi_target, tag1, tag2); - sync_bitmap(render_target); - - return hr; + return ID2D1RenderTarget_Flush(render_target->dxgi_target, tag1, tag2); } static void STDMETHODCALLTYPE d2d_dc_render_target_SaveDrawingState(ID2D1DCRenderTarget *iface, @@ -595,17 +603,10 @@ static HRESULT STDMETHODCALLTYPE d2d_dc_render_target_EndDraw(ID2D1DCRenderTarge D2D1_TAG *tag1, D2D1_TAG *tag2) { struct d2d_dc_render_target *render_target = impl_from_ID2D1DCRenderTarget(iface); - HRESULT hr; TRACE("iface %p, tag1 %p, tag2 %p.\n", iface, tag1, tag2); - if (!render_target->hdc) - return D2DERR_WRONG_STATE; - - hr = ID2D1RenderTarget_EndDraw(render_target->dxgi_target, tag1, tag2); - sync_bitmap(render_target); - - return hr; + return ID2D1RenderTarget_EndDraw(render_target->dxgi_target, tag1, tag2); } static D2D1_PIXEL_FORMAT * STDMETHODCALLTYPE d2d_dc_render_target_GetPixelFormat(ID2D1DCRenderTarget *iface, @@ -813,6 +814,11 @@ static const struct ID2D1DCRenderTargetVtbl d2d_dc_render_target_vtbl = d2d_dc_render_target_BindDC, }; +static const struct d2d_device_context_ops d2d_dc_render_target_ops = +{ + d2d_dc_render_target_present, +}; + HRESULT d2d_dc_render_target_init(struct d2d_dc_render_target *render_target, ID2D1Factory *factory, ID3D10Device1 *device, const D2D1_RENDER_TARGET_PROPERTIES *desc) { @@ -868,7 +874,8 @@ HRESULT d2d_dc_render_target_init(struct d2d_dc_render_target *render_target, ID } if (FAILED(hr = d2d_d3d_create_render_target(factory, (IDXGISurface *)render_target->dxgi_surface, - (IUnknown *)&render_target->ID2D1DCRenderTarget_iface, desc, &render_target->dxgi_target))) + (IUnknown *)&render_target->ID2D1DCRenderTarget_iface, &d2d_dc_render_target_ops, + desc, &render_target->dxgi_target))) { WARN("Failed to create DXGI surface render target, hr %#x.\n", hr); IDXGISurface1_Release(render_target->dxgi_surface); diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index bba4870dd4..dd33866c9f 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -205,7 +205,7 @@ static inline struct d2d_device_context *impl_from_ID2D1RenderTarget(ID2D1Render static HRESULT STDMETHODCALLTYPE d2d_device_context_QueryInterface(ID2D1DeviceContext *iface, REFIID iid, void **out) { - struct d2d_device_context *render_target = impl_from_ID2D1DeviceContext(iface); + struct d2d_device_context *context = impl_from_ID2D1DeviceContext(iface); TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); @@ -220,10 +220,12 @@ static HRESULT STDMETHODCALLTYPE d2d_device_context_QueryInterface(ID2D1DeviceCo } else if (IsEqualGUID(iid, &IID_ID2D1GdiInteropRenderTarget)) { - ID2D1GdiInteropRenderTarget_AddRef(&render_target->ID2D1GdiInteropRenderTarget_iface); - *out = &render_target->ID2D1GdiInteropRenderTarget_iface; + ID2D1GdiInteropRenderTarget_AddRef(&context->ID2D1GdiInteropRenderTarget_iface); + *out = &context->ID2D1GdiInteropRenderTarget_iface; return S_OK; } + else if (context->outer_unknown) + return IUnknown_QueryInterface(context->outer_unknown, iid, out); WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); @@ -1448,8 +1450,13 @@ static void STDMETHODCALLTYPE d2d_device_context_PopLayer(ID2D1DeviceContext *if static HRESULT STDMETHODCALLTYPE d2d_device_context_Flush(ID2D1DeviceContext *iface, D2D1_TAG *tag1, D2D1_TAG *tag2) { + struct d2d_device_context *context = impl_from_ID2D1DeviceContext(iface); + FIXME("iface %p, tag1 %p, tag2 %p stub!\n", iface, tag1, tag2); + if (context->ops) + context->ops->device_context_present(context->outer_unknown); + return E_NOTIMPL; } @@ -1615,16 +1622,23 @@ static void STDMETHODCALLTYPE d2d_device_context_BeginDraw(ID2D1DeviceContext *i static HRESULT STDMETHODCALLTYPE d2d_device_context_EndDraw(ID2D1DeviceContext *iface, D2D1_TAG *tag1, D2D1_TAG *tag2) { - struct d2d_device_context *render_target = impl_from_ID2D1DeviceContext(iface); + struct d2d_device_context *context = impl_from_ID2D1DeviceContext(iface); + HRESULT hr; TRACE("iface %p, tag1 %p, tag2 %p.\n", iface, tag1, tag2); if (tag1) - *tag1 = render_target->error.tag1; + *tag1 = context->error.tag1; if (tag2) - *tag2 = render_target->error.tag2; + *tag2 = context->error.tag2; - return render_target->error.code; + if (context->ops) + { + if (FAILED(hr = context->ops->device_context_present(context->outer_unknown))) + context->error.code = hr; + } + + return context->error.code; } static D2D1_PIXEL_FORMAT * STDMETHODCALLTYPE d2d_device_context_GetPixelFormat(ID2D1DeviceContext *iface, @@ -2469,7 +2483,8 @@ static const struct ID2D1GdiInteropRenderTargetVtbl d2d_gdi_interop_render_targe }; static HRESULT d2d_device_context_init(struct d2d_device_context *render_target, ID2D1Factory *factory, - IDXGISurface *surface, IUnknown *outer_unknown, const D2D1_RENDER_TARGET_PROPERTIES *desc) + IDXGISurface *surface, IUnknown *outer_unknown, const struct d2d_device_context_ops *ops, + const D2D1_RENDER_TARGET_PROPERTIES *desc) { D3D10_SUBRESOURCE_DATA buffer_data; D3D10_STATE_BLOCK_MASK state_mask; @@ -3357,6 +3372,7 @@ static HRESULT d2d_device_context_init(struct d2d_device_context *render_target, render_target->outer_unknown = outer_unknown ? outer_unknown : (IUnknown *)&render_target->ID2D1DeviceContext_iface; + render_target->ops = ops; if (FAILED(hr = IDXGISurface_GetDevice(surface, &IID_ID3D10Device, (void **)&render_target->device))) { @@ -3555,7 +3571,7 @@ err: } HRESULT d2d_d3d_create_render_target(ID2D1Factory *factory, IDXGISurface *surface, IUnknown *outer_unknown, - const D2D1_RENDER_TARGET_PROPERTIES *desc, ID2D1RenderTarget **render_target) + const struct d2d_device_context_ops *ops, const D2D1_RENDER_TARGET_PROPERTIES *desc, ID2D1RenderTarget **render_target) { struct d2d_device_context *object; HRESULT hr; @@ -3563,7 +3579,7 @@ HRESULT d2d_d3d_create_render_target(ID2D1Factory *factory, IDXGISurface *surfac if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; - if (FAILED(hr = d2d_device_context_init(object, factory, surface, outer_unknown, desc))) + if (FAILED(hr = d2d_device_context_init(object, factory, surface, outer_unknown, ops, desc))) { WARN("Failed to initialize render target, hr %#x.\n", hr); heap_free(object); diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c index d2e53879e6..386734d26f 100644 --- a/dlls/d2d1/factory.c +++ b/dlls/d2d1/factory.c @@ -340,7 +340,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDxgiSurfaceRenderTarget(ID2D1 { TRACE("iface %p, surface %p, desc %p, render_target %p.\n", iface, surface, desc, render_target); - return d2d_d3d_create_render_target((ID2D1Factory *)iface, surface, NULL, desc, render_target); + return d2d_d3d_create_render_target((ID2D1Factory *)iface, surface, NULL, NULL, desc, render_target); } static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDCRenderTarget(ID2D1Factory1 *iface, diff --git a/dlls/d2d1/hwnd_render_target.c b/dlls/d2d1/hwnd_render_target.c index 04d33536a6..976b926efa 100644 --- a/dlls/d2d1/hwnd_render_target.c +++ b/dlls/d2d1/hwnd_render_target.c @@ -24,12 +24,20 @@ WINE_DEFAULT_DEBUG_CHANNEL(d2d); -static void render_target_present(struct d2d_hwnd_render_target *render_target) +static inline struct d2d_hwnd_render_target *impl_from_IUnknown(IUnknown *iface) { + return CONTAINING_RECORD(iface, struct d2d_hwnd_render_target, ID2D1HwndRenderTarget_iface); +} + +static HRESULT d2d_hwnd_render_target_present(IUnknown *outer_unknown) +{ + struct d2d_hwnd_render_target *render_target = impl_from_IUnknown(outer_unknown); HRESULT hr; if (FAILED(hr = IDXGISwapChain_Present(render_target->swapchain, render_target->sync_interval, 0))) WARN("Present failed, %#x.\n", hr); + + return S_OK; } static inline struct d2d_hwnd_render_target *impl_from_ID2D1HwndRenderTarget(ID2D1HwndRenderTarget *iface) @@ -53,7 +61,8 @@ static HRESULT STDMETHODCALLTYPE d2d_hwnd_render_target_QueryInterface(ID2D1Hwnd *out = iface; return S_OK; } - else if (IsEqualGUID(iid, &IID_ID2D1GdiInteropRenderTarget)) + else if (IsEqualGUID(iid, &IID_ID2D1GdiInteropRenderTarget) + || IsEqualGUID(iid, &IID_ID2D1DeviceContext)) return ID2D1RenderTarget_QueryInterface(render_target->dxgi_target, iid, out); WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); @@ -516,14 +525,10 @@ static HRESULT STDMETHODCALLTYPE d2d_hwnd_render_target_Flush(ID2D1HwndRenderTar D2D1_TAG *tag2) { struct d2d_hwnd_render_target *render_target = impl_from_ID2D1HwndRenderTarget(iface); - HRESULT hr; TRACE("iface %p, tag1 %p, tag2 %p.\n", iface, tag1, tag2); - hr = ID2D1RenderTarget_Flush(render_target->dxgi_target, tag1, tag2); - render_target_present(render_target); - - return hr; + return ID2D1RenderTarget_Flush(render_target->dxgi_target, tag1, tag2); } static void STDMETHODCALLTYPE d2d_hwnd_render_target_SaveDrawingState(ID2D1HwndRenderTarget *iface, @@ -587,14 +592,10 @@ static HRESULT STDMETHODCALLTYPE d2d_hwnd_render_target_EndDraw(ID2D1HwndRenderT D2D1_TAG *tag1, D2D1_TAG *tag2) { struct d2d_hwnd_render_target *render_target = impl_from_ID2D1HwndRenderTarget(iface); - HRESULT hr; TRACE("iface %p, tag1 %p, tag2 %p.\n", iface, tag1, tag2); - hr = ID2D1RenderTarget_EndDraw(render_target->dxgi_target, tag1, tag2); - render_target_present(render_target); - - return hr; + return ID2D1RenderTarget_EndDraw(render_target->dxgi_target, tag1, tag2); } static D2D1_PIXEL_FORMAT * STDMETHODCALLTYPE d2d_hwnd_render_target_GetPixelFormat(ID2D1HwndRenderTarget *iface, @@ -776,6 +777,11 @@ static const struct ID2D1HwndRenderTargetVtbl d2d_hwnd_render_target_vtbl = d2d_hwnd_render_target_GetHwnd }; +static const struct d2d_device_context_ops d2d_hwnd_render_target_ops = +{ + d2d_hwnd_render_target_present, +}; + HRESULT d2d_hwnd_render_target_init(struct d2d_hwnd_render_target *render_target, ID2D1Factory *factory, ID3D10Device1 *device, const D2D1_RENDER_TARGET_PROPERTIES *desc, const D2D1_HWND_RENDER_TARGET_PROPERTIES *hwnd_rt_desc) @@ -862,7 +868,7 @@ HRESULT d2d_hwnd_render_target_init(struct d2d_hwnd_render_target *render_target render_target->ID2D1HwndRenderTarget_iface.lpVtbl = &d2d_hwnd_render_target_vtbl; hr = d2d_d3d_create_render_target(factory, dxgi_surface, (IUnknown *)&render_target->ID2D1HwndRenderTarget_iface, - &dxgi_rt_desc, &render_target->dxgi_target); + &d2d_hwnd_render_target_ops, &dxgi_rt_desc, &render_target->dxgi_target); IDXGISurface_Release(dxgi_surface); if (FAILED(hr)) { diff --git a/dlls/d2d1/wic_render_target.c b/dlls/d2d1/wic_render_target.c index 5642fd44ff..67a826f8ae 100644 --- a/dlls/d2d1/wic_render_target.c +++ b/dlls/d2d1/wic_render_target.c @@ -25,8 +25,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(d2d); -static void sync_bitmap(struct d2d_wic_render_target *render_target) +static inline struct d2d_wic_render_target *impl_from_IUnknown(IUnknown *iface) { + return CONTAINING_RECORD(iface, struct d2d_wic_render_target, ID2D1RenderTarget_iface); +} + +static HRESULT d2d_wic_render_target_present(IUnknown *outer_unknown) +{ + struct d2d_wic_render_target *render_target = impl_from_IUnknown(outer_unknown); D3D10_MAPPED_TEXTURE2D mapped_texture; ID3D10Resource *src_resource; IWICBitmapLock *bitmap_lock; @@ -41,7 +47,7 @@ static void sync_bitmap(struct d2d_wic_render_target *render_target) &IID_ID3D10Resource, (void **)&src_resource))) { ERR("Failed to get source resource interface, hr %#x.\n", hr); - return; + goto end; } ID3D10Texture2D_GetDevice(render_target->readback_texture, &device); @@ -56,28 +62,28 @@ static void sync_bitmap(struct d2d_wic_render_target *render_target) if (FAILED(hr = IWICBitmap_Lock(render_target->bitmap, &dst_rect, WICBitmapLockWrite, &bitmap_lock))) { ERR("Failed to lock destination bitmap, hr %#x.\n", hr); - return; + goto end; } if (FAILED(hr = IWICBitmapLock_GetDataPointer(bitmap_lock, &dst_size, &dst))) { ERR("Failed to get data pointer, hr %#x.\n", hr); IWICBitmapLock_Release(bitmap_lock); - return; + goto end; } if (FAILED(hr = IWICBitmapLock_GetStride(bitmap_lock, &dst_pitch))) { ERR("Failed to get stride, hr %#x.\n", hr); IWICBitmapLock_Release(bitmap_lock); - return; + goto end; } if (FAILED(hr = ID3D10Texture2D_Map(render_target->readback_texture, 0, D3D10_MAP_READ, 0, &mapped_texture))) { ERR("Failed to map readback texture, hr %#x.\n", hr); IWICBitmapLock_Release(bitmap_lock); - return; + goto end; } src = mapped_texture.pData; @@ -91,6 +97,9 @@ static void sync_bitmap(struct d2d_wic_render_target *render_target) ID3D10Texture2D_Unmap(render_target->readback_texture, 0); IWICBitmapLock_Release(bitmap_lock); + +end: + return S_OK; } static inline struct d2d_wic_render_target *impl_from_ID2D1RenderTarget(ID2D1RenderTarget *iface) @@ -112,7 +121,8 @@ static HRESULT STDMETHODCALLTYPE d2d_wic_render_target_QueryInterface(ID2D1Rende *out = iface; return S_OK; } - else if (IsEqualGUID(iid, &IID_ID2D1GdiInteropRenderTarget)) + else if (IsEqualGUID(iid, &IID_ID2D1GdiInteropRenderTarget) + || IsEqualGUID(iid, &IID_ID2D1DeviceContext)) return ID2D1RenderTarget_QueryInterface(render_target->dxgi_target, iid, out); WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); @@ -574,14 +584,10 @@ static void STDMETHODCALLTYPE d2d_wic_render_target_PopLayer(ID2D1RenderTarget * static HRESULT STDMETHODCALLTYPE d2d_wic_render_target_Flush(ID2D1RenderTarget *iface, D2D1_TAG *tag1, D2D1_TAG *tag2) { struct d2d_wic_render_target *render_target = impl_from_ID2D1RenderTarget(iface); - HRESULT hr; TRACE("iface %p, tag1 %p, tag2 %p.\n", iface, tag1, tag2); - hr = ID2D1RenderTarget_Flush(render_target->dxgi_target, tag1, tag2); - sync_bitmap(render_target); - - return hr; + return ID2D1RenderTarget_Flush(render_target->dxgi_target, tag1, tag2); } static void STDMETHODCALLTYPE d2d_wic_render_target_SaveDrawingState(ID2D1RenderTarget *iface, @@ -645,14 +651,10 @@ static HRESULT STDMETHODCALLTYPE d2d_wic_render_target_EndDraw(ID2D1RenderTarget D2D1_TAG *tag1, D2D1_TAG *tag2) { struct d2d_wic_render_target *render_target = impl_from_ID2D1RenderTarget(iface); - HRESULT hr; TRACE("iface %p, tag1 %p, tag2 %p.\n", iface, tag1, tag2); - hr = ID2D1RenderTarget_EndDraw(render_target->dxgi_target, tag1, tag2); - sync_bitmap(render_target); - - return hr; + return ID2D1RenderTarget_EndDraw(render_target->dxgi_target, tag1, tag2); } static D2D1_PIXEL_FORMAT * STDMETHODCALLTYPE d2d_wic_render_target_GetPixelFormat(ID2D1RenderTarget *iface, @@ -785,6 +787,11 @@ static const struct ID2D1RenderTargetVtbl d2d_wic_render_target_vtbl = d2d_wic_render_target_IsSupported, }; +static const struct d2d_device_context_ops d2d_wic_render_target_ops = +{ + d2d_wic_render_target_present, +}; + HRESULT d2d_wic_render_target_init(struct d2d_wic_render_target *render_target, ID2D1Factory *factory, ID3D10Device1 *device, IWICBitmap *bitmap, const D2D1_RENDER_TARGET_PROPERTIES *desc) { @@ -875,7 +882,7 @@ HRESULT d2d_wic_render_target_init(struct d2d_wic_render_target *render_target, } if (FAILED(hr = d2d_d3d_create_render_target(factory, render_target->dxgi_surface, - (IUnknown *)&render_target->ID2D1RenderTarget_iface, desc, &render_target->dxgi_target))) + (IUnknown *)&render_target->ID2D1RenderTarget_iface, &d2d_wic_render_target_ops, desc, &render_target->dxgi_target))) { WARN("Failed to create DXGI surface render target, hr %#x.\n", hr); ID3D10Texture2D_Release(render_target->readback_texture); -- 2.18.0

1 0

[PATCH] ntdll/tests: Handle case where process doesn't have its own DEP policy
by Alex Henrie 12 Sep '18

12 Sep '18

If neither MEM_EXECUTE_OPTION_ENABLE nor MEM_EXECUTE_OPTION_DISABLE is set in the ProcessExecuteFlags, the process is using the system DEP setting. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- This should fix the test crashes on Windows Server 2008. --- dlls/ntdll/tests/info.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 2ab12e4257..e7b07e57af 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -38,6 +38,7 @@ static NTSTATUS (WINAPI * pNtClose)(HANDLE); static ULONG (WINAPI * pNtGetCurrentProcessorNumber)(void); static BOOL (WINAPI * pIsWow64Process)(HANDLE, PBOOL); static BOOL (WINAPI * pGetLogicalProcessorInformationEx)(LOGICAL_PROCESSOR_RELATIONSHIP,SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX*,DWORD*); +static DEP_SYSTEM_POLICY_TYPE (WINAPI * pGetSystemDEPPolicy)(void); static BOOL is_wow64; @@ -96,6 +97,8 @@ static BOOL InitFunctionPtrs(void) pIsWow64Process = (void *)GetProcAddress(hkernel32, "IsWow64Process"); if (!pIsWow64Process || !pIsWow64Process( GetCurrentProcess(), &is_wow64 )) is_wow64 = FALSE; + pGetSystemDEPPolicy = (void *)GetProcAddress(hkernel32, "GetSystemDEPPolicy"); + /* starting with Win7 */ pNtQuerySystemInformationEx = (void *) GetProcAddress(hntdll, "NtQuerySystemInformationEx"); if (!pNtQuerySystemInformationEx) @@ -1851,7 +1854,7 @@ static void test_mapprotection(void) ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status ); trace("Process execute flags %08x\n", oldflags); - if (oldflags & MEM_EXECUTE_OPTION_DISABLE) + if (!(oldflags & MEM_EXECUTE_OPTION_ENABLE)) { if (oldflags & MEM_EXECUTE_OPTION_PERMANENT) { @@ -1859,6 +1862,12 @@ static void test_mapprotection(void) return; } + if (pGetSystemDEPPolicy && pGetSystemDEPPolicy() == AlwaysOn) + { + skip("System policy requires noexec\n"); + return; + } + status = pNtSetInformationProcess( GetCurrentProcess(), ProcessExecuteFlags, &flags, sizeof(flags) ); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status ); reset_flags = TRUE; -- 2.19.0

1 0

[PATCH v2 1/4] msxml3: Allow creating floating attributes.
by Daniel Lehman 12 Sep '18

12 Sep '18

Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> --- dlls/msxml3/attribute.c | 9 ++++++++- dlls/msxml3/element.c | 2 +- dlls/msxml3/msxml_private.h | 2 +- dlls/msxml3/node.c | 2 +- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/attribute.c b/dlls/msxml3/attribute.c index 637615b341..8eb2695128 100644 --- a/dlls/msxml3/attribute.c +++ b/dlls/msxml3/attribute.c @@ -50,6 +50,7 @@ typedef struct _domattr xmlnode node; IXMLDOMAttribute IXMLDOMAttribute_iface; LONG ref; + BOOL floating; } domattr; static const tid_t domattr_se_tids[] = { @@ -116,6 +117,11 @@ static ULONG WINAPI domattr_Release( if ( ref == 0 ) { destroy_xmlnode(&This->node); + if ( This->floating ) + { + xmlFreeNs( This->node.node->ns ); + xmlFreeNode( This->node.node ); + } heap_free( This ); } @@ -709,7 +715,7 @@ static dispex_static_data_t domattr_dispex = { domattr_iface_tids }; -IUnknown* create_attribute( xmlNodePtr attribute ) +IUnknown* create_attribute( xmlNodePtr attribute, BOOL floating ) { domattr *This; @@ -719,6 +725,7 @@ IUnknown* create_attribute( xmlNodePtr attribute ) This->IXMLDOMAttribute_iface.lpVtbl = &domattr_vtbl; This->ref = 1; + This->floating = floating; init_xmlnode(&This->node, attribute, (IXMLDOMNode*)&This->IXMLDOMAttribute_iface, &domattr_dispex); diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index 6e00aa0116..4faeed400c 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -1398,7 +1398,7 @@ static HRESULT WINAPI domelem_getAttributeNode( if (attr) { - IUnknown *unk = create_attribute((xmlNodePtr)attr); + IUnknown *unk = create_attribute((xmlNodePtr)attr, FALSE); hr = IUnknown_QueryInterface(unk, &IID_IXMLDOMAttribute, (void**)attributeNode); IUnknown_Release(unk); } diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 94ef66b23d..abc6ab3465 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -252,7 +252,7 @@ extern IUnknown *create_domdoc( xmlNodePtr ) DECLSPEC_HIDDEN; extern IUnknown *create_xmldoc( void ) DECLSPEC_HIDDEN; extern IXMLDOMNode *create_node( xmlNodePtr ) DECLSPEC_HIDDEN; extern IUnknown *create_element( xmlNodePtr ) DECLSPEC_HIDDEN; -extern IUnknown *create_attribute( xmlNodePtr ) DECLSPEC_HIDDEN; +extern IUnknown *create_attribute( xmlNodePtr, BOOL ) DECLSPEC_HIDDEN; extern IUnknown *create_text( xmlNodePtr ) DECLSPEC_HIDDEN; extern IUnknown *create_pi( xmlNodePtr ) DECLSPEC_HIDDEN; extern IUnknown *create_comment( xmlNodePtr ) DECLSPEC_HIDDEN; diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index bcb4181374..fc18935b69 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -2271,7 +2271,7 @@ IXMLDOMNode *create_node( xmlNodePtr node ) pUnk = create_element( node ); break; case XML_ATTRIBUTE_NODE: - pUnk = create_attribute( node ); + pUnk = create_attribute( node, FALSE ); break; case XML_TEXT_NODE: pUnk = create_text( node ); -- 2.17.1

1 3

[PATCH 1/2] ntdll: Add dummy apiset to PEB.
by Alistair Leslie-Hughes 12 Sep '18

12 Sep '18

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/ntdll/thread.c | 2 ++ include/Makefile.in | 1 + include/apiset.h | 38 ++++++++++++++++++++++++++++++++++++++ include/winternl.h | 3 ++- 4 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 include/apiset.h diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 59d64e1..c601cff 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -73,6 +73,7 @@ static WCHAR current_dir[MAX_NT_PATH_LENGTH]; static RTL_BITMAP tls_bitmap; static RTL_BITMAP tls_expansion_bitmap; static RTL_BITMAP fls_bitmap; +static API_SET_NAMESPACE_ARRAY apiset_map; static int nb_threads = 1; static RTL_CRITICAL_SECTION peb_lock; @@ -311,6 +312,7 @@ HANDLE thread_init(void) peb->FastPebLock = &peb_lock; peb->ProcessParameters = &params; + peb->ApiSetMap = &apiset_map; peb->TlsBitmap = &tls_bitmap; peb->TlsExpansionBitmap = &tls_expansion_bitmap; peb->FlsBitmap = &fls_bitmap; diff --git a/include/Makefile.in b/include/Makefile.in index ffecb98..4a6fe44 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -14,6 +14,7 @@ SOURCES = \ amstream.idl \ amvideo.idl \ appcompatapi.h \ + apiset.h \ appmgmt.h \ appmodel.h \ asptlb.idl \ diff --git a/include/apiset.h b/include/apiset.h new file mode 100644 index 0000000..f55f804 --- /dev/null +++ b/include/apiset.h @@ -0,0 +1,38 @@ +/* + * Copyright (C) 2017 Michael Müller + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * 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 + */ +#ifndef _API_SET_H_ +#define _API_SET_H_ + +#include <windef.h> + +typedef struct _API_SET_NAMESPACE_ENTRY +{ + ULONG NameOffset; + ULONG NameLength; + ULONG DataOffset; +} API_SET_NAMESPACE_ENTRY, *PAPI_SET_NAMESPACE_ENTRY; + +typedef struct _API_SET_NAMESPACE_ARRAY +{ + ULONG Version; + ULONG Count; + API_SET_NAMESPACE_ENTRY Array[1]; +} API_SET_NAMESPACE_ARRAY, *PAPI_SET_NAMESPACE_ARRAY; + +#endif + diff --git a/include/winternl.h b/include/winternl.h index dca8ff3..8b47948 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -23,6 +23,7 @@ #include <ntdef.h> #include <windef.h> +#include <apiset.h> #ifdef __cplusplus extern "C" { @@ -286,7 +287,7 @@ typedef struct _PEB ULONG EnvironmentUpdateCount; /* 028/050 */ PVOID KernelCallbackTable; /* 02c/058 */ ULONG Reserved[2]; /* 030/060 */ - PVOID /*PPEB_FREE_BLOCK*/ FreeList; /* 038/068 */ + PAPI_SET_NAMESPACE_ARRAY ApiSetMap; /* 038/068 */ ULONG TlsExpansionCounter; /* 03c/070 */ PRTL_BITMAP TlsBitmap; /* 040/078 */ ULONG TlsBitmapBits[2]; /* 044/080 */ -- 1.9.1

1 0

[PATCH] mfplat: Forward IMFMediaType to IMFAttributes
by Alistair Leslie-Hughes 12 Sep '18

12 Sep '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/mfplat/main.c | 170 ++++++++++++++--------------------------------------- 1 file changed, 43 insertions(+), 127 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 9f381ef..1c10561 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -1148,6 +1148,12 @@ static const IMFAttributesVtbl mfattributes_vtbl = mfattributes_CopyAllItems }; +static void init_attribute_object(mfattributes *object, UINT32 size) +{ + object->ref = 1; + object->IMFAttributes_iface.lpVtbl = &mfattributes_vtbl; +} + /*********************************************************************** * MFCreateAttributes (mfplat.@) */ @@ -1161,10 +1167,9 @@ HRESULT WINAPI MFCreateAttributes(IMFAttributes **attributes, UINT32 size) if(!object) return E_OUTOFMEMORY; - object->ref = 1; - object->IMFAttributes_iface.lpVtbl = &mfattributes_vtbl; - + init_attribute_object(object, size); *attributes = &object->IMFAttributes_iface; + return S_OK; } @@ -1335,8 +1340,8 @@ HRESULT WINAPI MFCreateSourceResolver(IMFSourceResolver **resolver) typedef struct _mfmediatype { + mfattributes attributes; IMFMediaType IMFMediaType_iface; - LONG ref; } mfmediatype; static inline mfmediatype *impl_from_IMFMediaType(IMFMediaType *iface) @@ -1370,7 +1375,7 @@ static HRESULT WINAPI mediatype_QueryInterface(IMFMediaType *iface, REFIID riid, static ULONG WINAPI mediatype_AddRef(IMFMediaType *iface) { mfmediatype *This = impl_from_IMFMediaType(iface); - ULONG ref = InterlockedIncrement(&This->ref); + ULONG ref = InterlockedIncrement(&This->attributes.ref); TRACE("(%p) ref=%u\n", This, ref); @@ -1380,7 +1385,7 @@ static ULONG WINAPI mediatype_AddRef(IMFMediaType *iface) static ULONG WINAPI mediatype_Release(IMFMediaType *iface) { mfmediatype *This = impl_from_IMFMediaType(iface); - ULONG ref = InterlockedDecrement(&This->ref); + ULONG ref = InterlockedDecrement(&This->attributes.ref); TRACE("(%p) ref=%u\n", This, ref); @@ -1395,269 +1400,179 @@ static ULONG WINAPI mediatype_Release(IMFMediaType *iface) static HRESULT WINAPI mediatype_GetItem(IMFMediaType *iface, REFGUID key, PROPVARIANT *value) { mfmediatype *This = impl_from_IMFMediaType(iface); - - FIXME("%p, %s, %p\n", This, debugstr_guid(key), value); - - return E_NOTIMPL; + return IMFAttributes_GetItem(&This->attributes.IMFAttributes_iface, key, value); } static HRESULT WINAPI mediatype_GetItemType(IMFMediaType *iface, REFGUID key, MF_ATTRIBUTE_TYPE *type) { mfmediatype *This = impl_from_IMFMediaType(iface); - - FIXME("%p, %s, %p\n", This, debugstr_guid(key), type); - - return E_NOTIMPL; + return IMFAttributes_GetItemType(&This->attributes.IMFAttributes_iface, key, type); } static HRESULT WINAPI mediatype_CompareItem(IMFMediaType *iface, REFGUID key, REFPROPVARIANT value, BOOL *result) { mfmediatype *This = impl_from_IMFMediaType(iface); - - FIXME("%p, %s, %p, %p\n", This, debugstr_guid(key), value, result); - - return E_NOTIMPL; + return IMFAttributes_CompareItem(&This->attributes.IMFAttributes_iface, key, value, result); } static HRESULT WINAPI mediatype_Compare(IMFMediaType *iface, IMFAttributes *attrs, MF_ATTRIBUTES_MATCH_TYPE type, BOOL *result) { mfmediatype *This = impl_from_IMFMediaType(iface); - - FIXME("%p, %p, %d, %p\n", This, attrs, type, result); - - return E_NOTIMPL; + return IMFAttributes_Compare(&This->attributes.IMFAttributes_iface, attrs, type, result); } static HRESULT WINAPI mediatype_GetUINT32(IMFMediaType *iface, REFGUID key, UINT32 *value) { mfmediatype *This = impl_from_IMFMediaType(iface); - - FIXME("%p, %s, %p\n", This, debugstr_guid(key), value); - - return E_NOTIMPL; + return IMFAttributes_GetUINT32(&This->attributes.IMFAttributes_iface, key, value); } static HRESULT WINAPI mediatype_GetUINT64(IMFMediaType *iface, REFGUID key, UINT64 *value) { mfmediatype *This = impl_from_IMFMediaType(iface); - - FIXME("%p, %s, %p\n", This, debugstr_guid(key), value); - - return E_NOTIMPL; + return IMFAttributes_GetUINT64(&This->attributes.IMFAttributes_iface, key, value); } static HRESULT WINAPI mediatype_GetDouble(IMFMediaType *iface, REFGUID key, double *value) { mfmediatype *This = impl_from_IMFMediaType(iface); - - FIXME("%p, %s, %p\n", This, debugstr_guid(key), value); - - return E_NOTIMPL; + return IMFAttributes_GetDouble(&This->attributes.IMFAttributes_iface, key, value); } static HRESULT WINAPI mediatype_GetGUID(IMFMediaType *iface, REFGUID key, GUID *value) { mfmediatype *This = impl_from_IMFMediaType(iface); - - FIXME("%p, %s, %p\n", This, debugstr_guid(key), value); - - return E_NOTIMPL; + return IMFAttributes_GetGUID(&This->attributes.IMFAttributes_iface, key, value); } static HRESULT WINAPI mediatype_GetStringLength(IMFMediaType *iface, REFGUID key, UINT32 *length) { mfmediatype *This = impl_from_IMFMediaType(iface); - - FIXME("%p, %s, %p\n", This, debugstr_guid(key), length); - - return E_NOTIMPL; + return IMFAttributes_GetStringLength(&This->attributes.IMFAttributes_iface, key, length); } static HRESULT WINAPI mediatype_GetString(IMFMediaType *iface, REFGUID key, WCHAR *value, UINT32 size, UINT32 *length) { mfmediatype *This = impl_from_IMFMediaType(iface); - - FIXME("%p, %s, %p, %d, %p\n", This, debugstr_guid(key), value, size, length); - - return E_NOTIMPL; + return IMFAttributes_GetString(&This->attributes.IMFAttributes_iface, key, value, size, length); } static HRESULT WINAPI mediatype_GetAllocatedString(IMFMediaType *iface, REFGUID key, WCHAR **value, UINT32 *length) { mfmediatype *This = impl_from_IMFMediaType(iface); - - FIXME("%p, %s, %p, %p\n", This, debugstr_guid(key), value, length); - - return E_NOTIMPL; + return IMFAttributes_GetAllocatedString(&This->attributes.IMFAttributes_iface, key, value, length); } static HRESULT WINAPI mediatype_GetBlobSize(IMFMediaType *iface, REFGUID key, UINT32 *size) { mfmediatype *This = impl_from_IMFMediaType(iface); - - FIXME("%p, %s, %p\n", This, debugstr_guid(key), size); - - return E_NOTIMPL; + return IMFAttributes_GetBlobSize(&This->attributes.IMFAttributes_iface, key, size); } static HRESULT WINAPI mediatype_GetBlob(IMFMediaType *iface, REFGUID key, UINT8 *buf, UINT32 bufsize, UINT32 *blobsize) { mfmediatype *This = impl_from_IMFMediaType(iface); - - FIXME("%p, %s, %p, %d, %p\n", This, debugstr_guid(key), buf, bufsize, blobsize); - - return E_NOTIMPL; + return IMFAttributes_GetBlob(&This->attributes.IMFAttributes_iface, key, buf, bufsize, blobsize); } static HRESULT WINAPI mediatype_GetAllocatedBlob(IMFMediaType *iface, REFGUID key, UINT8 **buf, UINT32 *size) { mfmediatype *This = impl_from_IMFMediaType(iface); - - FIXME("%p, %s, %p, %p\n", This, debugstr_guid(key), buf, size); - - return E_NOTIMPL; + return IMFAttributes_GetAllocatedBlob(&This->attributes.IMFAttributes_iface, key, buf, size); } static HRESULT WINAPI mediatype_GetUnknown(IMFMediaType *iface, REFGUID key, REFIID riid, void **ppv) { mfmediatype *This = impl_from_IMFMediaType(iface); - - FIXME("%p, %s, %s, %p\n", This, debugstr_guid(key), debugstr_guid(riid), ppv); - - return E_NOTIMPL; + return IMFAttributes_GetUnknown(&This->attributes.IMFAttributes_iface, key, riid, ppv); } static HRESULT WINAPI mediatype_SetItem(IMFMediaType *iface, REFGUID key, REFPROPVARIANT value) { mfmediatype *This = impl_from_IMFMediaType(iface); - - FIXME("%p, %s, %p\n", This, debugstr_guid(key), value); - - return E_NOTIMPL; + return IMFAttributes_SetItem(&This->attributes.IMFAttributes_iface, key, value); } static HRESULT WINAPI mediatype_DeleteItem(IMFMediaType *iface, REFGUID key) { mfmediatype *This = impl_from_IMFMediaType(iface); - - FIXME("%p, %s\n", This, debugstr_guid(key)); - - return E_NOTIMPL; + return IMFAttributes_DeleteItem(&This->attributes.IMFAttributes_iface, key); } static HRESULT WINAPI mediatype_DeleteAllItems(IMFMediaType *iface) { mfmediatype *This = impl_from_IMFMediaType(iface); - - FIXME("%p\n", This); - - return E_NOTIMPL; + return IMFAttributes_DeleteAllItems(&This->attributes.IMFAttributes_iface); } static HRESULT WINAPI mediatype_SetUINT32(IMFMediaType *iface, REFGUID key, UINT32 value) { mfmediatype *This = impl_from_IMFMediaType(iface); - - FIXME("%p, %s, %d\n", This, debugstr_guid(key), value); - - return E_NOTIMPL; + return IMFAttributes_SetUINT32(&This->attributes.IMFAttributes_iface, key, value); } static HRESULT WINAPI mediatype_SetUINT64(IMFMediaType *iface, REFGUID key, UINT64 value) { mfmediatype *This = impl_from_IMFMediaType(iface); - - FIXME("%p, %s, %s\n", This, debugstr_guid(key), wine_dbgstr_longlong(value)); - - return E_NOTIMPL; + return IMFAttributes_SetUINT64(&This->attributes.IMFAttributes_iface, key, value); } static HRESULT WINAPI mediatype_SetDouble(IMFMediaType *iface, REFGUID key, double value) { mfmediatype *This = impl_from_IMFMediaType(iface); - - FIXME("%p, %s, %f\n", This, debugstr_guid(key), value); - - return E_NOTIMPL; + return IMFAttributes_SetDouble(&This->attributes.IMFAttributes_iface, key, value); } static HRESULT WINAPI mediatype_SetGUID(IMFMediaType *iface, REFGUID key, REFGUID value) { mfmediatype *This = impl_from_IMFMediaType(iface); - - FIXME("%p, %s, %s\n", This, debugstr_guid(key), debugstr_guid(value)); - - return E_NOTIMPL; + return IMFAttributes_SetGUID(&This->attributes.IMFAttributes_iface, key, value); } static HRESULT WINAPI mediatype_SetString(IMFMediaType *iface, REFGUID key, const WCHAR *value) { mfmediatype *This = impl_from_IMFMediaType(iface); - - FIXME("%p, %s, %s\n", This, debugstr_guid(key), debugstr_w(value)); - - return E_NOTIMPL; + return IMFAttributes_SetString(&This->attributes.IMFAttributes_iface, key, value); } static HRESULT WINAPI mediatype_SetBlob(IMFMediaType *iface, REFGUID key, const UINT8 *buf, UINT32 size) { mfmediatype *This = impl_from_IMFMediaType(iface); - - FIXME("%p, %s, %p, %d\n", This, debugstr_guid(key), buf, size); - - return E_NOTIMPL; + return IMFAttributes_SetBlob(&This->attributes.IMFAttributes_iface, key, buf, size); } static HRESULT WINAPI mediatype_SetUnknown(IMFMediaType *iface, REFGUID key, IUnknown *unknown) { mfmediatype *This = impl_from_IMFMediaType(iface); - - FIXME("%p, %s, %p\n", This, debugstr_guid(key), unknown); - - return E_NOTIMPL; + return IMFAttributes_SetUnknown(&This->attributes.IMFAttributes_iface, key, unknown); } static HRESULT WINAPI mediatype_LockStore(IMFMediaType *iface) { mfmediatype *This = impl_from_IMFMediaType(iface); - - FIXME("%p\n", This); - - return E_NOTIMPL; + return IMFAttributes_LockStore(&This->attributes.IMFAttributes_iface); } static HRESULT WINAPI mediatype_UnlockStore(IMFMediaType *iface) { mfmediatype *This = impl_from_IMFMediaType(iface); - - FIXME("%p\n", This); - - return E_NOTIMPL; + return IMFAttributes_UnlockStore(&This->attributes.IMFAttributes_iface); } static HRESULT WINAPI mediatype_GetCount(IMFMediaType *iface, UINT32 *items) { mfmediatype *This = impl_from_IMFMediaType(iface); - - FIXME("%p, %p\n", This, items); - - if(items) - *items = 0; - - return E_NOTIMPL; + return IMFAttributes_GetCount(&This->attributes.IMFAttributes_iface, items); } static HRESULT WINAPI mediatype_GetItemByIndex(IMFMediaType *iface, UINT32 index, GUID *key, PROPVARIANT *value) { mfmediatype *This = impl_from_IMFMediaType(iface); - - FIXME("%p, %d, %p, %p\n", This, index, key, value); - - return E_NOTIMPL; + return IMFAttributes_GetItemByIndex(&This->attributes.IMFAttributes_iface, index, key, value); } static HRESULT WINAPI mediatype_CopyAllItems(IMFMediaType *iface, IMFAttributes *dest) @@ -1768,14 +1683,15 @@ HRESULT WINAPI MFCreateMediaType(IMFMediaType **type) if(!type) return E_INVALIDARG; - object = HeapAlloc( GetProcessHeap(), 0, sizeof(*object) ); + object = heap_alloc( sizeof(*object) ); if(!object) return E_OUTOFMEMORY; - object->ref = 1; + init_attribute_object(&object->attributes, 0); object->IMFMediaType_iface.lpVtbl = &mediatype_vtbl; *type = &object->IMFMediaType_iface; + return S_OK; } -- 1.9.1

1 0

[PATCH] wine.inf: Updates E. South America Standard Time DST data
by saboya＠gmail.com 11 Sep '18

11 Sep '18

From: Rodrigo Saboya <saboya(a)gmail.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45786 Signed-off-by: Rodrigo Saboya <saboya(a)gmail.com> --- loader/wine.inf.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 4f241c0447..f10284bedc 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2806,7 +2806,7 @@ HKLM,%CurrentVersionNT%\Time Zones\E. Australia Standard Time,"TZI",1,a8,fd,ff,f HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time,"Display",,"America/Sao_Paulo" HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time,"Dlt",,"E. South America Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time,"Std",,"E. South America Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time,"TZI",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time,"TZI",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,0b,00,00,00,01,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time\Dynamic DST,"2015",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,df,07,02,00,00,00,16,00,00,00,00,00,00,00,00,00,df,07,0a,00,00,00,12,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time\Dynamic DST,"2023",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,e7,07,02,00,00,00,1a,00,00,00,00,00,00,00,00,00,e7,07,0a,00,00,00,0f,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time\Dynamic DST,"2026",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,ea,07,02,00,00,00,16,00,00,00,00,00,00,00,00,00,ea,07,0a,00,00,00,12,00,00,00,00,00,00,00,00,00 -- 2.16.4

1 0

[PATCH 1/3] [programs/cmd] Handle whitespace in 'for' argument items
by Jason Edmeades 11 Sep '18

11 Sep '18

Fixes bug#45731 Avoid whitespace affecting the parsing of a for loops items. The leading and trailing quote or backtick needed removing, and it was assumed that the trailing character would be that character, which was wrong when there was whitespace unless the parameter is trimmed. Signed-off-by: Jason Edmeades <us(a)edmeades.me.uk> --- programs/cmd/builtins.c | 8 +++++++- programs/cmd/tests/test_builtins.cmd | 7 ++++++- programs/cmd/tests/test_builtins.cmd.exp | 4 ++++ 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 25d5be145e..1e6181ddff 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -2069,17 +2069,22 @@ static HANDLE WCMD_forf_getinputhandle(BOOL usebackq, WCHAR *itemstr, BOOL iscmd WCHAR temp_str[MAX_PATH]; WCHAR temp_file[MAX_PATH]; WCHAR temp_cmd[MAXSTRING]; + WCHAR *trimmed = NULL; HANDLE hinput = INVALID_HANDLE_VALUE; static const WCHAR redirOutW[] = {'>','%','s','\0'}; static const WCHAR cmdW[] = {'C','M','D','\0'}; static const WCHAR cmdslashcW[] = {'C','M','D','.','E','X','E',' ', '/','C',' ','%','s','\0'}; - /* Remove leading and trailing character */ + /* Remove leading and trailing character (but there may be trailing whitespace too) */ if ((iscmd && (itemstr[0] == '`' && usebackq)) || (iscmd && (itemstr[0] == '\'' && !usebackq)) || (!iscmd && (itemstr[0] == '"' && usebackq))) { + trimmed = WCMD_strtrim(itemstr); + if (trimmed) { + itemstr = trimmed; + } itemstr[strlenW(itemstr)-1] = 0x00; itemstr++; } @@ -2106,6 +2111,7 @@ static HANDLE WCMD_forf_getinputhandle(BOOL usebackq, WCHAR *itemstr, BOOL iscmd hinput = CreateFileW(itemstr, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); } + heap_free(trimmed); return hinput; } diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index de9c8891ab..e74d4910ed 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -1702,8 +1702,11 @@ mkdir foobar & cd foobar echo ------ string argument rem NT4 does not support usebackq for /F %%i in ("a b c") do echo %%i +for /F %%i in ( "a b c" ) do echo X%%iX for /f usebackq %%i in ('a b c') do echo %%i>output_file if not exist output_file (echo no output) else (type output_file & del output_file) +for /f usebackq %%i in ( 'a b c' ) do echo X%%iX>output_file +if not exist output_file (echo no output) else (type output_file & del output_file) for /f %%i in ("a ") do echo %%i for /f usebackq %%i in ('a ') do echo %%i>output_file if not exist output_file (echo no output) else (type output_file & del output_file) @@ -1755,9 +1758,11 @@ for /f "usebackq" %%i in (`echo.Passed2`) do echo %%i for /f usebackq %%i in (`echo.Passed3`) do echo %%i for /f "usebackq" %%i in (`"c:\windows\system32\cmd.exe" /C echo Passed4`) do echo %%i for /f "usebackq" %%i in (`""c:\windows\system32\cmd.exe" /C echo Passed5"`) do echo %%i +for /f %%i in ( 'echo.Passed6' ) do echo %%i +for /f "usebackq" %%i in ( `echo.Passed7` ) do echo %%i goto :ContinueFORF :SkipFORFcmdNT4 -for /l %%i in (1,1,5) do echo Missing functionality - Broken%%i +for /l %%i in (1,1,7) do echo Missing functionality - Broken%%i :ContinueFORF rem FIXME: Rest not testable right now in wine: not implemented and would need rem preliminary grep-like program implementation (e.g. like findstr or fc) even diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 3829318956..021a5b0893 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -1180,7 +1180,9 @@ WINE_bar correctly 6@or_broken@ERROR: WINE_bar incorrectly 5 [6] --- for /F ------ string argument a +XaX a@or_broken@no output +XaX@or_broken@no output a a@or_broken@no output a @@ -1218,6 +1220,8 @@ Passed2@or_broken@Missing functionality - Broken2 Passed3@or_broken@Missing functionality - Broken3 Passed4@or_broken@Missing functionality - Broken4 Passed5@or_broken@Missing functionality - Broken5 +Passed6@or_broken@Missing functionality - Broken6 +Passed7@or_broken@Missing functionality - Broken7 ------ eol option and@or_broken@Broken NT4 functionality1 Line@or_broken@Broken NT4 functionality2 -- 2.17.1

2 3

[PATCH v2 4/4] msftedit: Add tests for interfaces.
by Jactry Zeng 11 Sep '18

11 Sep '18

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- configure | 1 + configure.ac | 1 + dlls/msftedit/tests/Makefile.in | 5 + dlls/msftedit/tests/richole.c | 165 ++++++++++++++++++++++++++++++++ 4 files changed, 172 insertions(+) create mode 100644 dlls/msftedit/tests/Makefile.in create mode 100644 dlls/msftedit/tests/richole.c diff --git a/configure b/configure index a3916ee233..818cb40fce 100755 --- a/configure +++ b/configure @@ -19595,6 +19595,7 @@ wine_fn_config_makefile dlls/msdmo enable_msdmo wine_fn_config_makefile dlls/msdmo/tests enable_tests wine_fn_config_makefile dlls/msdrm enable_msdrm wine_fn_config_makefile dlls/msftedit enable_msftedit +wine_fn_config_makefile dlls/msftedit/tests enable_tests wine_fn_config_makefile dlls/msg711.acm enable_msg711_acm wine_fn_config_makefile dlls/msgsm32.acm enable_msgsm32_acm wine_fn_config_makefile dlls/mshtml.tlb enable_mshtml_tlb diff --git a/configure.ac b/configure.ac index 006f7d9fc2..605ad1690d 100644 --- a/configure.ac +++ b/configure.ac @@ -3451,6 +3451,7 @@ WINE_CONFIG_MAKEFILE(dlls/msdmo) WINE_CONFIG_MAKEFILE(dlls/msdmo/tests) WINE_CONFIG_MAKEFILE(dlls/msdrm) WINE_CONFIG_MAKEFILE(dlls/msftedit) +WINE_CONFIG_MAKEFILE(dlls/msftedit/tests) WINE_CONFIG_MAKEFILE(dlls/msg711.acm) WINE_CONFIG_MAKEFILE(dlls/msgsm32.acm) WINE_CONFIG_MAKEFILE(dlls/mshtml.tlb) diff --git a/dlls/msftedit/tests/Makefile.in b/dlls/msftedit/tests/Makefile.in new file mode 100644 index 0000000000..99cc46a007 --- /dev/null +++ b/dlls/msftedit/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = msftedit.dll +IMPORTS = ole32 oleaut32 user32 + +C_SRCS = \ + richole.c diff --git a/dlls/msftedit/tests/richole.c b/dlls/msftedit/tests/richole.c new file mode 100644 index 0000000000..6191c8ac3a --- /dev/null +++ b/dlls/msftedit/tests/richole.c @@ -0,0 +1,165 @@ +/* + * Tests for IRichEditOle and friends. + * + * Copyright 2008 Google (Dan Hipschman) + * Copyright 2018 Jactry Zeng 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 <stdarg.h> + +#include <windef.h> +#include <winbase.h> +#include <initguid.h> +#include <ole2.h> +#include <richedit.h> +#include <richole.h> +#include <tom.h> +#include <wine/test.h> + +static HMODULE msftedit_hmodule; + +#define EXPECT_REF(obj,ref) _expect_ref((IUnknown*)obj, ref, __LINE__) +static void _expect_ref(IUnknown* obj, ULONG ref, int line) +{ + ULONG rc; + IUnknown_AddRef(obj); + rc = IUnknown_Release(obj); + ok_(__FILE__,line)(rc == ref, "expected refcount %d, got %d\n", ref, rc); +} + +static HWND new_window(LPCWSTR classname, DWORD dwstyle, HWND parent) +{ + HWND hwnd = CreateWindowW(classname, NULL, + dwstyle | WS_POPUP | WS_HSCROLL | WS_VSCROLL | WS_VISIBLE, + 0, 0, 200, 60, parent, NULL, msftedit_hmodule, NULL); + ok(hwnd != NULL, "class: %s, error: %d\n", wine_dbgstr_w(classname), (int) GetLastError()); + return hwnd; +} + +static void test_Interfaces(void) +{ + IRichEditOle *reole = NULL, *reole1 = NULL; + ITextDocument *txtdoc = NULL; + ITextDocument2Old *txtdoc2Old = NULL; + ITextSelection *txtsel = NULL, *txtsel2; + IUnknown *punk; + HRESULT hres; + LRESULT res; + HWND hwnd; + ULONG refcount; + + hwnd = new_window(MSFTEDIT_CLASS, ES_MULTILINE, NULL); + if (!hwnd) + { + skip("Couldn't create window\n"); + return; + } + + res = SendMessageA(hwnd, EM_GETOLEINTERFACE, 0, (LPARAM)&reole); + ok(res, "SendMessage\n"); + ok(reole != NULL, "EM_GETOLEINTERFACE\n"); + EXPECT_REF(reole, 2); + + res = SendMessageA(hwnd, EM_GETOLEINTERFACE, 0, (LPARAM)&reole1); + ok(res == 1, "SendMessage\n"); + ok(reole1 == reole, "Should not return a new IRichEditOle interface\n"); + EXPECT_REF(reole, 3); + + hres = IRichEditOle_QueryInterface(reole, &IID_ITextDocument, (void **)&txtdoc); + ok(hres == S_OK, "IRichEditOle_QueryInterface\n"); + ok(txtdoc != NULL, "IRichEditOle_QueryInterface\n"); + + hres = ITextDocument_GetSelection(txtdoc, NULL); + ok(hres == E_INVALIDARG, "ITextDocument_GetSelection: 0x%x\n", hres); + + EXPECT_REF(txtdoc, 4); + + hres = ITextDocument_GetSelection(txtdoc, &txtsel); + ok(hres == S_OK, "got 0x%08x\n", hres); + + EXPECT_REF(txtdoc, 4); + EXPECT_REF(txtsel, 2); + + hres = ITextDocument_GetSelection(txtdoc, &txtsel2); + ok(hres == S_OK, "got 0x%08x\n", hres); + ok(txtsel2 == txtsel, "got %p, %p\n", txtsel, txtsel2); + + EXPECT_REF(txtdoc, 4); + EXPECT_REF(txtsel, 3); + + ITextSelection_Release(txtsel2); + + punk = NULL; + hres = ITextSelection_QueryInterface(txtsel, &IID_ITextSelection, (void **)&punk); + ok(hres == S_OK, "ITextSelection_QueryInterface\n"); + ok(punk != NULL, "ITextSelection_QueryInterface\n"); + IUnknown_Release(punk); + + punk = NULL; + hres = ITextSelection_QueryInterface(txtsel, &IID_ITextRange, (void **)&punk); + ok(hres == S_OK, "ITextSelection_QueryInterface\n"); + ok(punk != NULL, "ITextSelection_QueryInterface\n"); + IUnknown_Release(punk); + + punk = NULL; + hres = ITextSelection_QueryInterface(txtsel, &IID_IDispatch, (void **)&punk); + ok(hres == S_OK, "ITextSelection_QueryInterface\n"); + ok(punk != NULL, "ITextSelection_QueryInterface\n"); + IUnknown_Release(punk); + + punk = NULL; + hres = IRichEditOle_QueryInterface(reole, &IID_IOleClientSite, (void **)&punk); + ok(hres == E_NOINTERFACE, "IRichEditOle_QueryInterface\n"); + + punk = NULL; + hres = IRichEditOle_QueryInterface(reole, &IID_IOleWindow, (void **)&punk); + ok(hres == E_NOINTERFACE, "IRichEditOle_QueryInterface\n"); + + punk = NULL; + hres = IRichEditOle_QueryInterface(reole, &IID_IOleInPlaceSite, (void **)&punk); + ok(hres == E_NOINTERFACE, "IRichEditOle_QueryInterface\n"); + + hres = IRichEditOle_QueryInterface(reole, &IID_ITextDocument2Old, (void **)&txtdoc2Old); + ok(hres == S_OK, "IRichEditOle_QueryInterface\n"); + ok(txtdoc2Old != NULL, "IRichEditOle_QueryInterface\n"); + EXPECT_REF(txtdoc2Old, 5); + EXPECT_REF(reole, 5); + ITextDocument2Old_Release(txtdoc2Old); + + ITextDocument_Release(txtdoc); + IRichEditOle_Release(reole); + refcount = IRichEditOle_Release(reole); + ok(refcount == 1, "got wrong ref count: %d\n", refcount); + DestroyWindow(hwnd); + + /* Methods should return CO_E_RELEASED if the backing document has + been released. One test should suffice. */ + hres = ITextSelection_CanEdit(txtsel, NULL); + ok(hres == CO_E_RELEASED, "ITextSelection after ITextDocument destroyed\n"); + + ITextSelection_Release(txtsel); +} + +START_TEST(richole) +{ + msftedit_hmodule = LoadLibraryA("msftedit.dll"); + ok(msftedit_hmodule != NULL, "error: %d\n", (int) GetLastError()); + + test_Interfaces(); +} -- 2.18.0

2 1

[PATCH] msvcrt: Don't report an underflow for ldexp(0, x) or _scalb(0, x)
by Alex Henrie 11 Sep '18

11 Sep '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/msvcrt/math.c | 2 +- dlls/ucrtbase/tests/misc.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 8d5b687b6f..a1ba552632 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1015,7 +1015,7 @@ double CDECL MSVCRT_ldexp(double num, MSVCRT_long exp) if (isfinite(num) && !isfinite(z)) math_error(_OVERFLOW, "ldexp", num, exp, z); - else if (isfinite(num) && !z) + else if (num && isfinite(num) && !z) math_error(_UNDERFLOW, "ldexp", num, exp, z); else if (z == 0 && signbit(z)) z = 0.0; /* Convert -0 -> +0 */ diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index 2a9648ab6e..bd8034e994 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -694,11 +694,13 @@ static void test_math_errors(void) } testsdl[] = { {"_scalb", -INFINITY, 1, -1, -1}, {"_scalb", -1e100, 1, -1, -1}, + {"_scalb", 0, 1, -1, -1}, {"_scalb", 1e100, 1, -1, -1}, {"_scalb", INFINITY, 1, -1, -1}, {"_scalb", 1, 1e9, ERANGE, _OVERFLOW}, {"ldexp", -INFINITY, 1, -1, -1}, {"ldexp", -1e100, 1, -1, -1}, + {"ldexp", 0, 1, -1, -1}, {"ldexp", 1e100, 1, -1, -1}, {"ldexp", INFINITY, 1, -1, -1}, {"ldexp", 1, -1e9, -1, _UNDERFLOW}, -- 2.18.0

2 1

[PATCH 4/4] ddraw: Accept the d3d1 and d3d2 versions of D3DFINDDEVICERESULT in ddraw_find_device().
by Henri Verbeet 11 Sep '18

11 Sep '18

From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Based off a patch by Michael Müller. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/ddraw/ddraw.c | 69 ++++++++++++++++++++++++++++++++++++++++------- dlls/ddraw/tests/ddraw1.c | 57 ++++++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw2.c | 57 ++++++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw4.c | 57 ++++++++++++++++++++++++++++++++++++++- include/d3dhal.h | 69 +++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 297 insertions(+), 12 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 170a5492784..c83d0ca1568 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -25,6 +25,8 @@ #include "wine/port.h" #include "ddraw_private.h" +#include "ddrawi.h" +#include "d3dhal.h" #include "wine/exception.h" @@ -4019,20 +4021,44 @@ static HRESULT WINAPI d3d1_CreateViewport(IDirect3D *iface, IDirect3DViewport ** } static HRESULT ddraw_find_device(struct ddraw *ddraw, const D3DFINDDEVICESEARCH *fds, D3DFINDDEVICERESULT *fdr, - unsigned int guid_count, const GUID * const *guids) -{ + unsigned int guid_count, const GUID * const *guids, DWORD device_desc_size) +{ + struct ddraw_find_device_result_v1 + { + DWORD size; + GUID guid; + D3DDEVICEDESC_V1 hw_desc; + D3DDEVICEDESC_V1 sw_desc; + } *fdr1; + struct ddraw_find_device_result_v2 + { + DWORD size; + GUID guid; + D3DDEVICEDESC_V2 hw_desc; + D3DDEVICEDESC_V2 sw_desc; + } *fdr2; D3DDEVICEDESC7 desc7; D3DDEVICEDESC desc1; unsigned int i; HRESULT hr; - TRACE("ddraw %p, fds %p, fdr %p, guid_count %u, guids %p.\n", ddraw, fds, fdr, guid_count, guids); + TRACE("ddraw %p, fds %p, fdr %p, guid_count %u, guids %p, device_desc_size %u.\n", + ddraw, fds, fdr, guid_count, guids, device_desc_size); if (!fds || !fdr) return DDERR_INVALIDPARAMS; - if (fds->dwSize != sizeof(*fds) || fdr->dwSize != sizeof(*fdr)) + if (fds->dwSize != sizeof(*fds)) + { + WARN("Got invalid search structure size %u.\n", fds->dwSize); + return DDERR_INVALIDPARAMS; + } + + if (fdr->dwSize != sizeof(*fdr) && fdr->dwSize != sizeof(*fdr2) && fdr->dwSize != sizeof(*fdr1)) + { + WARN("Got invalid result structure size %u.\n", fdr->dwSize); return DDERR_INVALIDPARAMS; + } if (fds->dwFlags & D3DFDS_COLORMODEL) WARN("Ignoring colour model %#x.\n", fds->dcmColorModel); @@ -4066,8 +4092,33 @@ static HRESULT ddraw_find_device(struct ddraw *ddraw, const D3DFINDDEVICESEARCH /* Now return our own GUID */ ddraw_d3dcaps1_from_7(&desc1, &desc7); fdr->guid = IID_D3DDEVICE_WineD3D; - fdr->ddHwDesc = desc1; - fdr->ddSwDesc = desc1; + + /* Note that "device_desc_size" doesn't necessarily have any relation to + * the actual structure size. However, this matches the behaviour of + * Windows since at least Windows 2000. */ + if (fdr->dwSize == sizeof(*fdr1)) + { + fdr1 = (struct ddraw_find_device_result_v1 *)fdr; + memcpy(&fdr1->hw_desc, &desc1, sizeof(fdr1->hw_desc)); + fdr1->hw_desc.dwSize = device_desc_size; + memcpy(&fdr1->sw_desc, &desc1, sizeof(fdr1->sw_desc)); + fdr1->sw_desc.dwSize = device_desc_size; + } + else if (fdr->dwSize == sizeof(*fdr2)) + { + fdr2 = (struct ddraw_find_device_result_v2 *)fdr; + memcpy(&fdr2->hw_desc, &desc1, sizeof(fdr2->hw_desc)); + fdr2->hw_desc.dwSize = device_desc_size; + memcpy(&fdr2->sw_desc, &desc1, sizeof(fdr2->sw_desc)); + fdr2->sw_desc.dwSize = device_desc_size; + } + else + { + fdr->ddHwDesc = desc1; + fdr->ddHwDesc.dwSize = device_desc_size; + fdr->ddSwDesc = desc1; + fdr->ddSwDesc.dwSize = device_desc_size; + } TRACE("Returning Wine's wined3d device with (undumped) capabilities.\n"); @@ -4086,7 +4137,7 @@ static HRESULT WINAPI d3d3_FindDevice(IDirect3D3 *iface, D3DFINDDEVICESEARCH *fd TRACE("iface %p, fds %p, fdr %p.\n", iface, fds, fdr); - return ddraw_find_device(ddraw, fds, fdr, ARRAY_SIZE(guids), guids); + return ddraw_find_device(ddraw, fds, fdr, ARRAY_SIZE(guids), guids, sizeof(D3DDEVICEDESC_V3)); } static HRESULT WINAPI d3d2_FindDevice(IDirect3D2 *iface, D3DFINDDEVICESEARCH *fds, D3DFINDDEVICERESULT *fdr) @@ -4103,7 +4154,7 @@ static HRESULT WINAPI d3d2_FindDevice(IDirect3D2 *iface, D3DFINDDEVICESEARCH *fd TRACE("iface %p, fds %p, fdr %p.\n", iface, fds, fdr); - return ddraw_find_device(ddraw, fds, fdr, ARRAY_SIZE(guids), guids); + return ddraw_find_device(ddraw, fds, fdr, ARRAY_SIZE(guids), guids, sizeof(D3DDEVICEDESC_V2)); } static HRESULT WINAPI d3d1_FindDevice(IDirect3D *iface, D3DFINDDEVICESEARCH *fds, D3DFINDDEVICERESULT *fdr) @@ -4119,7 +4170,7 @@ static HRESULT WINAPI d3d1_FindDevice(IDirect3D *iface, D3DFINDDEVICESEARCH *fds TRACE("iface %p, fds %p, fdr %p.\n", iface, fds, fdr); - return ddraw_find_device(ddraw, fds, fdr, ARRAY_SIZE(guids), guids); + return ddraw_find_device(ddraw, fds, fdr, ARRAY_SIZE(guids), guids, sizeof(D3DDEVICEDESC_V1)); } /***************************************************************************** diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index ba9f128dad7..ee4fa5bfaab 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -22,7 +22,8 @@ #include "wine/test.h" #include <limits.h> #include <math.h> -#include "d3d.h" +#include "ddrawi.h" +#include "d3dhal.h" static BOOL is_ddraw64 = sizeof(DWORD) != sizeof(DWORD *); static DEVMODEW registry_mode; @@ -11724,6 +11725,22 @@ static void test_find_device(void) HWND window; HRESULT hr; + struct + { + DWORD size; + GUID guid; + D3DDEVICEDESC_V1 hw_desc; + D3DDEVICEDESC_V1 sw_desc; + } result_v1; + + struct + { + DWORD size; + GUID guid; + D3DDEVICEDESC_V2 hw_desc; + D3DDEVICEDESC_V2 sw_desc; + } result_v2; + static const struct { const GUID *guid; @@ -11761,6 +11778,10 @@ static void test_find_device(void) hr = IDirect3D_FindDevice(d3d, &search, &result); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); ok(result.dwSize == sizeof(result), "Got unexpected result size %u.\n", result.dwSize); + ok(result.ddHwDesc.dwSize == sizeof(result_v1.hw_desc), + "Got unexpected HW desc size %u.\n", result.ddHwDesc.dwSize); + ok(result.ddSwDesc.dwSize == sizeof(result_v1.sw_desc), + "Got unexpected SW desc size %u.\n", result.ddSwDesc.dwSize); memset(&search, 0, sizeof(search)); memset(&result, 0, sizeof(result)); @@ -11772,6 +11793,26 @@ static void test_find_device(void) hr = IDirect3D_FindDevice(d3d, &search, &result); ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr); + search.dwSize = sizeof(search); + + memset(&result_v1, 0, sizeof(result_v1)); + result_v1.size = sizeof(result_v1); + hr = IDirect3D_FindDevice(d3d, &search, (D3DFINDDEVICERESULT *)&result_v1); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(result_v1.hw_desc.dwSize == sizeof(result_v1.hw_desc), + "Got unexpected HW desc size %u.\n", result_v1.hw_desc.dwSize); + ok(result_v1.sw_desc.dwSize == sizeof(result_v1.sw_desc), + "Got unexpected SW desc size %u.\n", result_v1.sw_desc.dwSize); + + memset(&result_v2, 0, sizeof(result_v2)); + result_v2.size = sizeof(result_v2); + hr = IDirect3D_FindDevice(d3d, &search, (D3DFINDDEVICERESULT *)&result_v2); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(result_v2.hw_desc.dwSize == sizeof(result_v1.hw_desc), + "Got unexpected HW desc size %u.\n", result_v2.hw_desc.dwSize); + ok(result_v2.sw_desc.dwSize == sizeof(result_v1.sw_desc), + "Got unexpected SW desc size %u.\n", result_v2.sw_desc.dwSize); + for (i = 0; i < ARRAY_SIZE(tests); ++i) { memset(&search, 0, sizeof(search)); @@ -11785,6 +11826,20 @@ static void test_find_device(void) hr = IDirect3D_FindDevice(d3d, &search, &result); ok(hr == tests[i].hr, "Test %u: Got unexpected hr %#x.\n", i, hr); ok(result.dwSize == sizeof(result), "Test %u: Got unexpected result size %u.\n", i, result.dwSize); + if (SUCCEEDED(hr)) + { + ok(result.ddHwDesc.dwSize == sizeof(result_v1.hw_desc), + "Test %u: Got unexpected HW desc size %u.\n", i, result.ddHwDesc.dwSize); + ok(result.ddSwDesc.dwSize == sizeof(result_v1.sw_desc), + "Test %u: Got unexpected SW desc size %u.\n", i, result.ddSwDesc.dwSize); + } + else + { + ok(!result.ddHwDesc.dwSize, + "Test %u: Got unexpected HW desc size %u.\n", i, result.ddHwDesc.dwSize); + ok(!result.ddSwDesc.dwSize, + "Test %u: Got unexpected SW desc size %u.\n", i, result.ddSwDesc.dwSize); + } } /* The HAL device can only be enumerated if hardware acceleration is present. */ diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index b5739c3ab4d..9394705330a 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -24,7 +24,8 @@ #include "wine/test.h" #include <limits.h> #include <math.h> -#include "d3d.h" +#include "ddrawi.h" +#include "d3dhal.h" static BOOL is_ddraw64 = sizeof(DWORD) != sizeof(DWORD *); static DEVMODEW registry_mode; @@ -13006,6 +13007,22 @@ static void test_find_device(void) HWND window; HRESULT hr; + struct + { + DWORD size; + GUID guid; + D3DDEVICEDESC_V1 hw_desc; + D3DDEVICEDESC_V1 sw_desc; + } result_v1; + + struct + { + DWORD size; + GUID guid; + D3DDEVICEDESC_V2 hw_desc; + D3DDEVICEDESC_V2 sw_desc; + } result_v2; + static const struct { const GUID *guid; @@ -13043,6 +13060,10 @@ static void test_find_device(void) hr = IDirect3D2_FindDevice(d3d, &search, &result); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); ok(result.dwSize == sizeof(result), "Got unexpected result size %u.\n", result.dwSize); + ok(result.ddHwDesc.dwSize == sizeof(result_v2.hw_desc), + "Got unexpected HW desc size %u.\n", result.ddHwDesc.dwSize); + ok(result.ddSwDesc.dwSize == sizeof(result_v2.sw_desc), + "Got unexpected SW desc size %u.\n", result.ddSwDesc.dwSize); memset(&search, 0, sizeof(search)); memset(&result, 0, sizeof(result)); @@ -13054,6 +13075,26 @@ static void test_find_device(void) hr = IDirect3D2_FindDevice(d3d, &search, &result); ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr); + search.dwSize = sizeof(search); + + memset(&result_v1, 0, sizeof(result_v1)); + result_v1.size = sizeof(result_v1); + hr = IDirect3D2_FindDevice(d3d, &search, (D3DFINDDEVICERESULT *)&result_v1); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(result_v1.hw_desc.dwSize == sizeof(result_v2.hw_desc), + "Got unexpected HW desc size %u.\n", result_v1.hw_desc.dwSize); + ok(result_v1.sw_desc.dwSize == sizeof(result_v2.sw_desc), + "Got unexpected SW desc size %u.\n", result_v1.sw_desc.dwSize); + + memset(&result_v2, 0, sizeof(result_v2)); + result_v2.size = sizeof(result_v2); + hr = IDirect3D2_FindDevice(d3d, &search, (D3DFINDDEVICERESULT *)&result_v2); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(result_v2.hw_desc.dwSize == sizeof(result_v2.hw_desc), + "Got unexpected HW desc size %u.\n", result_v2.hw_desc.dwSize); + ok(result_v2.sw_desc.dwSize == sizeof(result_v2.sw_desc), + "Got unexpected SW desc size %u.\n", result_v2.sw_desc.dwSize); + for (i = 0; i < ARRAY_SIZE(tests); ++i) { memset(&search, 0, sizeof(search)); @@ -13067,6 +13108,20 @@ static void test_find_device(void) hr = IDirect3D2_FindDevice(d3d, &search, &result); ok(hr == tests[i].hr, "Test %u: Got unexpected hr %#x.\n", i, hr); ok(result.dwSize == sizeof(result), "Test %u: Got unexpected result size %u.\n", i, result.dwSize); + if (SUCCEEDED(hr)) + { + ok(result.ddHwDesc.dwSize == sizeof(result_v2.hw_desc), + "Test %u: Got unexpected HW desc size %u.\n", i, result.ddHwDesc.dwSize); + ok(result.ddSwDesc.dwSize == sizeof(result_v2.sw_desc), + "Test %u: Got unexpected SW desc size %u.\n", i, result.ddSwDesc.dwSize); + } + else + { + ok(!result.ddHwDesc.dwSize, + "Test %u: Got unexpected HW desc size %u.\n", i, result.ddHwDesc.dwSize); + ok(!result.ddSwDesc.dwSize, + "Test %u: Got unexpected SW desc size %u.\n", i, result.ddSwDesc.dwSize); + } } /* The HAL device can only be enumerated if hardware acceleration is present. */ diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 337ccb06e42..6a3630a2c0e 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -22,7 +22,8 @@ #include "wine/test.h" #include <limits.h> #include <math.h> -#include "d3d.h" +#include "ddrawi.h" +#include "d3dhal.h" HRESULT WINAPI GetSurfaceFromDC(HDC dc, struct IDirectDrawSurface **surface, HDC *device_dc); @@ -15100,6 +15101,22 @@ static void test_find_device(void) HWND window; HRESULT hr; + struct + { + DWORD size; + GUID guid; + D3DDEVICEDESC_V1 hw_desc; + D3DDEVICEDESC_V1 sw_desc; + } result_v1; + + struct + { + DWORD size; + GUID guid; + D3DDEVICEDESC_V2 hw_desc; + D3DDEVICEDESC_V2 sw_desc; + } result_v2; + static const struct { const GUID *guid; @@ -15137,6 +15154,10 @@ static void test_find_device(void) hr = IDirect3D3_FindDevice(d3d, &search, &result); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); ok(result.dwSize == sizeof(result), "Got unexpected result size %u.\n", result.dwSize); + ok(result.ddHwDesc.dwSize == sizeof(result.ddHwDesc), + "Got unexpected HW desc size %u.\n", result.ddHwDesc.dwSize); + ok(result.ddSwDesc.dwSize == sizeof(result.ddSwDesc), + "Got unexpected SW desc size %u.\n", result.ddSwDesc.dwSize); memset(&search, 0, sizeof(search)); memset(&result, 0, sizeof(result)); @@ -15148,6 +15169,26 @@ static void test_find_device(void) hr = IDirect3D3_FindDevice(d3d, &search, &result); ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr); + search.dwSize = sizeof(search); + + memset(&result_v1, 0, sizeof(result_v1)); + result_v1.size = sizeof(result_v1); + hr = IDirect3D3_FindDevice(d3d, &search, (D3DFINDDEVICERESULT *)&result_v1); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(result_v1.hw_desc.dwSize == sizeof(result.ddHwDesc), + "Got unexpected HW desc size %u.\n", result_v1.hw_desc.dwSize); + ok(result_v1.sw_desc.dwSize == sizeof(result.ddSwDesc), + "Got unexpected SW desc size %u.\n", result_v1.sw_desc.dwSize); + + memset(&result_v2, 0, sizeof(result_v2)); + result_v2.size = sizeof(result_v2); + hr = IDirect3D3_FindDevice(d3d, &search, (D3DFINDDEVICERESULT *)&result_v2); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(result_v2.hw_desc.dwSize == sizeof(result.ddHwDesc), + "Got unexpected HW desc size %u.\n", result_v2.hw_desc.dwSize); + ok(result_v2.sw_desc.dwSize == sizeof(result.ddSwDesc), + "Got unexpected SW desc size %u.\n", result_v2.sw_desc.dwSize); + for (i = 0; i < ARRAY_SIZE(tests); ++i) { memset(&search, 0, sizeof(search)); @@ -15161,6 +15202,20 @@ static void test_find_device(void) hr = IDirect3D3_FindDevice(d3d, &search, &result); ok(hr == tests[i].hr, "Test %u: Got unexpected hr %#x.\n", i, hr); ok(result.dwSize == sizeof(result), "Test %u: Got unexpected result size %u.\n", i, result.dwSize); + if (SUCCEEDED(hr)) + { + ok(result.ddHwDesc.dwSize == sizeof(result.ddHwDesc), + "Test %u: Got unexpected HW desc size %u.\n", i, result.ddHwDesc.dwSize); + ok(result.ddSwDesc.dwSize == sizeof(result.ddSwDesc), + "Test %u: Got unexpected SW desc size %u.\n", i, result.ddSwDesc.dwSize); + } + else + { + ok(!result.ddHwDesc.dwSize, + "Test %u: Got unexpected HW desc size %u.\n", i, result.ddHwDesc.dwSize); + ok(!result.ddSwDesc.dwSize, + "Test %u: Got unexpected SW desc size %u.\n", i, result.ddSwDesc.dwSize); + } } /* The HAL device can only be enumerated if hardware acceleration is present. */ diff --git a/include/d3dhal.h b/include/d3dhal.h index 9d43313a00b..409cbfdf83b 100644 --- a/include/d3dhal.h +++ b/include/d3dhal.h @@ -47,6 +47,75 @@ typedef struct _D3DDeviceDesc_V1 { DWORD dwMaxVertexCount; } D3DDEVICEDESC_V1,*LPD3DDEVICEDESC_V1; +typedef struct _D3DDeviceDesc_V2 +{ + DWORD dwSize; + DWORD dwFlags; + D3DCOLORMODEL dcmColorModel; + DWORD dwDevCaps; + D3DTRANSFORMCAPS dtcTransformCaps; + BOOL bClipping; + D3DLIGHTINGCAPS dlcLightingCaps; + D3DPRIMCAPS dpcLineCaps; + D3DPRIMCAPS dpcTriCaps; + DWORD dwDeviceRenderBitDepth; + DWORD dwDeviceZBufferBitDepth; + DWORD dwMaxBufferSize; + DWORD dwMaxVertexCount; + + /* DirectX 5 */ + DWORD dwMinTextureWidth; + DWORD dwMinTextureHeight; + DWORD dwMaxTextureWidth; + DWORD dwMaxTextureHeight; + DWORD dwMinStippleWidth; + DWORD dwMaxStippleWidth; + DWORD dwMinStippleHeight; + DWORD dwMaxStippleHeight; +} D3DDEVICEDESC_V2, *LPD3DDEVICEDESC_V2; + +typedef struct _D3DDeviceDesc_V3 +{ + DWORD dwSize; + DWORD dwFlags; + D3DCOLORMODEL dcmColorModel; + DWORD dwDevCaps; + D3DTRANSFORMCAPS dtcTransformCaps; + BOOL bClipping; + D3DLIGHTINGCAPS dlcLightingCaps; + D3DPRIMCAPS dpcLineCaps; + D3DPRIMCAPS dpcTriCaps; + DWORD dwDeviceRenderBitDepth; + DWORD dwDeviceZBufferBitDepth; + DWORD dwMaxBufferSize; + DWORD dwMaxVertexCount; + + /* DirectX 5 */ + DWORD dwMinTextureWidth; + DWORD dwMinTextureHeight; + DWORD dwMaxTextureWidth; + DWORD dwMaxTextureHeight; + DWORD dwMinStippleWidth; + DWORD dwMaxStippleWidth; + DWORD dwMinStippleHeight; + DWORD dwMaxStippleHeight; + + /* DirectX 6 */ + DWORD dwMaxTextureRepeat; + DWORD dwMaxTextureAspectRatio; + DWORD dwMaxAnisotropy; + D3DVALUE dvGuardBandLeft; + D3DVALUE dvGuardBandTop; + D3DVALUE dvGuardBandRight; + D3DVALUE dvGuardBandBottom; + D3DVALUE dvExtentsAdjust; + DWORD dwStencilCaps; + DWORD dwFVFCaps; + DWORD dwTextureOpCaps; + WORD wMaxTextureBlendStages; + WORD wMaxSimultaneousTextures; +} D3DDEVICEDESC_V3, *LPD3DDEVICEDESC_V3; + typedef struct _D3DHAL_GLOBALDRIVERDATA { DWORD dwSize; D3DDEVICEDESC_V1 hwCaps; -- 2.11.0

2 1

[PATCH 2/4] ddraw: Ignore the colour model in d3d3_FindDevice().
by Henri Verbeet 11 Sep '18

11 Sep '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/ddraw/ddraw.c | 8 ++------ dlls/ddraw/tests/ddraw1.c | 2 +- dlls/ddraw/tests/ddraw2.c | 2 +- dlls/ddraw/tests/ddraw4.c | 2 +- 4 files changed, 5 insertions(+), 9 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index e60c5f345af..e5f1e4f8c75 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -4049,12 +4049,8 @@ static HRESULT WINAPI d3d3_FindDevice(IDirect3D3 *iface, D3DFINDDEVICESEARCH *fd || fdr->dwSize != sizeof(D3DFINDDEVICERESULT)) return DDERR_INVALIDPARAMS; - if ((fds->dwFlags & D3DFDS_COLORMODEL) - && fds->dcmColorModel != D3DCOLOR_RGB) - { - WARN("Trying to request a non-RGB D3D color model. Not supported.\n"); - return DDERR_INVALIDPARAMS; /* No real idea what to return here :-) */ - } + if (fds->dwFlags & D3DFDS_COLORMODEL) + WARN("Ignoring colour model %#x.\n", fds->dcmColorModel); if (fds->dwFlags & D3DFDS_GUID) { diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 641847aa38d..b8dafdb6281 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -11812,7 +11812,7 @@ static void test_find_device(void) search.dcmColorModel = 0xdeadbeef; result.dwSize = sizeof(result); hr = IDirect3D_FindDevice(d3d, &search, &result); - todo_wine ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); IDirect3D_Release(d3d); IDirectDraw_Release(ddraw); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 02f430afa1a..762b4d9aba3 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -13094,7 +13094,7 @@ static void test_find_device(void) search.dcmColorModel = 0xdeadbeef; result.dwSize = sizeof(result); hr = IDirect3D2_FindDevice(d3d, &search, &result); - todo_wine ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); IDirect3D2_Release(d3d); IDirectDraw2_Release(ddraw); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 942d0253c46..337ccb06e42 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -15186,7 +15186,7 @@ static void test_find_device(void) search.dcmColorModel = 0xdeadbeef; result.dwSize = sizeof(result); hr = IDirect3D3_FindDevice(d3d, &search, &result); - todo_wine ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); IDirect3D3_Release(d3d); IDirectDraw4_Release(ddraw); -- 2.11.0

2 1

[PATCH v2 3/4] riched20: Add IID_ITextDocument2Old support for ITextServices::QueryInterface().
by Jactry Zeng 11 Sep '18

11 Sep '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=20613 Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/riched20/editor.h | 1 + dlls/riched20/richole.c | 6 ++++++ dlls/riched20/tests/txtsrv.c | 34 ++++++++++++++++++++++++++++++++++ dlls/riched20/txtsrv.c | 5 ++++- 4 files changed, 45 insertions(+), 1 deletion(-) diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 141c63aca9..0f86a07e0a 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -234,6 +234,7 @@ void ME_GetOLEObjectSize(const ME_Context *c, ME_Run *run, SIZE *pSize) DECLSPEC void ME_CopyReObject(REOBJECT *dst, const REOBJECT *src, DWORD flags) DECLSPEC_HIDDEN; void ME_DeleteReObject(struct re_object *re_object) DECLSPEC_HIDDEN; void ME_GetITextDocumentInterface(IRichEditOle *iface, LPVOID *ppvObj) DECLSPEC_HIDDEN; +void ME_GetITextDocument2OldInterface(IRichEditOle *iface, LPVOID *ppvObj) DECLSPEC_HIDDEN; /* editor.c */ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index c5d2d7c99a..889b740ed4 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -6013,3 +6013,9 @@ void ME_GetITextDocumentInterface(IRichEditOle *iface, LPVOID *ppvObj) IRichEditOleImpl *This = impl_from_IRichEditOle(iface); *ppvObj = &This->ITextDocument_iface; } + +void ME_GetITextDocument2OldInterface(IRichEditOle *iface, LPVOID *ppvObj) +{ + IRichEditOleImpl *This = impl_from_IRichEditOle(iface); + *ppvObj = &This->ITextDocument2Old_iface; +} diff --git a/dlls/riched20/tests/txtsrv.c b/dlls/riched20/tests/txtsrv.c index a8cf6ff1ad..1aa08f89a4 100644 --- a/dlls/riched20/tests/txtsrv.c +++ b/dlls/riched20/tests/txtsrv.c @@ -904,6 +904,7 @@ static void test_QueryInterface(void) HRESULT hres; IRichEditOle *reole, *txtsrv_reole; ITextDocument *txtdoc, *txtsrv_txtdoc; + ITextDocument2Old *txtdoc2old, *txtsrv_txtdoc2old; ULONG refcount; if(!init_texthost(&txtserv, &host)) @@ -930,6 +931,17 @@ static void test_QueryInterface(void) ITextDocument_Release(txtdoc); refcount = get_refcount((IUnknown *)txtserv); ok(refcount == 2, "got wrong ref count: %d\n", refcount); + + hres = IRichEditOle_QueryInterface(txtsrv_reole, &IID_ITextDocument2Old, (void **)&txtdoc2old); + ok(hres == S_OK, "IRichEditOle_QueryInterface: 0x%08x\n", hres); + refcount = get_refcount((IUnknown *)txtserv); + ok(refcount == 3, "got wrong ref count: %d\n", refcount); + refcount = get_refcount((IUnknown *)txtsrv_reole); + ok(refcount == 3, "got wrong ref count: %d\n", refcount); + + ITextDocument2Old_Release(txtdoc2old); + refcount = get_refcount((IUnknown *)txtserv); + ok(refcount == 2, "got wrong ref count: %d\n", refcount); IRichEditOle_Release(txtsrv_reole); refcount = get_refcount((IUnknown *)txtserv); ok(refcount == 1, "got wrong ref count: %d\n", refcount); @@ -956,6 +968,28 @@ static void test_QueryInterface(void) refcount = get_refcount((IUnknown *)txtserv); ok(refcount == 1, "got wrong ref count: %d\n", refcount); + /* ITextDocument2Old */ + hres = ITextServices_QueryInterface(txtserv, &IID_ITextDocument2Old, (void **)&txtsrv_txtdoc2old); + ok(hres == S_OK, "ITextServices_QueryInterface: 0x%08x\n", hres); + refcount = get_refcount((IUnknown *)txtserv); + ok(refcount == 2, "got wrong ref count: %d\n", refcount); + refcount = get_refcount((IUnknown *)txtsrv_txtdoc2old); + ok(refcount == 2, "got wrong ref count: %d\n", refcount); + + hres = ITextDocument2Old_QueryInterface(txtsrv_txtdoc2old, &IID_IRichEditOle, (void **)&reole); + ok(hres == S_OK, "ITextDocument2Old_QueryInterface: 0x%08x\n", hres); + refcount = get_refcount((IUnknown *)txtserv); + ok(refcount == 3, "got wrong ref count: %d\n", refcount); + refcount = get_refcount((IUnknown *)txtsrv_txtdoc2old); + ok(refcount == 3, "got wrong ref count: %d\n", refcount); + + IRichEditOle_Release(reole); + refcount = get_refcount((IUnknown *)txtserv); + ok(refcount == 2, "got wrong ref count: %d\n", refcount); + ITextDocument2Old_Release(txtsrv_txtdoc2old); + refcount = get_refcount((IUnknown *)txtserv); + ok(refcount == 1, "got wrong ref count: %d\n", refcount); + ITextServices_Release(txtserv); ITextHost_Release(host); } diff --git a/dlls/riched20/txtsrv.c b/dlls/riched20/txtsrv.c index ee65621b1d..090ea3490c 100644 --- a/dlls/riched20/txtsrv.c +++ b/dlls/riched20/txtsrv.c @@ -78,12 +78,15 @@ static HRESULT WINAPI ITextServicesImpl_QueryInterface(IUnknown *iface, REFIID r *ppv = &This->IUnknown_inner; else if (IsEqualIID(riid, &IID_ITextServices)) *ppv = &This->ITextServices_iface; - else if (IsEqualIID(riid, &IID_IRichEditOle) || IsEqualIID(riid, &IID_ITextDocument)) { + else if (IsEqualIID(riid, &IID_IRichEditOle) || IsEqualIID(riid, &IID_ITextDocument) || + IsEqualIID(riid, &IID_ITextDocument2Old)) { if (!This->editor->reOle) if (!CreateIRichEditOle(This->outer_unk, This->editor, (void **)(&This->editor->reOle))) return E_OUTOFMEMORY; if (IsEqualIID(riid, &IID_ITextDocument)) ME_GetITextDocumentInterface(This->editor->reOle, ppv); + else if (IsEqualIID(riid, &IID_ITextDocument2Old)) + ME_GetITextDocument2OldInterface(This->editor->reOle, ppv); else *ppv = This->editor->reOle; } else { -- 2.18.0

1 0

[PATCH v2 2/4] riched20: Add stub for ITextDocument2Old interface.
by Jactry Zeng 11 Sep '18

11 Sep '18

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/riched20/richole.c | 499 ++++++++++++++++++++++++++++++++++ dlls/riched20/tests/richole.c | 8 + 2 files changed, 507 insertions(+) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 5c7be5eaa9..c5d2d7c99a 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -46,6 +46,7 @@ DEFINE_GUID(IID_ITextServices, 0x8d33f740, 0xcf58, 0x11ce, 0xa8, 0x9d, 0x00, 0xa DEFINE_GUID(IID_ITextHost, 0x13e670f4,0x1a5a,0x11cf,0xab,0xeb,0x00,0xaa,0x00,0xb6,0x5e,0xa1); DEFINE_GUID(IID_ITextHost2, 0x13e670f5,0x1a5a,0x11cf,0xab,0xeb,0x00,0xaa,0x00,0xb6,0x5e,0xa1); DEFINE_GUID(IID_ITextDocument, 0x8cc497c0, 0xa1df, 0x11ce, 0x80, 0x98, 0x00, 0xaa, 0x00, 0x47, 0xbe, 0x5d); +DEFINE_GUID(IID_ITextDocument2Old, 0x01c25500, 0x4268, 0x11d1, 0x88, 0x3a, 0x3c, 0x8b, 0x00, 0xc1, 0x00, 0x00); DEFINE_GUID(IID_ITextRange, 0x8cc497c2, 0xa1df, 0x11ce, 0x80, 0x98, 0x00, 0xaa, 0x00, 0x47, 0xbe, 0x5d); DEFINE_GUID(IID_ITextSelection, 0x8cc497c1, 0xa1df, 0x11ce, 0x80, 0x98, 0x00, 0xaa, 0x00, 0x47, 0xbe, 0x5d); DEFINE_GUID(IID_ITextFont, 0x8cc497c3, 0xa1df, 0x11ce, 0x80, 0x98, 0x00, 0xaa, 0x00, 0x47, 0xbe, 0x5d); @@ -56,6 +57,7 @@ static ITypeLib *typelib; enum tid_t { NULL_tid, ITextDocument_tid, + ITextDocument2Old_tid, ITextRange_tid, ITextSelection_tid, ITextFont_tid, @@ -67,6 +69,7 @@ static const IID * const tid_ids[] = { &IID_NULL, &IID_ITextDocument, + &IID_ITextDocument2Old, &IID_ITextRange, &IID_ITextSelection, &IID_ITextFont, @@ -209,6 +212,7 @@ typedef struct IRichEditOleImpl { IUnknown IUnknown_inner; IRichEditOle IRichEditOle_iface; ITextDocument ITextDocument_iface; + ITextDocument2Old ITextDocument2Old_iface; IUnknown *outer_unk; LONG ref; @@ -272,6 +276,11 @@ static inline IRichEditOleImpl *impl_from_ITextDocument(ITextDocument *iface) return CONTAINING_RECORD(iface, IRichEditOleImpl, ITextDocument_iface); } +static inline IRichEditOleImpl *impl_from_ITextDocument2Old(ITextDocument2Old *iface) +{ + return CONTAINING_RECORD(iface, IRichEditOleImpl, ITextDocument2Old_iface); +} + static inline IRichEditOleImpl *impl_from_IUnknown(IUnknown *iface) { return CONTAINING_RECORD(iface, IRichEditOleImpl, IUnknown_inner); @@ -945,6 +954,8 @@ static HRESULT WINAPI IRichEditOleImpl_inner_fnQueryInterface(IUnknown *iface, R *ppvObj = &This->IRichEditOle_iface; else if (IsEqualGUID(riid, &IID_ITextDocument)) *ppvObj = &This->ITextDocument_iface; + else if (IsEqualGUID(riid, &IID_ITextDocument2Old)) + *ppvObj = &This->ITextDocument2Old_iface; if (*ppvObj) { IUnknown_AddRef((IUnknown *)*ppvObj); @@ -4178,6 +4189,493 @@ static const ITextDocumentVtbl tdvt = { ITextDocument_fnRangeFromPoint }; +/* ITextDocument2Old */ +static HRESULT WINAPI ITextDocument2Old_fnQueryInterface(ITextDocument2Old *iface, + REFIID riid, void **obj) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); + + return IRichEditOle_QueryInterface(&This->IRichEditOle_iface, riid, obj); +} + +static ULONG WINAPI ITextDocument2Old_fnAddRef(ITextDocument2Old *iface) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); + + return IRichEditOle_AddRef(&This->IRichEditOle_iface); +} + +static ULONG WINAPI ITextDocument2Old_fnRelease(ITextDocument2Old *iface) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); + + return IRichEditOle_Release(&This->IRichEditOle_iface); +} + +static HRESULT WINAPI ITextDocument2Old_fnGetTypeInfoCount(ITextDocument2Old *iface, UINT *info) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); + + TRACE("(%p)->(%p)\n", This, info); + + *info = 1; + return S_OK; +} + +static HRESULT WINAPI ITextDocument2Old_fnGetTypeInfo(ITextDocument2Old *iface, UINT info, LCID lcid, + ITypeInfo **type_info) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); + HRESULT hr; + + TRACE("(%p)->(%u, %d, %p)\n", This, info, lcid, type_info); + + hr = get_typeinfo(ITextDocument2Old_tid, type_info); + if (SUCCEEDED(hr)) + ITypeInfo_AddRef(*type_info); + return hr; +} + +static HRESULT WINAPI ITextDocument2Old_fnGetIDsOfNames(ITextDocument2Old *iface, REFIID riid, LPOLESTR *name, + UINT name_count, LCID lcid, DISPID *dispid) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); + ITypeInfo *ti; + HRESULT hr; + + TRACE("(%p)->(%s, %p, %u, %d, %p)\n", This, debugstr_guid(riid), name, name_count, lcid, dispid); + + hr = get_typeinfo(ITextDocument2Old_tid, &ti); + if (SUCCEEDED(hr)) + hr = ITypeInfo_GetIDsOfNames(ti, name, name_count, dispid); + return hr; +} + +static HRESULT WINAPI ITextDocument2Old_fnInvoke(ITextDocument2Old *iface, DISPID dispid, REFIID riid, + LCID lcid, WORD flags, DISPPARAMS *dispparams, + VARIANT *var_result, EXCEPINFO *excepinfo, + UINT *arg_err) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); + ITypeInfo *ti; + HRESULT hr; + + TRACE("(%p)->(%d, %s, %d, %u, %p, %p, %p, %p)\n", This, dispid, + debugstr_guid(riid), lcid, flags, dispparams, var_result, + excepinfo, arg_err); + + hr = get_typeinfo(ITextDocument2Old_tid, &ti); + if (SUCCEEDED(hr)) + hr = ITypeInfo_Invoke(ti, iface, dispid, flags, dispparams, var_result, excepinfo, arg_err); + return hr; +} + +static HRESULT WINAPI ITextDocument2Old_fnGetName(ITextDocument2Old *iface, BSTR *name) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); + + TRACE("(%p)->(%p)\n", This, name); + + return ITextDocument_GetName(&This->ITextDocument_iface, name); +} + +static HRESULT WINAPI ITextDocument2Old_fnGetSelection(ITextDocument2Old *iface, ITextSelection **selection) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); + + TRACE("(%p)->(%p)\n", This, selection); + + return ITextDocument_GetSelection(&This->ITextDocument_iface, selection); +} + +static HRESULT WINAPI ITextDocument2Old_fnGetStoryCount(ITextDocument2Old *iface, LONG *count) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); + + TRACE("(%p)->(%p)\n", This, count); + + return ITextDocument_GetStoryCount(&This->ITextDocument_iface, count); +} + +static HRESULT WINAPI ITextDocument2Old_fnGetStoryRanges(ITextDocument2Old *iface, ITextStoryRanges **story_ranges) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); + + TRACE("(%p)->(%p)\n", This, story_ranges); + + return ITextDocument_GetStoryRanges(&This->ITextDocument_iface, story_ranges); +} + +static HRESULT WINAPI ITextDocument2Old_fnGetSaved(ITextDocument2Old *iface, LONG *value) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); + + TRACE("(%p)->(%p)\n", This, value); + + return ITextDocument_GetSaved(&This->ITextDocument_iface, value); +} + +static HRESULT WINAPI ITextDocument2Old_fnSetSaved(ITextDocument2Old *iface, LONG value) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); + + TRACE("(%p)->(%d)\n", This, value); + + return ITextDocument_SetSaved(&This->ITextDocument_iface, value); +} + +static HRESULT WINAPI ITextDocument2Old_fnGetDefaultTabStop(ITextDocument2Old *iface, float *value) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); + + TRACE("(%p)->(%p)\n", This, value); + + return ITextDocument_GetDefaultTabStop(&This->ITextDocument_iface, value); +} + +static HRESULT WINAPI ITextDocument2Old_fnSetDefaultTabStop(ITextDocument2Old *iface, float value) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); + + TRACE("(%p)->(%f)\n", This, value); + + return ITextDocument_SetDefaultTabStop(&This->ITextDocument_iface, value); +} + +static HRESULT WINAPI ITextDocument2Old_fnNew(ITextDocument2Old *iface) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); + + TRACE("(%p)\n", This); + + return ITextDocument_New(&This->ITextDocument_iface); +} + +static HRESULT WINAPI ITextDocument2Old_fnOpen(ITextDocument2Old *iface, VARIANT *var, LONG flags, LONG codepage) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); + + TRACE("(%p)->(%p, %d, %d)\n", This, var, flags, codepage); + + return ITextDocument_Open(&This->ITextDocument_iface, var, flags, codepage); +} + +static HRESULT WINAPI ITextDocument2Old_fnSave(ITextDocument2Old *iface, VARIANT *var, LONG flags, LONG codepage) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); + + TRACE("(%p)->(%p, %d, %d)\n", This, var, flags, codepage); + + return ITextDocument_Save(&This->ITextDocument_iface, var, flags, codepage); +} + +static HRESULT WINAPI ITextDocument2Old_fnFreeze(ITextDocument2Old *iface, LONG *count) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); + + TRACE("(%p)->(%p)\n", This, count); + + return ITextDocument_Freeze(&This->ITextDocument_iface, count); +} + +static HRESULT WINAPI ITextDocument2Old_fnUnfreeze(ITextDocument2Old *iface, LONG *count) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); + + TRACE("(%p)->(%p)\n", This, count); + + return ITextDocument_Unfreeze(&This->ITextDocument_iface, count); +} + +static HRESULT WINAPI ITextDocument2Old_fnBeginEditCollection(ITextDocument2Old *iface) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); + + TRACE("(%p)\n", This); + + return ITextDocument_BeginEditCollection(&This->ITextDocument_iface); +} + +static HRESULT WINAPI ITextDocument2Old_fnEndEditCollection(ITextDocument2Old *iface) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); + + TRACE("(%p)\n", This); + + return ITextDocument_EndEditCollection(&This->ITextDocument_iface); +} + +static HRESULT WINAPI ITextDocument2Old_fnUndo(ITextDocument2Old *iface, LONG count, LONG *prop) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); + + TRACE("(%p)->(%d, %p)\n", This, count, prop); + + return ITextDocument_Undo(&This->ITextDocument_iface, count, prop); +} + +static HRESULT WINAPI ITextDocument2Old_fnRedo(ITextDocument2Old *iface, LONG count, LONG *prop) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); + + TRACE("(%p)->(%d, %p)\n", This, count, prop); + + return ITextDocument_Redo(&This->ITextDocument_iface, count, prop); +} + +static HRESULT WINAPI ITextDocument2Old_fnRange(ITextDocument2Old *iface, LONG cp_active, LONG cp_anchor, + ITextRange **range) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); + + TRACE("(%p)->(%d, %d, %p)\n", This, cp_active, cp_anchor, range); + + return ITextDocument_Range(&This->ITextDocument_iface, cp_active, cp_anchor, range); +} + +static HRESULT WINAPI ITextDocument2Old_fnRangeFromPoint(ITextDocument2Old *iface, LONG x, LONG y, + ITextRange **range) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); + + TRACE("(%p)->(%d, %d, %p)\n", This, x, y, range); + + return ITextDocument_RangeFromPoint(&This->ITextDocument_iface, x, y, range); +} + +static HRESULT WINAPI ITextDocument2Old_fnAttachMsgFilter(ITextDocument2Old *iface, IUnknown *filter) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); + + FIXME("(%p)->(%p): stub\n", This, filter); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextDocument2Old_fnSetEffectColor(ITextDocument2Old *iface, LONG index, COLORREF cr) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); + + FIXME("(%p)->(%d, 0x%x): stub\n", This, index, cr); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextDocument2Old_fnGetEffectColor(ITextDocument2Old *iface, LONG index, COLORREF *cr) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); + + FIXME("(%p)->(%d, %p): stub\n", This, index, cr); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextDocument2Old_fnGetCaretType(ITextDocument2Old *iface, LONG *type) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); + + FIXME("(%p)->(%p): stub\n", This, type); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextDocument2Old_fnSetCaretType(ITextDocument2Old *iface, LONG type) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); + + FIXME("(%p)->(%d): stub\n", This, type); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextDocument2Old_fnGetImmContext(ITextDocument2Old *iface, LONG *context) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); + + FIXME("(%p)->(%p): stub\n", This, context); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextDocument2Old_fnReleaseImmContext(ITextDocument2Old *iface, LONG context) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); + + FIXME("(%p)->(%d): stub\n", This, context); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextDocument2Old_fnGetPreferredFont(ITextDocument2Old *iface, LONG cp, LONG charrep, + LONG options, LONG current_charrep, LONG current_fontsize, + BSTR *bstr, LONG *pitch_family, LONG *new_fontsize) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); + + FIXME("(%p)->(%d, %d, %d, %d, %d, %p, %p, %p): stub\n", This, cp, charrep, options, current_charrep, + current_fontsize, bstr, pitch_family, new_fontsize); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextDocument2Old_fnGetNotificationMode(ITextDocument2Old *iface, LONG *mode) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); + + FIXME("(%p)->(%p): stub\n", This, mode); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextDocument2Old_fnSetNotificationMode(ITextDocument2Old *iface, LONG mode) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); + + FIXME("(%p)->(0x%x): stub\n", This, mode); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextDocument2Old_fnGetClientRect(ITextDocument2Old *iface, LONG type, LONG *left, LONG *top, + LONG *right, LONG *bottom) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); + + FIXME("(%p)->(%d, %p, %p, %p, %p): stub\n", This, type, left, top, right, bottom); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextDocument2Old_fnGetSelectionEx(ITextDocument2Old *iface, ITextSelection **selection) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); + + FIXME("(%p)->(%p): stub\n", This, selection); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextDocument2Old_fnGetWindow(ITextDocument2Old *iface, LONG *hwnd) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); + + FIXME("(%p)->(%p): stub\n", This, hwnd); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextDocument2Old_fnGetFEFlags(ITextDocument2Old *iface, LONG *flags) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); + + FIXME("(%p)->(%p): stub\n", This, flags); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextDocument2Old_fnUpdateWindow(ITextDocument2Old *iface) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); + + FIXME("(%p): stub\n", This); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextDocument2Old_fnCheckTextLimit(ITextDocument2Old *iface, LONG cch, LONG *exceed) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); + + FIXME("(%p)->(%d, %p): stub\n", This, cch, exceed); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextDocument2Old_fnIMEInProgress(ITextDocument2Old *iface, LONG mode) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); + + FIXME("(%p)->(0x%x): stub\n", This, mode); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextDocument2Old_fnSysBeep(ITextDocument2Old *iface) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); + + FIXME("(%p): stub\n", This); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextDocument2Old_fnUpdate(ITextDocument2Old *iface, LONG mode) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); + + FIXME("(%p)->(0x%x): stub\n", This, mode); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextDocument2Old_fnNotify(ITextDocument2Old *iface, LONG notify) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); + + FIXME("(%p)->(%d): stub\n", This, notify); + + return E_NOTIMPL; +} + +static const ITextDocument2OldVtbl td2oldvt = { + ITextDocument2Old_fnQueryInterface, + ITextDocument2Old_fnAddRef, + ITextDocument2Old_fnRelease, + ITextDocument2Old_fnGetTypeInfoCount, + ITextDocument2Old_fnGetTypeInfo, + ITextDocument2Old_fnGetIDsOfNames, + ITextDocument2Old_fnInvoke, + ITextDocument2Old_fnGetName, + ITextDocument2Old_fnGetSelection, + ITextDocument2Old_fnGetStoryCount, + ITextDocument2Old_fnGetStoryRanges, + ITextDocument2Old_fnGetSaved, + ITextDocument2Old_fnSetSaved, + ITextDocument2Old_fnGetDefaultTabStop, + ITextDocument2Old_fnSetDefaultTabStop, + ITextDocument2Old_fnNew, + ITextDocument2Old_fnOpen, + ITextDocument2Old_fnSave, + ITextDocument2Old_fnFreeze, + ITextDocument2Old_fnUnfreeze, + ITextDocument2Old_fnBeginEditCollection, + ITextDocument2Old_fnEndEditCollection, + ITextDocument2Old_fnUndo, + ITextDocument2Old_fnRedo, + ITextDocument2Old_fnRange, + ITextDocument2Old_fnRangeFromPoint, + ITextDocument2Old_fnAttachMsgFilter, + ITextDocument2Old_fnSetEffectColor, + ITextDocument2Old_fnGetEffectColor, + ITextDocument2Old_fnGetCaretType, + ITextDocument2Old_fnSetCaretType, + ITextDocument2Old_fnGetImmContext, + ITextDocument2Old_fnReleaseImmContext, + ITextDocument2Old_fnGetPreferredFont, + ITextDocument2Old_fnGetNotificationMode, + ITextDocument2Old_fnSetNotificationMode, + ITextDocument2Old_fnGetClientRect, + ITextDocument2Old_fnGetSelectionEx, + ITextDocument2Old_fnGetWindow, + ITextDocument2Old_fnGetFEFlags, + ITextDocument2Old_fnUpdateWindow, + ITextDocument2Old_fnCheckTextLimit, + ITextDocument2Old_fnIMEInProgress, + ITextDocument2Old_fnSysBeep, + ITextDocument2Old_fnUpdate, + ITextDocument2Old_fnNotify +}; + /* ITextSelection */ static HRESULT WINAPI ITextSelection_fnQueryInterface( ITextSelection *me, @@ -5277,6 +5775,7 @@ LRESULT CreateIRichEditOle(IUnknown *outer_unk, ME_TextEditor *editor, LPVOID *p reo->IUnknown_inner.lpVtbl = &reo_unk_vtbl; reo->IRichEditOle_iface.lpVtbl = &revt; reo->ITextDocument_iface.lpVtbl = &tdvt; + reo->ITextDocument2Old_iface.lpVtbl = &td2oldvt; reo->ref = 1; reo->editor = editor; reo->txtSel = NULL; diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index aaf52bcfdd..bacf68c095 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -117,6 +117,7 @@ static void test_Interfaces(void) { IRichEditOle *reOle = NULL, *reOle1 = NULL; ITextDocument *txtDoc = NULL; + ITextDocument2Old *txtDoc2Old = NULL; ITextSelection *txtSel = NULL, *txtSel2; IUnknown *punk; HRESULT hres; @@ -195,6 +196,13 @@ static void test_Interfaces(void) hres = IRichEditOle_QueryInterface(reOle, &IID_IOleInPlaceSite, (void **) &punk); ok(hres == E_NOINTERFACE, "IRichEditOle_QueryInterface\n"); + hres = IRichEditOle_QueryInterface(reOle, &IID_ITextDocument2Old, (void **)&txtDoc2Old); + ok(hres == S_OK, "IRichEditOle_QueryInterface\n"); + ok(txtDoc2Old != NULL, "IRichEditOle_QueryInterface\n"); + EXPECT_REF(txtDoc2Old, 5); + EXPECT_REF(reOle, 5); + ITextDocument2Old_Release(txtDoc2Old); + ITextDocument_Release(txtDoc); IRichEditOle_Release(reOle); refcount = IRichEditOle_Release(reOle); -- 2.18.0

1 0

[PATCH v2 1/4] include: Add ITextDocument2Old and ITextDocument2 interface.
by Jactry Zeng 11 Sep '18

11 Sep '18

ITextDocument2Old was known as ITextDocument2 before win8. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- include/tom.idl | 91 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 91 insertions(+) diff --git a/include/tom.idl b/include/tom.idl index 357b0457a5..afc24ca5fb 100644 --- a/include/tom.idl +++ b/include/tom.idl @@ -237,6 +237,97 @@ interface ITextDocument : IDispatch HRESULT RangeFromPoint([in]LONG x, [in]LONG y, [retval, out]ITextRange **ppRange); } +[ + object, + uuid(01C25500-4268-11D1-883A-3C8B00C10000) +] +interface ITextDocument2Old : ITextDocument +{ + HRESULT AttachMsgFilter([in]IUnknown *filter); + HRESULT SetEffectColor([in]LONG index, [in]COLORREF cr); + HRESULT GetEffectColor([in]LONG index, [out]COLORREF *cr); + HRESULT GetCaretType([retval, out]LONG *type); + HRESULT SetCaretType([in]LONG type); + HRESULT GetImmContext([retval, out]LONG *context); + HRESULT ReleaseImmContext([in]LONG context); + HRESULT GetPreferredFont([in]LONG cp, [in]LONG codepage, [in]LONG option, [in]LONG current_codepage, [in]LONG current_fontsize, + [out]BSTR *bstr, [out]LONG *pitch_family, [out]LONG *new_fontsize); + HRESULT GetNotificationMode([retval, out]LONG *mode); + HRESULT SetNotificationMode([in]LONG mode); + HRESULT GetClientRect([in]LONG type, [out]LONG *left, [out]LONG *top, [out]LONG *right, [out]LONG *bottom); + HRESULT GetSelectionEx([retval, out]ITextSelection **selection); + HRESULT GetWindow([out]LONG *hwnd); + HRESULT GetFEFlags([out]LONG *flags); + HRESULT UpdateWindow(); + HRESULT CheckTextLimit([in]LONG cch, [out]LONG *exceed); + HRESULT IMEInProgress([in]LONG mode); + HRESULT SysBeep(); + HRESULT Update([in]LONG mode); + HRESULT Notify([in]LONG notify); +} + +interface ITextDisplays; +interface ITextFont2; +interface ITextPara2; +interface ITextRange2; +interface ITextSelection2; +interface ITextStory; +interface ITextStoryRanges2; +interface ITextStrings; + +[ + object, + uuid(c241f5e0-7206-11d8-a2c7-00a0d1d6c6b3) +] +interface ITextDocument2 : ITextDocument +{ + HRESULT GetCaretType([retval, out]LONG *value); + HRESULT SetCaretType([in]LONG value); + HRESULT GetDisplays([retval, out]ITextDisplays **displays); + HRESULT GetDocumentFont([retval, out]ITextFont2 **font); + HRESULT SetDocumentFont([in]ITextFont2 *font); + HRESULT GetDocumentPara([retval, out]ITextPara2 **para); + HRESULT SetDocumentPara([in]ITextPara2 *para); + HRESULT GetEastAsianFlags([retval, out]LONG *flags); + HRESULT GetGenerator([retval, out]BSTR *bstr); + HRESULT SetIMEInProgress([in]LONG value); + HRESULT GetNotificationMode([retval, out]LONG *mode); + HRESULT SetNotificationMode([in]LONG mode); + HRESULT GetSelection2([retval, out]ITextSelection2 **selection); + HRESULT GetStoryRanges2([retval, out]ITextStoryRanges2 **stories); + HRESULT GetTypographyOptions([retval, out]LONG *options); + HRESULT GetVersion([retval, out]LONG *value); + HRESULT GetWindow([retval, out]LONG *hwnd); + HRESULT AttachMsgFilter([in]IUnknown *filter); + HRESULT CheckTextLimit([in]LONG cch, [out]LONG *exceed); + HRESULT GetCallManager([retval, out]IUnknown **manager); + HRESULT GetClientRect([in]LONG type, [out]LONG *left, [out]LONG *top, [out]LONG *right, [out]LONG *bottom); + HRESULT GetEffectColor([in]LONG index, [out]COLORREF *cr); + HRESULT GetImmContext([retval, out]LONG *context); + HRESULT GetPreferredFont([in]LONG cp, [in]LONG codepage, [in]LONG option, [in]LONG current_codepage, [in]LONG current_fontsize, + [out]BSTR *bstr, [out]LONG *pitch_family, [out]LONG *new_fontsize); + HRESULT GetProperty([in]LONG type, [out]LONG *value); + HRESULT GetStrings([out]ITextStrings **strings); + HRESULT Notify([in]LONG notify); + HRESULT Range2([in]LONG cp_active, [in]LONG cp_anchor, [retval, out]ITextRange2 **range); + HRESULT RangeFromPoint2([in]LONG x, [in]LONG y, [in]LONG type, [retval, out]ITextRange2 **range); + HRESULT ReleaseCallManager([in]IUnknown *manager); + HRESULT ReleaseImmContext([in]LONG context); + HRESULT SetEffectColor([in]LONG index, [in]LONG value); + HRESULT SetProperty([in]LONG type, [in]LONG value); + HRESULT SetTypographyOptions([in]LONG options, [in]LONG mask); + HRESULT SysBeep(); + HRESULT Update([in]LONG value); + HRESULT UpdateWindow(); + HRESULT GetMathProperties([out]LONG *options); + HRESULT SetMathProperties([in]LONG options, [in]LONG mask); + HRESULT GetActiveStory([retval, out]ITextStory **story); + HRESULT SetActiveStory([in]ITextStory *story); + HRESULT GetMainStory([retval, out]ITextStory **story); + HRESULT GetNewStory([retval, out]ITextStory **story); + HRESULT GetStory([in]LONG index, [retval, out]ITextStory **story); +} + interface ITextFont; interface ITextPara; -- 2.18.0

1 0

[v2 PATCH] d2d1: Return device context pointer for render targets.
by Nikolay Sivov 11 Sep '18

11 Sep '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v2: call back on EndDraw/Flush. dlls/d2d1/bitmap_render_target.c | 7 +++++- dlls/d2d1/d2d1_private.h | 13 +++++++++-- dlls/d2d1/dc_render_target.c | 34 ++++++++++++++-------------- dlls/d2d1/device.c | 38 ++++++++++++++++++++++---------- dlls/d2d1/hwnd_render_target.c | 21 ++++++++++-------- dlls/d2d1/wic_render_target.c | 37 ++++++++++++++++--------------- 6 files changed, 91 insertions(+), 59 deletions(-) diff --git a/dlls/d2d1/bitmap_render_target.c b/dlls/d2d1/bitmap_render_target.c index c106e211d6..5ae155d430 100644 --- a/dlls/d2d1/bitmap_render_target.c +++ b/dlls/d2d1/bitmap_render_target.c @@ -733,6 +733,7 @@ HRESULT d2d_bitmap_render_target_init(struct d2d_bitmap_render_target *render_ta D2D1_COMPATIBLE_RENDER_TARGET_OPTIONS options) { D2D1_RENDER_TARGET_PROPERTIES dxgi_rt_desc; + struct outer_target_desc outer_desc; D2D1_BITMAP_PROPERTIES bitmap_desc; D3D10_TEXTURE2D_DESC texture_desc; IDXGISurface *dxgi_surface; @@ -810,8 +811,12 @@ HRESULT d2d_bitmap_render_target_init(struct d2d_bitmap_render_target *render_ta return hr; } + outer_desc.outer_unknown = (IUnknown *)&render_target->ID2D1BitmapRenderTarget_iface; + outer_desc.data = NULL; + outer_desc.present = NULL; + if (FAILED(hr = d2d_d3d_create_render_target(parent_target->factory, dxgi_surface, - (IUnknown *)&render_target->ID2D1BitmapRenderTarget_iface, &dxgi_rt_desc, &render_target->dxgi_target))) + &outer_desc, &dxgi_rt_desc, &render_target->dxgi_target))) { WARN("Failed to create DXGI surface render target, hr %#x.\n", hr); IDXGISurface_Release(dxgi_surface); diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index e00b942797..49d1475ed4 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -117,6 +117,15 @@ struct d2d_ps_cb struct d2d_brush_cb opacity_brush; }; +typedef HRESULT (*outer_target_present_func)(const void *data); + +struct outer_target_desc +{ + IUnknown *outer_unknown; + const void *data; + outer_target_present_func present; +}; + struct d2d_device_context { ID2D1DeviceContext ID2D1DeviceContext_iface; @@ -124,7 +133,7 @@ struct d2d_device_context IDWriteTextRenderer IDWriteTextRenderer_iface; LONG refcount; - IUnknown *outer_unknown; + struct outer_target_desc outer_target; ID2D1Factory *factory; ID3D10Device *device; @@ -148,7 +157,7 @@ struct d2d_device_context struct d2d_clip_stack clip_stack; }; -HRESULT d2d_d3d_create_render_target(ID2D1Factory *factory, IDXGISurface *surface, IUnknown *outer_unknown, +HRESULT d2d_d3d_create_render_target(ID2D1Factory *factory, IDXGISurface *surface, const struct outer_target_desc *outer, const D2D1_RENDER_TARGET_PROPERTIES *desc, ID2D1RenderTarget **render_target) DECLSPEC_HIDDEN; HRESULT d2d_d3d_render_target_create_rtv(ID2D1RenderTarget *render_target, IDXGISurface1 *surface) DECLSPEC_HIDDEN; diff --git a/dlls/d2d1/dc_render_target.c b/dlls/d2d1/dc_render_target.c index d5e4f47e6d..f5276bfbb4 100644 --- a/dlls/d2d1/dc_render_target.c +++ b/dlls/d2d1/dc_render_target.c @@ -24,17 +24,20 @@ WINE_DEFAULT_DEBUG_CHANNEL(d2d); -static void sync_bitmap(struct d2d_dc_render_target *render_target) +static HRESULT sync_bitmap(struct d2d_dc_render_target *render_target) { const RECT *dst_rect = &render_target->dst_rect; RECT empty_rect; HDC src_hdc; HRESULT hr; + if (!render_target->hdc) + return D2DERR_WRONG_STATE; + if (FAILED(hr = IDXGISurface1_GetDC(render_target->dxgi_surface, FALSE, &src_hdc))) { WARN("GetDC() failed, %#x.\n", hr); - return; + return S_OK; } BitBlt(render_target->hdc, dst_rect->left, dst_rect->top, dst_rect->right - dst_rect->left, @@ -42,6 +45,8 @@ static void sync_bitmap(struct d2d_dc_render_target *render_target) SetRectEmpty(&empty_rect); IDXGISurface1_ReleaseDC(render_target->dxgi_surface, &empty_rect); + + return S_OK; } static inline struct d2d_dc_render_target *impl_from_ID2D1DCRenderTarget(ID2D1DCRenderTarget *iface) @@ -64,7 +69,8 @@ static HRESULT STDMETHODCALLTYPE d2d_dc_render_target_QueryInterface(ID2D1DCRend *out = iface; return S_OK; } - else if (IsEqualGUID(iid, &IID_ID2D1GdiInteropRenderTarget)) + else if (IsEqualGUID(iid, &IID_ID2D1GdiInteropRenderTarget) + || IsEqualGUID(iid, &IID_ID2D1DeviceContext)) return ID2D1RenderTarget_QueryInterface(render_target->dxgi_target, iid, out); WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); @@ -524,14 +530,10 @@ static void STDMETHODCALLTYPE d2d_dc_render_target_PopLayer(ID2D1DCRenderTarget static HRESULT STDMETHODCALLTYPE d2d_dc_render_target_Flush(ID2D1DCRenderTarget *iface, D2D1_TAG *tag1, D2D1_TAG *tag2) { struct d2d_dc_render_target *render_target = impl_from_ID2D1DCRenderTarget(iface); - HRESULT hr; TRACE("iface %p, tag1 %p, tag2 %p.\n", iface, tag1, tag2); - hr = ID2D1RenderTarget_Flush(render_target->dxgi_target, tag1, tag2); - sync_bitmap(render_target); - - return hr; + return ID2D1RenderTarget_Flush(render_target->dxgi_target, tag1, tag2); } static void STDMETHODCALLTYPE d2d_dc_render_target_SaveDrawingState(ID2D1DCRenderTarget *iface, @@ -595,17 +597,10 @@ static HRESULT STDMETHODCALLTYPE d2d_dc_render_target_EndDraw(ID2D1DCRenderTarge D2D1_TAG *tag1, D2D1_TAG *tag2) { struct d2d_dc_render_target *render_target = impl_from_ID2D1DCRenderTarget(iface); - HRESULT hr; TRACE("iface %p, tag1 %p, tag2 %p.\n", iface, tag1, tag2); - if (!render_target->hdc) - return D2DERR_WRONG_STATE; - - hr = ID2D1RenderTarget_EndDraw(render_target->dxgi_target, tag1, tag2); - sync_bitmap(render_target); - - return hr; + return ID2D1RenderTarget_EndDraw(render_target->dxgi_target, tag1, tag2); } static D2D1_PIXEL_FORMAT * STDMETHODCALLTYPE d2d_dc_render_target_GetPixelFormat(ID2D1DCRenderTarget *iface, @@ -816,6 +811,7 @@ static const struct ID2D1DCRenderTargetVtbl d2d_dc_render_target_vtbl = HRESULT d2d_dc_render_target_init(struct d2d_dc_render_target *render_target, ID2D1Factory *factory, ID3D10Device1 *device, const D2D1_RENDER_TARGET_PROPERTIES *desc) { + struct outer_target_desc outer_desc; D3D10_TEXTURE2D_DESC texture_desc; ID3D10Texture2D *texture; HRESULT hr; @@ -867,8 +863,12 @@ HRESULT d2d_dc_render_target_init(struct d2d_dc_render_target *render_target, ID return hr; } + outer_desc.outer_unknown = (IUnknown *)&render_target->ID2D1DCRenderTarget_iface; + outer_desc.data = render_target; + outer_desc.present = (outer_target_present_func)sync_bitmap; + if (FAILED(hr = d2d_d3d_create_render_target(factory, (IDXGISurface *)render_target->dxgi_surface, - (IUnknown *)&render_target->ID2D1DCRenderTarget_iface, desc, &render_target->dxgi_target))) + &outer_desc, desc, &render_target->dxgi_target))) { WARN("Failed to create DXGI surface render target, hr %#x.\n", hr); IDXGISurface1_Release(render_target->dxgi_surface); diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index bba4870dd4..3980e35280 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -1448,8 +1448,13 @@ static void STDMETHODCALLTYPE d2d_device_context_PopLayer(ID2D1DeviceContext *if static HRESULT STDMETHODCALLTYPE d2d_device_context_Flush(ID2D1DeviceContext *iface, D2D1_TAG *tag1, D2D1_TAG *tag2) { + struct d2d_device_context *context = impl_from_ID2D1DeviceContext(iface); + FIXME("iface %p, tag1 %p, tag2 %p stub!\n", iface, tag1, tag2); + if (context->outer_target.present) + context->outer_target.present(context->outer_target.data); + return E_NOTIMPL; } @@ -1615,16 +1620,23 @@ static void STDMETHODCALLTYPE d2d_device_context_BeginDraw(ID2D1DeviceContext *i static HRESULT STDMETHODCALLTYPE d2d_device_context_EndDraw(ID2D1DeviceContext *iface, D2D1_TAG *tag1, D2D1_TAG *tag2) { - struct d2d_device_context *render_target = impl_from_ID2D1DeviceContext(iface); + struct d2d_device_context *context = impl_from_ID2D1DeviceContext(iface); + HRESULT hr; TRACE("iface %p, tag1 %p, tag2 %p.\n", iface, tag1, tag2); if (tag1) - *tag1 = render_target->error.tag1; + *tag1 = context->error.tag1; if (tag2) - *tag2 = render_target->error.tag2; + *tag2 = context->error.tag2; - return render_target->error.code; + if (context->outer_target.present) + { + if (FAILED(hr = context->outer_target.present(context->outer_target.data))) + context->error.code = hr; + } + + return context->error.code; } static D2D1_PIXEL_FORMAT * STDMETHODCALLTYPE d2d_device_context_GetPixelFormat(ID2D1DeviceContext *iface, @@ -2381,7 +2393,7 @@ static HRESULT STDMETHODCALLTYPE d2d_gdi_interop_render_target_QueryInterface(ID TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); - return IUnknown_QueryInterface(render_target->outer_unknown, iid, out); + return IUnknown_QueryInterface(render_target->outer_target.outer_unknown, iid, out); } static ULONG STDMETHODCALLTYPE d2d_gdi_interop_render_target_AddRef(ID2D1GdiInteropRenderTarget *iface) @@ -2390,7 +2402,7 @@ static ULONG STDMETHODCALLTYPE d2d_gdi_interop_render_target_AddRef(ID2D1GdiInte TRACE("iface %p.\n", iface); - return IUnknown_AddRef(render_target->outer_unknown); + return IUnknown_AddRef(render_target->outer_target.outer_unknown); } static ULONG STDMETHODCALLTYPE d2d_gdi_interop_render_target_Release(ID2D1GdiInteropRenderTarget *iface) @@ -2399,7 +2411,7 @@ static ULONG STDMETHODCALLTYPE d2d_gdi_interop_render_target_Release(ID2D1GdiInt TRACE("iface %p.\n", iface); - return IUnknown_Release(render_target->outer_unknown); + return IUnknown_Release(render_target->outer_target.outer_unknown); } static HRESULT d2d_device_context_get_surface(struct d2d_device_context *render_target, IDXGISurface1 **surface) @@ -2469,7 +2481,7 @@ static const struct ID2D1GdiInteropRenderTargetVtbl d2d_gdi_interop_render_targe }; static HRESULT d2d_device_context_init(struct d2d_device_context *render_target, ID2D1Factory *factory, - IDXGISurface *surface, IUnknown *outer_unknown, const D2D1_RENDER_TARGET_PROPERTIES *desc) + IDXGISurface *surface, const struct outer_target_desc *outer, const D2D1_RENDER_TARGET_PROPERTIES *desc) { D3D10_SUBRESOURCE_DATA buffer_data; D3D10_STATE_BLOCK_MASK state_mask; @@ -3355,8 +3367,10 @@ static HRESULT d2d_device_context_init(struct d2d_device_context *render_target, render_target->factory = factory; ID2D1Factory_AddRef(render_target->factory); - render_target->outer_unknown = outer_unknown ? outer_unknown : - (IUnknown *)&render_target->ID2D1DeviceContext_iface; + if (outer) + render_target->outer_target = *outer; + else + render_target->outer_target.outer_unknown = (IUnknown *)&render_target->ID2D1DeviceContext_iface; if (FAILED(hr = IDXGISurface_GetDevice(surface, &IID_ID3D10Device, (void **)&render_target->device))) { @@ -3554,7 +3568,7 @@ err: return hr; } -HRESULT d2d_d3d_create_render_target(ID2D1Factory *factory, IDXGISurface *surface, IUnknown *outer_unknown, +HRESULT d2d_d3d_create_render_target(ID2D1Factory *factory, IDXGISurface *surface, const struct outer_target_desc *outer, const D2D1_RENDER_TARGET_PROPERTIES *desc, ID2D1RenderTarget **render_target) { struct d2d_device_context *object; @@ -3563,7 +3577,7 @@ HRESULT d2d_d3d_create_render_target(ID2D1Factory *factory, IDXGISurface *surfac if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; - if (FAILED(hr = d2d_device_context_init(object, factory, surface, outer_unknown, desc))) + if (FAILED(hr = d2d_device_context_init(object, factory, surface, outer, desc))) { WARN("Failed to initialize render target, hr %#x.\n", hr); heap_free(object); diff --git a/dlls/d2d1/hwnd_render_target.c b/dlls/d2d1/hwnd_render_target.c index 04d33536a6..112e6a98a2 100644 --- a/dlls/d2d1/hwnd_render_target.c +++ b/dlls/d2d1/hwnd_render_target.c @@ -24,12 +24,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(d2d); -static void render_target_present(struct d2d_hwnd_render_target *render_target) +static HRESULT render_target_present(struct d2d_hwnd_render_target *render_target) { HRESULT hr; if (FAILED(hr = IDXGISwapChain_Present(render_target->swapchain, render_target->sync_interval, 0))) WARN("Present failed, %#x.\n", hr); + + return S_OK; } static inline struct d2d_hwnd_render_target *impl_from_ID2D1HwndRenderTarget(ID2D1HwndRenderTarget *iface) @@ -53,7 +55,8 @@ static HRESULT STDMETHODCALLTYPE d2d_hwnd_render_target_QueryInterface(ID2D1Hwnd *out = iface; return S_OK; } - else if (IsEqualGUID(iid, &IID_ID2D1GdiInteropRenderTarget)) + else if (IsEqualGUID(iid, &IID_ID2D1GdiInteropRenderTarget) + || IsEqualGUID(iid, &IID_ID2D1DeviceContext)) return ID2D1RenderTarget_QueryInterface(render_target->dxgi_target, iid, out); WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); @@ -516,14 +519,10 @@ static HRESULT STDMETHODCALLTYPE d2d_hwnd_render_target_Flush(ID2D1HwndRenderTar D2D1_TAG *tag2) { struct d2d_hwnd_render_target *render_target = impl_from_ID2D1HwndRenderTarget(iface); - HRESULT hr; TRACE("iface %p, tag1 %p, tag2 %p.\n", iface, tag1, tag2); - hr = ID2D1RenderTarget_Flush(render_target->dxgi_target, tag1, tag2); - render_target_present(render_target); - - return hr; + return ID2D1RenderTarget_Flush(render_target->dxgi_target, tag1, tag2); } static void STDMETHODCALLTYPE d2d_hwnd_render_target_SaveDrawingState(ID2D1HwndRenderTarget *iface, @@ -782,6 +781,7 @@ HRESULT d2d_hwnd_render_target_init(struct d2d_hwnd_render_target *render_target { D2D1_RENDER_TARGET_PROPERTIES dxgi_rt_desc; DXGI_SWAP_CHAIN_DESC swapchain_desc; + struct outer_target_desc outer_desc; IDXGIAdapter *dxgi_adapter; IDXGIFactory *dxgi_factory; IDXGISurface *dxgi_surface; @@ -860,9 +860,12 @@ HRESULT d2d_hwnd_render_target_init(struct d2d_hwnd_render_target *render_target return hr; } + outer_desc.outer_unknown = (IUnknown *)&render_target->ID2D1HwndRenderTarget_iface; + outer_desc.data = render_target; + outer_desc.present = (outer_target_present_func)render_target_present; + render_target->ID2D1HwndRenderTarget_iface.lpVtbl = &d2d_hwnd_render_target_vtbl; - hr = d2d_d3d_create_render_target(factory, dxgi_surface, (IUnknown *)&render_target->ID2D1HwndRenderTarget_iface, - &dxgi_rt_desc, &render_target->dxgi_target); + hr = d2d_d3d_create_render_target(factory, dxgi_surface, &outer_desc, &dxgi_rt_desc, &render_target->dxgi_target); IDXGISurface_Release(dxgi_surface); if (FAILED(hr)) { diff --git a/dlls/d2d1/wic_render_target.c b/dlls/d2d1/wic_render_target.c index 5642fd44ff..ede9d811d7 100644 --- a/dlls/d2d1/wic_render_target.c +++ b/dlls/d2d1/wic_render_target.c @@ -25,7 +25,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d2d); -static void sync_bitmap(struct d2d_wic_render_target *render_target) +static HRESULT sync_bitmap(struct d2d_wic_render_target *render_target) { D3D10_MAPPED_TEXTURE2D mapped_texture; ID3D10Resource *src_resource; @@ -41,7 +41,7 @@ static void sync_bitmap(struct d2d_wic_render_target *render_target) &IID_ID3D10Resource, (void **)&src_resource))) { ERR("Failed to get source resource interface, hr %#x.\n", hr); - return; + goto end; } ID3D10Texture2D_GetDevice(render_target->readback_texture, &device); @@ -56,28 +56,28 @@ static void sync_bitmap(struct d2d_wic_render_target *render_target) if (FAILED(hr = IWICBitmap_Lock(render_target->bitmap, &dst_rect, WICBitmapLockWrite, &bitmap_lock))) { ERR("Failed to lock destination bitmap, hr %#x.\n", hr); - return; + goto end; } if (FAILED(hr = IWICBitmapLock_GetDataPointer(bitmap_lock, &dst_size, &dst))) { ERR("Failed to get data pointer, hr %#x.\n", hr); IWICBitmapLock_Release(bitmap_lock); - return; + goto end; } if (FAILED(hr = IWICBitmapLock_GetStride(bitmap_lock, &dst_pitch))) { ERR("Failed to get stride, hr %#x.\n", hr); IWICBitmapLock_Release(bitmap_lock); - return; + goto end; } if (FAILED(hr = ID3D10Texture2D_Map(render_target->readback_texture, 0, D3D10_MAP_READ, 0, &mapped_texture))) { ERR("Failed to map readback texture, hr %#x.\n", hr); IWICBitmapLock_Release(bitmap_lock); - return; + goto end; } src = mapped_texture.pData; @@ -91,6 +91,9 @@ static void sync_bitmap(struct d2d_wic_render_target *render_target) ID3D10Texture2D_Unmap(render_target->readback_texture, 0); IWICBitmapLock_Release(bitmap_lock); + +end: + return S_OK; } static inline struct d2d_wic_render_target *impl_from_ID2D1RenderTarget(ID2D1RenderTarget *iface) @@ -112,7 +115,8 @@ static HRESULT STDMETHODCALLTYPE d2d_wic_render_target_QueryInterface(ID2D1Rende *out = iface; return S_OK; } - else if (IsEqualGUID(iid, &IID_ID2D1GdiInteropRenderTarget)) + else if (IsEqualGUID(iid, &IID_ID2D1GdiInteropRenderTarget) + || IsEqualGUID(iid, &IID_ID2D1DeviceContext)) return ID2D1RenderTarget_QueryInterface(render_target->dxgi_target, iid, out); WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); @@ -574,14 +578,10 @@ static void STDMETHODCALLTYPE d2d_wic_render_target_PopLayer(ID2D1RenderTarget * static HRESULT STDMETHODCALLTYPE d2d_wic_render_target_Flush(ID2D1RenderTarget *iface, D2D1_TAG *tag1, D2D1_TAG *tag2) { struct d2d_wic_render_target *render_target = impl_from_ID2D1RenderTarget(iface); - HRESULT hr; TRACE("iface %p, tag1 %p, tag2 %p.\n", iface, tag1, tag2); - hr = ID2D1RenderTarget_Flush(render_target->dxgi_target, tag1, tag2); - sync_bitmap(render_target); - - return hr; + return ID2D1RenderTarget_Flush(render_target->dxgi_target, tag1, tag2); } static void STDMETHODCALLTYPE d2d_wic_render_target_SaveDrawingState(ID2D1RenderTarget *iface, @@ -645,14 +645,10 @@ static HRESULT STDMETHODCALLTYPE d2d_wic_render_target_EndDraw(ID2D1RenderTarget D2D1_TAG *tag1, D2D1_TAG *tag2) { struct d2d_wic_render_target *render_target = impl_from_ID2D1RenderTarget(iface); - HRESULT hr; TRACE("iface %p, tag1 %p, tag2 %p.\n", iface, tag1, tag2); - hr = ID2D1RenderTarget_EndDraw(render_target->dxgi_target, tag1, tag2); - sync_bitmap(render_target); - - return hr; + return ID2D1RenderTarget_EndDraw(render_target->dxgi_target, tag1, tag2); } static D2D1_PIXEL_FORMAT * STDMETHODCALLTYPE d2d_wic_render_target_GetPixelFormat(ID2D1RenderTarget *iface, @@ -788,6 +784,7 @@ static const struct ID2D1RenderTargetVtbl d2d_wic_render_target_vtbl = HRESULT d2d_wic_render_target_init(struct d2d_wic_render_target *render_target, ID2D1Factory *factory, ID3D10Device1 *device, IWICBitmap *bitmap, const D2D1_RENDER_TARGET_PROPERTIES *desc) { + struct outer_target_desc outer_desc; D3D10_TEXTURE2D_DESC texture_desc; ID3D10Texture2D *texture; HRESULT hr; @@ -874,8 +871,12 @@ HRESULT d2d_wic_render_target_init(struct d2d_wic_render_target *render_target, return hr; } + outer_desc.outer_unknown = (IUnknown *)&render_target->ID2D1RenderTarget_iface; + outer_desc.data = render_target; + outer_desc.present = (outer_target_present_func)sync_bitmap; + if (FAILED(hr = d2d_d3d_create_render_target(factory, render_target->dxgi_surface, - (IUnknown *)&render_target->ID2D1RenderTarget_iface, desc, &render_target->dxgi_target))) + &outer_desc, desc, &render_target->dxgi_target))) { WARN("Failed to create DXGI surface render target, hr %#x.\n", hr); ID3D10Texture2D_Release(render_target->readback_texture); -- 2.18.0

2 1

[PATCH 1/4] ddraw/tests: Rewrite FindDevice().
by Henri Verbeet 11 Sep '18

11 Sep '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/ddraw/tests/d3d.c | 138 ---------------------------------------------- dlls/ddraw/tests/ddraw1.c | 106 +++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 106 +++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 104 ++++++++++++++++++++++++++++++++++ 4 files changed, 316 insertions(+), 138 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index ec0f8d715ca..64f68fde560 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -1612,143 +1612,6 @@ static void VertexBufferLockRest(void) IDirect3DVertexBuffer7_Release(buffer); } -static void FindDevice(void) -{ - static const struct - { - const GUID *guid; - BOOL todo; - } deviceGUIDs[] = - { - {&IID_IDirect3DRampDevice, TRUE}, - {&IID_IDirect3DRGBDevice, FALSE}, - }; - - static const GUID *nonexistent_deviceGUIDs[] = {&IID_IDirect3DMMXDevice, - &IID_IDirect3DRefDevice, - &IID_IDirect3DTnLHalDevice, - &IID_IDirect3DNullDevice}; - - D3DFINDDEVICESEARCH search = {0}; - D3DFINDDEVICERESULT result = {0}; - IDirect3DDevice *d3dhal; - HRESULT hr; - int i; - - /* Test invalid parameters. */ - hr = IDirect3D_FindDevice(Direct3D1, NULL, NULL); - ok(hr == DDERR_INVALIDPARAMS, - "Expected IDirect3D1::FindDevice to return DDERR_INVALIDPARAMS, got 0x%08x\n", hr); - - hr = IDirect3D_FindDevice(Direct3D1, NULL, &result); - ok(hr == DDERR_INVALIDPARAMS, - "Expected IDirect3D1::FindDevice to return DDERR_INVALIDPARAMS, got 0x%08x\n", hr); - - hr = IDirect3D_FindDevice(Direct3D1, &search, NULL); - ok(hr == DDERR_INVALIDPARAMS, - "Expected IDirect3D1::FindDevice to return DDERR_INVALIDPARAMS, got 0x%08x\n", hr); - - search.dwSize = 0; - result.dwSize = 0; - - hr = IDirect3D_FindDevice(Direct3D1, &search, &result); - ok(hr == DDERR_INVALIDPARAMS, - "Expected IDirect3D1::FindDevice to return DDERR_INVALIDPARAMS, got 0x%08x\n", hr); - - search.dwSize = sizeof(search) + 1; - result.dwSize = sizeof(result) + 1; - - hr = IDirect3D_FindDevice(Direct3D1, &search, &result); - ok(hr == DDERR_INVALIDPARAMS, - "Expected IDirect3D1::FindDevice to return DDERR_INVALIDPARAMS, got 0x%08x\n", hr); - - /* Specifying no flags is permitted. */ - search.dwSize = sizeof(search); - search.dwFlags = 0; - result.dwSize = sizeof(result); - - hr = IDirect3D_FindDevice(Direct3D1, &search, &result); - ok(hr == D3D_OK, - "Expected IDirect3D1::FindDevice to return D3D_OK, got 0x%08x\n", hr); - - /* Try an arbitrary non-device GUID. */ - search.dwSize = sizeof(search); - search.dwFlags = D3DFDS_GUID; - search.guid = IID_IDirect3D; - result.dwSize = sizeof(result); - - hr = IDirect3D_FindDevice(Direct3D1, &search, &result); - ok(hr == DDERR_NOTFOUND, - "Expected IDirect3D1::FindDevice to return DDERR_NOTFOUND, got 0x%08x\n", hr); - - /* These GUIDs appear to be never present. */ - for (i = 0; i < sizeof(nonexistent_deviceGUIDs)/sizeof(nonexistent_deviceGUIDs[0]); i++) - { - search.dwSize = sizeof(search); - search.dwFlags = D3DFDS_GUID; - search.guid = *nonexistent_deviceGUIDs[i]; - result.dwSize = sizeof(result); - - hr = IDirect3D_FindDevice(Direct3D1, &search, &result); - ok(hr == DDERR_NOTFOUND, - "[%d] Expected IDirect3D1::FindDevice to return DDERR_NOTFOUND, got 0x%08x\n", i, hr); - } - - /* The HAL device can only be enumerated if hardware acceleration is present. */ - search.dwSize = sizeof(search); - search.dwFlags = D3DFDS_GUID; - search.guid = IID_IDirect3DHALDevice; - result.dwSize = sizeof(result); - - hr = IDirect3D_FindDevice(Direct3D1, &search, &result); - trace("IDirect3D::FindDevice returned 0x%08x for the HAL device GUID\n", hr); - if (SUCCEEDED(hr)) - { - hr = IDirectDrawSurface_QueryInterface(Surface1, &IID_IDirect3DHALDevice, (void **)&d3dhal); - /* Currently Wine only supports the creation of one Direct3D device - * for a given DirectDraw instance. */ - ok(SUCCEEDED(hr) || broken(hr == DDERR_INVALIDPIXELFORMAT) /* XP/Win2003 Wow64 on VMware */, - "Expected IDirectDrawSurface::QueryInterface to succeed, got 0x%08x\n", hr); - - if (SUCCEEDED(hr)) - IDirect3DDevice_Release(d3dhal); - } - else - { - hr = IDirectDrawSurface_QueryInterface(Surface1, &IID_IDirect3DHALDevice, (void **)&d3dhal); - ok(FAILED(hr), "Expected IDirectDrawSurface::QueryInterface to fail, got 0x%08x\n", hr); - - if (SUCCEEDED(hr)) - IDirect3DDevice_Release(d3dhal); - } - - /* These GUIDs appear to be always present. */ - for (i = 0; i < sizeof(deviceGUIDs)/sizeof(deviceGUIDs[0]); i++) - { - search.dwSize = sizeof(search); - search.dwFlags = D3DFDS_GUID; - search.guid = *deviceGUIDs[i].guid; - result.dwSize = sizeof(result); - - hr = IDirect3D_FindDevice(Direct3D1, &search, &result); - - todo_wine_if (deviceGUIDs[i].todo) - ok(hr == D3D_OK, - "[%d] Expected IDirect3D1::FindDevice to return D3D_OK, got 0x%08x\n", i, hr); - } - - /* Curiously the color model criteria seem to be ignored. */ - search.dwSize = sizeof(search); - search.dwFlags = D3DFDS_COLORMODEL; - search.dcmColorModel = 0xdeadbeef; - result.dwSize = sizeof(result); - - hr = IDirect3D_FindDevice(Direct3D1, &search, &result); - todo_wine - ok(hr == D3D_OK, - "Expected IDirect3D1::FindDevice to return D3D_OK, got 0x%08x\n", hr); -} - static void BackBuffer3DCreateSurfaceTest(void) { DDSURFACEDESC ddsd; @@ -2390,7 +2253,6 @@ START_TEST(d3d) Direct3D1Test(); TextureLoadTest(); ViewportTest(); - FindDevice(); BackBuffer3DCreateSurfaceTest(); BackBuffer3DAttachmentTest(); test_get_caps1(); diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index d4fe1f294af..641847aa38d 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -11713,6 +11713,111 @@ static void test_viewport(void) DestroyWindow(window); } +static void test_find_device(void) +{ + D3DFINDDEVICESEARCH search = {0}; + D3DFINDDEVICERESULT result = {0}; + IDirect3DDevice *device; + IDirectDraw *ddraw; + IDirect3D *d3d; + unsigned int i; + HWND window; + HRESULT hr; + + static const struct + { + const GUID *guid; + HRESULT hr; + BOOL todo; + } + tests[] = + { + {&IID_IDirect3D, DDERR_NOTFOUND}, + {&IID_IDirect3DRampDevice, D3D_OK, TRUE}, + {&IID_IDirect3DRGBDevice, D3D_OK}, + {&IID_IDirect3DMMXDevice, DDERR_NOTFOUND}, + {&IID_IDirect3DRefDevice, DDERR_NOTFOUND}, + {&IID_IDirect3DTnLHalDevice, DDERR_NOTFOUND}, + {&IID_IDirect3DNullDevice, DDERR_NOTFOUND}, + }; + + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + + if (FAILED(IDirectDraw_QueryInterface(ddraw, &IID_IDirect3D, (void **)&d3d))) + { + skip("D3D interface is not available, skipping test.\n"); + IDirectDraw_Release(ddraw); + return; + } + + result.dwSize = sizeof(result); + search.dwSize = sizeof(search); + hr = IDirect3D_FindDevice(d3d, NULL, NULL); + ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr); + hr = IDirect3D_FindDevice(d3d, NULL, &result); + ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr); + hr = IDirect3D_FindDevice(d3d, &search, NULL); + ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr); + hr = IDirect3D_FindDevice(d3d, &search, &result); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(result.dwSize == sizeof(result), "Got unexpected result size %u.\n", result.dwSize); + + memset(&search, 0, sizeof(search)); + memset(&result, 0, sizeof(result)); + hr = IDirect3D_FindDevice(d3d, &search, &result); + ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr); + + search.dwSize = sizeof(search) + 1; + result.dwSize = sizeof(result) + 1; + hr = IDirect3D_FindDevice(d3d, &search, &result); + ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + memset(&search, 0, sizeof(search)); + search.dwSize = sizeof(search); + search.dwFlags = D3DFDS_GUID; + search.guid = *tests[i].guid; + + memset(&result, 0, sizeof(result)); + result.dwSize = sizeof(result); + + hr = IDirect3D_FindDevice(d3d, &search, &result); + todo_wine_if(tests[i].todo) + ok(hr == tests[i].hr, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(result.dwSize == sizeof(result), "Test %u: Got unexpected result size %u.\n", i, result.dwSize); + } + + /* The HAL device can only be enumerated if hardware acceleration is present. */ + search.dwSize = sizeof(search); + search.dwFlags = D3DFDS_GUID; + search.guid = IID_IDirect3DHALDevice; + result.dwSize = sizeof(result); + hr = IDirect3D_FindDevice(d3d, &search, &result); + + window = create_window(); + device = create_device(ddraw, window, DDSCL_NORMAL); + if (hr == D3D_OK) + ok(!!device, "Failed to create a 3D device.\n"); + else + ok(!device, "Succeeded to create a 3D device.\n"); + if (device) + IDirect3DDevice_Release(device); + DestroyWindow(window); + + /* Curiously the colour model criteria seem to be ignored. */ + search.dwSize = sizeof(search); + search.dwFlags = D3DFDS_COLORMODEL; + search.dcmColorModel = 0xdeadbeef; + result.dwSize = sizeof(result); + hr = IDirect3D_FindDevice(d3d, &search, &result); + todo_wine ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + IDirect3D_Release(d3d); + IDirectDraw_Release(ddraw); +} + START_TEST(ddraw1) { DDDEVICEIDENTIFIER identifier; @@ -11817,4 +11922,5 @@ START_TEST(ddraw1) test_enum_surfaces(); test_execute_data(); test_viewport(); + test_find_device(); } diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 941d46bf42c..02f430afa1a 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -12995,6 +12995,111 @@ static void test_viewport(void) DestroyWindow(window); } +static void test_find_device(void) +{ + D3DFINDDEVICESEARCH search = {0}; + D3DFINDDEVICERESULT result = {0}; + IDirect3DDevice2 *device; + IDirectDraw2 *ddraw; + IDirect3D2 *d3d; + unsigned int i; + HWND window; + HRESULT hr; + + static const struct + { + const GUID *guid; + HRESULT hr; + BOOL todo; + } + tests[] = + { + {&IID_IDirect3D, DDERR_NOTFOUND}, + {&IID_IDirect3DRampDevice, D3D_OK, TRUE}, + {&IID_IDirect3DRGBDevice, D3D_OK}, + {&IID_IDirect3DMMXDevice, D3D_OK, TRUE}, + {&IID_IDirect3DRefDevice, DDERR_NOTFOUND}, + {&IID_IDirect3DTnLHalDevice, DDERR_NOTFOUND}, + {&IID_IDirect3DNullDevice, DDERR_NOTFOUND}, + }; + + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + + if (FAILED(IDirectDraw2_QueryInterface(ddraw, &IID_IDirect3D2, (void **)&d3d))) + { + skip("D3D interface is not available, skipping test.\n"); + IDirectDraw2_Release(ddraw); + return; + } + + result.dwSize = sizeof(result); + search.dwSize = sizeof(search); + hr = IDirect3D2_FindDevice(d3d, NULL, NULL); + ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr); + hr = IDirect3D2_FindDevice(d3d, NULL, &result); + ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr); + hr = IDirect3D2_FindDevice(d3d, &search, NULL); + ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr); + hr = IDirect3D2_FindDevice(d3d, &search, &result); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(result.dwSize == sizeof(result), "Got unexpected result size %u.\n", result.dwSize); + + memset(&search, 0, sizeof(search)); + memset(&result, 0, sizeof(result)); + hr = IDirect3D2_FindDevice(d3d, &search, &result); + ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr); + + search.dwSize = sizeof(search) + 1; + result.dwSize = sizeof(result) + 1; + hr = IDirect3D2_FindDevice(d3d, &search, &result); + ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + memset(&search, 0, sizeof(search)); + search.dwSize = sizeof(search); + search.dwFlags = D3DFDS_GUID; + search.guid = *tests[i].guid; + + memset(&result, 0, sizeof(result)); + result.dwSize = sizeof(result); + + hr = IDirect3D2_FindDevice(d3d, &search, &result); + todo_wine_if(tests[i].todo) + ok(hr == tests[i].hr, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(result.dwSize == sizeof(result), "Test %u: Got unexpected result size %u.\n", i, result.dwSize); + } + + /* The HAL device can only be enumerated if hardware acceleration is present. */ + search.dwSize = sizeof(search); + search.dwFlags = D3DFDS_GUID; + search.guid = IID_IDirect3DHALDevice; + result.dwSize = sizeof(result); + hr = IDirect3D2_FindDevice(d3d, &search, &result); + + window = create_window(); + device = create_device(ddraw, window, DDSCL_NORMAL); + if (hr == D3D_OK) + ok(!!device, "Failed to create a 3D device.\n"); + else + ok(!device, "Succeeded to create a 3D device.\n"); + if (device) + IDirect3DDevice2_Release(device); + DestroyWindow(window); + + /* Curiously the colour model criteria seem to be ignored. */ + search.dwSize = sizeof(search); + search.dwFlags = D3DFDS_COLORMODEL; + search.dcmColorModel = 0xdeadbeef; + result.dwSize = sizeof(result); + hr = IDirect3D2_FindDevice(d3d, &search, &result); + todo_wine ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + IDirect3D2_Release(d3d); + IDirectDraw2_Release(ddraw); +} + START_TEST(ddraw2) { DDDEVICEIDENTIFIER identifier; @@ -13107,4 +13212,5 @@ START_TEST(ddraw2) test_clear(); test_enum_surfaces(); test_viewport(); + test_find_device(); } diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index e81472d4f2b..942d0253c46 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -15089,6 +15089,109 @@ static void test_viewport(void) DestroyWindow(window); } +static void test_find_device(void) +{ + D3DFINDDEVICESEARCH search = {0}; + D3DFINDDEVICERESULT result = {0}; + IDirect3DDevice3 *device; + IDirectDraw4 *ddraw; + IDirect3D3 *d3d; + unsigned int i; + HWND window; + HRESULT hr; + + static const struct + { + const GUID *guid; + HRESULT hr; + } + tests[] = + { + {&IID_IDirect3D, DDERR_NOTFOUND}, + {&IID_IDirect3DRampDevice, DDERR_NOTFOUND}, + {&IID_IDirect3DRGBDevice, D3D_OK}, + {&IID_IDirect3DMMXDevice, DDERR_NOTFOUND}, + {&IID_IDirect3DRefDevice, DDERR_NOTFOUND}, + {&IID_IDirect3DTnLHalDevice, DDERR_NOTFOUND}, + {&IID_IDirect3DNullDevice, DDERR_NOTFOUND}, + }; + + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + + if (FAILED(IDirectDraw4_QueryInterface(ddraw, &IID_IDirect3D3, (void **)&d3d))) + { + skip("D3D interface is not available, skipping test.\n"); + IDirectDraw4_Release(ddraw); + return; + } + + result.dwSize = sizeof(result); + search.dwSize = sizeof(search); + hr = IDirect3D3_FindDevice(d3d, NULL, NULL); + ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr); + hr = IDirect3D3_FindDevice(d3d, NULL, &result); + ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr); + hr = IDirect3D3_FindDevice(d3d, &search, NULL); + ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr); + hr = IDirect3D3_FindDevice(d3d, &search, &result); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(result.dwSize == sizeof(result), "Got unexpected result size %u.\n", result.dwSize); + + memset(&search, 0, sizeof(search)); + memset(&result, 0, sizeof(result)); + hr = IDirect3D3_FindDevice(d3d, &search, &result); + ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr); + + search.dwSize = sizeof(search) + 1; + result.dwSize = sizeof(result) + 1; + hr = IDirect3D3_FindDevice(d3d, &search, &result); + ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + memset(&search, 0, sizeof(search)); + search.dwSize = sizeof(search); + search.dwFlags = D3DFDS_GUID; + search.guid = *tests[i].guid; + + memset(&result, 0, sizeof(result)); + result.dwSize = sizeof(result); + + hr = IDirect3D3_FindDevice(d3d, &search, &result); + ok(hr == tests[i].hr, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(result.dwSize == sizeof(result), "Test %u: Got unexpected result size %u.\n", i, result.dwSize); + } + + /* The HAL device can only be enumerated if hardware acceleration is present. */ + search.dwSize = sizeof(search); + search.dwFlags = D3DFDS_GUID; + search.guid = IID_IDirect3DHALDevice; + result.dwSize = sizeof(result); + hr = IDirect3D3_FindDevice(d3d, &search, &result); + + window = create_window(); + device = create_device(window, DDSCL_NORMAL); + if (hr == D3D_OK) + ok(!!device, "Failed to create a 3D device.\n"); + else + ok(!device, "Succeeded to create a 3D device.\n"); + if (device) + IDirect3DDevice3_Release(device); + DestroyWindow(window); + + /* Curiously the colour model criteria seem to be ignored. */ + search.dwSize = sizeof(search); + search.dwFlags = D3DFDS_COLORMODEL; + search.dcmColorModel = 0xdeadbeef; + result.dwSize = sizeof(result); + hr = IDirect3D3_FindDevice(d3d, &search, &result); + todo_wine ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + IDirect3D3_Release(d3d); + IDirectDraw4_Release(ddraw); +} + START_TEST(ddraw4) { DDDEVICEIDENTIFIER identifier; @@ -15215,4 +15318,5 @@ START_TEST(ddraw4) test_clear(); test_enum_surfaces(); test_viewport(); + test_find_device(); } -- 2.11.0

2 1

[PATCH 3/4] ddraw: Find the correct GUIDs for each D3D version in FindDevice().
by Henri Verbeet 11 Sep '18

11 Sep '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/ddraw/ddraw.c | 83 ++++++++++++++++++++++++++++++----------------- dlls/ddraw/tests/ddraw1.c | 6 ++-- dlls/ddraw/tests/ddraw2.c | 8 ++--- 3 files changed, 59 insertions(+), 38 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index e5f1e4f8c75..170a5492784 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -4018,35 +4018,20 @@ static HRESULT WINAPI d3d1_CreateViewport(IDirect3D *iface, IDirect3DViewport ** outer_unknown); } -/***************************************************************************** - * IDirect3D3::FindDevice - * - * This method finds a device with the requested properties and returns a - * device description - * - * Versions 1, 2 and 3 - * Params: - * fds: Describes the requested device characteristics - * fdr: Returns the device description - * - * Returns: - * D3D_OK on success - * DDERR_INVALIDPARAMS if no device was found - * - *****************************************************************************/ -static HRESULT WINAPI d3d3_FindDevice(IDirect3D3 *iface, D3DFINDDEVICESEARCH *fds, D3DFINDDEVICERESULT *fdr) +static HRESULT ddraw_find_device(struct ddraw *ddraw, const D3DFINDDEVICESEARCH *fds, D3DFINDDEVICERESULT *fdr, + unsigned int guid_count, const GUID * const *guids) { - struct ddraw *ddraw = impl_from_IDirect3D3(iface); D3DDEVICEDESC7 desc7; D3DDEVICEDESC desc1; + unsigned int i; HRESULT hr; - TRACE("iface %p, fds %p, fdr %p.\n", iface, fds, fdr); + TRACE("ddraw %p, fds %p, fdr %p, guid_count %u, guids %p.\n", ddraw, fds, fdr, guid_count, guids); - if (!fds || !fdr) return DDERR_INVALIDPARAMS; + if (!fds || !fdr) + return DDERR_INVALIDPARAMS; - if (fds->dwSize != sizeof(D3DFINDDEVICESEARCH) - || fdr->dwSize != sizeof(D3DFINDDEVICERESULT)) + if (fds->dwSize != sizeof(*fds) || fdr->dwSize != sizeof(*fdr)) return DDERR_INVALIDPARAMS; if (fds->dwFlags & D3DFDS_COLORMODEL) @@ -4054,12 +4039,22 @@ static HRESULT WINAPI d3d3_FindDevice(IDirect3D3 *iface, D3DFINDDEVICESEARCH *fd if (fds->dwFlags & D3DFDS_GUID) { - TRACE("Trying to match guid %s.\n", debugstr_guid(&(fds->guid))); - if (!IsEqualGUID(&IID_D3DDEVICE_WineD3D, &fds->guid) - && !IsEqualGUID(&IID_IDirect3DHALDevice, &fds->guid) - && !IsEqualGUID(&IID_IDirect3DRGBDevice, &fds->guid)) + BOOL found = FALSE; + + TRACE("Trying to match GUID %s.\n", debugstr_guid(&fds->guid)); + + for (i = 0; i < guid_count; ++i) + { + if (IsEqualGUID(guids[i], &fds->guid)) + { + found = TRUE; + break; + } + } + + if (!found) { - WARN("No match for this GUID.\n"); + WARN("Failed to match GUID %s.\n", debugstr_guid(&fds->guid)); return DDERR_NOTFOUND; } } @@ -4079,22 +4074,52 @@ static HRESULT WINAPI d3d3_FindDevice(IDirect3D3 *iface, D3DFINDDEVICESEARCH *fd return D3D_OK; } +static HRESULT WINAPI d3d3_FindDevice(IDirect3D3 *iface, D3DFINDDEVICESEARCH *fds, D3DFINDDEVICERESULT *fdr) +{ + struct ddraw *ddraw = impl_from_IDirect3D3(iface); + static const GUID * const guids[] = + { + &IID_D3DDEVICE_WineD3D, + &IID_IDirect3DHALDevice, + &IID_IDirect3DRGBDevice, + }; + + TRACE("iface %p, fds %p, fdr %p.\n", iface, fds, fdr); + + return ddraw_find_device(ddraw, fds, fdr, ARRAY_SIZE(guids), guids); +} + static HRESULT WINAPI d3d2_FindDevice(IDirect3D2 *iface, D3DFINDDEVICESEARCH *fds, D3DFINDDEVICERESULT *fdr) { struct ddraw *ddraw = impl_from_IDirect3D2(iface); + static const GUID * const guids[] = + { + &IID_D3DDEVICE_WineD3D, + &IID_IDirect3DHALDevice, + &IID_IDirect3DMMXDevice, + &IID_IDirect3DRGBDevice, + &IID_IDirect3DRampDevice, + }; TRACE("iface %p, fds %p, fdr %p.\n", iface, fds, fdr); - return d3d3_FindDevice(&ddraw->IDirect3D3_iface, fds, fdr); + return ddraw_find_device(ddraw, fds, fdr, ARRAY_SIZE(guids), guids); } static HRESULT WINAPI d3d1_FindDevice(IDirect3D *iface, D3DFINDDEVICESEARCH *fds, D3DFINDDEVICERESULT *fdr) { struct ddraw *ddraw = impl_from_IDirect3D(iface); + static const GUID * const guids[] = + { + &IID_D3DDEVICE_WineD3D, + &IID_IDirect3DHALDevice, + &IID_IDirect3DRGBDevice, + &IID_IDirect3DRampDevice, + }; TRACE("iface %p, fds %p, fdr %p.\n", iface, fds, fdr); - return d3d3_FindDevice(&ddraw->IDirect3D3_iface, fds, fdr); + return ddraw_find_device(ddraw, fds, fdr, ARRAY_SIZE(guids), guids); } /***************************************************************************** diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index b8dafdb6281..ba9f128dad7 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -11728,12 +11728,11 @@ static void test_find_device(void) { const GUID *guid; HRESULT hr; - BOOL todo; } tests[] = { {&IID_IDirect3D, DDERR_NOTFOUND}, - {&IID_IDirect3DRampDevice, D3D_OK, TRUE}, + {&IID_IDirect3DRampDevice, D3D_OK}, {&IID_IDirect3DRGBDevice, D3D_OK}, {&IID_IDirect3DMMXDevice, DDERR_NOTFOUND}, {&IID_IDirect3DRefDevice, DDERR_NOTFOUND}, @@ -11784,8 +11783,7 @@ static void test_find_device(void) result.dwSize = sizeof(result); hr = IDirect3D_FindDevice(d3d, &search, &result); - todo_wine_if(tests[i].todo) - ok(hr == tests[i].hr, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == tests[i].hr, "Test %u: Got unexpected hr %#x.\n", i, hr); ok(result.dwSize == sizeof(result), "Test %u: Got unexpected result size %u.\n", i, result.dwSize); } diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 762b4d9aba3..b5739c3ab4d 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -13010,14 +13010,13 @@ static void test_find_device(void) { const GUID *guid; HRESULT hr; - BOOL todo; } tests[] = { {&IID_IDirect3D, DDERR_NOTFOUND}, - {&IID_IDirect3DRampDevice, D3D_OK, TRUE}, + {&IID_IDirect3DRampDevice, D3D_OK}, {&IID_IDirect3DRGBDevice, D3D_OK}, - {&IID_IDirect3DMMXDevice, D3D_OK, TRUE}, + {&IID_IDirect3DMMXDevice, D3D_OK}, {&IID_IDirect3DRefDevice, DDERR_NOTFOUND}, {&IID_IDirect3DTnLHalDevice, DDERR_NOTFOUND}, {&IID_IDirect3DNullDevice, DDERR_NOTFOUND}, @@ -13066,8 +13065,7 @@ static void test_find_device(void) result.dwSize = sizeof(result); hr = IDirect3D2_FindDevice(d3d, &search, &result); - todo_wine_if(tests[i].todo) - ok(hr == tests[i].hr, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == tests[i].hr, "Test %u: Got unexpected hr %#x.\n", i, hr); ok(result.dwSize == sizeof(result), "Test %u: Got unexpected result size %u.\n", i, result.dwSize); } -- 2.11.0

1 0

[PATCH] wined3d: Add support for 1D UAVs in shaders.
by Józef Kucia 11 Sep '18

11 Sep '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 1a1fe54bda64..64c8b77aa385 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2679,6 +2679,10 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont image_type = "imageBuffer"; break; + case WINED3D_SHADER_RESOURCE_TEXTURE_1D: + image_type = "image1D"; + break; + case WINED3D_SHADER_RESOURCE_TEXTURE_2D: image_type = "image2D"; break; @@ -2687,6 +2691,10 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont image_type = "image3D"; break; + case WINED3D_SHADER_RESOURCE_TEXTURE_1DARRAY: + image_type = "image1DArray"; + break; + case WINED3D_SHADER_RESOURCE_TEXTURE_2DARRAY: image_type = "image2DArray"; break; -- 2.16.4

2 1

[PATCH 1/2] d3d11/tests: Test D3D11_BLEND_DESC normalization.
by Józef Kucia 11 Sep '18

11 Sep '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d11/tests/d3d11.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index c470e24f646f..94e7a8eeb9cc 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -4914,12 +4914,6 @@ static void test_create_blend_state(void) desc.AlphaToCoverageEnable = FALSE; desc.IndependentBlendEnable = FALSE; desc.RenderTarget[0].BlendEnable = FALSE; - desc.RenderTarget[0].SrcBlend = D3D11_BLEND_ONE; - desc.RenderTarget[0].DestBlend = D3D11_BLEND_ZERO; - desc.RenderTarget[0].BlendOp = D3D11_BLEND_OP_ADD; - desc.RenderTarget[0].SrcBlendAlpha = D3D11_BLEND_ONE; - desc.RenderTarget[0].DestBlendAlpha = D3D11_BLEND_ZERO; - desc.RenderTarget[0].BlendOpAlpha = D3D11_BLEND_OP_ADD; desc.RenderTarget[0].RenderTargetWriteMask = D3D11_COLOR_WRITE_ENABLE_ALL; expected_refcount = get_refcount(device) + 1; -- 2.16.4

3 2

[PATCH 2/2] d3d10core/tests: Test D3D10_BLEND_DESC normalization.
by Józef Kucia 11 Sep '18

11 Sep '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d10core/tests/d3d10core.c | 36 ++++++++++++++++++++++++++---------- 1 file changed, 26 insertions(+), 10 deletions(-) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index e675c12a39e5..11eede764bc5 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -3984,18 +3984,9 @@ static void test_create_blend_state(void) hr = ID3D10Device_CreateBlendState(device, NULL, &blend_state1); ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); - blend_desc.AlphaToCoverageEnable = FALSE; - blend_desc.SrcBlend = D3D10_BLEND_ONE; - blend_desc.DestBlend = D3D10_BLEND_ZERO; - blend_desc.BlendOp = D3D10_BLEND_OP_ADD; - blend_desc.SrcBlendAlpha = D3D10_BLEND_ONE; - blend_desc.DestBlendAlpha = D3D10_BLEND_ZERO; - blend_desc.BlendOpAlpha = D3D10_BLEND_OP_ADD; + memset(&blend_desc, 0, sizeof(blend_desc)); for (i = 0; i < D3D10_SIMULTANEOUS_RENDER_TARGET_COUNT; ++i) - { - blend_desc.BlendEnable[i] = FALSE; blend_desc.RenderTargetWriteMask[i] = D3D10_COLOR_WRITE_ENABLE_ALL; - } expected_refcount = get_refcount(device) + 1; hr = ID3D10Device_CreateBlendState(device, &blend_desc, &blend_state1); @@ -4013,6 +4004,31 @@ static void test_create_blend_state(void) ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); ID3D10Device_Release(tmp); + ID3D10BlendState_GetDesc(blend_state1, &blend_desc); + ok(blend_desc.AlphaToCoverageEnable == FALSE, + "Got unexpected alpha to coverage enable %#x.\n", blend_desc.AlphaToCoverageEnable); + ok(blend_desc.SrcBlend == D3D10_BLEND_ONE, + "Got unexpected src blend %#x.\n", blend_desc.SrcBlend); + ok(blend_desc.DestBlend == D3D10_BLEND_ZERO, + "Got unexpected dest blend %#x.\n", blend_desc.DestBlend); + ok(blend_desc.BlendOp == D3D10_BLEND_OP_ADD, + "Got unexpected blend op %#x.\n", blend_desc.BlendOp); + ok(blend_desc.SrcBlendAlpha == D3D10_BLEND_ONE, + "Got unexpected src blend alpha %#x.\n", blend_desc.SrcBlendAlpha); + ok(blend_desc.DestBlendAlpha == D3D10_BLEND_ZERO, + "Got unexpected dest blend alpha %#x.\n", blend_desc.DestBlendAlpha); + ok(blend_desc.BlendOpAlpha == D3D10_BLEND_OP_ADD, + "Got unexpected blend op alpha %#x.\n", blend_desc.BlendOpAlpha); + for (i = 0; i < D3D10_SIMULTANEOUS_RENDER_TARGET_COUNT; ++i) + { + ok(blend_desc.BlendEnable[i] == FALSE, + "Got unexpected blend enable %#x for render target %u.\n", + blend_desc.BlendEnable[i], i); + ok(blend_desc.RenderTargetWriteMask[i] == D3D10_COLOR_WRITE_ENABLE_ALL, + "Got unexpected render target write mask %#x for render target %u.\n", + blend_desc.RenderTargetWriteMask[i], i); + } + /* Not available on all Windows versions. */ check_interface(blend_state1, &IID_ID3D10BlendState1, TRUE, TRUE); -- 2.16.4

2 1

[PATCH v2 3/3] comctl32/pager: Support comboboxex notification conversion.
by Zhiyi Zhang 11 Sep '18

11 Sep '18

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/pager.c | 61 +++++++++++++++++++++++++++---- dlls/comctl32/tests/pager.c | 72 +++++++++++++++++++++++++++++++++++-- 2 files changed, 125 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/pager.c b/dlls/comctl32/pager.c index fd9af3147b..c03b07966c 100644 --- a/dlls/comctl32/pager.c +++ b/dlls/comctl32/pager.c @@ -101,7 +101,11 @@ enum conversion_flags /* Convert ANSI text from parent back to Unicode for children */ CONVERT_RECEIVE = 0x02, /* Send empty text to parent if text is NULL. Original text pointer still remains NULL */ - NULL_SEND_EMPTY = 0x04 + NULL_SEND_EMPTY = 0x04, + /* Set text to null after parent received the notification if the required mask is not set before sending notification */ + NO_MASK_SET_NULL = 0x08, + /* Zero out the text buffer before sending it to parent */ + ZERO_SEND = 0x10 }; static void @@ -1038,6 +1042,10 @@ static UINT PAGER_GetAnsiNtfCode(UINT code) { switch (code) { + /* ComboxBoxEx */ + case CBEN_DRAGBEGINW: return CBEN_DRAGBEGINA; + case CBEN_ENDEDITW: return CBEN_ENDEDITA; + case CBEN_GETDISPINFOW: return CBEN_GETDISPINFOA; /* Toolbar */ case TBN_GETBUTTONINFOW: return TBN_GETBUTTONINFOA; case TBN_GETINFOTIPW: return TBN_GETINFOTIPA; @@ -1060,7 +1068,8 @@ static BOOL PAGER_AdjustBuffer(PAGER_INFO *infoPtr, INT size) return TRUE; } -static LRESULT PAGER_SendConvertedNotify(PAGER_INFO *infoPtr, NMHDR *hdr, WCHAR **text, INT *textMax, DWORD flags) +static LRESULT PAGER_SendConvertedNotify(PAGER_INFO *infoPtr, NMHDR *hdr, UINT *mask, UINT requiredMask, WCHAR **text, + INT *textMax, DWORD flags) { CHAR *sendBuffer = NULL; CHAR *receiveBuffer; @@ -1074,14 +1083,21 @@ static LRESULT PAGER_SendConvertedNotify(PAGER_INFO *infoPtr, NMHDR *hdr, WCHAR hdr->code = PAGER_GetAnsiNtfCode(hdr->code); + if (mask && !(*mask & requiredMask)) + { + ret = SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, hdr->idFrom, (LPARAM)hdr); + if (flags & NO_MASK_SET_NULL) oldText = NULL; + goto done; + } + if (oldTextMax < 0) goto done; - if ((*text && flags & CONVERT_SEND) || (!*text && flags & NULL_SEND_EMPTY)) + if ((*text && flags & (CONVERT_SEND | ZERO_SEND)) || (!*text && flags & NULL_SEND_EMPTY)) { bufferSize = textMax ? *textMax : lstrlenW(*text) + 1; sendBuffer = heap_alloc_zero(bufferSize); if (!sendBuffer) goto done; - WideCharToMultiByte(CP_ACP, 0, *text, -1, sendBuffer, bufferSize, NULL, FALSE); + if (!(flags & ZERO_SEND)) WideCharToMultiByte(CP_ACP, 0, *text, -1, sendBuffer, bufferSize, NULL, FALSE); *text = (WCHAR *)sendBuffer; } @@ -1117,17 +1133,50 @@ static LRESULT PAGER_Notify(PAGER_INFO *infoPtr, NMHDR *hdr) switch (hdr->code) { + /* ComboBoxEx */ + case CBEN_GETDISPINFOW: + { + NMCOMBOBOXEXW *nmcbe = (NMCOMBOBOXEXW *)hdr; + return PAGER_SendConvertedNotify(infoPtr, hdr, &nmcbe->ceItem.mask, CBEIF_TEXT, &nmcbe->ceItem.pszText, + &nmcbe->ceItem.cchTextMax, ZERO_SEND | NO_MASK_SET_NULL | CONVERT_RECEIVE); + } + case CBEN_DRAGBEGINW: + { + NMCBEDRAGBEGINW *nmdbW = (NMCBEDRAGBEGINW *)hdr; + NMCBEDRAGBEGINA nmdbA = {0}; + nmdbA.hdr.code = PAGER_GetAnsiNtfCode(nmdbW->hdr.code); + nmdbA.hdr.hwndFrom = nmdbW->hdr.hwndFrom; + nmdbA.hdr.idFrom = nmdbW->hdr.idFrom; + nmdbA.iItemid = nmdbW->iItemid; + WideCharToMultiByte(CP_ACP, 0, nmdbW->szText, ARRAY_SIZE(nmdbW->szText), nmdbA.szText, ARRAY_SIZE(nmdbA.szText), + NULL, FALSE); + return SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, hdr->idFrom, (LPARAM)&nmdbA); + } + case CBEN_ENDEDITW: + { + NMCBEENDEDITW *nmedW = (NMCBEENDEDITW *)hdr; + NMCBEENDEDITA nmedA = {0}; + nmedA.hdr.code = PAGER_GetAnsiNtfCode(nmedW->hdr.code); + nmedA.hdr.hwndFrom = nmedW->hdr.hwndFrom; + nmedA.hdr.idFrom = nmedW->hdr.idFrom; + nmedA.fChanged = nmedW->fChanged; + nmedA.iNewSelection = nmedW->iNewSelection; + nmedA.iWhy = nmedW->iWhy; + WideCharToMultiByte(CP_ACP, 0, nmedW->szText, ARRAY_SIZE(nmedW->szText), nmedA.szText, ARRAY_SIZE(nmedA.szText), + NULL, FALSE); + return SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, hdr->idFrom, (LPARAM)&nmedA); + } /* Toolbar */ case TBN_GETBUTTONINFOW: { NMTOOLBARW *nmtb = (NMTOOLBARW *)hdr; - return PAGER_SendConvertedNotify(infoPtr, hdr, &nmtb->pszText, &nmtb->cchText, + return PAGER_SendConvertedNotify(infoPtr, hdr, NULL, 0, &nmtb->pszText, &nmtb->cchText, NULL_SEND_EMPTY | CONVERT_SEND | CONVERT_RECEIVE); } case TBN_GETINFOTIPW: { NMTBGETINFOTIPW *nmtbgit = (NMTBGETINFOTIPW *)hdr; - return PAGER_SendConvertedNotify(infoPtr, hdr, &nmtbgit->pszText, &nmtbgit->cchTextMax, CONVERT_RECEIVE); + return PAGER_SendConvertedNotify(infoPtr, hdr, NULL, 0, &nmtbgit->pszText, &nmtbgit->cchTextMax, CONVERT_RECEIVE); } /* Tooltip */ case TTN_GETDISPINFOW: diff --git a/dlls/comctl32/tests/pager.c b/dlls/comctl32/tests/pager.c index 56b3116fd7..a01736f17f 100644 --- a/dlls/comctl32/tests/pager.c +++ b/dlls/comctl32/tests/pager.c @@ -65,7 +65,9 @@ enum test_conversion_flags CONVERT_RECEIVE = 0x04, NOT_CONVERT_RECEIVE = 0x08, NULL_SEND_EMPTY = 0x10, - NOT_NULL_SEND_EMPTY = 0x20 + NOT_NULL_SEND_EMPTY = 0x20, + NO_MASK_SET_NULL = 0x40, + ZERO_SEND = 0x80 }; static struct notify_test_info @@ -576,7 +578,10 @@ static void notify_generic_text_handler(CHAR **text, INT *text_max) const struct notify_test_send_data *data = (notify_test_info.test_id == CONVERT_SEND ? test_convert_send_datas : test_not_convert_send_datas) + notify_test_info.sub_test_id; - if (notify_test_info.flags & CONVERT_SEND) + if (notify_test_info.flags & ZERO_SEND) + ok(!lstrcmpA(*text, empty_a), "Code 0x%08x test 0x%08x sub test %d expect empty text, got %s\n", + notify_test_info.unicode, notify_test_info.test_id, notify_test_info.sub_test_id, *text); + else if (notify_test_info.flags & CONVERT_SEND) ok(!lstrcmpA(data->expect_text, *text), "Code 0x%08x test 0x%08x sub test %d expect %s, got %s\n", notify_test_info.unicode, notify_test_info.test_id, notify_test_info.sub_test_id, (CHAR *)data->expect_text, *text); @@ -658,6 +663,32 @@ static LRESULT WINAPI test_notify_proc(HWND hwnd, UINT message, WPARAM wParam, L } switch (hdr->code) { + /* ComboBoxEx */ + case CBEN_INSERTITEM: + case CBEN_DELETEITEM: + { + NMCOMBOBOXEXW *nmcbe = (NMCOMBOBOXEXW *)hdr; + notify_generic_text_handler((CHAR **)&nmcbe->ceItem.pszText, NULL); + break; + } + case CBEN_DRAGBEGINA: + { + NMCBEDRAGBEGINA *nmcbedb = (NMCBEDRAGBEGINA *)hdr; + ok(!lstrcmpA(nmcbedb->szText, test_a), "Expect %s, got %s\n", nmcbedb->szText, test_a); + break; + } + case CBEN_ENDEDITA: + { + NMCBEENDEDITA *nmcbeed = (NMCBEENDEDITA *)hdr; + ok(!lstrcmpA(nmcbeed->szText, test_a), "Expect %s, got %s\n", nmcbeed->szText, test_a); + break; + } + case CBEN_GETDISPINFOA: + { + NMCOMBOBOXEXA *nmcbe = (NMCOMBOBOXEXA *)hdr; + notify_generic_text_handler(&nmcbe->ceItem.pszText, &nmcbe->ceItem.cchTextMax); + break; + } /* Toolbar */ case TBN_SAVE: { @@ -838,6 +869,33 @@ static void test_notify_generic_text_helper(HWND pager, void *ptr, size_t size, else notify_test_info.test_id = NOT_NULL_SEND_EMPTY; send_notify(code_unicode, code_ansi, (LPARAM)ptr, TRUE); + + notify_test_info.test_id = NO_MASK_SET_NULL; + memset(ptr, 0, size); + memset(buffer, 0, sizeof(buffer)); + *text = buffer; + if (text_max) *text_max = ARRAY_SIZE(buffer); + send_notify(code_unicode, code_ansi, (LPARAM)ptr, TRUE); + if(flags & NO_MASK_SET_NULL) + ok(!*text, "Expect null text\n"); +} + +static void test_wm_notify_comboboxex(HWND pager) +{ + static NMCBEDRAGBEGINW nmcbedb; + static NMCBEENDEDITW nmcbeed; + + /* CBEN_DRAGBEGIN */ + memset(&nmcbedb, 0, sizeof(nmcbedb)); + memcpy(nmcbedb.szText, test_w, sizeof(test_w)); + send_notify(CBEN_DRAGBEGINW, CBEN_DRAGBEGINA, (LPARAM)&nmcbedb, FALSE); + ok(!lstrcmpW(nmcbedb.szText, test_w), "Expect %s, got %s\n", wine_dbgstr_w(test_w), wine_dbgstr_w(nmcbedb.szText)); + + /* CBEN_ENDEDIT */ + memset(&nmcbeed, 0, sizeof(nmcbeed)); + memcpy(nmcbeed.szText, test_w, sizeof(test_w)); + send_notify(CBEN_ENDEDITW, CBEN_ENDEDITA, (LPARAM)&nmcbeed, FALSE); + ok(!lstrcmpW(nmcbeed.szText, test_w), "Expect %s, got %s\n", wine_dbgstr_w(test_w), wine_dbgstr_w(nmcbeed.szText)); } static void test_wm_notify_tooltip(HWND pager) @@ -882,6 +940,8 @@ static void test_wm_notify(void) { static const CHAR *class = "Pager notify class"; HWND parent, pager; + /* Combo Box Ex */ + static NMCOMBOBOXEXW nmcbe; /* Tool Bar */ static NMTBRESTORE nmtbr; static NMTBSAVE nmtbs; @@ -890,6 +950,13 @@ static void test_wm_notify(void) static NMTBGETINFOTIPW nmtbgit; static const struct generic_text_helper_para paras[] = { + /* Combo Box Ex */ + {&nmcbe, sizeof(nmcbe), &nmcbe.ceItem.mask, CBEIF_TEXT, &nmcbe.ceItem.pszText, &nmcbe.ceItem.cchTextMax, + CBEN_INSERTITEM, CBEN_INSERTITEM, NOT_CONVERT_SEND | NOT_CONVERT_RECEIVE}, + {&nmcbe, sizeof(nmcbe), &nmcbe.ceItem.mask, CBEIF_TEXT, &nmcbe.ceItem.pszText, &nmcbe.ceItem.cchTextMax, + CBEN_DELETEITEM, CBEN_DELETEITEM, NOT_CONVERT_SEND | NOT_CONVERT_RECEIVE}, + {&nmcbe, sizeof(nmcbe), &nmcbe.ceItem.mask, CBEIF_TEXT, &nmcbe.ceItem.pszText, &nmcbe.ceItem.cchTextMax, + CBEN_GETDISPINFOW, CBEN_GETDISPINFOA, ZERO_SEND | NO_MASK_SET_NULL | NOT_CONVERT_SEND | CONVERT_RECEIVE}, /* Tool Bar */ {&nmtbs, sizeof(nmtbs), NULL, 0, (WCHAR **)&nmtbs.tbButton.iString, NULL, TBN_SAVE, TBN_SAVE, NOT_CONVERT_SEND | NOT_CONVERT_RECEIVE}, @@ -922,6 +989,7 @@ static void test_wm_notify(void) } /* Tests for those that can't be covered by generic text test helper */ + test_wm_notify_comboboxex(pager); test_wm_notify_tooltip(pager); DestroyWindow(parent); -- 2.18.0

1 0

[PATCH v2 2/3] comctl32/pager: Support tooltip notification conversion.
by Zhiyi Zhang 11 Sep '18

11 Sep '18

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/pager.c | 72 ++++++++++++++++++++++++ dlls/comctl32/tests/pager.c | 106 ++++++++++++++++++++++++++++++++++++ 2 files changed, 178 insertions(+) diff --git a/dlls/comctl32/pager.c b/dlls/comctl32/pager.c index be9bccbbc7..fd9af3147b 100644 --- a/dlls/comctl32/pager.c +++ b/dlls/comctl32/pager.c @@ -84,6 +84,8 @@ typedef struct INT TLbtnState; /* state of top or left btn */ INT BRbtnState; /* state of bottom or right btn */ INT direction; /* direction of the scroll, (e.g. PGF_SCROLLUP) */ + WCHAR *pwszBuffer;/* text buffer for converted notifications */ + INT nBufferSize;/* size of the above buffer */ } PAGER_INFO; #define TIMERID1 1 @@ -605,6 +607,7 @@ static LRESULT PAGER_Destroy (PAGER_INFO *infoPtr) { SetWindowLongPtrW (infoPtr->hwndSelf, 0, 0); + heap_free (infoPtr->pwszBuffer); heap_free (infoPtr); return 0; } @@ -1038,10 +1041,25 @@ static UINT PAGER_GetAnsiNtfCode(UINT code) /* Toolbar */ case TBN_GETBUTTONINFOW: return TBN_GETBUTTONINFOA; case TBN_GETINFOTIPW: return TBN_GETINFOTIPA; + /* Tooltip */ + case TTN_GETDISPINFOW: return TTN_GETDISPINFOA; } return code; } +static BOOL PAGER_AdjustBuffer(PAGER_INFO *infoPtr, INT size) +{ + if (!infoPtr->pwszBuffer) + infoPtr->pwszBuffer = heap_alloc(size); + else if (infoPtr->nBufferSize < size) + infoPtr->pwszBuffer = heap_realloc(infoPtr->pwszBuffer, size); + + if (!infoPtr->pwszBuffer) return FALSE; + if (infoPtr->nBufferSize < size) infoPtr->nBufferSize = size; + + return TRUE; +} + static LRESULT PAGER_SendConvertedNotify(PAGER_INFO *infoPtr, NMHDR *hdr, WCHAR **text, INT *textMax, DWORD flags) { CHAR *sendBuffer = NULL; @@ -1093,6 +1111,8 @@ done: static LRESULT PAGER_Notify(PAGER_INFO *infoPtr, NMHDR *hdr) { + LRESULT ret; + if (infoPtr->bUnicode) return SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, hdr->idFrom, (LPARAM)hdr); switch (hdr->code) @@ -1109,6 +1129,58 @@ static LRESULT PAGER_Notify(PAGER_INFO *infoPtr, NMHDR *hdr) NMTBGETINFOTIPW *nmtbgit = (NMTBGETINFOTIPW *)hdr; return PAGER_SendConvertedNotify(infoPtr, hdr, &nmtbgit->pszText, &nmtbgit->cchTextMax, CONVERT_RECEIVE); } + /* Tooltip */ + case TTN_GETDISPINFOW: + { + NMTTDISPINFOW *nmttdiW = (NMTTDISPINFOW *)hdr; + NMTTDISPINFOA nmttdiA = {0}; + INT size; + + nmttdiA.hdr.code = PAGER_GetAnsiNtfCode(nmttdiW->hdr.code); + nmttdiA.hdr.hwndFrom = nmttdiW->hdr.hwndFrom; + nmttdiA.hdr.idFrom = nmttdiW->hdr.idFrom; + nmttdiA.hinst = nmttdiW->hinst; + nmttdiA.uFlags = nmttdiW->uFlags; + nmttdiA.lParam = nmttdiW->lParam; + nmttdiA.lpszText = nmttdiA.szText; + WideCharToMultiByte(CP_ACP, 0, nmttdiW->szText, ARRAY_SIZE(nmttdiW->szText), nmttdiA.szText, + ARRAY_SIZE(nmttdiA.szText), NULL, FALSE); + + ret = SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, hdr->idFrom, (LPARAM)&nmttdiA); + + nmttdiW->hinst = nmttdiA.hinst; + nmttdiW->uFlags = nmttdiA.uFlags; + nmttdiW->lParam = nmttdiA.lParam; + + MultiByteToWideChar(CP_ACP, 0, nmttdiA.szText, ARRAY_SIZE(nmttdiA.szText), nmttdiW->szText, + ARRAY_SIZE(nmttdiW->szText)); + if (!nmttdiA.lpszText) + nmttdiW->lpszText = nmttdiW->szText; + else if (!IS_INTRESOURCE(nmttdiA.lpszText)) + { + size = MultiByteToWideChar(CP_ACP, 0, nmttdiA.lpszText, -1, 0, 0); + if (size > ARRAY_SIZE(nmttdiW->szText)) + { + if (!PAGER_AdjustBuffer(infoPtr, size * sizeof(WCHAR))) return ret; + MultiByteToWideChar(CP_ACP, 0, nmttdiA.lpszText, -1, infoPtr->pwszBuffer, size); + nmttdiW->lpszText = infoPtr->pwszBuffer; + /* Override content in szText */ + memcpy(nmttdiW->szText, nmttdiW->lpszText, min(sizeof(nmttdiW->szText), size * sizeof(WCHAR))); + } + else + { + MultiByteToWideChar(CP_ACP, 0, nmttdiA.lpszText, -1, nmttdiW->szText, ARRAY_SIZE(nmttdiW->szText)); + nmttdiW->lpszText = nmttdiW->szText; + } + } + else + { + nmttdiW->szText[0] = 0; + nmttdiW->lpszText = (WCHAR *)nmttdiA.lpszText; + } + + return ret; + } } /* Other notifications, no need to convert */ return SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, hdr->idFrom, (LPARAM)hdr); diff --git a/dlls/comctl32/tests/pager.c b/dlls/comctl32/tests/pager.c index 8cc990a702..56b3116fd7 100644 --- a/dlls/comctl32/tests/pager.c +++ b/dlls/comctl32/tests/pager.c @@ -35,12 +35,26 @@ static CHAR test_a[] = {'t', 'e', 's', 't', 0}; static WCHAR empty_w[] = {0}; static CHAR empty_a[] = {0}; static CHAR large_a[] = "You should have received a copy of the GNU Lesser General Public License along with this ..."; +static WCHAR large_w[] = +{ + 'Y', 'o', 'u', ' ', 's', 'h', 'o', 'u', 'l', 'd', ' ', 'h', 'a', 'v', 'e', ' ', 'r', 'e', 'c', 'e', 'i', 'v', 'e', + 'd', ' ', 'a', ' ', 'c', 'o', 'p', 'y', ' ', 'o', 'f', ' ', 't', 'h', 'e', ' ', 'G', 'N', 'U', ' ', 'L', 'e', 's', + 's', 'e', 'r', ' ', 'G', 'e', 'n', 'e', 'r', 'a', 'l', ' ', 'P', 'u', 'b', 'l', 'i', 'c', ' ', 'L', 'i', 'c', 'e', + 'n', 's', 'e', ' ', 'a', 'l', 'o', 'n', 'g', ' ', 'w', 'i', 't', 'h', ' ', 't', 'h', 'i', 's', ' ', '.', '.', '.', 0 +}; static WCHAR large_truncated_65_w[65] = { 'Y', 'o', 'u', ' ', 's', 'h', 'o', 'u', 'l', 'd', ' ', 'h', 'a', 'v', 'e', ' ', 'r', 'e', 'c', 'e', 'i', 'v', 'e', 'd', ' ', 'a', ' ', 'c', 'o', 'p', 'y', ' ', 'o', 'f', ' ', 't', 'h', 'e', ' ', 'G', 'N', 'U', ' ', 'L', 'e', 's', 's', 'e', 'r', ' ', 'G', 'e', 'n', 'e', 'r', 'a', 'l', ' ', 'P', 'u', 'b', 'l', 'i', 'c', 0 }; +static WCHAR large_truncated_80_w[80] = +{ + 'Y', 'o', 'u', ' ', 's', 'h', 'o', 'u', 'l', 'd', ' ', 'h', 'a', 'v', 'e', ' ', 'r', 'e', 'c', 'e', + 'i', 'v', 'e', 'd', ' ', 'a', ' ', 'c', 'o', 'p', 'y', ' ', 'o', 'f', ' ', 't', 'h', 'e', ' ', 'G', + 'N', 'U', ' ', 'L', 'e', 's', 's', 'e', 'r', ' ', 'G', 'e', 'n', 'e', 'r', 'a', 'l', ' ', 'P', 'u', + 'b', 'l', 'i', 'c', ' ', 'L', 'i', 'c', 'e', 'n', 's', 'e', ' ', 'a', 'l', 'o', 'n', 'g', ' ', 'w' +}; static WCHAR buffer[64]; /* Text field conversion test behavior flags. */ @@ -132,6 +146,38 @@ static const struct notify_test_receive_data test_not_convert_receive_datas[] = {empty_w, sizeof(empty_w), ARRAY_SIZE(buffer), test_a, NULL, 0, -1, test_a, ARRAY_SIZE(buffer)}, }; +static const struct notify_test_tooltip_data +{ + /* Data for parent to write */ + CHAR *write_sztext; + INT write_sztext_size; + CHAR *write_lpsztext; + HMODULE write_hinst; + /* Data when message returned */ + WCHAR *return_sztext; + INT return_sztext_size; + WCHAR *return_lpsztext; + HMODULE return_hinst; + /* Data expected by parent */ + CHAR *expect_sztext; + /* Data send to parent */ + WCHAR *send_sztext; + INT send_sztext_size; + WCHAR *send_lpsztext; +} test_tooltip_datas[] = +{ + {NULL, 0, NULL, NULL, empty_w, -1, empty_w}, + {test_a, sizeof(test_a), NULL, NULL, test_w, -1, test_w}, + {test_a, sizeof(test_a), test_a, NULL, test_w, -1, test_w}, + {test_a, sizeof(test_a), (CHAR *)1, (HMODULE)0xdeadbeef, empty_w, -1, (WCHAR *)1, (HMODULE)0xdeadbeef}, + {test_a, sizeof(test_a), test_a, (HMODULE)0xdeadbeef, test_w, -1, test_w, (HMODULE)0xdeadbeef}, + {NULL, 0, test_a, NULL, test_w, -1, test_w}, + {test_a, 2, test_a, NULL, test_w, -1, test_w}, + {NULL, 0, NULL, NULL, test_w, -1, test_w, NULL, test_a, test_w, sizeof(test_w)}, + {NULL, 0, NULL, NULL, empty_w, -1, empty_w, NULL, empty_a, NULL, 0, test_w}, + {NULL, 0, large_a, NULL, large_truncated_80_w, sizeof(large_truncated_80_w), large_w} +}; + #define CHILD1_ID 1 #define CHILD2_ID 2 @@ -574,6 +620,19 @@ static void notify_generic_text_handler(CHAR **text, INT *text_max) } } +static void notify_tooltip_handler(NMTTDISPINFOA *nm) +{ + const struct notify_test_tooltip_data *data = test_tooltip_datas + notify_test_info.sub_test_id; + ok(nm->lpszText == nm->szText, "Sub test %d expect %p, got %p\n", notify_test_info.sub_test_id, nm->szText, + nm->lpszText); + if (data->expect_sztext) + ok(!lstrcmpA(data->expect_sztext, nm->szText), "Sub test %d expect %s, got %s\n", notify_test_info.sub_test_id, + data->expect_sztext, nm->szText); + if (data->write_sztext) memcpy(nm->szText, data->write_sztext, data->write_sztext_size); + if (data->write_lpsztext) nm->lpszText = data->write_lpsztext; + if (data->write_hinst) nm->hinst = data->write_hinst; +} + static LRESULT WINAPI test_notify_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { static const WCHAR test[] = {'t', 'e', 's', 't', 0}; @@ -630,6 +689,12 @@ static LRESULT WINAPI test_notify_proc(HWND hwnd, UINT message, WPARAM wParam, L notify_generic_text_handler(&nmtbgit->pszText, &nmtbgit->cchTextMax); break; } + /* Tooltip */ + case TTN_GETDISPINFOA: + { + notify_tooltip_handler((NMTTDISPINFOA *)hdr); + break; + } default: ok(0, "Unexpected message 0x%08x\n", hdr->code); } @@ -775,6 +840,44 @@ static void test_notify_generic_text_helper(HWND pager, void *ptr, size_t size, send_notify(code_unicode, code_ansi, (LPARAM)ptr, TRUE); } +static void test_wm_notify_tooltip(HWND pager) +{ + NMTTDISPINFOW nmttdi; + const struct notify_test_tooltip_data *data; + INT i; + + for (i = 0; i < ARRAY_SIZE(test_tooltip_datas); i++) + { + data = test_tooltip_datas + i; + notify_test_info.sub_test_id = i; + + memset(&nmttdi, 0, sizeof(nmttdi)); + if (data->send_sztext) memcpy(nmttdi.szText, data->send_sztext, data->send_sztext_size); + if (data->send_lpsztext) nmttdi.lpszText = data->send_lpsztext; + send_notify(TTN_GETDISPINFOW, TTN_GETDISPINFOA, (LPARAM)&nmttdi, FALSE); + if (data->return_sztext) + { + if (data->return_sztext_size == -1) + ok(!lstrcmpW(nmttdi.szText, data->return_sztext), "Sub test %d expect %s, got %s\n", i, + wine_dbgstr_w(data->return_sztext), wine_dbgstr_w(nmttdi.szText)); + else + ok(!memcmp(nmttdi.szText, data->return_sztext, data->return_sztext_size), "Wrong szText content\n"); + } + if (data->return_lpsztext) + { + if (IS_INTRESOURCE(data->return_lpsztext)) + ok(nmttdi.lpszText == data->return_lpsztext, "Sub test %d expect %s, got %s\n", i, + wine_dbgstr_w(data->return_lpsztext), wine_dbgstr_w(nmttdi.lpszText)); + else + ok(!lstrcmpW(nmttdi.lpszText, data->return_lpsztext), "Test %d expect %s, got %s\n", i, + wine_dbgstr_w(data->return_lpsztext), wine_dbgstr_w(nmttdi.lpszText)); + } + if (data->return_hinst) + ok(nmttdi.hinst == data->return_hinst, "Sub test %d expect %p, got %p\n", i, data->return_hinst, + nmttdi.hinst); + } +} + static void test_wm_notify(void) { static const CHAR *class = "Pager notify class"; @@ -818,6 +921,9 @@ static void test_wm_notify(void) p->code_unicode, p->code_ansi, p->flags); } + /* Tests for those that can't be covered by generic text test helper */ + test_wm_notify_tooltip(pager); + DestroyWindow(parent); UnregisterClassA(class, GetModuleHandleA(NULL)); } -- 2.18.0

1 0

[PATCH v3] ntdll: Fix treating valid affinity mask requests as invalid in NtSetInformationThread()
by Roger Zoellner 11 Sep '18

11 Sep '18

Wine currently treats valid affinity mask requests as invalid. Especially when the requested mask has one or more bits set that are higher than the highest set bit in the current system/process mask (which mostly means when requested mask > system mask) Included are two additional test cases, that would fail with the current implementaion, but should succeed on Windows. Signed-off-by: Roger Zoellner <zoellner.roger(a)gmail.com> --- dlls/ntdll/tests/info.c | 21 +++++++++++++++++++++ dlls/ntdll/thread.c | 7 ++++--- 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 2ab12e4257..68beae3054 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -2040,6 +2040,27 @@ static void test_affinity(void) ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); ok( tbi.AffinityMask == 1, "Unexpected thread affinity\n" ); + /* NOTE: Pre-Vista does not allow bits to be set that are higher than the highest set bit in process affinity mask */ + thread_affinity = (pbi.AffinityMask << 1) | pbi.AffinityMask; + status = pNtSetInformationThread( GetCurrentThread(), ThreadAffinityMask, &thread_affinity, sizeof(thread_affinity) ); + ok( broken(status == STATUS_INVALID_PARAMETER) || (status == STATUS_SUCCESS), "Expected STATUS_SUCCESS, got %08x\n", status ); + if (status == STATUS_SUCCESS) + { + status = pNtQueryInformationThread( GetCurrentThread(), ThreadBasicInformation, &tbi, sizeof(tbi), NULL ); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status ); + ok( tbi.AffinityMask == pbi.AffinityMask, "Unexpected thread affinity. Expected %lx, got %lx\n", pbi.AffinityMask, tbi.AffinityMask ); + } + + thread_affinity = ~(DWORD_PTR)0 - 1; + status = pNtSetInformationThread( GetCurrentThread(), ThreadAffinityMask, &thread_affinity, sizeof(thread_affinity) ); + ok( broken(status == STATUS_INVALID_PARAMETER) || (status == STATUS_SUCCESS), "Expected STATUS_SUCCESS, got %08x\n", status ); + if (status == STATUS_SUCCESS) + { + status = pNtQueryInformationThread( GetCurrentThread(), ThreadBasicInformation, &tbi, sizeof(tbi), NULL ); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status ); + ok( tbi.AffinityMask == (pbi.AffinityMask & (~(DWORD_PTR)0 - 1)), "Unexpected thread affinity. Expected %lx, got %lx\n", pbi.AffinityMask & (~(DWORD_PTR)0 - 1), tbi.AffinityMask ); + } + /* NOTE: Pre-Vista does not recognize the "all processors" flag (all bits set) */ thread_affinity = ~(DWORD_PTR)0; status = pNtSetInformationThread( GetCurrentThread(), ThreadAffinityMask, &thread_affinity, sizeof(thread_affinity) ); diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 59d64e174d..7a85704432 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -1289,9 +1289,10 @@ NTSTATUS WINAPI NtSetInformationThread( HANDLE handle, THREADINFOCLASS class, if (length != sizeof(ULONG_PTR)) return STATUS_INVALID_PARAMETER; req_aff = *(const ULONG_PTR *)data; - if ((ULONG)req_aff == ~0u) req_aff = affinity_mask; - else if (req_aff & ~affinity_mask) return STATUS_INVALID_PARAMETER; - else if (!req_aff) return STATUS_INVALID_PARAMETER; + + req_aff = req_aff & affinity_mask; + if (!req_aff) return STATUS_INVALID_PARAMETER; + SERVER_START_REQ( set_thread_info ) { req->handle = wine_server_obj_handle( handle ); -- 2.18.0

1 1

[PATCH] iphlpapi: Fix FILE leak in get_ipv6_addr_scope_table() (Coverity).
by Józef Kucia 11 Sep '18

11 Sep '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/iphlpapi/ipstats.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index 994e1fe1272c..84d28ee4e67b 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -2686,6 +2686,8 @@ static struct ipv6_addr_scope *get_ipv6_addr_scope_table(unsigned int *size) entry->scope = htons(scope); } + + fclose(fp); } #else FIXME( "not implemented\n" ); -- 2.16.4

1 0

[PATCH 1/3] xmllite/writer: Add support for namespace definitions in WriteElementString().
by Nikolay Sivov 11 Sep '18

11 Sep '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/xmllite/tests/writer.c | 127 +++++++++++++++++++------ dlls/xmllite/writer.c | 184 ++++++++++++++++++++++++++++++++---- 2 files changed, 264 insertions(+), 47 deletions(-) diff --git a/dlls/xmllite/tests/writer.c b/dlls/xmllite/tests/writer.c index cf43f30f6b..9331899a19 100644 --- a/dlls/xmllite/tests/writer.c +++ b/dlls/xmllite/tests/writer.c @@ -982,6 +982,46 @@ static void test_WriteStartElement(void) IXmlWriter_Release(writer); } +static HRESULT write_element_string(IXmlWriter *writer, const char *prefix, const char *local, + const char *uri, const char *value) +{ + WCHAR *prefixW, *localW, *uriW, *valueW; + HRESULT hr; + + prefixW = strdupAtoW(prefix); + localW = strdupAtoW(local); + uriW = strdupAtoW(uri); + valueW = strdupAtoW(value); + + hr = IXmlWriter_WriteElementString(writer, prefixW, localW, uriW, valueW); + + heap_free(prefixW); + heap_free(localW); + heap_free(uriW); + heap_free(valueW); + + return hr; +} + +static HRESULT write_start_element(IXmlWriter *writer, const char *prefix, const char *local, + const char *uri) +{ + WCHAR *prefixW, *localW, *uriW; + HRESULT hr; + + prefixW = strdupAtoW(prefix); + localW = strdupAtoW(local); + uriW = strdupAtoW(uri); + + hr = IXmlWriter_WriteStartElement(writer, prefixW, localW, uriW); + + heap_free(prefixW); + heap_free(localW); + heap_free(uriW); + + return hr; +} + static void test_WriteElementString(void) { static const struct @@ -996,13 +1036,18 @@ static void test_WriteElementString(void) } element_string_tests[] = { - { "prefix", "local", "uri", "value", "<prefix:local xmlns:prefix=\"uri\">value</prefix:local>", S_OK, 1 }, - { NULL, "local", "uri", "value", "<local xmlns=\"uri\">value</local>", S_OK, 1 }, - { "", "local", "uri", "value", "<local xmlns=\"uri\">value</local>", S_OK, 1 }, - { "prefix", "local", "uri", NULL, "<prefix:local xmlns:prefix=\"uri\" />", S_OK, 1 }, - { NULL, "local", "uri", NULL, "<local xmlns=\"uri\" />", S_OK, 1 }, - { "", "local", "uri", NULL, "<local xmlns=\"uri\" />", S_OK, 1 }, + { "prefix", "local", "uri", "value", "<prefix:local xmlns:prefix=\"uri\">value</prefix:local>" }, + { NULL, "local", "uri", "value", "<local xmlns=\"uri\">value</local>" }, + { "", "local", "uri", "value", "<local xmlns=\"uri\">value</local>" }, + { "prefix", "local", "uri", NULL, "<prefix:local xmlns:prefix=\"uri\" />" }, + { NULL, "local", "uri", NULL, "<local xmlns=\"uri\" />" }, + { "", "local", "uri", NULL, "<local xmlns=\"uri\" />" }, { NULL, "local", NULL, NULL, "<local />" }, + { "prefix", "local", "uri", "", "<prefix:local xmlns:prefix=\"uri\"></prefix:local>" }, + { NULL, "local", "uri", "", "<local xmlns=\"uri\"></local>" }, + { "", "local", "uri", "", "<local xmlns=\"uri\"></local>" }, + { NULL, "local", NULL, "", "<local></local>" }, + { "", "local", "http://www.w3.org/2000/xmlns/", NULL, "<local xmlns=\"http://www.w3.org/2000/xmlns/\" />" }, { "prefix", NULL, NULL, "value", NULL, E_INVALIDARG }, { NULL, NULL, "uri", "value", NULL, E_INVALIDARG }, @@ -1010,12 +1055,11 @@ static void test_WriteElementString(void) { NULL, "prefix:local", "uri", "value", NULL, WC_E_NAMECHARACTER }, { NULL, ":local", "uri", "value", NULL, WC_E_NAMECHARACTER }, { ":", "local", "uri", "value", NULL, WC_E_NAMECHARACTER }, + { "prefix", "local", NULL, "value", NULL, WR_E_NSPREFIXWITHEMPTYNSURI }, + { "prefix", "local", "", "value", NULL, WR_E_NSPREFIXWITHEMPTYNSURI }, { NULL, "local", "http://www.w3.org/2000/xmlns/", "value", NULL, WR_E_XMLNSPREFIXDECLARATION }, { "prefix", "local", "http://www.w3.org/2000/xmlns/", "value", NULL, WR_E_XMLNSURIDECLARATION }, }; - static const WCHAR valueW[] = {'v','a','l','u','e',0}; - static const WCHAR aW[] = {'a',0}; - static const WCHAR bW[] = {'b',0}; IXmlWriter *writer; IStream *stream; unsigned int i; @@ -1024,32 +1068,69 @@ static void test_WriteElementString(void) hr = CreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - hr = IXmlWriter_WriteElementString(writer, NULL, bW, NULL, valueW); + hr = write_element_string(writer, NULL, "b", NULL, "value"); ok(hr == E_UNEXPECTED, "got 0x%08x\n", hr); stream = writer_set_output(writer); - hr = IXmlWriter_WriteStartElement(writer, NULL, aW, NULL); + hr = write_start_element(writer, NULL, "a", NULL); ok(hr == S_OK, "got 0x%08x\n", hr); - hr = IXmlWriter_WriteElementString(writer, NULL, bW, NULL, valueW); + hr = write_element_string(writer, NULL, "b", NULL, "value"); ok(hr == S_OK, "got 0x%08x\n", hr); - hr = IXmlWriter_WriteElementString(writer, NULL, bW, NULL, NULL); + hr = write_element_string(writer, NULL, "b", NULL, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = write_element_string(writer, "prefix", "b", "uri", NULL); ok(hr == S_OK, "got 0x%08x\n", hr); + hr = write_start_element(writer, "prefix", "c", "uri"); + ok(hr == S_OK, "Failed to start element, hr %#x.\n", hr); + + hr = write_element_string(writer, "prefix", "d", NULL, NULL); + ok(hr == S_OK, "Failed to write element, hr %#x.\n", hr); + + hr = write_element_string(writer, "prefix2", "d", "uri", NULL); + ok(hr == S_OK, "Failed to write element, hr %#x.\n", hr); + + hr = write_element_string(writer, NULL, "e", "uri", NULL); + ok(hr == S_OK, "Failed to write element, hr %#x.\n", hr); + + hr = write_element_string(writer, "prefix", "f", "uri2", NULL); + ok(hr == S_OK, "Failed to write element, hr %#x.\n", hr); + + hr = write_element_string(writer, NULL, "g", "uri3", NULL); + ok(hr == S_OK, "Failed to write element, hr %#x.\n", hr); + + hr = write_element_string(writer, "prefix", "h", NULL, NULL); + ok(hr == S_OK, "Failed to write element, hr %#x.\n", hr); + + hr = write_element_string(writer, "prefix_i", "i", NULL, NULL); + ok(hr == WR_E_NSPREFIXWITHEMPTYNSURI, "Failed to write element, hr %#x.\n", hr); + + hr = write_element_string(writer, "", "j", "uri", NULL); + ok(hr == S_OK, "Failed to write element, hr %#x.\n", hr); + hr = IXmlWriter_Flush(writer); ok(hr == S_OK, "got 0x%08x\n", hr); CHECK_OUTPUT(stream, - "<a>value"); + "<a>value" + "<prefix:b xmlns:prefix=\"uri\" />" + "<prefix:c xmlns:prefix=\"uri\">" + "<prefix:d />" + "<prefix2:d xmlns:prefix2=\"uri\" />" + "<prefix:e />" + "<prefix:f xmlns:prefix=\"uri2\" />" + "<g xmlns=\"uri3\" />" + "<prefix:h />" + "<j xmlns=\"uri\" />"); IStream_Release(stream); for (i = 0; i < ARRAY_SIZE(element_string_tests); ++i) { - WCHAR *prefixW, *localW, *uriW, *valueW; - stream = writer_set_output(writer); writer_set_property(writer, XmlWriterProperty_OmitXmlDeclaration); @@ -1057,13 +1138,8 @@ static void test_WriteElementString(void) hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Omit); ok(hr == S_OK, "Failed to start document, hr %#x.\n", hr); - prefixW = strdupAtoW(element_string_tests[i].prefix); - localW = strdupAtoW(element_string_tests[i].local); - uriW = strdupAtoW(element_string_tests[i].uri); - valueW = strdupAtoW(element_string_tests[i].value); - - hr = IXmlWriter_WriteElementString(writer, prefixW, localW, uriW, valueW); - todo_wine_if(i >= 13) + hr = write_element_string(writer, element_string_tests[i].prefix, element_string_tests[i].local, + element_string_tests[i].uri, element_string_tests[i].value); ok(hr == element_string_tests[i].hr, "%u: unexpected hr %#x.\n", i, hr); if (SUCCEEDED(element_string_tests[i].hr)) @@ -1082,11 +1158,6 @@ static void test_WriteElementString(void) check_output(stream, element_string_tests[i].output, element_string_tests[i].todo, __LINE__); } - heap_free(prefixW); - heap_free(localW); - heap_free(uriW); - heap_free(valueW); - IStream_Release(stream); } diff --git a/dlls/xmllite/writer.c b/dlls/xmllite/writer.c index f9e8c666b2..e8935cd508 100644 --- a/dlls/xmllite/writer.c +++ b/dlls/xmllite/writer.c @@ -46,6 +46,9 @@ static const WCHAR ltW[] = {'<'}; static const WCHAR gtW[] = {'>'}; static const WCHAR spaceW[] = {' '}; static const WCHAR quoteW[] = {'"'}; +static const WCHAR eqW[] = {'='}; +static const WCHAR xmlnsW[] = {' ','x','m','l','n','s'}; +static const WCHAR xmlnsuriW[] = {'h','t','t','p',':','/','/','w','w','w','.','w','3','.','o','r','g','/','2','0','0','0','/','x','m','l','n','s','/',0}; struct output_buffer { @@ -81,11 +84,20 @@ typedef struct static const struct IUnknownVtbl xmlwriteroutputvtbl; +struct ns +{ + struct list entry; + WCHAR *prefix; + int prefix_len; + WCHAR *uri; +}; + struct element { struct list entry; WCHAR *qname; unsigned int len; /* qname length in chars */ + struct list ns; }; typedef struct _xmlwriter @@ -149,12 +161,12 @@ static inline void *writeroutput_realloc(xmlwriteroutput *output, void *mem, siz } /* writer memory allocation functions */ -static inline void *writer_alloc(xmlwriter *writer, size_t len) +static inline void *writer_alloc(const xmlwriter *writer, size_t len) { return m_alloc(writer->imalloc, len); } -static inline void writer_free(xmlwriter *writer, void *mem) +static inline void writer_free(const xmlwriter *writer, void *mem) { m_free(writer->imalloc, mem); } @@ -180,17 +192,39 @@ static struct element *alloc_element(xmlwriter *writer, const WCHAR *prefix, con else ret->qname[0] = 0; strcatW(ret->qname, local); + list_init(&ret->ns); return ret; } -static void free_element(xmlwriter *writer, struct element *element) +static void writer_free_element(xmlwriter *writer, struct element *element) { + struct ns *ns, *ns2; + + LIST_FOR_EACH_ENTRY_SAFE(ns, ns2, &element->ns, struct ns, entry) + { + list_remove(&ns->entry); + writer_free(writer, ns->prefix); + writer_free(writer, ns->uri); + writer_free(writer, ns); + } + writer_free(writer, element->qname); writer_free(writer, element); } -static void push_element(xmlwriter *writer, struct element *element) +static void writer_free_element_stack(xmlwriter *writer) +{ + struct element *element, *element2; + + LIST_FOR_EACH_ENTRY_SAFE(element, element2, &writer->elements, struct element, entry) + { + list_remove(&element->entry); + writer_free_element(writer, element); + } +} + +static void writer_push_element(xmlwriter *writer, struct element *element) { list_add_head(&writer->elements, &element->entry); } @@ -205,6 +239,46 @@ static struct element *pop_element(xmlwriter *writer) return element; } +static WCHAR *writer_strndupW(const xmlwriter *writer, const WCHAR *str, int len) +{ + size_t size; + WCHAR *ret; + + if (!str) + return NULL; + + if (len == -1) + len = strlenW(str); + + size = (len + 1) * sizeof(WCHAR); + ret = writer_alloc(writer, size); + memcpy(ret, str, size); + return ret; +} + +static WCHAR *writer_strdupW(const xmlwriter *writer, const WCHAR *str) +{ + return writer_strndupW(writer, str, -1); +} + +static void writer_push_ns(xmlwriter *writer, const WCHAR *prefix, int prefix_len, const WCHAR *uri) +{ + struct element *element; + struct ns *ns; + + element = LIST_ENTRY(list_head(&writer->elements), struct element, entry); + if (!element) + return; + + if ((ns = writer_alloc(writer, sizeof(*ns)))) + { + ns->prefix = writer_strndupW(writer, prefix, prefix_len); + ns->prefix_len = prefix_len; + ns->uri = writer_strdupW(writer, uri); + list_add_tail(&element->ns, &ns->entry); + } +} + static HRESULT init_output_buffer(xmlwriteroutput *output) { struct output_buffer *buffer = &output->buffer; @@ -298,13 +372,15 @@ static HRESULT write_output_buffer_quoted(xmlwriteroutput *output, const WCHAR * static HRESULT write_output_qname(xmlwriteroutput *output, const WCHAR *prefix, int prefix_len, const WCHAR *local_name, int local_len) { + static const WCHAR colW[] = {':'}; + assert(prefix_len >= 0 && local_len >= 0); - if (prefix_len) { - static const WCHAR colW[] = {':'}; + if (prefix_len) write_output_buffer(output, prefix, prefix_len); + + if (prefix_len && local_len) write_output_buffer(output, colW, ARRAY_SIZE(colW)); - } write_output_buffer(output, local_name, local_len); @@ -423,9 +499,21 @@ static HRESULT write_xmldecl(xmlwriter *writer, XmlStandalone standalone) static HRESULT writer_close_starttag(xmlwriter *writer) { + struct element *element; + struct ns *ns; HRESULT hr; if (!writer->starttagopen) return S_OK; + + element = LIST_ENTRY(list_head(&writer->elements), struct element, entry); + + LIST_FOR_EACH_ENTRY(ns, &element->ns, struct ns, entry) + { + write_output_qname(writer->output, xmlnsW, ARRAY_SIZE(xmlnsW), ns->prefix, ns->prefix_len); + write_output_buffer(writer->output, eqW, ARRAY_SIZE(eqW)); + write_output_buffer_quoted(writer->output, ns->uri, -1); + } + hr = write_output_buffer(writer->output, gtW, ARRAY_SIZE(gtW)); writer->starttagopen = FALSE; return hr; @@ -498,17 +586,12 @@ static ULONG WINAPI xmlwriter_Release(IXmlWriter *iface) TRACE("(%p)->(%u)\n", This, ref); if (ref == 0) { - struct element *element, *element2; IMalloc *imalloc = This->imalloc; writeroutput_flush_stream(This->output); if (This->output) IUnknown_Release(&This->output->IXmlWriterOutput_iface); - /* element stack */ - LIST_FOR_EACH_ENTRY_SAFE(element, element2, &This->elements, struct element, entry) { - list_remove(&element->entry); - free_element(This, element); - } + writer_free_element_stack(This); writer_free(This, This); if (imalloc) IMalloc_Release(imalloc); @@ -532,6 +615,7 @@ static HRESULT WINAPI xmlwriter_SetOutput(IXmlWriter *iface, IUnknown *output) This->output = NULL; This->bomwritten = FALSE; This->indent_level = 0; + writer_free_element_stack(This); } /* just reset current output */ @@ -635,7 +719,6 @@ static HRESULT WINAPI xmlwriter_WriteAttributes(IXmlWriter *iface, IXmlReader *p static HRESULT WINAPI xmlwriter_WriteAttributeString(IXmlWriter *iface, LPCWSTR ns_prefix, LPCWSTR local_name, LPCWSTR ns_uri, LPCWSTR value) { - static const WCHAR eqW[] = {'=','"'}; xmlwriter *This = impl_from_IXmlWriter(iface); TRACE("%p %s %s %s %s\n", This, debugstr_w(ns_prefix), debugstr_w(local_name), @@ -664,8 +747,7 @@ static HRESULT WINAPI xmlwriter_WriteAttributeString(IXmlWriter *iface, LPCWSTR write_output_buffer(This->output, spaceW, ARRAY_SIZE(spaceW)); write_output_buffer(This->output, local_name, -1); write_output_buffer(This->output, eqW, ARRAY_SIZE(eqW)); - write_output_buffer(This->output, value, -1); - write_output_buffer(This->output, quoteW, ARRAY_SIZE(quoteW)); + write_output_buffer_quoted(This->output, value, -1); return S_OK; } @@ -860,11 +942,46 @@ static HRESULT is_valid_ncname(const WCHAR *str, int *out) return S_OK; } +static BOOL is_empty_string(const WCHAR *str) +{ + return !str || !*str; +} + +static struct ns *writer_find_ns(xmlwriter *writer, const WCHAR *prefix, const WCHAR *uri) +{ + struct element *element; + struct ns *ns; + + if (is_empty_string(prefix) && is_empty_string(uri)) + return NULL; + + LIST_FOR_EACH_ENTRY(element, &writer->elements, struct element, entry) + { + LIST_FOR_EACH_ENTRY(ns, &element->ns, struct ns, entry) + { + if (!uri) + { + if (!ns->prefix) continue; + if (!strcmpW(ns->prefix, prefix)) + return ns; + } + else if (!strcmpW(uri, ns->uri)) + { + if (!prefix || !strcmpW(prefix, ns->prefix)) + return ns; + } + } + } + + return NULL; +} + static HRESULT WINAPI xmlwriter_WriteElementString(IXmlWriter *iface, LPCWSTR prefix, LPCWSTR local_name, LPCWSTR uri, LPCWSTR value) { xmlwriter *This = impl_from_IXmlWriter(iface); int prefix_len, local_len; + struct ns *ns; HRESULT hr; TRACE("(%p)->(%s %s %s %s)\n", This, wine_dbgstr_w(prefix), wine_dbgstr_w(local_name), @@ -895,10 +1012,34 @@ static HRESULT WINAPI xmlwriter_WriteElementString(IXmlWriter *iface, LPCWSTR pr if (FAILED(hr = is_valid_ncname(local_name, &local_len))) return hr; + ns = writer_find_ns(This, prefix, uri); + if (!ns && !is_empty_string(prefix) && is_empty_string(uri)) + return WR_E_NSPREFIXWITHEMPTYNSURI; + + if (uri && !strcmpW(uri, xmlnsuriW)) + { + if (!prefix) + return WR_E_XMLNSPREFIXDECLARATION; + + if (!is_empty_string(prefix)) + return WR_E_XMLNSURIDECLARATION; + } + write_encoding_bom(This); write_node_indent(This); + write_output_buffer(This->output, ltW, ARRAY_SIZE(ltW)); - write_output_qname(This->output, prefix, prefix_len, local_name, local_len); + if (ns) + write_output_qname(This->output, ns->prefix, ns->prefix_len, local_name, local_len); + else + write_output_qname(This->output, prefix, prefix_len, local_name, local_len); + + if (!ns && (prefix_len || !is_empty_string(uri))) + { + write_output_qname(This->output, xmlnsW, ARRAY_SIZE(xmlnsW), prefix, prefix_len); + write_output_buffer(This->output, eqW, ARRAY_SIZE(eqW)); + write_output_buffer_quoted(This->output, uri, -1); + } if (value) { @@ -1025,6 +1166,9 @@ static HRESULT WINAPI xmlwriter_WriteFullEndElement(IXmlWriter *iface) return WR_E_INVALIDACTION; case XmlWriterState_InvalidEncoding: return MX_E_ENCODING; + case XmlWriterState_ElemStarted: + writer_close_starttag(This); + break; default: ; } @@ -1033,7 +1177,6 @@ static HRESULT WINAPI xmlwriter_WriteFullEndElement(IXmlWriter *iface) if (!element) return WR_E_INVALIDACTION; - writer_close_starttag(This); writer_dec_indent(This); /* don't force full end tag to the next line */ @@ -1299,7 +1442,10 @@ static HRESULT WINAPI xmlwriter_WriteStartElement(IXmlWriter *iface, LPCWSTR pre This->state = XmlWriterState_ElemStarted; This->starttagopen = TRUE; - push_element(This, element); + writer_push_element(This, element); + + if (prefix_len && uri) + writer_push_ns(This, prefix, prefix_len, uri); write_output_buffer(This->output, ltW, ARRAY_SIZE(ltW)); write_output_qname(This->output, prefix, prefix_len, local_name, local_len); -- 2.18.0

1 2

[PATCH] dplayx: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 11 Sep '18

11 Sep '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dplayx/dplay.c | 12 ++++++------ dlls/dplayx/dplobby.c | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index fde068138e..65c7e4df5d 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -4335,7 +4335,7 @@ static HRESULT WINAPI IDirectPlay4AImpl_EnumConnections( IDirectPlay4A *iface, RegCloseKey(hkServiceProvider); /* FIXME: Check return types to ensure we're interpreting data right */ - MultiByteToWideChar( CP_ACP, 0, returnBuffer, -1, buff, sizeof(buff)/sizeof(WCHAR) ); + MultiByteToWideChar( CP_ACP, 0, returnBuffer, -1, buff, ARRAY_SIZE( buff )); CLSIDFromString( buff, &serviceProviderGUID ); /* FIXME: Have I got a memory leak on the serviceProviderGUID? */ @@ -4433,7 +4433,7 @@ static HRESULT WINAPI IDirectPlay4AImpl_EnumConnections( IDirectPlay4A *iface, RegCloseKey(hkServiceProvider); /* FIXME: Check return types to ensure we're interpreting data right */ - MultiByteToWideChar( CP_ACP, 0, returnBuffer, -1, buff, sizeof(buff)/sizeof(WCHAR) ); + MultiByteToWideChar( CP_ACP, 0, returnBuffer, -1, buff, ARRAY_SIZE( buff )); CLSIDFromString( buff, &serviceProviderGUID ); /* FIXME: Have I got a memory leak on the serviceProviderGUID? */ @@ -4682,7 +4682,7 @@ static HMODULE DP_LoadSP( LPCGUID lpcGuid, LPSPINITDATA lpSpData, LPBOOL lpbIsDp } /* FIXME: Check return types to ensure we're interpreting data right */ - MultiByteToWideChar( CP_ACP, 0, returnBuffer, -1, buff, sizeof(buff)/sizeof(WCHAR) ); + MultiByteToWideChar( CP_ACP, 0, returnBuffer, -1, buff, ARRAY_SIZE( buff )); CLSIDFromString( buff, &serviceProviderGUID ); /* FIXME: Have I got a memory leak on the serviceProviderGUID? */ @@ -5811,7 +5811,7 @@ static HRESULT DirectPlayEnumerateAW(LPDPENUMDPCALLBACKA lpEnumCallbackA, dwIndex = 0; do { - sizeOfSubKeyName = sizeof(subKeyName) / sizeof(WCHAR); + sizeOfSubKeyName = ARRAY_SIZE(subKeyName); ret_value = RegEnumKeyW(hkResult, dwIndex, subKeyName, sizeOfSubKeyName); dwIndex++; } @@ -5836,8 +5836,8 @@ static HRESULT DirectPlayEnumerateAW(LPDPENUMDPCALLBACKA lpEnumCallbackA, HKEY hkServiceProvider; WCHAR guidKeyContent[(2 * 16) + 1 + 6 /* This corresponds to '{....-..-..-..-......}' */ ]; DWORD sizeOfGuidKeyContent = sizeof(guidKeyContent); - - sizeOfSubKeyName = sizeof(subKeyName) / sizeof(WCHAR); + + sizeOfSubKeyName = ARRAY_SIZE(subKeyName); ret_value = RegEnumKeyExW(hkResult, dwIndex, subKeyName, &sizeOfSubKeyName, NULL, NULL, NULL, &filetime); if (ret_value == ERROR_NO_MORE_ITEMS) diff --git a/dlls/dplayx/dplobby.c b/dlls/dplayx/dplobby.c index 944fea9ec6..30d76aa16d 100644 --- a/dlls/dplayx/dplobby.c +++ b/dlls/dplayx/dplobby.c @@ -782,7 +782,7 @@ static HRESULT WINAPI IDirectPlayLobby3AImpl_EnumAddressTypes( IDirectPlayLobby3 } /* FIXME: Check return types to ensure we're interpreting data right */ - MultiByteToWideChar( CP_ACP, 0, returnBuffer, -1, buff, sizeof(buff)/sizeof(WCHAR) ); + MultiByteToWideChar( CP_ACP, 0, returnBuffer, -1, buff, ARRAY_SIZE( buff )); CLSIDFromString( buff, &serviceProviderGUID ); /* FIXME: Have I got a memory leak on the serviceProviderGUID? */ @@ -809,7 +809,7 @@ static HRESULT WINAPI IDirectPlayLobby3AImpl_EnumAddressTypes( IDirectPlayLobby3 TRACE( "Found Address Type GUID %s\n", atSubKey ); /* FIXME: Check return types to ensure we're interpreting data right */ - MultiByteToWideChar( CP_ACP, 0, atSubKey, -1, buff, sizeof(buff)/sizeof(WCHAR) ); + MultiByteToWideChar( CP_ACP, 0, atSubKey, -1, buff, ARRAY_SIZE( buff )); CLSIDFromString( buff, &serviceProviderGUID ); /* FIXME: Have I got a memory leak on the serviceProviderGUID? */ @@ -950,7 +950,7 @@ static HRESULT WINAPI IDirectPlayLobby3AImpl_EnumLocalApplications( IDirectPlayL } /* FIXME: Check return types to ensure we're interpreting data right */ - MultiByteToWideChar( CP_ACP, 0, returnBuffer, -1, buff, sizeof(buff)/sizeof(WCHAR) ); + MultiByteToWideChar( CP_ACP, 0, returnBuffer, -1, buff, ARRAY_SIZE( buff )); CLSIDFromString( buff, &serviceProviderGUID ); /* FIXME: Have I got a memory leak on the serviceProviderGUID? */ -- 2.14.4

2 1

[PATCH 2/3] riched20: Add stub for ITextDocument2 interface.
by Jactry Zeng 11 Sep '18

11 Sep '18

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/riched20/richole.c | 473 ++++++++++++++++++++++++++++++++++ dlls/riched20/tests/richole.c | 8 + 2 files changed, 481 insertions(+) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 5c7be5eaa9..6c21a8721c 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -46,6 +46,7 @@ DEFINE_GUID(IID_ITextServices, 0x8d33f740, 0xcf58, 0x11ce, 0xa8, 0x9d, 0x00, 0xa DEFINE_GUID(IID_ITextHost, 0x13e670f4,0x1a5a,0x11cf,0xab,0xeb,0x00,0xaa,0x00,0xb6,0x5e,0xa1); DEFINE_GUID(IID_ITextHost2, 0x13e670f5,0x1a5a,0x11cf,0xab,0xeb,0x00,0xaa,0x00,0xb6,0x5e,0xa1); DEFINE_GUID(IID_ITextDocument, 0x8cc497c0, 0xa1df, 0x11ce, 0x80, 0x98, 0x00, 0xaa, 0x00, 0x47, 0xbe, 0x5d); +DEFINE_GUID(IID_ITextDocument2, 0x01c25500, 0x4268, 0x11d1, 0x88, 0x3a, 0x3c, 0x8b, 0x00, 0xc1, 0x00, 0x00); DEFINE_GUID(IID_ITextRange, 0x8cc497c2, 0xa1df, 0x11ce, 0x80, 0x98, 0x00, 0xaa, 0x00, 0x47, 0xbe, 0x5d); DEFINE_GUID(IID_ITextSelection, 0x8cc497c1, 0xa1df, 0x11ce, 0x80, 0x98, 0x00, 0xaa, 0x00, 0x47, 0xbe, 0x5d); DEFINE_GUID(IID_ITextFont, 0x8cc497c3, 0xa1df, 0x11ce, 0x80, 0x98, 0x00, 0xaa, 0x00, 0x47, 0xbe, 0x5d); @@ -209,6 +210,7 @@ typedef struct IRichEditOleImpl { IUnknown IUnknown_inner; IRichEditOle IRichEditOle_iface; ITextDocument ITextDocument_iface; + ITextDocument2 ITextDocument2_iface; IUnknown *outer_unk; LONG ref; @@ -272,6 +274,11 @@ static inline IRichEditOleImpl *impl_from_ITextDocument(ITextDocument *iface) return CONTAINING_RECORD(iface, IRichEditOleImpl, ITextDocument_iface); } +static inline IRichEditOleImpl *impl_from_ITextDocument2(ITextDocument2 *iface) +{ + return CONTAINING_RECORD(iface, IRichEditOleImpl, ITextDocument2_iface); +} + static inline IRichEditOleImpl *impl_from_IUnknown(IUnknown *iface) { return CONTAINING_RECORD(iface, IRichEditOleImpl, IUnknown_inner); @@ -945,6 +952,8 @@ static HRESULT WINAPI IRichEditOleImpl_inner_fnQueryInterface(IUnknown *iface, R *ppvObj = &This->IRichEditOle_iface; else if (IsEqualGUID(riid, &IID_ITextDocument)) *ppvObj = &This->ITextDocument_iface; + else if (IsEqualGUID(riid, &IID_ITextDocument2)) + *ppvObj = &This->ITextDocument2_iface; if (*ppvObj) { IUnknown_AddRef((IUnknown *)*ppvObj); @@ -4178,6 +4187,469 @@ static const ITextDocumentVtbl tdvt = { ITextDocument_fnRangeFromPoint }; +/* ITextDocument2 */ +static HRESULT WINAPI ITextDocument2_fnQueryInterface(ITextDocument2 *iface, + REFIID riid, void **obj) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2(iface); + + return IRichEditOle_QueryInterface(&This->IRichEditOle_iface, riid, obj); +} + +static ULONG WINAPI ITextDocument2_fnAddRef(ITextDocument2 *iface) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2(iface); + + return IRichEditOle_AddRef(&This->IRichEditOle_iface); +} + +static ULONG WINAPI ITextDocument2_fnRelease(ITextDocument2 *iface) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2(iface); + + return IRichEditOle_Release(&This->IRichEditOle_iface); +} + +static HRESULT WINAPI ITextDocument2_fnGetTypeInfoCount(ITextDocument2 *iface, UINT *info) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2(iface); + + return ITextDocument_GetTypeInfoCount(&This->ITextDocument_iface, info); +} + +static HRESULT WINAPI ITextDocument2_fnGetTypeInfo(ITextDocument2 *iface, UINT info, LCID lcid, + ITypeInfo **type_info) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2(iface); + + return ITextDocument_GetTypeInfo(&This->ITextDocument_iface, info, lcid, type_info); +} + +static HRESULT WINAPI ITextDocument2_fnGetIDsOfNames(ITextDocument2 *iface, REFIID riid, LPOLESTR *name, + UINT name_count, LCID lcid, DISPID *dispid) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2(iface); + + return ITextDocument_GetIDsOfNames(&This->ITextDocument_iface, riid, name, name_count, lcid, dispid); +} + +static HRESULT WINAPI ITextDocument2_fnInvoke(ITextDocument2 *iface, DISPID dispid, REFIID riid, + LCID lcid, WORD flags, DISPPARAMS *dispparams, + VARIANT *var_result, EXCEPINFO *excepinfo, + UINT *arg_err) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2(iface); + + return ITextDocument_Invoke(&This->ITextDocument_iface, dispid, riid, lcid, flags, dispparams, + var_result, excepinfo, arg_err); +} + +static HRESULT WINAPI ITextDocument2_fnGetName(ITextDocument2 *iface, BSTR *name) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2(iface); + + TRACE("(%p)->(%p)\n", This, name); + + return ITextDocument_GetName(&This->ITextDocument_iface, name); +} + +static HRESULT WINAPI ITextDocument2_fnGetSelection(ITextDocument2 *iface, ITextSelection **selection) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2(iface); + + TRACE("(%p)->(%p)\n", This, selection); + + return ITextDocument_GetSelection(&This->ITextDocument_iface, selection); +} + +static HRESULT WINAPI ITextDocument2_fnGetStoryCount(ITextDocument2 *iface, LONG *count) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2(iface); + + TRACE("(%p)->(%p)\n", This, count); + + return ITextDocument_GetStoryCount(&This->ITextDocument_iface, count); +} + +static HRESULT WINAPI ITextDocument2_fnGetStoryRanges(ITextDocument2 *iface, ITextStoryRanges **story_ranges) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2(iface); + + TRACE("(%p)->(%p)\n", This, story_ranges); + + return ITextDocument_GetStoryRanges(&This->ITextDocument_iface, story_ranges); +} + +static HRESULT WINAPI ITextDocument2_fnGetSaved(ITextDocument2 *iface, LONG *value) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2(iface); + + TRACE("(%p)->(%p)\n", This, value); + + return ITextDocument_GetSaved(&This->ITextDocument_iface, value); +} + +static HRESULT WINAPI ITextDocument2_fnSetSaved(ITextDocument2 *iface, LONG value) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2(iface); + + TRACE("(%p)->(%d)\n", This, value); + + return ITextDocument_SetSaved(&This->ITextDocument_iface, value); +} + +static HRESULT WINAPI ITextDocument2_fnGetDefaultTabStop(ITextDocument2 *iface, float *value) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2(iface); + + TRACE("(%p)->(%p)\n", This, value); + + return ITextDocument_GetDefaultTabStop(&This->ITextDocument_iface, value); +} + +static HRESULT WINAPI ITextDocument2_fnSetDefaultTabStop(ITextDocument2 *iface, float value) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2(iface); + + TRACE("(%p)->(%f)\n", This, value); + + return ITextDocument_SetDefaultTabStop(&This->ITextDocument_iface, value); +} + +static HRESULT WINAPI ITextDocument2_fnNew(ITextDocument2 *iface) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2(iface); + + TRACE("(%p)\n", This); + + return ITextDocument_New(&This->ITextDocument_iface); +} + +static HRESULT WINAPI ITextDocument2_fnOpen(ITextDocument2 *iface, VARIANT *var, LONG flags, LONG codepage) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2(iface); + + TRACE("(%p)->(%p, %d, %d)\n", This, var, flags, codepage); + + return ITextDocument_Open(&This->ITextDocument_iface, var, flags, codepage); +} + +static HRESULT WINAPI ITextDocument2_fnSave(ITextDocument2 *iface, VARIANT *var, LONG flags, LONG codepage) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2(iface); + + TRACE("(%p)->(%p, %d, %d)\n", This, var, flags, codepage); + + return ITextDocument_Save(&This->ITextDocument_iface, var, flags, codepage); +} + +static HRESULT WINAPI ITextDocument2_fnFreeze(ITextDocument2 *iface, LONG *count) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2(iface); + + TRACE("(%p)->(%p)\n", This, count); + + return ITextDocument_Freeze(&This->ITextDocument_iface, count); +} + +static HRESULT WINAPI ITextDocument2_fnUnfreeze(ITextDocument2 *iface, LONG *count) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2(iface); + + TRACE("(%p)->(%p)\n", This, count); + + return ITextDocument_Unfreeze(&This->ITextDocument_iface, count); +} + +static HRESULT WINAPI ITextDocument2_fnBeginEditCollection(ITextDocument2 *iface) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2(iface); + + TRACE("(%p)\n", This); + + return ITextDocument_BeginEditCollection(&This->ITextDocument_iface); +} + +static HRESULT WINAPI ITextDocument2_fnEndEditCollection(ITextDocument2 *iface) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2(iface); + + TRACE("(%p)\n", This); + + return ITextDocument_EndEditCollection(&This->ITextDocument_iface); +} + +static HRESULT WINAPI ITextDocument2_fnUndo(ITextDocument2 *iface, LONG count, LONG *prop) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2(iface); + + TRACE("(%p)->(%d, %p)\n", This, count, prop); + + return ITextDocument_Undo(&This->ITextDocument_iface, count, prop); +} + +static HRESULT WINAPI ITextDocument2_fnRedo(ITextDocument2 *iface, LONG count, LONG *prop) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2(iface); + + TRACE("(%p)->(%d, %p)\n", This, count, prop); + + return ITextDocument_Redo(&This->ITextDocument_iface, count, prop); +} + +static HRESULT WINAPI ITextDocument2_fnRange(ITextDocument2 *iface, LONG cp_active, LONG cp_anchor, + ITextRange **range) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2(iface); + + TRACE("(%p)->(%d, %d, %p)\n", This, cp_active, cp_anchor, range); + + return ITextDocument_Range(&This->ITextDocument_iface, cp_active, cp_anchor, range); +} + +static HRESULT WINAPI ITextDocument2_fnRangeFromPoint(ITextDocument2 *iface, LONG x, LONG y, + ITextRange **range) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2(iface); + + TRACE("(%p)->(%d, %d, %p)\n", This, x, y, range); + + return ITextDocument_RangeFromPoint(&This->ITextDocument_iface, x, y, range); +} + +static HRESULT WINAPI ITextDocument2_fnAttachMsgFilter(ITextDocument2 *iface, IUnknown *filter) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2(iface); + + FIXME("(%p)->(%p): stub\n", This, filter); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextDocument2_fnSetEffectColor(ITextDocument2 *iface, LONG index, COLORREF cr) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2(iface); + + FIXME("(%p)->(%d, 0x%x): stub\n", This, index, cr); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextDocument2_fnGetEffectColor(ITextDocument2 *iface, LONG index, COLORREF *cr) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2(iface); + + FIXME("(%p)->(%d, %p): stub\n", This, index, cr); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextDocument2_fnGetCaretType(ITextDocument2 *iface, LONG *type) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2(iface); + + FIXME("(%p)->(%p): stub\n", This, type); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextDocument2_fnSetCaretType(ITextDocument2 *iface, LONG type) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2(iface); + + FIXME("(%p)->(%d): stub\n", This, type); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextDocument2_fnGetImmContext(ITextDocument2 *iface, LONG *context) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2(iface); + + FIXME("(%p)->(%p): stub\n", This, context); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextDocument2_fnReleaseImmContext(ITextDocument2 *iface, LONG context) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2(iface); + + FIXME("(%p)->(%d): stub\n", This, context); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextDocument2_fnGetPreferredFont(ITextDocument2 *iface, LONG cp, LONG charrep, + LONG options, LONG current_charrep, LONG current_fontsize, + BSTR *bstr, LONG *pitch_family, LONG *new_fontsize) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2(iface); + + FIXME("(%p)->(%d, %d, %d, %d, %d, %p, %p, %p): stub\n", This, cp, charrep, options, current_charrep, + current_fontsize, bstr, pitch_family, new_fontsize); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextDocument2_fnGetNotificationMode(ITextDocument2 *iface, LONG *mode) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2(iface); + + FIXME("(%p)->(%p): stub\n", This, mode); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextDocument2_fnSetNotificationMode(ITextDocument2 *iface, LONG mode) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2(iface); + + FIXME("(%p)->(0x%x): stub\n", This, mode); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextDocument2_fnGetClientRect(ITextDocument2 *iface, LONG type, LONG *left, LONG *top, + LONG *right, LONG *bottom) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2(iface); + + FIXME("(%p)->(%d, %p, %p, %p, %p): stub\n", This, type, left, top, right, bottom); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextDocument2_fnGetSelectionEx(ITextDocument2 *iface, ITextSelection **selection) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2(iface); + + FIXME("(%p)->(%p): stub\n", This, selection); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextDocument2_fnGetWindow(ITextDocument2 *iface, LONG *hwnd) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2(iface); + + FIXME("(%p)->(%p): stub\n", This, hwnd); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextDocument2_fnGetFEFlags(ITextDocument2 *iface, LONG *flags) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2(iface); + + FIXME("(%p)->(%p): stub\n", This, flags); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextDocument2_fnUpdateWindow(ITextDocument2 *iface) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2(iface); + + FIXME("(%p): stub\n", This); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextDocument2_fnCheckTextLimit(ITextDocument2 *iface, LONG cch, LONG *exceed) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2(iface); + + FIXME("(%p)->(%d, %p): stub\n", This, cch, exceed); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextDocument2_fnIMEInProgress(ITextDocument2 *iface, LONG mode) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2(iface); + + FIXME("(%p)->(0x%x): stub\n", This, mode); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextDocument2_fnSysBeep(ITextDocument2 *iface) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2(iface); + + FIXME("(%p): stub\n", This); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextDocument2_fnUpdate(ITextDocument2 *iface, LONG mode) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2(iface); + + FIXME("(%p)->(0x%x): stub\n", This, mode); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextDocument2_fnNotify(ITextDocument2 *iface, LONG notify) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2(iface); + + FIXME("(%p)->(%d): stub\n", This, notify); + + return E_NOTIMPL; +} + +static const ITextDocument2Vtbl td2vt = { + ITextDocument2_fnQueryInterface, + ITextDocument2_fnAddRef, + ITextDocument2_fnRelease, + ITextDocument2_fnGetTypeInfoCount, + ITextDocument2_fnGetTypeInfo, + ITextDocument2_fnGetIDsOfNames, + ITextDocument2_fnInvoke, + ITextDocument2_fnGetName, + ITextDocument2_fnGetSelection, + ITextDocument2_fnGetStoryCount, + ITextDocument2_fnGetStoryRanges, + ITextDocument2_fnGetSaved, + ITextDocument2_fnSetSaved, + ITextDocument2_fnGetDefaultTabStop, + ITextDocument2_fnSetDefaultTabStop, + ITextDocument2_fnNew, + ITextDocument2_fnOpen, + ITextDocument2_fnSave, + ITextDocument2_fnFreeze, + ITextDocument2_fnUnfreeze, + ITextDocument2_fnBeginEditCollection, + ITextDocument2_fnEndEditCollection, + ITextDocument2_fnUndo, + ITextDocument2_fnRedo, + ITextDocument2_fnRange, + ITextDocument2_fnRangeFromPoint, + ITextDocument2_fnAttachMsgFilter, + ITextDocument2_fnSetEffectColor, + ITextDocument2_fnGetEffectColor, + ITextDocument2_fnGetCaretType, + ITextDocument2_fnSetCaretType, + ITextDocument2_fnGetImmContext, + ITextDocument2_fnReleaseImmContext, + ITextDocument2_fnGetPreferredFont, + ITextDocument2_fnGetNotificationMode, + ITextDocument2_fnSetNotificationMode, + ITextDocument2_fnGetClientRect, + ITextDocument2_fnGetSelectionEx, + ITextDocument2_fnGetWindow, + ITextDocument2_fnGetFEFlags, + ITextDocument2_fnUpdateWindow, + ITextDocument2_fnCheckTextLimit, + ITextDocument2_fnIMEInProgress, + ITextDocument2_fnSysBeep, + ITextDocument2_fnUpdate, + ITextDocument2_fnNotify +}; + /* ITextSelection */ static HRESULT WINAPI ITextSelection_fnQueryInterface( ITextSelection *me, @@ -5277,6 +5749,7 @@ LRESULT CreateIRichEditOle(IUnknown *outer_unk, ME_TextEditor *editor, LPVOID *p reo->IUnknown_inner.lpVtbl = &reo_unk_vtbl; reo->IRichEditOle_iface.lpVtbl = &revt; reo->ITextDocument_iface.lpVtbl = &tdvt; + reo->ITextDocument2_iface.lpVtbl = &td2vt; reo->ref = 1; reo->editor = editor; reo->txtSel = NULL; diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index aaf52bcfdd..ab2af3fdb7 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -117,6 +117,7 @@ static void test_Interfaces(void) { IRichEditOle *reOle = NULL, *reOle1 = NULL; ITextDocument *txtDoc = NULL; + ITextDocument2 *txtDoc2 = NULL; ITextSelection *txtSel = NULL, *txtSel2; IUnknown *punk; HRESULT hres; @@ -195,6 +196,13 @@ static void test_Interfaces(void) hres = IRichEditOle_QueryInterface(reOle, &IID_IOleInPlaceSite, (void **) &punk); ok(hres == E_NOINTERFACE, "IRichEditOle_QueryInterface\n"); + hres = IRichEditOle_QueryInterface(reOle, &IID_ITextDocument2, (void **)&txtDoc2); + ok(hres == S_OK, "IRichEditOle_QueryInterface\n"); + ok(txtDoc2 != NULL, "IRichEditOle_QueryInterface\n"); + EXPECT_REF(txtDoc2, 5); + EXPECT_REF(reOle, 5); + ITextDocument2_Release(txtDoc2); + ITextDocument_Release(txtDoc); IRichEditOle_Release(reOle); refcount = IRichEditOle_Release(reOle); -- 2.18.0

3 2

[PATCH 1/3] include: Add ITextDocument2 interface.
by Jactry Zeng 11 Sep '18

11 Sep '18

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- include/tom.idl | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/include/tom.idl b/include/tom.idl index 357b0457a5..7e63e6c301 100644 --- a/include/tom.idl +++ b/include/tom.idl @@ -237,6 +237,35 @@ interface ITextDocument : IDispatch HRESULT RangeFromPoint([in]LONG x, [in]LONG y, [retval, out]ITextRange **ppRange); } +[ + object, + uuid(01C25500-4268-11D1-883A-3C8B00C10000) +] +interface ITextDocument2 : ITextDocument +{ + HRESULT AttachMsgFilter([in]IUnknown *filter); + HRESULT SetEffectColor([in]LONG index, [in]COLORREF cr); + HRESULT GetEffectColor([in]LONG index, [out]COLORREF *cr); + HRESULT GetCaretType([retval, out]LONG *type); + HRESULT SetCaretType([in]LONG type); + HRESULT GetImmContext([retval, out]LONG *context); + HRESULT ReleaseImmContext([in]LONG context); + HRESULT GetPreferredFont([in]LONG cp, [in]LONG codepage, [in]LONG option, [in]LONG current_codepage, [in]LONG current_fontsize, + [out]BSTR *bstr, [out]LONG *pitch_family, [out]LONG *new_fontsize); + HRESULT GetNotificationMode([retval, out]LONG *mode); + HRESULT SetNotificationMode([in]LONG mode); + HRESULT GetClientRect([in]LONG type, [out]LONG *left, [out]LONG *top, [out]LONG *right, [out]LONG *bottom); + HRESULT GetSelectionEx([retval, out]ITextSelection **selection); + HRESULT GetWindow([out]LONG *hwnd); + HRESULT GetFEFlags([out]LONG *flags); + HRESULT UpdateWindow(); + HRESULT CheckTextLimit([in]LONG cch, [out]LONG *exceed); + HRESULT IMEInProgress([in]LONG mode); + HRESULT SysBeep(); + HRESULT Update([in]LONG mode); + HRESULT Notify([in]LONG notify); +} + interface ITextFont; interface ITextPara; -- 2.18.0

3 2

[PATCH] riched20: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 11 Sep '18

11 Sep '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/riched20/editor.c | 11 +++++------ dlls/riched20/paint.c | 2 +- dlls/riched20/para.c | 4 ++-- dlls/riched20/reader.c | 4 ++-- dlls/riched20/richole.c | 6 +++--- dlls/riched20/style.c | 4 ++-- dlls/riched20/wrap.c | 4 ++-- dlls/riched20/writer.c | 2 +- 8 files changed, 18 insertions(+), 19 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 12f1fa67c1..2571ce97bc 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -518,8 +518,8 @@ void ME_RTFCharAttrHook(RTF_Info *info) RTFFont *f = RTFGetFont(info, info->rtfParam); if (f) { - MultiByteToWideChar(CP_ACP, 0, f->rtfFName, -1, fmt.szFaceName, sizeof(fmt.szFaceName)/sizeof(WCHAR)); - fmt.szFaceName[sizeof(fmt.szFaceName)/sizeof(WCHAR)-1] = '\0'; + MultiByteToWideChar(CP_ACP, 0, f->rtfFName, -1, fmt.szFaceName, ARRAY_SIZE(fmt.szFaceName)); + fmt.szFaceName[ARRAY_SIZE(fmt.szFaceName)-1] = '\0'; fmt.bCharSet = f->rtfFCharSet; fmt.dwMask = CFM_FACE | CFM_CHARSET; fmt.bPitchAndFamily = f->rtfFPitch | (f->rtfFFamily << 4); @@ -5272,10 +5272,9 @@ static BOOL isurlneutral( WCHAR c ) /* Some shortcuts */ if (isalnum( c )) return FALSE; - if (c > neutral_chars[sizeof(neutral_chars) / sizeof(neutral_chars[0]) - 1]) return FALSE; + if (c > neutral_chars[ARRAY_SIZE( neutral_chars ) - 1]) return FALSE; - return !!bsearch( &c, neutral_chars, sizeof(neutral_chars) / sizeof(neutral_chars[0]), - sizeof(c), wchar_comp ); + return !!bsearch( &c, neutral_chars, ARRAY_SIZE( neutral_chars ), sizeof(c), wchar_comp ); } /** @@ -5408,7 +5407,7 @@ static BOOL ME_IsCandidateAnURL(ME_TextEditor *editor, const ME_Cursor *start, i unsigned int i; ME_GetTextW(editor, bufferW, MAX_PREFIX_LEN, start, nChars, FALSE, FALSE); - for (i = 0; i < sizeof(prefixes) / sizeof(*prefixes); i++) + for (i = 0; i < ARRAY_SIZE(prefixes); i++) { if (nChars < prefixes[i].length) continue; if (!memcmp(prefixes[i].text, bufferW, prefixes[i].length * sizeof(WCHAR))) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index fcc4e105a3..44cf3cbe78 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -536,7 +536,7 @@ int ME_GetParaBorderWidth(const ME_Context* c, int flags) int idx = (flags >> 8) & 0xF; int width; - if (idx >= sizeof(border_details) / sizeof(border_details[0])) + if (idx >= ARRAY_SIZE(border_details)) { FIXME("Unsupported border value %d\n", idx); return 0; diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index 8f35342b8e..fcd7936807 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -206,7 +206,7 @@ static ME_String *para_num_get_str( ME_Paragraph *para, WORD num ) /* This is not base-26 (or 27) as zeros don't count unless they are leading zeros. It's simplest to start with the least significant letter, so first calculate how many letters are needed. */ - for (i = 0, total = 0; i < sizeof(letter_base) / sizeof(letter_base[0]); i++) + for (i = 0, total = 0; i < ARRAY_SIZE( letter_base ); i++) { total += letter_base[i]; if (num < total) break; @@ -228,7 +228,7 @@ static ME_String *para_num_get_str( ME_Paragraph *para, WORD num ) case PFN_UCROMAN: if (!num) num = 1; - for (i = 0; i < sizeof(roman_base) / sizeof(roman_base[0]); i++) + for (i = 0; i < ARRAY_SIZE( roman_base ); i++) { if (i > 0) { diff --git a/dlls/riched20/reader.c b/dlls/riched20/reader.c index 339ca04949..8410241729 100644 --- a/dlls/riched20/reader.c +++ b/dlls/riched20/reader.c @@ -2596,13 +2596,13 @@ RTFPutUnicodeString(RTF_Info *info, const WCHAR *string, int length) RTFFlushCPOutputBuffer(info); while (length) { - int fit = min(length, sizeof(info->OutputBuffer) / sizeof(WCHAR) - info->dwOutputCount); + int fit = min(length, ARRAY_SIZE(info->OutputBuffer) - info->dwOutputCount); memmove(info->OutputBuffer + info->dwOutputCount, string, fit * sizeof(WCHAR)); info->dwOutputCount += fit; length -= fit; string += fit; - if (sizeof(info->OutputBuffer) / sizeof(WCHAR) == info->dwOutputCount) + if (ARRAY_SIZE(info->OutputBuffer) == info->dwOutputCount) RTFFlushUnicodeOutputBuffer(info); } } diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 5c7be5eaa9..11b9920b57 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -97,7 +97,7 @@ void release_typelib(void) if (!typelib) return; - for (i = 0; i < sizeof(typeinfos)/sizeof(*typeinfos); i++) + for (i = 0; i < ARRAY_SIZE(typeinfos); i++) if (typeinfos[i]) ITypeInfo_Release(typeinfos[i]); @@ -633,7 +633,7 @@ static void textrange_set_font(ITextRange *range, ITextFont *font) if (ITextFont_GetName(font, &str) == S_OK) { fmt.dwMask |= CFM_FACE; - lstrcpynW(fmt.szFaceName, str, sizeof(fmt.szFaceName)/sizeof(WCHAR)); + lstrcpynW(fmt.szFaceName, str, ARRAY_SIZE(fmt.szFaceName)); SysFreeString(str); } @@ -817,7 +817,7 @@ static HRESULT set_textfont_prop(ITextFontImpl *font, enum textfont_prop_id prop fmt.wWeight = value->l; break; case FONT_NAME: - lstrcpynW(fmt.szFaceName, value->str, sizeof(fmt.szFaceName)/sizeof(WCHAR)); + lstrcpynW(fmt.szFaceName, value->str, ARRAY_SIZE(fmt.szFaceName)); break; default: FIXME("unhandled font property %d\n", propid); diff --git a/dlls/riched20/style.c b/dlls/riched20/style.c index 97e98a7a14..c3f3fc3f9a 100644 --- a/dlls/riched20/style.c +++ b/dlls/riched20/style.c @@ -41,7 +41,7 @@ BOOL cfany_to_cf2w(CHARFORMAT2W *to, const CHARFORMAT2W *from) CopyMemory(to, f, FIELD_OFFSET(CHARFORMATA, szFaceName)); to->cbSize = sizeof(CHARFORMAT2W); if (f->dwMask & CFM_FACE) { - MultiByteToWideChar(CP_ACP, 0, f->szFaceName, -1, to->szFaceName, sizeof(to->szFaceName)/sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, f->szFaceName, -1, to->szFaceName, ARRAY_SIZE(to->szFaceName)); } return TRUE; } @@ -61,7 +61,7 @@ BOOL cfany_to_cf2w(CHARFORMAT2W *to, const CHARFORMAT2W *from) CopyMemory(to, f, FIELD_OFFSET(CHARFORMATA, szFaceName)); /* convert face name */ if (f->dwMask & CFM_FACE) - MultiByteToWideChar(CP_ACP, 0, f->szFaceName, -1, to->szFaceName, sizeof(to->szFaceName)/sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, f->szFaceName, -1, to->szFaceName, ARRAY_SIZE(to->szFaceName)); /* copy the rest of the 2A structure to 2W */ CopyMemory(&to->wWeight, &f->wWeight, sizeof(CHARFORMAT2A)-FIELD_OFFSET(CHARFORMAT2A, wWeight)); to->cbSize = sizeof(CHARFORMAT2W); diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index e3a70f07d1..5a1c499034 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -260,7 +260,7 @@ static void layout_row( ME_DisplayItem *start, const ME_DisplayItem *end ) TRACE("%d runs\n", num_runs); if (!num_runs) return; - if (num_runs > sizeof(buf) / (sizeof(buf[0]) * 5)) + if (num_runs > ARRAY_SIZE( buf ) / 5) vis_to_log = heap_alloc( num_runs * sizeof(int) * 5 ); log_to_vis = vis_to_log + num_runs; @@ -766,7 +766,7 @@ static HRESULT itemize_para( ME_Context *c, ME_DisplayItem *p ) ME_Run *run; ME_DisplayItem *di; SCRIPT_ITEM buf[16], *items = buf; - int items_passed = sizeof( buf ) / sizeof( buf[0] ), num_items, cur_item; + int items_passed = ARRAY_SIZE( buf ), num_items, cur_item; SCRIPT_CONTROL control = { LANG_USER_DEFAULT, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, 0 }; SCRIPT_STATE state = { 0, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, 0, 0 }; diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index b1e99d642f..2bd97d8db2 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -760,7 +760,7 @@ ME_StreamOutRTFCharProps(ME_OutStream *pStream, CHARFORMAT2W *fmt) { CFE_STRIKEOUT, "\\strike", "\\strike0" }, }; - for (i = 0; i < sizeof(effects) / sizeof(effects[0]); i++) + for (i = 0; i < ARRAY_SIZE( effects ); i++) { if ((old_fmt->dwEffects ^ fmt->dwEffects) & effects[i].effect) strcat( props, fmt->dwEffects & effects[i].effect ? effects[i].on : effects[i].off ); -- 2.14.4

2 1

[PATCH] winhttp: Implement WINHTTP_OPTION_RECEIVE_RESPONSE_TIMEOUT.
by Hans Leidekker 11 Sep '18

11 Sep '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/request.c | 6 +- dlls/winhttp/session.c | 138 ++++++++++++++++++++++++++++------------- dlls/winhttp/tests/winhttp.c | 68 +++++++++++++++++++- dlls/winhttp/winhttp_private.h | 6 +- 4 files changed, 169 insertions(+), 49 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 3e6d2af396..80694da02e 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1741,7 +1741,7 @@ static BOOL open_connection( request_t *request ) return FALSE; } netconn_set_timeout( netconn, TRUE, request->send_timeout ); - netconn_set_timeout( netconn, FALSE, request->recv_timeout ); + netconn_set_timeout( netconn, FALSE, request->receive_response_timeout ); if (is_secure) { if (connect->session->proxy_server && @@ -1776,7 +1776,7 @@ static BOOL open_connection( request_t *request ) TRACE("using connection %p\n", netconn); netconn_set_timeout( netconn, TRUE, request->send_timeout ); - netconn_set_timeout( netconn, FALSE, request->recv_timeout ); + netconn_set_timeout( netconn, FALSE, request->receive_response_timeout ); request->netconn = netconn; } @@ -2628,6 +2628,7 @@ static BOOL receive_response( request_t *request, BOOL async ) BOOL ret; DWORD size, query, status; + netconn_set_timeout( request->netconn, FALSE, request->receive_response_timeout ); for (;;) { if (!(ret = read_reply( request ))) @@ -2665,6 +2666,7 @@ static BOOL receive_response( request_t *request, BOOL async ) break; } + netconn_set_timeout( request->netconn, FALSE, request->receive_timeout ); if (request->content_length) refill_buffer( request, FALSE ); if (async) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index b697d4febf..959cafa209 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -46,10 +46,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(winhttp); -#define DEFAULT_RESOLVE_TIMEOUT 0 -#define DEFAULT_CONNECT_TIMEOUT 20000 -#define DEFAULT_SEND_TIMEOUT 30000 -#define DEFAULT_RECEIVE_TIMEOUT 30000 +#define DEFAULT_RESOLVE_TIMEOUT 0 +#define DEFAULT_CONNECT_TIMEOUT 20000 +#define DEFAULT_SEND_TIMEOUT 30000 +#define DEFAULT_RECEIVE_TIMEOUT 30000 +#define DEFAULT_RECEIVE_RESPONSE_TIMEOUT ~0u void set_last_error( DWORD error ) { @@ -132,18 +133,27 @@ static BOOL session_query_option( object_header_t *hdr, DWORD option, LPVOID buf *(DWORD *)buffer = session->resolve_timeout; *buflen = sizeof(DWORD); return TRUE; + case WINHTTP_OPTION_CONNECT_TIMEOUT: *(DWORD *)buffer = session->connect_timeout; *buflen = sizeof(DWORD); return TRUE; + case WINHTTP_OPTION_SEND_TIMEOUT: *(DWORD *)buffer = session->send_timeout; *buflen = sizeof(DWORD); return TRUE; + case WINHTTP_OPTION_RECEIVE_TIMEOUT: - *(DWORD *)buffer = session->recv_timeout; + *(DWORD *)buffer = session->receive_timeout; + *buflen = sizeof(DWORD); + return TRUE; + + case WINHTTP_OPTION_RECEIVE_RESPONSE_TIMEOUT: + *(DWORD *)buffer = session->receive_response_timeout; *buflen = sizeof(DWORD); return TRUE; + default: FIXME("unimplemented option %u\n", option); set_last_error( ERROR_INVALID_PARAMETER ); @@ -193,31 +203,44 @@ static BOOL session_set_option( object_header_t *hdr, DWORD option, LPVOID buffe case WINHTTP_OPTION_DISABLE_FEATURE: set_last_error( ERROR_WINHTTP_INCORRECT_HANDLE_TYPE ); return FALSE; + case WINHTTP_OPTION_RESOLVE_TIMEOUT: session->resolve_timeout = *(DWORD *)buffer; return TRUE; + case WINHTTP_OPTION_CONNECT_TIMEOUT: session->connect_timeout = *(DWORD *)buffer; return TRUE; + case WINHTTP_OPTION_SEND_TIMEOUT: session->send_timeout = *(DWORD *)buffer; return TRUE; + case WINHTTP_OPTION_RECEIVE_TIMEOUT: - session->recv_timeout = *(DWORD *)buffer; + session->receive_timeout = *(DWORD *)buffer; return TRUE; + + case WINHTTP_OPTION_RECEIVE_RESPONSE_TIMEOUT: + session->receive_response_timeout = *(DWORD *)buffer; + return TRUE; + case WINHTTP_OPTION_CONFIGURE_PASSPORT_AUTH: FIXME("WINHTTP_OPTION_CONFIGURE_PASSPORT_AUTH: 0x%x\n", *(DWORD *)buffer); return TRUE; + case WINHTTP_OPTION_UNLOAD_NOTIFY_EVENT: TRACE("WINHTTP_OPTION_UNLOAD_NOTIFY_EVENT: %p\n", *(HANDLE *)buffer); session->unload_event = *(HANDLE *)buffer; return TRUE; + case WINHTTP_OPTION_MAX_CONNS_PER_SERVER: FIXME("WINHTTP_OPTION_MAX_CONNS_PER_SERVER: %d\n", *(DWORD *)buffer); return TRUE; + case WINHTTP_OPTION_MAX_CONNS_PER_1_0_SERVER: FIXME("WINHTTP_OPTION_MAX_CONNS_PER_1_0_SERVER: %d\n", *(DWORD *)buffer); return TRUE; + default: FIXME("unimplemented option %u\n", option); set_last_error( ERROR_WINHTTP_INVALID_OPTION ); @@ -253,7 +276,8 @@ HINTERNET WINAPI WinHttpOpen( LPCWSTR agent, DWORD access, LPCWSTR proxy, LPCWST session->resolve_timeout = DEFAULT_RESOLVE_TIMEOUT; session->connect_timeout = DEFAULT_CONNECT_TIMEOUT; session->send_timeout = DEFAULT_SEND_TIMEOUT; - session->recv_timeout = DEFAULT_RECEIVE_TIMEOUT; + session->receive_timeout = DEFAULT_RECEIVE_TIMEOUT; + session->receive_response_timeout = DEFAULT_RECEIVE_RESPONSE_TIMEOUT; list_init( &session->cookie_cache ); if (agent && !(session->agent = strdupW( agent ))) goto end; @@ -334,18 +358,27 @@ static BOOL connect_query_option( object_header_t *hdr, DWORD option, LPVOID buf *(DWORD *)buffer = connect->session->resolve_timeout; *buflen = sizeof(DWORD); return TRUE; + case WINHTTP_OPTION_CONNECT_TIMEOUT: *(DWORD *)buffer = connect->session->connect_timeout; *buflen = sizeof(DWORD); return TRUE; + case WINHTTP_OPTION_SEND_TIMEOUT: *(DWORD *)buffer = connect->session->send_timeout; *buflen = sizeof(DWORD); return TRUE; + case WINHTTP_OPTION_RECEIVE_TIMEOUT: - *(DWORD *)buffer = connect->session->recv_timeout; + *(DWORD *)buffer = connect->session->receive_timeout; *buflen = sizeof(DWORD); return TRUE; + + case WINHTTP_OPTION_RECEIVE_RESPONSE_TIMEOUT: + *(DWORD *)buffer = connect->session->receive_response_timeout; + *buflen = sizeof(DWORD); + return TRUE; + default: FIXME("unimplemented option %u\n", option); set_last_error( ERROR_INVALID_PARAMETER ); @@ -795,16 +828,24 @@ static BOOL request_query_option( object_header_t *hdr, DWORD option, LPVOID buf *(DWORD *)buffer = request->resolve_timeout; *buflen = sizeof(DWORD); return TRUE; + case WINHTTP_OPTION_CONNECT_TIMEOUT: *(DWORD *)buffer = request->connect_timeout; *buflen = sizeof(DWORD); return TRUE; + case WINHTTP_OPTION_SEND_TIMEOUT: *(DWORD *)buffer = request->send_timeout; *buflen = sizeof(DWORD); return TRUE; + case WINHTTP_OPTION_RECEIVE_TIMEOUT: - *(DWORD *)buffer = request->recv_timeout; + *(DWORD *)buffer = request->receive_timeout; + *buflen = sizeof(DWORD); + return TRUE; + + case WINHTTP_OPTION_RECEIVE_RESPONSE_TIMEOUT: + *(DWORD *)buffer = request->receive_response_timeout; *buflen = sizeof(DWORD); return TRUE; @@ -927,14 +968,21 @@ static BOOL request_set_option( object_header_t *hdr, DWORD option, LPVOID buffe case WINHTTP_OPTION_RESOLVE_TIMEOUT: request->resolve_timeout = *(DWORD *)buffer; return TRUE; + case WINHTTP_OPTION_CONNECT_TIMEOUT: request->connect_timeout = *(DWORD *)buffer; return TRUE; + case WINHTTP_OPTION_SEND_TIMEOUT: request->send_timeout = *(DWORD *)buffer; return TRUE; + case WINHTTP_OPTION_RECEIVE_TIMEOUT: - request->recv_timeout = *(DWORD *)buffer; + request->receive_timeout = *(DWORD *)buffer; + return TRUE; + + case WINHTTP_OPTION_RECEIVE_RESPONSE_TIMEOUT: + request->receive_response_timeout = *(DWORD *)buffer; return TRUE; case WINHTTP_OPTION_USERNAME: @@ -977,6 +1025,7 @@ static BOOL request_set_option( object_header_t *hdr, DWORD option, LPVOID buffe } FIXME("WINHTTP_OPTION_CLIENT_CERT_CONTEXT\n"); return TRUE; + case WINHTTP_OPTION_ENABLE_FEATURE: if(buflen == sizeof( DWORD ) && *(DWORD *)buffer == WINHTTP_ENABLE_SSL_REVOCATION) { @@ -989,9 +1038,11 @@ static BOOL request_set_option( object_header_t *hdr, DWORD option, LPVOID buffe SetLastError( ERROR_INVALID_PARAMETER ); return FALSE; } + case WINHTTP_OPTION_CONNECT_RETRIES: FIXME("WINHTTP_OPTION_CONNECT_RETRIES\n"); return TRUE; + default: FIXME("unimplemented option %u\n", option); set_last_error( ERROR_WINHTTP_INVALID_OPTION ); @@ -1094,7 +1145,8 @@ HINTERNET WINAPI WinHttpOpenRequest( HINTERNET hconnect, LPCWSTR verb, LPCWSTR o request->resolve_timeout = connect->session->resolve_timeout; request->connect_timeout = connect->session->connect_timeout; request->send_timeout = connect->session->send_timeout; - request->recv_timeout = connect->session->recv_timeout; + request->receive_timeout = connect->session->receive_timeout; + request->receive_response_timeout = connect->session->receive_response_timeout; if (!verb || !verb[0]) verb = getW; if (!(request->verb = strdupW( verb ))) goto end; @@ -2024,8 +2076,6 @@ BOOL WINAPI WinHttpSetTimeouts( HINTERNET handle, int resolve, int connect, int { BOOL ret = TRUE; object_header_t *hdr; - request_t *request; - session_t *session; TRACE("%p, %d, %d, %d, %d\n", handle, resolve, connect, send, receive); @@ -2043,43 +2093,45 @@ BOOL WINAPI WinHttpSetTimeouts( HINTERNET handle, int resolve, int connect, int switch(hdr->type) { - case WINHTTP_HANDLE_TYPE_REQUEST: - request = (request_t *)hdr; - request->connect_timeout = connect; - - if (resolve < 0) resolve = 0; - request->resolve_timeout = resolve; - - if (send < 0) send = 0; - request->send_timeout = send; + case WINHTTP_HANDLE_TYPE_REQUEST: + { + request_t *request = (request_t *)hdr; + request->connect_timeout = connect; - if (receive < 0) receive = 0; - request->recv_timeout = receive; + if (resolve < 0) resolve = 0; + request->resolve_timeout = resolve; - if (request->netconn) - { - if (netconn_set_timeout( request->netconn, TRUE, send )) ret = FALSE; - if (netconn_set_timeout( request->netconn, FALSE, receive )) ret = FALSE; - } - break; + if (send < 0) send = 0; + request->send_timeout = send; - case WINHTTP_HANDLE_TYPE_SESSION: - session = (session_t *)hdr; - session->connect_timeout = connect; + if (receive < 0) receive = 0; + request->receive_timeout = receive; - if (resolve < 0) resolve = 0; - session->resolve_timeout = resolve; + if (request->netconn) + { + if (netconn_set_timeout( request->netconn, TRUE, send )) ret = FALSE; + if (netconn_set_timeout( request->netconn, FALSE, receive )) ret = FALSE; + } + break; + } + case WINHTTP_HANDLE_TYPE_SESSION: + { + session_t *session = (session_t *)hdr; + session->connect_timeout = connect; - if (send < 0) send = 0; - session->send_timeout = send; + if (resolve < 0) resolve = 0; + session->resolve_timeout = resolve; - if (receive < 0) receive = 0; - session->recv_timeout = receive; - break; + if (send < 0) send = 0; + session->send_timeout = send; - default: - set_last_error( ERROR_WINHTTP_INCORRECT_HANDLE_TYPE ); - ret = FALSE; + if (receive < 0) receive = 0; + session->receive_timeout = receive; + break; + } + default: + set_last_error( ERROR_WINHTTP_INCORRECT_HANDLE_TYPE ); + ret = FALSE; } release_object( hdr ); if (ret) set_last_error( ERROR_SUCCESS ); diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index a3c8507fea..1c72c07574 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -1383,7 +1383,7 @@ static void test_set_default_proxy_config(void) set_default_proxy_reg_value( saved_proxy_settings, len, type ); } -static void test_Timeouts (void) +static void test_timeouts(void) { BOOL ret; DWORD value, size; @@ -1972,6 +1972,70 @@ static void test_Timeouts (void) ok(ret, "%u\n", GetLastError()); ok(value == 0xbeefdead, "Expected 0xbeefdead, got %u\n", value); + /* response timeout */ + SetLastError(0xdeadbeef); + value = 0xdeadbeef; + size = sizeof(value); + ret = WinHttpQueryOption(req, WINHTTP_OPTION_RECEIVE_RESPONSE_TIMEOUT, &value, &size); + ok(ret, "%u\n", GetLastError()); + ok(value == ~0u, "got %u\n", value); + + SetLastError(0xdeadbeef); + value = 30000; + ret = WinHttpSetOption(req, WINHTTP_OPTION_RECEIVE_RESPONSE_TIMEOUT, &value, sizeof(value)); + ok(ret, "%u\n", GetLastError()); + + SetLastError(0xdeadbeef); + value = 0xdeadbeef; + size = sizeof(value); + ret = WinHttpQueryOption(req, WINHTTP_OPTION_RECEIVE_RESPONSE_TIMEOUT, &value, &size); + ok(ret, "%u\n", GetLastError()); + todo_wine ok(value == 0xbeefdead, "got %u\n", value); + + SetLastError(0xdeadbeef); + value = 0xdeadbeef; + size = sizeof(value); + ret = WinHttpQueryOption(con, WINHTTP_OPTION_RECEIVE_RESPONSE_TIMEOUT, &value, &size); + ok(ret, "%u\n", GetLastError()); + ok(value == ~0u, "got %u\n", value); + + SetLastError(0xdeadbeef); + value = 30000; + ret = WinHttpSetOption(con, WINHTTP_OPTION_RECEIVE_RESPONSE_TIMEOUT, &value, sizeof(value)); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_WINHTTP_INCORRECT_HANDLE_TYPE, "got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + value = 0xdeadbeef; + size = sizeof(value); + ret = WinHttpQueryOption(ses, WINHTTP_OPTION_RECEIVE_RESPONSE_TIMEOUT, &value, &size); + ok(ret, "%u\n", GetLastError()); + ok(value == ~0u, "got %u\n", value); + + SetLastError(0xdeadbeef); + value = 48878; + ret = WinHttpSetOption(ses, WINHTTP_OPTION_RECEIVE_RESPONSE_TIMEOUT, &value, sizeof(value)); + ok(ret, "%u\n", GetLastError()); + + SetLastError(0xdeadbeef); + value = 0xdeadbeef; + size = sizeof(value); + ret = WinHttpQueryOption(ses, WINHTTP_OPTION_RECEIVE_RESPONSE_TIMEOUT, &value, &size); + ok(ret, "%u\n", GetLastError()); + todo_wine ok(value == 48879, "got %u\n", value); + + SetLastError(0xdeadbeef); + value = 48880; + ret = WinHttpSetOption(ses, WINHTTP_OPTION_RECEIVE_RESPONSE_TIMEOUT, &value, sizeof(value)); + ok(ret, "%u\n", GetLastError()); + + SetLastError(0xdeadbeef); + value = 0xdeadbeef; + size = sizeof(value); + ret = WinHttpQueryOption(ses, WINHTTP_OPTION_RECEIVE_RESPONSE_TIMEOUT, &value, &size); + ok(ret, "%u\n", GetLastError()); + ok(value == 48880, "got %u\n", value); + WinHttpCloseHandle(req); WinHttpCloseHandle(con); WinHttpCloseHandle(ses); @@ -4563,7 +4627,7 @@ START_TEST (winhttp) test_QueryOption(); test_set_default_proxy_config(); test_empty_headers_param(); - test_Timeouts(); + test_timeouts(); test_resolve_timeout(); test_credentials(); test_IWinHttpRequest_Invoke(); diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 838561fe66..6b4e3b0405 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -98,7 +98,8 @@ typedef struct int resolve_timeout; int connect_timeout; int send_timeout; - int recv_timeout; + int receive_timeout; + int receive_response_timeout; LPWSTR proxy_server; LPWSTR proxy_bypass; LPWSTR proxy_username; @@ -198,7 +199,8 @@ typedef struct int resolve_timeout; int connect_timeout; int send_timeout; - int recv_timeout; + int receive_timeout; + int receive_response_timeout; LPWSTR status_text; DWORD content_length; /* total number of bytes to be read */ DWORD content_read; /* bytes read so far */ -- 2.11.0

2 2

[PATCH 1/4] msxml3: Allow creating floating attributes.
by Daniel Lehman 11 Sep '18

11 Sep '18

Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> --- dlls/msxml3/attribute.c | 9 ++++++++- dlls/msxml3/element.c | 2 +- dlls/msxml3/msxml_private.h | 2 +- dlls/msxml3/node.c | 2 +- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/attribute.c b/dlls/msxml3/attribute.c index 637615b341..8eb2695128 100644 --- a/dlls/msxml3/attribute.c +++ b/dlls/msxml3/attribute.c @@ -50,6 +50,7 @@ typedef struct _domattr xmlnode node; IXMLDOMAttribute IXMLDOMAttribute_iface; LONG ref; + BOOL floating; } domattr; static const tid_t domattr_se_tids[] = { @@ -116,6 +117,11 @@ static ULONG WINAPI domattr_Release( if ( ref == 0 ) { destroy_xmlnode(&This->node); + if ( This->floating ) + { + xmlFreeNs( This->node.node->ns ); + xmlFreeNode( This->node.node ); + } heap_free( This ); } @@ -709,7 +715,7 @@ static dispex_static_data_t domattr_dispex = { domattr_iface_tids }; -IUnknown* create_attribute( xmlNodePtr attribute ) +IUnknown* create_attribute( xmlNodePtr attribute, BOOL floating ) { domattr *This; @@ -719,6 +725,7 @@ IUnknown* create_attribute( xmlNodePtr attribute ) This->IXMLDOMAttribute_iface.lpVtbl = &domattr_vtbl; This->ref = 1; + This->floating = floating; init_xmlnode(&This->node, attribute, (IXMLDOMNode*)&This->IXMLDOMAttribute_iface, &domattr_dispex); diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index 6e00aa0116..4faeed400c 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -1398,7 +1398,7 @@ static HRESULT WINAPI domelem_getAttributeNode( if (attr) { - IUnknown *unk = create_attribute((xmlNodePtr)attr); + IUnknown *unk = create_attribute((xmlNodePtr)attr, FALSE); hr = IUnknown_QueryInterface(unk, &IID_IXMLDOMAttribute, (void**)attributeNode); IUnknown_Release(unk); } diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 94ef66b23d..abc6ab3465 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -252,7 +252,7 @@ extern IUnknown *create_domdoc( xmlNodePtr ) DECLSPEC_HIDDEN; extern IUnknown *create_xmldoc( void ) DECLSPEC_HIDDEN; extern IXMLDOMNode *create_node( xmlNodePtr ) DECLSPEC_HIDDEN; extern IUnknown *create_element( xmlNodePtr ) DECLSPEC_HIDDEN; -extern IUnknown *create_attribute( xmlNodePtr ) DECLSPEC_HIDDEN; +extern IUnknown *create_attribute( xmlNodePtr, BOOL ) DECLSPEC_HIDDEN; extern IUnknown *create_text( xmlNodePtr ) DECLSPEC_HIDDEN; extern IUnknown *create_pi( xmlNodePtr ) DECLSPEC_HIDDEN; extern IUnknown *create_comment( xmlNodePtr ) DECLSPEC_HIDDEN; diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index bcb4181374..fc18935b69 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -2271,7 +2271,7 @@ IXMLDOMNode *create_node( xmlNodePtr node ) pUnk = create_element( node ); break; case XML_ATTRIBUTE_NODE: - pUnk = create_attribute( node ); + pUnk = create_attribute( node, FALSE ); break; case XML_TEXT_NODE: pUnk = create_text( node ); -- 2.17.1

2 4

[PATCH] ntoskrnl: Add ExReleaseResourceLite stub.
by Gijs Vermeulen 11 Sep '18

11 Sep '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45800 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 5 +++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 292f89c2e7..804a938372 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3986,3 +3986,8 @@ NTSTATUS WINAPI DbgQueryDebugFilterState(ULONG component, ULONG level) FIXME("stub: %d %d\n", component, level); return STATUS_NOT_IMPLEMENTED; } + +void WINAPI ExReleaseResourceLite(PERESOURCE resource) +{ + FIXME("stub: %p\n", resource); +} diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index e867dbe680..12f9ddb096 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -9,7 +9,7 @@ @ stdcall -norelay ExInterlockedPushEntrySList (ptr ptr ptr) NTOSKRNL_ExInterlockedPushEntrySList @ stub ExReInitializeRundownProtection @ stdcall -norelay ExReleaseFastMutexUnsafe(ptr) -@ stub ExReleaseResourceLite +@ stdcall ExReleaseResourceLite(ptr) @ stub ExReleaseRundownProtection @ stub ExReleaseRundownProtectionEx @ stub ExRundownCompleted -- 2.18.0

1 0

[PATCH] mfplat: Correct spec for MFTRegisterLocal
by Alistair Leslie-Hughes 10 Sep '18

10 Sep '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/mfplat/mfplat.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index 42b0b86f45..f6064476d7 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -138,7 +138,7 @@ @ stdcall MFTEnumEx(int128 long ptr ptr ptr ptr) @ stub MFTGetInfo @ stdcall MFTRegister(int128 int128 wstr long long ptr long ptr ptr) -@ stub MFTRegisterLocal(ptr ptr wstr long long ptr long ptr) +@ stdcall MFTRegisterLocal(ptr ptr wstr long long ptr long ptr) @ stub MFTRegisterLocalByCLSID @ stdcall MFTUnregister(int128) @ stdcall MFTUnregisterLocal(ptr) -- 2.18.0

1 0

[PATCH 3/4] wsdapi: Implement generation of ProbeMatches message.
by Owen Rudge 10 Sep '18

10 Sep '18

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/soap.c | 169 +++++++++++++++++++++++++++++++++- dlls/wsdapi/tests/discovery.c | 2 +- 2 files changed, 169 insertions(+), 2 deletions(-)

1 0

[PATCH 2/4] wsdapi: Implement matching of names in MatchProbeEx.
by Owen Rudge 10 Sep '18

10 Sep '18

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/discovery.c | 58 ++++++++++++++++++++++++++++++++--- dlls/wsdapi/soap.c | 9 ++++++ dlls/wsdapi/wsdapi_internal.h | 6 ++++ 3 files changed, 69 insertions(+), 4 deletions(-)

1 0

[PATCH 1/4] wsdapi: Use slim reader/writer lock instead of critical section.
by Owen Rudge 10 Sep '18

10 Sep '18

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/discovery.c | 13 ++++++------- dlls/wsdapi/network.c | 4 ++-- dlls/wsdapi/wsdapi_internal.h | 2 +- 3 files changed, 9 insertions(+), 10 deletions(-)

1 0

[website] German translation for release 3.15
by Julian Rüger 10 Sep '18

10 Sep '18

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[website] German translation for the SteamPlay announcement
by Julian Rüger 10 Sep '18

10 Sep '18

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[website] German translation for release 3.14
by Julian Rüger 10 Sep '18

10 Sep '18

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[website] German translation for release 3.13
by Julian Rüger 10 Sep '18

10 Sep '18

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[PATCH v2] ntdll: Fix treating valid affinity mask requests as invalid in NtSetInformationThread()
by Roger Zoellner 10 Sep '18

10 Sep '18

Wine currently treats valid affinity mask requests as invalid. Especially when the requested mask has one or more higher bits set, that aren't set in the current system/process mask (which mostly means when requested mask > system mask) Included are two more test cases, that would fail with the current implementaion, but should succeed on Windows. This patch supercedes https://source.winehq.org/patches/data/150846 https://source.winehq.org/patches/data/150824 Signed-off-by: Roger Zoellner <zoellner.roger(a)gmail.com> --- dlls/ntdll/tests/info.c | 14 ++++++++++++++ dlls/ntdll/thread.c | 8 +++++--- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 2ab12e4257..e297606ef2 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -2040,6 +2040,20 @@ static void test_affinity(void) ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); ok( tbi.AffinityMask == 1, "Unexpected thread affinity\n" ); + thread_affinity = (pbi.AffinityMask << 1) | pbi.AffinityMask; + status = pNtSetInformationThread( GetCurrentThread(), ThreadAffinityMask, &thread_affinity, sizeof(thread_affinity) ); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); + status = pNtQueryInformationThread( GetCurrentThread(), ThreadBasicInformation, &tbi, sizeof(tbi), NULL ); + ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); + ok( tbi.AffinityMask == pbi.AffinityMask, "Unexpected thread affinity. Expected %lx, got %lx\n", pbi.AffinityMask, tbi.AffinityMask); + + thread_affinity = ~(DWORD_PTR)0 - 1; + status = pNtSetInformationThread( GetCurrentThread(), ThreadAffinityMask, &thread_affinity, sizeof(thread_affinity) ); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); + status = pNtQueryInformationThread( GetCurrentThread(), ThreadBasicInformation, &tbi, sizeof(tbi), NULL ); + ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); + ok( tbi.AffinityMask == (pbi.AffinityMask & (~(DWORD_PTR)0 - 1)), "Unexpected thread affinity. Expected %lx, got %lx\n", pbi.AffinityMask & (~(DWORD_PTR)0 - 1), tbi.AffinityMask); + /* NOTE: Pre-Vista does not recognize the "all processors" flag (all bits set) */ thread_affinity = ~(DWORD_PTR)0; status = pNtSetInformationThread( GetCurrentThread(), ThreadAffinityMask, &thread_affinity, sizeof(thread_affinity) ); diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 59d64e174d..b0ad0e8259 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -1211,6 +1211,7 @@ NTSTATUS WINAPI NtQueryInformationThread( HANDLE handle, THREADINFOCLASS class, * NtSetInformationThread (NTDLL.@) * ZwSetInformationThread (NTDLL.@) */ + NTSTATUS WINAPI NtSetInformationThread( HANDLE handle, THREADINFOCLASS class, LPCVOID data, ULONG length ) { @@ -1289,9 +1290,10 @@ NTSTATUS WINAPI NtSetInformationThread( HANDLE handle, THREADINFOCLASS class, if (length != sizeof(ULONG_PTR)) return STATUS_INVALID_PARAMETER; req_aff = *(const ULONG_PTR *)data; - if ((ULONG)req_aff == ~0u) req_aff = affinity_mask; - else if (req_aff & ~affinity_mask) return STATUS_INVALID_PARAMETER; - else if (!req_aff) return STATUS_INVALID_PARAMETER; + + if (!(req_aff & affinity_mask)) return STATUS_INVALID_PARAMETER; + req_aff = req_aff & affinity_mask; + SERVER_START_REQ( set_thread_info ) { req->handle = wine_server_obj_handle( handle ); -- 2.18.0

2 1

[PATCH] mshtml: Added IHTMLCSSStyleDeclaration::styleFloat property implementation.
by Jacek Caban 10 Sep '18

10 Sep '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlstyle.c | 8 ++++---- dlls/mshtml/tests/style.c | 17 +++++++++++++++++ 2 files changed, 21 insertions(+), 4 deletions(-)

1 0

[PATCH 3/3] riched20: Add IID_ITextDocument2 support for ITextServices::QueryInterface().
by Jactry Zeng 10 Sep '18

10 Sep '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=20613 Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/riched20/editor.h | 1 + dlls/riched20/richole.c | 6 ++++++ dlls/riched20/tests/txtsrv.c | 34 ++++++++++++++++++++++++++++++++++ dlls/riched20/txtsrv.c | 5 ++++- 4 files changed, 45 insertions(+), 1 deletion(-) diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 141c63aca9..4c2d71242b 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -234,6 +234,7 @@ void ME_GetOLEObjectSize(const ME_Context *c, ME_Run *run, SIZE *pSize) DECLSPEC void ME_CopyReObject(REOBJECT *dst, const REOBJECT *src, DWORD flags) DECLSPEC_HIDDEN; void ME_DeleteReObject(struct re_object *re_object) DECLSPEC_HIDDEN; void ME_GetITextDocumentInterface(IRichEditOle *iface, LPVOID *ppvObj) DECLSPEC_HIDDEN; +void ME_GetITextDocument2Interface(IRichEditOle *iface, LPVOID *ppvObj) DECLSPEC_HIDDEN; /* editor.c */ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 6c21a8721c..57ab3d0b31 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -5987,3 +5987,9 @@ void ME_GetITextDocumentInterface(IRichEditOle *iface, LPVOID *ppvObj) IRichEditOleImpl *This = impl_from_IRichEditOle(iface); *ppvObj = &This->ITextDocument_iface; } + +void ME_GetITextDocument2Interface(IRichEditOle *iface, LPVOID *ppvObj) +{ + IRichEditOleImpl *This = impl_from_IRichEditOle(iface); + *ppvObj = &This->ITextDocument2_iface; +} diff --git a/dlls/riched20/tests/txtsrv.c b/dlls/riched20/tests/txtsrv.c index a8cf6ff1ad..77b5857165 100644 --- a/dlls/riched20/tests/txtsrv.c +++ b/dlls/riched20/tests/txtsrv.c @@ -904,6 +904,7 @@ static void test_QueryInterface(void) HRESULT hres; IRichEditOle *reole, *txtsrv_reole; ITextDocument *txtdoc, *txtsrv_txtdoc; + ITextDocument2 *txtdoc2, *txtsrv_txtdoc2; ULONG refcount; if(!init_texthost(&txtserv, &host)) @@ -930,6 +931,17 @@ static void test_QueryInterface(void) ITextDocument_Release(txtdoc); refcount = get_refcount((IUnknown *)txtserv); ok(refcount == 2, "got wrong ref count: %d\n", refcount); + + hres = IRichEditOle_QueryInterface(txtsrv_reole, &IID_ITextDocument2, (void **)&txtdoc2); + ok(hres == S_OK, "IRichEditOle_QueryInterface: 0x%08x\n", hres); + refcount = get_refcount((IUnknown *)txtserv); + ok(refcount == 3, "got wrong ref count: %d\n", refcount); + refcount = get_refcount((IUnknown *)txtsrv_reole); + ok(refcount == 3, "got wrong ref count: %d\n", refcount); + + ITextDocument2_Release(txtdoc2); + refcount = get_refcount((IUnknown *)txtserv); + ok(refcount == 2, "got wrong ref count: %d\n", refcount); IRichEditOle_Release(txtsrv_reole); refcount = get_refcount((IUnknown *)txtserv); ok(refcount == 1, "got wrong ref count: %d\n", refcount); @@ -956,6 +968,28 @@ static void test_QueryInterface(void) refcount = get_refcount((IUnknown *)txtserv); ok(refcount == 1, "got wrong ref count: %d\n", refcount); + /* ITextDocument2 */ + hres = ITextServices_QueryInterface(txtserv, &IID_ITextDocument2, (void **)&txtsrv_txtdoc2); + ok(hres == S_OK, "ITextServices_QueryInterface: 0x%08x\n", hres); + refcount = get_refcount((IUnknown *)txtserv); + ok(refcount == 2, "got wrong ref count: %d\n", refcount); + refcount = get_refcount((IUnknown *)txtsrv_txtdoc2); + ok(refcount == 2, "got wrong ref count: %d\n", refcount); + + hres = ITextDocument2_QueryInterface(txtsrv_txtdoc2, &IID_IRichEditOle, (void **)&reole); + ok(hres == S_OK, "ITextDocument2_QueryInterface: 0x%08x\n", hres); + refcount = get_refcount((IUnknown *)txtserv); + ok(refcount == 3, "got wrong ref count: %d\n", refcount); + refcount = get_refcount((IUnknown *)txtsrv_txtdoc2); + ok(refcount == 3, "got wrong ref count: %d\n", refcount); + + IRichEditOle_Release(reole); + refcount = get_refcount((IUnknown *)txtserv); + ok(refcount == 2, "got wrong ref count: %d\n", refcount); + ITextDocument2_Release(txtsrv_txtdoc2); + refcount = get_refcount((IUnknown *)txtserv); + ok(refcount == 1, "got wrong ref count: %d\n", refcount); + ITextServices_Release(txtserv); ITextHost_Release(host); } diff --git a/dlls/riched20/txtsrv.c b/dlls/riched20/txtsrv.c index ee65621b1d..46c3a3c5e4 100644 --- a/dlls/riched20/txtsrv.c +++ b/dlls/riched20/txtsrv.c @@ -78,12 +78,15 @@ static HRESULT WINAPI ITextServicesImpl_QueryInterface(IUnknown *iface, REFIID r *ppv = &This->IUnknown_inner; else if (IsEqualIID(riid, &IID_ITextServices)) *ppv = &This->ITextServices_iface; - else if (IsEqualIID(riid, &IID_IRichEditOle) || IsEqualIID(riid, &IID_ITextDocument)) { + else if (IsEqualIID(riid, &IID_IRichEditOle) || IsEqualIID(riid, &IID_ITextDocument) || + IsEqualIID(riid, &IID_ITextDocument2)) { if (!This->editor->reOle) if (!CreateIRichEditOle(This->outer_unk, This->editor, (void **)(&This->editor->reOle))) return E_OUTOFMEMORY; if (IsEqualIID(riid, &IID_ITextDocument)) ME_GetITextDocumentInterface(This->editor->reOle, ppv); + else if (IsEqualIID(riid, &IID_ITextDocument2)) + ME_GetITextDocument2Interface(This->editor->reOle, ppv); else *ppv = This->editor->reOle; } else { -- 2.18.0

1 0

[PATCH v3 01/10] shell32/autocomplete: Fix a vulnerability by avoiding the use of snprintf
by Gabriel Ivăncescu 10 Sep '18

10 Sep '18

The quickComplete format can have more than one % argument, or stuff like %*.* or %1234s, which can be exploited since the format string can be read from the registry, so handle it manually instead of using sprintf. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- Supersedes series starting with 150711. v3: Use a helper function and handle %% and also split it to multiple patches and fix the embarrassing mistake. And for the entire patch series, I've moved the "txtbackup never NULL" patch to the IACList::Expand patch which will come later (because then it will hopefully make more sense!). Lastly, please see comments on patch 7/10 in the series for more information, hopefully that's okay now. dlls/shell32/autocomplete.c | 44 ++++++++++++++++++++++++++++++++++++++------ 1 file changed, 38 insertions(+), 6 deletions(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index 4ec7387..39df45e 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -93,6 +93,34 @@ static inline IAutoCompleteImpl *impl_from_IAutoCompleteDropDown(IAutoCompleteDr return CONTAINING_RECORD(iface, IAutoCompleteImpl, IAutoCompleteDropDown_iface); } +static void format_quick_complete(WCHAR *dst, const WCHAR *qc, const WCHAR *str, size_t str_len) +{ + /* Replace the first %s directly without using snprintf, to avoid + exploits since the format string can be retrieved from the registry */ + while (*qc != '\0') + { + if (qc[0] == '%') + { + if (qc[1] == 's') + { + memcpy(dst, str, str_len * sizeof(WCHAR)); + dst += str_len; + qc += 2; + while (*qc != '\0') + { + if (qc[0] == '%' && qc[1] == '%') + qc++; + *dst++ = *qc++; + } + break; + } + qc += (qc[1] == '%'); + } + *dst++ = *qc++; + } + *dst = '\0'; +} + static void destroy_autocomplete_object(IAutoCompleteImpl *ac) { ac->hwndEdit = NULL; @@ -109,7 +137,6 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, IAutoCompleteImpl *This = GetPropW(hwnd, autocomplete_propertyW); HRESULT hr; WCHAR hwndText[255]; - WCHAR *hwndQCText; RECT r; BOOL control, filled, displayall = FALSE; int cpt, height, sel; @@ -138,11 +165,16 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, /* If quickComplete is set and control is pressed, replace the string */ control = GetKeyState(VK_CONTROL) & 0x8000; if (control && This->quickComplete) { - hwndQCText = heap_alloc((lstrlenW(This->quickComplete)+lstrlenW(hwndText))*sizeof(WCHAR)); - sel = sprintfW(hwndQCText, This->quickComplete, hwndText); - SendMessageW(hwnd, WM_SETTEXT, 0, (LPARAM)hwndQCText); - SendMessageW(hwnd, EM_SETSEL, 0, sel); - heap_free(hwndQCText); + WCHAR *buf; + size_t len = strlenW(hwndText); + size_t sz = strlenW(This->quickComplete) + 1 + len; + if ((buf = heap_alloc(sz * sizeof(WCHAR)))) + { + format_quick_complete(buf, This->quickComplete, hwndText, len); + SendMessageW(hwnd, WM_SETTEXT, 0, (LPARAM)buf); + SendMessageW(hwnd, EM_SETSEL, 0, sz-1); + heap_free(buf); + } } ShowWindow(This->hwndListBox, SW_HIDE); -- 1.9.1

2 19

[PATCH v2] msvcr100: Add Concurrency::wait stub.
by Gijs Vermeulen 10 Sep '18

10 Sep '18

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/concrt140/concrt140.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcrt/lock.c | 10 ++++++++++ 6 files changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/concrt140/concrt140.spec b/dlls/concrt140/concrt140.spec index 7fe53b5d73..406a50569f 100644 --- a/dlls/concrt140/concrt140.spec +++ b/dlls/concrt140/concrt140.spec @@ -516,7 +516,7 @@ @ cdecl -arch=win64 ?unlock@critical_section@Concurrency@@QEAAXXZ(ptr) msvcr120.?unlock@critical_section@Concurrency@@QEAAXXZ @ thiscall -arch=win32 ?unlock@reader_writer_lock@Concurrency@@QAEXXZ(ptr) msvcr120.?unlock@reader_writer_lock@Concurrency@@QAEXXZ @ cdecl -arch=win64 ?unlock@reader_writer_lock@Concurrency@@QEAAXXZ(ptr) msvcr120.?unlock@reader_writer_lock@Concurrency@@QEAAXXZ -@ stub ?wait@Concurrency@@YAXI@Z +@ cdecl ?wait@Concurrency@@YAXI@Z(long) msvcr120.?wait@Concurrency@@YAXI@Z @ thiscall -arch=i386 ?wait@_Condition_variable@details@Concurrency@@QAEXAAVcritical_section@3@@Z(ptr ptr) msvcr120.?wait@_Condition_variable@details@Concurrency@@QAEXAAVcritical_section@3@@Z @ cdecl -arch=win64 ?wait@_Condition_variable@details@Concurrency@@QEAAXAEAVcritical_section@3@@Z(ptr ptr) msvcr120.?wait@_Condition_variable@details@Concurrency@@QEAAXAEAVcritical_section@3@@Z @ stub -arch=win32 ?wait@agent@Concurrency@@SA?AW4agent_status@2@PAV12@I@Z diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 88698ca5c3..15e88e2391 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -496,7 +496,7 @@ @ thiscall -arch=win32 ?unlock@reader_writer_lock@Concurrency@@QAEXXZ(ptr) reader_writer_lock_unlock @ cdecl -arch=win64 ?unlock@reader_writer_lock@Concurrency@@QEAAXXZ(ptr) reader_writer_lock_unlock @ cdecl ?vswprintf@@YAHPA_WIPB_WPAD@Z(ptr long wstr ptr) MSVCRT_vsnwprintf -@ stub ?wait@Concurrency@@YAXI@Z +@ cdecl ?wait@Concurrency@@YAXI@Z(long) Concurrency_wait @ thiscall -arch=win32 ?wait@event@Concurrency@@QAEII@Z(ptr) event_wait @ cdecl -arch=win64 ?wait@event@Concurrency@@QEAA_KI@Z(ptr) event_wait @ cdecl -arch=win32 ?wait_for_multiple@event@Concurrency@@SAIPAPAV12@I_NI@Z(ptr long long long) event_wait_for_multiple diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 3d116c4ec8..cd7b625d28 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -808,7 +808,7 @@ @ thiscall -arch=win32 ?unlock@reader_writer_lock@Concurrency@@QAEXXZ(ptr) reader_writer_lock_unlock @ cdecl -arch=win64 ?unlock@reader_writer_lock@Concurrency@@QEAAXXZ(ptr) reader_writer_lock_unlock @ cdecl ?vswprintf@@YAHPA_WIPB_WPAD@Z(ptr long wstr ptr) MSVCRT_vsnwprintf -@ stub ?wait@Concurrency@@YAXI@Z +@ cdecl ?wait@Concurrency@@YAXI@Z(long) Concurrency_wait @ cdecl -arch=arm ?wait@_Condition_variable@details@Concurrency@@QAAXAAVcritical_section@3@@Z(ptr ptr) _Condition_variable_wait @ thiscall -arch=i386 ?wait@_Condition_variable@details@Concurrency@@QAEXAAVcritical_section@3@@Z(ptr ptr) _Condition_variable_wait @ cdecl -arch=win64 ?wait@_Condition_variable@details@Concurrency@@QEAAXAEAVcritical_section@3@@Z(ptr ptr) _Condition_variable_wait diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index f317d1f8b3..44f728ba0a 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -790,7 +790,7 @@ @ thiscall -arch=win32 ?unlock@reader_writer_lock@Concurrency@@QAEXXZ(ptr) reader_writer_lock_unlock @ cdecl -arch=win64 ?unlock@reader_writer_lock@Concurrency@@QEAAXXZ(ptr) reader_writer_lock_unlock @ cdecl ?vswprintf@@YAHPA_WIPB_WPAD@Z(ptr long wstr ptr) MSVCRT_vsnwprintf -@ stub ?wait@Concurrency@@YAXI@Z +@ cdecl ?wait@Concurrency@@YAXI@Z(long) Concurrency_wait @ cdecl -arch=arm ?wait@_Condition_variable@details@Concurrency@@QAAXAAVcritical_section@3@@Z(ptr ptr) _Condition_variable_wait @ thiscall -arch=i386 ?wait@_Condition_variable@details@Concurrency@@QAEXAAVcritical_section@3@@Z(ptr ptr) _Condition_variable_wait @ cdecl -arch=win64 ?wait@_Condition_variable@details@Concurrency@@QEAAXAEAVcritical_section@3@@Z(ptr ptr) _Condition_variable_wait diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 0f5d143089..935de2b2b2 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -786,7 +786,7 @@ @ thiscall -arch=win32 ?unlock@reader_writer_lock@Concurrency@@QAEXXZ(ptr) msvcr120.?unlock@reader_writer_lock@Concurrency@@QAEXXZ @ cdecl -arch=win64 ?unlock@reader_writer_lock@Concurrency@@QEAAXXZ(ptr) msvcr120.?unlock@reader_writer_lock@Concurrency@@QEAAXXZ @ cdecl ?vswprintf@@YAHPA_WIPB_WPAD@Z(ptr long wstr ptr) msvcr120.?vswprintf@@YAHPA_WIPB_WPAD@Z -@ stub ?wait@Concurrency@@YAXI@Z +@ cdecl ?wait@Concurrency@@YAXI@Z(long) msvcr120.?wait@Concurrency@@YAXI@Z @ cdecl -arch=arm ?wait@_Condition_variable@details@Concurrency@@QAAXAAVcritical_section@3@@Z(ptr ptr) msvcr120.?wait@_Condition_variable@details@Concurrency@@QAAXAAVcritical_section@3@@Z @ thiscall -arch=i386 ?wait@_Condition_variable@details@Concurrency@@QAEXAAVcritical_section@3@@Z(ptr ptr) msvcr120.?wait@_Condition_variable@details@Concurrency@@QAEXAAVcritical_section@3@@Z @ cdecl -arch=win64 ?wait@_Condition_variable@details@Concurrency@@QEAAXAEAVcritical_section@3@@Z(ptr ptr) msvcr120.?wait@_Condition_variable@details@Concurrency@@QEAAXAEAVcritical_section@3@@Z diff --git a/dlls/msvcrt/lock.c b/dlls/msvcrt/lock.c index 177fc2a17c..4646126537 100644 --- a/dlls/msvcrt/lock.c +++ b/dlls/msvcrt/lock.c @@ -1404,6 +1404,16 @@ MSVCRT_bool __thiscall _ReentrantBlockingLock__TryAcquire(_ReentrantBlockingLock TRACE("(%p)\n", this); return TryEnterCriticalSection(&this->cs); } + +/* ?wait@Concurrency@@YAXI@Z */ +void __cdecl Concurrency_wait(unsigned int time) +{ + static int once; + + if (!once++) FIXME("(%d) stub!\n", time); + + Sleep(time); +} #endif #if _MSVCR_VER == 110 -- 2.16.4

2 1

Re: [PATCH 1/2] d2d1: Return device context pointer for render targets.
by Vlad Bespalov 10 Sep '18

10 Sep '18

> > > return S_OK; > } > - else if (IsEqualGUID(iid, &IID_ID2D1GdiInteropRenderTarget)) > + else if (IsEqualGUID(iid, &IID_ID2D1GdiInteropRenderTarget) > + || IsEqualGUID(iid, &IID_ID2D1GdiInteropRenderTarget)) > return > ID2D1RenderTarget_QueryInterface(render_target->dxgi_target, iid, out); > > Something feels wrong here - did you mean to have 2nd check against &IID_ID2D1DeviceContext ? Thanks, Vlad.

1 0

[PATCH 2/2] winevulkan: Enable vkGetDeviceProcAddr() quirk for idTech engine.
by Józef Kucia 10 Sep '18

10 Sep '18

For DOOM VFR. Based on a patch by Andrew Eikum. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/winevulkan/vulkan.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index c30f666a6296..1c721039f2f3 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -760,9 +760,7 @@ VkResult WINAPI wine_vkCreateInstance(const VkInstanceCreateInfo *create_info, app_info->engineVersion); TRACE("API version %#x.\n", app_info->apiVersion); - if (app_info->pApplicationName - && (!strcmp(app_info->pApplicationName, "DOOM") - || !strcmp(app_info->pApplicationName, "Wolfenstein II The New Colossus"))) + if (app_info->pEngineName && !strcmp(app_info->pEngineName, "idTech")) object->quirks |= WINEVULKAN_QUIRK_GET_DEVICE_PROC_ADDR; } -- 2.16.4

1 0

[PATCH 1/2] winevulkan: Trace VkApplicationInfo in wine_vkCreateInstance().
by Józef Kucia 10 Sep '18

10 Sep '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/winevulkan/vulkan.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 83041a543084..c30f666a6296 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -362,16 +362,6 @@ static VkResult wine_vk_instance_convert_create_info(const VkInstanceCreateInfo *dst = *src; - if (dst->pApplicationInfo) - { - const VkApplicationInfo *app_info = dst->pApplicationInfo; - TRACE("Application name %s, application version %#x\n", - debugstr_a(app_info->pApplicationName), app_info->applicationVersion); - TRACE("Engine name %s, engine version %#x\n", debugstr_a(app_info->pEngineName), - app_info->engineVersion); - TRACE("API version %#x\n", app_info->apiVersion); - } - /* Application and loader can pass in a chain of extensions through pNext. * We can't blindly pass these through as often these contain callbacks or * they can even be pass structures for loader / ICD internal use. For now @@ -762,10 +752,17 @@ VkResult WINAPI wine_vkCreateInstance(const VkInstanceCreateInfo *create_info, return res; } - if ((app_info = create_info->pApplicationInfo) && app_info->pApplicationName) + if ((app_info = create_info->pApplicationInfo)) { - if (!strcmp(app_info->pApplicationName, "DOOM") - || !strcmp(app_info->pApplicationName, "Wolfenstein II The New Colossus")) + TRACE("Application name %s, application version %#x.\n", + debugstr_a(app_info->pApplicationName), app_info->applicationVersion); + TRACE("Engine name %s, engine version %#x.\n", debugstr_a(app_info->pEngineName), + app_info->engineVersion); + TRACE("API version %#x.\n", app_info->apiVersion); + + if (app_info->pApplicationName + && (!strcmp(app_info->pApplicationName, "DOOM") + || !strcmp(app_info->pApplicationName, "Wolfenstein II The New Colossus"))) object->quirks |= WINEVULKAN_QUIRK_GET_DEVICE_PROC_ADDR; } -- 2.16.4

1 0

[PATCH 1/3] xmllite/tests: Add more writer tests.
by Nikolay Sivov 10 Sep '18

10 Sep '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/xmllite/tests/writer.c | 306 +++++++++++++++++++++++++++++++----- dlls/xmllite/writer.c | 3 + 2 files changed, 273 insertions(+), 36 deletions(-) diff --git a/dlls/xmllite/tests/writer.c b/dlls/xmllite/tests/writer.c index 33c2f8f7d1..67fe55bb44 100644 --- a/dlls/xmllite/tests/writer.c +++ b/dlls/xmllite/tests/writer.c @@ -26,6 +26,8 @@ #include "winbase.h" #include "ole2.h" #include "xmllite.h" + +#include "wine/heap.h" #include "wine/test.h" #include "initguid.h" @@ -89,6 +91,19 @@ static void check_output(IStream *stream, const char *expected, BOOL todo, int l #define CHECK_OUTPUT_TODO(stream, expected) check_output(stream, expected, TRUE, __LINE__) #define CHECK_OUTPUT_RAW(stream, expected, size) check_output_raw(stream, expected, size, __LINE__) +static WCHAR *strdupAtoW(const char *str) +{ + WCHAR *ret = NULL; + DWORD len; + + if (!str) return ret; + len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); + ret = heap_alloc(len * sizeof(WCHAR)); + if (ret) + MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); + return ret; +} + static void writer_set_property(IXmlWriter *writer, XmlWriterProperty property) { HRESULT hr; @@ -826,13 +841,41 @@ static void test_bom(void) IXmlWriter_Release(writer); } -static void test_writestartelement(void) +static void test_WriteStartElement(void) { + static const struct + { + const char *prefix; + const char *local; + const char *uri; + const char *output; + const char *output_partial; + HRESULT hr; + int todo; + int todo_partial; + } + start_element_tests[] = + { + { "prefix", "local", "uri", "<prefix:local xmlns:prefix=\"uri\" />", "<prefix:local", S_OK, 1 }, + { NULL, "local", "uri", "<local xmlns=\"uri\" />", "<local", S_OK, 1 }, + { "", "local", "uri", "<local xmlns=\"uri\" />", "<local", S_OK, 1, 1 }, + { "", "local", "uri", "<local xmlns=\"uri\" />", "<local", S_OK, 1, 1}, + + { "prefix", NULL, NULL, NULL, NULL, E_INVALIDARG }, + { NULL, NULL, "uri", NULL, NULL, E_INVALIDARG }, + { NULL, NULL, NULL, NULL, NULL, E_INVALIDARG }, + { NULL, "prefix:local", "uri", NULL, NULL, WC_E_NAMECHARACTER, 1, 1 }, + { NULL, ":local", "uri", NULL, NULL, WC_E_NAMECHARACTER, 1, 1 }, + { ":", "local", "uri", NULL, NULL, WC_E_NAMECHARACTER, 1, 1 }, + { NULL, "local", "http://www.w3.org/2000/xmlns/", NULL, NULL, WR_E_XMLNSPREFIXDECLARATION }, + { "prefix", "local", "http://www.w3.org/2000/xmlns/", NULL, NULL, WR_E_XMLNSURIDECLARATION }, + }; static const WCHAR valueW[] = {'v','a','l','u','e',0}; static const WCHAR aW[] = {'a',0}; static const WCHAR bW[] = {'b',0}; IXmlWriter *writer; IStream *stream; + unsigned int i; HRESULT hr; hr = CreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL); @@ -843,15 +886,6 @@ static void test_writestartelement(void) stream = writer_set_output(writer); - hr = IXmlWriter_WriteStartElement(writer, aW, NULL, NULL); - ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); - - hr = IXmlWriter_WriteStartElement(writer, NULL, NULL, NULL); - ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); - - hr = IXmlWriter_WriteStartElement(writer, NULL, NULL, aW); - ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); - hr = IXmlWriter_WriteStartElement(writer, NULL, aW, NULL); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -900,6 +934,161 @@ static void test_writestartelement(void) "<a>value"); IStream_Release(stream); + + /* WriteStartElement */ + for (i = 0; i < ARRAY_SIZE(start_element_tests); ++i) + { + WCHAR *prefixW, *localW, *uriW; + + stream = writer_set_output(writer); + + writer_set_property(writer, XmlWriterProperty_OmitXmlDeclaration); + + hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Omit); + ok(hr == S_OK, "Failed to start document, hr %#x.\n", hr); + + prefixW = strdupAtoW(start_element_tests[i].prefix); + localW = strdupAtoW(start_element_tests[i].local); + uriW = strdupAtoW(start_element_tests[i].uri); + + hr = IXmlWriter_WriteStartElement(writer, prefixW, localW, uriW); + todo_wine_if(i >= 7) + ok(hr == start_element_tests[i].hr, "%u: unexpected hr %#x.\n", i, hr); + + if (SUCCEEDED(start_element_tests[i].hr)) + { + hr = IXmlWriter_Flush(writer); + ok(hr == S_OK, "Failed to flush, hr %#x.\n", hr); + + check_output(stream, start_element_tests[i].output_partial, start_element_tests[i].todo_partial, __LINE__); + + hr = IXmlWriter_WriteEndDocument(writer); + ok(hr == S_OK, "Failed to end document, hr %#x.\n", hr); + + hr = IXmlWriter_Flush(writer); + ok(hr == S_OK, "Failed to flush, hr %#x.\n", hr); + + check_output(stream, start_element_tests[i].output, start_element_tests[i].todo, __LINE__); + } + + heap_free(prefixW); + heap_free(localW); + heap_free(uriW); + + IStream_Release(stream); + } + + IXmlWriter_Release(writer); +} + +static void test_WriteElementString(void) +{ + static const struct + { + const char *prefix; + const char *local; + const char *uri; + const char *value; + const char *output; + HRESULT hr; + int todo; + } + element_string_tests[] = + { + { "prefix", "local", "uri", "value", "<prefix:local xmlns:prefix=\"uri\">value</prefix:local>", S_OK, 1 }, + { NULL, "local", "uri", "value", "<local xmlns=\"uri\">value</local>", S_OK, 1 }, + { "", "local", "uri", "value", "<local xmlns=\"uri\">value</local>", S_OK, 1 }, + { "prefix", "local", "uri", NULL, "<prefix:local xmlns:prefix=\"uri\" />", S_OK, 1 }, + { NULL, "local", "uri", NULL, "<local xmlns=\"uri\" />", S_OK, 1 }, + { "", "local", "uri", NULL, "<local xmlns=\"uri\" />", S_OK, 1 }, + { NULL, "local", NULL, NULL, "<local />" }, + + { "prefix", NULL, NULL, "value", NULL, E_INVALIDARG }, + { NULL, NULL, "uri", "value", NULL, E_INVALIDARG }, + { NULL, NULL, NULL, "value", NULL, E_INVALIDARG }, + { NULL, "prefix:local", "uri", "value", NULL, WC_E_NAMECHARACTER }, + { NULL, ":local", "uri", "value", NULL, WC_E_NAMECHARACTER }, + { ":", "local", "uri", "value", NULL, WC_E_NAMECHARACTER }, + { NULL, "local", "http://www.w3.org/2000/xmlns/", "value", NULL, WR_E_XMLNSPREFIXDECLARATION }, + { "prefix", "local", "http://www.w3.org/2000/xmlns/", "value", NULL, WR_E_XMLNSURIDECLARATION }, + }; + static const WCHAR valueW[] = {'v','a','l','u','e',0}; + static const WCHAR aW[] = {'a',0}; + static const WCHAR bW[] = {'b',0}; + IXmlWriter *writer; + IStream *stream; + unsigned int i; + HRESULT hr; + + hr = CreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + hr = IXmlWriter_WriteElementString(writer, NULL, bW, NULL, valueW); + ok(hr == E_UNEXPECTED, "got 0x%08x\n", hr); + + stream = writer_set_output(writer); + + hr = IXmlWriter_WriteStartElement(writer, NULL, aW, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteElementString(writer, NULL, bW, NULL, valueW); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteElementString(writer, NULL, bW, NULL, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_Flush(writer); + ok(hr == S_OK, "got 0x%08x\n", hr); + + CHECK_OUTPUT(stream, + "<a>value"); + + IStream_Release(stream); + + for (i = 0; i < ARRAY_SIZE(element_string_tests); ++i) + { + WCHAR *prefixW, *localW, *uriW, *valueW; + + stream = writer_set_output(writer); + + writer_set_property(writer, XmlWriterProperty_OmitXmlDeclaration); + + hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Omit); + ok(hr == S_OK, "Failed to start document, hr %#x.\n", hr); + + prefixW = strdupAtoW(element_string_tests[i].prefix); + localW = strdupAtoW(element_string_tests[i].local); + uriW = strdupAtoW(element_string_tests[i].uri); + valueW = strdupAtoW(element_string_tests[i].value); + + hr = IXmlWriter_WriteElementString(writer, prefixW, localW, uriW, valueW); + todo_wine_if(i >= 10) + ok(hr == element_string_tests[i].hr, "%u: unexpected hr %#x.\n", i, hr); + + if (SUCCEEDED(element_string_tests[i].hr)) + { + hr = IXmlWriter_Flush(writer); + ok(hr == S_OK, "Failed to flush, hr %#x.\n", hr); + + check_output(stream, element_string_tests[i].output, element_string_tests[i].todo, __LINE__); + + hr = IXmlWriter_WriteEndDocument(writer); + ok(hr == S_OK, "Failed to end document, hr %#x.\n", hr); + + hr = IXmlWriter_Flush(writer); + ok(hr == S_OK, "Failed to flush, hr %#x.\n", hr); + + check_output(stream, element_string_tests[i].output, element_string_tests[i].todo, __LINE__); + } + + heap_free(prefixW); + heap_free(localW); + heap_free(uriW); + heap_free(valueW); + + IStream_Release(stream); + } + IXmlWriter_Release(writer); } @@ -1313,42 +1502,94 @@ static void test_indentation(void) static void test_WriteAttributeString(void) { + static const struct + { + const char *prefix; + const char *local; + const char *uri; + const char *value; + const char *output; + const char *output_partial; + HRESULT hr; + } + attribute_tests[] = + { + { NULL, "a", NULL, "b", "<e a=\"b\" />", "<e a=\"b\"" }, + { "prefix", "local", "uri", "b", "<e prefix:local=\"b\" xmlns:prefix=\"uri\" />", "<e prefix:local=\"b\"" }, + { NULL, "a", "http://www.w3.org/2000/xmlns/", "defuri", "<e xmlns:a=\"defuri\" />", "<e xmlns:a=\"defuri\"" }, + + /* Autogenerated prefix names. */ + { NULL, "a", "defuri", NULL, "<e p1:a=\"\" xmlns:p1=\"defuri\" />", "<e p1:a=\"\"" }, + { NULL, "a", "defuri", "b", "<e p1:a=\"b\" xmlns:p1=\"defuri\" />", "<e p1:a=\"b\"" }, + + /* Failing cases. */ + { NULL, NULL, "http://www.w3.org/2000/xmlns/", "defuri", "<e />", "<e", E_INVALIDARG }, + { "prefix", NULL, "http://www.w3.org/2000/xmlns/", "defuri", "<e />", "<e", E_INVALIDARG }, + { "prefix", NULL, NULL, "b", "<e />", "<e", E_INVALIDARG }, + { "prefix", NULL, "uri", NULL, "<e />", "<e", E_INVALIDARG }, + { "xmlns", NULL, NULL, "uri", "<e />", "<e", WR_E_NSPREFIXDECLARED }, + { "xmlns", "a", "defuri", NULL, "<e />", "<e", WR_E_XMLNSPREFIXDECLARATION }, + { NULL, "xmlns", "uri", NULL, "<e />", "<e", WR_E_XMLNSPREFIXDECLARATION }, + { "xmlns", NULL, "uri", NULL, "<e />", "<e", WR_E_XMLNSPREFIXDECLARATION }, + { "prefix", "a", "http://www.w3.org/2000/xmlns/", "defuri", "<e />", "<e", WR_E_XMLNSURIDECLARATION }, + }; + static const WCHAR prefixW[] = {'p','r','e','f','i','x',0}; static const WCHAR localW[] = {'l','o','c','a','l',0}; static const WCHAR uriW[] = {'u','r','i',0}; - static const WCHAR uri2W[] = {'u','r','i','2',0}; - static const WCHAR xmlnsW[] = {'x','m','l','n','s',0}; + static const WCHAR elementW[] = {'e',0}; static const WCHAR aW[] = {'a',0}; static const WCHAR bW[] = {'b',0}; IXmlWriter *writer; IStream *stream; + unsigned int i; HRESULT hr; hr = CreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - stream = writer_set_output(writer); - writer_set_property(writer, XmlWriterProperty_OmitXmlDeclaration); - hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Omit); - ok(hr == S_OK, "got 0x%08x\n", hr); + for (i = 0; i < ARRAY_SIZE(attribute_tests); ++i) + { + WCHAR *prefixW, *localW, *uriW, *valueW; - hr = IXmlWriter_WriteStartElement(writer, NULL, aW, NULL); - ok(hr == S_OK, "got 0x%08x\n", hr); + stream = writer_set_output(writer); - hr = IXmlWriter_WriteAttributeString(writer, NULL, aW, NULL, bW); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Omit); + ok(hr == S_OK, "Failed to start document, hr %#x.\n", hr); - hr = IXmlWriter_WriteEndDocument(writer); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IXmlWriter_WriteStartElement(writer, NULL, elementW, NULL); + ok(hr == S_OK, "Failed to start element, hr %#x.\n", hr); - hr = IXmlWriter_Flush(writer); - ok(hr == S_OK, "got 0x%08x\n", hr); + prefixW = strdupAtoW(attribute_tests[i].prefix); + localW = strdupAtoW(attribute_tests[i].local); + uriW = strdupAtoW(attribute_tests[i].uri); + valueW = strdupAtoW(attribute_tests[i].value); - CHECK_OUTPUT(stream, - "<a a=\"b\" />"); - IStream_Release(stream); + hr = IXmlWriter_WriteAttributeString(writer, prefixW, localW, uriW, valueW); + todo_wine_if(i != 0) + ok(hr == attribute_tests[i].hr, "%u: unexpected hr %#x.\n", i, hr); + + hr = IXmlWriter_Flush(writer); + ok(hr == S_OK, "Failed to flush, hr %#x.\n", hr); + + check_output(stream, attribute_tests[i].output_partial, i == 1 || i == 2 || i == 3 || i == 4, __LINE__); + + hr = IXmlWriter_WriteEndDocument(writer); + ok(hr == S_OK, "Failed to end document, hr %#x.\n", hr); + + hr = IXmlWriter_Flush(writer); + ok(hr == S_OK, "Failed to flush, hr %#x.\n", hr); + + heap_free(prefixW); + heap_free(localW); + heap_free(uriW); + heap_free(valueW); + + check_output(stream, attribute_tests[i].output, i == 1 || i == 2 || i == 3 || i == 4, __LINE__); + IStream_Release(stream); + } /* with namespaces */ stream = writer_set_output(writer); @@ -1370,14 +1611,6 @@ todo_wine hr = IXmlWriter_WriteAttributeString(writer, NULL, aW, NULL, bW); ok(hr == S_OK, "got 0x%08x\n", hr); - hr = IXmlWriter_WriteAttributeString(writer, NULL, xmlnsW, uri2W, NULL); -todo_wine - ok(hr == WR_E_XMLNSPREFIXDECLARATION, "got 0x%08x\n", hr); - - hr = IXmlWriter_WriteAttributeString(writer, NULL, xmlnsW, NULL, uri2W); -todo_wine - ok(hr == WR_E_NSPREFIXDECLARED, "got 0x%08x\n", hr); - hr = IXmlWriter_WriteAttributeString(writer, prefixW, localW, NULL, bW); todo_wine ok(hr == WR_E_DUPLICATEATTRIBUTE, "got 0x%08x\n", hr); @@ -1585,7 +1818,8 @@ START_TEST(writer) test_writer_state(); test_writeroutput(); test_writestartdocument(); - test_writestartelement(); + test_WriteStartElement(); + test_WriteElementString(); test_writeendelement(); test_flush(); test_omitxmldeclaration(); diff --git a/dlls/xmllite/writer.c b/dlls/xmllite/writer.c index 88f75b6e20..c0260ae473 100644 --- a/dlls/xmllite/writer.c +++ b/dlls/xmllite/writer.c @@ -857,6 +857,9 @@ static HRESULT WINAPI xmlwriter_WriteElementString(IXmlWriter *iface, LPCWSTR pr ; } + if (!local_name) + return E_INVALIDARG; + write_encoding_bom(This); write_node_indent(This); write_output_buffer(This->output, ltW, ARRAY_SIZE(ltW)); -- 2.18.0

1 2

[PATCH 1/2] d2d1: Return device context pointer for render targets.
by Nikolay Sivov 10 Sep '18

10 Sep '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- In attempt to reduce larger patch at https://bugs.winehq.org/show_bug.cgi?id=44052. dlls/d2d1/dc_render_target.c | 3 ++- dlls/d2d1/hwnd_render_target.c | 3 ++- dlls/d2d1/wic_render_target.c | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/d2d1/dc_render_target.c b/dlls/d2d1/dc_render_target.c index d5e4f47e6d..e55483d7c1 100644 --- a/dlls/d2d1/dc_render_target.c +++ b/dlls/d2d1/dc_render_target.c @@ -64,7 +64,8 @@ static HRESULT STDMETHODCALLTYPE d2d_dc_render_target_QueryInterface(ID2D1DCRend *out = iface; return S_OK; } - else if (IsEqualGUID(iid, &IID_ID2D1GdiInteropRenderTarget)) + else if (IsEqualGUID(iid, &IID_ID2D1GdiInteropRenderTarget) + || IsEqualGUID(iid, &IID_ID2D1DeviceContext)) return ID2D1RenderTarget_QueryInterface(render_target->dxgi_target, iid, out); WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); diff --git a/dlls/d2d1/hwnd_render_target.c b/dlls/d2d1/hwnd_render_target.c index 04d33536a6..6e91ad6a21 100644 --- a/dlls/d2d1/hwnd_render_target.c +++ b/dlls/d2d1/hwnd_render_target.c @@ -53,7 +53,8 @@ static HRESULT STDMETHODCALLTYPE d2d_hwnd_render_target_QueryInterface(ID2D1Hwnd *out = iface; return S_OK; } - else if (IsEqualGUID(iid, &IID_ID2D1GdiInteropRenderTarget)) + else if (IsEqualGUID(iid, &IID_ID2D1GdiInteropRenderTarget) + || IsEqualGUID(iid, &IID_ID2D1GdiInteropRenderTarget)) return ID2D1RenderTarget_QueryInterface(render_target->dxgi_target, iid, out); WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); diff --git a/dlls/d2d1/wic_render_target.c b/dlls/d2d1/wic_render_target.c index 5642fd44ff..b742314d38 100644 --- a/dlls/d2d1/wic_render_target.c +++ b/dlls/d2d1/wic_render_target.c @@ -112,7 +112,8 @@ static HRESULT STDMETHODCALLTYPE d2d_wic_render_target_QueryInterface(ID2D1Rende *out = iface; return S_OK; } - else if (IsEqualGUID(iid, &IID_ID2D1GdiInteropRenderTarget)) + else if (IsEqualGUID(iid, &IID_ID2D1GdiInteropRenderTarget) + || IsEqualGUID(iid, &IID_ID2D1GdiInteropRenderTarget)) return ID2D1RenderTarget_QueryInterface(render_target->dxgi_target, iid, out); WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); -- 2.18.0

2 3

[PATCH 4/4] vulkan-1/tests: Add test for unsupported device extensions.
by Józef Kucia 10 Sep '18

10 Sep '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/vulkan-1/tests/vulkan.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/dlls/vulkan-1/tests/vulkan.c b/dlls/vulkan-1/tests/vulkan.c index 55efa236b041..4143af752c20 100644 --- a/dlls/vulkan-1/tests/vulkan.c +++ b/dlls/vulkan-1/tests/vulkan.c @@ -300,6 +300,27 @@ static void test_unsupported_instance_extensions(void) } } +static void test_unsupported_device_extensions(VkPhysicalDevice vk_physical_device) +{ + VkDevice vk_device; + unsigned int i; + VkResult vr; + + static const char *extensions[] = + { + "VK_KHR_external_fence_fd", + "VK_KHR_external_memory_fd", + "VK_KHR_external_semaphore_fd", + }; + + for (i = 0; i < ARRAY_SIZE(extensions); ++i) + { + vr = create_device(vk_physical_device, 1, &extensions[i], NULL, &vk_device); + ok(vr == VK_ERROR_EXTENSION_NOT_PRESENT, + "Got VkResult %d for extension %s.\n", vr, extensions[i]); + } +} + static void for_each_device(void (*test_func)(VkPhysicalDevice)) { VkPhysicalDevice *vk_physical_devices; @@ -342,4 +363,5 @@ START_TEST(vulkan) test_physical_device_groups(); for_each_device(test_destroy_command_pool); test_unsupported_instance_extensions(); + for_each_device(test_unsupported_device_extensions); } -- 2.16.4

1 0

[PATCH 3/4] winevulkan: Check if device extensions are supported.
by Józef Kucia 10 Sep '18

10 Sep '18

Return VK_ERROR_EXTENSION_NOT_PRESENT for unsupported extensions. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/winevulkan/vulkan.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 7485fdc04669..83041a543084 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -278,10 +278,16 @@ static VkResult wine_vk_device_convert_create_info(const VkDeviceCreateInfo *src dst->enabledLayerCount = 0; dst->ppEnabledLayerNames = NULL; - TRACE("Enabled extensions: %u.\n", dst->enabledExtensionCount); + TRACE("Enabled %u extensions.\n", dst->enabledExtensionCount); for (i = 0; i < dst->enabledExtensionCount; i++) { - TRACE("Extension %u: %s.\n", i, debugstr_a(dst->ppEnabledExtensionNames[i])); + const char *extension_name = dst->ppEnabledExtensionNames[i]; + TRACE("Extension %u: %s.\n", i, debugstr_a(extension_name)); + if (!wine_vk_device_extension_supported(extension_name)) + { + WARN("Extension %s is not supported.\n", debugstr_a(extension_name)); + return VK_ERROR_EXTENSION_NOT_PRESENT; + } } return VK_SUCCESS; @@ -632,7 +638,8 @@ VkResult WINAPI wine_vkCreateDevice(VkPhysicalDevice phys_dev, res = wine_vk_device_convert_create_info(create_info, &create_info_host); if (res != VK_SUCCESS) { - ERR("Failed to convert VkDeviceCreateInfo, res=%d.\n", res); + if (res != VK_ERROR_EXTENSION_NOT_PRESENT) + ERR("Failed to convert VkDeviceCreateInfo, res=%d.\n", res); wine_vk_device_free(object); return res; } -- 2.16.4

1 0

[PATCH 2/4] vulkan-1/tests: Add test for unsupported instance extensions.
by Józef Kucia 10 Sep '18

10 Sep '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/vulkan-1/tests/vulkan.c | 44 +++++++++++++++++++++++++++++++++++++------- 1 file changed, 37 insertions(+), 7 deletions(-) diff --git a/dlls/vulkan-1/tests/vulkan.c b/dlls/vulkan-1/tests/vulkan.c index 20a245238b02..55efa236b041 100644 --- a/dlls/vulkan-1/tests/vulkan.c +++ b/dlls/vulkan-1/tests/vulkan.c @@ -25,7 +25,6 @@ static VkResult create_instance(uint32_t extension_count, const char * const *enabled_extensions, VkInstance *vk_instance) { VkInstanceCreateInfo create_info; - VkResult vr; create_info.sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO; create_info.pNext = NULL; @@ -36,22 +35,32 @@ static VkResult create_instance(uint32_t extension_count, create_info.enabledExtensionCount = extension_count; create_info.ppEnabledExtensionNames = enabled_extensions; - if ((vr = vkCreateInstance(&create_info, NULL, vk_instance)) >= 0) + return vkCreateInstance(&create_info, NULL, vk_instance); +} + +#define create_instance_skip(a, b, c) create_instance_skip_(__LINE__, a, b, c) +static VkResult create_instance_skip_(unsigned int line, uint32_t extension_count, + const char * const *enabled_extensions, VkInstance *vk_instance) +{ + VkResult vr; + + if ((vr = create_instance(extension_count, enabled_extensions, vk_instance)) >= 0) return vr; switch (vr) { case VK_ERROR_EXTENSION_NOT_PRESENT: if (extension_count == 1) - skip("Instance extension '%s' not supported.\n", enabled_extensions[0]); + skip_(__FILE__, line)("Instance extension '%s' not supported.\n", enabled_extensions[0]); else - skip("Instance extensions not supported.\n"); + skip_(__FILE__, line)("Instance extensions not supported.\n"); break; default: - skip("Failed to create Vulkan instance, vr %d.\n", vr); + skip_(__FILE__, line)("Failed to create Vulkan instance, vr %d.\n", vr); break; } + return vr; } @@ -186,7 +195,7 @@ static void test_physical_device_groups(void) VK_KHR_DEVICE_GROUP_CREATION_EXTENSION_NAME, }; - if ((vr = create_instance(ARRAY_SIZE(extensions), extensions, &vk_instance)) < 0) + if ((vr = create_instance_skip(ARRAY_SIZE(extensions), extensions, &vk_instance)) < 0) return; ok(vr == VK_SUCCESS, "Got unexpected VkResult %d.\n", vr); @@ -271,6 +280,26 @@ static void test_destroy_command_pool(VkPhysicalDevice vk_physical_device) vkDestroyDevice(vk_device, NULL); } +static void test_unsupported_instance_extensions(void) +{ + VkInstance vk_instance; + unsigned int i; + VkResult vr; + + static const char *extensions[] = + { + "VK_KHR_xcb_surface", + "VK_KHR_xlib_surface", + }; + + for (i = 0; i < ARRAY_SIZE(extensions); ++i) + { + vr = create_instance(1, &extensions[i], &vk_instance); + ok(vr == VK_ERROR_EXTENSION_NOT_PRESENT, + "Got VkResult %d for extension %s.\n", vr, extensions[i]); + } +} + static void for_each_device(void (*test_func)(VkPhysicalDevice)) { VkPhysicalDevice *vk_physical_devices; @@ -279,7 +308,7 @@ static void for_each_device(void (*test_func)(VkPhysicalDevice)) uint32_t count; VkResult vr; - if ((vr = create_instance(0, NULL, &vk_instance)) < 0) + if ((vr = create_instance_skip(0, NULL, &vk_instance)) < 0) return; ok(vr == VK_SUCCESS, "Got unexpected VkResult %d.\n", vr); @@ -312,4 +341,5 @@ START_TEST(vulkan) for_each_device(enumerate_device_queues); test_physical_device_groups(); for_each_device(test_destroy_command_pool); + test_unsupported_instance_extensions(); } -- 2.16.4

1 0

[PATCH 1/4] winevulkan: Check if instance extensions are supported.
by Józef Kucia 10 Sep '18

10 Sep '18

Return VK_ERROR_EXTENSION_NOT_PRESENT for unsupported extensions. Fixes crashes in some Vulkan CTS tests. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/winevulkan/vulkan.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 4e0d999ddb41..7485fdc04669 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -349,7 +349,7 @@ static BOOL wine_vk_init(void) * This function takes care of extensions handled at winevulkan layer, a Wine graphics * driver is responsible for handling e.g. surface extensions. */ -static void wine_vk_instance_convert_create_info(const VkInstanceCreateInfo *src, +static VkResult wine_vk_instance_convert_create_info(const VkInstanceCreateInfo *src, VkInstanceCreateInfo *dst) { unsigned int i; @@ -400,11 +400,19 @@ static void wine_vk_instance_convert_create_info(const VkInstanceCreateInfo *src dst->enabledLayerCount = 0; dst->ppEnabledLayerNames = NULL; - TRACE("Enabled extensions: %u\n", dst->enabledExtensionCount); + TRACE("Enabled %u instance extensions.\n", dst->enabledExtensionCount); for (i = 0; i < dst->enabledExtensionCount; i++) { - TRACE("Extension %u: %s\n", i, debugstr_a(dst->ppEnabledExtensionNames[i])); + const char *extension_name = dst->ppEnabledExtensionNames[i]; + TRACE("Extension %u: %s.\n", i, debugstr_a(extension_name)); + if (!wine_vk_instance_extension_supported(extension_name)) + { + WARN("Extension %s is not supported.\n", debugstr_a(extension_name)); + return VK_ERROR_EXTENSION_NOT_PRESENT; + } } + + return VK_SUCCESS; } /* Helper function which stores wrapped physical devices in the instance object. */ @@ -710,7 +718,12 @@ VkResult WINAPI wine_vkCreateInstance(const VkInstanceCreateInfo *create_info, } object->base.loader_magic = VULKAN_ICD_MAGIC_VALUE; - wine_vk_instance_convert_create_info(create_info, &create_info_host); + res = wine_vk_instance_convert_create_info(create_info, &create_info_host); + if (res != VK_SUCCESS) + { + wine_vk_instance_free(object); + return res; + } res = vk_funcs->p_vkCreateInstance(&create_info_host, NULL /* allocator */, &object->instance); if (res != VK_SUCCESS) -- 2.16.4

1 0

[PATCH] ntdll/tests: If DEP is enabled, skip a test that will crash
by Alex Henrie 10 Sep '18

10 Sep '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- DEP is enabled by default on server editions of Windows, so this test has been consistently crashing on Windows Server 2008. --- dlls/ntdll/tests/info.c | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 2ab12e4257..2ee9f0deba 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -37,6 +37,7 @@ static NTSTATUS (WINAPI * pNtUnmapViewOfSection)(HANDLE,PVOID); static NTSTATUS (WINAPI * pNtClose)(HANDLE); static ULONG (WINAPI * pNtGetCurrentProcessorNumber)(void); static BOOL (WINAPI * pIsWow64Process)(HANDLE, PBOOL); +static BOOL (WINAPI * pGetProcessDEPPolicy)(HANDLE,DWORD*,BOOL*); static BOOL (WINAPI * pGetLogicalProcessorInformationEx)(LOGICAL_PROCESSOR_RELATIONSHIP,SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX*,DWORD*); static BOOL is_wow64; @@ -96,6 +97,8 @@ static BOOL InitFunctionPtrs(void) pIsWow64Process = (void *)GetProcAddress(hkernel32, "IsWow64Process"); if (!pIsWow64Process || !pIsWow64Process( GetCurrentProcess(), &is_wow64 )) is_wow64 = FALSE; + pGetProcessDEPPolicy = (void *)GetProcAddress(hkernel32, "GetProcessDEPPolicy"); + /* starting with Win7 */ pNtQuerySystemInformationEx = (void *) GetProcAddress(hntdll, "NtQuerySystemInformationEx"); if (!pNtQuerySystemInformationEx) @@ -1838,6 +1841,8 @@ static void test_mapprotection(void) LARGE_INTEGER size, offset; NTSTATUS status; SIZE_T retlen, count; + DWORD dep_flags; + BOOL dep_permanent; void (*f)(void); BOOL reset_flags = FALSE; @@ -1883,18 +1888,28 @@ static void test_mapprotection(void) status = pNtMapViewOfSection ( h, GetCurrentProcess(), &addr, 0, 0, &offset, &count, ViewShare, 0, PAGE_READWRITE); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); + if (pGetProcessDEPPolicy && + pGetProcessDEPPolicy(GetCurrentProcess(), &dep_flags, &dep_permanent) && + dep_flags & PROCESS_DEP_ENABLE) + { + skip("Data Execution Prevention is enabled\n"); + } + else + { #if defined(__x86_64__) || defined(__i386__) - *(unsigned char*)addr = 0xc3; /* lret ... in both i386 and x86_64 */ + *(unsigned char*)addr = 0xc3; /* lret ... in both i386 and x86_64 */ #elif defined(__arm__) - *(unsigned long*)addr = 0xe12fff1e; /* bx lr */ + *(unsigned long*)addr = 0xe12fff1e; /* bx lr */ #elif defined(__aarch64__) - *(unsigned long*)addr = 0xd65f03c0; /* ret */ + *(unsigned long*)addr = 0xd65f03c0; /* ret */ #else - ok(0, "Add a return opcode for your architecture or expect a crash in this test\n"); + ok(0, "Add a return opcode for your architecture or expect a crash in this test\n"); #endif - trace("trying to execute code in the readwrite only mapped anon file...\n"); - f = addr;f(); - trace("...done.\n"); + trace("trying to execute code in the readwrite-only mapped anon file...\n"); + f = addr; + f(); + trace("...done.\n"); + } status = pNtQueryVirtualMemory( GetCurrentProcess(), addr, MemoryBasicInformation, &info, sizeof(info), &retlen ); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); -- 2.18.0

2 2

[PATCH 2/2] comctl32: Fix drawing function of disabled button in toolbar.
by Ziqing Hui 10 Sep '18

10 Sep '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=24784 Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/comctl32/tests/toolbar.c | 2 +- dlls/comctl32/toolbar.c | 82 +++++++++++++++++++++++++++++-------------- 2 files changed, 56 insertions(+), 28 deletions(-)

2 2

[PATCH 5/5] msi/tests: Add more tests for remote MsiSummaryInfoGetProperty.
by Dmitry Timoshkov 10 Sep '18

10 Sep '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/msi/tests/custom.c | 69 +++++++++++++++++++++++++++-------------- 1 file changed, 46 insertions(+), 23 deletions(-) diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index a727bbd4df..f06aee0675 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -277,10 +277,14 @@ static void test_props(MSIHANDLE hinst) static void test_db(MSIHANDLE hinst) { + static const UINT prop_type[20] = { VT_EMPTY, VT_EMPTY, VT_LPSTR, VT_EMPTY, VT_EMPTY, + VT_EMPTY, VT_EMPTY, VT_LPSTR, VT_EMPTY, VT_LPSTR, + VT_EMPTY, VT_EMPTY, VT_EMPTY, VT_EMPTY, VT_I4, + VT_I4, VT_EMPTY, VT_EMPTY, VT_EMPTY, VT_EMPTY }; MSIHANDLE hdb, view, rec, rec2, suminfo; char buffer[10]; DWORD sz; - UINT r, count, type; + UINT r, count, type, i; INT int_value; FILETIME ft; @@ -466,30 +470,49 @@ static void test_db(MSIHANDLE hinst) r = MsiSummaryInfoGetPropertyA(suminfo, 0, NULL, NULL, NULL, NULL, NULL); ok(hinst, r == RPC_X_NULL_REF_POINTER, "got %u\n", r); - type = 0xdeadbeef; - int_value = 0xdeadbeef; - strcpy(buffer, "deadbeef"); - sz = sizeof(buffer); - r = MsiSummaryInfoGetPropertyA(suminfo, PID_AUTHOR, &type, &int_value, &ft, buffer, &sz); - ok(hinst, !r, "got %u\n", r); - ok(hinst, type == 0, "got %u\n", type); - ok(hinst, int_value == 0, "got %u\n", int_value); - ok(hinst, sz == sizeof(buffer), "got %u\n", sz); - ok(hinst, !lstrcmpA(buffer, "deadbeef"), "got %s\n", buffer); + for (i = 0; i < 20; i++) + { + /* for some reason query for PID_TITLE leads to install failure under Windows */ + if (i == PID_TITLE) continue; + + type = 0xdeadbeef; + int_value = 0xdeadbeef; + *buffer = 0; + sz = sizeof(buffer); + r = MsiSummaryInfoGetPropertyA(suminfo, i, &type, &int_value, &ft, buffer, &sz); + if (sz == sizeof(buffer) || i == PID_TEMPLATE) + ok(hinst, !r, "%u: got %u\n", i, r); + else + ok(hinst, r == ERROR_MORE_DATA, "%u: got %u\n", i, r); + ok(hinst, type == prop_type[i], "%u: expected %u, got %u\n", i, prop_type[i], type); + if (i == PID_PAGECOUNT) + ok(hinst, int_value == 100, "%u: got %u\n", i, int_value); + else + ok(hinst, int_value == 0, "%u: got %u\n", i, int_value); + if (i == PID_TEMPLATE) + { + ok(hinst, sz == 5, "%u: got %u\n", i, sz); + ok(hinst, !lstrcmpA(buffer, ";1033"), "%u: got %s\n", i, buffer); + } + else if (i == PID_REVNUMBER) + { + ok(hinst, sz == 76, "%u: got %u\n", i, sz); + ok(hinst, !lstrcmpA(buffer, "{004757CA"), "%u: got %s\n", i, buffer); + } + else + { + ok(hinst, sz == sizeof(buffer), "%u: got %u\n", i, sz); + ok(hinst, !*buffer, "%u: got %s\n", i, buffer); + } + } - type = 0xdeadbeef; - int_value = 0xdeadbeef; - strcpy(buffer, "deadbeef"); - sz = sizeof(buffer); - r = MsiSummaryInfoGetPropertyA(suminfo, PID_CODEPAGE, &type, &int_value, &ft, buffer, &sz); - ok(hinst, !r, "got %u\n", r); - ok(hinst, type == 0, "got %u\n", type); - ok(hinst, int_value == 0, "got %u\n", int_value); - ok(hinst, sz == sizeof(buffer), "got %u\n", sz); - ok(hinst, !lstrcmpA(buffer, "deadbeef"), "got %s\n", buffer); + GetSystemTimeAsFileTime(&ft); - r = MsiSummaryInfoSetPropertyA(suminfo, PID_CODEPAGE, VT_I2, 1252, &ft, ""); - ok(hinst, r == ERROR_FUNCTION_FAILED, "got %u\n", r); + for (i = 0; i < 20; i++) + { + r = MsiSummaryInfoSetPropertyA(suminfo, i, prop_type[i], 1252, &ft, ""); + ok(hinst, r == ERROR_FUNCTION_FAILED, "%u: got %u\n", i, r); + } r = MsiSummaryInfoSetPropertyW(suminfo, PID_CODEPAGE, VT_I2, 1252, &ft, NULL); ok(hinst, r == ERROR_FUNCTION_FAILED, "got %u\n", r); -- 2.17.1

3 2

[PATCH 4/5] msi: Handle the remote case in MsiSummaryInfoGetProperty. (v2)
by Dmitry Timoshkov 10 Sep '18

10 Sep '18

This patch fixes the regression introduced by bf5589311de8ac2c74e3bd73bef32337a2ce8df2. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/msi/suminfo.c | 66 +++++++++++++++++++++++++++++++++++++++-- dlls/msi/tests/custom.c | 7 ----- dlls/msi/winemsi.idl | 2 ++ 3 files changed, 66 insertions(+), 9 deletions(-) diff --git a/dlls/msi/suminfo.c b/dlls/msi/suminfo.c index d2bf678853..37c49d72e2 100644 --- a/dlls/msi/suminfo.c +++ b/dlls/msi/suminfo.c @@ -741,7 +741,29 @@ UINT WINAPI MsiSummaryInfoGetPropertyA( } if (!(si = msihandle2msiinfo( handle, MSIHANDLETYPE_SUMMARYINFO ))) - return ERROR_INVALID_HANDLE; + { + MSIHANDLE remote; + WCHAR *buf = NULL; + + if (!(remote = msi_get_remote( handle ))) + return ERROR_INVALID_HANDLE; + + __TRY + { + r = remote_SummaryInfoGetProperty( remote, uiProperty, puiDataType, piValue, pftValue, &buf ); + } + __EXCEPT(rpc_filter) + { + r = GetExceptionCode(); + } + __ENDTRY + + if (!r) + r = msi_strncpyWtoA( buf, -1, szValueBuf, pcchValueBuf, TRUE ); + + midl_user_free( buf ); + return r; + } str.unicode = FALSE; str.str.a = szValueBuf; @@ -769,7 +791,29 @@ UINT WINAPI MsiSummaryInfoGetPropertyW( } if (!(si = msihandle2msiinfo( handle, MSIHANDLETYPE_SUMMARYINFO ))) - return ERROR_INVALID_HANDLE; + { + MSIHANDLE remote; + WCHAR *buf = NULL; + + if (!(remote = msi_get_remote( handle ))) + return ERROR_INVALID_HANDLE; + + __TRY + { + r = remote_SummaryInfoGetProperty( remote, uiProperty, puiDataType, piValue, pftValue, &buf ); + } + __EXCEPT(rpc_filter) + { + r = GetExceptionCode(); + } + __ENDTRY + + if (!r) + r = msi_strncpyW( buf, -1, szValueBuf, pcchValueBuf ); + + midl_user_free( buf ); + return r; + } str.unicode = TRUE; str.str.w = szValueBuf; @@ -1150,3 +1194,21 @@ UINT __cdecl s_remote_SummaryInfoGetPropertyCount( MSIHANDLE suminfo, UINT *coun { return MsiSummaryInfoGetPropertyCount( suminfo, count ); } + +UINT __cdecl s_remote_SummaryInfoGetProperty( MSIHANDLE suminfo, UINT property, UINT *type, + INT *value, FILETIME *ft, LPWSTR *buf ) +{ + WCHAR empty[1]; + DWORD size = 0; + UINT r; + + r = MsiSummaryInfoGetPropertyW( suminfo, property, type, value, ft, empty, &size ); + if (r == ERROR_MORE_DATA) + { + size++; + *buf = midl_user_allocate( size * sizeof(WCHAR) ); + if (!*buf) return ERROR_OUTOFMEMORY; + r = MsiSummaryInfoGetPropertyW( suminfo, property, type, value, ft, *buf, &size ); + } + return r; +} diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index eb0ed625ef..a727bbd4df 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -464,7 +464,6 @@ static void test_db(MSIHANDLE hinst) ok(hinst, count == 5, "got %u\n", count); r = MsiSummaryInfoGetPropertyA(suminfo, 0, NULL, NULL, NULL, NULL, NULL); -todo_wine ok(hinst, r == RPC_X_NULL_REF_POINTER, "got %u\n", r); type = 0xdeadbeef; @@ -472,11 +471,8 @@ todo_wine strcpy(buffer, "deadbeef"); sz = sizeof(buffer); r = MsiSummaryInfoGetPropertyA(suminfo, PID_AUTHOR, &type, &int_value, &ft, buffer, &sz); -todo_wine ok(hinst, !r, "got %u\n", r); -todo_wine ok(hinst, type == 0, "got %u\n", type); -todo_wine ok(hinst, int_value == 0, "got %u\n", int_value); ok(hinst, sz == sizeof(buffer), "got %u\n", sz); ok(hinst, !lstrcmpA(buffer, "deadbeef"), "got %s\n", buffer); @@ -486,11 +482,8 @@ todo_wine strcpy(buffer, "deadbeef"); sz = sizeof(buffer); r = MsiSummaryInfoGetPropertyA(suminfo, PID_CODEPAGE, &type, &int_value, &ft, buffer, &sz); -todo_wine ok(hinst, !r, "got %u\n", r); -todo_wine ok(hinst, type == 0, "got %u\n", type); -todo_wine ok(hinst, int_value == 0, "got %u\n", int_value); ok(hinst, sz == sizeof(buffer), "got %u\n", sz); ok(hinst, !lstrcmpA(buffer, "deadbeef"), "got %s\n", buffer); diff --git a/dlls/msi/winemsi.idl b/dlls/msi/winemsi.idl index 5a14ffdb79..ebbca82a16 100644 --- a/dlls/msi/winemsi.idl +++ b/dlls/msi/winemsi.idl @@ -75,6 +75,8 @@ interface IWineMsiRemote UINT remote_DatabaseOpenView( [in] MSIHANDLE db, [in, string] LPCWSTR query, [out] MSIHANDLE *view ); UINT remote_SummaryInfoGetPropertyCount( [in] MSIHANDLE suminfo, [out] UINT *count ); + UINT remote_SummaryInfoGetProperty( [in] MSIHANDLE suminfo, [in] UINT property, [out] UINT *type, [out] INT *value, + [out] FILETIME *ft, [out, string] LPWSTR *buf ); MSIHANDLE remote_GetActiveDatabase( [in] MSIHANDLE hinst ); UINT remote_GetProperty( [in] MSIHANDLE hinst, [in, string] LPCWSTR property, [out, string] LPWSTR *value, [out] DWORD *size ); -- 2.17.1

3 2

[PATCH 3/5] msi: Handle the remote case in MsiSummaryInfoGetPropertyCount. (v2)
by Dmitry Timoshkov 10 Sep '18

10 Sep '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/msi/suminfo.c | 25 ++++++++++++++++++++++++- dlls/msi/tests/custom.c | 3 --- dlls/msi/winemsi.idl | 2 ++ 3 files changed, 26 insertions(+), 4 deletions(-) diff --git a/dlls/msi/suminfo.c b/dlls/msi/suminfo.c index 8c844a6a6c..d2bf678853 100644 --- a/dlls/msi/suminfo.c +++ b/dlls/msi/suminfo.c @@ -600,7 +600,25 @@ UINT WINAPI MsiSummaryInfoGetPropertyCount(MSIHANDLE hSummaryInfo, PUINT pCount) si = msihandle2msiinfo( hSummaryInfo, MSIHANDLETYPE_SUMMARYINFO ); if( !si ) - return ERROR_INVALID_HANDLE; + { + MSIHANDLE remote; + UINT ret; + + if (!(remote = msi_get_remote( hSummaryInfo ))) + return ERROR_INVALID_HANDLE; + + __TRY + { + ret = remote_SummaryInfoGetPropertyCount( remote, pCount ); + } + __EXCEPT(rpc_filter) + { + ret = GetExceptionCode(); + } + __ENDTRY + + return ret; + } if( pCount ) *pCount = get_property_count( si->property ); @@ -1127,3 +1145,8 @@ UINT msi_load_suminfo_properties( MSIPACKAGE *package ) msiobj_release( &si->hdr ); return r; } + +UINT __cdecl s_remote_SummaryInfoGetPropertyCount( MSIHANDLE suminfo, UINT *count ) +{ + return MsiSummaryInfoGetPropertyCount( suminfo, count ); +} diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index 0ba5f10c88..eb0ed625ef 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -456,14 +456,11 @@ static void test_db(MSIHANDLE hinst) ok(hinst, !r, "got %u\n", r); r = MsiSummaryInfoGetPropertyCount(suminfo, NULL); -todo_wine ok(hinst, r == RPC_X_NULL_REF_POINTER, "got %u\n", r); count = 0xdeadbeef; r = MsiSummaryInfoGetPropertyCount(suminfo, &count); -todo_wine ok(hinst, !r, "got %u\n", r); -todo_wine ok(hinst, count == 5, "got %u\n", count); r = MsiSummaryInfoGetPropertyA(suminfo, 0, NULL, NULL, NULL, NULL, NULL); diff --git a/dlls/msi/winemsi.idl b/dlls/msi/winemsi.idl index 50f62fcbfd..5a14ffdb79 100644 --- a/dlls/msi/winemsi.idl +++ b/dlls/msi/winemsi.idl @@ -74,6 +74,8 @@ interface IWineMsiRemote UINT remote_DatabaseGetSummaryInformation( [in] MSIHANDLE db, [in] UINT updatecount, [out] MSIHANDLE *suminfo ); UINT remote_DatabaseOpenView( [in] MSIHANDLE db, [in, string] LPCWSTR query, [out] MSIHANDLE *view ); + UINT remote_SummaryInfoGetPropertyCount( [in] MSIHANDLE suminfo, [out] UINT *count ); + MSIHANDLE remote_GetActiveDatabase( [in] MSIHANDLE hinst ); UINT remote_GetProperty( [in] MSIHANDLE hinst, [in, string] LPCWSTR property, [out, string] LPWSTR *value, [out] DWORD *size ); UINT remote_SetProperty( [in] MSIHANDLE hinst, [in, string, unique] LPCWSTR property, [in, string, unique] LPCWSTR value ); -- 2.17.1

3 2

[PATCH 2/5] msi: Handle the remote case in MsiSummaryInfoSetProperty.
by Dmitry Timoshkov 10 Sep '18

10 Sep '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/msi/suminfo.c | 20 ++++++++++++++++++++ dlls/msi/tests/custom.c | 4 +++- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/msi/suminfo.c b/dlls/msi/suminfo.c index e796a692e4..8c844a6a6c 100644 --- a/dlls/msi/suminfo.c +++ b/dlls/msi/suminfo.c @@ -836,7 +836,17 @@ UINT WINAPI MsiSummaryInfoSetPropertyW( MSIHANDLE handle, UINT uiProperty, UINT return ERROR_INVALID_PARAMETER; if (!(si = msihandle2msiinfo( handle, MSIHANDLETYPE_SUMMARYINFO ))) + { + MSIHANDLE remote; + + if ((remote = msi_get_remote( handle ))) + { + WARN("MsiSummaryInfoSetProperty not allowed during a custom action!\n"); + return ERROR_FUNCTION_FAILED; + } + return ERROR_INVALID_HANDLE; + } str.unicode = TRUE; str.str.w = szValue; @@ -867,7 +877,17 @@ UINT WINAPI MsiSummaryInfoSetPropertyA( MSIHANDLE handle, UINT uiProperty, UINT return ERROR_INVALID_PARAMETER; if (!(si = msihandle2msiinfo( handle, MSIHANDLETYPE_SUMMARYINFO ))) + { + MSIHANDLE remote; + + if ((remote = msi_get_remote( handle ))) + { + WARN("MsiSummaryInfoSetProperty not allowed during a custom action!\n"); + return ERROR_FUNCTION_FAILED; + } + return ERROR_INVALID_HANDLE; + } str.unicode = FALSE; str.str.a = szValue; diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index 1cf24536d0..0ba5f10c88 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -499,7 +499,9 @@ todo_wine ok(hinst, !lstrcmpA(buffer, "deadbeef"), "got %s\n", buffer); r = MsiSummaryInfoSetPropertyA(suminfo, PID_CODEPAGE, VT_I2, 1252, &ft, ""); -todo_wine + ok(hinst, r == ERROR_FUNCTION_FAILED, "got %u\n", r); + + r = MsiSummaryInfoSetPropertyW(suminfo, PID_CODEPAGE, VT_I2, 1252, &ft, NULL); ok(hinst, r == ERROR_FUNCTION_FAILED, "got %u\n", r); r = MsiCloseHandle(suminfo); -- 2.17.1

3 2

[PATCH 1/5] msi/tests: Add some tests for remote MSI summary info APIs.
by Dmitry Timoshkov 10 Sep '18

10 Sep '18

These patches depend on "msi: Add exception handling around all custom action RPC calls." Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/msi/tests/custom.c | 52 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 51 insertions(+), 1 deletion(-) diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index 6332d68768..1cf24536d0 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -30,6 +30,7 @@ #include <msxml.h> #include <msi.h> #include <msiquery.h> +#include <msidefs.h> static int todo_level, todo_do_loop; @@ -279,7 +280,9 @@ static void test_db(MSIHANDLE hinst) MSIHANDLE hdb, view, rec, rec2, suminfo; char buffer[10]; DWORD sz; - UINT r; + UINT r, count, type; + INT int_value; + FILETIME ft; hdb = MsiGetActiveDatabase(hinst); ok(hinst, hdb, "MsiGetActiveDatabase failed\n"); @@ -452,6 +455,53 @@ static void test_db(MSIHANDLE hinst) r = MsiGetSummaryInformationA(hdb, NULL, 1, &suminfo); ok(hinst, !r, "got %u\n", r); + r = MsiSummaryInfoGetPropertyCount(suminfo, NULL); +todo_wine + ok(hinst, r == RPC_X_NULL_REF_POINTER, "got %u\n", r); + + count = 0xdeadbeef; + r = MsiSummaryInfoGetPropertyCount(suminfo, &count); +todo_wine + ok(hinst, !r, "got %u\n", r); +todo_wine + ok(hinst, count == 5, "got %u\n", count); + + r = MsiSummaryInfoGetPropertyA(suminfo, 0, NULL, NULL, NULL, NULL, NULL); +todo_wine + ok(hinst, r == RPC_X_NULL_REF_POINTER, "got %u\n", r); + + type = 0xdeadbeef; + int_value = 0xdeadbeef; + strcpy(buffer, "deadbeef"); + sz = sizeof(buffer); + r = MsiSummaryInfoGetPropertyA(suminfo, PID_AUTHOR, &type, &int_value, &ft, buffer, &sz); +todo_wine + ok(hinst, !r, "got %u\n", r); +todo_wine + ok(hinst, type == 0, "got %u\n", type); +todo_wine + ok(hinst, int_value == 0, "got %u\n", int_value); + ok(hinst, sz == sizeof(buffer), "got %u\n", sz); + ok(hinst, !lstrcmpA(buffer, "deadbeef"), "got %s\n", buffer); + + type = 0xdeadbeef; + int_value = 0xdeadbeef; + strcpy(buffer, "deadbeef"); + sz = sizeof(buffer); + r = MsiSummaryInfoGetPropertyA(suminfo, PID_CODEPAGE, &type, &int_value, &ft, buffer, &sz); +todo_wine + ok(hinst, !r, "got %u\n", r); +todo_wine + ok(hinst, type == 0, "got %u\n", type); +todo_wine + ok(hinst, int_value == 0, "got %u\n", int_value); + ok(hinst, sz == sizeof(buffer), "got %u\n", sz); + ok(hinst, !lstrcmpA(buffer, "deadbeef"), "got %s\n", buffer); + + r = MsiSummaryInfoSetPropertyA(suminfo, PID_CODEPAGE, VT_I2, 1252, &ft, ""); +todo_wine + ok(hinst, r == ERROR_FUNCTION_FAILED, "got %u\n", r); + r = MsiCloseHandle(suminfo); ok(hinst, !r, "got %u\n", r); -- 2.17.1

3 2

[PATCH] msi: Add exception handling around all custom action RPC calls.
by Zebediah Figura 10 Sep '18

10 Sep '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/msi/cond.y | 13 +++- dlls/msi/custom.c | 5 ++ dlls/msi/format.c | 21 +++++- dlls/msi/install.c | 195 +++++++++++++++++++++++++++++++++++++++++++++------- dlls/msi/msi.c | 12 +++- dlls/msi/msipriv.h | 1 + dlls/msi/msiquery.c | 92 ++++++++++++++++++++++--- dlls/msi/package.c | 57 +++++++++++++-- dlls/msi/suminfo.c | 12 +++- 9 files changed, 363 insertions(+), 45 deletions(-) diff --git a/dlls/msi/cond.y b/dlls/msi/cond.y index a8c9734..2e252be 100644 --- a/dlls/msi/cond.y +++ b/dlls/msi/cond.y @@ -39,6 +39,7 @@ #include "msipriv.h" #include "winemsi.h" #include "wine/debug.h" +#include "wine/exception.h" #include "wine/unicode.h" #include "wine/list.h" @@ -858,7 +859,17 @@ MSICONDITION WINAPI MsiEvaluateConditionW( MSIHANDLE hInstall, LPCWSTR szConditi if (!szCondition) return MSICONDITION_NONE; - return remote_EvaluateCondition(remote, szCondition); + __TRY + { + ret = remote_EvaluateCondition(remote, szCondition); + } + __EXCEPT(rpc_filter) + { + ret = GetExceptionCode(); + } + __ENDTRY + + return ret; } ret = MSI_EvaluateConditionW( package, szCondition ); diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 436a096..a0fc3dd 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -76,6 +76,11 @@ void __RPC_USER MIDL_user_free(void __RPC_FAR * ptr) heap_free(ptr); } +LONG WINAPI rpc_filter(EXCEPTION_POINTERS *eptr) +{ + return I_RpcExceptionFilter(eptr->ExceptionRecord->ExceptionCode); +} + UINT msi_schedule_action( MSIPACKAGE *package, UINT script, const WCHAR *action ) { UINT count; diff --git a/dlls/msi/format.c b/dlls/msi/format.c index d32afb2..128143f 100644 --- a/dlls/msi/format.c +++ b/dlls/msi/format.c @@ -35,6 +35,7 @@ #include "msipriv.h" #include "winemsi.h" +#include "wine/exception.h" #include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(msi); @@ -919,7 +920,15 @@ UINT WINAPI MsiFormatRecordW( MSIHANDLE hInstall, MSIHANDLE hRecord, if ((remote = msi_get_remote(hInstall))) { - r = remote_FormatRecord(remote, (struct wire_record *)&record->count, &value); + __TRY + { + r = remote_FormatRecord(remote, (struct wire_record *)&record->count, &value); + } + __EXCEPT(rpc_filter) + { + r = GetExceptionCode(); + } + __ENDTRY if (!r) r = msi_strncpyW(value, -1, szResult, sz); @@ -968,7 +977,15 @@ UINT WINAPI MsiFormatRecordA(MSIHANDLE hinst, MSIHANDLE hrec, char *buf, DWORD * if ((remote = msi_get_remote(hinst))) { - r = remote_FormatRecord(remote, (struct wire_record *)&rec->count, &value); + __TRY + { + r = remote_FormatRecord(remote, (struct wire_record *)&rec->count, &value); + } + __EXCEPT(rpc_filter) + { + r = GetExceptionCode(); + } + __ENDTRY if (!r) r = msi_strncpyWtoA(value, -1, buf, sz, TRUE); diff --git a/dlls/msi/install.c b/dlls/msi/install.c index 0e224c9..ce36bd3 100644 --- a/dlls/msi/install.c +++ b/dlls/msi/install.c @@ -36,6 +36,7 @@ #include "winemsi.h" #include "wine/heap.h" #include "wine/debug.h" +#include "wine/exception.h" #include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(msi); @@ -80,7 +81,17 @@ UINT WINAPI MsiDoActionW( MSIHANDLE hInstall, LPCWSTR szAction ) if (!(remote = msi_get_remote(hInstall))) return ERROR_INVALID_HANDLE; - return remote_DoAction(remote, szAction); + __TRY + { + ret = remote_DoAction(remote, szAction); + } + __EXCEPT(rpc_filter) + { + ret = GetExceptionCode(); + } + __ENDTRY + + return ret; } ret = ACTION_PerformAction(package, szAction); @@ -129,7 +140,17 @@ UINT WINAPI MsiSequenceW( MSIHANDLE hInstall, LPCWSTR szTable, INT iSequenceMode if (!(remote = msi_get_remote(hInstall))) return ERROR_INVALID_HANDLE; - return remote_Sequence(remote, szTable, iSequenceMode); + __TRY + { + ret = remote_Sequence(remote, szTable, iSequenceMode); + } + __EXCEPT(rpc_filter) + { + ret = GetExceptionCode(); + } + __ENDTRY + + return ret; } ret = MSI_Sequence( package, szTable ); msiobj_release( &package->hdr ); @@ -257,7 +278,16 @@ UINT WINAPI MsiGetTargetPathA(MSIHANDLE hinst, const char *folder, char *buf, DW return ERROR_INVALID_HANDLE; } - r = remote_GetTargetPath(remote, folderW, &path); + __TRY + { + r = remote_GetTargetPath(remote, folderW, &path); + } + __EXCEPT(rpc_filter) + { + r = GetExceptionCode(); + } + __ENDTRY + if (!r) r = msi_strncpyWtoA(path, -1, buf, sz, TRUE); @@ -300,7 +330,16 @@ UINT WINAPI MsiGetTargetPathW(MSIHANDLE hinst, const WCHAR *folder, WCHAR *buf, if (!(remote = msi_get_remote(hinst))) return ERROR_INVALID_HANDLE; - r = remote_GetTargetPath(remote, folder, &path); + __TRY + { + r = remote_GetTargetPath(remote, folder, &path); + } + __EXCEPT(rpc_filter) + { + r = GetExceptionCode(); + } + __ENDTRY + if (!r) r = msi_strncpyW(path, -1, buf, sz); @@ -396,7 +435,16 @@ UINT WINAPI MsiGetSourcePathA(MSIHANDLE hinst, const char *folder, char *buf, DW return ERROR_INVALID_HANDLE; } - r = remote_GetSourcePath(remote, folderW, &path); + __TRY + { + r = remote_GetSourcePath(remote, folderW, &path); + } + __EXCEPT(rpc_filter) + { + r = GetExceptionCode(); + } + __ENDTRY + if (!r) r = msi_strncpyWtoA(path, -1, buf, sz, TRUE); @@ -439,7 +487,16 @@ UINT WINAPI MsiGetSourcePathW(MSIHANDLE hinst, const WCHAR *folder, WCHAR *buf, if (!(remote = msi_get_remote(hinst))) return ERROR_INVALID_HANDLE; - r = remote_GetSourcePath(remote, folder, &path); + __TRY + { + r = remote_GetSourcePath(remote, folder, &path); + } + __EXCEPT(rpc_filter) + { + r = GetExceptionCode(); + } + __ENDTRY + if (!r) r = msi_strncpyW(path, -1, buf, sz); @@ -560,7 +617,17 @@ UINT WINAPI MsiSetTargetPathW(MSIHANDLE hInstall, LPCWSTR szFolder, if (!(remote = msi_get_remote(hInstall))) return ERROR_INVALID_HANDLE; - return remote_SetTargetPath(remote, szFolder, szFolderPath); + __TRY + { + ret = remote_SetTargetPath(remote, szFolder, szFolderPath); + } + __EXCEPT(rpc_filter) + { + ret = GetExceptionCode(); + } + __ENDTRY + + return ret; } ret = MSI_SetTargetPathW( package, szFolder, szFolderPath ); @@ -616,7 +683,17 @@ BOOL WINAPI MsiGetMode(MSIHANDLE hInstall, MSIRUNMODE iRunMode) if (!(remote = msi_get_remote(hInstall))) return FALSE; - return remote_GetMode(remote, iRunMode); + __TRY + { + r = remote_GetMode(remote, iRunMode); + } + __EXCEPT(rpc_filter) + { + r = FALSE; + } + __ENDTRY + + return r; } switch (iRunMode) @@ -699,7 +776,17 @@ UINT WINAPI MsiSetMode(MSIHANDLE hInstall, MSIRUNMODE iRunMode, BOOL fState) if (!(remote = msi_get_remote(hInstall))) return FALSE; - return remote_SetMode(remote, iRunMode, fState); + __TRY + { + r = remote_SetMode(remote, iRunMode, fState); + } + __EXCEPT(rpc_filter) + { + r = GetExceptionCode(); + } + __ENDTRY + + return r; } switch (iRunMode) @@ -877,7 +964,17 @@ UINT WINAPI MsiSetFeatureStateW(MSIHANDLE hInstall, LPCWSTR szFeature, if (!(remote = msi_get_remote(hInstall))) return ERROR_INVALID_HANDLE; - return remote_SetFeatureState(remote, szFeature, iState); + __TRY + { + rc = remote_SetFeatureState(remote, szFeature, iState); + } + __EXCEPT(rpc_filter) + { + rc = GetExceptionCode(); + } + __ENDTRY + + return rc; } rc = MSI_SetFeatureStateW(package,szFeature,iState); @@ -1008,11 +1105,17 @@ UINT WINAPI MsiGetFeatureStateW(MSIHANDLE hInstall, LPCWSTR szFeature, if (!(remote = msi_get_remote(hInstall))) return ERROR_INVALID_HANDLE; - /* FIXME: should use SEH */ - if (!piInstalled || !piAction) - return RPC_X_NULL_REF_POINTER; + __TRY + { + ret = remote_GetFeatureState(remote, szFeature, piInstalled, piAction); + } + __EXCEPT(rpc_filter) + { + ret = GetExceptionCode(); + } + __ENDTRY - return remote_GetFeatureState(remote, szFeature, piInstalled, piAction); + return ret; } ret = MSI_GetFeatureStateW(package, szFeature, piInstalled, piAction); @@ -1123,11 +1226,17 @@ UINT WINAPI MsiGetFeatureCostW(MSIHANDLE hInstall, LPCWSTR szFeature, if (!(remote = msi_get_remote(hInstall))) return ERROR_INVALID_HANDLE; - /* FIXME: should use SEH */ - if (!piCost) - return RPC_X_NULL_REF_POINTER; + __TRY + { + ret = remote_GetFeatureCost(remote, szFeature, iCostTree, iState, piCost); + } + __EXCEPT(rpc_filter) + { + ret = GetExceptionCode(); + } + __ENDTRY - return remote_GetFeatureCost(remote, szFeature, iCostTree, iState, piCost); + return ret; } if (!piCost) @@ -1370,7 +1479,17 @@ UINT WINAPI MsiSetComponentStateW(MSIHANDLE hInstall, LPCWSTR szComponent, if (!(remote = msi_get_remote(hInstall))) return ERROR_INVALID_HANDLE; - return remote_SetComponentState(remote, szComponent, iState); + __TRY + { + ret = remote_SetComponentState(remote, szComponent, iState); + } + __EXCEPT(rpc_filter) + { + ret = GetExceptionCode(); + } + __ENDTRY + + return ret; } ret = MSI_SetComponentStateW(package, szComponent, iState); @@ -1401,11 +1520,17 @@ UINT WINAPI MsiGetComponentStateW(MSIHANDLE hInstall, LPCWSTR szComponent, if (!(remote = msi_get_remote(hInstall))) return ERROR_INVALID_HANDLE; - /* FIXME: should use SEH */ - if (!piInstalled || !piAction) - return RPC_X_NULL_REF_POINTER; + __TRY + { + ret = remote_GetComponentState(remote, szComponent, piInstalled, piAction); + } + __EXCEPT(rpc_filter) + { + ret = GetExceptionCode(); + } + __ENDTRY - return remote_GetComponentState(remote, szComponent, piInstalled, piAction); + return ret; } ret = MSI_GetComponentStateW( package, szComponent, piInstalled, piAction); @@ -1429,7 +1554,17 @@ LANGID WINAPI MsiGetLanguage(MSIHANDLE hInstall) if (!(remote = msi_get_remote(hInstall))) return ERROR_INVALID_HANDLE; - return remote_GetLanguage(remote); + __TRY + { + langid = remote_GetLanguage(remote); + } + __EXCEPT(rpc_filter) + { + langid = 0; + } + __ENDTRY + + return langid; } langid = msi_get_property_int( package->db, szProductLanguage, 0 ); @@ -1478,7 +1613,17 @@ UINT WINAPI MsiSetInstallLevel(MSIHANDLE hInstall, int iInstallLevel) if (!(remote = msi_get_remote(hInstall))) return ERROR_INVALID_HANDLE; - return remote_SetInstallLevel(remote, iInstallLevel); + __TRY + { + r = remote_SetInstallLevel(remote, iInstallLevel); + } + __EXCEPT(rpc_filter) + { + r = GetExceptionCode(); + } + __ENDTRY + + return r; } r = MSI_SetInstallLevel( package, iInstallLevel ); diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index ae146e6..39b9354 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -47,6 +47,7 @@ #include "msxml2.h" #include "wine/debug.h" +#include "wine/exception.h" #include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(msi); @@ -2026,7 +2027,16 @@ UINT WINAPI MsiEnumComponentCostsW( MSIHANDLE handle, LPCWSTR component, DWORD i if (!(remote = msi_get_remote(handle))) return ERROR_INVALID_HANDLE; - r = remote_EnumComponentCosts(remote, component, index, state, buffer, cost, temp); + __TRY + { + r = remote_EnumComponentCosts(remote, component, index, state, buffer, cost, temp); + } + __EXCEPT(rpc_filter) + { + r = GetExceptionCode(); + } + __ENDTRY + if (r == ERROR_SUCCESS) { lstrcpynW(drive, buffer, *buflen); diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 34bc490..10031d6 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -741,6 +741,7 @@ UINT msi_strcpy_to_awstring(const WCHAR *, int, awstring *, DWORD *) DECLSPEC_HI /* msi server interface */ extern MSIHANDLE msi_get_remote(MSIHANDLE handle) DECLSPEC_HIDDEN; +extern LONG WINAPI rpc_filter(EXCEPTION_POINTERS *eptr) DECLSPEC_HIDDEN; /* handle functions */ extern void *msihandle2msiinfo(MSIHANDLE handle, UINT type) DECLSPEC_HIDDEN; diff --git a/dlls/msi/msiquery.c b/dlls/msi/msiquery.c index 7dcfa7f..544bfc9 100644 --- a/dlls/msi/msiquery.c +++ b/dlls/msi/msiquery.c @@ -26,6 +26,7 @@ #include "winbase.h" #include "winerror.h" #include "wine/debug.h" +#include "wine/exception.h" #include "wine/unicode.h" #include "msi.h" #include "msiquery.h" @@ -258,7 +259,16 @@ UINT WINAPI MsiDatabaseOpenViewW(MSIHANDLE hdb, if (!(remote = msi_get_remote(hdb))) return ERROR_INVALID_HANDLE; - ret = remote_DatabaseOpenView(remote, szQuery, &remote_view); + __TRY + { + ret = remote_DatabaseOpenView(remote, szQuery, &remote_view); + } + __EXCEPT(rpc_filter) + { + ret = GetExceptionCode(); + } + __ENDTRY + if (!ret) *phView = alloc_msi_remote_handle(remote_view); return ret; @@ -397,7 +407,16 @@ UINT WINAPI MsiViewFetch(MSIHANDLE hView, MSIHANDLE *record) if (!(remote = msi_get_remote(hView))) return ERROR_INVALID_HANDLE; - ret = remote_ViewFetch(remote, &wire_rec); + __TRY + { + ret = remote_ViewFetch(remote, &wire_rec); + } + __EXCEPT(rpc_filter) + { + ret = GetExceptionCode(); + } + __ENDTRY + if (!ret) { ret = unmarshal_record(wire_rec, record); @@ -447,7 +466,17 @@ UINT WINAPI MsiViewClose(MSIHANDLE hView) if (!(remote = msi_get_remote(hView))) return ERROR_INVALID_HANDLE; - return remote_ViewClose(remote); + __TRY + { + ret = remote_ViewClose(remote); + } + __EXCEPT(rpc_filter) + { + ret = GetExceptionCode(); + } + __ENDTRY + + return ret; } ret = MSI_ViewClose( query ); @@ -494,7 +523,15 @@ UINT WINAPI MsiViewExecute(MSIHANDLE hView, MSIHANDLE hRec) if (!(remote = msi_get_remote(hView))) return ERROR_INVALID_HANDLE; - ret = remote_ViewExecute(remote, rec ? (struct wire_record *)&rec->count : NULL); + __TRY + { + ret = remote_ViewExecute(remote, rec ? (struct wire_record *)&rec->count : NULL); + } + __EXCEPT(rpc_filter) + { + ret = GetExceptionCode(); + } + __ENDTRY if (rec) msiobj_release(&rec->hdr); @@ -611,7 +648,16 @@ UINT WINAPI MsiViewGetColumnInfo(MSIHANDLE hView, MSICOLINFO info, MSIHANDLE *hR if (!(remote = msi_get_remote(hView))) return ERROR_INVALID_HANDLE; - r = remote_ViewGetColumnInfo(remote, info, &wire_rec); + __TRY + { + r = remote_ViewGetColumnInfo(remote, info, &wire_rec); + } + __EXCEPT(rpc_filter) + { + r = GetExceptionCode(); + } + __ENDTRY + if (!r) { r = unmarshal_record(wire_rec, hRec); @@ -680,8 +726,17 @@ UINT WINAPI MsiViewModify( MSIHANDLE hView, MSIMODIFY eModifyMode, if (!(remote = msi_get_remote(hView))) return ERROR_INVALID_HANDLE; - r = remote_ViewModify(remote, eModifyMode, - (struct wire_record *)&rec->count, &wire_refreshed); + __TRY + { + r = remote_ViewModify(remote, eModifyMode, + (struct wire_record *)&rec->count, &wire_refreshed); + } + __EXCEPT(rpc_filter) + { + r = GetExceptionCode(); + } + __ENDTRY + if (!r && (eModifyMode == MSIMODIFY_REFRESH || eModifyMode == MSIMODIFY_SEEK)) { r = copy_remote_record(wire_refreshed, hRecord); @@ -1004,7 +1059,16 @@ UINT WINAPI MsiDatabaseGetPrimaryKeysW( MSIHANDLE hdb, if (!(remote = msi_get_remote(hdb))) return ERROR_INVALID_HANDLE; - r = remote_DatabaseGetPrimaryKeys(remote, table, &wire_rec); + __TRY + { + r = remote_DatabaseGetPrimaryKeys(remote, table, &wire_rec); + } + __EXCEPT(rpc_filter) + { + r = GetExceptionCode(); + } + __ENDTRY + if (!r) { r = unmarshal_record(wire_rec, phRec); @@ -1083,7 +1147,17 @@ MSICONDITION WINAPI MsiDatabaseIsTablePersistentW( if (!(remote = msi_get_remote(hDatabase))) return MSICONDITION_ERROR; - return remote_DatabaseIsTablePersistent(remote, szTableName); + __TRY + { + r = remote_DatabaseIsTablePersistent(remote, szTableName); + } + __EXCEPT(rpc_filter) + { + r = MSICONDITION_ERROR; + } + __ENDTRY + + return r; } r = MSI_DatabaseIsTablePersistent( db, szTableName ); diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 273ca71..3374964 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -44,6 +44,7 @@ #include "wine/heap.h" #include "wine/debug.h" +#include "wine/exception.h" #include "wine/unicode.h" #include "msipriv.h" @@ -1739,8 +1740,16 @@ MSIHANDLE WINAPI MsiGetActiveDatabase(MSIHANDLE hInstall) } else if ((remote = msi_get_remote(hInstall))) { - handle = remote_GetActiveDatabase(remote); - handle = alloc_msi_remote_handle(handle); + __TRY + { + handle = remote_GetActiveDatabase(hInstall); + handle = alloc_msi_remote_handle(handle); + } + __EXCEPT(rpc_filter) + { + handle = 0; + } + __ENDTRY } return handle; @@ -2100,7 +2109,15 @@ INT WINAPI MsiProcessMessage( MSIHANDLE hInstall, INSTALLMESSAGE eMessageType, if (!(remote = msi_get_remote(hInstall))) return ERROR_INVALID_HANDLE; - ret = remote_ProcessMessage(remote, eMessageType, (struct wire_record *)&record->count); + __TRY + { + ret = remote_ProcessMessage(remote, eMessageType, (struct wire_record *)&record->count); + } + __EXCEPT(rpc_filter) + { + ret = GetExceptionCode(); + } + __ENDTRY msiobj_release(&record->hdr); return ret; @@ -2230,7 +2247,17 @@ UINT WINAPI MsiSetPropertyW( MSIHANDLE hInstall, LPCWSTR szName, LPCWSTR szValue if (!(remote = msi_get_remote(hInstall))) return ERROR_INVALID_HANDLE; - return remote_SetProperty(remote, szName, szValue); + __TRY + { + ret = remote_SetProperty(remote, szName, szValue); + } + __EXCEPT(rpc_filter) + { + ret = GetExceptionCode(); + } + __ENDTRY + + return ret; } ret = msi_set_property( package->db, szName, szValue, -1 ); @@ -2407,7 +2434,16 @@ UINT WINAPI MsiGetPropertyA(MSIHANDLE hinst, const char *name, char *buf, DWORD return ERROR_INVALID_HANDLE; } - r = remote_GetProperty(remote, nameW, &value, &len); + __TRY + { + r = remote_GetProperty(remote, nameW, &value, &len); + } + __EXCEPT(rpc_filter) + { + r = GetExceptionCode(); + } + __ENDTRY + heap_free(nameW); if (!r) @@ -2463,7 +2499,16 @@ UINT WINAPI MsiGetPropertyW(MSIHANDLE hinst, const WCHAR *name, WCHAR *buf, DWOR if (!(remote = msi_get_remote(hinst))) return ERROR_INVALID_HANDLE; - r = remote_GetProperty(remote, name, &value, &len); + __TRY + { + r = remote_GetProperty(remote, name, &value, &len); + } + __EXCEPT(rpc_filter) + { + r = GetExceptionCode(); + } + __ENDTRY + if (!r) { /* String might contain embedded nulls. diff --git a/dlls/msi/suminfo.c b/dlls/msi/suminfo.c index 288ba40..e796a69 100644 --- a/dlls/msi/suminfo.c +++ b/dlls/msi/suminfo.c @@ -29,6 +29,7 @@ #include "winnls.h" #include "shlwapi.h" #include "wine/debug.h" +#include "wine/exception.h" #include "wine/unicode.h" #include "msi.h" #include "msiquery.h" @@ -528,7 +529,16 @@ UINT WINAPI MsiGetSummaryInformationW( MSIHANDLE hDatabase, if (!(remote = msi_get_remote(hDatabase))) return ERROR_INVALID_HANDLE; - ret = remote_DatabaseGetSummaryInformation(remote, uiUpdateCount, &remote_suminfo); + __TRY + { + ret = remote_DatabaseGetSummaryInformation(remote, uiUpdateCount, &remote_suminfo); + } + __EXCEPT(rpc_filter) + { + ret = GetExceptionCode(); + } + __ENDTRY + if (!ret) *pHandle = alloc_msi_remote_handle(remote_suminfo); -- 2.7.4

2 1

[PATCH v4 01/11] shell32/autocomplete: Revamp pwzsRegKeyPath handling so it can deal with arbitrary sizes and make it more robust
by Gabriel Ivăncescu 10 Sep '18

10 Sep '18

Handle heap_alloc failure, reg strings without a \ character at all, try harder to find the reg path (if only value fails the lookup), and read the registry value with any size. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- This patch series supersedes the series starting with 150630 (second half will come after these are committed) v2: Retrieve the registry value without failing in rare race conditions. v3: Don't open the HKEY_LOCAL_MACHINE twice under some circumstances. v4: Adjusted with a loop as suggested by Huw Davies. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/shell32/autocomplete.c | 81 +++++++++++++++++++++++++++------------------ 1 file changed, 49 insertions(+), 32 deletions(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index cf8da50..b2c388e 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -486,40 +486,57 @@ static HRESULT WINAPI IAutoComplete2_fnInit( if (This->options & ACO_AUTOSUGGEST) create_listbox(This); - if (pwzsRegKeyPath) { - WCHAR *key; - WCHAR result[MAX_PATH]; - WCHAR *value; - HKEY hKey = 0; - LONG res; - LONG len; - - /* pwszRegKeyPath contains the key as well as the value, so we split */ - key = heap_alloc((lstrlenW(pwzsRegKeyPath)+1)*sizeof(WCHAR)); - strcpyW(key, pwzsRegKeyPath); - value = strrchrW(key, '\\'); - *value = 0; - value++; - /* Now value contains the value and buffer the key */ - res = RegOpenKeyExW(HKEY_CURRENT_USER, key, 0, KEY_READ, &hKey); - if (res != ERROR_SUCCESS) { - /* if the key is not found, MSDN states we must seek in HKEY_LOCAL_MACHINE */ - res = RegOpenKeyExW(HKEY_LOCAL_MACHINE, key, 0, KEY_READ, &hKey); - } - if (res == ERROR_SUCCESS) { - res = RegQueryValueW(hKey, value, result, &len); - if (res == ERROR_SUCCESS) { - This->quickComplete = heap_alloc(len*sizeof(WCHAR)); - strcpyW(This->quickComplete, result); - } - RegCloseKey(hKey); - } - heap_free(key); + if (pwzsRegKeyPath) + { + static const HKEY roots[] = { HKEY_CURRENT_USER, HKEY_LOCAL_MACHINE }; + WCHAR *key, *value; + DWORD type, sz; + BYTE *qc; + HKEY hKey; + LSTATUS res; + size_t len; + UINT i; + + /* pwszRegKeyPath contains the key as well as the value, so split it */ + value = strrchrW(pwzsRegKeyPath, '\\'); + len = value - pwzsRegKeyPath; + + if (value && (key = heap_alloc((len+1) * sizeof(*key))) != NULL) + { + memcpy(key, pwzsRegKeyPath, len * sizeof(*key)); + key[len] = '\0'; + value++; + + for (i = 0; i < ARRAY_SIZE(roots); i++) + { + if (RegOpenKeyExW(roots[i], key, 0, KEY_READ, &hKey) != ERROR_SUCCESS) + continue; + sz = MAX_PATH * sizeof(WCHAR); + + while ((qc = heap_alloc(sz)) != NULL) + { + res = RegQueryValueExW(hKey, value, NULL, &type, qc, &sz); + if (res == ERROR_SUCCESS && type == REG_SZ) + { + This->quickComplete = heap_realloc(qc, sz); + i = ARRAY_SIZE(roots); + break; + } + heap_free(qc); + if (res != ERROR_MORE_DATA || type != REG_SZ) + break; + } + RegCloseKey(hKey); + } + heap_free(key); + } } - if ((pwszQuickComplete) && (!This->quickComplete)) { - This->quickComplete = heap_alloc((lstrlenW(pwszQuickComplete)+1)*sizeof(WCHAR)); - lstrcpyW(This->quickComplete, pwszQuickComplete); + if (!This->quickComplete && pwszQuickComplete) + { + size_t len = strlenW(pwszQuickComplete)+1; + if ((This->quickComplete = heap_alloc(len * sizeof(WCHAR))) != NULL) + memcpy(This->quickComplete, pwszQuickComplete, len * sizeof(WCHAR)); } return S_OK; -- 1.9.1

2 19

[PATCH] winspool.drv: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 10 Sep '18

10 Sep '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winspool.drv/info.c | 50 +++++++++++++++++++++++------------------------- 1 file changed, 24 insertions(+), 26 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index f63f3f687b..7c4ee9a26f 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -332,7 +332,7 @@ static const printenv_t * validate_envW(LPCWSTR env) TRACE("testing %s\n", debugstr_w(env)); if (env && env[0]) { - for (i = 0; i < sizeof(all_printenv)/sizeof(all_printenv[0]); i++) + for (i = 0; i < ARRAY_SIZE(all_printenv); i++) { if (lstrcmpiW(env, all_printenv[i]->envname) == 0) { @@ -594,7 +594,7 @@ static BOOL add_printer_driver(const WCHAR *name, WCHAR *ppd) di3.pConfigFile = driver_nt; di3.pDefaultDataType = rawW; - for (i = 0; i < sizeof(all_printenv)/sizeof(all_printenv[0]); i++) + for (i = 0; i < ARRAY_SIZE(all_printenv); i++) { di3.pEnvironment = (WCHAR *) all_printenv[i]->envname; if (all_printenv[i]->envname == envname_win40W) @@ -752,7 +752,7 @@ static WCHAR *get_ppd_dir( void ) WCHAR *dir, tmp_path[MAX_PATH]; BOOL res; - len = GetTempPathW( sizeof(tmp_path) / sizeof(tmp_path[0]), tmp_path ); + len = GetTempPathW( ARRAY_SIZE( tmp_path ), tmp_path ); if (!len) return NULL; dir = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) + sizeof(wine_ppds) ) ; if (!dir) return NULL; @@ -927,7 +927,7 @@ static BOOL CUPS_LoadPrinters(void) nrofdests = pcupsGetDests(&dests); TRACE("Found %d CUPS %s:\n", nrofdests, (nrofdests == 1) ? "printer" : "printers"); for (i=0;i<nrofdests;i++) { - MultiByteToWideChar(CP_UNIXCP, 0, dests[i].name, -1, nameW, sizeof(nameW) / sizeof(WCHAR)); + MultiByteToWideChar(CP_UNIXCP, 0, dests[i].name, -1, nameW, ARRAY_SIZE(nameW)); printer_type = get_cups_printer_type( dests + i ); TRACE( "Printer %d: %s. printer_type %x\n", i, debugstr_w(nameW), printer_type ); @@ -1010,7 +1010,7 @@ static BOOL CUPS_LoadPrinters(void) } if (hadprinter && !haddefault) { - MultiByteToWideChar(CP_UNIXCP, 0, dests[0].name, -1, nameW, sizeof(nameW) / sizeof(WCHAR)); + MultiByteToWideChar(CP_UNIXCP, 0, dests[0].name, -1, nameW, ARRAY_SIZE(nameW)); SetDefaultPrinterW(nameW); } pcupsFreeDests(nrofdests, dests); @@ -1037,13 +1037,13 @@ static char *get_queue_name( HANDLE printer, BOOL *cups ) if (!port) goto end; RegQueryValueExW( key, PortW, 0, &type, (BYTE*)port, &needed ); - if (!strncmpW( port, CUPS_Port, sizeof(CUPS_Port) / sizeof(WCHAR) -1 )) + if (!strncmpW( port, CUPS_Port, ARRAY_SIZE( CUPS_Port ) -1 )) { - name = port + sizeof(CUPS_Port) / sizeof(WCHAR) - 1; + name = port + ARRAY_SIZE( CUPS_Port ) - 1; *cups = TRUE; } - else if (!strncmpW( port, LPR_Port, sizeof(LPR_Port) / sizeof(WCHAR) -1 )) - name = port + sizeof(LPR_Port) / sizeof(WCHAR) - 1; + else if (!strncmpW( port, LPR_Port, ARRAY_SIZE( LPR_Port ) -1 )) + name = port + ARRAY_SIZE( LPR_Port ) - 1; if (name) { needed = WideCharToMultiByte( CP_UNIXCP, 0, name, -1, NULL, 0, NULL, NULL ); @@ -1222,7 +1222,7 @@ static BOOL PRINTCAP_ParseEntry( const char *pent, BOOL isfirst ) goto end; } - MultiByteToWideChar(CP_ACP, 0, devname, -1, devnameW, sizeof(devnameW) / sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, devname, -1, devnameW, ARRAY_SIZE(devnameW)); if(RegOpenKeyA(hkeyPrinters, devname, &hkeyPrinter) == ERROR_SUCCESS) { DWORD status = get_dword_from_reg( hkeyPrinter, StatusW ); @@ -1391,7 +1391,7 @@ static LPWSTR get_servername_from_name(LPCWSTR name) TRACE("found %s\n", debugstr_w(server)); - len = sizeof(buffer)/sizeof(buffer[0]); + len = ARRAY_SIZE(buffer); if (GetComputerNameW(buffer, &len)) { if (lstrcmpW(buffer, server) == 0) { /* The requested Servername is our computername */ @@ -1641,7 +1641,7 @@ void WINSPOOL_LoadSystemPrinters(void) if(RegQueryInfoKeyW(hkeyPrinters, NULL, NULL, NULL, &num, NULL, NULL, NULL, NULL, NULL, NULL, NULL) == ERROR_SUCCESS) { for(i = 0; i < num; i++) { - if(RegEnumKeyW(hkeyPrinters, i, PrinterName, sizeof(PrinterName)/sizeof(PrinterName[0])) == ERROR_SUCCESS) { + if(RegEnumKeyW(hkeyPrinters, i, PrinterName, ARRAY_SIZE(PrinterName)) == ERROR_SUCCESS) { if(RegOpenKeyW(hkeyPrinters, PrinterName, &hkey) == ERROR_SUCCESS) { if(RegQueryValueExW(hkey, NameW, 0, 0, 0, &needed) == ERROR_FILE_NOT_FOUND) { set_reg_szW(hkey, NameW, PrinterName); @@ -2941,7 +2941,7 @@ BOOL WINAPI AddJobW(HANDLE hPrinter, DWORD Level, LPBYTE pData, DWORD cbBuf, LPD job->job_id = InterlockedIncrement(&next_job_id); - len = GetSystemDirectoryW(path, sizeof(path) / sizeof(WCHAR)); + len = GetSystemDirectoryW(path, ARRAY_SIZE(path)); if(path[len - 1] != '\\') path[len++] = '\\'; memcpy(path + len, spool_path, sizeof(spool_path)); @@ -3384,7 +3384,7 @@ BOOL WINAPI DeletePrinter(HANDLE hPrinter) LPCWSTR lpNameW = get_opened_printer_name(hPrinter); HKEY hkeyPrinters, hkey; WCHAR def[MAX_PATH]; - DWORD size = sizeof( def ) / sizeof( def[0] ); + DWORD size = ARRAY_SIZE(def); if(!lpNameW) { SetLastError(ERROR_INVALID_HANDLE); @@ -4667,8 +4667,7 @@ static BOOL WINSPOOL_EnumPrintersW(DWORD dwType, LPWSTR lpszName, pi = (used <= cbBuf) ? lpbPrinters : NULL; for(i = 0; i < number; i++) { - if(RegEnumKeyW(hkeyPrinters, i, PrinterName, sizeof(PrinterName)/sizeof(PrinterName[0])) != - ERROR_SUCCESS) { + if(RegEnumKeyW(hkeyPrinters, i, PrinterName, ARRAY_SIZE(PrinterName)) != ERROR_SUCCESS) { ERR("Can't enum key number %d\n", i); RegCloseKey(hkeyPrinters); return FALSE; @@ -5508,8 +5507,7 @@ static BOOL WINSPOOL_EnumPrinterDrivers(LPWSTR pName, LPCWSTR pEnvironment, PBYTE data_ptr = NULL; DWORD needed = 0; - if(RegEnumKeyW(hkeyDrivers, i, DriverNameW, sizeof(DriverNameW)/sizeof(DriverNameW[0])) - != ERROR_SUCCESS) { + if(RegEnumKeyW(hkeyDrivers, i, DriverNameW, ARRAY_SIZE(DriverNameW)) != ERROR_SUCCESS) { ERR("Can't enum key number %d\n", i); RegCloseKey(hkeyDrivers); return FALSE; @@ -5585,7 +5583,7 @@ BOOL WINAPI EnumPrinterDriversW(LPWSTR pName, LPWSTR pEnvironment, DWORD Level, /* Precompute the overall total; we need this to know where pointers end and data begins (i.e. data_offset) */ - for (i = 0; i < sizeof(all_printenv)/sizeof(all_printenv[0]); i++) + for (i = 0; i < ARRAY_SIZE(all_printenv); i++) { needed = found = 0; ret = WINSPOOL_EnumPrinterDrivers(pName, all_printenv[i]->envname, Level, @@ -5599,7 +5597,7 @@ BOOL WINAPI EnumPrinterDriversW(LPWSTR pName, LPWSTR pEnvironment, DWORD Level, *pcReturned = 0; *pcbNeeded = 0; total_found = 0; - for (i = 0; i < sizeof(all_printenv)/sizeof(all_printenv[0]); i++) + for (i = 0; i < ARRAY_SIZE(all_printenv); i++) { needed = found = 0; ret = WINSPOOL_EnumPrinterDrivers(pName, all_printenv[i]->envname, Level, @@ -5963,7 +5961,7 @@ BOOL WINAPI SetDefaultPrinterW(LPCWSTR pszPrinter) if ((pszPrinter == NULL) || (pszPrinter[0] == '\0')) { default_printer[0] = '\0'; - size = sizeof(default_printer)/sizeof(WCHAR); + size = ARRAY_SIZE(default_printer); /* if we have a default Printer, do nothing. */ if (GetDefaultPrinterW(default_printer, &size)) @@ -5974,7 +5972,7 @@ BOOL WINAPI SetDefaultPrinterW(LPCWSTR pszPrinter) if (!RegOpenKeyExW(HKEY_LOCAL_MACHINE, PrintersW, 0, KEY_READ, &hreg)) { default_printer[0] = '\0'; - size = sizeof(default_printer)/sizeof(WCHAR); + size = ARRAY_SIZE(default_printer); if (!RegEnumKeyExW(hreg, 0, default_printer, &size, NULL, NULL, NULL, NULL)) { pszPrinter = default_printer; @@ -8350,8 +8348,8 @@ static INT_PTR CALLBACK file_dlg_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM WCHAR caption[200], message[200]; int mb_ret; - LoadStringW(WINSPOOL_hInstance, IDS_CAPTION, caption, sizeof(caption) / sizeof(WCHAR)); - LoadStringW(WINSPOOL_hInstance, IDS_FILE_EXISTS, message, sizeof(message) / sizeof(WCHAR)); + LoadStringW(WINSPOOL_hInstance, IDS_CAPTION, caption, ARRAY_SIZE(caption)); + LoadStringW(WINSPOOL_hInstance, IDS_FILE_EXISTS, message, ARRAY_SIZE(message)); mb_ret = MessageBoxW(hwnd, message, caption, MB_OKCANCEL | MB_ICONEXCLAMATION); if(mb_ret == IDCANCEL) { @@ -8364,8 +8362,8 @@ static INT_PTR CALLBACK file_dlg_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM { WCHAR caption[200], message[200]; - LoadStringW(WINSPOOL_hInstance, IDS_CAPTION, caption, sizeof(caption) / sizeof(WCHAR)); - LoadStringW(WINSPOOL_hInstance, IDS_CANNOT_OPEN, message, sizeof(message) / sizeof(WCHAR)); + LoadStringW(WINSPOOL_hInstance, IDS_CAPTION, caption, ARRAY_SIZE(caption)); + LoadStringW(WINSPOOL_hInstance, IDS_CANNOT_OPEN, message, ARRAY_SIZE(message)); MessageBoxW(hwnd, message, caption, MB_OK | MB_ICONEXCLAMATION); HeapFree(GetProcessHeap(), 0, filename); return TRUE; -- 2.14.4

2 1

[PATCH 1/2] comctl32/tests: Add test for disabled toolbar button.
by Ziqing Hui 10 Sep '18

10 Sep '18

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

1 0

[PATCH] ntdll: Workaround for requesting thread affinity mask that isn't a subset of the system's mask
by Roger Zoellner 09 Sep '18

09 Sep '18

This patch is related to the game 'Divinity Original Sin 2' which crashes on startup, if the system only has 4 or less logical cpus. By Microsoft specification, requesting a thread affinity mask requires it be be a subset of the process affiniy mask. However the game requests a mask F...FE (-2) which makes wine to return STATUS_INVALID_PARAMETER, which in turn makes the game hang. This patch will make wine to adjust the mask in this case, which makes the game start correctly. Signed-off-by: Roger Zoellner <zoellner.roger(a)gmail.com> --- dlls/ntdll/thread.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 59d64e174d..6beb8c1a3d 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -1290,6 +1290,7 @@ NTSTATUS WINAPI NtSetInformationThread( HANDLE handle, THREADINFOCLASS class, if (length != sizeof(ULONG_PTR)) return STATUS_INVALID_PARAMETER; req_aff = *(const ULONG_PTR *)data; if ((ULONG)req_aff == ~0u) req_aff = affinity_mask; + else if ((LONG) req_aff < 0) req_aff = affinity_mask & req_aff; else if (req_aff & ~affinity_mask) return STATUS_INVALID_PARAMETER; else if (!req_aff) return STATUS_INVALID_PARAMETER; SERVER_START_REQ( set_thread_info ) -- 2.18.0

1 1

[PATCH 4/4] wined3d: Derive format component counts from the component info.
by Henri Verbeet 09 Sep '18

09 Sep '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/utils.c | 76 ++++++++++++++++++++++-------------------- dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 40 insertions(+), 38 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 1b13c99265c..54b7bceebb9 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -600,48 +600,47 @@ struct wined3d_format_vertex_info { enum wined3d_format_id id; enum wined3d_ffp_emit_idx emit_idx; - unsigned int component_count; GLenum gl_vtx_type; enum wined3d_gl_extension extension; }; static const struct wined3d_format_vertex_info format_vertex_info[] = { - {WINED3DFMT_R32_FLOAT, WINED3D_FFP_EMIT_FLOAT1, 1, GL_FLOAT}, - {WINED3DFMT_R32G32_FLOAT, WINED3D_FFP_EMIT_FLOAT2, 2, GL_FLOAT}, - {WINED3DFMT_R32G32B32_FLOAT, WINED3D_FFP_EMIT_FLOAT3, 3, GL_FLOAT}, - {WINED3DFMT_R32G32B32A32_FLOAT, WINED3D_FFP_EMIT_FLOAT4, 4, GL_FLOAT}, - {WINED3DFMT_B8G8R8A8_UNORM, WINED3D_FFP_EMIT_D3DCOLOR, 4, GL_UNSIGNED_BYTE}, - {WINED3DFMT_R8G8B8A8_UINT, WINED3D_FFP_EMIT_UBYTE4, 4, GL_UNSIGNED_BYTE}, - {WINED3DFMT_R16G16_UINT, WINED3D_FFP_EMIT_INVALID, 2, GL_UNSIGNED_SHORT}, - {WINED3DFMT_R16G16_SINT, WINED3D_FFP_EMIT_SHORT2, 2, GL_SHORT}, - {WINED3DFMT_R16G16B16A16_SINT, WINED3D_FFP_EMIT_SHORT4, 4, GL_SHORT}, - {WINED3DFMT_R8G8B8A8_UNORM, WINED3D_FFP_EMIT_UBYTE4N, 4, GL_UNSIGNED_BYTE}, - {WINED3DFMT_R16G16_SNORM, WINED3D_FFP_EMIT_SHORT2N, 2, GL_SHORT}, - {WINED3DFMT_R16G16B16A16_SNORM, WINED3D_FFP_EMIT_SHORT4N, 4, GL_SHORT}, - {WINED3DFMT_R16G16_UNORM, WINED3D_FFP_EMIT_USHORT2N, 2, GL_UNSIGNED_SHORT}, - {WINED3DFMT_R16G16B16A16_UNORM, WINED3D_FFP_EMIT_USHORT4N, 4, GL_UNSIGNED_SHORT}, - {WINED3DFMT_R10G10B10X2_UINT, WINED3D_FFP_EMIT_UDEC3, 3, GL_UNSIGNED_SHORT}, - {WINED3DFMT_R10G10B10X2_SNORM, WINED3D_FFP_EMIT_DEC3N, 3, GL_SHORT}, - {WINED3DFMT_R10G10B10A2_UNORM, WINED3D_FFP_EMIT_INVALID, 4, GL_UNSIGNED_INT_2_10_10_10_REV, + {WINED3DFMT_R32_FLOAT, WINED3D_FFP_EMIT_FLOAT1, GL_FLOAT}, + {WINED3DFMT_R32G32_FLOAT, WINED3D_FFP_EMIT_FLOAT2, GL_FLOAT}, + {WINED3DFMT_R32G32B32_FLOAT, WINED3D_FFP_EMIT_FLOAT3, GL_FLOAT}, + {WINED3DFMT_R32G32B32A32_FLOAT, WINED3D_FFP_EMIT_FLOAT4, GL_FLOAT}, + {WINED3DFMT_B8G8R8A8_UNORM, WINED3D_FFP_EMIT_D3DCOLOR, GL_UNSIGNED_BYTE}, + {WINED3DFMT_R8G8B8A8_UINT, WINED3D_FFP_EMIT_UBYTE4, GL_UNSIGNED_BYTE}, + {WINED3DFMT_R16G16_UINT, WINED3D_FFP_EMIT_INVALID, GL_UNSIGNED_SHORT}, + {WINED3DFMT_R16G16_SINT, WINED3D_FFP_EMIT_SHORT2, GL_SHORT}, + {WINED3DFMT_R16G16B16A16_SINT, WINED3D_FFP_EMIT_SHORT4, GL_SHORT}, + {WINED3DFMT_R8G8B8A8_UNORM, WINED3D_FFP_EMIT_UBYTE4N, GL_UNSIGNED_BYTE}, + {WINED3DFMT_R16G16_SNORM, WINED3D_FFP_EMIT_SHORT2N, GL_SHORT}, + {WINED3DFMT_R16G16B16A16_SNORM, WINED3D_FFP_EMIT_SHORT4N, GL_SHORT}, + {WINED3DFMT_R16G16_UNORM, WINED3D_FFP_EMIT_USHORT2N, GL_UNSIGNED_SHORT}, + {WINED3DFMT_R16G16B16A16_UNORM, WINED3D_FFP_EMIT_USHORT4N, GL_UNSIGNED_SHORT}, + {WINED3DFMT_R10G10B10X2_UINT, WINED3D_FFP_EMIT_UDEC3, GL_UNSIGNED_SHORT}, + {WINED3DFMT_R10G10B10X2_SNORM, WINED3D_FFP_EMIT_DEC3N, GL_SHORT}, + {WINED3DFMT_R10G10B10A2_UNORM, WINED3D_FFP_EMIT_INVALID, GL_UNSIGNED_INT_2_10_10_10_REV, ARB_VERTEX_TYPE_2_10_10_10_REV}, - {WINED3DFMT_R16G16_FLOAT, WINED3D_FFP_EMIT_FLOAT16_2, 2, GL_HALF_FLOAT}, - {WINED3DFMT_R16G16B16A16_FLOAT, WINED3D_FFP_EMIT_FLOAT16_4, 4, GL_HALF_FLOAT}, - {WINED3DFMT_R8G8B8A8_SNORM, WINED3D_FFP_EMIT_INVALID, 4, GL_BYTE}, - {WINED3DFMT_R8G8B8A8_SINT, WINED3D_FFP_EMIT_INVALID, 4, GL_BYTE}, - {WINED3DFMT_R16G16B16A16_UINT, WINED3D_FFP_EMIT_INVALID, 4, GL_UNSIGNED_SHORT}, - {WINED3DFMT_R8_UNORM, WINED3D_FFP_EMIT_INVALID, 1, GL_UNSIGNED_BYTE}, - {WINED3DFMT_R8_UINT, WINED3D_FFP_EMIT_INVALID, 1, GL_UNSIGNED_BYTE}, - {WINED3DFMT_R8_SINT, WINED3D_FFP_EMIT_INVALID, 1, GL_BYTE}, - {WINED3DFMT_R16_UINT, WINED3D_FFP_EMIT_INVALID, 1, GL_UNSIGNED_SHORT}, - {WINED3DFMT_R16_SINT, WINED3D_FFP_EMIT_INVALID, 1, GL_SHORT}, - {WINED3DFMT_R32_UINT, WINED3D_FFP_EMIT_INVALID, 1, GL_UNSIGNED_INT}, - {WINED3DFMT_R32_SINT, WINED3D_FFP_EMIT_INVALID, 1, GL_INT}, - {WINED3DFMT_R32G32_UINT, WINED3D_FFP_EMIT_INVALID, 2, GL_UNSIGNED_INT}, - {WINED3DFMT_R32G32_SINT, WINED3D_FFP_EMIT_INVALID, 2, GL_INT}, - {WINED3DFMT_R32G32B32_UINT, WINED3D_FFP_EMIT_INVALID, 3, GL_UNSIGNED_INT}, - {WINED3DFMT_R32G32B32A32_UINT, WINED3D_FFP_EMIT_INVALID, 4, GL_UNSIGNED_INT}, - {WINED3DFMT_R32G32B32A32_SINT, WINED3D_FFP_EMIT_INVALID, 4, GL_INT}, + {WINED3DFMT_R16G16_FLOAT, WINED3D_FFP_EMIT_FLOAT16_2, GL_HALF_FLOAT}, + {WINED3DFMT_R16G16B16A16_FLOAT, WINED3D_FFP_EMIT_FLOAT16_4, GL_HALF_FLOAT}, + {WINED3DFMT_R8G8B8A8_SNORM, WINED3D_FFP_EMIT_INVALID, GL_BYTE}, + {WINED3DFMT_R8G8B8A8_SINT, WINED3D_FFP_EMIT_INVALID, GL_BYTE}, + {WINED3DFMT_R16G16B16A16_UINT, WINED3D_FFP_EMIT_INVALID, GL_UNSIGNED_SHORT}, + {WINED3DFMT_R8_UNORM, WINED3D_FFP_EMIT_INVALID, GL_UNSIGNED_BYTE}, + {WINED3DFMT_R8_UINT, WINED3D_FFP_EMIT_INVALID, GL_UNSIGNED_BYTE}, + {WINED3DFMT_R8_SINT, WINED3D_FFP_EMIT_INVALID, GL_BYTE}, + {WINED3DFMT_R16_UINT, WINED3D_FFP_EMIT_INVALID, GL_UNSIGNED_SHORT}, + {WINED3DFMT_R16_SINT, WINED3D_FFP_EMIT_INVALID, GL_SHORT}, + {WINED3DFMT_R32_UINT, WINED3D_FFP_EMIT_INVALID, GL_UNSIGNED_INT}, + {WINED3DFMT_R32_SINT, WINED3D_FFP_EMIT_INVALID, GL_INT}, + {WINED3DFMT_R32G32_UINT, WINED3D_FFP_EMIT_INVALID, GL_UNSIGNED_INT}, + {WINED3DFMT_R32G32_SINT, WINED3D_FFP_EMIT_INVALID, GL_INT}, + {WINED3DFMT_R32G32B32_UINT, WINED3D_FFP_EMIT_INVALID, GL_UNSIGNED_INT}, + {WINED3DFMT_R32G32B32A32_UINT, WINED3D_FFP_EMIT_INVALID, GL_UNSIGNED_INT}, + {WINED3DFMT_R32G32B32A32_SINT, WINED3D_FFP_EMIT_INVALID, GL_INT}, }; struct wined3d_format_texture_info @@ -2038,6 +2037,7 @@ static BOOL init_format_base_info(struct wined3d_adapter *adapter) for (i = 0; i < ARRAY_SIZE(typed_formats); ++i) { const struct wined3d_format *typeless_format; + unsigned int component_count = 0; DWORD flags = 0; if (!(format = get_format_internal(adapter, typed_formats[i].id))) @@ -2073,6 +2073,8 @@ static BOOL init_format_base_info(struct wined3d_adapter *adapter) flags |= WINED3DFMT_FLAG_INTEGER; if (channel_type == WINED3D_CHANNEL_TYPE_FLOAT) flags |= WINED3DFMT_FLAG_FLOAT; + if (channel_type != WINED3D_CHANNEL_TYPE_UNUSED) + ++component_count; if (channel_type == WINED3D_CHANNEL_TYPE_DEPTH && !format->depth_size) { @@ -2081,6 +2083,7 @@ static BOOL init_format_base_info(struct wined3d_adapter *adapter) } } + format->component_count = component_count; format_set_flag(format, flags); } @@ -3683,9 +3686,8 @@ static BOOL init_format_vertex_info(const struct wined3d_adapter *adapter, continue; format->emit_idx = format_vertex_info[i].emit_idx; - format->component_count = format_vertex_info[i].component_count; format->gl_vtx_type = format_vertex_info[i].gl_vtx_type; - format->gl_vtx_format = format_vertex_info[i].component_count; + format->gl_vtx_format = format->component_count; } return TRUE; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 535023fc9f8..7c8beb87535 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4326,6 +4326,7 @@ struct wined3d_format enum wined3d_format_id id; D3DDDIFORMAT ddi_format; + unsigned int component_count; DWORD red_size; DWORD green_size; DWORD blue_size; @@ -4343,7 +4344,6 @@ struct wined3d_format UINT block_byte_count; enum wined3d_ffp_emit_idx emit_idx; - GLint component_count; GLenum gl_vtx_type; GLint gl_vtx_format; -- 2.11.0

1 0

[PATCH 3/4] wined3d: Introduce WINED3DFMT_FLAG_NORMALISED.
by Henri Verbeet 09 Sep '18

09 Sep '18

Derived from the component info. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 7 ++-- dlls/wined3d/utils.c | 73 +++++++++++++++++++++--------------------- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 42 insertions(+), 40 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 83e35638bc6..34376efe3c7 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -5376,6 +5376,8 @@ static void context_load_numbered_arrays(struct wined3d_context *context, if (element->stride) { + DWORD format_flags = element->format->flags[WINED3D_GL_RES_TYPE_BUFFER]; + if (current_bo != element->data.buffer_object) { GL_EXTCALL(glBindBuffer(GL_ARRAY_BUFFER, element->data.buffer_object)); @@ -5386,8 +5388,7 @@ static void context_load_numbered_arrays(struct wined3d_context *context, * pointer. vb can point to a user pointer data blob. In that case * current_bo will be 0. If there is a vertex buffer but no vbo we * won't be load converted attributes anyway. */ - if (vs && vs->reg_maps.shader_version.major >= 4 - && (element->format->flags[WINED3D_GL_RES_TYPE_BUFFER] & WINED3DFMT_FLAG_INTEGER)) + if (vs && vs->reg_maps.shader_version.major >= 4 && (format_flags & WINED3DFMT_FLAG_INTEGER)) { GL_EXTCALL(glVertexAttribIPointer(i, element->format->gl_vtx_format, element->format->gl_vtx_type, element->stride, element->data.addr + state->load_base_vertex_index * element->stride)); @@ -5395,7 +5396,7 @@ static void context_load_numbered_arrays(struct wined3d_context *context, else { GL_EXTCALL(glVertexAttribPointer(i, element->format->gl_vtx_format, element->format->gl_vtx_type, - element->format->gl_normalized, element->stride, + !!(format_flags & WINED3DFMT_FLAG_NORMALISED), element->stride, element->data.addr + state->load_base_vertex_index * element->stride)); } diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 84410af5dcc..1b13c99265c 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -602,47 +602,46 @@ struct wined3d_format_vertex_info enum wined3d_ffp_emit_idx emit_idx; unsigned int component_count; GLenum gl_vtx_type; - GLboolean gl_normalized; enum wined3d_gl_extension extension; }; static const struct wined3d_format_vertex_info format_vertex_info[] = { - {WINED3DFMT_R32_FLOAT, WINED3D_FFP_EMIT_FLOAT1, 1, GL_FLOAT, GL_FALSE}, - {WINED3DFMT_R32G32_FLOAT, WINED3D_FFP_EMIT_FLOAT2, 2, GL_FLOAT, GL_FALSE}, - {WINED3DFMT_R32G32B32_FLOAT, WINED3D_FFP_EMIT_FLOAT3, 3, GL_FLOAT, GL_FALSE}, - {WINED3DFMT_R32G32B32A32_FLOAT, WINED3D_FFP_EMIT_FLOAT4, 4, GL_FLOAT, GL_FALSE}, - {WINED3DFMT_B8G8R8A8_UNORM, WINED3D_FFP_EMIT_D3DCOLOR, 4, GL_UNSIGNED_BYTE, GL_TRUE }, - {WINED3DFMT_R8G8B8A8_UINT, WINED3D_FFP_EMIT_UBYTE4, 4, GL_UNSIGNED_BYTE, GL_FALSE}, - {WINED3DFMT_R16G16_UINT, WINED3D_FFP_EMIT_INVALID, 2, GL_UNSIGNED_SHORT, GL_FALSE}, - {WINED3DFMT_R16G16_SINT, WINED3D_FFP_EMIT_SHORT2, 2, GL_SHORT, GL_FALSE}, - {WINED3DFMT_R16G16B16A16_SINT, WINED3D_FFP_EMIT_SHORT4, 4, GL_SHORT, GL_FALSE}, - {WINED3DFMT_R8G8B8A8_UNORM, WINED3D_FFP_EMIT_UBYTE4N, 4, GL_UNSIGNED_BYTE, GL_TRUE }, - {WINED3DFMT_R16G16_SNORM, WINED3D_FFP_EMIT_SHORT2N, 2, GL_SHORT, GL_TRUE }, - {WINED3DFMT_R16G16B16A16_SNORM, WINED3D_FFP_EMIT_SHORT4N, 4, GL_SHORT, GL_TRUE }, - {WINED3DFMT_R16G16_UNORM, WINED3D_FFP_EMIT_USHORT2N, 2, GL_UNSIGNED_SHORT, GL_TRUE }, - {WINED3DFMT_R16G16B16A16_UNORM, WINED3D_FFP_EMIT_USHORT4N, 4, GL_UNSIGNED_SHORT, GL_TRUE }, - {WINED3DFMT_R10G10B10X2_UINT, WINED3D_FFP_EMIT_UDEC3, 3, GL_UNSIGNED_SHORT, GL_FALSE}, - {WINED3DFMT_R10G10B10X2_SNORM, WINED3D_FFP_EMIT_DEC3N, 3, GL_SHORT, GL_TRUE }, - {WINED3DFMT_R10G10B10A2_UNORM, WINED3D_FFP_EMIT_INVALID, 4, GL_UNSIGNED_INT_2_10_10_10_REV, GL_TRUE, + {WINED3DFMT_R32_FLOAT, WINED3D_FFP_EMIT_FLOAT1, 1, GL_FLOAT}, + {WINED3DFMT_R32G32_FLOAT, WINED3D_FFP_EMIT_FLOAT2, 2, GL_FLOAT}, + {WINED3DFMT_R32G32B32_FLOAT, WINED3D_FFP_EMIT_FLOAT3, 3, GL_FLOAT}, + {WINED3DFMT_R32G32B32A32_FLOAT, WINED3D_FFP_EMIT_FLOAT4, 4, GL_FLOAT}, + {WINED3DFMT_B8G8R8A8_UNORM, WINED3D_FFP_EMIT_D3DCOLOR, 4, GL_UNSIGNED_BYTE}, + {WINED3DFMT_R8G8B8A8_UINT, WINED3D_FFP_EMIT_UBYTE4, 4, GL_UNSIGNED_BYTE}, + {WINED3DFMT_R16G16_UINT, WINED3D_FFP_EMIT_INVALID, 2, GL_UNSIGNED_SHORT}, + {WINED3DFMT_R16G16_SINT, WINED3D_FFP_EMIT_SHORT2, 2, GL_SHORT}, + {WINED3DFMT_R16G16B16A16_SINT, WINED3D_FFP_EMIT_SHORT4, 4, GL_SHORT}, + {WINED3DFMT_R8G8B8A8_UNORM, WINED3D_FFP_EMIT_UBYTE4N, 4, GL_UNSIGNED_BYTE}, + {WINED3DFMT_R16G16_SNORM, WINED3D_FFP_EMIT_SHORT2N, 2, GL_SHORT}, + {WINED3DFMT_R16G16B16A16_SNORM, WINED3D_FFP_EMIT_SHORT4N, 4, GL_SHORT}, + {WINED3DFMT_R16G16_UNORM, WINED3D_FFP_EMIT_USHORT2N, 2, GL_UNSIGNED_SHORT}, + {WINED3DFMT_R16G16B16A16_UNORM, WINED3D_FFP_EMIT_USHORT4N, 4, GL_UNSIGNED_SHORT}, + {WINED3DFMT_R10G10B10X2_UINT, WINED3D_FFP_EMIT_UDEC3, 3, GL_UNSIGNED_SHORT}, + {WINED3DFMT_R10G10B10X2_SNORM, WINED3D_FFP_EMIT_DEC3N, 3, GL_SHORT}, + {WINED3DFMT_R10G10B10A2_UNORM, WINED3D_FFP_EMIT_INVALID, 4, GL_UNSIGNED_INT_2_10_10_10_REV, ARB_VERTEX_TYPE_2_10_10_10_REV}, - {WINED3DFMT_R16G16_FLOAT, WINED3D_FFP_EMIT_FLOAT16_2, 2, GL_HALF_FLOAT, GL_FALSE}, - {WINED3DFMT_R16G16B16A16_FLOAT, WINED3D_FFP_EMIT_FLOAT16_4, 4, GL_HALF_FLOAT, GL_FALSE}, - {WINED3DFMT_R8G8B8A8_SNORM, WINED3D_FFP_EMIT_INVALID, 4, GL_BYTE, GL_TRUE }, - {WINED3DFMT_R8G8B8A8_SINT, WINED3D_FFP_EMIT_INVALID, 4, GL_BYTE, GL_FALSE}, - {WINED3DFMT_R16G16B16A16_UINT, WINED3D_FFP_EMIT_INVALID, 4, GL_UNSIGNED_SHORT, GL_FALSE}, - {WINED3DFMT_R8_UNORM, WINED3D_FFP_EMIT_INVALID, 1, GL_UNSIGNED_BYTE, GL_TRUE}, - {WINED3DFMT_R8_UINT, WINED3D_FFP_EMIT_INVALID, 1, GL_UNSIGNED_BYTE, GL_FALSE}, - {WINED3DFMT_R8_SINT, WINED3D_FFP_EMIT_INVALID, 1, GL_BYTE, GL_FALSE}, - {WINED3DFMT_R16_UINT, WINED3D_FFP_EMIT_INVALID, 1, GL_UNSIGNED_SHORT, GL_FALSE}, - {WINED3DFMT_R16_SINT, WINED3D_FFP_EMIT_INVALID, 1, GL_SHORT, GL_FALSE}, - {WINED3DFMT_R32_UINT, WINED3D_FFP_EMIT_INVALID, 1, GL_UNSIGNED_INT, GL_FALSE}, - {WINED3DFMT_R32_SINT, WINED3D_FFP_EMIT_INVALID, 1, GL_INT, GL_FALSE}, - {WINED3DFMT_R32G32_UINT, WINED3D_FFP_EMIT_INVALID, 2, GL_UNSIGNED_INT, GL_FALSE}, - {WINED3DFMT_R32G32_SINT, WINED3D_FFP_EMIT_INVALID, 2, GL_INT, GL_FALSE}, - {WINED3DFMT_R32G32B32_UINT, WINED3D_FFP_EMIT_INVALID, 3, GL_UNSIGNED_INT, GL_FALSE}, - {WINED3DFMT_R32G32B32A32_UINT, WINED3D_FFP_EMIT_INVALID, 4, GL_UNSIGNED_INT, GL_FALSE}, - {WINED3DFMT_R32G32B32A32_SINT, WINED3D_FFP_EMIT_INVALID, 4, GL_INT, GL_FALSE}, + {WINED3DFMT_R16G16_FLOAT, WINED3D_FFP_EMIT_FLOAT16_2, 2, GL_HALF_FLOAT}, + {WINED3DFMT_R16G16B16A16_FLOAT, WINED3D_FFP_EMIT_FLOAT16_4, 4, GL_HALF_FLOAT}, + {WINED3DFMT_R8G8B8A8_SNORM, WINED3D_FFP_EMIT_INVALID, 4, GL_BYTE}, + {WINED3DFMT_R8G8B8A8_SINT, WINED3D_FFP_EMIT_INVALID, 4, GL_BYTE}, + {WINED3DFMT_R16G16B16A16_UINT, WINED3D_FFP_EMIT_INVALID, 4, GL_UNSIGNED_SHORT}, + {WINED3DFMT_R8_UNORM, WINED3D_FFP_EMIT_INVALID, 1, GL_UNSIGNED_BYTE}, + {WINED3DFMT_R8_UINT, WINED3D_FFP_EMIT_INVALID, 1, GL_UNSIGNED_BYTE}, + {WINED3DFMT_R8_SINT, WINED3D_FFP_EMIT_INVALID, 1, GL_BYTE}, + {WINED3DFMT_R16_UINT, WINED3D_FFP_EMIT_INVALID, 1, GL_UNSIGNED_SHORT}, + {WINED3DFMT_R16_SINT, WINED3D_FFP_EMIT_INVALID, 1, GL_SHORT}, + {WINED3DFMT_R32_UINT, WINED3D_FFP_EMIT_INVALID, 1, GL_UNSIGNED_INT}, + {WINED3DFMT_R32_SINT, WINED3D_FFP_EMIT_INVALID, 1, GL_INT}, + {WINED3DFMT_R32G32_UINT, WINED3D_FFP_EMIT_INVALID, 2, GL_UNSIGNED_INT}, + {WINED3DFMT_R32G32_SINT, WINED3D_FFP_EMIT_INVALID, 2, GL_INT}, + {WINED3DFMT_R32G32B32_UINT, WINED3D_FFP_EMIT_INVALID, 3, GL_UNSIGNED_INT}, + {WINED3DFMT_R32G32B32A32_UINT, WINED3D_FFP_EMIT_INVALID, 4, GL_UNSIGNED_INT}, + {WINED3DFMT_R32G32B32A32_SINT, WINED3D_FFP_EMIT_INVALID, 4, GL_INT}, }; struct wined3d_format_texture_info @@ -2067,6 +2066,9 @@ static BOOL init_format_base_info(struct wined3d_adapter *adapter) for (j = 0; j < strlen(typed_formats[i].channels); ++j) { enum wined3d_channel_type channel_type = map_channel_type(typed_formats[i].channels[j]); + + if (channel_type == WINED3D_CHANNEL_TYPE_UNORM || channel_type == WINED3D_CHANNEL_TYPE_SNORM) + flags |= WINED3DFMT_FLAG_NORMALISED; if (channel_type == WINED3D_CHANNEL_TYPE_UINT || channel_type == WINED3D_CHANNEL_TYPE_SINT) flags |= WINED3DFMT_FLAG_INTEGER; if (channel_type == WINED3D_CHANNEL_TYPE_FLOAT) @@ -3684,7 +3686,6 @@ static BOOL init_format_vertex_info(const struct wined3d_adapter *adapter, format->component_count = format_vertex_info[i].component_count; format->gl_vtx_type = format_vertex_info[i].gl_vtx_type; format->gl_vtx_format = format_vertex_info[i].component_count; - format->gl_normalized = format_vertex_info[i].gl_normalized; } return TRUE; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 9dd3cd21499..535023fc9f8 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4306,6 +4306,7 @@ extern enum wined3d_format_id pixelformat_for_depth(DWORD depth) DECLSPEC_HIDDEN #define WINED3DFMT_FLAG_BLOCKS_NO_VERIFY 0x00100000 #define WINED3DFMT_FLAG_INTEGER 0x00200000 #define WINED3DFMT_FLAG_GEN_MIPMAP 0x00400000 +#define WINED3DFMT_FLAG_NORMALISED 0x00800000 struct wined3d_rational { @@ -4345,7 +4346,6 @@ struct wined3d_format GLint component_count; GLenum gl_vtx_type; GLint gl_vtx_format; - GLboolean gl_normalized; GLint glInternal; GLint glGammaInternal; -- 2.11.0

1 0

[PATCH 2/4] wined3d: Add component info for R10G10B10X2_SNORM and R10G10B10X2_UINT.
by Henri Verbeet 09 Sep '18

09 Sep '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/utils.c | 5 +++-- include/wine/wined3d.h | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 961e3fe7144..84410af5dcc 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -123,8 +123,6 @@ static const struct wined3d_format_channels formats[] = {WINED3DFMT_R5G5_SNORM_L6_UNORM, 5, 5, 0, 0, 0, 5, 0, 0, 2, 0, 0}, {WINED3DFMT_R8G8_SNORM_L8X8_UNORM, 8, 8, 0, 0, 0, 8, 0, 0, 4, 0, 0}, {WINED3DFMT_R10G11B11_SNORM, 10, 11, 11, 0, 0, 10, 21, 0, 4, 0, 0}, - {WINED3DFMT_R10G10B10X2_UINT, 10, 10, 10, 0, 0, 10, 20, 0, 4, 0, 0}, - {WINED3DFMT_R10G10B10X2_SNORM, 10, 10, 10, 0, 0, 10, 20, 0, 4, 0, 0}, {WINED3DFMT_R10G10B10_SNORM_A2_UNORM, 10, 10, 10, 2, 0, 10, 20, 30, 4, 0, 0}, /* Depth stencil formats */ {WINED3DFMT_D16_LOCKABLE, 0, 0, 0, 0, 0, 0, 0, 0, 2, 16, 0}, @@ -155,6 +153,7 @@ static const struct wined3d_format_channels formats[] = {WINED3DFMT_R32G32_TYPELESS, 32, 32, 0, 0, 0, 32, 0, 0, 8, 0, 0}, {WINED3DFMT_R32G8X24_TYPELESS, 0, 0, 0, 0, 0, 0, 0, 0, 8, 32, 8}, {WINED3DFMT_R10G10B10A2_TYPELESS, 10, 10, 10, 2, 0, 10, 20, 30, 4, 0, 0}, + {WINED3DFMT_R10G10B10X2_TYPELESS, 10, 10, 10, 0, 0, 10, 20, 0, 4, 0, 0}, {WINED3DFMT_R8G8B8A8_TYPELESS, 8, 8, 8, 8, 0, 8, 16, 24, 4, 0, 0}, {WINED3DFMT_R16G16_TYPELESS, 16, 16, 0, 0, 0, 16, 0, 0, 4, 0, 0}, {WINED3DFMT_R32_TYPELESS, 32, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0}, @@ -227,6 +226,8 @@ static const struct wined3d_typed_format_info typed_formats[] = {WINED3DFMT_R10G10B10A2_SNORM, WINED3DFMT_R10G10B10A2_TYPELESS, "iiii"}, {WINED3DFMT_R10G10B10A2_UINT, WINED3DFMT_R10G10B10A2_TYPELESS, "UUUU"}, {WINED3DFMT_R10G10B10A2_UNORM, WINED3DFMT_R10G10B10A2_TYPELESS, "uuuu"}, + {WINED3DFMT_R10G10B10X2_SNORM, WINED3DFMT_R10G10B10X2_TYPELESS, "iiiX"}, + {WINED3DFMT_R10G10B10X2_UINT, WINED3DFMT_R10G10B10X2_TYPELESS, "UUUX"}, {WINED3DFMT_R8G8B8A8_UINT, WINED3DFMT_R8G8B8A8_TYPELESS, "UUUU"}, {WINED3DFMT_R8G8B8A8_SINT, WINED3DFMT_R8G8B8A8_TYPELESS, "IIII"}, {WINED3DFMT_R8G8B8A8_SNORM, WINED3DFMT_R8G8B8A8_TYPELESS, "iiii"}, diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 239ccd8ec62..ac7e3dd85cb 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -132,6 +132,7 @@ enum wined3d_format_id WINED3DFMT_R5G5_SNORM_L6_UNORM, WINED3DFMT_R8G8_SNORM_L8X8_UNORM, WINED3DFMT_R10G11B11_SNORM, + WINED3DFMT_R10G10B10X2_TYPELESS, WINED3DFMT_R10G10B10X2_UINT, WINED3DFMT_R10G10B10X2_SNORM, WINED3DFMT_R10G10B10_SNORM_A2_UNORM, -- 2.11.0

1 0

[PATCH 1/4] wined3d: Get rid of the "attribute_size" field in struct wined3d_format.
by Henri Verbeet 09 Sep '18

09 Sep '18

Note that "byte_count" is 4 for R10G10B10X2_UINT/R10G10B10X2_SNORM, while "attribute_size" is 6. I think 4 is correct. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/buffer.c | 2 +- dlls/wined3d/utils.c | 35 ----------------------------------- dlls/wined3d/vertexdeclaration.c | 2 +- dlls/wined3d/wined3d_private.h | 1 - 4 files changed, 2 insertions(+), 38 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index f381b2efb94..e20d66cc880 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -309,7 +309,7 @@ static BOOL buffer_process_converted_attribute(struct wined3d_buffer *buffer, } data = ((DWORD_PTR)attrib->data.addr) % buffer->stride; - for (i = 0; i < format->attribute_size; ++i) + for (i = 0; i < format->byte_count; ++i) { DWORD_PTR idx = (data + i) % buffer->stride; if (buffer->conversion_map[idx] != conversion_type) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 6f13f91353a..961e3fe7144 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3665,34 +3665,6 @@ static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_ format->flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; } -static unsigned int calculate_vertex_attribute_size(GLenum type, unsigned int component_count) -{ - switch (type) - { - case GL_HALF_FLOAT: - return component_count * sizeof(GLhalfNV); - case GL_FLOAT: - return component_count * sizeof(GLfloat); - case GL_BYTE: - return component_count * sizeof(GLbyte); - case GL_UNSIGNED_BYTE: - return component_count * sizeof(GLubyte); - case GL_SHORT: - return component_count * sizeof(GLshort); - case GL_UNSIGNED_SHORT: - return component_count * sizeof(GLushort); - case GL_INT: - return component_count * sizeof(GLint); - case GL_UNSIGNED_INT: - return component_count * sizeof(GLuint); - case GL_UNSIGNED_INT_2_10_10_10_REV: - return sizeof(GLuint); - default: - FIXME("Unhandled GL type %#x.\n", type); - return 0; - } -} - static BOOL init_format_vertex_info(const struct wined3d_adapter *adapter, struct wined3d_gl_info *gl_info) { @@ -3712,13 +3684,6 @@ static BOOL init_format_vertex_info(const struct wined3d_adapter *adapter, format->gl_vtx_type = format_vertex_info[i].gl_vtx_type; format->gl_vtx_format = format_vertex_info[i].component_count; format->gl_normalized = format_vertex_info[i].gl_normalized; - if (!(format->attribute_size = calculate_vertex_attribute_size(format->gl_vtx_type, - format->component_count))) - { - ERR("Invalid attribute size for vertex format %s (%#x).\n", - debug_d3dformat(format_vertex_info[i].id), format_vertex_info[i].id); - return FALSE; - } } return TRUE; diff --git a/dlls/wined3d/vertexdeclaration.c b/dlls/wined3d/vertexdeclaration.c index c050a6dda9f..89329d42034 100644 --- a/dlls/wined3d/vertexdeclaration.c +++ b/dlls/wined3d/vertexdeclaration.c @@ -315,7 +315,7 @@ static void append_decl_element(struct wined3d_fvf_convert_state *state, elements[idx].usage_idx = usage_idx; format = wined3d_get_format(state->adapter, format_id, 0); - state->offset += format->attribute_size; + state->offset += format->byte_count; ++state->idx; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 70841683e5b..9dd3cd21499 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4346,7 +4346,6 @@ struct wined3d_format GLenum gl_vtx_type; GLint gl_vtx_format; GLboolean gl_normalized; - unsigned int attribute_size; GLint glInternal; GLint glGammaInternal; -- 2.11.0

1 0

[PATCH] ntdll/tests: Add basic tests for NtSetInformationThread(), class ThreadAffinityMask
by Roger Zoellner 09 Sep '18

09 Sep '18

Related to https://source.winehq.org/patches/data/150818 --- dlls/ntdll/tests/Makefile.in | 1 + dlls/ntdll/tests/thread.c | 83 ++++++++++++++++++++++++++++++++++++ 2 files changed, 84 insertions(+) create mode 100644 dlls/ntdll/tests/thread.c diff --git a/dlls/ntdll/tests/Makefile.in b/dlls/ntdll/tests/Makefile.in index 5c70f3f01a..26b7f8cd09 100644 --- a/dlls/ntdll/tests/Makefile.in +++ b/dlls/ntdll/tests/Makefile.in @@ -22,4 +22,5 @@ C_SRCS = \ rtlstr.c \ string.c \ threadpool.c \ + thread.c \ time.c diff --git a/dlls/ntdll/tests/thread.c b/dlls/ntdll/tests/thread.c new file mode 100644 index 0000000000..740d64fff5 --- /dev/null +++ b/dlls/ntdll/tests/thread.c @@ -0,0 +1,83 @@ +/* + * Unit test suite for ntdll thread functions + * + * Copyright 2018 Roger Zoellner + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "ntdll_test.h" + +static NTSTATUS (WINAPI *pNtSetInformationThread)(HANDLE handle, THREADINFOCLASS class, LPCVOID data, ULONG length); + +static DWORD WINAPI thread_main(LPVOID lpParam) +{ + /* Thread is created with CREATE_SUSPENDED flag set and isn't doing anything */ +} + +static void test_NtSetInformationThread(HANDLE thread) +{ + /* class ThreadAffinityMask */ + THREADINFOCLASS class = ThreadAffinityMask; + DWORD_PTR req_aff; + ULONG req_aff_length = sizeof(req_aff); + NTSTATUS status; + + HANDLE process = GetCurrentProcess(); + DWORD_PTR system_aff; + DWORD_PTR process_aff; + BOOL success = GetProcessAffinityMask(process, &process_aff, &system_aff); + ok(success == TRUE, "GetProcessAffinityMask failed. Expected TRUE, got FALSE\n"); + + if (success == FALSE) return; + + /* Test required affinity mask, no bits set */ + req_aff = 0; + status = pNtSetInformationThread(thread, class, &req_aff, req_aff_length); + ok(status == STATUS_INVALID_PARAMETER, "NtSetInformationThread failed. Expected STATUS_INVALID_PARAMETER, got %08x (class=ThreadAffinityMask, case 1, req_aff=%08x, process_aff=%08x)\n", status, req_aff, process_aff); + + /* Test required affinity mask, all bits set */ + req_aff = ~0u; + status = pNtSetInformationThread(thread, class, &req_aff, req_aff_length); + ok(status == STATUS_SUCCESS, "NtSetInformationThread failed. Expected STATUS_SUCCESS, got %08x (class=ThreadAffinityMask, case 2, req_aff=%08x, process_aff=%08x)\n", status, req_aff, process_aff); + + /* Test required affinity mask = process affinity mask */ + req_aff = process_aff; + status = pNtSetInformationThread(thread, class, &req_aff, req_aff_length); + ok(status == STATUS_SUCCESS, "NtSetInformationThread failed. Expected STATUS_SUCCESS, got %08x (class=ThreadAffinityMask, case 3, req_aff=%08x, process_aff=%08x)\n", status, req_aff, process_aff); + + /* Test required affinity mask = process affinity mask with a prepended bit set */ + req_aff = (process_aff << 1) | process_aff; + status = pNtSetInformationThread(thread, class, &req_aff, req_aff_length); + ok(status == STATUS_SUCCESS, "NtSetInformationThread failed. Expected STATUS_SUCCESS, got %08x (class=ThreadAffinityMask, case 4, req_aff=%08x, process_aff=%08x)\n", status, req_aff, process_aff); +} + +START_TEST(thread) +{ + HMODULE mod = GetModuleHandleA("ntdll.dll"); + pNtSetInformationThread = (void *) GetProcAddress(mod ,"NtSetInformationThread"); + HANDLE thread; + + thread = CreateThread(NULL, 0, thread_main, NULL, CREATE_SUSPENDED, NULL); + ok(thread != NULL, "dlls/ntdll/tests/: Could not create new thread\n"); + + if (thread != NULL) + { + test_NtSetInformationThread(thread); + TerminateThread(thread, 0); + CloseHandle(thread); + } +} + -- 2.18.0

4 5

[PATCH] wind3d: Acknowledge additional instruction modifiers
by Tobias Klausmann 09 Sep '18

09 Sep '18

Extended opcodes (modifiers) are primarily used for sign-extension, yet there are some additional modifiers we can parse at least. Information taken from dxvk implementation! There should be no functional change beyond the FIXME -> TRACE change for the newly acknowledge modifiers. Signed-off-by: Tobias Klausmann <tobias.johannes.klausmann(a)mni.thm.de> --- dlls/wined3d/shader_sm4.c | 98 +++++++++++++++++++++++++++------------ 1 file changed, 69 insertions(+), 29 deletions(-) diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index b119e8feaa..ad0ac9e80a 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -25,14 +25,19 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader); WINE_DECLARE_DEBUG_CHANNEL(d3d_bytecode); #define WINED3D_SM4_INSTRUCTION_MODIFIER (0x1u << 31) +#define WINED3D_SM4_INSTRUCTION_MODIFIER_BIT 31 -#define WINED3D_SM4_MODIFIER_AOFFIMMI 0x1 -#define WINED3D_SM4_AOFFIMMI_U_SHIFT 9 -#define WINED3D_SM4_AOFFIMMI_U_MASK (0xfu << WINED3D_SM4_AOFFIMMI_U_SHIFT) -#define WINED3D_SM4_AOFFIMMI_V_SHIFT 13 -#define WINED3D_SM4_AOFFIMMI_V_MASK (0xfu << WINED3D_SM4_AOFFIMMI_V_SHIFT) -#define WINED3D_SM4_AOFFIMMI_W_SHIFT 17 -#define WINED3D_SM4_AOFFIMMI_W_MASK (0xfu << WINED3D_SM4_AOFFIMMI_W_SHIFT) +#define WINED3D_SM4_MODIFIER_FIELD_BIT_LOW 0 +#define WINED3D_SM4_MODIFIER_FIELD_BIT_HIGH 5 + +#define WINED3D_SM4_AOFFIMMI_U_BIT_LOW 9 +#define WINED3D_SM4_AOFFIMMI_U_BIT_HIGH 12 + +#define WINED3D_SM4_AOFFIMMI_V_BIT_LOW 13 +#define WINED3D_SM4_AOFFIMMI_V_BIT_HIGH 16 + +#define WINED3D_SM4_AOFFIMMI_W_BIT_LOW 17 +#define WINED3D_SM4_AOFFIMMI_W_BIT_HIGH 20 #define WINED3D_SM4_INSTRUCTION_LENGTH_SHIFT 24 #define WINED3D_SM4_INSTRUCTION_LENGTH_MASK (0x1fu << WINED3D_SM4_INSTRUCTION_LENGTH_SHIFT) @@ -304,6 +309,13 @@ enum wined3d_sm4_opcode WINED3D_SM5_OP_DCL_GS_INSTANCES = 0xce, }; +enum wined3d_sm4_ext_opcode { + WINED3D_SM4_EXT_OP_EMPTY = 0, + WINED3D_SM4_EXT_OP_SAMPLE_CONTROLS, + WINED3D_SM4_EXT_OP_RESOURCE_DIM, + WINED3D_SM4_EXT_OP_RESOURCE_RETURN_TYPE, +}; + enum wined3d_sm4_register_type { WINED3D_SM4_RT_TEMP = 0x00, @@ -1222,6 +1234,10 @@ static enum wined3d_data_type map_data_type(char t) } } +inline DWORD bit_extract32(DWORD value, DWORD fst, DWORD lst) { + return (value >> fst) & ~(~0 << (lst - fst + 1)); +} + enum wined3d_shader_type wined3d_get_sm4_shader_type(const DWORD *byte_code, size_t byte_code_size) { DWORD shader_type; @@ -1610,32 +1626,56 @@ static BOOL shader_sm4_read_dst_param(struct wined3d_sm4_data *priv, const DWORD static void shader_sm4_read_instruction_modifier(DWORD modifier, struct wined3d_shader_instruction *ins) { - static const DWORD recognized_bits = WINED3D_SM4_INSTRUCTION_MODIFIER - | WINED3D_SM4_MODIFIER_AOFFIMMI - | WINED3D_SM4_AOFFIMMI_U_MASK - | WINED3D_SM4_AOFFIMMI_V_MASK - | WINED3D_SM4_AOFFIMMI_W_MASK; - - if (modifier & ~recognized_bits) + if (bit_extract32(modifier, + WINED3D_SM4_INSTRUCTION_MODIFIER_BIT, + WINED3D_SM4_INSTRUCTION_MODIFIER_BIT)) { - FIXME("Unhandled modifier 0x%08x.\n", modifier); + const DWORD extOpcode = bit_extract32(modifier, + WINED3D_SM4_MODIFIER_FIELD_BIT_LOW, + WINED3D_SM4_MODIFIER_FIELD_BIT_HIGH); + + switch (extOpcode) + { + case WINED3D_SM4_EXT_OP_SAMPLE_CONTROLS: { + /* Bit fields are used for sign extension */ + struct + { + int u : 4; + int v : 4; + int w : 4; + } + aoffimmi; + + aoffimmi.u = bit_extract32(modifier, + WINED3D_SM4_AOFFIMMI_U_BIT_LOW, + WINED3D_SM4_AOFFIMMI_U_BIT_HIGH); + aoffimmi.v = bit_extract32(modifier, + WINED3D_SM4_AOFFIMMI_V_BIT_LOW, + WINED3D_SM4_AOFFIMMI_V_BIT_HIGH); + aoffimmi.w = bit_extract32(modifier, + WINED3D_SM4_AOFFIMMI_W_BIT_LOW, + WINED3D_SM4_AOFFIMMI_W_BIT_HIGH); + + ins->texel_offset.u = aoffimmi.u; + ins->texel_offset.v = aoffimmi.v; + ins->texel_offset.w = aoffimmi.w; + } + break; + + case WINED3D_SM4_EXT_OP_RESOURCE_DIM: + case WINED3D_SM4_EXT_OP_RESOURCE_RETURN_TYPE: + TRACE("Unhandled opcode extension 0x%08x -> %d\n", modifier, + extOpcode); + break; // part of resource description + + default: + FIXME("Unhandled opcode extension 0x%08x\n", modifier); + break; + } } else { - /* Bit fields are used for sign extension */ - struct - { - int u : 4; - int v : 4; - int w : 4; - } - aoffimmi; - aoffimmi.u = (modifier & WINED3D_SM4_AOFFIMMI_U_MASK) >> WINED3D_SM4_AOFFIMMI_U_SHIFT; - aoffimmi.v = (modifier & WINED3D_SM4_AOFFIMMI_V_MASK) >> WINED3D_SM4_AOFFIMMI_V_SHIFT; - aoffimmi.w = (modifier & WINED3D_SM4_AOFFIMMI_W_MASK) >> WINED3D_SM4_AOFFIMMI_W_SHIFT; - ins->texel_offset.u = aoffimmi.u; - ins->texel_offset.v = aoffimmi.v; - ins->texel_offset.w = aoffimmi.w; + FIXME("Unhandled modifier 0x%08x\n", modifier); } } -- 2.18.0

2 5

[PATCH] ntdll: Workaround for requesting thread affinity mask that isn't a subset of the system's mask
by Roger Zoellner 09 Sep '18

09 Sep '18

This patch is related to the game 'Divinity Original Sin 2' which crashes on startup, if the system only has 4 or less logical cpus. By Microsoft specification, requesting a thread affinity mask requires it be be a subset of the process affiniy mask. However the game requests a mask F...FE (-2) which makes wine to return STATUS_INVALID_PARAMETER, which in turn makes the game hang. This patch will make wine to adjust the mask in this case, which makes the game start correctly. Signed-off-by: Roger Zoellner <zoellner.roger(a)gmail.com> --- dlls/ntdll/thread.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 59d64e174d..6beb8c1a3d 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -1290,6 +1290,7 @@ NTSTATUS WINAPI NtSetInformationThread( HANDLE handle, THREADINFOCLASS class, if (length != sizeof(ULONG_PTR)) return STATUS_INVALID_PARAMETER; req_aff = *(const ULONG_PTR *)data; if ((ULONG)req_aff == ~0u) req_aff = affinity_mask; + else if ((LONG) req_aff < 0) req_aff = affinity_mask & req_aff; else if (req_aff & ~affinity_mask) return STATUS_INVALID_PARAMETER; else if (!req_aff) return STATUS_INVALID_PARAMETER; SERVER_START_REQ( set_thread_info ) -- 2.18.0

3 4

[PATCH] mpr: Implement WNetClearConnections().
by Pierre Schweitzer 09 Sep '18

09 Sep '18

Hi, Please find attached a patch implements an undocumented Windows MPR API that is used on logoff to disconnect any network share connection. Implementation based on: https://git.reactos.org/?p=reactos.git;a=blob;f=base/applications/network/n… Successfully tested in: https://jira.reactos.org/browse/CORE-15012 Cheers, -- Pierre Schweitzer <pierre at reactos.org> System & Network Administrator Senior Kernel Developer ReactOS Deutschland e.V.

1 0

[PATCH v2] find: First simple implementation and tests
by Fabian Maurer 09 Sep '18

09 Sep '18

The message text is the same as on windows, since the exit code doesn't seem reliable. v2: Read input text line by line Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- configure | 25 ++--- configure.ac | 1 + programs/find/Makefile.in | 5 +- programs/find/find.c | 137 +++++++++++++++++++++++++- programs/find/resources.h | 27 +++++ programs/find/rsrc.rc | 25 +++++ programs/find/tests/Makefile.in | 4 + programs/find/tests/find.c | 169 ++++++++++++++++++++++++++++++++ 8 files changed, 369 insertions(+), 24 deletions(-) create mode 100644 programs/find/resources.h create mode 100644 programs/find/rsrc.rc create mode 100644 programs/find/tests/Makefile.in create mode 100644 programs/find/tests/find.c diff --git a/configure b/configure index 337ce912fe..40f697d60c 100755 --- a/configure +++ b/configure @@ -805,7 +805,6 @@ infodir docdir oldincludedir includedir -runstatedir localstatedir sharedstatedir sysconfdir @@ -1870,7 +1869,6 @@ datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' -runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' @@ -2123,15 +2121,6 @@ do | -silent | --silent | --silen | --sile | --sil) silent=yes ;; - -runstatedir | --runstatedir | --runstatedi | --runstated \ - | --runstate | --runstat | --runsta | --runst | --runs \ - | --run | --ru | --r) - ac_prev=runstatedir ;; - -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ - | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ - | --run=* | --ru=* | --r=*) - runstatedir=$ac_optarg ;; - -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -2269,7 +2258,7 @@ fi for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir runstatedir + libdir localedir mandir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -2422,7 +2411,6 @@ Fine tuning of the installation directories: --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] - --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] @@ -6803,7 +6791,7 @@ else We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -6849,7 +6837,7 @@ else We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -6873,7 +6861,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -6918,7 +6906,7 @@ else We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -6942,7 +6930,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -20030,6 +20018,7 @@ wine_fn_config_makefile programs/explorer enable_explorer wine_fn_config_makefile programs/extrac32 enable_extrac32 wine_fn_config_makefile programs/fc enable_fc wine_fn_config_makefile programs/find enable_find +wine_fn_config_makefile programs/find/tests enable_tests wine_fn_config_makefile programs/findstr enable_findstr wine_fn_config_makefile programs/fsutil enable_fsutil wine_fn_config_makefile programs/hh enable_hh diff --git a/configure.ac b/configure.ac index be247ea200..e8edcbe522 100644 --- a/configure.ac +++ b/configure.ac @@ -3891,6 +3891,7 @@ WINE_CONFIG_MAKEFILE(programs/explorer) WINE_CONFIG_MAKEFILE(programs/extrac32) WINE_CONFIG_MAKEFILE(programs/fc) WINE_CONFIG_MAKEFILE(programs/find) +WINE_CONFIG_MAKEFILE(programs/find/tests) WINE_CONFIG_MAKEFILE(programs/findstr) WINE_CONFIG_MAKEFILE(programs/fsutil) WINE_CONFIG_MAKEFILE(programs/hh) diff --git a/programs/find/Makefile.in b/programs/find/Makefile.in index ef8d61b7ce..4a90905986 100644 --- a/programs/find/Makefile.in +++ b/programs/find/Makefile.in @@ -1,4 +1,7 @@ MODULE = find.exe -APPMODE = -mconsole -municode +APPMODE = -mconsole +IMPORTS = user32 shlwapi C_SRCS = find.c + +RC_SRCS = rsrc.rc diff --git a/programs/find/find.c b/programs/find/find.c index 9d7aecd402..bbac3eeee0 100644 --- a/programs/find/find.c +++ b/programs/find/find.c @@ -16,18 +16,145 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <windows.h> +#include <stdlib.h> +#include <shlwapi.h> + +#include "wine/heap.h" #include "wine/debug.h" +#include "resources.h" WINE_DEFAULT_DEBUG_CHANNEL(find); -int wmain(int argc, WCHAR *argv[]) +/* Reads a line from a handle, returns TRUE if there is more to be read */ +BOOL read_line_from_handle(HANDLE handle, char **line_out) +{ + int buffer_size = 4096; + char c; + DWORD bytes_read; + int length = 0; + BOOL success; + char *line = heap_alloc(buffer_size); + + for (;;) + { + success = ReadFile(handle, &c, 1, &bytes_read, NULL); + + if (c == '\n') + break; + + /* Check for EOF */ + if (!success || !bytes_read) + { + if (length == 0) + return FALSE; + else + break; + } + + /* Make sure buffer is large enough */ + if (length + bytes_read >= buffer_size) + { + buffer_size *= 2; + line = heap_realloc(line, buffer_size); + } + + line[length++] = c; + } + + line[length] = 0; + if (length - 1 >= 0 && line[length - 1] == '\r') + line[length - 1] = 0; + + *line_out = line; + return TRUE; +} + +void write_to_handle(HANDLE handle, const char *str) +{ + DWORD bytes_written_sum = 0; + DWORD length = lstrlenA(str); + do + { + DWORD bytes_written; + WriteFile(handle, str, length * sizeof(char), &bytes_written, NULL); + bytes_written_sum += bytes_written; + } while (bytes_written_sum < length); +} + +void find_printf(const char *str) +{ + write_to_handle(GetStdHandle(STD_OUTPUT_HANDLE), str); +} + +BOOL run_find_for_line(const char *line, const char *tofind) { + void *found; + + if (lstrlenA(line) == 0) + return FALSE; + + found = StrStrA(line, tofind); + + if (found) + { + find_printf(line); + find_printf("\r\n"); + return TRUE; + } + + return FALSE; +} + +int main(int argc, char *argv[]) +{ + char *line; + char *tofind = NULL; + char message_parameter_invalid[64]; + char message_switch_invalid[64]; int i; + int exitcode; + HANDLE input; - WINE_FIXME("stub:"); + TRACE("running find:"); for (i = 0; i < argc; i++) - WINE_FIXME(" %s", wine_dbgstr_w(argv[i])); - WINE_FIXME("\n"); + { + TRACE(" %s", argv[i]); + } + TRACE("\n"); + + LoadStringA(GetModuleHandleW(NULL), IDS_INVALID_PARAMETER, message_parameter_invalid, sizeof(message_parameter_invalid)); + LoadStringA(GetModuleHandleW(NULL), IDS_INVALID_SWITCH, message_switch_invalid, sizeof(message_switch_invalid)); + + input = GetStdHandle(STD_INPUT_HANDLE); + + for (i = 1; i < argc; i++) + { + if (argv[i][0] == '/') + { + find_printf(message_switch_invalid); + return 2; + } + else if(tofind == NULL) + { + tofind = argv[i]; + } + } + + if (tofind == NULL) + { + find_printf(message_parameter_invalid); + return 2; + } + + exitcode = 1; + while (read_line_from_handle(input, &line)) + { + if (run_find_for_line(line, tofind)) + exitcode = 0; + + heap_free(line); + } - return 0; + return exitcode; } diff --git a/programs/find/resources.h b/programs/find/resources.h new file mode 100644 index 0000000000..8712d91e36 --- /dev/null +++ b/programs/find/resources.h @@ -0,0 +1,27 @@ +/* + * Resource IDs + * + * Copyright 2018 Fabian Maurer + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_FIND_RESOURCES_H +#define __WINE_FIND_RESOURCES_H + +#define IDS_INVALID_PARAMETER 1000 +#define IDS_INVALID_SWITCH 1001 + +#endif /* __WINE_FIND_RESOURCES_H */ diff --git a/programs/find/rsrc.rc b/programs/find/rsrc.rc new file mode 100644 index 0000000000..f10fb6285f --- /dev/null +++ b/programs/find/rsrc.rc @@ -0,0 +1,25 @@ +/* + * Copyright 2018 Fabian Maurer + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "resources.h" + +STRINGTABLE +{ + IDS_INVALID_PARAMETER "FIND: Parameter format not correct\r\n" + IDS_INVALID_SWITCH "FIND: Invalid switch\r\n" +} diff --git a/programs/find/tests/Makefile.in b/programs/find/tests/Makefile.in new file mode 100644 index 0000000000..ad88243ede --- /dev/null +++ b/programs/find/tests/Makefile.in @@ -0,0 +1,4 @@ +TESTDLL = find.exe + +C_SRCS = \ + find.c diff --git a/programs/find/tests/find.c b/programs/find/tests/find.c new file mode 100644 index 0000000000..615d99ca59 --- /dev/null +++ b/programs/find/tests/find.c @@ -0,0 +1,169 @@ +/* + * Copyright 2018 Fabian Maurer + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <windows.h> +#include <stdio.h> + +#include "wine/heap.h" +#include "wine/test.h" + +char* read_all_from_handle(HANDLE handle) +{ + char buffer[4096]; + DWORD bytes_read; + DWORD length = 0; + BOOL success; + char *ret = heap_alloc_zero(1); + + for (;;) + { + success = ReadFile(handle, buffer, sizeof(buffer), &bytes_read, NULL); + if (!success || !bytes_read) + break; + ret = heap_realloc(ret, length + bytes_read); + memcpy((char *)ret + length, buffer, bytes_read); + length += bytes_read; + } + + ret[length] = 0; + return ret; +} + +/* Copied from find.exe implementation */ +void write_to_handle(HANDLE handle, const char *str) +{ + DWORD bytes_written_sum = 0; + DWORD length = lstrlenA(str); + do + { + DWORD bytes_written; + WriteFile(handle, str, length * sizeof(char), &bytes_written, NULL); + bytes_written_sum += bytes_written; + } while (bytes_written_sum < length); +} + +#define run_find(commandline, input, out_expected, exitcode_expected) \ + run_find_(commandline, input, out_expected, exitcode_expected, __FILE__, __LINE__) + +static void run_find_(const char *commandline, const char *input, const char *out_expected, int exitcode_expected, const char *file, int line) +{ + HANDLE child_stdin_read; + HANDLE child_stdout_write; + HANDLE parent_stdin_write; + HANDLE parent_stdout_read; + STARTUPINFOA startup_info = {0}; + SECURITY_ATTRIBUTES security_attributes; + PROCESS_INFORMATION process_info = {0}; + char *child_output = NULL; + char cmd[4096]; + int comparison; + DWORD exitcode; + + security_attributes.nLength = sizeof(SECURITY_ATTRIBUTES); + security_attributes.bInheritHandle = TRUE; + security_attributes.lpSecurityDescriptor = NULL; + + CreatePipe(&parent_stdout_read, &child_stdout_write, &security_attributes, 0); + CreatePipe(&child_stdin_read, &parent_stdin_write, &security_attributes, 0); + + SetHandleInformation(parent_stdout_read, HANDLE_FLAG_INHERIT, 0); + SetHandleInformation(parent_stdin_write, HANDLE_FLAG_INHERIT, 0); + + startup_info.cb = sizeof(STARTUPINFOW); + startup_info.hStdInput = child_stdin_read; + startup_info.hStdOutput = child_stdout_write; + startup_info.hStdError = NULL; + startup_info.dwFlags |= STARTF_USESTDHANDLES; + + sprintf(cmd, "find.exe %s", commandline); + CreateProcessA(NULL, cmd, NULL, NULL, TRUE, 0, NULL, NULL, &startup_info, &process_info); + CloseHandle(child_stdin_read); + CloseHandle(child_stdout_write); + + write_to_handle(parent_stdin_write, input); + CloseHandle(parent_stdin_write); + + child_output = read_all_from_handle(parent_stdout_read); + CloseHandle(parent_stdout_read); + + GetExitCodeProcess(process_info.hProcess, &exitcode); + CloseHandle(process_info.hProcess); + CloseHandle(process_info.hThread); + + comparison = lstrcmpA(child_output, out_expected); + + ok_(file, line)(comparison == 0, "\n#################### Expected:\n" + "%s\n" + "#################### But got:\n" + "%s\n" + "####################\n", + out_expected, child_output); + ok_(file, line)(exitcode == exitcode_expected, "Expected exitcode %d, got %d\n", exitcode_expected, exitcode); + + heap_free(child_output); +} + +static void test_errors(void) +{ + run_find("", "", "FIND: Parameter format not correct\r\n", 2); + todo_wine + run_find("test", "", "FIND: Parameter format not correct\r\n", 2); + todo_wine + run_find("\"test", "", "FIND: Parameter format not correct\r\n", 2); + run_find("\"test\" /XYZ", "", "FIND: Invalid switch\r\n", 2); +} + +static void test_singleline_without_switches(void) +{ + run_find("\"\"", "test", "", 1); + run_find("\"test\"", "", "", 1); + run_find("\"test\"", "test", "test\r\n", 0); + run_find("\"test\"", "test2", "test2\r\n", 0); + run_find("\"test2\"", "test", "", 1); + +} + +static void test_multiline(void) +{ + /* Newline in input shouldn't work */ + run_find("\"t1\r\nt1\"", "t1\r\nt1", "", 1); + run_find("\"t1\nt1\"", "t1\nt1", "", 1); + + /* Newline should always be displayed as \r\n */ + run_find("\"test1\"", "test1\ntest2", "test1\r\n", 0); + run_find("\"test1\"", "test1\r\ntest2", "test1\r\n", 0); + + /* Test with empty line */ + run_find("\"test1\"", "test1\n\ntest2", "test1\r\n", 0); + + /* Two strings to be found */ + run_find("\"test\"", "junk1\ntest1\ntest2\r\njunk", "test1\r\ntest2\r\n", 0); +} + +START_TEST(find) +{ + if (PRIMARYLANGID(GetUserDefaultUILanguage()) != LANG_ENGLISH) + { + skip("Tests only work with english locale.\n"); + return; + } + + test_errors(); + test_singleline_without_switches(); + test_multiline(); +} -- 2.18.0

2 9

[PATCH] kernel32/tests: Allow ERROR_ACCESS_DENIED for newer Win10
by André Hentschel 09 Sep '18

09 Sep '18

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/kernel32/tests/loader.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index e4d6741b6f..e7a1a4307c 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -3163,7 +3163,8 @@ todo_wine if (!ret) ok(GetLastError() == ERROR_INVALID_PARAMETER || GetLastError() == ERROR_GEN_FAILURE /* win7 64-bit */ || - GetLastError() == ERROR_INVALID_FUNCTION /* vista 64-bit */, + GetLastError() == ERROR_INVALID_FUNCTION /* vista 64-bit */ || + GetLastError() == ERROR_ACCESS_DENIED /* Win10 32-bit */, "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); SetLastError(0xdeadbeef); ctx.ContextFlags = CONTEXT_INTEGER; @@ -3186,7 +3187,8 @@ todo_wine if (!ret) ok(GetLastError() == ERROR_INVALID_PARAMETER || GetLastError() == ERROR_GEN_FAILURE /* win7 64-bit */ || - GetLastError() == ERROR_INVALID_FUNCTION /* vista 64-bit */, + GetLastError() == ERROR_INVALID_FUNCTION /* vista 64-bit */ || + GetLastError() == ERROR_ACCESS_DENIED /* Win10 32-bit */, "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); SetLastError(0xdeadbeef); ctx.ContextFlags = CONTEXT_INTEGER; -- 2.17.1

1 0

[PATCH] advapi32/tests: Allow ERROR_ACCESS_DENIED for newer Win10
by André Hentschel 09 Sep '18

09 Sep '18

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/advapi32/tests/security.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index aebf3b83cd..3ca151d0fd 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -3149,8 +3149,8 @@ static void test_impersonation_level(void) /* can't perform access check when opening object against an identification impersonation token */ error = RegOpenKeyExA(HKEY_CURRENT_USER, "Software", 0, KEY_READ, &hkey); todo_wine { - ok(error == ERROR_INVALID_HANDLE || error == ERROR_BAD_IMPERSONATION_LEVEL, - "RegOpenKeyEx should have failed with ERROR_INVALID_HANDLE or ERROR_BAD_IMPERSONATION_LEVEL instead of %d\n", error); + ok(error == ERROR_INVALID_HANDLE || error == ERROR_BAD_IMPERSONATION_LEVEL || error == ERROR_ACCESS_DENIED, + "RegOpenKeyEx should have failed with ERROR_INVALID_HANDLE, ERROR_BAD_IMPERSONATION_LEVEL or ERROR_ACCESS_DENIED instead of %d\n", error); } ret = PrivilegeCheck(Token, PrivilegeSet, &AccessGranted); ok(ret, "PrivilegeCheck for SecurityIdentification failed with error %d\n", GetLastError()); -- 2.17.1

1 0

[PATCH] oleaut32/tests: Adjust test to a fixed Windows bug
by André Hentschel 09 Sep '18

09 Sep '18

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/oleaut32/tests/safearray.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/tests/safearray.c b/dlls/oleaut32/tests/safearray.c index 5d541466e3..9cc3793bc7 100644 --- a/dlls/oleaut32/tests/safearray.c +++ b/dlls/oleaut32/tests/safearray.c @@ -2018,9 +2018,10 @@ static void test_SafeArrayDestroyData (void) ok(hres == S_OK, "got 0x%08x\n", hres); todo_wine ok(sa->fFeatures == FADF_HAVEVARTYPE, "got 0x%x\n", sa->fFeatures); - ok(sa->pvData != NULL, "got %p\n", sa->pvData); - /* There seems to be a bug on windows, especially visible on 64bit systems, - probably double-free of similar issue. */ +todo_wine + ok(sa->pvData == NULL || broken(sa->pvData != NULL), "got %p\n", sa->pvData); + /* There was a bug on windows, especially visible on 64bit systems, + probably double-free or similar issue. */ sa->pvData = NULL; SafeArrayDestroy(sa); } -- 2.17.1

1 0

[PATCH] crypt32: Print Crypt(Un)protectMemory FIXME only once
by André Hentschel 09 Sep '18

09 Sep '18

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/crypt32/main.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/main.c b/dlls/crypt32/main.c index 9ff7592282..79a0ce1fd3 100644 --- a/dlls/crypt32/main.c +++ b/dlls/crypt32/main.c @@ -252,12 +252,14 @@ ASN1encoding_t WINAPI I_CryptGetAsn1Encoder(HCRYPTASN1MODULE x) BOOL WINAPI CryptProtectMemory(void *data, DWORD len, DWORD flags) { - FIXME("(%p %u %08x): stub\n", data, len, flags); + static int fixme_once; + if (!fixme_once++) FIXME("(%p %u %08x): stub\n", data, len, flags); return TRUE; } BOOL WINAPI CryptUnprotectMemory(void *data, DWORD len, DWORD flags) { - FIXME("(%p %u %08x): stub\n", data, len, flags); + static int fixme_once; + if (!fixme_once++) FIXME("(%p %u %08x): stub\n", data, len, flags); return TRUE; } -- 2.17.1

1 0

[PATCH] wind3d: Acknowledge additional instruction modifiers
by Tobias Klausmann 08 Sep '18

08 Sep '18

Extended opcodes (modifiers) are primarily used for sign-extension, yet there are some additional modifiers we can parse at least. Information taken from dxvk implementation! There should be no functional change beyond the FIXME -> TRACE change for the newly acknowledge modifiers. Signed-off-by: Tobias Klausmann <tobias.johannes.klausmann(a)mni.thm.de> --- dlls/wined3d/shader_sm4.c | 98 +++++++++++++++++++++++++++------------ 1 file changed, 69 insertions(+), 29 deletions(-) diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index b119e8feaa..ad0ac9e80a 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -25,14 +25,19 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader); WINE_DECLARE_DEBUG_CHANNEL(d3d_bytecode); #define WINED3D_SM4_INSTRUCTION_MODIFIER (0x1u << 31) +#define WINED3D_SM4_INSTRUCTION_MODIFIER_BIT 31 -#define WINED3D_SM4_MODIFIER_AOFFIMMI 0x1 -#define WINED3D_SM4_AOFFIMMI_U_SHIFT 9 -#define WINED3D_SM4_AOFFIMMI_U_MASK (0xfu << WINED3D_SM4_AOFFIMMI_U_SHIFT) -#define WINED3D_SM4_AOFFIMMI_V_SHIFT 13 -#define WINED3D_SM4_AOFFIMMI_V_MASK (0xfu << WINED3D_SM4_AOFFIMMI_V_SHIFT) -#define WINED3D_SM4_AOFFIMMI_W_SHIFT 17 -#define WINED3D_SM4_AOFFIMMI_W_MASK (0xfu << WINED3D_SM4_AOFFIMMI_W_SHIFT) +#define WINED3D_SM4_MODIFIER_FIELD_BIT_LOW 0 +#define WINED3D_SM4_MODIFIER_FIELD_BIT_HIGH 5 + +#define WINED3D_SM4_AOFFIMMI_U_BIT_LOW 9 +#define WINED3D_SM4_AOFFIMMI_U_BIT_HIGH 12 + +#define WINED3D_SM4_AOFFIMMI_V_BIT_LOW 13 +#define WINED3D_SM4_AOFFIMMI_V_BIT_HIGH 16 + +#define WINED3D_SM4_AOFFIMMI_W_BIT_LOW 17 +#define WINED3D_SM4_AOFFIMMI_W_BIT_HIGH 20 #define WINED3D_SM4_INSTRUCTION_LENGTH_SHIFT 24 #define WINED3D_SM4_INSTRUCTION_LENGTH_MASK (0x1fu << WINED3D_SM4_INSTRUCTION_LENGTH_SHIFT) @@ -304,6 +309,13 @@ enum wined3d_sm4_opcode WINED3D_SM5_OP_DCL_GS_INSTANCES = 0xce, }; +enum wined3d_sm4_ext_opcode { + WINED3D_SM4_EXT_OP_EMPTY = 0, + WINED3D_SM4_EXT_OP_SAMPLE_CONTROLS, + WINED3D_SM4_EXT_OP_RESOURCE_DIM, + WINED3D_SM4_EXT_OP_RESOURCE_RETURN_TYPE, +}; + enum wined3d_sm4_register_type { WINED3D_SM4_RT_TEMP = 0x00, @@ -1222,6 +1234,10 @@ static enum wined3d_data_type map_data_type(char t) } } +inline DWORD bit_extract32(DWORD value, DWORD fst, DWORD lst) { + return (value >> fst) & ~(~0 << (lst - fst + 1)); +} + enum wined3d_shader_type wined3d_get_sm4_shader_type(const DWORD *byte_code, size_t byte_code_size) { DWORD shader_type; @@ -1610,32 +1626,56 @@ static BOOL shader_sm4_read_dst_param(struct wined3d_sm4_data *priv, const DWORD static void shader_sm4_read_instruction_modifier(DWORD modifier, struct wined3d_shader_instruction *ins) { - static const DWORD recognized_bits = WINED3D_SM4_INSTRUCTION_MODIFIER - | WINED3D_SM4_MODIFIER_AOFFIMMI - | WINED3D_SM4_AOFFIMMI_U_MASK - | WINED3D_SM4_AOFFIMMI_V_MASK - | WINED3D_SM4_AOFFIMMI_W_MASK; - - if (modifier & ~recognized_bits) + if (bit_extract32(modifier, + WINED3D_SM4_INSTRUCTION_MODIFIER_BIT, + WINED3D_SM4_INSTRUCTION_MODIFIER_BIT)) { - FIXME("Unhandled modifier 0x%08x.\n", modifier); + const DWORD extOpcode = bit_extract32(modifier, + WINED3D_SM4_MODIFIER_FIELD_BIT_LOW, + WINED3D_SM4_MODIFIER_FIELD_BIT_HIGH); + + switch (extOpcode) + { + case WINED3D_SM4_EXT_OP_SAMPLE_CONTROLS: { + /* Bit fields are used for sign extension */ + struct + { + int u : 4; + int v : 4; + int w : 4; + } + aoffimmi; + + aoffimmi.u = bit_extract32(modifier, + WINED3D_SM4_AOFFIMMI_U_BIT_LOW, + WINED3D_SM4_AOFFIMMI_U_BIT_HIGH); + aoffimmi.v = bit_extract32(modifier, + WINED3D_SM4_AOFFIMMI_V_BIT_LOW, + WINED3D_SM4_AOFFIMMI_V_BIT_HIGH); + aoffimmi.w = bit_extract32(modifier, + WINED3D_SM4_AOFFIMMI_W_BIT_LOW, + WINED3D_SM4_AOFFIMMI_W_BIT_HIGH); + + ins->texel_offset.u = aoffimmi.u; + ins->texel_offset.v = aoffimmi.v; + ins->texel_offset.w = aoffimmi.w; + } + break; + + case WINED3D_SM4_EXT_OP_RESOURCE_DIM: + case WINED3D_SM4_EXT_OP_RESOURCE_RETURN_TYPE: + TRACE("Unhandled opcode extension 0x%08x -> %d\n", modifier, + extOpcode); + break; // part of resource description + + default: + FIXME("Unhandled opcode extension 0x%08x\n", modifier); + break; + } } else { - /* Bit fields are used for sign extension */ - struct - { - int u : 4; - int v : 4; - int w : 4; - } - aoffimmi; - aoffimmi.u = (modifier & WINED3D_SM4_AOFFIMMI_U_MASK) >> WINED3D_SM4_AOFFIMMI_U_SHIFT; - aoffimmi.v = (modifier & WINED3D_SM4_AOFFIMMI_V_MASK) >> WINED3D_SM4_AOFFIMMI_V_SHIFT; - aoffimmi.w = (modifier & WINED3D_SM4_AOFFIMMI_W_MASK) >> WINED3D_SM4_AOFFIMMI_W_SHIFT; - ins->texel_offset.u = aoffimmi.u; - ins->texel_offset.v = aoffimmi.v; - ins->texel_offset.w = aoffimmi.w; + FIXME("Unhandled modifier 0x%08x\n", modifier); } } -- 2.18.0

1 0

[PATCH v2 3/3] comdlg32/tests: Fix failures on newer Windows 10.
by Zhiyi Zhang 08 Sep '18

08 Sep '18

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comdlg32/tests/itemdlg.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/tests/itemdlg.c b/dlls/comdlg32/tests/itemdlg.c index 6b63063e29..c9ba23d045 100644 --- a/dlls/comdlg32/tests/itemdlg.c +++ b/dlls/comdlg32/tests/itemdlg.c @@ -1069,7 +1069,7 @@ static void test_advise_helper(IFileDialog *pfd) for(i = 0; i < 10; i++) { hr = IFileDialog_Advise(pfd, pfde, &cookie[i]); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(cookie[i] == i+1, "Got cookie: %d\n", cookie[i]); + ok(cookie[i] == i+cookie[0], "Got cookie: %d\n", cookie[i]); } ok(pfdeimpl->ref == 10+1, "got ref %d\n", pfdeimpl->ref); ensure_zero_events(pfdeimpl); @@ -1102,7 +1102,8 @@ static void test_advise_helper(IFileDialog *pfd) hr = IFileDialog_Advise(pfd, pfde, &cookie[0]); ok(hr == S_OK, "got 0x%08x\n", hr); - todo_wine ok(cookie[0] == 1, "got cookie: %d\n", cookie[0]); + /* cookie[0] is 4 on Windows 10 17134 */ + todo_wine ok(cookie[0] == 1 || cookie[0] == 4, "got cookie: %d\n", cookie[0]); ok(pfdeimpl->ref == 1+1, "got ref %d\n", pfdeimpl->ref); ensure_zero_events(pfdeimpl); -- 2.18.0

1 0

[PATCH v2 2/3] comdlg32: Check invalid options in IFileDialog::SetOptions.
by Zhiyi Zhang 08 Sep '18

08 Sep '18

Fix Steam chat unable to select files. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v2: Use bitmask of known values to check invalid options. dlls/comdlg32/itemdlg.c | 10 ++++++++++ dlls/comdlg32/tests/itemdlg.c | 19 +++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/dlls/comdlg32/itemdlg.c b/dlls/comdlg32/itemdlg.c index c8eff3438d..5f4c593ed7 100644 --- a/dlls/comdlg32/itemdlg.c +++ b/dlls/comdlg32/itemdlg.c @@ -2505,6 +2505,16 @@ static HRESULT WINAPI IFileDialog2_fnSetOptions(IFileDialog2 *iface, FILEOPENDIA FileDialogImpl *This = impl_from_IFileDialog2(iface); TRACE("%p (0x%x)\n", This, fos); + if (fos & ~(FOS_OVERWRITEPROMPT | FOS_STRICTFILETYPES | FOS_NOCHANGEDIR | FOS_PICKFOLDERS | FOS_FORCEFILESYSTEM + | FOS_ALLNONSTORAGEITEMS | FOS_NOVALIDATE | FOS_ALLOWMULTISELECT | FOS_PATHMUSTEXIST | FOS_FILEMUSTEXIST + | FOS_CREATEPROMPT | FOS_SHAREAWARE | FOS_NOREADONLYRETURN | FOS_NOTESTFILECREATE | FOS_HIDEMRUPLACES + | FOS_HIDEPINNEDPLACES | FOS_NODEREFERENCELINKS | FOS_DONTADDTORECENT | FOS_FORCESHOWHIDDEN + | FOS_DEFAULTNOMINIMODE | FOS_FORCEPREVIEWPANEON | FOS_SUPPORTSTREAMABLEITEMS)) + { + WARN("FILEOPENDIALOGOPTIONS 0x%08x contains unknown enums\n", fos); + return E_INVALIDARG; + } + if( !(This->options & FOS_PICKFOLDERS) && (fos & FOS_PICKFOLDERS) ) { WCHAR buf[30]; diff --git a/dlls/comdlg32/tests/itemdlg.c b/dlls/comdlg32/tests/itemdlg.c index d3be8c8d29..6b63063e29 100644 --- a/dlls/comdlg32/tests/itemdlg.c +++ b/dlls/comdlg32/tests/itemdlg.c @@ -536,6 +536,8 @@ static void test_basics(void) const WCHAR fname2[] = {'f','n','a','m','e','2', 0}; const WCHAR fspec2[] = {'*','.','e','x','e',0}; COMDLG_FILTERSPEC filterspec[2] = {{fname1, fspec1}, {fname2, fspec2}}; + const DWORD invalid_fos[] = {0x1, 0x10, 0x400, 0x80000, 0x400000, 0x800000, 0x1000000, 0x4000000, 0x8000000}; + INT i; /* This should work on every platform with IFileDialog */ SHGetDesktopFolder(&psfdesktop); @@ -586,6 +588,23 @@ static void test_basics(void) ok(fdoptions == (FOS_OVERWRITEPROMPT | FOS_NOREADONLYRETURN | FOS_PATHMUSTEXIST | FOS_NOCHANGEDIR), "Unexpected default options: 0x%08x\n", fdoptions); + /* Check SetOptions invalid options handling */ + for (i = 0; i < ARRAY_SIZE(invalid_fos); i++) + { + hr = IFileOpenDialog_SetOptions(pfod, invalid_fos[i]); + ok(hr == E_INVALIDARG, "got 0x%08x.\n", hr); + hr = IFileOpenDialog_GetOptions(pfod, &fdoptions); + ok(hr == S_OK, "got 0x%08x.\n", hr); + ok(fdoptions == (FOS_PATHMUSTEXIST | FOS_FILEMUSTEXIST | FOS_NOCHANGEDIR), "got %08x\n", fdoptions); + + hr = IFileSaveDialog_SetOptions(pfsd, invalid_fos[i]); + ok(hr == E_INVALIDARG, "got 0x%08x.\n", hr); + hr = IFileSaveDialog_GetOptions(pfsd, &fdoptions); + ok(hr == S_OK, "got 0x%08x.\n", hr); + ok(fdoptions == (FOS_OVERWRITEPROMPT | FOS_NOREADONLYRETURN | FOS_PATHMUSTEXIST | FOS_NOCHANGEDIR), + "got %08x\n", fdoptions); + } + /* GetResult */ hr = IFileOpenDialog_GetResult(pfod, NULL); ok(hr == E_INVALIDARG, "got 0x%08x.\n", hr); -- 2.18.0

1 0

[PATCH v2 1/3] comdlg32/tests: Fix crashes.
by Zhiyi Zhang 08 Sep '18

08 Sep '18

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comdlg32/tests/itemdlg.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/comdlg32/tests/itemdlg.c b/dlls/comdlg32/tests/itemdlg.c index d28e682b49..d3be8c8d29 100644 --- a/dlls/comdlg32/tests/itemdlg.c +++ b/dlls/comdlg32/tests/itemdlg.c @@ -1032,10 +1032,14 @@ static void test_advise_helper(IFileDialog *pfd) pfde = IFileDialogEvents_Constructor(); pfdeimpl = impl_from_IFileDialogEvents(pfde); - hr = IFileDialog_Advise(pfd, NULL, NULL); - ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); - hr = IFileDialog_Advise(pfd, pfde, NULL); - ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + /* Null pointer tests crashed on Windows 10 16299 or newer */ + if (0) + { + hr = IFileDialog_Advise(pfd, NULL, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + hr = IFileDialog_Advise(pfd, pfde, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + } hr = IFileDialog_Advise(pfd, NULL, &cookie[0]); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); ok(pfdeimpl->ref == 1, "got ref %d\n", pfdeimpl->ref); -- 2.18.0

1 0

[PATCH v5] kernel32: Correct ReplaceFileW behaviour
by Brock York 08 Sep '18

08 Sep '18

ReplaceFileW should fail with ERROR_ACCESS_DENIED when either the replaced or replacement file is set to read only using SetFileAttributes. Testing for the return values of ReplaceFileW was performed on a Windows XP SP3 and Windows 10 vm. Remove GENERIC_WRITE flag when opening replaced file. ReplaceFileW will fail when called to replace the current executable. This is not the same behaviour as tested on Windows 7, 10 and XP this is because the "replaced" file is opened with the GENERIC_WRITE flag. The MSDN also mentions that the replaced file is only opened with GENERIC_READ, DELETE and SYNCHRONIZE. This patch will fix the following bug once it is merged into Wine-Staging as the WarFrame launcher requires patches from Wine-Staging to work. Wine-Bug:https://bugs.winehq.org/show_bug.cgi?id=33845 Signed-off-by: Brock York <twunknown(a)gmail.com> --- dlls/kernel32/file.c | 29 ++++++++++++++++++++++++++++- dlls/kernel32/tests/file.c | 4 ++-- 2 files changed, 30 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index 081f0760a5..b31b054f35 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -1738,6 +1738,7 @@ BOOL WINAPI ReplaceFileW(LPCWSTR lpReplacedFileName, LPCWSTR lpReplacementFileNa NTSTATUS status; IO_STATUS_BLOCK io; OBJECT_ATTRIBUTES attr; + BY_HANDLE_FILE_INFORMATION file_info; TRACE("%s %s %s 0x%08x %p %p\n", debugstr_w(lpReplacedFileName), debugstr_w(lpReplacementFileName), debugstr_w(lpBackupFileName), @@ -1772,7 +1773,7 @@ BOOL WINAPI ReplaceFileW(LPCWSTR lpReplacedFileName, LPCWSTR lpReplacementFileNa } replaced_flags = lpBackupFileName ? FILE_OPEN : FILE_OPEN_IF; attr.ObjectName = &nt_replaced_name; - status = NtOpenFile(&hReplaced, GENERIC_READ|GENERIC_WRITE|DELETE|SYNCHRONIZE, + status = NtOpenFile(&hReplaced, GENERIC_READ|DELETE|SYNCHRONIZE, &attr, &io, FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, FILE_SYNCHRONOUS_IO_NONALERT|FILE_NON_DIRECTORY_FILE); @@ -1788,6 +1789,19 @@ BOOL WINAPI ReplaceFileW(LPCWSTR lpReplacedFileName, LPCWSTR lpReplacementFileNa goto fail; } + /* Replacement should fail if replaced is READ_ONLY */ + if (!GetFileInformationByHandle(hReplaced, &file_info)) + { + error = GetLastError(); + goto fail; + } + + if (file_info.dwFileAttributes & FILE_ATTRIBUTE_READONLY) + { + error = ERROR_ACCESS_DENIED; + goto fail; + } + /* * Open the replacement file for reading, writing, and deleting * (writing and deleting are needed when finished) @@ -1811,6 +1825,19 @@ BOOL WINAPI ReplaceFileW(LPCWSTR lpReplacedFileName, LPCWSTR lpReplacementFileNa goto fail; } + /* Replacement should fail if replacement is READ_ONLY */ + if (!GetFileInformationByHandle(hReplacement, &file_info)) + { + error = GetLastError(); + goto fail; + } + + if (file_info.dwFileAttributes & FILE_ATTRIBUTE_READONLY) + { + error = ERROR_ACCESS_DENIED; + goto fail; + } + /* If the user wants a backup then that needs to be performed first */ if (lpBackupFileName) { diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 33cae4b7c4..8e4a994142 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -3666,7 +3666,7 @@ static void test_ReplaceFileA(void) */ SetLastError(0xdeadbeef); ret = pReplaceFileA(replaced, replacement, backup, 0, 0, 0); - todo_wine ok(ret == 0 && GetLastError() == ERROR_ACCESS_DENIED, "ReplaceFileA: unexpected error %d\n", GetLastError()); + ok(ret == 0 && GetLastError() == ERROR_ACCESS_DENIED, "ReplaceFileA: unexpected error %d\n", GetLastError()); /* make sure that the replacement file still exists */ hReplacementFile = CreateFileA(replacement, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0); ok(hReplacementFile != INVALID_HANDLE_VALUE || @@ -3698,7 +3698,7 @@ static void test_ReplaceFileA(void) "unexpected error, replaced file should be able to be opened %d\n", GetLastError()); /*Calling ReplaceFileA on an exe should succeed*/ ret = pReplaceFileA(replaced, replacement, NULL, 0, 0, 0); - todo_wine ok(ret, "ReplaceFileA: unexpected error %d\n", GetLastError()); + ok(ret, "ReplaceFileA: unexpected error %d\n", GetLastError()); CloseHandle(hReplacedFile); /* replacement file still exists, make pass w/o "replaced" */ -- 2.18.0

2 2

[PATCH 2/3] comdlg32: Check invalid options in IFileDialog::SetOptions.
by Zhiyi Zhang 07 Sep '18

07 Sep '18

Fix Steam chat unable to select files. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comdlg32/itemdlg.c | 8 ++++++++ dlls/comdlg32/tests/itemdlg.c | 19 +++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/dlls/comdlg32/itemdlg.c b/dlls/comdlg32/itemdlg.c index c8eff3438d..c3454c92cd 100644 --- a/dlls/comdlg32/itemdlg.c +++ b/dlls/comdlg32/itemdlg.c @@ -2505,6 +2505,14 @@ static HRESULT WINAPI IFileDialog2_fnSetOptions(IFileDialog2 *iface, FILEOPENDIA FileDialogImpl *This = impl_from_IFileDialog2(iface); TRACE("%p (0x%x)\n", This, fos); + /* 0xDC80411 = Invalid FILEOPENDIALOGOPTIONS enums OR result = + * 0x1 | 0x10 | 0x400 | 0x80000 | 0x400000 | 0x800000 | 0x1000000 | 0x4000000 | 0x8000000 */ + if(fos & 0xDC80411) + { + FIXME("FILEOPENDIALOGOPTIONS 0x%08x contains unknown enums\n", fos); + return E_INVALIDARG; + } + if( !(This->options & FOS_PICKFOLDERS) && (fos & FOS_PICKFOLDERS) ) { WCHAR buf[30]; diff --git a/dlls/comdlg32/tests/itemdlg.c b/dlls/comdlg32/tests/itemdlg.c index d3be8c8d29..6b63063e29 100644 --- a/dlls/comdlg32/tests/itemdlg.c +++ b/dlls/comdlg32/tests/itemdlg.c @@ -536,6 +536,8 @@ static void test_basics(void) const WCHAR fname2[] = {'f','n','a','m','e','2', 0}; const WCHAR fspec2[] = {'*','.','e','x','e',0}; COMDLG_FILTERSPEC filterspec[2] = {{fname1, fspec1}, {fname2, fspec2}}; + const DWORD invalid_fos[] = {0x1, 0x10, 0x400, 0x80000, 0x400000, 0x800000, 0x1000000, 0x4000000, 0x8000000}; + INT i; /* This should work on every platform with IFileDialog */ SHGetDesktopFolder(&psfdesktop); @@ -586,6 +588,23 @@ static void test_basics(void) ok(fdoptions == (FOS_OVERWRITEPROMPT | FOS_NOREADONLYRETURN | FOS_PATHMUSTEXIST | FOS_NOCHANGEDIR), "Unexpected default options: 0x%08x\n", fdoptions); + /* Check SetOptions invalid options handling */ + for (i = 0; i < ARRAY_SIZE(invalid_fos); i++) + { + hr = IFileOpenDialog_SetOptions(pfod, invalid_fos[i]); + ok(hr == E_INVALIDARG, "got 0x%08x.\n", hr); + hr = IFileOpenDialog_GetOptions(pfod, &fdoptions); + ok(hr == S_OK, "got 0x%08x.\n", hr); + ok(fdoptions == (FOS_PATHMUSTEXIST | FOS_FILEMUSTEXIST | FOS_NOCHANGEDIR), "got %08x\n", fdoptions); + + hr = IFileSaveDialog_SetOptions(pfsd, invalid_fos[i]); + ok(hr == E_INVALIDARG, "got 0x%08x.\n", hr); + hr = IFileSaveDialog_GetOptions(pfsd, &fdoptions); + ok(hr == S_OK, "got 0x%08x.\n", hr); + ok(fdoptions == (FOS_OVERWRITEPROMPT | FOS_NOREADONLYRETURN | FOS_PATHMUSTEXIST | FOS_NOCHANGEDIR), + "got %08x\n", fdoptions); + } + /* GetResult */ hr = IFileOpenDialog_GetResult(pfod, NULL); ok(hr == E_INVALIDARG, "got 0x%08x.\n", hr); -- 2.18.0

2 1

[PATCH 8/8] wined3d: Add support for A8_UNORM render targets.
by Józef Kucia 07 Sep '18

07 Sep '18

Not supported in core contexts yet. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44655 Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/utils.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index d75cbc1a1645..6f13f91353a9 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1531,7 +1531,8 @@ static const struct wined3d_format_texture_info format_texture_info[] = ARB_TEXTURE_RG, NULL}, {WINED3DFMT_A8_UNORM, GL_ALPHA8, GL_ALPHA8, 0, GL_ALPHA, GL_UNSIGNED_BYTE, 0, - WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, + WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING + | WINED3DFMT_FLAG_RENDERTARGET, WINED3D_GL_LEGACY_CONTEXT, NULL}, {WINED3DFMT_B4G4R4X4_UNORM, GL_RGB4, GL_RGB4, 0, GL_BGRA, GL_UNSIGNED_SHORT_4_4_4_4_REV, 0, -- 2.16.4

2 1

[PATCH 7/8] wined3d: Try to avoid allocating sysmem for GPU buffers with initial data.
by Józef Kucia 07 Sep '18

07 Sep '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/buffer.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 639a145f881b..f381b2efb941 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1379,9 +1379,6 @@ static HRESULT buffer_init(struct wined3d_buffer *buffer, struct wined3d_device buffer->bind_flags = bind_flags; buffer->locations = data ? WINED3D_LOCATION_DISCARDED : WINED3D_LOCATION_SYSMEM; - if (!wined3d_resource_allocate_sysmem(&buffer->resource)) - return E_OUTOFMEMORY; - TRACE("buffer %p, size %#x, usage %#x, format %s, memory @ %p.\n", buffer, buffer->resource.size, buffer->resource.usage, debug_d3dformat(buffer->resource.format->id), buffer->resource.heap_memory); @@ -1394,6 +1391,7 @@ static HRESULT buffer_init(struct wined3d_buffer *buffer, struct wined3d_device * the buffer to provide the same behavior to the application. */ TRACE("Pinning system memory.\n"); buffer->flags |= WINED3D_BUFFER_PIN_SYSMEM; + buffer->locations = WINED3D_LOCATION_SYSMEM; } /* Observations show that draw_primitive_immediate_mode() is faster on @@ -1418,6 +1416,12 @@ static HRESULT buffer_init(struct wined3d_buffer *buffer, struct wined3d_device buffer->flags |= WINED3D_BUFFER_USE_BO; } + if (buffer->locations & WINED3D_LOCATION_SYSMEM || !(buffer->flags & WINED3D_BUFFER_USE_BO)) + { + if (!wined3d_resource_allocate_sysmem(&buffer->resource)) + return E_OUTOFMEMORY; + } + if (!(buffer->maps = heap_alloc(sizeof(*buffer->maps)))) { ERR("Out of memory.\n"); -- 2.16.4

2 1

[PATCH 6/8] d3d11/tests: Add test for staging buffers.
by Józef Kucia 07 Sep '18

07 Sep '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d11/tests/d3d11.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index e43b2f34f3b4..c470e24f646f 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -28102,6 +28102,72 @@ static void test_depth_clip(void) release_test_context(&test_context); } +static void test_staging_buffers(void) +{ + struct d3d11_test_context test_context; + ID3D11Buffer *dst_buffer, *src_buffer; + D3D11_SUBRESOURCE_DATA resource_data; + D3D11_BUFFER_DESC buffer_desc; + ID3D11DeviceContext *context; + struct resource_readback rb; + float data[16], value; + ID3D11Device *device; + unsigned int i; + HRESULT hr; + + if (!init_test_context(&test_context, NULL)) + return; + device = test_context.device; + context = test_context.immediate_context; + + buffer_desc.ByteWidth = sizeof(data); + buffer_desc.Usage = D3D11_USAGE_STAGING; + buffer_desc.BindFlags = 0; + buffer_desc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE; + buffer_desc.MiscFlags = 0; + buffer_desc.StructureByteStride = 0; + + for (i = 0; i < ARRAY_SIZE(data); ++i) + data[i] = i; + resource_data.pSysMem = data; + resource_data.SysMemPitch = 0; + resource_data.SysMemSlicePitch = 0; + + hr = ID3D11Device_CreateBuffer(device, &buffer_desc, &resource_data, &src_buffer); + ok(hr == S_OK, "Failed to create buffer, hr %#x.\n", hr); + + buffer_desc.Usage = D3D11_USAGE_DEFAULT; + buffer_desc.BindFlags = D3D11_BIND_CONSTANT_BUFFER; + buffer_desc.CPUAccessFlags = 0; + hr = ID3D11Device_CreateBuffer(device, &buffer_desc, NULL, &dst_buffer); + ok(hr == S_OK, "Failed to create buffer, hr %#x.\n", hr); + + ID3D11DeviceContext_CopyResource(context, (ID3D11Resource *)dst_buffer, (ID3D11Resource *)src_buffer); + get_buffer_readback(dst_buffer, &rb); + for (i = 0; i < ARRAY_SIZE(data); ++i) + { + value = get_readback_float(&rb, i, 0); + ok(value == data[i], "Got unexpected value %.8e at %u.\n", value, i); + } + release_resource_readback(&rb); + + for (i = 0; i < ARRAY_SIZE(data); ++i) + data[i] = 2 * i; + ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)src_buffer, 0, NULL, data, 0, 0); + ID3D11DeviceContext_CopyResource(context, (ID3D11Resource *)dst_buffer, (ID3D11Resource *)src_buffer); + get_buffer_readback(dst_buffer, &rb); + for (i = 0; i < ARRAY_SIZE(data); ++i) + { + value = get_readback_float(&rb, i, 0); + ok(value == i, "Got unexpected value %.8e at %u.\n", value, i); + } + release_resource_readback(&rb); + + ID3D11Buffer_Release(dst_buffer); + ID3D11Buffer_Release(src_buffer); + release_test_context(&test_context); +} + START_TEST(d3d11) { unsigned int argc, i; @@ -28249,6 +28315,7 @@ START_TEST(d3d11) queue_test(test_sample_shading); queue_test(test_sample_mask); queue_test(test_depth_clip); + queue_test(test_staging_buffers); run_queued_tests(); } -- 2.16.4

3 2

[PATCH 5/8] wined3d: Fix initial data for non-GPU buffers.
by Józef Kucia 07 Sep '18

07 Sep '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44655 Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/buffer.c | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index a824d940bf19..639a145f881b 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1230,6 +1230,28 @@ void wined3d_buffer_upload_data(struct wined3d_buffer *buffer, struct wined3d_co wined3d_buffer_upload_ranges(buffer, context, data, range.offset, 1, &range); } +static void wined3d_buffer_init_data(struct wined3d_buffer *buffer, + struct wined3d_device *device, const struct wined3d_sub_resource_data *data) +{ + struct wined3d_resource *resource = &buffer->resource; + struct wined3d_bo_address bo; + struct wined3d_box box; + + if (buffer->flags & WINED3D_BUFFER_USE_BO) + { + wined3d_box_set(&box, 0, 0, resource->size, 1, 0, 1); + wined3d_cs_emit_update_sub_resource(device->cs, resource, + 0, &box, data->data, data->row_pitch, data->slice_pitch); + } + else + { + wined3d_buffer_get_memory(buffer, &bo, WINED3D_LOCATION_SYSMEM); + memcpy(bo.addr, data->data, resource->size); + wined3d_buffer_validate_location(buffer, WINED3D_LOCATION_SYSMEM); + wined3d_buffer_invalidate_location(buffer, ~WINED3D_LOCATION_SYSMEM); + } +} + static ULONG buffer_resource_incref(struct wined3d_resource *resource) { return wined3d_buffer_incref(buffer_from_resource(resource)); @@ -1326,7 +1348,6 @@ static HRESULT buffer_init(struct wined3d_buffer *buffer, struct wined3d_device const struct wined3d_format *format = wined3d_get_format(device->adapter, format_id, usage); const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; struct wined3d_resource *resource = &buffer->resource; - struct wined3d_box box; BOOL dynamic_buffer_ok; HRESULT hr; @@ -1408,11 +1429,7 @@ static HRESULT buffer_init(struct wined3d_buffer *buffer, struct wined3d_device buffer->maps_size = 1; if (data) - { - wined3d_box_set(&box, 0, 0, resource->size, 1, 0, 1); - wined3d_cs_emit_update_sub_resource(device->cs, resource, - 0, &box, data->data, data->row_pitch, data->slice_pitch); - } + wined3d_buffer_init_data(buffer, device, data); return WINED3D_OK; } -- 2.16.4

2 1

[PATCH 1/8] dxgi: Fix dxgi_output_QueryInterface().
by Józef Kucia 07 Sep '18

07 Sep '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44655 Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/output.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/dlls/dxgi/output.c b/dlls/dxgi/output.c index 2b168fb627bb..868a36845863 100644 --- a/dlls/dxgi/output.c +++ b/dlls/dxgi/output.c @@ -41,20 +41,24 @@ static inline struct dxgi_output *impl_from_IDXGIOutput4(IDXGIOutput4 *iface) /* IUnknown methods */ -static HRESULT STDMETHODCALLTYPE dxgi_output_QueryInterface(IDXGIOutput4 *iface, REFIID riid, void **object) +static HRESULT STDMETHODCALLTYPE dxgi_output_QueryInterface(IDXGIOutput4 *iface, REFIID iid, void **object) { - TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); - - if (IsEqualGUID(riid, &IID_IDXGIOutput) - || IsEqualGUID(riid, &IID_IDXGIObject) - || IsEqualGUID(riid, &IID_IUnknown)) + TRACE("iface %p, iid %s, object %p.\n", iface, debugstr_guid(iid), object); + + if (IsEqualGUID(iid, &IID_IDXGIOutput4) + || IsEqualGUID(iid, &IID_IDXGIOutput3) + || IsEqualGUID(iid, &IID_IDXGIOutput2) + || IsEqualGUID(iid, &IID_IDXGIOutput1) + || IsEqualGUID(iid, &IID_IDXGIOutput) + || IsEqualGUID(iid, &IID_IDXGIObject) + || IsEqualGUID(iid, &IID_IUnknown)) { IUnknown_AddRef(iface); *object = iface; return S_OK; } - WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); *object = NULL; return E_NOINTERFACE; -- 2.16.4

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