mirror of
git://source.winehq.org/git/wine.git
synced 2024-10-06 09:35:52 +00:00
joy.cpl: Enable visual styles.
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@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
0d093f8935
commit
9ec0f8a3d5
16
dlls/joy.cpl/joy.manifest
Normal file
16
dlls/joy.cpl/joy.manifest
Normal file
|
@ -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>
|
|
@ -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"
|
||||
|
||||
|
|
|
@ -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();
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue