wine-devel April 2022

wine-devel@winehq.org

87 participants
938 discussions

[PATCH 01/10] jscript: Accept DISPATCH_PROPERTYPUTREF for jsdisps.
by Gabriel Ivăncescu 13 Apr '22

13 Apr '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45493 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- We already treat all objects as references anyway. dlls/jscript/dispex.c | 2 + dlls/jscript/tests/run.c | 94 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 96 insertions(+) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 319617b..7f4d1e1 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -1627,6 +1627,8 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc } break; } + case DISPATCH_PROPERTYPUTREF | DISPATCH_PROPERTYPUT: + case DISPATCH_PROPERTYPUTREF: case DISPATCH_PROPERTYPUT: { jsval_t val; DWORD i; diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index 5e797a1..e4408be 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -2787,6 +2787,91 @@ static void test_retval(void) close_script(engine); } +static void test_propputref(void) +{ + static DISPID propput_dispid = DISPID_PROPERTYPUT; + DISPPARAMS dp = {0}, dp_get = {0}; + IActiveScript *script, *script2; + IDispatch *disp, *obj; + HRESULT hres; + VARIANT v; + DISPID id; + BSTR str; + + hres = parse_script_expr(L"new Object()", &v, &script2); + ok(hres == S_OK, "parse_script_expr failed: %08lx\n", hres); + ok(V_VT(&v) == VT_DISPATCH, "V_VT(v) = %d\n", V_VT(&v)); + obj = V_DISPATCH(&v); + + hres = parse_script_expr(L"var disp = new Object(); disp.a = disp; disp", &v, &script); + ok(hres == S_OK, "parse_script_expr failed: %08lx\n", hres); + ok(V_VT(&v) == VT_DISPATCH, "V_VT(v) = %d\n", V_VT(&v)); + disp = V_DISPATCH(&v); + + str = SysAllocString(L"a"); + hres = IDispatch_GetIDsOfNames(disp, &IID_NULL, &str, 1, 0, &id); + ok(hres == S_OK, "GetIDsOfNames failed: %08lx\n", hres); + SysFreeString(str); + + dp.cArgs = dp.cNamedArgs = 1; + dp.rgdispidNamedArgs = &propput_dispid; + dp.rgvarg = &v; + V_VT(&v) = VT_DISPATCH; + V_DISPATCH(&v) = obj; + hres = IDispatch_Invoke(disp, id, &IID_NULL, 0, DISPATCH_PROPERTYPUTREF, &dp, NULL, NULL, NULL); + ok(hres == S_OK, "Invoke failed: %08lx\n", hres); + V_VT(&v) = VT_EMPTY; + hres = IDispatch_Invoke(disp, id, &IID_NULL, 0, DISPATCH_PROPERTYGET, &dp_get, &v, NULL, NULL); + ok(hres == S_OK, "Invoke failed: %08lx\n", hres); + ok(V_VT(&v) == VT_DISPATCH, "V_VT(v) = %d\n", V_VT(&v)); + ok(V_DISPATCH(&v) == obj, "V_DISPATCH(v) = %p\n", V_DISPATCH(&v)); + VariantClear(&v); + + V_VT(&v) = VT_DISPATCH; + V_DISPATCH(&v) = obj; + hres = IDispatch_Invoke(disp, id, &IID_NULL, 0, DISPATCH_PROPERTYPUTREF | DISPATCH_PROPERTYPUT, &dp, NULL, NULL, NULL); + ok(hres == S_OK, "Invoke failed: %08lx\n", hres); + V_VT(&v) = VT_EMPTY; + hres = IDispatch_Invoke(disp, id, &IID_NULL, 0, DISPATCH_PROPERTYGET, &dp_get, &v, NULL, NULL); + ok(hres == S_OK, "Invoke failed: %08lx\n", hres); + ok(V_VT(&v) == VT_DISPATCH, "V_VT(v) = %d\n", V_VT(&v)); + ok(V_DISPATCH(&v) == obj, "V_DISPATCH(v) = %p\n", V_DISPATCH(&v)); + IDispatch_Release(obj); + close_script(script2); + VariantClear(&v); + + V_VT(&v) = VT_DISPATCH; + V_DISPATCH(&v) = NULL; + hres = IDispatch_Invoke(disp, id, &IID_NULL, 0, DISPATCH_PROPERTYPUTREF, &dp, NULL, NULL, NULL); + ok(hres == S_OK, "Invoke failed: %08lx\n", hres); + V_VT(&v) = VT_EMPTY; + hres = IDispatch_Invoke(disp, id, &IID_NULL, 0, DISPATCH_PROPERTYGET, &dp_get, &v, NULL, NULL); + ok(hres == S_OK, "Invoke failed: %08lx\n", hres); + ok(V_VT(&v) == VT_DISPATCH, "V_VT(v) = %d\n", V_VT(&v)); + ok(!V_DISPATCH(&v), "V_DISPATCH(v) = %p\n", V_DISPATCH(&v)); + + V_VT(&v) = VT_EMPTY; + hres = IDispatch_Invoke(disp, id, &IID_NULL, 0, DISPATCH_PROPERTYPUTREF, &dp, NULL, NULL, NULL); + ok(hres == S_OK, "Invoke failed: %08lx\n", hres); + V_VT(&v) = VT_EMPTY; + hres = IDispatch_Invoke(disp, id, &IID_NULL, 0, DISPATCH_PROPERTYGET, &dp_get, &v, NULL, NULL); + ok(hres == S_OK, "Invoke failed: %08lx\n", hres); + ok(V_VT(&v) == VT_EMPTY, "V_VT(v) = %d\n", V_VT(&v)); + + V_VT(&v) = VT_I4; + V_I4(&v) = 42; + hres = IDispatch_Invoke(disp, id, &IID_NULL, 0, DISPATCH_PROPERTYPUTREF, &dp, NULL, NULL, NULL); + ok(hres == S_OK, "Invoke failed: %08lx\n", hres); + V_VT(&v) = VT_EMPTY; + hres = IDispatch_Invoke(disp, id, &IID_NULL, 0, DISPATCH_PROPERTYGET, &dp_get, &v, NULL, NULL); + ok(hres == S_OK, "Invoke failed: %08lx\n", hres); + ok(V_VT(&v) == VT_I4, "V_VT(v) = %d\n", V_VT(&v)); + ok(V_I4(&v) == 42, "V_I4(v) = %ld\n", V_I4(&v)); + + IDispatch_Release(disp); + close_script(script); +} + static void test_default_value(void) { static DISPID propput_dispid = DISPID_PROPERTYPUT; @@ -2888,6 +2973,10 @@ static void test_default_value(void) V_VT(&v) = VT_EMPTY; hres = IDispatch_Invoke(disp, DISPID_VALUE, &IID_NULL, 0, DISPATCH_PROPERTYPUT, &dp, NULL, NULL, NULL); ok(hres == DISP_E_MEMBERNOTFOUND, "Invoke failed: %08lx\n", hres); + hres = IDispatch_Invoke(disp, DISPID_VALUE, &IID_NULL, 0, DISPATCH_PROPERTYPUTREF, &dp, NULL, NULL, NULL); + ok(hres == DISP_E_MEMBERNOTFOUND, "Invoke failed: %08lx\n", hres); + hres = IDispatch_Invoke(disp, DISPID_VALUE, &IID_NULL, 0, DISPATCH_PROPERTYPUTREF | DISPATCH_PROPERTYPUT, &dp, NULL, NULL, NULL); + ok(hres == DISP_E_MEMBERNOTFOUND, "Invoke failed: %08lx\n", hres); IDispatch_Release(disp); close_script(script); @@ -2899,6 +2988,10 @@ static void test_default_value(void) V_VT(&v) = VT_EMPTY; hres = IDispatch_Invoke(disp, DISPID_VALUE, &IID_NULL, 0, DISPATCH_PROPERTYPUT, &dp, NULL, NULL, NULL); ok(hres == DISP_E_MEMBERNOTFOUND, "Invoke failed: %08lx\n", hres); + hres = IDispatch_Invoke(disp, DISPID_VALUE, &IID_NULL, 0, DISPATCH_PROPERTYPUTREF, &dp, NULL, NULL, NULL); + ok(hres == DISP_E_MEMBERNOTFOUND, "Invoke failed: %08lx\n", hres); + hres = IDispatch_Invoke(disp, DISPID_VALUE, &IID_NULL, 0, DISPATCH_PROPERTYPUTREF | DISPATCH_PROPERTYPUT, &dp, NULL, NULL, NULL); + ok(hres == DISP_E_MEMBERNOTFOUND, "Invoke failed: %08lx\n", hres); IDispatch_Release(disp); close_script(script); } @@ -2968,6 +3061,7 @@ static void test_script_exprs(void) VariantClear(&v); test_default_value(); + test_propputref(); test_retval(); testing_expr = FALSE; -- 2.34.1

3 19

[PATCH] server: clear area when file size is not full page.
by chen 13 Apr '22

13 Apr '22

1 0

[PATCH] server: clear area when file size is not full page.
by Jiangyi Chen 13 Apr '22

13 Apr '22

1 0

[PATCH v2 6/7] joy.cpl: Enable visual styles.
by Zhiyi Zhang 13 Apr '22

13 Apr '22

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 v2 5/7] inetcpl.cpl: Enable visual styles.
by Zhiyi Zhang 13 Apr '22

13 Apr '22

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 13 Apr '22

13 Apr '22

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 13 Apr '22

13 Apr '22

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 13 Apr '22

13 Apr '22

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 13 Apr '22

13 Apr '22

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 13 Apr '22

13 Apr '22

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

← Newer
1
...
57
58
59
60
61
62
63
...
94
Older →

Jump to page:

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-devel April 2022