November 2022 - Wine-commits

Rémi Bernon : joy.cpl: Always start input threads and remove num_ff member.
by Alexandre Julliard 29 Nov '22

29 Nov '22

Module: wine Branch: master Commit: eb00dd0db1cb196a48ec113892b5a165314c9cf4 URL: https://gitlab.winehq.org/wine/wine/-/commit/eb00dd0db1cb196a48ec113892b5a1… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Nov 26 21:47:52 2022 +0100 joy.cpl: Always start input threads and remove num_ff member. --- dlls/joy.cpl/main.c | 35 ++++++++++++----------------------- 1 file changed, 12 insertions(+), 23 deletions(-) diff --git a/dlls/joy.cpl/main.c b/dlls/joy.cpl/main.c index f2d4212b0aa..ab2314bad5f 100644 --- a/dlls/joy.cpl/main.c +++ b/dlls/joy.cpl/main.c @@ -92,7 +92,6 @@ struct Graphics struct JoystickData { IDirectInput8W *di; - int num_ff; struct Graphics graphics; BOOL stop; }; @@ -270,7 +269,6 @@ static BOOL CALLBACK enum_devices( const DIDEVICEINSTANCEW *instance, void *cont IDirectInputDevice8_SetDataFormat( entry->device, &c_dfDIJoystick ); IDirectInputDevice8_GetCapabilities( entry->device, &caps ); - if (caps.dwFlags & DIDC_FORCEFEEDBACK) data->num_ff++; /* Set axis range to ease the GUI visualization */ proprange.diph.dwSize = sizeof(DIPROPRANGE); @@ -846,17 +844,13 @@ static INT_PTR CALLBACK test_dlgproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM refresh_test_joystick_list(hwnd, data); - /* Initialize input thread */ - if (!list_empty( &devices )) - { - data->stop = FALSE; + data->stop = FALSE; - /* Set the first joystick as default */ - SendDlgItemMessageW(hwnd, IDC_TESTSELECTCOMBO, CB_SETCURSEL, 0, 0); - test_handle_joychange(hwnd, data); + /* Set the first joystick as default */ + SendDlgItemMessageW(hwnd, IDC_TESTSELECTCOMBO, CB_SETCURSEL, 0, 0); + test_handle_joychange(hwnd, data); - thread = CreateThread(NULL, 0, input_thread, (void*) data, 0, &tid); - } + thread = CreateThread(NULL, 0, input_thread, (void*) data, 0, &tid); } break; @@ -1079,20 +1073,15 @@ static INT_PTR CALLBACK ff_dlgproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lp case PSN_SETACTIVE: refresh_ff_joystick_list(hwnd, data); - if (data->num_ff > 0) - { - DWORD tid; - - data->stop = FALSE; - /* Set the first joystick as default */ - SendDlgItemMessageW(hwnd, IDC_FFSELECTCOMBO, CB_SETCURSEL, 0, 0); - ff_handle_joychange( hwnd ); + data->stop = FALSE; + /* Set the first joystick as default */ + SendDlgItemMessageW(hwnd, IDC_FFSELECTCOMBO, CB_SETCURSEL, 0, 0); + ff_handle_joychange( hwnd ); - SendDlgItemMessageW(hwnd, IDC_FFEFFECTLIST, LB_SETCURSEL, 0, 0); - ff_handle_effectchange( hwnd ); + SendDlgItemMessageW(hwnd, IDC_FFEFFECTLIST, LB_SETCURSEL, 0, 0); + ff_handle_effectchange( hwnd ); - thread = CreateThread(NULL, 0, ff_input_thread, (void*) data, 0, &tid); - } + thread = CreateThread(NULL, 0, ff_input_thread, (void*) data, 0, NULL); break; case PSN_RESET: /* intentional fall-through */

1 0

Rémi Bernon : joy.cpl: Use a notification event rather than polling state.
by Alexandre Julliard 29 Nov '22

29 Nov '22

