February 2017 - Wine-Commits

Olivier F. R. Dierick : xinput1_3: Add DECLSPEC_HOTPATCH to XInputEnable() definition.
by Alexandre Julliard Feb. 28, 2017

Feb. 28, 2017

Module: wine Branch: oldstable Commit: ac340f82bc73209a38d1d9c9f3c4e12bbf87bdfe URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac340f82bc73209a38d1d9c9f… Author: Olivier F. R. Dierick <o.dierick(a)piezo-forte.be> Date: Fri Jan 6 18:17:55 2017 +0100 xinput1_3: Add DECLSPEC_HOTPATCH to XInputEnable() definition. Signed-off-by: Olivier F. R. Dierick <o.dierick(a)piezo-forte.be> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 1640c9ce623ba00e52c197a31650d4dfa9d7bde7) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/xinput1_3/xinput1_3_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/xinput1_3/xinput1_3_main.c b/dlls/xinput1_3/xinput1_3_main.c index d5d6147..358116a 100644 --- a/dlls/xinput1_3/xinput1_3_main.c +++ b/dlls/xinput1_3/xinput1_3_main.c @@ -42,7 +42,7 @@ BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved) return TRUE; } -void WINAPI XInputEnable(BOOL enable) +void WINAPI DECLSPEC_HOTPATCH XInputEnable(BOOL enable) { /* Setting to false will stop messages from XInputSetState being sent to the controllers. Setting to true will send the last vibration

1 0

Hugh McMaster : appwiz.cpl: Do not overwrite application IDs when changing registry keys.
by Alexandre Julliard Feb. 28, 2017

Feb. 28, 2017

Module: wine Branch: oldstable Commit: 46aefc7ea8a23ef00404b3d63978c74490156a94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46aefc7ea8a23ef00404b3d63… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Dec 21 12:19:58 2016 +0000 appwiz.cpl: Do not overwrite application IDs when changing registry keys. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit c03ea1971b3a16291615cac25e169aeb78290c8a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/appwiz.cpl/appwiz.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/appwiz.cpl/appwiz.c b/dlls/appwiz.cpl/appwiz.c index dd84827..8119d07 100644 --- a/dlls/appwiz.cpl/appwiz.c +++ b/dlls/appwiz.cpl/appwiz.c @@ -152,7 +152,8 @@ static void FreeAppInfo(APPINFO *info) static BOOL ReadApplicationsFromRegistry(HKEY root) { HKEY hkeyApp; - int i, id = 0; + int i; + static int id = 0; DWORD sizeOfSubKeyName, displen, uninstlen; DWORD dwNoModify, dwType, value, size; WCHAR subKeyName[256];

1 0

Michael Stefaniuc : include: Make wine_dbgstr_rect() available for tests too.
by Alexandre Julliard Feb. 28, 2017

Feb. 28, 2017

Module: wine Branch: oldstable Commit: 46ac41ba7b5de8aba2ab7fef637f825fc7083d1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=46ac41ba7b5de8aba2ab7fef6… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jun 7 09:45:40 2016 +0200 include: Make wine_dbgstr_rect() available for tests too. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 636340ce34e1ef7996eb48c8717b3bdb39dcdc8d) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- include/wine/test.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/include/wine/test.h b/include/wine/test.h index 862d553..8f6db18 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -66,6 +66,7 @@ extern void winetest_wait_child_process( HANDLE process ); extern const char *wine_dbgstr_wn( const WCHAR *str, int n ); extern const char *wine_dbgstr_guid( const GUID *guid ); +extern const char *wine_dbgstr_rect( const RECT *rect ); static inline const char *wine_dbgstr_w( const WCHAR *s ) { return wine_dbgstr_wn( s, -1 ); } /* strcmpW is available for tests compiled under Wine, but not in standalone @@ -534,6 +535,17 @@ const char *wine_dbgstr_guid( const GUID *guid ) return res; } +const char *wine_dbgstr_rect( const RECT *rect ) +{ + char *res; + + if (!rect) return "(null)"; + res = get_temp_buffer( 60 ); + sprintf( res, "(%d,%d)-(%d,%d)", rect->left, rect->top, rect->right, rect->bottom ); + release_temp_buffer( res, strlen(res) + 1 ); + return res; +} + /* Find a test by name */ static const struct test *find_test( const char *name ) {

1 0

Józef Kucia : wined3d: Update "screen_format" when ChangeDisplaySettingsEx() call is redundant.
by Alexandre Julliard Feb. 28, 2017

Feb. 28, 2017

Module: wine Branch: oldstable Commit: 9b79b59657186b6be109f180ca1506fa654b2fd8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b79b59657186b6be109f180c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jan 12 11:36:26 2017 +0100 wined3d: Update "screen_format" when ChangeDisplaySettingsEx() call is redundant. This fixes a regression introduced by commit f6dde7062413a1dfdd71acc92c5178ac66f3ade0. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 06cf77b343a36729754e9df34045a1b039b31c44) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/directx.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index dd2164d..e4b1028 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -4288,6 +4288,7 @@ HRESULT CDECL wined3d_set_adapter_display_mode(struct wined3d *wined3d, || !(new_mode.dmFields & DM_DISPLAYFLAGS))) { TRACE("Skipping redundant mode setting call.\n"); + adapter->screen_format = new_format_id; return WINED3D_OK; }

