December 2021 - Wine-commits

Eric Pouech : winedbg: Make savable variables size a DWORD.
by Alexandre Julliard 07 Dec '21

07 Dec '21

Module: wine Branch: master Commit: 396880ac81a7bb8c8aa7ea3fdd6ea54f30180160 URL: https://source.winehq.org/git/wine.git/?a=commit;h=396880ac81a7bb8c8aa7ea3f… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Dec 7 18:45:27 2021 +0100 winedbg: Make savable variables size a DWORD. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/debugger.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index 506a7d1797b..837384c21a8 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -254,7 +254,7 @@ extern HANDLE dbg_houtput; struct dbg_internal_var { - DWORD_PTR val; + DWORD val; const char* name; void* pval; ULONG typeid; /* always internal type */

1 0

Eric Pouech : winedbg: Make pid and tid internal variables DWORDs.
by Alexandre Julliard 07 Dec '21

07 Dec '21

Module: wine Branch: master Commit: ac3ee768c3ef6b64c5cd57c1a927e66dfd3ce95a URL: https://source.winehq.org/git/wine.git/?a=commit;h=ac3ee768c3ef6b64c5cd57c1… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Dec 7 18:45:33 2021 +0100 winedbg: Make pid and tid internal variables DWORDs. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/debugger.h | 4 ++-- programs/winedbg/stack.c | 2 +- programs/winedbg/tgt_active.c | 6 +++--- programs/winedbg/winedbg.c | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index 837384c21a8..1d3156bf8a3 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -245,9 +245,9 @@ struct be_process_io }; extern struct dbg_process* dbg_curr_process; -extern DWORD_PTR dbg_curr_pid; +extern DWORD dbg_curr_pid; extern struct dbg_thread* dbg_curr_thread; -extern DWORD_PTR dbg_curr_tid; +extern DWORD dbg_curr_tid; extern dbg_ctx_t dbg_context; extern BOOL dbg_interactiveP; extern HANDLE dbg_houtput; diff --git a/programs/winedbg/stack.c b/programs/winedbg/stack.c index 34ca6c985be..34089bcde04 100644 --- a/programs/winedbg/stack.c +++ b/programs/winedbg/stack.c @@ -409,7 +409,7 @@ static void backtrace_all(void) dbg_active_wait_for_first_exception(); } - dbg_printf("\nBacktracing for thread %04x in process %04Ix (%s):\n", + dbg_printf("\nBacktracing for thread %04x in process %04x (%s):\n", entry.th32ThreadID, dbg_curr_pid, dbg_W2A(dbg_curr_process->imageName, -1)); backtrace_tid(dbg_curr_process, entry.th32ThreadID); diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index 0993bddc985..70ad7e8b437 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -370,7 +370,7 @@ static unsigned dbg_handle_debug_event(DEBUG_EVENT* de) size = ARRAY_SIZE(u.buffer); if (!QueryFullProcessImageNameW( dbg_curr_process->handle, 0, u.buffer, &size )) { - swprintf( u.buffer, ARRAY_SIZE(u.buffer), L"Process_%08x", dbg_curr_pid); + swprintf(u.buffer, ARRAY_SIZE(u.buffer), L"Process_%08x", dbg_curr_pid); } WINE_TRACE("%04x:%04x: create process '%s'/%p @%p (%u<%u>)\n", @@ -537,12 +537,12 @@ static void dbg_resume_debuggee(DWORD cont) if (dbg_curr_thread) { if (!dbg_curr_process->be_cpu->set_context(dbg_curr_thread->handle, &dbg_context)) - dbg_printf("Cannot set ctx on %04Ix\n", dbg_curr_tid); + dbg_printf("Cannot set ctx on %04x\n", dbg_curr_tid); } } dbg_interactiveP = FALSE; if (!ContinueDebugEvent(dbg_curr_pid, dbg_curr_tid, cont)) - dbg_printf("Cannot continue on %04Ix (%08x)\n", dbg_curr_tid, cont); + dbg_printf("Cannot continue on %04x (%08x)\n", dbg_curr_tid, cont); } static void wait_exception(void) diff --git a/programs/winedbg/winedbg.c b/programs/winedbg/winedbg.c index 803a26f1e55..283b126ba84 100644 --- a/programs/winedbg/winedbg.c +++ b/programs/winedbg/winedbg.c @@ -77,8 +77,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(winedbg); struct dbg_process* dbg_curr_process = NULL; struct dbg_thread* dbg_curr_thread = NULL; -DWORD_PTR dbg_curr_tid = 0; -DWORD_PTR dbg_curr_pid = 0; +DWORD dbg_curr_tid = 0; +DWORD dbg_curr_pid = 0; dbg_ctx_t dbg_context; BOOL dbg_interactiveP = FALSE; HANDLE dbg_houtput = 0; @@ -569,7 +569,7 @@ void dbg_start_interactive(const char* filename, HANDLE hFile) if (dbg_curr_process) { - dbg_printf("WineDbg starting on pid %04Ix\n", dbg_curr_pid); + dbg_printf("WineDbg starting on pid %04x\n", dbg_curr_pid); if (dbg_curr_process->active_debuggee) dbg_active_wait_for_first_exception(); }