Module: wine Branch: master Commit: a2a80136875f4c0f504d5b84c3ecf04e06ef28ca URL: https://gitlab.winehq.org/wine/wine/-/commit/a2a80136875f4c0f504d5b84c3ecf0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Nov 26 23:16:15 2022 +0100 joy.cpl: Use a notification event rather than polling state. --- dlls/joy.cpl/main.c | 55 +++++++++++++++++++++++++---------------------------- 1 file changed, 26 insertions(+), 29 deletions(-) diff --git a/dlls/joy.cpl/main.c b/dlls/joy.cpl/main.c index ab2314bad5f..cc1ce800445 100644 --- a/dlls/joy.cpl/main.c +++ b/dlls/joy.cpl/main.c @@ -113,6 +113,8 @@ static IDirectInputEffect *effect_selected; static struct list devices = LIST_INIT( devices ); static IDirectInputDevice8W *device_selected; +static HANDLE device_state_event; + /********************************************************************* * DllMain */ @@ -292,10 +294,17 @@ static void set_selected_device( IDirectInputDevice8W *device ) set_selected_effect( NULL ); - if (device) IDirectInputDevice8_AddRef( device ); - previous = device_selected; - device_selected = device; - if (previous) IDirectInputEffect_Release( previous ); + if ((previous = device_selected)) + { + IDirectInputDevice8_SetEventNotification( previous, NULL ); + IDirectInputDevice8_Release( previous ); + } + if ((device_selected = device)) + { + IDirectInputDevice8_AddRef( device ); + IDirectInputDevice8_SetEventNotification( device, device_state_event ); + IDirectInputDevice8_Acquire( device ); + } LeaveCriticalSection( &joy_cs ); } @@ -601,24 +610,6 @@ static void dump_joy_state(DIJOYSTATE* st) TRACE("\n"); } -static void poll_input( IDirectInputDevice8W *device, DIJOYSTATE *state ) -{ - HRESULT hr; - - hr = IDirectInputDevice8_Poll( device ); - - /* If it failed, try to acquire the joystick */ - if (FAILED(hr)) - { - hr = IDirectInputDevice8_Acquire( device ); - while (hr == DIERR_INPUTLOST) hr = IDirectInputDevice8_Acquire( device ); - } - - if (hr == DIERR_OTHERAPPHASPRIO) return; - - IDirectInputDevice8_GetDeviceState( device, sizeof(DIJOYSTATE), state ); -} - static DWORD WINAPI input_thread(void *param) { int axes_pos[TEST_MAX_AXES][2]; @@ -647,9 +638,11 @@ static DWORD WINAPI input_thread(void *param) memset( &state, 0, sizeof(state) ); + if (WaitForSingleObject( device_state_event, TEST_POLL_TIME ) == WAIT_TIMEOUT) continue; + if ((device = get_selected_device())) { - poll_input( device, &state ); + IDirectInputDevice8_GetDeviceState( device, sizeof(state), &state ); IDirectInputDevice8_Release( device ); } @@ -688,8 +681,6 @@ static DWORD WINAPI input_thread(void *param) SetWindowPos(data->graphics.axes[i], 0, r.left, r.top, 0, 0, SWP_NOZORDER | SWP_NOSIZE); } - - Sleep(TEST_POLL_TIME); } return 0; @@ -981,11 +972,13 @@ static DWORD WINAPI ff_input_thread(void *param) }; RECT r; - Sleep(TEST_POLL_TIME); + if (WaitForSingleObject( device_state_event, TEST_POLL_TIME ) == WAIT_TIMEOUT) continue; - if (!(device = get_selected_device())) continue; - poll_input( device, &state ); - IDirectInputDevice8_Release( device ); + if ((device = get_selected_device())) + { + IDirectInputDevice8_GetDeviceState( device, sizeof(state), &state ); + IDirectInputDevice8_Release( device ); + } if (!(effect = get_selected_effect())) continue; @@ -1214,6 +1207,8 @@ LONG CALLBACK CPlApplet(HWND hwnd, UINT command, LPARAM lParam1, LPARAM lParam2) { HRESULT hr; + device_state_event = CreateEventW( NULL, FALSE, FALSE, NULL ); + /* Initialize dinput */ hr = DirectInput8Create(GetModuleHandleW(NULL), DIRECTINPUT_VERSION, &IID_IDirectInput8W, (void**)&data.di, NULL); @@ -1251,6 +1246,8 @@ LONG CALLBACK CPlApplet(HWND hwnd, UINT command, LPARAM lParam1, LPARAM lParam2) /* And destroy dinput too */ IDirectInput8_Release(data.di); + + CloseHandle( device_state_event ); break; }

1 0

Rémi Bernon : joy.cpl: Reduce the button size on the device test tab.
by Alexandre Julliard 29 Nov '22

29 Nov '22

Module: wine Branch: master Commit: 8f618096902ef1502c9e439b41962810dd3cc0e0 URL: https://gitlab.winehq.org/wine/wine/-/commit/8f618096902ef1502c9e439b419628… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Nov 27 01:05:26 2022 +0100 joy.cpl: Reduce the button size on the device test tab. --- dlls/joy.cpl/joy.rc | 4 ++-- dlls/joy.cpl/main.c | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/joy.cpl/joy.rc b/dlls/joy.cpl/joy.rc index 8086ecec6e1..d1c179d2ef3 100644 --- a/dlls/joy.cpl/joy.rc +++ b/dlls/joy.cpl/joy.rc @@ -55,8 +55,8 @@ CAPTION "Test Joystick" FONT 8, "Ms Shell Dlg" { COMBOBOX IDC_TESTSELECTCOMBO, 5, 5, 200, 60, CBS_DROPDOWNLIST | CBS_HASSTRINGS - GROUPBOX "Buttons", IDC_STATIC, 0, 110, 250, 110 - GROUPBOX "", IDC_TESTGROUPXY, 15, 30, 60, 60 + GROUPBOX "Buttons", IDC_STATIC, 15, 100, 291, 70 + GROUPBOX "", IDC_TESTGROUPXY, 15, 30, 60, 60 GROUPBOX "", IDC_TESTGROUPRXRY, 92, 30, 60, 60 GROUPBOX "", IDC_TESTGROUPZRZ, 169, 30, 60, 60 GROUPBOX "", IDC_TESTGROUPPOV, 246, 30, 60, 60 diff --git a/dlls/joy.cpl/main.c b/dlls/joy.cpl/main.c index cc1ce800445..e48762d18f1 100644 --- a/dlls/joy.cpl/main.c +++ b/dlls/joy.cpl/main.c @@ -43,13 +43,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(joycpl); #define TEST_MAX_AXES 4 #define TEST_POLL_TIME 100 -#define TEST_BUTTON_COL_MAX 8 -#define TEST_BUTTON_X 8 -#define TEST_BUTTON_Y 122 -#define TEST_NEXT_BUTTON_X 30 -#define TEST_NEXT_BUTTON_Y 25 -#define TEST_BUTTON_SIZE_X 20 -#define TEST_BUTTON_SIZE_Y 18 +#define TEST_BUTTON_COL_MAX 16 +#define TEST_BUTTON_X 24 +#define TEST_BUTTON_Y 112 +#define TEST_NEXT_BUTTON_X 17 +#define TEST_NEXT_BUTTON_Y 15 +#define TEST_BUTTON_SIZE_X 16 +#define TEST_BUTTON_SIZE_Y 14 #define TEST_AXIS_X 43 #define TEST_AXIS_Y 60