1 0

Nikolay Sivov : comctl32/trackbar: Fix TBM_SETRANGEMAX handling when new limit is less than current min boundary.
by Alexandre Julliard Feb. 28, 2017

Feb. 28, 2017

Module: wine Branch: oldstable Commit: 29f4ac427f75a8513795dce719f79623f136511e URL: http://source.winehq.org/git/wine.git/?a=commit;h=29f4ac427f75a8513795dce71… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 12 17:22:25 2017 +0300 comctl32/trackbar: Fix TBM_SETRANGEMAX handling when new limit is less than current min boundary. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit bb1d68ede06c8b517ea16246e376a4a4e52bf1c5) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/tests/trackbar.c | 26 ++++++++++++++++++++++++++ dlls/comctl32/trackbar.c | 5 +++-- 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/trackbar.c b/dlls/comctl32/tests/trackbar.c index 80d5906..381bfb8 100644 --- a/dlls/comctl32/tests/trackbar.c +++ b/dlls/comctl32/tests/trackbar.c @@ -775,6 +775,32 @@ static void test_range(void) SendMessageA(hWndTrackbar, TBM_GETTHUMBRECT, 0, (LPARAM)&rect1); ok(EqualRect(&rect1, &rect2), "thumb rectangle not updated\n"); + /* test position update on range change */ + + /* set to [20, 50], position at 30, reduce range to [20,25] */ + SendMessageA(hWndTrackbar, TBM_SETRANGEMIN, FALSE, 20); + SendMessageA(hWndTrackbar, TBM_SETRANGEMAX, FALSE, 50); + SendMessageA(hWndTrackbar, TBM_SETPOS, FALSE, 30); + SendMessageA(hWndTrackbar, TBM_SETRANGEMAX, FALSE, 25); + r = SendMessageA(hWndTrackbar, TBM_GETPOS, 0, 0); + ok(r == 25, "Unexpected position %d\n", r); + + /* set to [20, 50], position at 30, flip max to 10 */ + SendMessageA(hWndTrackbar, TBM_SETRANGEMIN, FALSE, 20); + SendMessageA(hWndTrackbar, TBM_SETRANGEMAX, FALSE, 50); + SendMessageA(hWndTrackbar, TBM_SETPOS, FALSE, 30); + SendMessageA(hWndTrackbar, TBM_SETRANGEMAX, FALSE, 10); + r = SendMessageA(hWndTrackbar, TBM_GETPOS, 0, 0); + ok(r == 20, "Unexpected position %d\n", r); + + /* set to [20, 50], position at 30, flip min to 70 */ + SendMessageA(hWndTrackbar, TBM_SETRANGEMIN, FALSE, 20); + SendMessageA(hWndTrackbar, TBM_SETRANGEMAX, FALSE, 50); + SendMessageA(hWndTrackbar, TBM_SETPOS, FALSE, 30); + SendMessageA(hWndTrackbar, TBM_SETRANGEMIN, FALSE, 70); + r = SendMessageA(hWndTrackbar, TBM_GETPOS, 0, 0); + ok(r == 70, "Unexpected position %d\n", r); + DestroyWindow(hWndTrackbar); } diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c index 0e52212..b26d743 100644 --- a/dlls/comctl32/trackbar.c +++ b/dlls/comctl32/trackbar.c @@ -1279,10 +1279,11 @@ static inline LRESULT TRACKBAR_SetRangeMax (TRACKBAR_INFO *infoPtr, BOOL redraw, LONG lMax) { BOOL changed = infoPtr->lRangeMax != lMax; + LONG rightmost = max(lMax, infoPtr->lRangeMin); infoPtr->lRangeMax = lMax; - if (infoPtr->lPos > infoPtr->lRangeMax) { - infoPtr->lPos = infoPtr->lRangeMax; + if (infoPtr->lPos > rightmost) { + infoPtr->lPos = rightmost; infoPtr->flags |= TB_THUMBPOSCHANGED; }