1 0

Eric Pouech : winedbg: Introduce dbg_lg(u)int_t and migrate all integral computations on this type.
by Alexandre Julliard 07 Dec '21

07 Dec '21

Module: wine Branch: master Commit: 53ae7824b6459e09f95721d0e82566f719a6ad45 URL: https://source.winehq.org/git/wine.git/?a=commit;h=53ae7824b6459e09f95721d0… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Dec 7 18:45:39 2021 +0100 winedbg: Introduce dbg_lg(u)int_t and migrate all integral computations on this type. As a side effect, the internal 'long int' type is now always 8 byte wide. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/dbg.y | 6 +++--- programs/winedbg/debug.l | 8 ++++---- programs/winedbg/debugger.h | 21 +++++++++++++++++---- programs/winedbg/expr.c | 40 ++++++++++++++++++++-------------------- programs/winedbg/memory.c | 2 +- programs/winedbg/types.c | 28 +++++++++++++++++++++++----- 6 files changed, 68 insertions(+), 37 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=53ae7824b6459e09f957…

1 0

Eric Pouech : winedbg: Remove methods for fetching/storing integers in CPU backends.
by Alexandre Julliard 07 Dec '21

07 Dec '21

Module: wine Branch: master Commit: e656c29e59db26f0a29c370e8b99956cd42ce058 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e656c29e59db26f0a29c370e… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Dec 7 18:45:45 2021 +0100 winedbg: Remove methods for fetching/storing integers in CPU backends. All integer code assume CPU of debuggee encode integers: - little endian - 2 complement for signed integers. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/be_arm.c | 30 ------------------------------ programs/winedbg/be_arm64.c | 30 ------------------------------ programs/winedbg/be_cpu.h | 4 ---- programs/winedbg/be_i386.c | 30 ------------------------------ programs/winedbg/be_x86_64.c | 30 ------------------------------ programs/winedbg/debugger.h | 3 +++ programs/winedbg/memory.c | 40 ++++++++++++++++++++++++++++++++++------ programs/winedbg/types.c | 15 +++++++-------- 8 files changed, 44 insertions(+), 138 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e656c29e59db26f0a29c…

1 0

Eric Pouech : winedbg: Renamed extract_longlong() into extract_lgint() for clarity.
by Alexandre Julliard 07 Dec '21

07 Dec '21

