wine-commits November 2019

wine-commits@winehq.org

1 participants
895 discussions

Francois Gouget : kernel32/tests: Windows 10 dropped support for GetConsoleFontInfo().
by Alexandre Julliard 08 Nov '19

08 Nov '19

Module: wine Branch: master Commit: 2f30f28b04b657e174985d6b34aa59a8f544333b URL: https://source.winehq.org/git/wine.git/?a=commit;h=2f30f28b04b657e174985d6b… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Nov 6 16:45:34 2019 +0100 kernel32/tests: Windows 10 dropped support for GetConsoleFontInfo(). Windows 10 1507 still supports it but not 1607+. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index f85cd44ca7..97bea44e19 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -2865,6 +2865,14 @@ static void test_GetConsoleFontInfo(HANDLE std_output) SetLastError(0xdeadbeef); ret = pGetConsoleFontInfo(NULL, FALSE, 0, cfi); ok(!ret, "got %d, expected zero\n", ret); + if (GetLastError() == LOWORD(E_NOTIMPL) /* win10 1709+ */ || + broken(GetLastError() == ERROR_GEN_FAILURE) /* win10 1607 */) + { + skip("GetConsoleFontInfo is not implemented\n"); + SetConsoleScreenBufferSize(std_output, orig_sb_size); + HeapFree(GetProcessHeap(), 0, cfi); + return; + } todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); SetLastError(0xdeadbeef); @@ -2887,14 +2895,11 @@ static void test_GetConsoleFontInfo(HANDLE std_output) memset(cfi, 0, memsize); ret = pGetConsoleFontInfo(std_output, FALSE, num_fonts, cfi); - todo_wine ok(ret || broken(!ret) /* win10 1809 */, "got %d, expected non-zero\n", ret); - if (ret) - { - todo_wine ok(cfi[index].dwFontSize.X == win_width, "got %d, expected %d\n", - cfi[index].dwFontSize.X, win_width); - todo_wine ok(cfi[index].dwFontSize.Y == win_height, "got %d, expected %d\n", - cfi[index].dwFontSize.Y, win_height); - } + todo_wine ok(ret, "got %d, expected non-zero\n", ret); + todo_wine ok(cfi[index].dwFontSize.X == win_width, "got %d, expected %d\n", + cfi[index].dwFontSize.X, win_width); + todo_wine ok(cfi[index].dwFontSize.Y == win_height, "got %d, expected %d\n", + cfi[index].dwFontSize.Y, win_height); for (i = 0; i < num_fonts; i++) { @@ -2923,14 +2928,11 @@ static void test_GetConsoleFontInfo(HANDLE std_output) memset(cfi, 0, memsize); ret = pGetConsoleFontInfo(std_output, TRUE, num_fonts, cfi); - todo_wine ok(ret || broken(!ret) /* win10 1809 */, "got %d, expected non-zero\n", ret); - if (ret) - { - todo_wine ok(cfi[index].dwFontSize.X == csbi.dwMaximumWindowSize.X, "got %d, expected %d\n", - cfi[index].dwFontSize.X, csbi.dwMaximumWindowSize.X); - todo_wine ok(cfi[index].dwFontSize.Y == csbi.dwMaximumWindowSize.Y, "got %d, expected %d\n", - cfi[index].dwFontSize.Y, csbi.dwMaximumWindowSize.Y); - } + todo_wine ok(ret, "got %d, expected non-zero\n", ret); + todo_wine ok(cfi[index].dwFontSize.X == csbi.dwMaximumWindowSize.X, "got %d, expected %d\n", + cfi[index].dwFontSize.X, csbi.dwMaximumWindowSize.X); + todo_wine ok(cfi[index].dwFontSize.Y == csbi.dwMaximumWindowSize.Y, "got %d, expected %d\n", + cfi[index].dwFontSize.Y, csbi.dwMaximumWindowSize.Y); for (i = 0; i < num_fonts; i++) {

1 0

Nikolay Sivov : ole32: Add separate enumerator implementation for IEnumSTATPROPSETSTG.
by Alexandre Julliard 08 Nov '19

08 Nov '19