1 0

Andrew Eikum : dsound: Use the value from SetVolume when 3D processing is disabled.
by Alexandre Julliard Feb. 28, 2017

Feb. 28, 2017

Module: wine Branch: oldstable Commit: c4049574ec772b0cc67357abd1a29daebf07179b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4049574ec772b0cc67357abd… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Dec 28 14:03:25 2016 -0600 dsound: Use the value from SetVolume when 3D processing is disabled. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d961f5ac7e75ccb1a5aac4f20596bf954f2d8500) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dsound/sound3d.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dsound/sound3d.c b/dlls/dsound/sound3d.c index 840ab93..eb01881 100644 --- a/dlls/dsound/sound3d.c +++ b/dlls/dsound/sound3d.c @@ -185,6 +185,7 @@ void DSOUND_Calc3DBuffer(IDirectSoundBufferImpl *dsb) default: TRACE("3D processing disabled\n"); /* this one is here only to eliminate annoying warning message */ + dsb->volpan.lVolume = dsb->ds3db_lVolume; DSOUND_RecalcVolPan (&dsb->volpan); return; }

1 0

Andrew Eikum : dsound: Handle default case in dsound3d mode switch ( Coverity).
by Alexandre Julliard Feb. 28, 2017

Feb. 28, 2017

Module: wine Branch: oldstable Commit: 8e00e636ec34455c4836ef3dd4c347594cdd1c6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e00e636ec34455c4836ef3dd… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Feb 10 12:54:15 2016 -0600 dsound: Handle default case in dsound3d mode switch (Coverity). Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit f461610e6c93f74e7eb07567f0740c8f357eb951) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dsound/sound3d.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/dsound/sound3d.c b/dlls/dsound/sound3d.c index e428053..840ab93 100644 --- a/dlls/dsound/sound3d.c +++ b/dlls/dsound/sound3d.c @@ -170,11 +170,6 @@ void DSOUND_Calc3DBuffer(IDirectSoundBufferImpl *dsb) switch (dsb->ds3db_ds3db.dwMode) { - case DS3DMODE_DISABLE: - TRACE("3D processing disabled\n"); - /* this one is here only to eliminate annoying warning message */ - DSOUND_RecalcVolPan (&dsb->volpan); - return; case DS3DMODE_NORMAL: TRACE("Normal 3D processing mode\n"); /* we need to calculate distance between buffer and listener*/ @@ -187,6 +182,11 @@ void DSOUND_Calc3DBuffer(IDirectSoundBufferImpl *dsb) vDistance = dsb->ds3db_ds3db.vPosition; flDistance = VectorMagnitude (&vDistance); break; + default: + TRACE("3D processing disabled\n"); + /* this one is here only to eliminate annoying warning message */ + DSOUND_RecalcVolPan (&dsb->volpan); + return; } if (flDistance > dsb->ds3db_ds3db.flMaxDistance)

1 0

Hugh McMaster : kernel32: Check for a valid pointer before yanking the line.
by Alexandre Julliard Feb. 28, 2017

Feb. 28, 2017

