- Wine-Devel - list.winehq.org

[PATCH v2 5/7] inetcpl.cpl: Enable visual styles.
by Zhiyi Zhang April 13, 2022

April 13, 2022

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/inetcpl.cpl/inetcpl.manifest | 16 ++++++++++++++++ dlls/inetcpl.cpl/inetcpl.rc | 5 ++++- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 dlls/inetcpl.cpl/inetcpl.manifest diff --git a/dlls/inetcpl.cpl/inetcpl.manifest b/dlls/inetcpl.cpl/inetcpl.manifest new file mode 100644 index 00000000000..81a32e4879c --- /dev/null +++ b/dlls/inetcpl.cpl/inetcpl.manifest @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> +<assemblyIdentity type="win32" name="Wine.Inetcpl" version="0.0.0.0"/> +<dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="*" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> +</dependency> +</assembly> diff --git a/dlls/inetcpl.cpl/inetcpl.rc b/dlls/inetcpl.cpl/inetcpl.rc index 0c997da59ff..7ae2a53efdf 100644 --- a/dlls/inetcpl.cpl/inetcpl.rc +++ b/dlls/inetcpl.cpl/inetcpl.rc @@ -147,7 +147,10 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #define WINE_PRODUCTVERSION_STR "8.00.6001.18939" #include "wine/wine_common_ver.rc" - + +/* @makedep: inetcpl.manifest */ +123 RT_MANIFEST inetcpl.manifest + /* @makedep: inetcpl.ico */ ICO_MAIN ICON "inetcpl.ico" ICO_INTERNET ICON "inetcpl.ico" -- 2.32.0

1 0

[PATCH v2 4/7] appwiz.cpl: Enable visual styles.
by Zhiyi Zhang April 13, 2022

April 13, 2022

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/appwiz.cpl/appwiz.manifest | 16 ++++++++++++++++ dlls/appwiz.cpl/appwiz.rc | 3 +++ 2 files changed, 19 insertions(+) create mode 100644 dlls/appwiz.cpl/appwiz.manifest diff --git a/dlls/appwiz.cpl/appwiz.manifest b/dlls/appwiz.cpl/appwiz.manifest new file mode 100644 index 00000000000..8ec99d550a3 --- /dev/null +++ b/dlls/appwiz.cpl/appwiz.manifest @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> +<assemblyIdentity type="win32" name="Wine.Appwiz" version="0.0.0.0"/> +<dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="*" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> +</dependency> +</assembly> diff --git a/dlls/appwiz.cpl/appwiz.rc b/dlls/appwiz.cpl/appwiz.rc index 589f27548f9..c2e93a426c0 100644 --- a/dlls/appwiz.cpl/appwiz.rc +++ b/dlls/appwiz.cpl/appwiz.rc @@ -126,5 +126,8 @@ FONT 8, "MS Shell Dlg" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL +/* @makedep: appwiz.manifest */ +123 RT_MANIFEST appwiz.manifest + /* @makedep: appwiz.ico */ ICO_MAIN ICON "appwiz.ico" -- 2.32.0

1 0

[PATCH v2 3/7] rundll32: Activate context at ID 123 before calling library functions.
by Zhiyi Zhang April 13, 2022

April 13, 2022