Module: wine Branch: master Commit: 7279121f4fc919d3c5cc64e7c96da23a40c98514 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7279121f4fc919d3c5cc64e7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 8 16:33:52 2019 +0300 ole32: Add separate enumerator implementation for IEnumSTATPROPSETSTG. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/stg_prop.c | 329 +++++++++++++++++++++++++++----------------- dlls/ole32/tests/stg_prop.c | 115 ++++++++++++++++ 2 files changed, 317 insertions(+), 127 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7279121f4fc919d3c5cc…

1 0

Jacek Caban : jscript/tests: Use wchar string literals instead of a2bstr helper.
by Alexandre Julliard 08 Nov '19

08 Nov '19

Module: wine Branch: master Commit: f51a80f4ac299d87ee9c24f14dcd934c170fb1bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=f51a80f4ac299d87ee9c24f1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 8 17:02:55 2019 +0100 jscript/tests: Use wchar string literals instead of a2bstr helper. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/tests/jscript.c | 50 ++++++++++++++++++-------------------------- 1 file changed, 20 insertions(+), 30 deletions(-) diff --git a/dlls/jscript/tests/jscript.c b/dlls/jscript/tests/jscript.c index 57f06652f8..0904374062 100644 --- a/dlls/jscript/tests/jscript.c +++ b/dlls/jscript/tests/jscript.c @@ -95,18 +95,6 @@ DEFINE_EXPECT(OnLeaveScript); static const CLSID *engine_clsid = &CLSID_JScript; -static BSTR a2bstr(const char *str) -{ - BSTR ret; - int len; - - len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); - ret = SysAllocStringLen(NULL, len-1); - MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); - - return ret; -} - #define test_state(s,ss) _test_state(__LINE__,s,ss) static void _test_state(unsigned line, IActiveScript *script, SCRIPTSTATE exstate) { @@ -240,12 +228,12 @@ static void test_script_dispatch(IDispatchEx *dispex) VARIANT v; HRESULT hres; - str = a2bstr("ActiveXObject"); + str = SysAllocString(L"ActiveXObject"); hres = IDispatchEx_GetDispID(dispex, str, fdexNameCaseSensitive, &id); SysFreeString(str); ok(hres == S_OK, "GetDispID failed: %08x\n", hres); - str = a2bstr("Math"); + str = SysAllocString(L"Math"); hres = IDispatchEx_GetDispID(dispex, str, fdexNameCaseSensitive, &id); SysFreeString(str); ok(hres == S_OK, "GetDispID failed: %08x\n", hres); @@ -257,7 +245,7 @@ static void test_script_dispatch(IDispatchEx *dispex) ok(V_DISPATCH(&v) != NULL, "V_DISPATCH(v) = NULL\n"); VariantClear(&v); - str = a2bstr("String"); + str = SysAllocString(L"String"); hres = IDispatchEx_GetDispID(dispex, str, fdexNameCaseSensitive, &id); SysFreeString(str); ok(hres == S_OK, "GetDispID failed: %08x\n", hres); @@ -287,20 +275,22 @@ static IDispatchEx *get_script_dispatch(IActiveScript *script) } #define get_disp_id(a,b,c,d) _get_disp_id(__LINE__,a,b,c,d) -static void _get_disp_id(unsigned line, IDispatchEx *dispex, const char *name, HRESULT exhr, DISPID *id) +static void _get_disp_id(unsigned line, IDispatchEx *dispex, const WCHAR *name, HRESULT exhr, DISPID *id) { DISPID id2; HRESULT hr; BSTR str; - str = a2bstr(name); + str = SysAllocString(name); hr = IDispatchEx_GetDispID(dispex, str, 0, id); - ok_(__FILE__,line)(hr == exhr, "GetDispID(%s) returned %08x, expected %08x\n", name, hr, exhr); + ok_(__FILE__,line)(hr == exhr, "GetDispID(%s) returned %08x, expected %08x\n", + wine_dbgstr_w(name), hr, exhr); hr = IDispatchEx_GetIDsOfNames(dispex, &IID_NULL, &str, 1, 0, &id2); SysFreeString(str); - ok_(__FILE__,line)(hr == exhr, "GetIDsOfNames(%s) returned %08x, expected %08x\n", name, hr, exhr); - ok_(__FILE__,line)(*id == id2, "GetIDsOfNames(%s) id != id2\n", name); + ok_(__FILE__,line)(hr == exhr, "GetIDsOfNames(%s) returned %08x, expected %08x\n", + wine_dbgstr_w(name), hr, exhr); + ok_(__FILE__,line)(*id == id2, "GetIDsOfNames(%s) id != id2\n", wine_dbgstr_w(name)); } static void test_no_script_dispatch(IActiveScript *script) @@ -734,13 +724,13 @@ static void test_code_persistence(void) /* Pending code does not add identifiers to the global scope */ dispex = get_script_dispatch(script); id = 0; - get_disp_id(dispex, "x", DISP_E_UNKNOWNNAME, &id); + get_disp_id(dispex, L"x", DISP_E_UNKNOWNNAME, &id); ok(id == -1, "id = %d, expected -1\n", id); id = 0; - get_disp_id(dispex, "y", DISP_E_UNKNOWNNAME, &id); + get_disp_id(dispex, L"y", DISP_E_UNKNOWNNAME, &id); ok(id == -1, "id = %d, expected -1\n", id); id = 0; - get_disp_id(dispex, "z", DISP_E_UNKNOWNNAME, &id); + get_disp_id(dispex, L"z", DISP_E_UNKNOWNNAME, &id); ok(id == -1, "id = %d, expected -1\n", id); IDispatchEx_Release(dispex); @@ -773,13 +763,13 @@ static void test_code_persistence(void) dispex = get_script_dispatch(script); id = 0; - get_disp_id(dispex, "x", DISP_E_UNKNOWNNAME, &id); + get_disp_id(dispex, L"x", DISP_E_UNKNOWNNAME, &id); ok(id == -1, "id = %d, expected -1\n", id); id = 0; - get_disp_id(dispex, "y", S_OK, &id); + get_disp_id(dispex, L"y", S_OK, &id); ok(id != -1, "id = -1\n"); id = 0; - get_disp_id(dispex, "z", S_OK, &id); + get_disp_id(dispex, L"z", S_OK, &id); ok(id != -1, "id = -1\n"); IDispatchEx_Release(dispex); @@ -819,7 +809,7 @@ static void test_code_persistence(void) dispex = get_script_dispatch(script); id = 0; - get_disp_id(dispex, "z", DISP_E_UNKNOWNNAME, &id); + get_disp_id(dispex, L"z", DISP_E_UNKNOWNNAME, &id); ok(id == -1, "id = %d, expected -1\n", id); IDispatchEx_Release(dispex); @@ -835,7 +825,7 @@ static void test_code_persistence(void) dispex = get_script_dispatch(script); id = 0; - get_disp_id(dispex, "z", S_OK, &id); + get_disp_id(dispex, L"z", S_OK, &id); ok(id != -1, "id = -1\n"); IDispatchEx_Release(dispex); @@ -898,10 +888,10 @@ static void test_code_persistence(void) dispex = get_script_dispatch(script); id = 0; - get_disp_id(dispex, "y", DISP_E_UNKNOWNNAME, &id); + get_disp_id(dispex, L"y", DISP_E_UNKNOWNNAME, &id); ok(id == -1, "id = %d, expected -1\n", id); id = 0; - get_disp_id(dispex, "z", DISP_E_UNKNOWNNAME, &id); + get_disp_id(dispex, L"z", DISP_E_UNKNOWNNAME, &id); ok(id == -1, "id = %d, expected -1\n", id); IDispatchEx_Release(dispex);