1 0

Jacek Caban : winex11: Use NtUserGetDC.
by Alexandre Julliard 29 Nov '22

29 Nov '22

Module: wine Branch: master Commit: 114e7269162ec039954e72b9425a2a196bc3fbf3 URL: https://gitlab.winehq.org/wine/wine/-/commit/114e7269162ec039954e72b9425a2a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 28 22:11:46 2022 +0100 winex11: Use NtUserGetDC. --- dlls/winex11.drv/clipboard.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 6ebc36cbead..e91368d69e7 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -564,7 +564,7 @@ static void *create_dib_from_bitmap( HBITMAP hBmp, size_t *size ) /* Retrieve the DIB bits from the bitmap and fill in the * DIB color table if present */ - hdc = NtUserGetDCEx( 0, 0, DCX_CACHE | DCX_WINDOW ); + hdc = NtUserGetDC( 0 ); nLinesCopied = NtGdiGetDIBitsInternal( hdc, hBmp, 0, bmp.bmHeight, ret + OffsetBits, (LPBITMAPINFO) pbmiHeader, 0, 0, 0 ); NtUserReleaseDC( 0, hdc ); @@ -986,7 +986,7 @@ static void *import_image_bmp( Atom type, const void *data, size_t size, size_t else return NULL; if (!width || !height) return NULL; - hdc = NtUserGetDCEx( 0, 0, DCX_CACHE | DCX_WINDOW ); + hdc = NtUserGetDC( 0 ); if ((hbmp = NtGdiCreateDIBitmapInternal( hdc, width, height, CBM_INIT, (const BYTE *)data + bfh->bfOffBits, bmi,

1 0

Jacek Caban : win32u: Move NtUserGetDC implementation from user32.
by Alexandre Julliard 29 Nov '22

29 Nov '22

Module: wine Branch: master Commit: be6f5ed95ab24a8a1f5fd0bc0e74e566c717c83c URL: https://gitlab.winehq.org/wine/wine/-/commit/be6f5ed95ab24a8a1f5fd0bc0e74e5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 28 21:24:27 2022 +0100 win32u: Move NtUserGetDC implementation from user32. --- dlls/user32/button.c | 4 ++-- dlls/user32/clipboard.c | 6 +++--- dlls/user32/combo.c | 4 ++-- dlls/user32/dialog.c | 2 +- dlls/user32/edit.c | 10 +++++----- dlls/user32/icontitle.c | 2 +- dlls/user32/mdi.c | 2 +- dlls/user32/msgbox.c | 2 +- dlls/user32/painting.c | 16 ---------------- dlls/user32/static.c | 2 +- dlls/user32/user32.spec | 2 +- dlls/win32u/dce.c | 9 +++++++++ dlls/win32u/menu.c | 6 +++--- dlls/win32u/syscall.c | 1 + dlls/win32u/sysparams.c | 2 +- dlls/win32u/win32u.spec | 2 +- dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 7 +++++++ include/ntuser.h | 1 + 19 files changed, 42 insertions(+), 39 deletions(-)

1 0

Jacek Caban : win32u: Move NtUserGetWindowDC implementation from user32.
by Alexandre Julliard 29 Nov '22

29 Nov '22

