October 2019 - Wine-devel - list.winehq.org

[PATCH] ntdll: Use SIZE_T to store passed buffer size in sprintf.
by Piotr Caban 30 Oct '19

30 Oct '19

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/ntdll/printf.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)

1 0

[PATCH v3 4/7] ddraw/tests: Port life time tests in Enumdevices to ddraw*.c files
by David Adam 30 Oct '19

30 Oct '19

2 1

[PATCH] ntdll: Add a shortcut to NtReadVirtualMemory for the local process
by Martin Storsjo 30 Oct '19

30 Oct '19

EnumProcessModules uses ReadProcessMemory (which forwards to NtReadVirtualMemory) for reading the tables of a process, even for the current process. When running wine within docker, NtReadVirtualMemory currently fails unless the SYS_PTRACE capability is explicitly added. LLVM's libunwind uses EnumProcessModules for locating .eh_frame sections in all loaded modules when unwinding dwarf exceptions (used on i686). As it is used for locating sections within the current process, libunwind only calls EnumProcessModules for the current process. Therefore, exception handling in executables with libunwind on i686 doesn't work when run with wine within docker. Even for setups where NtReadVirtualMemory is allowed, it is significantly slower than just reading the memory directly within the process. Currently, handling 10000 thrown exceptions with libunwind on i686 takes 24 seconds when run in wine, while it runs in around 1.4 seconds with this patch. Signed-off-by: Martin Storsjo <martin(a)martin.st> --- dlls/ntdll/virtual.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index d15b49f6fd..566b5982a7 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -3521,6 +3521,26 @@ NTSTATUS WINAPI NtReadVirtualMemory( HANDLE process, const void *addr, void *buf if (virtual_check_buffer_for_write( buffer, size )) { + if (process == GetCurrentProcess()) + { + sigset_t sigset; + + server_enter_uninterrupted_section( &csVirtual, &sigset ); + if (virtual_check_buffer_for_read( addr, size )) + { + memcpy(buffer, addr, size); + status = STATUS_SUCCESS; + } + else + { + size = 0; + status = STATUS_ACCESS_VIOLATION; + } + server_leave_uninterrupted_section( &csVirtual, &sigset ); + if (bytes_read) *bytes_read = size; + return status; + } + SERVER_START_REQ( read_process_memory ) { req->handle = wine_server_obj_handle( process ); -- 2.17.1

4 5

[PATCH] msvcrt: Set errno in _lseeki64.
by Daniel Lehman 30 Oct '19

30 Oct '19

3 2

[PATCH] ucrtbase: Implement %g format for strftime.
by Vijay Kiran Kamuju 30 Oct '19

30 Oct '19

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/msvcrt/time.c | 11 +++++++++-- dlls/ucrtbase/tests/misc.c | 15 +++++++++++++++ 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index 8f4d64b3618c..9787d18e3f4e 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -1196,14 +1196,21 @@ static MSVCRT_size_t strftime_helper(char *str, MSVCRT_size_t max, const char *f if(!strftime_int(str, &ret, max, mstm->tm_mday, alternate ? 0 : 2, 0, 31)) return 0; break; + case 'g': case 'G': tmp = 1900 + mstm->tm_year; if (mstm->tm_yday - (mstm->tm_wday ? mstm->tm_wday : 7) + 4 < 0) tmp--; else if(mstm->tm_yday - (mstm->tm_wday ? mstm->tm_wday : 7) + 5 > 365 + IsLeapYear(tmp)) tmp++; - if (!strftime_int(str, &ret, max, tmp, 4, 0, 9999)) - return 0; + if(*format == 'G') + { + if (!strftime_int(str, &ret, max, tmp, 4, 0, 9999)) + return 0; + } else { + if (!strftime_int(str, &ret, max, tmp%100, 2, 0, 99)) + return 0; + } break; #endif case 'H': diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index 9cfe532560d8..8a6fb7b8e11b 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -968,6 +968,14 @@ static void test_strftime(void) ok(retA == 1, "expected 1, got %d\n", (int)retA); ok(!strcmp(bufA, "\t"), "got %s\n", bufA); + retA = p_strftime(bufA, sizeof(bufA), "%g", &epoch); + ok(retA == 2, "expected 2, got %d\n", (int)retA); + ok(!strcmp(bufA, "70"), "got %s\n", bufA); + + retA = p_strftime(bufA, sizeof(bufA), "%g", &tm1); + ok(retA == 2, "expected 2, got %d\n", (int)retA); + ok(!strcmp(bufA, "16"), "got %s\n", bufA); + retA = p_strftime(bufA, sizeof(bufA), "%G", &epoch); ok(retA == 4, "expected 4, got %d\n", (int)retA); ok(!strcmp(bufA, "1970"), "got %s\n", bufA); @@ -981,6 +989,13 @@ static void test_strftime(void) __time32_t t = (365*2 + i - 7) * 24 * 60 * 60; struct tm tm = *p__gmtime32(&t); + retA = p_strftime(bufA, sizeof(bufA), "%g", &tm); + ok(retA == 2, "%d) retA = %d\n", i, (int)retA); + if (i <= 8) + ok(!strcmp(bufA, "71"), "%d) got %s, expected 71\n", i, bufA); + else + ok(!strcmp(bufA, "72"), "%d) got %s, expected 72\n", i, bufA); + retA = p_strftime(bufA, sizeof(bufA), "%G", &tm); ok(retA == 4, "%d) retA = %d\n", i, (int)retA); if (i <= 8) -- 2.21.0

2 1

[PATCH v3 3/7] ddraw/tests: Port tests for the cancellation of enumeration in Enumdevices in ddraw*.c files
by David Adam 30 Oct '19

30 Oct '19

2 1

[PATCH 1/3] d3dx9: Don't pass usage flags for staging texture in D3DXCreateCubeTextureFromFileInMemoryEx().
by Paul Gofman 30 Oct '19

30 Oct '19

Spotted in https://bugs.winehq.org/show_bug.cgi?id=47974 Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- dlls/d3dx9_36/tests/texture.c | 17 ++++++++++++----- dlls/d3dx9_36/texture.c | 2 +- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index 3416a3318b..3e4d5e5df9 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -2061,8 +2061,14 @@ static void test_D3DXCreateCubeTextureFromFileInMemory(IDirect3DDevice9 *device) static void test_D3DXCreateCubeTextureFromFileInMemoryEx(IDirect3DDevice9 *device) { - HRESULT hr; IDirect3DCubeTexture9 *cube_texture; + HRESULT hr; + + hr = D3DXCreateCubeTextureFromFileInMemoryEx(device, dds_cube_map, sizeof(dds_cube_map), D3DX_DEFAULT, + D3DX_DEFAULT, D3DUSAGE_RENDERTARGET, D3DFMT_UNKNOWN, D3DPOOL_DEFAULT, D3DX_DEFAULT, + D3DX_DEFAULT, 0, NULL, NULL, &cube_texture); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + IDirect3DCubeTexture9_Release(cube_texture); if (!is_autogenmipmap_supported(device, D3DRTYPE_CUBETEXTURE)) { @@ -2070,10 +2076,11 @@ static void test_D3DXCreateCubeTextureFromFileInMemoryEx(IDirect3DDevice9 *devic return; } - hr = D3DXCreateCubeTextureFromFileInMemoryEx(device, dds_cube_map, sizeof(dds_cube_map), D3DX_DEFAULT, D3DX_DEFAULT, - D3DUSAGE_DYNAMIC | D3DUSAGE_AUTOGENMIPMAP, D3DFMT_UNKNOWN, D3DPOOL_DEFAULT, D3DX_DEFAULT, D3DX_DEFAULT, 0, NULL, NULL, &cube_texture); - ok(hr == D3D_OK, "D3DXCreateCubeTextureFromFileInMemoryEx returned %#x, expected %#x.\n", hr, D3D_OK); - if (SUCCEEDED(hr)) IDirect3DCubeTexture9_Release(cube_texture); + hr = D3DXCreateCubeTextureFromFileInMemoryEx(device, dds_cube_map, sizeof(dds_cube_map), D3DX_DEFAULT, + D3DX_DEFAULT, D3DUSAGE_DYNAMIC | D3DUSAGE_AUTOGENMIPMAP, D3DFMT_UNKNOWN, D3DPOOL_DEFAULT, + D3DX_DEFAULT, D3DX_DEFAULT, 0, NULL, NULL, &cube_texture); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + IDirect3DCubeTexture9_Release(cube_texture); } static void test_D3DXCreateVolumeTextureFromFileInMemory(IDirect3DDevice9 *device) diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index 6ee7d72e38..12cb2f3983 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -1481,7 +1481,7 @@ HRESULT WINAPI D3DXCreateCubeTextureFromFileInMemoryEx(IDirect3DDevice9 *device, dynamic_texture = (caps.Caps2 & D3DCAPS2_DYNAMICTEXTURES) && (usage & D3DUSAGE_DYNAMIC); if (pool == D3DPOOL_DEFAULT && !dynamic_texture) { - hr = D3DXCreateCubeTexture(device, size, mip_levels, usage, format, D3DPOOL_SYSTEMMEM, &buftex); + hr = D3DXCreateCubeTexture(device, size, mip_levels, 0, format, D3DPOOL_SYSTEMMEM, &buftex); tex = buftex; } else -- 2.21.0

3 4

[PATCH 1/2] d3dx10_43: Add D3DX10LoadTextureFromTexture definitions.
by Connor McAdams 30 Oct '19

30 Oct '19

Add the function definition for D3DX10LoadTextureFromTexture to the header file, as well as the structure definition for D3DX10_TEXTURE_LOAD_INFO. Signed-off-by: Connor McAdams <conmanx360(a)gmail.com> --- include/d3dx10tex.h | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/include/d3dx10tex.h b/include/d3dx10tex.h index 25ad490949..282f245e8e 100644 --- a/include/d3dx10tex.h +++ b/include/d3dx10tex.h @@ -103,6 +103,36 @@ typedef struct D3DX10_IMAGE_LOAD_INFO #endif } D3DX10_IMAGE_LOAD_INFO; +typedef struct _D3DX10_TEXTURE_LOAD_INFO +{ + D3D10_BOX *pSrcBox; + D3D10_BOX *pDstBox; + UINT SrcFirstMip; + UINT DstFirstMip; + UINT NumMips; + UINT SrcFirstElement; + UINT DstFirstElement; + UINT NumElements; + UINT Filter; + UINT MipFilter; + +#ifdef __cplusplus + _D3DX10_TEXTURE_LOAD_INFO() + { + pSrcBox = NULL; + pDstBox = NULL; + SrcFirstMip = 0; + DstFirstMip = 0; + NumMips = D3DX10_DEFAULT; + SrcFirstElement = 0; + DstFirstElement = 0; + NumElements = D3DX10_DEFAULT; + Filter = D3DX10_DEFAULT; + MipFilter = D3DX10_DEFAULT; + } +#endif +} D3DX10_TEXTURE_LOAD_INFO; + #ifdef __cplusplus extern "C" { #endif @@ -115,6 +145,9 @@ HRESULT WINAPI D3DX10FilterTexture(ID3D10Resource *texture, UINT src_level, UINT HRESULT WINAPI D3DX10GetImageInfoFromMemory(const void *src_data, SIZE_T src_data_size, ID3DX10ThreadPump *pump, D3DX10_IMAGE_INFO *img_info, HRESULT *hresult); +HRESULT WINAPI D3DX10LoadTextureFromTexture(ID3D10Resource *src_tex, D3DX10_TEXTURE_LOAD_INFO *tex_load_info, + ID3D10Resource *dst_tex); + #ifdef __cplusplus } #endif -- 2.20.1

2 2

[PATCH v4 00/11] Move DX10 Shader Reflection into d3dcompiler.
by Connor McAdams 30 Oct '19

30 Oct '19

Patch series four, now includes the d3d10 GetConstantBuffer, ShaderReflectionVariable, and ShaderReflectionType methods. Also removed utils.c altogether, and moved the functions remaining into the files that they're used in. Connor McAdams (11): d3d10: move parse_dxbc + helpers into effects.c d3d10: Delete utils.c, move remaining functions into respective files. d3d10+d3dcompiler: add PARENTSRC and fix definition conflicts d3d10+d3dcompiler: Move d3d10 reflection into d3dcompiler. d3dcompiler: Add shader init to D3D10ReflectShader d3dcompiler: implement d3d10 reflection GetDesc method. d3dcompiler: Implement Input/OutputParameterDesc method d3dcompiler: GetResourceBindingDesc for d3d10 reflect shader. d3dcompiler: Implement d3d10 reflect GetConstantBuffer methods. d3dcompiler: implement d3d10 ShaderReflectionVariable methods. d3dcompiler: implement d3d10 ShaderReflectionType methods. dlls/d3d10/Makefile.in | 4 +- dlls/d3d10/d3d10_main.c | 41 ++- dlls/d3d10/d3d10_private.h | 20 -- dlls/d3d10/effect.c | 160 ++++++++++ dlls/d3d10/shader.c | 112 ------- dlls/d3d10/stateblock.c | 38 +++ dlls/d3d10/utils.c | 231 -------------- dlls/d3dcompiler_43/reflection.c | 518 ++++++++++++++++++++++++++++++- dlls/d3dcompiler_43/utils.c | 2 + 9 files changed, 734 insertions(+), 392 deletions(-) delete mode 100644 dlls/d3d10/utils.c -- 2.20.1

4 27

[PATCH 1/3] ole32/tests: Add some more tests for interface redirection handling.
by Nikolay Sivov 30 Oct '19

30 Oct '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ole32/tests/Makefile.in | 2 + dlls/ole32/tests/compobj.c | 81 ++++++++++++++++++++++++++--------- dlls/ole32/tests/testlib.c | 17 ++++++++ dlls/ole32/tests/testlib.spec | 1 + 4 files changed, 80 insertions(+), 21 deletions(-) create mode 100644 dlls/ole32/tests/testlib.c create mode 100644 dlls/ole32/tests/testlib.spec diff --git a/dlls/ole32/tests/Makefile.in b/dlls/ole32/tests/Makefile.in index 6bf57e3e41..8f116147a1 100644 --- a/dlls/ole32/tests/Makefile.in +++ b/dlls/ole32/tests/Makefile.in @@ -15,4 +15,6 @@ C_SRCS = \ propvariant.c \ stg_prop.c \ storage32.c \ + testlib.c \ + testlib.spec \ usrmarshal.c diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index ea5ea35a11..5e72eb650e 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -82,9 +82,7 @@ static LONG (WINAPI * pRegOverridePredefKey)(HKEY key, HKEY override); static BOOL (WINAPI *pActivateActCtx)(HANDLE,ULONG_PTR*); static HANDLE (WINAPI *pCreateActCtxW)(PCACTCTXW); -static BOOL (WINAPI *pDeactivateActCtx)(DWORD,ULONG_PTR); static BOOL (WINAPI *pIsWow64Process)(HANDLE, LPBOOL); -static void (WINAPI *pReleaseActCtx)(HANDLE); #define ok_ole_success(hr, func) ok(hr == S_OK, func " failed with error 0x%08x\n", hr) #define ok_more_than_one_lock() ok(cLocks > 0, "Number of locks should be > 0, but actually is %d\n", cLocks) @@ -98,6 +96,8 @@ static const GUID IID_Testiface3 = { 0x42222222, 0x1234, 0x1234, { 0x12, 0x34, 0 static const GUID IID_Testiface4 = { 0x52222222, 0x1234, 0x1234, { 0x12, 0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0 } }; static const GUID IID_Testiface5 = { 0x62222222, 0x1234, 0x1234, { 0x12, 0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0 } }; static const GUID IID_Testiface6 = { 0x72222222, 0x1234, 0x1234, { 0x12, 0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0 } }; +static const GUID IID_Testiface7 = { 0x82222222, 0x1234, 0x1234, { 0x12, 0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0 } }; +static const GUID IID_Testiface8 = { 0x92222222, 0x1234, 0x1234, { 0x12, 0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0 } }; static const GUID IID_TestPS = { 0x66666666, 0x8888, 0x7777, { 0x66, 0x66, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55 } }; DEFINE_GUID(CLSID_testclsid, 0xacd014c7,0x9535,0x4fac,0x8b,0x53,0xa4,0x8c,0xa7,0xf4,0xd7,0x26); @@ -214,6 +214,26 @@ static BOOL create_manifest_file(const char *filename, const char *manifest) return TRUE; } +static void extract_resource(const char *name, const char *type, const char *path) +{ + DWORD written; + HANDLE file; + HRSRC res; + void *ptr; + + file = CreateFileA(path, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); + ok(file != INVALID_HANDLE_VALUE, "Failed to create a file at %s, error %d.\n", path, GetLastError()); + + res = FindResourceA(NULL, name, type); + ok(res != 0, "Failed to find resource.\n"); + ptr = LockResource(LoadResource(GetModuleHandleA(NULL), res)); + WriteFile(file, ptr, SizeofResource(GetModuleHandleA(NULL), res), &written, NULL); + ok(written == SizeofResource(GetModuleHandleA(NULL), res), "Failed to write file.\n" ); + CloseHandle(file); +} + +static char testlib[MAX_PATH]; + static HANDLE activate_context(const char *manifest, ULONG_PTR *cookie) { WCHAR path[MAX_PATH]; @@ -235,7 +255,7 @@ static HANDLE activate_context(const char *manifest, ULONG_PTR *cookie) "handle == INVALID_HANDLE_VALUE, error %u\n", GetLastError()); if (handle == INVALID_HANDLE_VALUE) { - win_skip("activation context generation failed, some tests will be skipped\n"); + win_skip("activation context generation failed, some tests will be skipped. Error %d\n", GetLastError()); handle = NULL; } @@ -260,6 +280,15 @@ static HANDLE activate_context(const char *manifest, ULONG_PTR *cookie) return handle; } +static void deactivate_context(HANDLE handle, ULONG_PTR cookie) +{ + BOOL ret; + + ret = DeactivateActCtx(0, cookie); + ok(ret, "Failed to deactivate context, error %d.\n", GetLastError()); + ReleaseActCtx(handle); +} + static const char actctx_manifest[] = "<assembly xmlns=\"urn:schemas-microsoft-com:asm.v1\" manifestVersion=\"1.0\">" "<assemblyIdentity version=\"1.2.3.4\" name=\"Wine.Test\" type=\"win32\"" @@ -294,6 +323,10 @@ static const char actctx_manifest[] = " iid=\"{22222222-1234-1234-1234-56789abcdef0}\"" " proxyStubClsid32=\"{66666666-8888-7777-6666-555555555555}\"" " />" +" <comInterfaceProxyStub " +" name=\"Iifaceps5\"" +" iid=\"{82222222-1234-1234-1234-56789abcdef0}\"" +" />" "</file>" " <comInterfaceExternalProxyStub " " name=\"Iifaceps2\"" @@ -367,8 +400,7 @@ static void test_ProgIDFromCLSID(void) hr = ProgIDFromCLSID(&IID_Testiface6, &progid); ok(hr == REGDB_E_CLASSNOTREG && progid == NULL, "got 0x%08x, progid %p\n", hr, progid); - pDeactivateActCtx(0, cookie); - pReleaseActCtx(handle); + deactivate_context(handle, cookie); } } @@ -434,8 +466,7 @@ static void test_CLSIDFromProgID(void) ok(!IsEqualCLSID(&clsid, &CLSID_StdFont) && !IsEqualCLSID(&clsid, &CLSID_NULL) && !IsEqualCLSID(&clsid, &clsid1), "got %s\n", wine_dbgstr_guid(&clsid)); - pDeactivateActCtx(0, cookie); - pReleaseActCtx(handle); + deactivate_context(handle, cookie); } } @@ -725,8 +756,14 @@ static void test_CoGetClassObject(void) ok(hr == S_OK, "got 0x%08x\n", hr); IUnknown_Release(pUnk); - pDeactivateActCtx(0, cookie); - pReleaseActCtx(handle); + hr = CoGetClassObject(&IID_Testiface7, CLSCTX_INPROC_SERVER, NULL, &IID_IUnknown, (void **)&pUnk); + todo_wine + ok(hr == 0x80001235, "Unexpected hr %#x.\n", hr); + + hr = CoGetClassObject(&IID_Testiface8, CLSCTX_INPROC_SERVER, NULL, &IID_IUnknown, (void **)&pUnk); + ok(hr == REGDB_E_CLASSNOTREG, "Unexpected hr %#x.\n", hr); + + deactivate_context(handle, cookie); } CoUninitialize(); @@ -1267,6 +1304,11 @@ static void test_CoGetPSClsid(void) ok(hr == S_OK, "got 0x%08x\n", hr); ok(IsEqualGUID(&clsid, &GUID_NULL), "got clsid %s\n", wine_dbgstr_guid(&clsid)); + memset(&clsid, 0xaa, sizeof(clsid)); + hr = CoGetPSClsid(&IID_Testiface7, &clsid); + ok(hr == S_OK, "Failed to get PS CLSID, hr %#x.\n", hr); + ok(IsEqualGUID(&clsid, &IID_Testiface7), "Unexpected CLSID %s.\n", wine_dbgstr_guid(&clsid)); + /* register same interface and try to get CLSID back */ hr = CoRegisterPSClsid(&IID_Testiface, &IID_Testiface4); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -1275,8 +1317,7 @@ static void test_CoGetPSClsid(void) ok(hr == S_OK, "got 0x%08x\n", hr); ok(IsEqualGUID(&clsid, &IID_Testiface4), "got clsid %s\n", wine_dbgstr_guid(&clsid)); - pDeactivateActCtx(0, cookie); - pReleaseActCtx(handle); + deactivate_context(handle, cookie); } if (pRegDeleteKeyExA && @@ -1533,11 +1574,9 @@ static void test_CoRegisterClassObject(void) if ((handle = activate_context(actctx_manifest, &ctxcookie))) { hr = CoGetClassObject(&CLSID_WineOOPTest, CLSCTX_INPROC_SERVER, NULL, &IID_IClassFactory, (void**)&pcf); -todo_wine - ok(hr == HRESULT_FROM_WIN32(ERROR_MOD_NOT_FOUND), "got 0x%08x\n", hr); + ok(hr == 0x80001234, "Unexpected hr %#x.\n", hr); - pDeactivateActCtx(0, ctxcookie); - pReleaseActCtx(handle); + deactivate_context(handle, ctxcookie); } hr = CoGetClassObject(&CLSID_WineOOPTest, CLSCTX_INPROC_SERVER, NULL, &IID_IClassFactory, (void**)&pcf); @@ -2264,8 +2303,7 @@ static void test_OleRegGetMiscStatus(void) ok(hr == S_OK, "got 0x%08x\n", hr); ok(status == 0, "got 0x%08x\n", status); - pDeactivateActCtx(0, cookie); - pReleaseActCtx(handle); + deactivate_context(handle, cookie); } } @@ -2332,8 +2370,7 @@ static void test_OleRegGetUserType(void) CoTaskMemFree(str); } - pDeactivateActCtx(0, cookie); - pReleaseActCtx(handle); + deactivate_context(handle, cookie); } /* test using registered CLSID */ @@ -3789,9 +3826,7 @@ static void init_funcs(void) pActivateActCtx = (void*)GetProcAddress(hkernel32, "ActivateActCtx"); pCreateActCtxW = (void*)GetProcAddress(hkernel32, "CreateActCtxW"); - pDeactivateActCtx = (void*)GetProcAddress(hkernel32, "DeactivateActCtx"); pIsWow64Process = (void*)GetProcAddress(hkernel32, "IsWow64Process"); - pReleaseActCtx = (void*)GetProcAddress(hkernel32, "ReleaseActCtx"); } static DWORD CALLBACK implicit_mta_proc(void *param) @@ -3869,6 +3904,10 @@ START_TEST(compobj) return; } + GetCurrentDirectoryA(ARRAY_SIZE(testlib), testlib); + lstrcatA(testlib, "\\testlib.dll"); + extract_resource("testlib.dll", "TESTDLL", testlib); + if (!pCreateActCtxW) win_skip("Activation contexts are not supported, some tests will be skipped.\n"); diff --git a/dlls/ole32/tests/testlib.c b/dlls/ole32/tests/testlib.c new file mode 100644 index 0000000000..d28147b750 --- /dev/null +++ b/dlls/ole32/tests/testlib.c @@ -0,0 +1,17 @@ +#include <stdio.h> +#include <windows.h> +#include <initguid.h> + +DEFINE_GUID(CLSID_WineOOPTest, 0x5201163f, 0x8164, 0x4fd0, 0xa1, 0xa2, 0x5d, 0x5a, 0x36, 0x54, 0xd3, 0xbd); +DEFINE_GUID(IID_Testiface7, 0x82222222, 0x1234, 0x1234, 0x12, 0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0); + +HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID riid, void **obj) +{ + if (IsEqualGUID(clsid, &CLSID_WineOOPTest)) + return 0x80001234; + + if (IsEqualGUID(clsid, &IID_Testiface7)) + return 0x80001235; + + return E_NOTIMPL; +} diff --git a/dlls/ole32/tests/testlib.spec b/dlls/ole32/tests/testlib.spec new file mode 100644 index 0000000000..8737274e9c --- /dev/null +++ b/dlls/ole32/tests/testlib.spec @@ -0,0 +1 @@ +@ stdcall DllGetClassObject(ptr ptr ptr) -- 2.23.0

3 7