October 2019 - Wine-commits

Paul Gofman : d3dx9: Factor our check_texture_requirements() function.
by Alexandre Julliard 30 Oct '19

30 Oct '19

Module: wine Branch: master Commit: 92c8c0fc7fb95209fa9dec25234d16b1dbddcf2a URL: https://source.winehq.org/git/wine.git/?a=commit;h=92c8c0fc7fb95209fa9dec25… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Mon Oct 28 09:27:40 2019 +0300 d3dx9: Factor our check_texture_requirements() function. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/texture.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index 736d11dfad..57326f406a 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -210,8 +210,8 @@ static D3DFORMAT get_replacement_format(D3DFORMAT format) return format; } -HRESULT WINAPI D3DXCheckTextureRequirements(struct IDirect3DDevice9 *device, UINT *width, UINT *height, - UINT *miplevels, DWORD usage, D3DFORMAT *format, D3DPOOL pool) +static HRESULT check_texture_requirements(struct IDirect3DDevice9 *device, UINT *width, UINT *height, + UINT *miplevels, DWORD usage, D3DFORMAT *format, D3DPOOL pool, D3DRESOURCETYPE resource_type) { UINT w = (width && *width) ? *width : 1; UINT h = (height && *height) ? *height : 1; @@ -223,8 +223,6 @@ HRESULT WINAPI D3DXCheckTextureRequirements(struct IDirect3DDevice9 *device, UIN D3DFORMAT usedformat = D3DFMT_UNKNOWN; const struct pixel_format_desc *fmt; - TRACE("(%p, %p, %p, %p, %u, %p, %u)\n", device, width, height, miplevels, usage, format, pool); - if (!device) return D3DERR_INVALIDCALL; @@ -266,7 +264,7 @@ HRESULT WINAPI D3DXCheckTextureRequirements(struct IDirect3DDevice9 *device, UIN fmt = get_format_info(usedformat); hr = IDirect3D9_CheckDeviceFormat(d3d, params.AdapterOrdinal, params.DeviceType, mode.Format, - usage, D3DRTYPE_TEXTURE, usedformat); + usage, resource_type, usedformat); if (FAILED(hr)) { BOOL allow_24bits; @@ -301,7 +299,7 @@ HRESULT WINAPI D3DXCheckTextureRequirements(struct IDirect3DDevice9 *device, UIN continue; hr = IDirect3D9_CheckDeviceFormat(d3d, params.AdapterOrdinal, params.DeviceType, - mode.Format, usage, D3DRTYPE_TEXTURE, curfmt->format); + mode.Format, usage, resource_type, curfmt->format); if (FAILED(hr)) continue; @@ -422,6 +420,15 @@ cleanup: return D3D_OK; } +HRESULT WINAPI D3DXCheckTextureRequirements(struct IDirect3DDevice9 *device, UINT *width, UINT *height, + UINT *miplevels, DWORD usage, D3DFORMAT *format, D3DPOOL pool) +{ + TRACE("device %p, width %p, height %p, miplevels %p, usage %u, format %p, pool %u.\n", + device, width, height, miplevels, usage, format, pool); + + return check_texture_requirements(device, width, height, miplevels, usage, format, pool, D3DRTYPE_TEXTURE); +} + HRESULT WINAPI D3DXCheckCubeTextureRequirements(struct IDirect3DDevice9 *device, UINT *size, UINT *miplevels, DWORD usage, D3DFORMAT *format, D3DPOOL pool) {

1 0

Paul Gofman : d3dx9: Use check_texture_requirements() in D3DXCheckCubeTextureRequirements() with correct resource type.
by Alexandre Julliard 30 Oct '19

30 Oct '19

Module: wine Branch: master Commit: e50873f504b4693c9efcf7113afcb633155babbc URL: https://source.winehq.org/git/wine.git/?a=commit;h=e50873f504b4693c9efcf711… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri Oct 25 20:30:57 2019 +0300 d3dx9: Use check_texture_requirements() in D3DXCheckCubeTextureRequirements() with correct resource type. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/texture.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index 57326f406a..9cd91789b1 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -450,7 +450,7 @@ HRESULT WINAPI D3DXCheckCubeTextureRequirements(struct IDirect3DDevice9 *device, if ((caps.TextureCaps & D3DPTEXTURECAPS_CUBEMAP_POW2) && (!is_pow2(s))) s = make_pow2(s); - hr = D3DXCheckTextureRequirements(device, &s, &s, miplevels, usage, format, pool); + hr = check_texture_requirements(device, &s, &s, miplevels, usage, format, pool, D3DRTYPE_CUBETEXTURE); if (!(caps.TextureCaps & D3DPTEXTURECAPS_MIPCUBEMAP)) {