Module: wine Branch: master Commit: 8bdfe2be19eace13fff714256e451e0928aea4d1 URL: https://gitlab.winehq.org/wine/wine/-/commit/8bdfe2be19eace13fff714256e451e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 28 21:29:43 2022 +0100 win32u: Move NtUserGetWindowDC implementation from user32. --- dlls/user32/painting.c | 9 --------- dlls/user32/user32.spec | 2 +- dlls/win32u/dce.c | 8 ++++++++ dlls/win32u/defwnd.c | 6 +++--- dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 7 +++++++ include/ntuser.h | 1 + 9 files changed, 23 insertions(+), 14 deletions(-) diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c index a231dd68a3d..c962f0dccf2 100644 --- a/dlls/user32/painting.c +++ b/dlls/user32/painting.c @@ -22,15 +22,6 @@ #include "user_private.h" -/*********************************************************************** - * GetWindowDC (USER32.@) - */ -HDC WINAPI GetWindowDC( HWND hwnd ) -{ - return NtUserGetDCEx( hwnd, 0, DCX_USESTYLE | DCX_WINDOW ); -} - - /*********************************************************************** * UpdateWindow (USER32.@) */ diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 464348201cb..e71370e9761 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -405,7 +405,7 @@ # @ stub GetWinStationInfo @ stdcall GetWindow(long long) @ stdcall GetWindowContextHelpId(long) -@ stdcall GetWindowDC(long) +@ stdcall GetWindowDC(long) NtUserGetWindowDC @ stdcall GetWindowDisplayAffinity(long ptr) @ stdcall GetWindowDpiAwarenessContext(long) @ stdcall GetWindowInfo(long ptr) diff --git a/dlls/win32u/dce.c b/dlls/win32u/dce.c index 360b985c339..9b5f87589c6 100644 --- a/dlls/win32u/dce.c +++ b/dlls/win32u/dce.c @@ -1038,6 +1038,14 @@ HDC WINAPI NtUserGetDC( HWND hwnd ) return NtUserGetDCEx( hwnd, 0, DCX_USESTYLE ); } +/*********************************************************************** + * NtUserGetWindowDC (win32u.@) + */ +HDC WINAPI NtUserGetWindowDC( HWND hwnd ) +{ + return NtUserGetDCEx( hwnd, 0, DCX_USESTYLE | DCX_WINDOW ); +} + /********************************************************************** * NtUserWindowFromDC (win32u.@) */ diff --git a/dlls/win32u/defwnd.c b/dlls/win32u/defwnd.c index 04953508cf2..e58d4e5a793 100644 --- a/dlls/win32u/defwnd.c +++ b/dlls/win32u/defwnd.c @@ -2067,7 +2067,7 @@ LRESULT handle_nc_hit_test( HWND hwnd, POINT pt ) static void track_min_max_box( HWND hwnd, WORD wparam ) { - HDC hdc = NtUserGetDCEx( hwnd, 0, DCX_USESTYLE | DCX_WINDOW ); + HDC hdc = NtUserGetWindowDC( hwnd ); DWORD style = get_window_long( hwnd, GWL_STYLE ); HMENU sys_menu = NtUserGetSystemMenu(hwnd, FALSE); void (*paint_button)( HWND, HDC, BOOL, BOOL ); @@ -2141,7 +2141,7 @@ static void track_close_button( HWND hwnd, WPARAM wparam, LPARAM lparam ) /* If the close item of the sysmenu is disabled or not present do nothing */ if((state & MF_DISABLED) || (state & MF_GRAYED) || state == 0xFFFFFFFF) return; - hdc = NtUserGetDCEx( hwnd, 0, DCX_USESTYLE | DCX_WINDOW ); + hdc = NtUserGetWindowDC( hwnd ); NtUserSetCapture( hwnd ); draw_close_button( hwnd, hdc, TRUE, FALSE ); @@ -2191,7 +2191,7 @@ static LRESULT handle_nc_lbutton_down( HWND hwnd, WPARAM wparam, LPARAM lparam ) case HTSYSMENU: if (style & WS_SYSMENU) { - HDC hdc = NtUserGetDCEx( hwnd, 0, DCX_USESTYLE | DCX_WINDOW ); + HDC hdc = NtUserGetWindowDC( hwnd ); draw_nc_sys_button( hwnd, hdc, TRUE ); NtUserReleaseDC( hwnd, hdc ); send_message( hwnd, WM_SYSCOMMAND, SC_MOUSEMENU + HTSYSMENU, lparam ); diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index 8c603dbf81e..3e029f413e5 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -209,6 +209,7 @@ static void * const syscalls[] = NtUserGetUpdateRect, NtUserGetUpdateRgn, NtUserGetUpdatedClipboardFormats, + NtUserGetWindowDC, NtUserGetWindowPlacement, NtUserGetWindowRgnEx, NtUserHideCaret, diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index 43d9b3904d0..9a987045868 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -1009,7 +1009,7 @@ @ stub NtUserGetWindowBand @ stub NtUserGetWindowCompositionAttribute @ stub NtUserGetWindowCompositionInfo -@ stub NtUserGetWindowDC +@ stdcall -syscall NtUserGetWindowDC(long) @ stub NtUserGetWindowDisplayAffinity @ stub NtUserGetWindowFeedbackSetting @ stub NtUserGetWindowGroupId diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h index 288dd593c2f..25d8d42e575 100644 --- a/dlls/wow64win/syscall.h +++ b/dlls/wow64win/syscall.h @@ -195,6 +195,7 @@ SYSCALL_ENTRY( NtUserGetUpdateRect ) \ SYSCALL_ENTRY( NtUserGetUpdateRgn ) \ SYSCALL_ENTRY( NtUserGetUpdatedClipboardFormats ) \ + SYSCALL_ENTRY( NtUserGetWindowDC ) \ SYSCALL_ENTRY( NtUserGetWindowPlacement ) \ SYSCALL_ENTRY( NtUserGetWindowRgnEx ) \ SYSCALL_ENTRY( NtUserHideCaret ) \ diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index 934612dce8a..78ffc34e68e 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -2570,6 +2570,13 @@ NTSTATUS WINAPI wow64_NtUserGetUpdatedClipboardFormats( UINT *args ) return NtUserGetUpdatedClipboardFormats( formats, size, out_size ); } +NTSTATUS WINAPI wow64_NtUserGetWindowDC( UINT *args ) +{ + HWND hwnd = get_handle( &args ); + + return HandleToUlong( NtUserGetWindowDC( hwnd )); +} + NTSTATUS WINAPI wow64_NtUserGetWindowPlacement( UINT *args ) { HWND hwnd = get_handle( &args ); diff --git a/include/ntuser.h b/include/ntuser.h index c27af731f29..cff2b6633a5 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -777,6 +777,7 @@ BOOL WINAPI NtUserGetTitleBarInfo( HWND hwnd, TITLEBARINFO *info ); INT WINAPI NtUserGetUpdateRgn( HWND hwnd, HRGN hrgn, BOOL erase ); BOOL WINAPI NtUserGetUpdatedClipboardFormats( UINT *formats, UINT size, UINT *out_size ); BOOL WINAPI NtUserGetUpdateRect( HWND hwnd, RECT *rect, BOOL erase ); +HDC WINAPI NtUserGetWindowDC( HWND hwnd ); BOOL WINAPI NtUserGetWindowPlacement( HWND hwnd, WINDOWPLACEMENT *placement ); int WINAPI NtUserGetWindowRgnEx( HWND hwnd, HRGN hrgn, UINT unk ); BOOL WINAPI NtUserHideCaret( HWND hwnd );

1 0

Jacek Caban : win32u: Move NtUserValidateRect implementation from user32.
by Alexandre Julliard 29 Nov '22

29 Nov '22

Module: wine Branch: master Commit: ae984f630b040b95093ab149e3d344063ee2aa7f URL: https://gitlab.winehq.org/wine/wine/-/commit/ae984f630b040b95093ab149e3d344… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 28 21:35:53 2022 +0100 win32u: Move NtUserValidateRect implementation from user32. --- dlls/user32/icontitle.c | 2 +- dlls/user32/painting.c | 20 -------------------- dlls/user32/user32.spec | 2 +- dlls/win32u/dce.c | 16 ++++++++++++++++ dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 8 ++++++++ include/ntuser.h | 1 + 9 files changed, 30 insertions(+), 23 deletions(-) diff --git a/dlls/user32/icontitle.c b/dlls/user32/icontitle.c index 047ac5ef1c8..687f2b69d72 100644 --- a/dlls/user32/icontitle.c +++ b/dlls/user32/icontitle.c @@ -176,7 +176,7 @@ LRESULT WINAPI IconTitleWndProc( HWND hWnd, UINT msg, else lParam = (owner == GetActiveWindow()); if( ICONTITLE_Paint( hWnd, owner, (HDC)wParam, (BOOL)lParam ) ) - ValidateRect( hWnd, NULL ); + NtUserValidateRect( hWnd, NULL ); return 1; } return DefWindowProcW( hWnd, msg, wParam, lParam ); diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c index c962f0dccf2..be6f91e1bde 100644 --- a/dlls/user32/painting.c +++ b/dlls/user32/painting.c @@ -52,26 +52,6 @@ BOOL WINAPI ValidateRgn( HWND hwnd, HRGN hrgn ) } -/*********************************************************************** - * ValidateRect (USER32.@) - * - * MSDN: if hwnd parameter is NULL, ValidateRect invalidates and redraws - * all windows and sends WM_ERASEBKGND and WM_NCPAINT. - */ -BOOL WINAPI ValidateRect( HWND hwnd, const RECT *rect ) -{ - UINT flags = RDW_VALIDATE; - - if (!hwnd) - { - flags = RDW_ALLCHILDREN | RDW_INVALIDATE | RDW_FRAME | RDW_ERASE | RDW_ERASENOW; - rect = NULL; - } - - return NtUserRedrawWindow( hwnd, rect, 0, flags ); -} - - /************************************************************************* * ScrollWindow (USER32.@) * diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index e71370e9761..b843d2068cd 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -807,7 +807,7 @@ @ stdcall UserSignalProc(long long long long) # @ stub VRipOutput # @ stub VTagOutput -@ stdcall ValidateRect(long ptr) +@ stdcall ValidateRect(long ptr) NtUserValidateRect @ stdcall ValidateRgn(long long) @ stdcall VkKeyScanA(long) @ stdcall VkKeyScanExA(long long) diff --git a/dlls/win32u/dce.c b/dlls/win32u/dce.c index 9b5f87589c6..364fbe6455b 100644 --- a/dlls/win32u/dce.c +++ b/dlls/win32u/dce.c @@ -1507,6 +1507,22 @@ BOOL WINAPI NtUserRedrawWindow( HWND hwnd, const RECT *rect, HRGN hrgn, UINT fla return ret; } +/*********************************************************************** + * NtUserValidateRect (win32u.@) + */ +BOOL WINAPI NtUserValidateRect( HWND hwnd, const RECT *rect ) +{ + UINT flags = RDW_VALIDATE; + + if (!hwnd) + { + flags = RDW_ALLCHILDREN | RDW_INVALIDATE | RDW_FRAME | RDW_ERASE | RDW_ERASENOW; + rect = NULL; + } + + return NtUserRedrawWindow( hwnd, rect, 0, flags ); +} + /*********************************************************************** * NtUserGetUpdateRgn (win32u.@) */ diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index 3e029f413e5..97052d4dc46 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -302,6 +302,7 @@ static void * const syscalls[] = NtUserUnregisterClass, NtUserUnregisterHotKey, NtUserUpdateInputContext, + NtUserValidateRect, NtUserVkKeyScanEx, NtUserWaitForInputIdle, NtUserWindowFromDC, diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index 9a987045868..d4e4365ce23 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -1300,7 +1300,7 @@ @ stub NtUserUpdateWindowInputSinkHints @ stub NtUserUpdateWindowTrackingInfo @ stub NtUserUserHandleGrantAccess -@ stub NtUserValidateRect +@ stdcall -syscall NtUserValidateRect(long ptr) @ stub NtUserValidateTimerCallback @ stdcall -syscall NtUserVkKeyScanEx(long long) @ stub NtUserWOWCleanup diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h index 25d8d42e575..c2cd0b7bbf5 100644 --- a/dlls/wow64win/syscall.h +++ b/dlls/wow64win/syscall.h @@ -288,6 +288,7 @@ SYSCALL_ENTRY( NtUserUnregisterClass ) \ SYSCALL_ENTRY( NtUserUnregisterHotKey ) \ SYSCALL_ENTRY( NtUserUpdateInputContext ) \ + SYSCALL_ENTRY( NtUserValidateRect ) \ SYSCALL_ENTRY( NtUserVkKeyScanEx ) \ SYSCALL_ENTRY( NtUserWaitForInputIdle ) \ SYSCALL_ENTRY( NtUserWindowFromDC ) \ diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index 78ffc34e68e..af77475e740 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -4102,6 +4102,14 @@ NTSTATUS WINAPI wow64_NtUserUpdateInputContext( UINT *args ) return NtUserUpdateInputContext( handle, attr, value ); } +NTSTATUS WINAPI wow64_NtUserValidateRect( UINT *args ) +{ + HWND hwnd = get_handle( &args ); + const RECT *rect = get_ptr( &args ); + + return NtUserValidateRect( hwnd, rect ); +} + NTSTATUS WINAPI wow64_NtUserVkKeyScanEx( UINT *args ) { WCHAR chr = get_ulong( &args ); diff --git a/include/ntuser.h b/include/ntuser.h index cff2b6633a5..18718ea8a2c 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -892,6 +892,7 @@ BOOL WINAPI NtUserUpdateInputContext( HIMC handle, UINT attr, UINT_PTR value BOOL WINAPI NtUserUpdateLayeredWindow( HWND hwnd, HDC hdc_dst, const POINT *pts_dst, const SIZE *size, HDC hdc_src, const POINT *pts_src, COLORREF key, const BLENDFUNCTION *blend, DWORD flags, const RECT *dirty ); +BOOL WINAPI NtUserValidateRect( HWND hwnd, const RECT *rect ); WORD WINAPI NtUserVkKeyScanEx( WCHAR chr, HKL layout ); DWORD WINAPI NtUserWaitForInputIdle( HANDLE process, DWORD timeout, BOOL wow ); HWND WINAPI NtUserWindowFromDC( HDC hdc );