Module: wine Branch: oldstable Commit: bde2d0a8495ed734bc8ca4df06e568de6232cdfb URL: http://source.winehq.org/git/wine.git/?a=commit;h=bde2d0a8495ed734bc8ca4df0… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Dec 13 12:00:03 2016 +0000 kernel32: Check for a valid pointer before yanking the line. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 8cacba5ff942ee91124895bb10fec026556cdf6f) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/editline.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/editline.c b/dlls/kernel32/editline.c index 78ea789..6d2ad17 100644 --- a/dlls/kernel32/editline.c +++ b/dlls/kernel32/editline.c @@ -635,7 +635,8 @@ static void WCEL_CapitalizeWord(WCEL_Context* ctx) static void WCEL_Yank(WCEL_Context* ctx) { - WCEL_InsertString(ctx, ctx->yanked); + if (ctx->yanked) + WCEL_InsertString(ctx, ctx->yanked); } static void WCEL_KillToEndOfLine(WCEL_Context* ctx)

1 0

Nikolay Sivov : comctl32/tests: Trackbar test to show that thumb is updated on TBM_SETTICFREQ.
by Alexandre Julliard Feb. 28, 2017

Feb. 28, 2017

Module: wine Branch: oldstable Commit: 0bc743ace967e7c08f166d0a9b76271530bf8274 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bc743ace967e7c08f166d0a9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 12 22:03:20 2016 +0300 comctl32/tests: Trackbar test to show that thumb is updated on TBM_SETTICFREQ. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 458ddd59b247a52fc4463a1a8b90d4744f154142) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/tests/trackbar.c | 47 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 46 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/trackbar.c b/dlls/comctl32/tests/trackbar.c index 918cf1a..da24595 100644 --- a/dlls/comctl32/tests/trackbar.c +++ b/dlls/comctl32/tests/trackbar.c @@ -890,7 +890,7 @@ static void test_thumb_length(void) static void test_tic_settings(void) { HWND hWndTrackbar; - int r; + int r, i; hWndTrackbar = create_trackbar(defaultstyle, hWndParent); ok(hWndTrackbar != NULL, "Expected non NULL value\n"); @@ -955,6 +955,51 @@ static void test_tic_settings(void) SendMessageA(hWndTrackbar, TBM_SETTICFREQ, 1, 0); r = SendMessageA(hWndTrackbar, TBM_GETNUMTICS, 0, 0); expect(3, r); + + DestroyWindow(hWndTrackbar); + + /* Test to show that TBM_SETTICFREQ updates thumb */ + for (i = 0; i < 2; i++) + { + DWORD style = i ? defaultstyle : defaultstyle & ~TBS_AUTOTICKS; + RECT rect, rect1; + WNDPROC oldproc; + + hWndTrackbar = create_trackbar2(style, hWndParent); + ok(hWndTrackbar != NULL, "Expected non NULL value\n"); + + oldproc = (WNDPROC)SetWindowLongPtrA(hWndTrackbar, GWLP_WNDPROC, (LONG_PTR)trackbar_no_wmpaint_proc); + SetWindowLongPtrA(hWndTrackbar, GWLP_USERDATA, (LONG_PTR)oldproc); + + SendMessageA(hWndTrackbar, TBM_GETTHUMBRECT, 0, (LPARAM)&rect); + SendMessageA(hWndTrackbar, TBM_SETPOS, FALSE, 0); + SendMessageA(hWndTrackbar, TBM_GETTHUMBRECT, 0, (LPARAM)&rect1); + ok(EqualRect(&rect, &rect1), "Unexpected thumb rectangle %s, previous %s\n", + wine_dbgstr_rect(&rect1), wine_dbgstr_rect(&rect)); + + SendMessageA(hWndTrackbar, TBM_GETTHUMBRECT, 0, (LPARAM)&rect); + SendMessageA(hWndTrackbar, TBM_SETRANGE, FALSE, MAKELONG(-100, 100)); + SendMessageA(hWndTrackbar, TBM_GETTHUMBRECT, 0, (LPARAM)&rect1); + ok(EqualRect(&rect, &rect1), "Unexpected thumb rectangle %s, previous %s\n", + wine_dbgstr_rect(&rect1), wine_dbgstr_rect(&rect)); + /* Old position is also 0, but thumb position will be different after range change */ + SendMessageA(hWndTrackbar, TBM_GETTHUMBRECT, 0, (LPARAM)&rect); + SendMessageA(hWndTrackbar, TBM_SETPOS, TRUE, 0); + SendMessageA(hWndTrackbar, TBM_GETTHUMBRECT, 0, (LPARAM)&rect1); + ok(EqualRect(&rect, &rect1), "Unexpected thumb rectangle %s, previous %s\n", + wine_dbgstr_rect(&rect1), wine_dbgstr_rect(&rect)); + /* Previous frequency is also 1, yet thumb is updated */ + SendMessageA(hWndTrackbar, TBM_GETTHUMBRECT, 0, (LPARAM)&rect); + SendMessageA(hWndTrackbar, TBM_SETTICFREQ, 1, 0); + SendMessageA(hWndTrackbar, TBM_GETTHUMBRECT, 0, (LPARAM)&rect1); + todo_wine + ok(!EqualRect(&rect, &rect1), "Unexpected thumb rectangle %s, previous %s\n", + wine_dbgstr_rect(&rect1), wine_dbgstr_rect(&rect)); + + SetWindowLongPtrA(hWndTrackbar, GWLP_WNDPROC, (LONG_PTR)oldproc); + + DestroyWindow(hWndTrackbar); + } } static void test_tic_placement(void)