Module: wine Branch: master Commit: 9b8d043cc846a826046216ae2990c766214fe853 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b8d043cc846a826046216ae… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Dec 7 18:45:51 2021 +0100 winedbg: Renamed extract_longlong() into extract_lgint() for clarity. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/debugger.h | 2 +- programs/winedbg/memory.c | 4 ++-- programs/winedbg/types.c | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index c3bc3c76fbe..5da569574f7 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -465,7 +465,7 @@ extern void print_value(const struct dbg_lvalue* addr, char format, extern BOOL types_print_type(const struct dbg_type*, BOOL details); extern BOOL print_types(void); extern dbg_lgint_t types_extract_as_integer(const struct dbg_lvalue*); -extern dbg_lgint_t types_extract_as_longlong(const struct dbg_lvalue*, unsigned* psize, BOOL *pissigned); +extern dbg_lgint_t types_extract_as_lgint(const struct dbg_lvalue*, unsigned* psize, BOOL *pissigned); extern void types_extract_as_address(const struct dbg_lvalue*, ADDRESS64*); extern BOOL types_store_value(struct dbg_lvalue* lvalue_to, const struct dbg_lvalue* lvalue_from); extern BOOL types_udt_find_element(struct dbg_lvalue* value, const char* name, ULONG *tmpbuf); diff --git a/programs/winedbg/memory.c b/programs/winedbg/memory.c index 4fb62e9e9d5..db4060d816a 100644 --- a/programs/winedbg/memory.c +++ b/programs/winedbg/memory.c @@ -537,7 +537,7 @@ void print_basic(const struct dbg_lvalue* lvalue, char format) if (format != 0) { unsigned size; - dbg_lgint_t res = types_extract_as_longlong(lvalue, &size, NULL); + dbg_lgint_t res = types_extract_as_lgint(lvalue, &size, NULL); WCHAR wch; switch (format) @@ -570,7 +570,7 @@ void print_basic(const struct dbg_lvalue* lvalue, char format) } if (lvalue->type.id == dbg_itype_segptr) { - dbg_print_longlong(types_extract_as_longlong(lvalue, NULL, NULL), TRUE); + dbg_print_longlong(types_extract_as_lgint(lvalue, NULL, NULL), TRUE); } else print_typed_basic(lvalue); } diff --git a/programs/winedbg/types.c b/programs/winedbg/types.c index 5c8969d8e23..74ba06cc31c 100644 --- a/programs/winedbg/types.c +++ b/programs/winedbg/types.c @@ -47,13 +47,13 @@ BOOL types_get_real_type(struct dbg_type* type, DWORD* tag) } /****************************************************************** - * types_extract_as_longlong + * types_extract_as_lgint * * Given a lvalue, try to get an integral (or pointer/address) value * out of it */ -dbg_lgint_t types_extract_as_longlong(const struct dbg_lvalue* lvalue, - unsigned* psize, BOOL *issigned) +dbg_lgint_t types_extract_as_lgint(const struct dbg_lvalue* lvalue, + unsigned* psize, BOOL *issigned) { dbg_lgint_t rtn = 0; DWORD tag, bt; @@ -138,7 +138,7 @@ dbg_lgint_t types_extract_as_longlong(const struct dbg_lvalue* lvalue, */ dbg_lgint_t types_extract_as_integer(const struct dbg_lvalue* lvalue) { - return types_extract_as_longlong(lvalue, NULL, NULL); + return types_extract_as_lgint(lvalue, NULL, NULL); } /****************************************************************** @@ -155,7 +155,7 @@ void types_extract_as_address(const struct dbg_lvalue* lvalue, ADDRESS64* addr) else { addr->Mode = AddrModeFlat; - addr->Offset = types_extract_as_longlong(lvalue, NULL, NULL); + addr->Offset = types_extract_as_lgint(lvalue, NULL, NULL); } }

1 0

Damjan Jovanovic : ntdll: Implement fill_battery_state() on FreeBSD.
by Alexandre Julliard 07 Dec '21

07 Dec '21

Module: wine Branch: master Commit: 36af18a4f13b5e9ffbf8be71ea0aaad7321cefb4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=36af18a4f13b5e9ffbf8be71… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Sat Dec 4 13:23:51 2021 +0200 ntdll: Implement fill_battery_state() on FreeBSD. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/system.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index 941c69190fb..d1a40e47bbf 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -3516,6 +3516,51 @@ static NTSTATUS fill_battery_state( SYSTEM_BATTERY_STATE *bs ) return STATUS_SUCCESS; } +#elif defined(__FreeBSD__) + +#include <dev/acpica/acpiio.h> + +static NTSTATUS fill_battery_state( SYSTEM_BATTERY_STATE *bs ) +{ + size_t len; + int state = 0; + int rate_mW = 0; + int time_mins = -1; + int life_percent = 0; + + bs->BatteryPresent = TRUE; + len = sizeof(state); + bs->BatteryPresent &= !sysctlbyname("hw.acpi.battery.state", &state, &len, NULL, 0); + len = sizeof(rate_mW); + bs->BatteryPresent &= !sysctlbyname("hw.acpi.battery.rate", &rate_mW, &len, NULL, 0); + len = sizeof(time_mins); + bs->BatteryPresent &= !sysctlbyname("hw.acpi.battery.time", &time_mins, &len, NULL, 0); + len = sizeof(life_percent); + bs->BatteryPresent &= !sysctlbyname("hw.acpi.battery.life", &life_percent, &len, NULL, 0); + + if (bs->BatteryPresent) + { + bs->AcOnLine = (time_mins == -1); + bs->Charging = state & ACPI_BATT_STAT_CHARGING; + bs->Discharging = state & ACPI_BATT_STAT_DISCHARG; + + bs->Rate = (rate_mW >= 0 ? -rate_mW : 0); + if (time_mins >= 0 && life_percent > 0) + { + bs->EstimatedTime = 60 * time_mins; + bs->RemainingCapacity = bs->EstimatedTime * rate_mW / 3600; + bs->MaxCapacity = bs->RemainingCapacity * 100 / life_percent; + } + else + { + bs->EstimatedTime = ~0u; + bs->RemainingCapacity = life_percent; + bs->MaxCapacity = 100; + } + } + return STATUS_SUCCESS; +} + #else static NTSTATUS fill_battery_state( SYSTEM_BATTERY_STATE *bs )

1 0

Damjan Jovanovic : server: FreeBSD 14-CURRENT's sched_setaffinity() needs _WITH_CPU_SET_T defined.
by Alexandre Julliard 07 Dec '21

07 Dec '21

Module: wine Branch: master Commit: 316a358b0f718d4c81d331993ebc22543c029bf1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=316a358b0f718d4c81d33199… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Mon Dec 6 03:52:13 2021 +0200 server: FreeBSD 14-CURRENT's sched_setaffinity() needs _WITH_CPU_SET_T defined. FreeBSD 14-CURRENT got the non-standard sched_setaffinity() function, but it uses FreeBSD's cpuset_t type instead of Linux's cpu_set_t (also non-standard). This breaks the build. We have to define _WITH_CPU_SET_T before including <sched.h> to get that type named cpu_set_t instead. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/thread.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/server/thread.c b/server/thread.c index e9240a05659..296f7a5d265 100644 --- a/server/thread.c +++ b/server/thread.c @@ -33,6 +33,8 @@ #include <time.h> #include <poll.h> #ifdef HAVE_SCHED_H +/* FreeBSD needs this for cpu_set_t intead of its cpuset_t */ +#define _WITH_CPU_SET_T #include <sched.h> #endif

1 0

Zhiyi Zhang : include: Add more EnableThemeDialogTexture() option flags.
by Alexandre Julliard 07 Dec '21

07 Dec '21

Module: wine Branch: master Commit: 15eef4c8f7fad3f8df5f1b5fb42999e53cbcd6b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=15eef4c8f7fad3f8df5f1b5f… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Dec 7 17:12:43 2021 +0800 include: Add more EnableThemeDialogTexture() option flags. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/uxtheme.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/uxtheme.h b/include/uxtheme.h index 384c3655b41..b44e06de611 100644 --- a/include/uxtheme.h +++ b/include/uxtheme.h @@ -96,7 +96,10 @@ HRESULT WINAPI DrawThemeTextEx(HTHEME,HDC,int,int,LPCWSTR,int,DWORD,RECT*, #define ETDT_DISABLE 0x00000001 #define ETDT_ENABLE 0x00000002 #define ETDT_USETABTEXTURE 0x00000004 +#define ETDT_USEAEROWIZARDTABTEXTURE 0x00000008 #define ETDT_ENABLETAB (ETDT_ENABLE|ETDT_USETABTEXTURE) +#define ETDT_ENABLEAEROWIZARDTAB (ETDT_ENABLE|ETDT_USEAEROWIZARDTABTEXTURE) +#define ETDT_VALIDBITS (ETDT_DISABLE|ETDT_ENABLE|ETDT_USETABTEXTURE|ETDT_USEAEROWIZARDTABTEXTURE) HRESULT WINAPI EnableThemeDialogTexture(HWND,DWORD); HRESULT WINAPI EnableTheming(BOOL);

1 0

Zhiyi Zhang : comctl32/tests: Test WM_CTLCOLORSTATIC for themed property sheets.
by Alexandre Julliard 07 Dec '21

07 Dec '21

Module: wine Branch: master Commit: ee1b19aa161b9b582b40ca7cf0f648210181ad6b URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee1b19aa161b9b582b40ca7c… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Dec 7 17:12:55 2021 +0800 comctl32/tests: Test WM_CTLCOLORSTATIC for themed property sheets. These tests show that it's the themed property sheet page window procedure that sets device contexts transparent and return a pattern brush created from the tab body part in a theme. Combined with test_WM_CTLCOLORSTATIC() in dlls/comctl32/tests/static.c, we can conclude that UXTHEME_DefDlgProc() shouldn't handle WM_CTLCOLORSTATIC. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/propsheet.c | 326 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 324 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ee1b19aa161b9b582b40…

1 0

Zhiyi Zhang : comctl32/propsheet: Handle WM_CTLCOLORSTATIC in the property sheet page window procedure.
by Alexandre Julliard 07 Dec '21

07 Dec '21

Module: wine Branch: master Commit: b1ccad4b5cb0ec763b046ad2f2739c95dc42c7b4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b1ccad4b5cb0ec763b046ad2… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Dec 7 17:13:03 2021 +0800 comctl32/propsheet: Handle WM_CTLCOLORSTATIC in the property sheet page window procedure. Move themed WM_CTLCOLORSTATIC handling from UXTHEME_DefDlgProc() to the property sheet page window procedure. Fix a regression from 2f1bbd8 that makes the static controls in file open dialog to have black background when using some themes. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51987 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/propsheet.c | 42 +++++++++++++++++++++++++++++++++++++++++ dlls/comctl32/tests/propsheet.c | 12 +++--------- dlls/comctl32/tests/static.c | 5 ----- dlls/uxtheme/dialog.c | 28 --------------------------- 4 files changed, 45 insertions(+), 42 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index 556d63f2c75..4fe80241855 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -1196,6 +1196,36 @@ PROPSHEET_WizardSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, return DefSubclassProc(hwnd, uMsg, wParam, lParam); } +/* Subclassing window procedure for theming dialogs in property sheet pages */ +static LRESULT CALLBACK PROPSHEET_ThemedSubclassProc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp, + UINT_PTR id, DWORD_PTR ref) +{ + WNDPROC dlgproc; + LRESULT lr; + HDC hdc; + + switch (msg) + { + case WM_CTLCOLORSTATIC: + { + if (!IsThemeActive() || !IsThemeDialogTextureEnabled(hwnd)) + break; + + dlgproc = (WNDPROC)GetWindowLongPtrW(hwnd, DWLP_DLGPROC); + lr = CallWindowProcW(dlgproc, hwnd, msg, wp, lp); + if (lr) + return lr; + + hdc = (HDC)wp; + SetBkColor(hdc, GetSysColor(COLOR_BTNFACE)); + SetBkMode(hdc, TRANSPARENT); + return (LRESULT)GetStockObject(NULL_BRUSH); + } + } + + return DefSubclassProc(hwnd, msg, wp, lp); +} + /* * Get the size of an in-memory Template * @@ -1467,6 +1497,10 @@ static BOOL PROPSHEET_CreatePage(HWND hwndParent, SetWindowSubclass(hwndPage, PROPSHEET_WizardSubclassProc, 1, (DWORD_PTR)ppshpage); } + else + { + SetWindowSubclass(hwndPage, PROPSHEET_ThemedSubclassProc, 1, (DWORD_PTR)ppshpage); + } if (!(psInfo->ppshheader.dwFlags & INTRNL_ANY_WIZARD)) EnableThemeDialogTexture (hwndPage, ETDT_ENABLETAB); @@ -2408,6 +2442,10 @@ static BOOL PROPSHEET_RemovePage(HWND hwndDlg, RemoveWindowSubclass(psInfo->proppage[index].hwndPage, PROPSHEET_WizardSubclassProc, 1); } + else + { + RemoveWindowSubclass(psInfo->proppage[index].hwndPage, PROPSHEET_ThemedSubclassProc, 1); + } /* Destroy page dialog window */ DestroyWindow(psInfo->proppage[index].hwndPage); @@ -2725,6 +2763,10 @@ static void PROPSHEET_CleanUp(HWND hwndDlg) RemoveWindowSubclass(psInfo->proppage[i].hwndPage, PROPSHEET_WizardSubclassProc, 1); } + else + { + RemoveWindowSubclass(psInfo->proppage[i].hwndPage, PROPSHEET_ThemedSubclassProc, 1); + } if(psInfo->proppage[i].hwndPage) DestroyWindow(psInfo->proppage[i].hwndPage); diff --git a/dlls/comctl32/tests/propsheet.c b/dlls/comctl32/tests/propsheet.c index eaaa00efe97..199b280879e 100644 --- a/dlls/comctl32/tests/propsheet.c +++ b/dlls/comctl32/tests/propsheet.c @@ -1298,13 +1298,11 @@ static void test_WM_CTLCOLORSTATIC(void) /* Test that device context is set to transparent after WM_CTLCOLORSTATIC */ mode = SetBkMode(child_hdc, old_mode); - todo_wine_if(pGetWindowTheme(sheethwnd) == NULL) ok(mode == TRANSPARENT, "Expected mode %#x, got %#x.\n", TRANSPARENT, mode); /* Test that the brush is a pattern brush created from the tab body bitmap in the theme */ - todo_wine_if(pGetWindowTheme(sheethwnd) == NULL) ok(hbrush != GetSysColorBrush(COLOR_BTNFACE), "Expected a different brush.\n"); - todo_wine_if(pGetWindowTheme(sheethwnd) != NULL) + todo_wine_if(is_theme_active) ok(hbrush != GetStockObject(NULL_BRUSH), "Expected a different brush.\n"); hbrush2 = SelectObject(child_hdc, GetSysColorBrush(COLOR_BTNFACE)); ok(hbrush2 != hbrush, "Expected a different brush.\n"); @@ -1312,7 +1310,6 @@ static void test_WM_CTLCOLORSTATIC(void) memset(&log_brush, 0, sizeof(log_brush)); count = GetObjectA(hbrush, sizeof(log_brush), &log_brush); ok(count == sizeof(log_brush), "GetObjectA failed, error %u.\n", GetLastError()); - todo_wine_if(pGetWindowTheme(sheethwnd) == NULL) ok(log_brush.lbColor == 0, "Expected brush color %#x, got %#x.\n", 0, log_brush.lbColor); todo_wine ok(log_brush.lbStyle == BS_PATTERN, "Expected brush style %#x, got %#x.\n", BS_PATTERN, @@ -1360,10 +1357,8 @@ static void test_WM_CTLCOLORSTATIC(void) old_mode = SetBkMode(hdc, OPAQUE); ok(old_mode != 0, "SetBkMode failed.\n"); hbrush2 = (HBRUSH)SendMessageW(sheethwnd, WM_CTLCOLORSTATIC, (WPARAM)hdc, (LPARAM)hwnd); - todo_wine_if(pGetWindowTheme(sheethwnd) != NULL) ok(hbrush2 == hbrush, "Expected the same brush.\n"); mode = SetBkMode(hdc, old_mode); - todo_wine ok(mode == TRANSPARENT, "Expected mode %#x, got %#x.\n", TRANSPARENT, mode); ReleaseDC(hwnd, hdc); DestroyWindow(hwnd); @@ -1374,7 +1369,6 @@ static void test_WM_CTLCOLORSTATIC(void) hr = pEnableThemeDialogTexture(sheethwnd, ETDT_DISABLE); ok(hr == S_OK, "EnableThemeDialogTexture failed, hr %#x.\n", hr); hbrush2 = (HBRUSH)SendMessageW(sheethwnd, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); - todo_wine_if(pGetWindowTheme(sheethwnd) == NULL) ok(hbrush2 != hbrush, "Expected a different brush.\n"); ok(hbrush2 == GetSysColorBrush(COLOR_BTNFACE), "Expected brush %p, got %p.\n", GetSysColorBrush(COLOR_BTNFACE), hbrush2); @@ -1456,11 +1450,11 @@ static void test_WM_CTLCOLORSTATIC(void) ok(ret, "GetBrushOrgEx failed, error %u.\n", GetLastError()); ok(org.x == 0 && org.y == 0, "Expected (0,0), got %s.\n", wine_dbgstr_point(&org)); - todo_wine_if(pGetWindowTheme(sheethwnd) != NULL) + todo_wine_if(is_theme_active) ok(hbrush == GetSysColorBrush(COLOR_BTNFACE), "Expected brush %p, got %p.\n", GetSysColorBrush(COLOR_BTNFACE), hbrush); mode = SetBkMode(child_hdc, old_mode); - todo_wine_if(pGetWindowTheme(sheethwnd) != NULL) + todo_wine_if(is_theme_active) ok(mode == OPAQUE, "Expected mode %#x, got %#x.\n", OPAQUE, mode); } color = SetBkColor(child_hdc, old_color); diff --git a/dlls/comctl32/tests/static.c b/dlls/comctl32/tests/static.c index ce21e03df3c..b507cf1e02b 100644 --- a/dlls/comctl32/tests/static.c +++ b/dlls/comctl32/tests/static.c @@ -42,7 +42,6 @@ static int g_nReceivedColorStatic; static HRESULT (WINAPI *pEnableThemeDialogTexture)(HWND, DWORD); static HTHEME (WINAPI *pGetWindowTheme)(HWND); -static BOOL (WINAPI *pIsThemeActive)(void); static BOOL (WINAPI *pIsThemeDialogTextureEnabled)(HWND); /* try to make sure pending X events have been processed before continuing */ @@ -452,14 +451,12 @@ static void test_WM_CTLCOLORSTATIC(void) ok(pGetWindowTheme(dialog) == NULL, "Expected NULL theme handle.\n"); brush = (HBRUSH)SendMessageW(dialog, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); - todo_wine_if(todo) ok(brush == GetSysColorBrush(COLOR_BTNFACE), "Expected brush %p, got %p.\n", GetSysColorBrush(COLOR_BTNFACE), brush); color = SetBkColor(child_hdc, old_color); ok(color == GetSysColor(COLOR_BTNFACE), "Expected background color %#x, got %#x.\n", GetSysColor(COLOR_BTNFACE), color); mode = SetBkMode(child_hdc, old_mode); - todo_wine_if(todo) ok(mode == OPAQUE, "Expected mode %#x, got %#x.\n", OPAQUE, mode); color = GetPixel(dialog_hdc, 40, 40); ok(color == 0, "Expected pixel %#x, got %#x.\n", 0, color); @@ -475,7 +472,6 @@ static void test_WM_CTLCOLORSTATIC(void) ok(ret, "Expected theme dialog texture enabled.\n"); brush = (HBRUSH)SendMessageW(dialog, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); - todo_wine_if(pIsThemeActive()) ok(brush == GetSysColorBrush(COLOR_BTNFACE), "Expected brush %p, got %p.\n", GetSysColorBrush(COLOR_BTNFACE), brush); @@ -497,7 +493,6 @@ static void init_functions(void) #define X(f) p##f = (void *)GetProcAddress(uxtheme, #f); X(EnableThemeDialogTexture) X(GetWindowTheme) - X(IsThemeActive) X(IsThemeDialogTextureEnabled) #undef X } diff --git a/dlls/uxtheme/dialog.c b/dlls/uxtheme/dialog.c index d0055e013a0..bbfdaba639b 100644 --- a/dlls/uxtheme/dialog.c +++ b/dlls/uxtheme/dialog.c @@ -89,34 +89,6 @@ LRESULT WINAPI UXTHEME_DefDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPa return 1; } - case WM_CTLCOLORSTATIC: - if (!doTheming) return user_api.pDefDlgProc(hWnd, msg, wParam, lParam, unicode); - { - WNDPROC dlgp = (WNDPROC)GetWindowLongPtrW (hWnd, DWLP_DLGPROC); - LRESULT result = CallWindowProcW(dlgp, hWnd, msg, wParam, lParam); - if (!result) - { - /* Override defaults with more suitable values when themed */ - HDC controlDC = (HDC)wParam; - HWND controlWnd = (HWND)lParam; - WCHAR controlClass[32]; - - GetClassNameW (controlWnd, controlClass, ARRAY_SIZE(controlClass)); - if (lstrcmpiW (controlClass, WC_STATICW) == 0) - { - SetBkColor(controlDC, GetSysColor(COLOR_BTNFACE)); - SetBkMode (controlDC, TRANSPARENT); - - /* Return NULL brush since we painted the BG already */ - return (LRESULT)GetStockObject (NULL_BRUSH); - } - else - return user_api.pDefDlgProc(hWnd, msg, wParam, lParam, unicode); - - } - return result; - } - default: /* Call old proc */ return user_api.pDefDlgProc(hWnd, msg, wParam, lParam, unicode);

1 0