1 0

Jacek Caban : win32u: Move NtUserPrintWindow implementation from user32.
by Alexandre Julliard 29 Nov '22

29 Nov '22

Module: wine Branch: master Commit: 6b2da0bab9296dca9533dbc7c24cf9169351ed63 URL: https://gitlab.winehq.org/wine/wine/-/commit/6b2da0bab9296dca9533dbc7c24cf9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 28 21:43:10 2022 +0100 win32u: Move NtUserPrintWindow implementation from user32. --- dlls/user32/painting.c | 15 --------------- dlls/user32/user32.spec | 2 +- dlls/win32u/dce.c | 11 +++++++++++ dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 9 +++++++++ include/ntuser.h | 1 + 8 files changed, 25 insertions(+), 17 deletions(-) diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c index be6f91e1bde..de67cd97e5f 100644 --- a/dlls/user32/painting.c +++ b/dlls/user32/painting.c @@ -62,18 +62,3 @@ BOOL WINAPI ScrollWindow( HWND hwnd, INT dx, INT dy, UINT flags = SW_INVALIDATE | SW_ERASE | (rect ? 0 : SW_SCROLLCHILDREN) | SW_NODCCACHE; return NtUserScrollWindowEx( hwnd, dx, dy, rect, clipRect, 0, NULL, flags ); } - -/************************************************************************ - * PrintWindow (USER32.@) - * - */ -BOOL WINAPI PrintWindow(HWND hwnd, HDC hdcBlt, UINT nFlags) -{ - UINT flags = PRF_CHILDREN | PRF_ERASEBKGND | PRF_OWNED | PRF_CLIENT; - if(!(nFlags & PW_CLIENTONLY)) - { - flags |= PRF_NONCLIENT; - } - SendMessageW(hwnd, WM_PRINT, (WPARAM)hdcBlt, flags); - return TRUE; -} diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index b843d2068cd..1130ab457cd 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -576,7 +576,7 @@ @ stdcall PostQuitMessage(long) @ stdcall PostThreadMessageA(long long long long) @ stdcall PostThreadMessageW(long long long long) NtUserPostThreadMessage -@ stdcall PrintWindow(long long long) +@ stdcall PrintWindow(long long long) NtUserPrintWindow @ stdcall PrivateExtractIconExA(str long ptr ptr long) @ stdcall PrivateExtractIconExW(wstr long ptr ptr long) @ stdcall PrivateExtractIconsA (str long long long ptr ptr long long) diff --git a/dlls/win32u/dce.c b/dlls/win32u/dce.c index 364fbe6455b..1cc6a0d605e 100644 --- a/dlls/win32u/dce.c +++ b/dlls/win32u/dce.c @@ -1858,3 +1858,14 @@ INT WINAPI NtUserScrollWindowEx( HWND hwnd, INT dx, INT dy, const RECT *rect, return retval; } + +/************************************************************************ + * NtUserPrintWindow (win32u.@) + */ +BOOL WINAPI NtUserPrintWindow( HWND hwnd, HDC hdc, UINT flags ) +{ + UINT prf_flags = PRF_CHILDREN | PRF_ERASEBKGND | PRF_OWNED | PRF_CLIENT; + if (!(flags & PW_CLIENTONLY)) prf_flags |= PRF_NONCLIENT; + send_message( hwnd, WM_PRINT, (WPARAM)hdc, prf_flags ); + return TRUE; +} diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index 97052d4dc46..558edc0257e 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -237,6 +237,7 @@ static void * const syscalls[] = NtUserPerMonitorDPIPhysicalToLogicalPoint, NtUserPostMessage, NtUserPostThreadMessage, + NtUserPrintWindow, NtUserQueryInputContext, NtUserRedrawWindow, NtUserRegisterClassExWOW, diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index d4e4365ce23..1d85a450748 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -1105,7 +1105,7 @@ @ stub NtUserPostKeyboardInputMessage @ stdcall -syscall NtUserPostMessage(long long long long) @ stdcall -syscall NtUserPostThreadMessage(long long long long) -@ stub NtUserPrintWindow +@ stdcall -syscall NtUserPrintWindow(long long long) @ stub NtUserProcessConnect @ stub NtUserProcessInkFeedbackCommand @ stub NtUserPromoteMouseInPointer diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h index c2cd0b7bbf5..8573fa743a5 100644 --- a/dlls/wow64win/syscall.h +++ b/dlls/wow64win/syscall.h @@ -223,6 +223,7 @@ SYSCALL_ENTRY( NtUserPerMonitorDPIPhysicalToLogicalPoint ) \ SYSCALL_ENTRY( NtUserPostMessage ) \ SYSCALL_ENTRY( NtUserPostThreadMessage ) \ + SYSCALL_ENTRY( NtUserPrintWindow ) \ SYSCALL_ENTRY( NtUserQueryInputContext ) \ SYSCALL_ENTRY( NtUserRedrawWindow ) \ SYSCALL_ENTRY( NtUserRegisterClassExWOW ) \ diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index af77475e740..447e8f84495 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -3184,6 +3184,15 @@ NTSTATUS WINAPI wow64_NtUserPostThreadMessage( UINT *args ) return NtUserPostThreadMessage( thread, msg, wparam, lparam ); } +NTSTATUS WINAPI wow64_NtUserPrintWindow( UINT *args ) +{ + HWND hwnd = get_handle( &args ); + HDC hdc = get_handle( &args ); + UINT flags = get_ulong( &args ); + + return NtUserPrintWindow( hwnd, hdc, flags ); +} + NTSTATUS WINAPI wow64_NtUserQueryInputContext( UINT *args ) { HIMC handle = get_handle( &args ); diff --git a/include/ntuser.h b/include/ntuser.h index 18718ea8a2c..b83ae2418d3 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -810,6 +810,7 @@ BOOL WINAPI NtUserPeekMessage( MSG *msg_out, HWND hwnd, UINT first, UINT last BOOL WINAPI NtUserPerMonitorDPIPhysicalToLogicalPoint( HWND hwnd, POINT *pt ); BOOL WINAPI NtUserPostMessage( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ); BOOL WINAPI NtUserPostThreadMessage( DWORD thread, UINT msg, WPARAM wparam, LPARAM lparam ); +BOOL WINAPI NtUserPrintWindow( HWND hwnd, HDC hdc, UINT flags ); UINT_PTR WINAPI NtUserQueryInputContext( HIMC handle, UINT attr ); BOOL WINAPI NtUserRedrawWindow( HWND hwnd, const RECT *rect, HRGN hrgn, UINT flags ); ATOM WINAPI NtUserRegisterClassExWOW( const WNDCLASSEXW *wc, UNICODE_STRING *name, UNICODE_STRING *version,