1 0

Andrew Eikum : user32: Support IDC_PEN.
by Alexandre Julliard Feb. 28, 2017

Feb. 28, 2017

Module: wine Branch: oldstable Commit: 8ab3e0ba6422719fb31f8799de4862f71cf398e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ab3e0ba6422719fb31f8799d… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Nov 30 13:13:47 2016 -0600 user32: Support IDC_PEN. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d1064669f416ad2e354218852535250717bc34dc) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user32/resources/ocr_pen.cur | Bin 0 -> 326 bytes dlls/user32/user32.rc | 3 +++ include/winuser.h | 1 + include/winuser.rh | 1 + 4 files changed, 5 insertions(+) diff --git a/dlls/user32/resources/ocr_pen.cur b/dlls/user32/resources/ocr_pen.cur new file mode 100644 index 0000000..51be164 Binary files /dev/null and b/dlls/user32/resources/ocr_pen.cur differ diff --git a/dlls/user32/user32.rc b/dlls/user32/user32.rc index 4826e04..28a6c74 100644 --- a/dlls/user32/user32.rc +++ b/dlls/user32/user32.rc @@ -263,6 +263,9 @@ OCR_HELP CURSOR resources/ocr_help.cur /* @makedep: resources/ocr_dragobject.cur */ OCR_DRAGOBJECT CURSOR resources/ocr_dragobject.cur +/* @makedep: resources/ocr_pen.cur */ +OCR_PEN CURSOR resources/ocr_pen.cur + /****************************************************************/ /* Icons */ diff --git a/include/winuser.h b/include/winuser.h index cbd592c..8b1302c 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -2200,6 +2200,7 @@ typedef struct tagCBTACTIVATESTRUCT #define IDC_WAIT MAKEINTRESOURCE(32514) #define IDC_CROSS MAKEINTRESOURCE(32515) #define IDC_UPARROW MAKEINTRESOURCE(32516) +#define IDC_PEN MAKEINTRESOURCE(32631) #define IDC_SIZE MAKEINTRESOURCE(32640) #define IDC_ICON MAKEINTRESOURCE(32641) #define IDC_SIZENWSE MAKEINTRESOURCE(32642) diff --git a/include/winuser.rh b/include/winuser.rh index 1d2a0bb..e48a935 100644 --- a/include/winuser.rh +++ b/include/winuser.rh @@ -999,6 +999,7 @@ #define OCR_WAIT 32514 #define OCR_CROSS 32515 #define OCR_UP 32516 +#define OCR_PEN 32631 #define OCR_SIZE 32640 #define OCR_ICON 32641 #define OCR_SIZENWSE 32642

1 0