This is required to enable common control v6 for library functions called by rundll32.exe. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- programs/rundll32/rundll32.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/programs/rundll32/rundll32.c b/programs/rundll32/rundll32.c index fe9d17f0f48..2fb87fb8a50 100644 --- a/programs/rundll32/rundll32.c +++ b/programs/rundll32/rundll32.c @@ -276,9 +276,12 @@ int WINAPI wWinMain(HINSTANCE instance, HINSTANCE hOldInstance, LPWSTR szCmdLine HWND hWnd; LPWSTR szDllName,szEntryPoint; void *entry_point = NULL; - BOOL unicode = FALSE, win16 = FALSE; + BOOL unicode = FALSE, win16 = FALSE, activated = FALSE; + HMODULE hDll, hCtx = INVALID_HANDLE_VALUE; + WCHAR path[MAX_PATH]; STARTUPINFOW info; - HMODULE hDll; + ULONG_PTR cookie; + ACTCTXW ctx; hWnd=NULL; hDll=NULL; @@ -301,6 +304,21 @@ int WINAPI wWinMain(HINSTANCE instance, HINSTANCE hOldInstance, LPWSTR szCmdLine szEntryPoint = get_next_arg(&szCmdLine); WINE_TRACE("EntryPoint=%s\n",wine_dbgstr_w(szEntryPoint)); + /* Activate context before DllMain() is called */ + if (SearchPathW(NULL, szDllName, NULL, ARRAY_SIZE(path), path, NULL)) + { + memset(&ctx, 0, sizeof(ctx)); + ctx.cbSize = sizeof(ctx); + ctx.lpSource = path; + ctx.lpResourceName = MAKEINTRESOURCEW(123); + ctx.dwFlags = ACTCTX_FLAG_RESOURCE_NAME_VALID; + hCtx = CreateActCtxW(&ctx); + if (hCtx != INVALID_HANDLE_VALUE) + activated = ActivateActCtx(hCtx, &cookie); + else + WINE_TRACE("No manifest at ID 123 in %s\n", wine_dbgstr_w(path)); + } + /* Load the library */ hDll=LoadLibraryW(szDllName); if (hDll) entry_point = get_entry_point32( hDll, szEntryPoint, &unicode ); @@ -367,6 +385,9 @@ CLEANUP: DestroyWindow(hWnd); if (hDll) FreeLibrary(hDll); + if (activated) + DeactivateActCtx(0, cookie); + ReleaseActCtx(hCtx); HeapFree(GetProcessHeap(),0,szDllName); return 0; /* rundll32 always returns 0! */ } -- 2.32.0

1 0

[PATCH v2 2/7] shell32: Activate context at ID 123 before loading control panel applets.
by Zhiyi Zhang April 13, 2022

April 13, 2022

This is required to enable common control v6 when running control panel applets using "rundll32.exe shell32.dll,Control_RunDLL". Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/shell32/control.c | 25 +++++++++++++++++++++++++ dlls/shell32/cpanel.h | 3 +++ 2 files changed, 28 insertions(+) diff --git a/dlls/shell32/control.c b/dlls/shell32/control.c index d8a5edd9722..66987ed3192 100644 --- a/dlls/shell32/control.c +++ b/dlls/shell32/control.c @@ -53,6 +53,9 @@ void Control_UnloadApplet(CPlApplet* applet) if (applet->proc) applet->proc(applet->hWnd, CPL_EXIT, 0L, 0L); FreeLibrary(applet->hModule); + if (applet->context_activated) + DeactivateActCtx(0, applet->cookie); + ReleaseActCtx(applet->context); list_remove( &applet->entry ); heap_free(applet->cmd); heap_free(applet); @@ -60,15 +63,19 @@ void Control_UnloadApplet(CPlApplet* applet) CPlApplet* Control_LoadApplet(HWND hWnd, LPCWSTR cmd, CPanel* panel) { + WCHAR path[MAX_PATH]; CPlApplet* applet; DWORD len; unsigned i; CPLINFO info; NEWCPLINFOW newinfo; + ACTCTXW ctx; if (!(applet = heap_alloc_zero(sizeof(*applet)))) return applet; + applet->context = INVALID_HANDLE_VALUE; + len = ExpandEnvironmentStringsW(cmd, NULL, 0); if (len > 0) { @@ -87,6 +94,21 @@ CPlApplet* Control_LoadApplet(HWND hWnd, LPCWSTR cmd, CPanel* panel) applet->hWnd = hWnd; + /* Activate context before DllMain() is called */ + if (SearchPathW(NULL, applet->cmd, NULL, ARRAY_SIZE(path), path, NULL)) + { + memset(&ctx, 0, sizeof(ctx)); + ctx.cbSize = sizeof(ctx); + ctx.lpSource = path; + ctx.lpResourceName = MAKEINTRESOURCEW(123); + ctx.dwFlags = ACTCTX_FLAG_RESOURCE_NAME_VALID; + applet->context = CreateActCtxW(&ctx); + if (applet->context != INVALID_HANDLE_VALUE) + applet->context_activated = ActivateActCtx(applet->context, &applet->cookie); + else + TRACE("No manifest at ID 123 in %s\n", wine_dbgstr_w(path)); + } + if (!(applet->hModule = LoadLibraryW(applet->cmd))) { WARN("Cannot load control panel applet %s\n", debugstr_w(applet->cmd)); goto theError; @@ -177,6 +199,9 @@ CPlApplet* Control_LoadApplet(HWND hWnd, LPCWSTR cmd, CPanel* panel) theError: FreeLibrary(applet->hModule); + if (applet->context_activated) + DeactivateActCtx(0, applet->cookie); + ReleaseActCtx(applet->context); heap_free(applet->cmd); heap_free(applet); return NULL; diff --git a/dlls/shell32/cpanel.h b/dlls/shell32/cpanel.h index 285fa8e1724..8e29b6d3331 100644 --- a/dlls/shell32/cpanel.h +++ b/dlls/shell32/cpanel.h @@ -40,6 +40,9 @@ typedef struct CPlApplet { unsigned count; /* number of subprograms */ HMODULE hModule; /* module of loaded applet */ APPLET_PROC proc; /* entry point address */ + BOOL context_activated; /* whether context is activated */ + HANDLE context; /* activation context handle */ + ULONG_PTR cookie; /* activation context cookie */ struct applet_info info[1]; /* array of count information */ } CPlApplet; -- 2.32.0

1 0

[PATCH v2 1/7] kernel32/tests: Add more CreateActCtx() tests.
by Zhiyi Zhang April 13, 2022

April 13, 2022

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v2: Supersede 232379~232385. Deactivate context after libraries are unloaded. dlls/kernel32/tests/actctx.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index ebe1bb86470..71337c0f38e 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -2688,9 +2688,12 @@ static void extract_resource(const char *name, const char *type, const char *pat static void test_CreateActCtx(void) { + static const DWORD flags[] = {LOAD_LIBRARY_AS_DATAFILE, LOAD_LIBRARY_AS_IMAGE_RESOURCE, + LOAD_LIBRARY_AS_IMAGE_RESOURCE | LOAD_LIBRARY_AS_DATAFILE}; CHAR path[MAX_PATH], dir[MAX_PATH], dll[MAX_PATH]; ACTCTXA actctx; HANDLE handle; + int i; GetTempPathA(ARRAY_SIZE(path), path); strcat(path, "main_wndcls.manifest"); @@ -2827,6 +2830,34 @@ todo_wine { delete_manifest_file("testdir.manifest"); delete_manifest_file("assembly_dir\\testdir.manifest"); RemoveDirectoryA(dir); + + /* create using lpSource with a DLL relative name */ + memset(&actctx, 0, sizeof(actctx)); + actctx.cbSize = sizeof(actctx); + actctx.lpSource = "shell32.dll"; + actctx.lpResourceName = MAKEINTRESOURCEA(124); + actctx.dwFlags = ACTCTX_FLAG_RESOURCE_NAME_VALID; + handle = CreateActCtxA(&actctx); + ok(handle == INVALID_HANDLE_VALUE, "CreateActCtxA succeeded\n"); + + /* create from module loaded as data file */ + memset(&actctx, 0, sizeof(actctx)); + actctx.cbSize = sizeof(actctx); + actctx.lpResourceName = MAKEINTRESOURCEA(1); + actctx.dwFlags = ACTCTX_FLAG_HMODULE_VALID | ACTCTX_FLAG_RESOURCE_NAME_VALID; + for (i = 0; i < ARRAY_SIZE(flags); ++i) + { + winetest_push_context("%lu", flags[i]); + + /* use explorer.exe because using modules already loaded has a different behavior */ + actctx.hModule = LoadLibraryExA("C:\\windows\\explorer.exe", NULL, flags[i]); + ok(actctx.hModule != NULL, "LoadLibraryExA failed, error %lu\n", GetLastError()); + handle = CreateActCtxA(&actctx); + ok(handle == INVALID_HANDLE_VALUE, "CreateActCtxA succeeded\n"); + FreeLibrary(actctx.hModule); + + winetest_pop_context(); + } } static BOOL init_funcs(void) -- 2.32.0

1 0

[PATCH 2/7] shell32: Activate context at ID 123 before loading control panel applets.
by Zhiyi Zhang April 13, 2022

April 13, 2022

This is required to enable common control v6 when running control panel applets using "rundll32.exe shell32.dll,Control_RunDLL". Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/shell32/control.c | 25 +++++++++++++++++++++++++ dlls/shell32/cpanel.h | 3 +++ 2 files changed, 28 insertions(+) diff --git a/dlls/shell32/control.c b/dlls/shell32/control.c index d8a5edd9722..af5ec7d1dd1 100644 --- a/dlls/shell32/control.c +++ b/dlls/shell32/control.c @@ -52,6 +52,9 @@ void Control_UnloadApplet(CPlApplet* applet) applet->proc(applet->hWnd, CPL_STOP, i, applet->info[i].data); if (applet->proc) applet->proc(applet->hWnd, CPL_EXIT, 0L, 0L); + if (applet->context_activated) + DeactivateActCtx(0, applet->cookie); + ReleaseActCtx(applet->context); FreeLibrary(applet->hModule); list_remove( &applet->entry ); heap_free(applet->cmd); @@ -60,15 +63,19 @@ void Control_UnloadApplet(CPlApplet* applet) CPlApplet* Control_LoadApplet(HWND hWnd, LPCWSTR cmd, CPanel* panel) { + WCHAR path[MAX_PATH]; CPlApplet* applet; DWORD len; unsigned i; CPLINFO info; NEWCPLINFOW newinfo; + ACTCTXW ctx; if (!(applet = heap_alloc_zero(sizeof(*applet)))) return applet; + applet->context = INVALID_HANDLE_VALUE; + len = ExpandEnvironmentStringsW(cmd, NULL, 0); if (len > 0) { @@ -87,6 +94,21 @@ CPlApplet* Control_LoadApplet(HWND hWnd, LPCWSTR cmd, CPanel* panel) applet->hWnd = hWnd; + /* Activate context before DllMain() is called */ + if (SearchPathW(NULL, applet->cmd, NULL, ARRAY_SIZE(path), path, NULL)) + { + memset(&ctx, 0, sizeof(ctx)); + ctx.cbSize = sizeof(ctx); + ctx.lpSource = path; + ctx.lpResourceName = MAKEINTRESOURCEW(123); + ctx.dwFlags = ACTCTX_FLAG_RESOURCE_NAME_VALID; + applet->context = CreateActCtxW(&ctx); + if (applet->context != INVALID_HANDLE_VALUE) + applet->context_activated = ActivateActCtx(applet->context, &applet->cookie); + else + TRACE("No manifest at ID 123 in %s\n", wine_dbgstr_w(path)); + } + if (!(applet->hModule = LoadLibraryW(applet->cmd))) { WARN("Cannot load control panel applet %s\n", debugstr_w(applet->cmd)); goto theError; @@ -176,6 +198,9 @@ CPlApplet* Control_LoadApplet(HWND hWnd, LPCWSTR cmd, CPanel* panel) return applet; theError: + if (applet->context_activated) + DeactivateActCtx(0, applet->cookie); + ReleaseActCtx(applet->context); FreeLibrary(applet->hModule); heap_free(applet->cmd); heap_free(applet); diff --git a/dlls/shell32/cpanel.h b/dlls/shell32/cpanel.h index 285fa8e1724..8e29b6d3331 100644 --- a/dlls/shell32/cpanel.h +++ b/dlls/shell32/cpanel.h @@ -40,6 +40,9 @@ typedef struct CPlApplet { unsigned count; /* number of subprograms */ HMODULE hModule; /* module of loaded applet */ APPLET_PROC proc; /* entry point address */ + BOOL context_activated; /* whether context is activated */ + HANDLE context; /* activation context handle */ + ULONG_PTR cookie; /* activation context cookie */ struct applet_info info[1]; /* array of count information */ } CPlApplet; -- 2.32.0

2 2

[PATCH] dlls/d3dx10_43: fix long type warnings
by Eric Pouech April 13, 2022

April 13, 2022

missing from 74adbac296a786144e15833ff4918765d5bb32aa Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/d3dx10_43/async.c | 6 +++--- dlls/d3dx10_43/d3dx10_43_main.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx10_43/async.c b/dlls/d3dx10_43/async.c index 062a04d739cb..db46a9353f69 100644 --- a/dlls/d3dx10_43/async.c +++ b/dlls/d3dx10_43/async.c @@ -220,7 +220,7 @@ HRESULT WINAPI D3DX10CompileFromMemory(const char *data, SIZE_T data_size, const const char *target, UINT sflags, UINT eflags, ID3DX10ThreadPump *pump, ID3D10Blob **shader, ID3D10Blob **error_messages, HRESULT *hresult) { - TRACE("data %s, data_size %lu, filename %s, defines %p, include %p, entry_point %s, target %s, " + TRACE("data %s, data_size %Iu, filename %s, defines %p, include %p, entry_point %s, target %s, " "sflags %#x, eflags %#x, pump %p, shader %p, error_messages %p, hresult %p.\n", debugstr_an(data, data_size), data_size, debugstr_a(filename), defines, include, debugstr_a(entry_point), debugstr_a(target), sflags, eflags, pump, shader, @@ -261,7 +261,7 @@ HRESULT WINAPI D3DX10CreateAsyncMemoryLoader(const void *data, SIZE_T data_size, { struct asyncdataloader *object; - TRACE("data %p, data_size %lu, loader %p.\n", data, data_size, loader); + TRACE("data %p, data_size %Iu, loader %p.\n", data, data_size, loader); if (!data || !loader) return E_FAIL; @@ -398,7 +398,7 @@ HRESULT WINAPI D3DX10PreprocessShaderFromMemory(const char *data, SIZE_T data_si const D3D10_SHADER_MACRO *defines, ID3DInclude *include, ID3DX10ThreadPump *pump, ID3D10Blob **shader_text, ID3D10Blob **errors, HRESULT *hresult) { - FIXME("data %s, data_size %lu, filename %s, defines %p, include %p, pump %p, shader_text %p, " + FIXME("data %s, data_size %Iu, filename %s, defines %p, include %p, pump %p, shader_text %p, " "errors %p, hresult %p stub!\n", debugstr_an(data, data_size), data_size, debugstr_a(filename), defines, include, pump, shader_text, errors, hresult); diff --git a/dlls/d3dx10_43/d3dx10_43_main.c b/dlls/d3dx10_43/d3dx10_43_main.c index 42f29ad6239f..ec7407508d30 100644 --- a/dlls/d3dx10_43/d3dx10_43_main.c +++ b/dlls/d3dx10_43/d3dx10_43_main.c @@ -53,7 +53,7 @@ HRESULT WINAPI D3DX10CreateEffectPoolFromMemory(const void *data, SIZE_T datasiz UINT fxflags, ID3D10Device *device, ID3DX10ThreadPump *pump, ID3D10EffectPool **effectpool, ID3D10Blob **errors, HRESULT *hresult) { - FIXME("data %p, datasize %lu, filename %s, defines %p, include %p, profile %s, hlslflags %#x, fxflags %#x, " + FIXME("data %p, datasize %Iu, filename %s, defines %p, include %p, profile %s, hlslflags %#x, fxflags %#x, " "device %p, pump %p, effectpool %p, errors %p, hresult %p.\n", data, datasize, debugstr_a(filename), defines, include, debugstr_a(profile), hlslflags, fxflags, device, pump, effectpool, errors, hresult);

2 1

[PATCH 7/7] ieframe: Enable visual styles.
by Zhiyi Zhang April 13, 2022

April 13, 2022

ieframe.dll uses manifest at ID 123. However, IEWinMain() is not called from rundll32.exe or Control_RunDLL() so the manifest needs to be activated in DllMain(). This allows iexplore.exe to enable theming. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/ieframe/ieframe.manifest | 16 ++++++++++++++++ dlls/ieframe/ieframe.rc | 3 +++ dlls/ieframe/ieframe_main.c | 28 ++++++++++++++++++++++++++++ 3 files changed, 47 insertions(+) create mode 100644 dlls/ieframe/ieframe.manifest diff --git a/dlls/ieframe/ieframe.manifest b/dlls/ieframe/ieframe.manifest new file mode 100644 index 00000000000..c8fd3eb4dce --- /dev/null +++ b/dlls/ieframe/ieframe.manifest @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> +<assemblyIdentity type="win32" name="Wine.Ieframe" version="0.0.0.0"/> +<dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="*" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> +</dependency> +</assembly> diff --git a/dlls/ieframe/ieframe.rc b/dlls/ieframe/ieframe.rc index aed8483e4ce..eb05a98dbc4 100644 --- a/dlls/ieframe/ieframe.rc +++ b/dlls/ieframe/ieframe.rc @@ -108,6 +108,9 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #include "wine/wine_common_ver.rc" +/* @makedep: ieframe.manifest */ +123 RT_MANIFEST ieframe.manifest + /* @makedep: ietoolbar.bmp */ IDB_IETOOLBAR BITMAP ietoolbar.bmp diff --git a/dlls/ieframe/ieframe_main.c b/dlls/ieframe/ieframe_main.c index 8775e244d1c..2ef1c3784c0 100644 --- a/dlls/ieframe/ieframe_main.c +++ b/dlls/ieframe/ieframe_main.c @@ -17,6 +17,7 @@ */ #include "ieframe.h" +#include <commctrl.h> #include "initguid.h" #include "rpcproxy.h" @@ -30,6 +31,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(ieframe); LONG module_ref = 0; HINSTANCE ieframe_instance; +static HANDLE context = INVALID_HANDLE_VALUE; +static ULONG_PTR context_cookie; +static BOOL context_activated; static ITypeLib *typelib; static ITypeInfo *typeinfos[LAST_tid]; @@ -178,6 +182,27 @@ static const IClassFactoryVtbl CUrlHistoryFactoryVtbl = { static IClassFactory CUrlHistoryFactory = { &CUrlHistoryFactoryVtbl }; +static void activate_context(void) +{ + ACTCTXW actctx; + + memset(&actctx, 0, sizeof(actctx)); + actctx.cbSize = sizeof(actctx); + actctx.hModule = ieframe_instance; + actctx.lpResourceName = MAKEINTRESOURCEW(123); + actctx.dwFlags = ACTCTX_FLAG_HMODULE_VALID | ACTCTX_FLAG_RESOURCE_NAME_VALID; + context = CreateActCtxW(&actctx); + if (context != INVALID_HANDLE_VALUE) + context_activated = ActivateActCtx(context, &context_cookie); +} + +static void deactivate_context(void) +{ + if (context_activated) + DeactivateActCtx(0, context_cookie); + ReleaseActCtx(context); +} + /****************************************************************** * DllMain (ieframe.@) */ @@ -189,6 +214,8 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) { case DLL_PROCESS_ATTACH: ieframe_instance = hInstDLL; + activate_context(); + InitCommonControls(); register_iewindow_class(); DisableThreadLibraryCalls(ieframe_instance); break; @@ -196,6 +223,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) if (lpv) break; unregister_iewindow_class(); release_typelib(); + deactivate_context(); } return TRUE; -- 2.32.0

1 0

[PATCH 6/7] joy.cpl: Enable visual styles.
by Zhiyi Zhang April 13, 2022

April 13, 2022

joy.cpl uses manifest at ID 124. According to tests, manifest at ID 124 is not loaded automatically by rundll32.exe or Control_RunDLL(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/joy.cpl/joy.manifest | 16 ++++++++++++++++ dlls/joy.cpl/joy.rc | 3 +++ dlls/joy.cpl/main.c | 17 +++++++++++++++++ 3 files changed, 36 insertions(+) create mode 100644 dlls/joy.cpl/joy.manifest diff --git a/dlls/joy.cpl/joy.manifest b/dlls/joy.cpl/joy.manifest new file mode 100644 index 00000000000..877860e3d68 --- /dev/null +++ b/dlls/joy.cpl/joy.manifest @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> +<assemblyIdentity type="win32" name="Wine.Joy" version="0.0.0.0"/> +<dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="*" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> +</dependency> +</assembly> diff --git a/dlls/joy.cpl/joy.rc b/dlls/joy.cpl/joy.rc index 77f121c5b1c..c1d8380af37 100644 --- a/dlls/joy.cpl/joy.rc +++ b/dlls/joy.cpl/joy.rc @@ -77,6 +77,9 @@ FONT 8, "Ms Shell Dlg" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL +/* @makedep: joy.manifest */ +124 RT_MANIFEST joy.manifest + /* @makedep: joy.ico */ ICO_MAIN ICON "joy.ico" diff --git a/dlls/joy.cpl/main.c b/dlls/joy.cpl/main.c index 3ecef2d9aa8..c1f41fb0e56 100644 --- a/dlls/joy.cpl/main.c +++ b/dlls/joy.cpl/main.c @@ -992,10 +992,24 @@ static void display_cpl_sheets(HWND parent, struct JoystickData *data) { INITCOMMONCONTROLSEX icex; PROPSHEETPAGEW psp[NUM_PROPERTY_PAGES]; + BOOL activated = FALSE; PROPSHEETHEADERW psh; + ULONG_PTR cookie; + ACTCTXW actctx; + HANDLE context; DWORD id = 0; OleInitialize(NULL); + /* Activate context */ + memset(&actctx, 0, sizeof(actctx)); + actctx.cbSize = sizeof(actctx); + actctx.hModule = hcpl; + actctx.lpResourceName = MAKEINTRESOURCEW(124); + actctx.dwFlags = ACTCTX_FLAG_HMODULE_VALID | ACTCTX_FLAG_RESOURCE_NAME_VALID; + context = CreateActCtxW(&actctx); + if (context != INVALID_HANDLE_VALUE) + activated = ActivateActCtx(context, &cookie); + /* Initialize common controls */ icex.dwSize = sizeof(INITCOMMONCONTROLSEX); icex.dwICC = ICC_LISTVIEW_CLASSES | ICC_BAR_CLASSES; @@ -1039,6 +1053,9 @@ static void display_cpl_sheets(HWND parent, struct JoystickData *data) /* display the dialog */ PropertySheetW(&psh); + if (activated) + DeactivateActCtx(0, cookie); + ReleaseActCtx(context); OleUninitialize(); } -- 2.32.0

1 0

[PATCH 5/7] inetcpl.cpl: Enable visual styles.
by Zhiyi Zhang April 13, 2022

April 13, 2022

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/inetcpl.cpl/inetcpl.manifest | 16 ++++++++++++++++ dlls/inetcpl.cpl/inetcpl.rc | 5 ++++- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 dlls/inetcpl.cpl/inetcpl.manifest diff --git a/dlls/inetcpl.cpl/inetcpl.manifest b/dlls/inetcpl.cpl/inetcpl.manifest new file mode 100644 index 00000000000..81a32e4879c --- /dev/null +++ b/dlls/inetcpl.cpl/inetcpl.manifest @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> +<assemblyIdentity type="win32" name="Wine.Inetcpl" version="0.0.0.0"/> +<dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="*" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> +</dependency> +</assembly> diff --git a/dlls/inetcpl.cpl/inetcpl.rc b/dlls/inetcpl.cpl/inetcpl.rc index 0c997da59ff..7ae2a53efdf 100644 --- a/dlls/inetcpl.cpl/inetcpl.rc +++ b/dlls/inetcpl.cpl/inetcpl.rc @@ -147,7 +147,10 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #define WINE_PRODUCTVERSION_STR "8.00.6001.18939" #include "wine/wine_common_ver.rc" - + +/* @makedep: inetcpl.manifest */ +123 RT_MANIFEST inetcpl.manifest + /* @makedep: inetcpl.ico */ ICO_MAIN ICON "inetcpl.ico" ICO_INTERNET ICON "inetcpl.ico" -- 2.32.0

1 0