1 0

Jacek Caban : user32: Merge painting.c into win.c.
by Alexandre Julliard 29 Nov '22

29 Nov '22

Module: wine Branch: master Commit: 609990f7167de4490732dd0dbe4b013949e169ad URL: https://gitlab.winehq.org/wine/wine/-/commit/609990f7167de4490732dd0dbe4b01… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 28 21:46:02 2022 +0100 user32: Merge painting.c into win.c. --- dlls/user32/Makefile.in | 1 - dlls/user32/painting.c | 64 ------------------------------------------------- dlls/user32/win.c | 40 +++++++++++++++++++++++++++++++ 3 files changed, 40 insertions(+), 65 deletions(-) diff --git a/dlls/user32/Makefile.in b/dlls/user32/Makefile.in index 3a01810991d..1a29970e112 100644 --- a/dlls/user32/Makefile.in +++ b/dlls/user32/Makefile.in @@ -32,7 +32,6 @@ C_SRCS = \ misc.c \ msgbox.c \ nonclient.c \ - painting.c \ property.c \ resource.c \ scroll.c \ diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c deleted file mode 100644 index de67cd97e5f..00000000000 --- a/dlls/user32/painting.c +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Window painting functions - * - * Copyright 1993, 1994, 1995, 2001, 2004, 2005, 2008 Alexandre Julliard - * Copyright 1996, 1997, 1999 Alex Korobka - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "user_private.h" - - -/*********************************************************************** - * UpdateWindow (USER32.@) - */ -BOOL WINAPI UpdateWindow( HWND hwnd ) -{ - if (!hwnd) - { - SetLastError( ERROR_INVALID_WINDOW_HANDLE ); - return FALSE; - } - - return NtUserRedrawWindow( hwnd, NULL, 0, RDW_UPDATENOW | RDW_ALLCHILDREN ); -} - - -/*********************************************************************** - * ValidateRgn (USER32.@) - */ -BOOL WINAPI ValidateRgn( HWND hwnd, HRGN hrgn ) -{ - if (!hwnd) - { - SetLastError( ERROR_INVALID_WINDOW_HANDLE ); - return FALSE; - } - - return NtUserRedrawWindow( hwnd, NULL, hrgn, RDW_VALIDATE ); -} - - -/************************************************************************* - * ScrollWindow (USER32.@) - * - */ -BOOL WINAPI ScrollWindow( HWND hwnd, INT dx, INT dy, - const RECT *rect, const RECT *clipRect ) -{ - UINT flags = SW_INVALIDATE | SW_ERASE | (rect ? 0 : SW_SCROLLCHILDREN) | SW_NODCCACHE; - return NtUserScrollWindowEx( hwnd, dx, dy, rect, clipRect, 0, NULL, flags ); -} diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 383de818172..a6f43c188c4 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -1428,6 +1428,46 @@ BOOL WINAPI SetProcessDefaultLayout( DWORD layout ) return NtUserSetProcessDefaultLayout( layout ); } + +/*********************************************************************** + * UpdateWindow (USER32.@) + */ +BOOL WINAPI UpdateWindow( HWND hwnd ) +{ + if (!hwnd) + { + SetLastError( ERROR_INVALID_WINDOW_HANDLE ); + return FALSE; + } + + return NtUserRedrawWindow( hwnd, NULL, 0, RDW_UPDATENOW | RDW_ALLCHILDREN ); +} + + +/*********************************************************************** + * ValidateRgn (USER32.@) + */ +BOOL WINAPI ValidateRgn( HWND hwnd, HRGN hrgn ) +{ + if (!hwnd) + { + SetLastError( ERROR_INVALID_WINDOW_HANDLE ); + return FALSE; + } + + return NtUserRedrawWindow( hwnd, NULL, hrgn, RDW_VALIDATE ); +} + + +/************************************************************************* + * ScrollWindow (USER32.@) + */ +BOOL WINAPI ScrollWindow( HWND hwnd, INT dx, INT dy, const RECT *rect, const RECT *clip_rect ) +{ + UINT flags = SW_INVALIDATE | SW_ERASE | (rect ? 0 : SW_SCROLLCHILDREN) | SW_NODCCACHE; + return NtUserScrollWindowEx( hwnd, dx, dy, rect, clip_rect, 0, NULL, flags ); +} + #ifdef _WIN64 /* 64bit versions */