1 0

Paul Gofman : d3dx9: Use check_texture_requirements() in D3DXCheckVolumeTextureRequirements() with correct resource type.
by Alexandre Julliard 30 Oct '19

30 Oct '19

Module: wine Branch: master Commit: 0b03d21c8f89b3f9dbd68ac849f9923197095eb5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b03d21c8f89b3f9dbd68ac8… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri Oct 25 20:30:58 2019 +0300 d3dx9: Use check_texture_requirements() in D3DXCheckVolumeTextureRequirements() with correct resource type. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/texture.c | 17 +++++++++++++++++ dlls/d3dx9_36/texture.c | 3 +-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index 3e4d5e5df9..2688559c2c 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -2125,6 +2125,22 @@ static void test_D3DXCreateVolumeTextureFromFileInMemory(IDirect3DDevice9 *devic ok(ref == 0, "Invalid reference count. Got %u, expected 0.\n", ref); } +static void test_D3DXCreateVolumeTextureFromFileInMemoryEx(IDirect3DDevice9 *device) +{ + IDirect3DVolumeTexture9 *volume_texture; + HRESULT hr; + + hr = D3DXCreateVolumeTextureFromFileInMemoryEx(device, dds_volume_map, sizeof(dds_volume_map), D3DX_DEFAULT, + D3DX_DEFAULT, D3DX_DEFAULT, 1, D3DUSAGE_RENDERTARGET, D3DFMT_UNKNOWN, D3DPOOL_DEFAULT, D3DX_DEFAULT, + D3DX_DEFAULT, 0, NULL, NULL, &volume_texture); + ok(hr == D3DERR_NOTAVAILABLE, "Got unexpected hr %#x.\n", hr); + + hr = D3DXCreateVolumeTextureFromFileInMemoryEx(device, dds_volume_map, sizeof(dds_volume_map), D3DX_DEFAULT, + D3DX_DEFAULT, D3DX_DEFAULT, 1, D3DUSAGE_DEPTHSTENCIL, D3DFMT_UNKNOWN, D3DPOOL_DEFAULT, D3DX_DEFAULT, + D3DX_DEFAULT, 0, NULL, NULL, &volume_texture); + ok(hr == D3DERR_NOTAVAILABLE, "Got unexpected hr %#x.\n", hr); +} + /* fills positive x face with red color */ static void WINAPI fill_cube_positive_x(D3DXVECTOR4 *out, const D3DXVECTOR3 *tex_coord, const D3DXVECTOR3 *texel_size, void *data) { @@ -2599,6 +2615,7 @@ START_TEST(texture) test_D3DXCreateCubeTextureFromFileInMemory(device); test_D3DXCreateCubeTextureFromFileInMemoryEx(device); test_D3DXCreateVolumeTextureFromFileInMemory(device); + test_D3DXCreateVolumeTextureFromFileInMemoryEx(device); test_D3DXSaveTextureToFileInMemory(device); ref = IDirect3DDevice9_Release(device); diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index 9cd91789b1..576635245a 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -482,7 +482,7 @@ HRESULT WINAPI D3DXCheckVolumeTextureRequirements(struct IDirect3DDevice9 *devic if (!(caps.TextureCaps & D3DPTEXTURECAPS_VOLUMEMAP)) return D3DERR_NOTAVAILABLE; - hr = D3DXCheckTextureRequirements(device, &w, &h, NULL, usage, format, pool); + hr = check_texture_requirements(device, &w, &h, NULL, usage, format, pool, D3DRTYPE_VOLUMETEXTURE); if (d == D3DX_DEFAULT) d = 1; @@ -1246,7 +1246,6 @@ HRESULT WINAPI D3DXCreateVolumeTextureFromFileInMemoryEx(IDirect3DDevice9 *devic hr = D3DXCreateVolumeTexture(device, width, height, depth, mip_levels, usage, format, pool, &tex); buftex = NULL; } - if (FAILED(hr)) return hr; hr = load_volume_texture_from_dds(tex, data, palette, filter, color_key, &image_info);

1 0

Paul Gofman : d3dx9: Don't pass usage flags for staging texture in D3DXCreateVolumeTextureFromFileInMemoryEx().
by Alexandre Julliard 30 Oct '19

30 Oct '19

Module: wine Branch: master Commit: 29c02234eb2be9c8fa48cfc021d0d6f84de58add URL: https://source.winehq.org/git/wine.git/?a=commit;h=29c02234eb2be9c8fa48cfc0… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri Oct 25 20:30:59 2019 +0300 d3dx9: Don't pass usage flags for staging texture in D3DXCreateVolumeTextureFromFileInMemoryEx(). Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/texture.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index 576635245a..d96ade9aed 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -1238,7 +1238,7 @@ HRESULT WINAPI D3DXCreateVolumeTextureFromFileInMemoryEx(IDirect3DDevice9 *devic dynamic_texture = (caps.Caps2 & D3DCAPS2_DYNAMICTEXTURES) && (usage & D3DUSAGE_DYNAMIC); if (pool == D3DPOOL_DEFAULT && !dynamic_texture) { - hr = D3DXCreateVolumeTexture(device, width, height, depth, mip_levels, usage, format, D3DPOOL_SYSTEMMEM, &buftex); + hr = D3DXCreateVolumeTexture(device, width, height, depth, mip_levels, 0, format, D3DPOOL_SYSTEMMEM, &buftex); tex = buftex; } else

1 0

Matteo Bruni : d3dx9: Turn unimplemented interface ERR into a WARN.
by Alexandre Julliard 30 Oct '19

30 Oct '19

Module: wine Branch: master Commit: 5b66442bc95e42bcef2ca385168fc3d594182e4a URL: https://source.winehq.org/git/wine.git/?a=commit;h=5b66442bc95e42bcef2ca385… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Oct 30 10:24:44 2019 +0100 d3dx9: Turn unimplemented interface ERR into a WARN. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 7d686a435d..63c931e172 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -4214,41 +4214,43 @@ static HRESULT WINAPI ID3DXEffectCompilerImpl_QueryInterface(ID3DXEffectCompiler { TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); - if (IsEqualGUID(riid, &IID_IUnknown) || - IsEqualGUID(riid, &IID_ID3DXEffectCompiler)) + if (IsEqualGUID(riid, &IID_IUnknown) + || IsEqualGUID(riid, &IID_ID3DXEffectCompiler)) { iface->lpVtbl->AddRef(iface); *object = iface; return S_OK; } - ERR("Interface %s not found\n", debugstr_guid(riid)); + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + *object = NULL; return E_NOINTERFACE; } static ULONG WINAPI ID3DXEffectCompilerImpl_AddRef(ID3DXEffectCompiler *iface) { - struct ID3DXEffectCompilerImpl *This = impl_from_ID3DXEffectCompiler(iface); + struct ID3DXEffectCompilerImpl *compiler = impl_from_ID3DXEffectCompiler(iface); + ULONG refcount = InterlockedIncrement(&compiler->ref); - TRACE("iface %p: AddRef from %u\n", iface, This->ref); + TRACE("%p increasing refcount to %u.\n", iface, refcount); - return InterlockedIncrement(&This->ref); + return refcount; } static ULONG WINAPI ID3DXEffectCompilerImpl_Release(ID3DXEffectCompiler *iface) { - struct ID3DXEffectCompilerImpl *This = impl_from_ID3DXEffectCompiler(iface); - ULONG ref = InterlockedDecrement(&This->ref); + struct ID3DXEffectCompilerImpl *compiler = impl_from_ID3DXEffectCompiler(iface); + ULONG refcount = InterlockedDecrement(&compiler->ref); - TRACE("iface %p: Release from %u\n", iface, ref + 1); + TRACE("%p decreasing refcount to %u.\n", iface, refcount); - if (!ref) + if (!refcount) { - HeapFree(GetProcessHeap(), 0, This); + heap_free(compiler); } - return ref; + return refcount; } /*** ID3DXBaseEffect methods ***/

1 0

Nikolay Sivov : ole32/tests: Add some more tests for interface redirection handling.
by Alexandre Julliard 30 Oct '19

30 Oct '19

Module: wine Branch: master Commit: 1e6b130b85d33d38231fc15b5b5e9bf41a24e0b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1e6b130b85d33d38231fc15b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 29 16:36:04 2019 +0300 ole32/tests: Add some more tests for interface redirection handling. 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/tests/Makefile.in | 4 ++- dlls/ole32/tests/compobj.c | 83 ++++++++++++++++++++++++++++++++----------- dlls/ole32/tests/testlib.c | 37 +++++++++++++++++++ dlls/ole32/tests/testlib.spec | 1 + 4 files changed, 103 insertions(+), 22 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1e6b130b85d33d38231f…

1 0

Nikolay Sivov : ole32: Do not pass around untyped context section pointers.
by Alexandre Julliard 30 Oct '19

30 Oct '19

Module: wine Branch: master Commit: ce15bc1f02b2e4d647b860c017c7091e3f7c9236 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce15bc1f02b2e4d647b860c0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 29 16:36:05 2019 +0300 ole32: Do not pass around untyped context section pointers. 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/compobj.c | 36 ++++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index c5a36059b9..4e48f6add6 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -145,19 +145,25 @@ struct progidredirect_data ULONG clsid_offset; }; +enum class_reg_data_origin +{ + CLASS_REG_ACTCTX, + CLASS_REG_REGISTRY, +}; + struct class_reg_data { + enum class_reg_data_origin origin; union { struct { - struct comclassredirect_data *data; - void *section; + const WCHAR *module_name; + DWORD threading_model; HANDLE hactctx; } actctx; HKEY hkey; } u; - BOOL hkey; }; struct registered_psclsid @@ -1408,7 +1414,7 @@ static BOOL get_object_dll_path(const struct class_reg_data *regdata, WCHAR *dst { DWORD ret; - if (regdata->hkey) + if (regdata->origin == CLASS_REG_REGISTRY) { DWORD keytype; WCHAR src[MAX_PATH]; @@ -1437,12 +1443,10 @@ static BOOL get_object_dll_path(const struct class_reg_data *regdata, WCHAR *dst { static const WCHAR dllW[] = {'.','d','l','l',0}; ULONG_PTR cookie; - WCHAR *nameW; *dst = 0; - nameW = (WCHAR*)((BYTE*)regdata->u.actctx.section + regdata->u.actctx.data->name_offset); ActivateActCtx(regdata->u.actctx.hactctx, &cookie); - ret = SearchPathW(NULL, nameW, dllW, dstlen, dst, NULL); + ret = SearchPathW(NULL, regdata->u.actctx.module_name, dllW, dstlen, dst, NULL); DeactivateActCtx(0, cookie); return *dst != 0; } @@ -2990,7 +2994,7 @@ HRESULT WINAPI CoRegisterClassObject( static enum comclass_threadingmodel get_threading_model(const struct class_reg_data *data) { - if (data->hkey) + if (data->origin == CLASS_REG_REGISTRY) { static const WCHAR wszThreadingModel[] = {'T','h','r','e','a','d','i','n','g','M','o','d','e','l',0}; static const WCHAR wszApartment[] = {'A','p','a','r','t','m','e','n','t',0}; @@ -3014,7 +3018,7 @@ static enum comclass_threadingmodel get_threading_model(const struct class_reg_d return ThreadingModel_No; } else - return data->u.actctx.data->model; + return data->u.actctx.threading_model; } static HRESULT get_inproc_class_object(APARTMENT *apt, const struct class_reg_data *regdata, @@ -3098,7 +3102,7 @@ HRESULT WINAPI DECLSPEC_HOTPATCH CoGetClassObject( REFCLSID rclsid, DWORD dwClsContext, COSERVERINFO *pServerInfo, REFIID iid, LPVOID *ppv) { - struct class_reg_data clsreg; + struct class_reg_data clsreg = { 0 }; IUnknown *regClassObject; HRESULT hres = E_UNEXPECTED; APARTMENT *apt; @@ -3144,10 +3148,10 @@ HRESULT WINAPI DECLSPEC_HOTPATCH CoGetClassObject( { struct comclassredirect_data *comclass = (struct comclassredirect_data*)data.lpData; + clsreg.u.actctx.module_name = (WCHAR *)((BYTE *)data.lpSectionBase + comclass->name_offset); clsreg.u.actctx.hactctx = data.hActCtx; - clsreg.u.actctx.data = data.lpData; - clsreg.u.actctx.section = data.lpSectionBase; - clsreg.hkey = FALSE; + clsreg.u.actctx.threading_model = comclass->model; + clsreg.origin = CLASS_REG_ACTCTX; hres = get_inproc_class_object(apt, &clsreg, &comclass->clsid, iid, !(dwClsContext & WINE_CLSCTX_DONT_HOST), ppv); ReleaseActCtx(data.hActCtx); @@ -3197,7 +3201,7 @@ HRESULT WINAPI DECLSPEC_HOTPATCH CoGetClassObject( if (SUCCEEDED(hres)) { clsreg.u.hkey = hkey; - clsreg.hkey = TRUE; + clsreg.origin = CLASS_REG_REGISTRY; hres = get_inproc_class_object(apt, &clsreg, rclsid, iid, !(dwClsContext & WINE_CLSCTX_DONT_HOST), ppv); RegCloseKey(hkey); @@ -3233,7 +3237,7 @@ HRESULT WINAPI DECLSPEC_HOTPATCH CoGetClassObject( if (SUCCEEDED(hres)) { clsreg.u.hkey = hkey; - clsreg.hkey = TRUE; + clsreg.origin = CLASS_REG_REGISTRY; hres = get_inproc_class_object(apt, &clsreg, rclsid, iid, !(dwClsContext & WINE_CLSCTX_DONT_HOST), ppv); RegCloseKey(hkey); @@ -5171,7 +5175,7 @@ HRESULT Handler_DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) WCHAR dllpath[MAX_PATH+1]; regdata.u.hkey = hkey; - regdata.hkey = TRUE; + regdata.origin = CLASS_REG_REGISTRY; if (get_object_dll_path(&regdata, dllpath, ARRAY_SIZE(dllpath))) {

1 0

Hans Leidekker : msi/tests: Fix test failures.
by Alexandre Julliard 29 Oct '19

29 Oct '19

Module: wine Branch: master Commit: 1b4b37cc7e05724fac235cef278a97b358d0cba1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b4b37cc7e05724fac235cef… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 29 10:58:42 2019 +0100 msi/tests: Fix test failures. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/msi.c | 120 ++++++++++++++++++++++++++++++++++++++++++++++- dlls/msi/tests/package.c | 9 ++++ dlls/msi/tests/source.c | 21 +++++++++ 3 files changed, 149 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1b4b37cc7e05724fac23…

1 0

Hans Leidekker : msi/tests: Run the package tests from a temporary directory.
by Alexandre Julliard 29 Oct '19

29 Oct '19

Module: wine Branch: master Commit: 8503ad172229979e9929e8d54dac546c5b799a03 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8503ad172229979e9929e8d5… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 29 10:58:43 2019 +0100 msi/tests: Run the package tests from a temporary directory. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/package.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index ba1b83a6fb..3c547bf04a 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -9640,15 +9640,25 @@ static void test_top_level_action(void) START_TEST(package) { + char temp_path[MAX_PATH], prev_path[MAX_PATH]; STATEMGRSTATUS status; BOOL ret = FALSE; + DWORD len; init_functionpointers(); if (pIsWow64Process) pIsWow64Process(GetCurrentProcess(), &is_wow64); - GetCurrentDirectoryA(MAX_PATH, CURR_DIR); + GetCurrentDirectoryA(MAX_PATH, prev_path); + GetTempPathA(MAX_PATH, temp_path); + SetCurrentDirectoryA(temp_path); + + lstrcpyA(CURR_DIR, temp_path); + len = lstrlenA(CURR_DIR); + + if (len && (CURR_DIR[len - 1] == '\\')) + CURR_DIR[len - 1] = 0; /* Create a restore point ourselves so we circumvent the multitude of restore points * that would have been created by all the installation and removal tests. @@ -9706,4 +9716,6 @@ START_TEST(package) if (ret) remove_restore_point(status.llSequenceNumber); } + + SetCurrentDirectoryA(prev_path); }

1 0

Hans Leidekker : msi/tests: Remove workarounds for Windows 2000.
by Alexandre Julliard 29 Oct '19

29 Oct '19

Module: wine Branch: master Commit: 71f755820642777261c54d3fe6a04ba202059340 URL: https://source.winehq.org/git/wine.git/?a=commit;h=71f755820642777261c54d3f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 29 10:58:44 2019 +0100 msi/tests: Remove workarounds for Windows 2000. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/msi.c | 84 ++++++++++++++++++---------------------------------- 1 file changed, 28 insertions(+), 56 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=71f755820642777261c5…

1 0