1 0

Micah N Gorrell : ole32: Obtain stream size regardless of current position.
by Alexandre Julliard 08 Nov '19

08 Nov '19

Module: wine Branch: master Commit: e08eb410ee2f596b57bee64bfa1f55287092f630 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e08eb410ee2f596b57bee64b… Author: Micah N Gorrell <mgorrell(a)codeweavers.com> Date: Thu Nov 7 14:38:24 2019 -0700 ole32: Obtain stream size regardless of current position. Use STREAM_SEEK_END when attempting to determine the size of a stream that clipboard data has just been rendered into. This corrects an issue with Office 2016 where the current position of the stream is 0 while rendering a target of image/png. Signed-off-by: Micah N Gorrell <mgorrell(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/clipboard.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index 0c02d02a65..9df37750a3 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -788,7 +788,7 @@ static HRESULT get_data_from_stream(IDataObject *data, FORMATETC *fmt, HGLOBAL * if(FAILED(hr)) goto error; offs.QuadPart = 0; - IStream_Seek(med.u.pstm, offs, STREAM_SEEK_CUR, &pos); + IStream_Seek(med.u.pstm, offs, STREAM_SEEK_END, &pos); IStream_Seek(med.u.pstm, offs, STREAM_SEEK_SET, NULL); hr = IStream_CopyTo(med.u.pstm, stm, pos, NULL, NULL); ReleaseStgMedium(&med);

1 0

Zebediah Figura : setupapi: Set the DeviceDesc value in SetupDiInstallDevice().
by Alexandre Julliard 08 Nov '19

08 Nov '19

Module: wine Branch: master Commit: 404cee2aa6ed08ae8b9a205396bee1fc2e3fd6d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=404cee2aa6ed08ae8b9a2053… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Nov 7 23:37:54 2019 -0600 setupapi: Set the DeviceDesc value in SetupDiInstallDevice(). At least one PnP enumeration utility expects this. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 6de26b943f..61ddade405 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -4720,7 +4720,7 @@ BOOL WINAPI SetupDiInstallDevice(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data) static const WCHAR addserviceW[] = {'A','d','d','S','e','r','v','i','c','e',0}; static const WCHAR rootW[] = {'r','o','o','t','\\',0}; WCHAR section[LINE_LEN], section_ext[LINE_LEN], subsection[LINE_LEN], inf_path[MAX_PATH], *extptr, *filepart; - WCHAR svc_name[LINE_LEN]; + WCHAR svc_name[LINE_LEN], field[LINE_LEN]; UINT install_flags = SPINST_ALL; HKEY driver_key, device_key; SC_HANDLE manager, service; @@ -4747,6 +4747,10 @@ BOOL WINAPI SetupDiInstallDevice(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data) return FALSE; SetupFindFirstLineW(hinf, driver->mfg_key, driver->description, &ctx); + + SetupGetStringFieldW(&ctx, 0, field, ARRAY_SIZE(field), NULL); + RegSetValueExW(device->key, L"DeviceDesc", 0, REG_SZ, (BYTE *)field, wcslen(field) * sizeof(WCHAR)); + SetupGetStringFieldW(&ctx, 1, section, ARRAY_SIZE(section), NULL); SetupDiGetActualSectionToInstallW(hinf, section, section_ext, ARRAY_SIZE(section_ext), NULL, &extptr);

1 0

Zebediah Figura : setupapi: Set the device class in SetupDiBuildDriverInfoList().
by Alexandre Julliard 08 Nov '19

08 Nov '19

Module: wine Branch: master Commit: 7d152715ef69ba2dd9945466f04cc5e93c2e86b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d152715ef69ba2dd9945466… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Nov 7 23:37:53 2019 -0600 setupapi: Set the device class in SetupDiBuildDriverInfoList(). This matches Windows XP behaviour. In Vista and later this appears to be done by UpdateDriverForPlugAndPlayDevices(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index f0d75f90b8..6de26b943f 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -4545,6 +4545,20 @@ BOOL WINAPI SetupDiBuildDriverInfoList(HDEVINFO devinfo, SP_DEVINFO_DATA *device } } + if (device->driver_count) + { + WCHAR classname[MAX_CLASS_NAME_LEN], guidstr[39]; + GUID class; + + if (SetupDiGetINFClassW(device->drivers[0].inf_path, &class, classname, ARRAY_SIZE(classname), NULL)) + { + device_data->ClassGuid = device->class = class; + SETUPDI_GuidToString(&class, guidstr); + RegSetValueExW(device->key, L"ClassGUID", 0, REG_SZ, (BYTE *)guidstr, sizeof(guidstr)); + RegSetValueExW(device->key, L"Class", 0, REG_SZ, (BYTE *)classname, wcslen(classname) * sizeof(WCHAR)); + } + } + return TRUE; }

1 0

Zebediah Figura : setupapi: Fix setting filepart in SetupCopyOEMInfW().
by Alexandre Julliard 08 Nov '19

08 Nov '19

Module: wine Branch: master Commit: 161a0c259acc97064cdf9d71f86f982506b01538 URL: https://source.winehq.org/git/wine.git/?a=commit;h=161a0c259acc97064cdf9d71… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Nov 7 23:37:52 2019 -0600 setupapi: Fix setting filepart in SetupCopyOEMInfW(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/misc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/setupapi/misc.c b/dlls/setupapi/misc.c index 3fadb6827b..3b5d62b682 100644 --- a/dlls/setupapi/misc.c +++ b/dlls/setupapi/misc.c @@ -1073,6 +1073,7 @@ done: if (buffer_size >= size) { lstrcpyW( dest, target ); + if (filepart) *filepart = wcsrchr( dest, '\\' ) + 1; } else { @@ -1081,7 +1082,6 @@ done: } } - if (filepart) *filepart = wcsrchr( target, '\\' ) + 1; if (required_size) *required_size = size; if (ret) SetLastError(ERROR_SUCCESS);

1 0

Zebediah Figura : configure: Install winebus.inf.
by Alexandre Julliard 08 Nov '19

08 Nov '19

Module: wine Branch: master Commit: 86f51040e8912398547a9a8093941fc6fc385fc2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=86f51040e8912398547a9a80… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Nov 7 23:37:51 2019 -0600 configure: Install winebus.inf. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + 2 files changed, 2 insertions(+) diff --git a/configure b/configure index d69d1ac4a3..f1797bf603 100755 --- a/configure +++ b/configure @@ -21231,6 +21231,7 @@ else fonts \ loader/l_intl.nls \ loader/wine.inf \ +loader/winebus.inf \ loader/winehid.inf \ programs/msidb/msidb \ programs/msiexec/msiexec \ diff --git a/configure.ac b/configure.ac index c99db6984b..e5003f769c 100644 --- a/configure.ac +++ b/configure.ac @@ -4100,6 +4100,7 @@ else fonts \ loader/l_intl.nls \ loader/wine.inf \ +loader/winebus.inf \ loader/winehid.inf \ programs/msidb/msidb \ programs/msiexec/msiexec \

1 0

Nikolay Sivov : ole32: Reimplement CoGetCurrentProcess() to use global counter from rpcss.
by Alexandre Julliard 08 Nov '19

08 Nov '19

Module: wine Branch: master Commit: c79b9bb46fca1df2d10b58ce3ea032016c8a0d53 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c79b9bb46fca1df2d10b58ce… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 7 23:00:01 2019 +0300 ole32: Reimplement CoGetCurrentProcess() to use global counter from rpcss. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/Makefile.in | 1 + dlls/ole32/compobj.c | 18 +++++------ dlls/ole32/compobj_private.h | 5 ++- dlls/ole32/irpcss.idl | 21 +++++++++++++ dlls/ole32/moniker.c | 75 +++++++++++++++++++++++++++++++++++++------- dlls/ole32/tests/compobj.c | 27 ++++++++++++++++ 6 files changed, 125 insertions(+), 22 deletions(-) diff --git a/dlls/ole32/Makefile.in b/dlls/ole32/Makefile.in index 6c2f1231f1..32de987a8c 100644 --- a/dlls/ole32/Makefile.in +++ b/dlls/ole32/Makefile.in @@ -48,6 +48,7 @@ RC_SRCS = ole32res.rc IDL_SRCS = \ dcom.idl \ irot.idl \ + irpcss.idl \ ole32_objidl.idl \ ole32_oleidl.idl \ ole32_unknwn.idl diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 0dc0d39c22..a91067fcb7 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -4027,18 +4027,18 @@ done: /****************************************************************************** * CoGetCurrentProcess [OLE32.@] - * - * Gets the current process ID. - * - * RETURNS - * The current process ID. - * - * NOTES - * Is DWORD really the correct return type for this function? */ DWORD WINAPI CoGetCurrentProcess(void) { - return GetCurrentProcessId(); + struct oletls *info = COM_CurrentInfo(); + + if (!info) + return 0; + + if (!info->thread_seqid) + info->thread_seqid = rpcss_get_next_seqid(); + + return info->thread_seqid; } /*********************************************************************** diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index bda1c6bff2..29f94421d1 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -165,7 +165,7 @@ struct oletls { struct apartment *apt; IErrorInfo *errorinfo; /* see errorinfo.c */ - IUnknown *state; /* see CoSetState */ + DWORD thread_seqid;/* returned with CoGetCurrentProcess */ DWORD apt_mask; /* apartment mask (+0Ch on x86) */ void *unknown0; DWORD inits; /* number of times CoInitializeEx called */ @@ -178,6 +178,7 @@ struct oletls IUnknown *call_state; /* current call context (+3Ch on x86) */ DWORD unknown2[46]; IUnknown *cancel_object; /* cancel object set by CoSetCancelObject (+F8h on x86) */ + IUnknown *state; /* see CoSetState */ struct list spies; /* Spies installed with CoRegisterInitializeSpy */ DWORD spies_lock; }; @@ -355,4 +356,6 @@ static inline HRESULT copy_formatetc(FORMATETC *dst, const FORMATETC *src) extern HRESULT EnumSTATDATA_Construct(IUnknown *holder, ULONG index, DWORD array_len, STATDATA *data, BOOL copy, IEnumSTATDATA **ppenum) DECLSPEC_HIDDEN; +extern DWORD rpcss_get_next_seqid(void) DECLSPEC_HIDDEN; + #endif /* __WINE_OLE_COMPOBJ_H */ diff --git a/dlls/ole32/irpcss.idl b/dlls/ole32/irpcss.idl new file mode 100644 index 0000000000..65078167de --- /dev/null +++ b/dlls/ole32/irpcss.idl @@ -0,0 +1,21 @@ +/* + * Copyright 2019 Nikolay Sivov 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 + */ + +#pragma makedep client + +#include "wine/irpcss.idl" diff --git a/dlls/ole32/moniker.c b/dlls/ole32/moniker.c index 82d829d719..f82159d9e1 100644 --- a/dlls/ole32/moniker.c +++ b/dlls/ole32/moniker.c @@ -41,6 +41,7 @@ #include "compobj_private.h" #include "moniker.h" #include "irot.h" +#include "irpcss.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); @@ -77,6 +78,7 @@ typedef struct RunningObjectTableImpl static RunningObjectTableImpl* runningObjectTableInstance = NULL; static IrotHandle irot_handle; +static RPC_BINDING_HANDLE irpcss_handle; /* define the EnumMonikerImpl structure */ typedef struct EnumMonikerImpl @@ -102,23 +104,30 @@ static inline EnumMonikerImpl *impl_from_IEnumMoniker(IEnumMoniker *iface) static HRESULT EnumMonikerImpl_CreateEnumROTMoniker(InterfaceList *moniker_list, ULONG pos, IEnumMoniker **ppenumMoniker); +static RPC_BINDING_HANDLE get_rpc_handle(unsigned short *protseq, unsigned short *endpoint) +{ + RPC_BINDING_HANDLE handle = NULL; + RPC_STATUS status; + RPC_WSTR binding; + + status = RpcStringBindingComposeW(NULL, protseq, NULL, endpoint, NULL, &binding); + if (status == RPC_S_OK) + { + status = RpcBindingFromStringBindingW(binding, &handle); + RpcStringFreeW(&binding); + } + + return handle; +} + static IrotHandle get_irot_handle(void) { if (!irot_handle) { - RPC_STATUS status; - RPC_WSTR binding; - IrotHandle new_handle; - unsigned short ncacn_np[] = IROT_PROTSEQ; + unsigned short protseq[] = IROT_PROTSEQ; unsigned short endpoint[] = IROT_ENDPOINT; - status = RpcStringBindingComposeW(NULL, ncacn_np, NULL, endpoint, NULL, &binding); - if (status == RPC_S_OK) - { - status = RpcBindingFromStringBindingW(binding, &new_handle); - RpcStringFreeW(&binding); - } - if (status != RPC_S_OK) - return NULL; + + IrotHandle new_handle = get_rpc_handle(protseq, endpoint); if (InterlockedCompareExchangePointer(&irot_handle, new_handle, NULL)) /* another thread beat us to it */ RpcBindingFree(&new_handle); @@ -126,6 +135,21 @@ static IrotHandle get_irot_handle(void) return irot_handle; } +static RPC_BINDING_HANDLE get_irpcss_handle(void) +{ + if (!irpcss_handle) + { + unsigned short protseq[] = IROT_PROTSEQ; + unsigned short endpoint[] = IROT_ENDPOINT; + + RPC_BINDING_HANDLE new_handle = get_rpc_handle(protseq, endpoint); + if (InterlockedCompareExchangePointer(&irpcss_handle, new_handle, NULL)) + /* another thread beat us to it */ + RpcBindingFree(&new_handle); + } + return irpcss_handle; +} + static BOOL start_rpcss(void) { static const WCHAR rpcssW[] = {'R','p','c','S','s',0}; @@ -176,6 +200,33 @@ static BOOL start_rpcss(void) return ret; } +DWORD rpcss_get_next_seqid(void) +{ + DWORD id = 0; + HRESULT hr; + + for (;;) + { + __TRY + { + hr = irpcss_get_thread_seq_id(get_irpcss_handle(), &id); + } + __EXCEPT(rpc_filter) + { + hr = HRESULT_FROM_WIN32(GetExceptionCode()); + } + __ENDTRY + if (hr == HRESULT_FROM_WIN32(RPC_S_SERVER_UNAVAILABLE)) + { + if (start_rpcss()) + continue; + } + break; + } + + return id; +} + static HRESULT create_stream_on_mip_ro(const InterfaceData *mip, IStream **stream) { HGLOBAL hglobal = GlobalAlloc(0, mip->ulCntData); diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 8412ee45a0..6b15040ebe 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -3893,6 +3893,31 @@ static void test_implicit_mta(void) CoUninitialize(); } +static DWORD WINAPI co_get_current_process_thread(void *param) +{ + DWORD *id = param; + + *id = CoGetCurrentProcess(); + return 0; +} + +static void test_CoGetCurrentProcess(void) +{ + DWORD id, id2; + HANDLE thread; + + id = CoGetCurrentProcess(); + ok(!!id && id != GetCurrentProcessId() && id != GetCurrentThreadId(), "Unexpected result %d.\n", id); + + id2 = 0; + thread = CreateThread(NULL, 0, co_get_current_process_thread, &id2, 0, NULL); + ok(thread != NULL, "Failed to create test thread.\n"); + ok(!WaitForSingleObject(thread, 10000), "Wait timed out.\n"); + CloseHandle(thread); + + ok(id2 && id2 != id, "Unexpected id from another thread.\n"); +} + START_TEST(compobj) { init_funcs(); @@ -3949,5 +3974,7 @@ START_TEST(compobj) test_CoGetInstanceFromFile(); test_GlobalOptions(); test_implicit_mta(); + test_CoGetCurrentProcess(); + DeleteFileA( testlib ); }

