August 2020 - Wine-devel - list.winehq.org

[PATCH v2 2/6] ole32: Move more built-in classes to CoGetClassObject().
by Huw Davies 13 Aug '20

13 Aug '20

From: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/ole32/compobj.c | 26 +++++--------------------- dlls/ole32/compobj_private.h | 1 + dlls/ole32/ole32.spec | 1 + dlls/ole32/oleproxy.c | 17 +++++++++++++++++ dlls/ole32/tests/marshal.c | 8 ++++++++ 5 files changed, 32 insertions(+), 21 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 8e78519dc80..f84c12243f7 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -2755,13 +2755,14 @@ HRESULT WINAPI DECLSPEC_HOTPATCH CoGetClassObject( if (CLSCTX_INPROC_SERVER & dwClsContext) { - if (IsEqualCLSID(rclsid, &CLSID_InProcFreeMarshaler)) + if (IsEqualCLSID(rclsid, &CLSID_InProcFreeMarshaler) || + IsEqualCLSID(rclsid, &CLSID_GlobalOptions) || + IsEqualCLSID(rclsid, &CLSID_ManualResetEvent) || + IsEqualCLSID(rclsid, &CLSID_StdGlobalInterfaceTable)) { apartment_release(apt); - return FTMarshalCF_Create(iid, ppv); + return Ole32DllGetClassObject(rclsid, iid, ppv); } - if (IsEqualCLSID(rclsid, &CLSID_GlobalOptions)) - return IClassFactory_QueryInterface(&GlobalOptionsCF, iid, ppv); } if (CLSCTX_INPROC & dwClsContext) @@ -2993,23 +2994,6 @@ HRESULT WINAPI DECLSPEC_HOTPATCH CoCreateInstanceEx( } apartment_release(apt); - /* - * The Standard Global Interface Table (GIT) object is a process-wide singleton. - */ - if (IsEqualIID(&clsid, &CLSID_StdGlobalInterfaceTable)) - { - IGlobalInterfaceTable *git = get_std_git(); - TRACE("Retrieving GIT\n"); - return return_multi_qi((IUnknown*)git, cmq, pResults, FALSE); - } - - if (IsEqualCLSID(&clsid, &CLSID_ManualResetEvent)) { - hres = ManualResetEvent_CreateInstance(&ManualResetEventCF, pUnkOuter, pResults[0].pIID, (void**)&unk); - if (FAILED(hres)) - return hres; - return return_multi_qi(unk, cmq, pResults, TRUE); - } - /* * Get a class factory to construct the object we want. */ diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index 974c230ddce..1b7aa5640ce 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -325,6 +325,7 @@ extern IClassFactory GlobalInterfaceTableCF DECLSPEC_HIDDEN; extern HRESULT WINAPI ManualResetEvent_CreateInstance(IClassFactory *iface, IUnknown *outer, REFIID riid, void **obj) DECLSPEC_HIDDEN; extern IClassFactory ManualResetEventCF DECLSPEC_HIDDEN; +extern HRESULT WINAPI Ole32DllGetClassObject(REFCLSID clsid, REFIID riid, void **obj) DECLSPEC_HIDDEN; /* Exported non-interface Data Advise Holder functions */ HRESULT DataAdviseHolder_OnConnect(IDataAdviseHolder *iface, IDataObject *pDelegate) DECLSPEC_HIDDEN; diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index c83f0b27166..a8101df80bc 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -182,6 +182,7 @@ @ stdcall MkParseDisplayName(ptr wstr ptr ptr) @ stdcall MonikerCommonPrefixWith(ptr ptr ptr) @ stub MonikerRelativePathTo +@ stdcall Ole32DllGetClassObject(ptr ptr ptr) @ stdcall OleBuildVersion() @ stdcall OleConvertIStorageToOLESTREAM(ptr ptr) @ stub OleConvertIStorageToOLESTREAMEx diff --git a/dlls/ole32/oleproxy.c b/dlls/ole32/oleproxy.c index 29cd391e127..0429e0f5495 100644 --- a/dlls/ole32/oleproxy.c +++ b/dlls/ole32/oleproxy.c @@ -220,3 +220,20 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid,LPVOID *ppv) return Handler_DllGetClassObject(rclsid, iid, ppv); } + +/*********************************************************************** + * Ole32DllGetClassObject [OLE32.@] + */ +HRESULT WINAPI Ole32DllGetClassObject(REFCLSID rclsid, REFIID riid, void **obj) +{ + if (IsEqualCLSID(rclsid, &CLSID_StdGlobalInterfaceTable)) + return IClassFactory_QueryInterface(&GlobalInterfaceTableCF, riid, obj); + else if (IsEqualCLSID(rclsid, &CLSID_ManualResetEvent)) + return IClassFactory_QueryInterface(&ManualResetEventCF, riid, obj); + else if (IsEqualCLSID(rclsid, &CLSID_GlobalOptions)) + return IClassFactory_QueryInterface(&GlobalOptionsCF, riid, obj); + else if (IsEqualCLSID(rclsid, &CLSID_InProcFreeMarshaler)) + return FTMarshalCF_Create(riid, obj); + else + return CLASS_E_CLASSNOTAVAILABLE; +} diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index ef608e66d01..a6811b9d241 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -4000,6 +4000,10 @@ static void test_globalinterfacetable(void) ok_no_locks(); IGlobalInterfaceTable_Release(git); + + hr = CoGetClassObject(&CLSID_StdGlobalInterfaceTable, CLSCTX_INPROC_SERVER, NULL, &IID_IClassFactory, (void **)&cf); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IClassFactory_Release(cf); } static void test_manualresetevent(void) @@ -4016,6 +4020,10 @@ static void test_manualresetevent(void) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); IClassFactory_Release(factory); + hr = CoGetClassObject(&CLSID_ManualResetEvent, CLSCTX_INPROC_SERVER, NULL, &IID_IClassFactory, (void **)&factory); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IClassFactory_Release(factory); + hr = CoCreateInstance(&CLSID_ManualResetEvent, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)&punk); ok(hr == S_OK, "Got 0x%08x\n", hr); ok(!!punk, "Got NULL.\n"); -- 2.23.0