1 0

Robert Wilhelm : vbscript: Accept private and public const global declarations.
by Alexandre Julliard 28 Nov '22

28 Nov '22

Module: wine Branch: master Commit: 5cf0d974167acf8495202050b51915716db0db6a URL: https://gitlab.winehq.org/wine/wine/-/commit/5cf0d974167acf8495202050b51915… Author: Robert Wilhelm <robert.wilhelm(a)gmx.net> Date: Sun Nov 27 22:47:46 2022 +0100 vbscript: Accept private and public const global declarations. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53783 --- dlls/vbscript/parser.y | 4 +++- dlls/vbscript/tests/lang.vbs | 6 ++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 4b9d53d3bca..88f098f3714 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -175,7 +175,9 @@ SourceElements | SourceElements ClassDeclaration { source_add_class(ctx, $2); } GlobalDimDeclaration - : tPRIVATE DimDeclList { $$ = new_dim_statement(ctx, @$, $2); CHECK_ERROR; } + : tPRIVATE tCONST ConstDeclList { $$ = new_const_statement(ctx, @$, $3); CHECK_ERROR; } + | tPUBLIC tCONST ConstDeclList { $$ = new_const_statement(ctx, @$, $3); CHECK_ERROR; } + | tPRIVATE DimDeclList { $$ = new_dim_statement(ctx, @$, $2); CHECK_ERROR; } | tPUBLIC DimDeclList { $$ = new_dim_statement(ctx, @$, $2); CHECK_ERROR; } ExpressionNl_opt diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 0e8dae4049f..ddfaf20a19d 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -1210,10 +1210,16 @@ Call ok(getVT(test) = "VT_DISPATCH", "getVT(test) = " & getVT(test)) Call ok(Me is Test, "Me is not Test") Const c1 = 1, c2 = 2, c3 = -3 +Private Const c4 = 4 +Public Const c5 = 5 Call ok(c1 = 1, "c1 = " & c1) Call ok(getVT(c1) = "VT_I2", "getVT(c1) = " & getVT(c1)) Call ok(c3 = -3, "c3 = " & c3) Call ok(getVT(c3) = "VT_I2", "getVT(c3) = " & getVT(c3)) +Call ok(c4 = 4, "c4 = " & c4) +Call ok(getVT(c4) = "VT_I2", "getVT(c4) = " & getVT(c4)) +Call ok(c5 = 5, "c5 = " & c5) +Call ok(getVT(c5) = "VT_I2", "getVT(c5) = " & getVT(c5)) Const cb = True, cs = "test", cnull = null Call ok(cb, "cb = " & cb)

1 0