1 0

Nikolay Sivov : rpcss: Make initialization helper easier to extend.
by Alexandre Julliard 08 Nov '19

08 Nov '19

Module: wine Branch: master Commit: 52218251368ae7b9c9abfa309be7c1cc5d8e2e5d URL: https://source.winehq.org/git/wine.git/?a=commit;h=52218251368ae7b9c9abfa30… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 7 22:59:59 2019 +0300 rpcss: Make initialization helper easier to extend. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/rpcss/rpcss_main.c | 102 +++++++++++++++++++++++++------------------- 1 file changed, 57 insertions(+), 45 deletions(-) diff --git a/programs/rpcss/rpcss_main.c b/programs/rpcss/rpcss_main.c index 6d24ccbc07..42749028c3 100644 --- a/programs/rpcss/rpcss_main.c +++ b/programs/rpcss/rpcss_main.c @@ -37,53 +37,60 @@ static WCHAR rpcssW[] = {'R','p','c','S','s',0}; static HANDLE exit_event; static SERVICE_STATUS_HANDLE service_handle; -static BOOL RPCSS_Initialize(void) +static RPC_STATUS RPCSS_Initialize(void) { - static unsigned short irot_protseq[] = IROT_PROTSEQ; - static unsigned short irot_endpoint[] = IROT_ENDPOINT; - static unsigned short epm_protseq[] = {'n','c','a','c','n','_','n','p',0}; - static unsigned short epm_endpoint[] = {'\\','p','i','p','e','\\','e','p','m','a','p','p','e','r',0}; - static unsigned short epm_protseq_lrpc[] = {'n','c','a','l','r','p','c',0}; - static unsigned short epm_endpoint_lrpc[] = {'e','p','m','a','p','p','e','r',0}; - RPC_STATUS status; - - WINE_TRACE("\n"); - - status = RpcServerRegisterIf(epm_v3_0_s_ifspec, NULL, NULL); - if (status != RPC_S_OK) - return status; - status = RpcServerRegisterIf(Irot_v0_2_s_ifspec, NULL, NULL); - if (status != RPC_S_OK) - { - RpcServerUnregisterIf(epm_v3_0_s_ifspec, NULL, FALSE); - return FALSE; - } - - status = RpcServerUseProtseqEpW(epm_protseq, RPC_C_PROTSEQ_MAX_REQS_DEFAULT, - epm_endpoint, NULL); - if (status != RPC_S_OK) - goto fail; - - status = RpcServerUseProtseqEpW(epm_protseq_lrpc, RPC_C_PROTSEQ_MAX_REQS_DEFAULT, - epm_endpoint_lrpc, NULL); - if (status != RPC_S_OK) - goto fail; - - status = RpcServerUseProtseqEpW(irot_protseq, RPC_C_PROTSEQ_MAX_REQS_DEFAULT, - irot_endpoint, NULL); - if (status != RPC_S_OK) - goto fail; - - status = RpcServerListen(1, RPC_C_LISTEN_MAX_CALLS_DEFAULT, TRUE); - if (status != RPC_S_OK) - goto fail; - - return TRUE; + static unsigned short irot_protseq[] = IROT_PROTSEQ; + static unsigned short irot_endpoint[] = IROT_ENDPOINT; + static unsigned short epm_protseq[] = {'n','c','a','c','n','_','n','p',0}; + static unsigned short epm_endpoint[] = {'\\','p','i','p','e','\\','e','p','m','a','p','p','e','r',0}; + static unsigned short epm_protseq_lrpc[] = {'n','c','a','l','r','p','c',0}; + static unsigned short epm_endpoint_lrpc[] = {'e','p','m','a','p','p','e','r',0}; + static const struct protseq_map + { + unsigned short *protseq; + unsigned short *endpoint; + } protseqs[] = + { + { epm_protseq, epm_endpoint }, + { epm_protseq_lrpc, epm_endpoint_lrpc }, + { irot_protseq, irot_endpoint }, + }; + RPC_IF_HANDLE ifspecs[] = + { + epm_v3_0_s_ifspec, + Irot_v0_2_s_ifspec, + }; + RPC_STATUS status; + int i, j; + + WINE_TRACE("\n"); + + for (i = 0, j = 0; i < ARRAY_SIZE(ifspecs); ++i, j = i) + { + status = RpcServerRegisterIf(ifspecs[i], NULL, NULL); + if (status != RPC_S_OK) + goto fail; + } + + for (i = 0; i < ARRAY_SIZE(protseqs); ++i) + { + status = RpcServerUseProtseqEpW(protseqs[i].protseq, RPC_C_PROTSEQ_MAX_REQS_DEFAULT, + protseqs[i].endpoint, NULL); + if (status != RPC_S_OK) + goto fail; + } + + status = RpcServerListen(1, RPC_C_LISTEN_MAX_CALLS_DEFAULT, TRUE); + if (status != RPC_S_OK) + goto fail; + + return RPC_S_OK; fail: - RpcServerUnregisterIf(epm_v3_0_s_ifspec, NULL, FALSE); - RpcServerUnregisterIf(Irot_v0_2_s_ifspec, NULL, FALSE); - return FALSE; + for (i = 0; i < j; ++i) + RpcServerUnregisterIf(ifspecs[i], NULL, FALSE); + + return status; } static DWORD WINAPI service_handler( DWORD ctrl, DWORD event_type, LPVOID event_data, LPVOID context ) @@ -121,10 +128,15 @@ static DWORD WINAPI service_handler( DWORD ctrl, DWORD event_type, LPVOID event_ static void WINAPI ServiceMain( DWORD argc, LPWSTR *argv ) { SERVICE_STATUS status; + RPC_STATUS ret; TRACE( "starting service\n" ); - if (!RPCSS_Initialize()) return; + if ((ret = RPCSS_Initialize())) + { + WARN("Failed to initialize rpc interfaces, status %d.\n", ret); + return; + } exit_event = CreateEventW( NULL, TRUE, FALSE, NULL );

1 0

← Newer
1
...
67
68
69
70
71
72
73
...
90
Older →

Jump to page:

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-commits November 2019