1 0

[PATCH] include/xaudio2.idl: use cpp_quote for xaudio2 error codes
by Biswapriyo Nath 13 Aug '20

13 Aug '20

1 0

[PATCH] d3dx10: Introduce get_d3dx10_dds_format().
by Ziqing Hui 13 Aug '20

13 Aug '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/d3dx10_43/d3dx10_43_main.c | 21 ++++++++++++++++++++- dlls/d3dx10_43/tests/d3dx10.c | 2 -- 2 files changed, 20 insertions(+), 3 deletions(-)

2 2

[PATCH v2 5/5] kernel32/tests: Add console title tests.
by Jacek Caban 12 Aug '20

12 Aug '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/tests/console.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+)

2 1

[PATCH v2 4/5] kernel32/tests: Add an option to test current console.
by Jacek Caban 12 Aug '20

12 Aug '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/tests/console.c | 136 ++++++++++++++++++---------------- 1 file changed, 71 insertions(+), 65 deletions(-)

2 1

[PATCH v2 3/5] kernel32/tests: Disable ENABLE_VIRTUAL_TERMINAL_PROCESSING mode in testWriteNotWrappedProcessed.
by Jacek Caban 12 Aug '20

12 Aug '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- With VT processing \t causes cursor move without filling skipped characters. It's usually not a problem because VT processing is disabled by default, but it's not necessarily true if we inherit the console (like in the next patch). dlls/kernel32/tests/console.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)

2 1

[PATCH vkd3d] vkd3d-compiler: Write to stdout if the output file is -.
by Zebediah Figura 12 Aug '20

12 Aug '20

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- I've found this feature to be occasionally useful. programs/vkd3d-compiler/main.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index 68bc030b..a1adb616 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -119,7 +119,11 @@ static bool write_shader(const struct vkd3d_shader_code *shader, const char *fil { FILE *fd; - if (!(fd = fopen(filename, "wb"))) + if (!strcmp(filename, "-")) + { + fd = stdout; + } + else if (!(fd = fopen(filename, "wb"))) { fprintf(stderr, "Cannot open file for writing: '%s'.\n", filename); return false; @@ -128,7 +132,8 @@ static bool write_shader(const struct vkd3d_shader_code *shader, const char *fil if (fwrite(shader->code, 1, shader->size, fd) != shader->size) fprintf(stderr, "Could not write shader bytecode to file: '%s'.\n", filename); - fclose(fd); + if (fd != stdout) + fclose(fd); return true; } @@ -143,7 +148,8 @@ static void print_usage(const char *program_name) " --buffer-uav=<type> Specify the buffer type to use for buffer UAV bindings.\n" " Valid values are 'buffer-texture' (default) and\n" " 'storage-buffer'.\n" - " -o, --output=<file> Write the output to <file>.\n" + " -o, --output=<file> Write the output to <file>. If <file> is -, write to\n" + " standard output.\n" " --print-source-types Display the supported source types and exit.\n" " --print-target-types Display the supported target types for the specified\n" " source type and exit.\n" -- 2.27.0

3 2

[PATCH v2 2/5] kernel32/tests: Fix ReadConsoleOutputW tests on Windows 8.
by Jacek Caban 12 Aug '20

12 Aug '20

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

2 1

[PATCH v2 1/5] include: Add missing console mode defines.
by Jacek Caban 12 Aug '20

12 Aug '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- v2: Fixed tests on win2008 and additional fixes for win8 include/consoleapi.h | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-)

1 0

[PATCH vkd3d] vkd3d-shader: Remove the unused "ctx" field from struct vkd3d_shader_instruction.
by Zebediah Figura 12 Aug '20

12 Aug '20

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d-shader/vkd3d_shader_private.h | 1 - 1 file changed, 1 deletion(-) diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 88aab0f..ba2f2d1 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -780,7 +780,6 @@ struct vkd3d_shader_primitive_type struct vkd3d_shader_instruction { - const struct vkd3d_shader_context *ctx; enum VKD3D_SHADER_INSTRUCTION_HANDLER handler_idx; DWORD flags; unsigned int dst_count; -- 2.27.0

2 1