January 2018 - Wine-commits

Dmitry Timoshkov : user32: DialogBoxParam should return -1 when dialog control creation fails.
by Alexandre Julliard 02 Jan '18

02 Jan '18

Module: wine Branch: stable Commit: 89d3f104d7949daa68a414c14c159ef53c4210f0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=89d3f104d7949daa68a414c1… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Aug 18 19:42:11 2017 +0800 user32: DialogBoxParam should return -1 when dialog control creation fails. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 3d66e753e7eb00495690bf54abc27943a9e089db) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user32/dialog.c | 14 ++++++++------ dlls/user32/tests/dialog.c | 1 - 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index 8b77ae2..c2aad8d 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -835,11 +835,12 @@ INT_PTR WINAPI DialogBoxParamA( HINSTANCE hInst, LPCSTR name, HRSRC hrsrc; LPCDLGTEMPLATEA ptr; + if (owner && !IsWindow(owner)) return 0; + if (!(hrsrc = FindResourceA( hInst, name, (LPSTR)RT_DIALOG ))) return -1; if (!(ptr = LoadResource(hInst, hrsrc))) return -1; - hwnd = DIALOG_CreateIndirect( hInst, ptr, owner, dlgProc, param, FALSE, &owner ); - if (hwnd) return DIALOG_DoDialogBox( hwnd, owner ); - return 0; + if (!(hwnd = DIALOG_CreateIndirect( hInst, ptr, owner, dlgProc, param, FALSE, &owner ))) return -1; + return DIALOG_DoDialogBox( hwnd, owner ); } @@ -853,11 +854,12 @@ INT_PTR WINAPI DialogBoxParamW( HINSTANCE hInst, LPCWSTR name, HRSRC hrsrc; LPCDLGTEMPLATEW ptr; + if (owner && !IsWindow(owner)) return 0; + if (!(hrsrc = FindResourceW( hInst, name, (LPWSTR)RT_DIALOG ))) return -1; if (!(ptr = LoadResource(hInst, hrsrc))) return -1; - hwnd = DIALOG_CreateIndirect( hInst, ptr, owner, dlgProc, param, TRUE, &owner ); - if (hwnd) return DIALOG_DoDialogBox( hwnd, owner ); - return 0; + if (!(hwnd = DIALOG_CreateIndirect( hInst, ptr, owner, dlgProc, param, TRUE, &owner ))) return -1; + return DIALOG_DoDialogBox( hwnd, owner ); } diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index 45886aa..1970e8f 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -1273,7 +1273,6 @@ static void test_DialogBoxParamA(void) SetLastError(0xdeadbeef); ret = DialogBoxParamA(GetModuleHandleA(NULL), "TEST_DIALOG_INVALID_CLASS", 0, DestroyDlgWinProc, 0); -todo_wine ok(ret == -1, "DialogBoxParamA returned %ld, expected -1\n", ret); ok(GetLastError() == 0, "got %d\n", GetLastError());

1 0

Huw Davies : gdi32: Add a helper to fill rectangles with a given pixel.
by Alexandre Julliard 02 Jan '18

02 Jan '18

Module: wine Branch: stable Commit: b5565f2a523f3323924d36b91e4d491121cc9515 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b5565f2a523f3323924d36b9… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jul 24 10:47:03 2017 +0100 gdi32: Add a helper to fill rectangles with a given pixel. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 46e6ee48f3cd5a6eeec50db2a8c7db17025c606f) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/gdi32/dibdrv/dibdrv.h | 1 + dlls/gdi32/dibdrv/objects.c | 19 +++++++++++++++---- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index 770e89e..adf16c4 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -257,6 +257,7 @@ extern void add_clipped_bounds( dibdrv_physdev *dev, const RECT *rect, HRGN clip extern int clip_line(const POINT *start, const POINT *end, const RECT *clip, const bres_params *params, POINT *pt1, POINT *pt2) DECLSPEC_HIDDEN; extern void release_cached_font( struct cached_font *font ) DECLSPEC_HIDDEN; +extern BOOL fill_with_pixel( DC *dc, dib_info *dib, DWORD pixel, int num, const RECT *rects, INT rop ) DECLSPEC_HIDDEN; static inline void init_clipped_rects( struct clipped_rects *clip_rects ) { diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index cde20e3..8e55d1a 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -1754,6 +1754,20 @@ COLORREF dibdrv_SetDCPenColor( PHYSDEV dev, COLORREF color ) } /********************************************************************** + * fill_with_pixel + * + * Fill a number of rectangles with a given pixel color and rop mode + */ +BOOL fill_with_pixel( DC *dc, dib_info *dib, DWORD pixel, int num, const RECT *rects, INT rop ) +{ + rop_mask mask; + + calc_rop_masks( rop, pixel, &mask ); + dib->funcs->solid_rects( dib, num, rects, mask.and, mask.xor ); + return TRUE; +} + +/********************************************************************** * solid_brush * * Fill a number of rectangles with the solid brush @@ -1762,12 +1776,9 @@ static BOOL solid_brush(dibdrv_physdev *pdev, dib_brush *brush, dib_info *dib, int num, const RECT *rects, INT rop) { DC *dc = get_physdev_dc( &pdev->dev ); - rop_mask brush_color; DWORD color = get_pixel_color( dc, &pdev->dib, brush->colorref, TRUE ); - calc_rop_masks( rop, color, &brush_color ); - dib->funcs->solid_rects( dib, num, rects, brush_color.and, brush_color.xor ); - return TRUE; + return fill_with_pixel( dc, dib, color, num, rects, rop ); } static BOOL alloc_brush_mask_bits( dib_brush *brush )

1 0

Huw Davies : gdi32: Respect the rop mode in SetPixel.
by Alexandre Julliard 02 Jan '18

02 Jan '18

Module: wine Branch: stable Commit: 16ba8ec24db68e8fdc343f0a3da85953f95128e0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=16ba8ec24db68e8fdc343f0a… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jul 24 10:47:04 2017 +0100 gdi32: Respect the rop mode in SetPixel. Based on a patch by Tim Worthington. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 8e9af9e01635733376962bea58b04f001a90ac66) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/gdi32/dibdrv/graphics.c | 2 +- dlls/gdi32/tests/dib.c | 70 ++++++++++++++++++++++++-------------------- 2 files changed, 40 insertions(+), 32 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=16ba8ec24db68e8fdc34…

1 0

Nikolay Sivov : comctl32/monthcal: Initialize day field before setting final hit test result (Valgrind).
by Alexandre Julliard 02 Jan '18

02 Jan '18

Module: wine Branch: stable Commit: 84c984960e8538a08c8cddb0ffe53b7babf82868 URL: https://source.winehq.org/git/wine.git/?a=commit;h=84c984960e8538a08c8cddb0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 28 00:07:50 2017 +0300 comctl32/monthcal: Initialize day field before setting final hit test result (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 9231452a9c064fa085733befd283025d2133f13b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/monthcal.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 4a9a81e..97e0c8c 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -1916,6 +1916,7 @@ MONTHCAL_HitTest(const MONTHCAL_INFO *infoPtr, MCHITTESTINFO *lpht) else if(PtInRect(&infoPtr->calendars[calIdx].days, lpht->pt)) { htinfo.iOffset = calIdx; + htinfo.st.wDay = ht_month->wDay; htinfo.st.wYear = ht_month->wYear; htinfo.st.wMonth = ht_month->wMonth; /* previous month only valid for first calendar */

1 0

Alexandre Julliard : winex11: If importing an X11 clipboard format fails, try other candidate formats for the target.
by Alexandre Julliard 02 Jan '18

02 Jan '18

Module: wine Branch: stable Commit: cf4c982d5f00781b51dbcf39dd34a576cafe9f70 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf4c982d5f00781b51dbcf39… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 25 08:08:13 2017 +0200 winex11: If importing an X11 clipboard format fails, try other candidate formats for the target. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 401ccc73e204522278d1d0426af008a1b89c8bd9) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winex11.drv/clipboard.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 4cb8cb8..4668ce8 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -1082,8 +1082,9 @@ static HANDLE render_format( UINT id ) for (i = 0; i < nb_current_x11_formats; i++) { if (current_x11_formats[i]->id != id) continue; - handle = import_selection( display, import_window, current_selection, current_x11_formats[i] ); - if (handle) SetClipboardData( id, handle ); + if (!(handle = import_selection( display, import_window, + current_selection, current_x11_formats[i] ))) continue; + SetClipboardData( id, handle ); break; } return handle;

1 0

Piotr Caban : msvcrt: Fix strcpy implementation so it works on overlapping buffers.
by Alexandre Julliard 02 Jan '18

02 Jan '18

Module: wine Branch: stable Commit: 34099917a257906ed52921adf59f4ad83d41a2aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=34099917a257906ed52921ad… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Aug 5 18:23:13 2017 +0200 msvcrt: Fix strcpy implementation so it works on overlapping buffers. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 395a65bdc6c576a084c8008e42c95b9750421e86) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/string.c | 10 ++++++++++ dlls/msvcrt/tests/string.c | 15 +++++++++++++-- dlls/ucrtbase/ucrtbase.spec | 2 +- 11 files changed, 32 insertions(+), 11 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index d80522a..76f88e6 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1800,7 +1800,7 @@ @ cdecl strchr(str long) MSVCRT_strchr @ cdecl strcmp(str str) MSVCRT_strcmp @ cdecl strcoll(str str) MSVCRT_strcoll -@ cdecl strcpy(ptr str) ntdll.strcpy +@ cdecl strcpy(ptr str) MSVCRT_strcpy @ cdecl strcpy_s(ptr long str) MSVCRT_strcpy_s @ cdecl strcspn(str str) ntdll.strcspn @ cdecl strerror(long) MSVCRT_strerror diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index adefdf1..416d43b 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -2158,7 +2158,7 @@ @ cdecl strchr(str long) MSVCRT_strchr @ cdecl strcmp(str str) MSVCRT_strcmp @ cdecl strcoll(str str) MSVCRT_strcoll -@ cdecl strcpy(ptr str) ntdll.strcpy +@ cdecl strcpy(ptr str) MSVCRT_strcpy @ cdecl strcpy_s(ptr long str) MSVCRT_strcpy_s @ cdecl strcspn(str str) ntdll.strcspn @ cdecl strerror(long) MSVCRT_strerror diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 47f87df..aec2eb6 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2368,7 +2368,7 @@ @ cdecl strchr(str long) MSVCRT_strchr @ cdecl strcmp(str str) MSVCRT_strcmp @ cdecl strcoll(str str) MSVCRT_strcoll -@ cdecl strcpy(ptr str) ntdll.strcpy +@ cdecl strcpy(ptr str) MSVCRT_strcpy @ cdecl strcpy_s(ptr long str) MSVCRT_strcpy_s @ cdecl strcspn(str str) ntdll.strcspn @ cdecl strerror(long) MSVCRT_strerror diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index f2aea27..093d853 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -813,7 +813,7 @@ @ cdecl strchr(str long) MSVCRT_strchr @ cdecl strcmp(str str) MSVCRT_strcmp @ cdecl strcoll(str str) MSVCRT_strcoll -@ cdecl strcpy(ptr str) ntdll.strcpy +@ cdecl strcpy(ptr str) MSVCRT_strcpy @ cdecl strcspn(str str) ntdll.strcspn @ cdecl strerror(long) MSVCRT_strerror @ cdecl strftime(str long str ptr) MSVCRT_strftime diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index 06c4d32..84367f8 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -809,7 +809,7 @@ @ cdecl strchr(str long) MSVCRT_strchr @ cdecl strcmp(str str) MSVCRT_strcmp @ cdecl strcoll(str str) MSVCRT_strcoll -@ cdecl strcpy(ptr str) ntdll.strcpy +@ cdecl strcpy(ptr str) MSVCRT_strcpy @ cdecl strcspn(str str) ntdll.strcspn @ cdecl strerror(long) MSVCRT_strerror @ cdecl strftime(str long str ptr) MSVCRT_strftime diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index b606cc3..0aec6e8 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1480,7 +1480,7 @@ @ cdecl strchr(str long) MSVCRT_strchr @ cdecl strcmp(str str) MSVCRT_strcmp @ cdecl strcoll(str str) MSVCRT_strcoll -@ cdecl strcpy(ptr str) ntdll.strcpy +@ cdecl strcpy(ptr str) MSVCRT_strcpy @ cdecl strcpy_s(ptr long str) MSVCRT_strcpy_s @ cdecl strcspn(str str) ntdll.strcspn @ cdecl strerror(long) MSVCRT_strerror diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 251bff9..d2e4fc5 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1453,7 +1453,7 @@ @ cdecl strchr(str long) MSVCRT_strchr @ cdecl strcmp(str str) MSVCRT_strcmp @ cdecl strcoll(str str) MSVCRT_strcoll -@ cdecl strcpy(ptr str) ntdll.strcpy +@ cdecl strcpy(ptr str) MSVCRT_strcpy @ cdecl strcpy_s(ptr long str) MSVCRT_strcpy_s @ cdecl strcspn(str str) ntdll.strcspn @ cdecl strerror(long) MSVCRT_strerror diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index daf80a0..a5579a2 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1421,7 +1421,7 @@ @ cdecl strchr(str long) MSVCRT_strchr @ cdecl strcmp(str str) MSVCRT_strcmp @ cdecl strcoll(str str) MSVCRT_strcoll -@ cdecl strcpy(ptr str) ntdll.strcpy +@ cdecl strcpy(ptr str) MSVCRT_strcpy @ cdecl strcpy_s(ptr long str) MSVCRT_strcpy_s @ cdecl strcspn(str str) ntdll.strcspn @ cdecl strerror(long) MSVCRT_strerror diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 3e765d0..8d6b48c 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -697,6 +697,16 @@ char* __cdecl MSVCRT_strncpy(char *dst, const char *src, MSVCRT_size_t len) } /********************************************************************* + * strcpy (MSVCRT.@) + */ +char* CDECL MSVCRT_strcpy(char *dst, const char *src) +{ + char *ret = dst; + while ((*dst++ = *src++)); + return ret; +} + +/********************************************************************* * strcpy_s (MSVCRT.@) */ int CDECL MSVCRT_strcpy_s( char* dst, MSVCRT_size_t elem, const char* src ) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 7557996..52d7c66 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -56,6 +56,7 @@ static void* (__cdecl *pmemcpy)(void *, const void *, size_t n); static int (__cdecl *p_memcpy_s)(void *, size_t, const void *, size_t); static int (__cdecl *p_memmove_s)(void *, size_t, const void *, size_t); static int* (__cdecl *pmemcmp)(void *, const void *, size_t n); +static int (__cdecl *p_strcpy)(char *dst, const char *src); static int (__cdecl *pstrcpy_s)(char *dst, size_t len, const char *src); static int (__cdecl *pstrcat_s)(char *dst, size_t len, const char *src); static int (__cdecl *p_mbscat_s)(unsigned char *dst, size_t size, const unsigned char *src); @@ -493,8 +494,8 @@ static void test_strdup(void) static void test_strcpy_s(void) { char dest[8]; - const char *small = "small"; - const char *big = "atoolongstringforthislittledestination"; + const char small[] = "small"; + const char big[] = "atoolongstringforthislittledestination"; int ret; if(!pstrcpy_s) @@ -543,6 +544,15 @@ static void test_strcpy_s(void) ret = pstrcpy_s(NULL, sizeof(dest), small); ok(ret == EINVAL, "Copying a big string a NULL dest returned %d, expected EINVAL\n", ret); + + /* strcpy overlapping buffers test */ + memset(dest, 'X', sizeof(dest)); + memcpy(dest+1, small, sizeof(small)); + p_strcpy(dest, dest+1); + ok(dest[0] == 's' && dest[1] == 'm' && dest[2] == 'a' && dest[3] == 'l' && + dest[4] == 'l' && dest[5] == '\0' && dest[6] == '\0' && dest[7] == 'X', + "Unexpected return data from strcpy: 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x\n", + dest[0], dest[1], dest[2], dest[3], dest[4], dest[5], dest[6], dest[7]); } #define NUMELMS(array) (sizeof(array)/sizeof((array)[0])) @@ -3186,6 +3196,7 @@ START_TEST(string) SET(pmemcmp,"memcmp"); SET(p_mbctype,"_mbctype"); SET(p__mb_cur_max,"__mb_cur_max"); + SET(p_strcpy, "strcpy"); pstrcpy_s = (void *)GetProcAddress( hMsvcrt,"strcpy_s" ); pstrcat_s = (void *)GetProcAddress( hMsvcrt,"strcat_s" ); p_mbscat_s = (void*)GetProcAddress( hMsvcrt, "_mbscat_s" ); diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index f6daec0..440f2d8 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2499,7 +2499,7 @@ @ cdecl strchr(str long) MSVCRT_strchr @ cdecl strcmp(str str) MSVCRT_strcmp @ cdecl strcoll(str str) MSVCRT_strcoll -@ cdecl strcpy(ptr str) ntdll.strcpy +@ cdecl strcpy(ptr str) MSVCRT_strcpy @ cdecl strcpy_s(ptr long str) MSVCRT_strcpy_s @ cdecl strcspn(str str) ntdll.strcspn @ cdecl strerror(long) MSVCRT_strerror

1 0

Fabian Maurer : shell32: Draw text on message boxes without background.
by Alexandre Julliard 02 Jan '18

02 Jan '18

Module: wine Branch: stable Commit: 69ef32e9427ae3d5e7ac5323661fd4767ed3b3fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=69ef32e9427ae3d5e7ac5323… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Mon Sep 4 19:42:53 2017 +0200 shell32: Draw text on message boxes without background. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 755f49d7c4765c792da2c0b776300b4616f7bef4) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/shlfileop.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c index 3c18066..8d4160d 100644 --- a/dlls/shell32/shlfileop.c +++ b/dlls/shell32/shlfileop.c @@ -122,6 +122,7 @@ static INT_PTR ConfirmMsgBox_Paint(HWND hDlg) BeginPaint(hDlg, &ps); hdc = ps.hdc; + SetBkMode(hdc, TRANSPARENT); GetClientRect(GetDlgItem(hDlg, IDD_MESSAGE), &r); /* this will remap the rect to dialog coords */

1 0

Alex Henrie : msvcrt: Note that __stdio_common functions are for ucrtbase.
by Alexandre Julliard 02 Jan '18

02 Jan '18

Module: wine Branch: stable Commit: bb03822f00f8c8e00f667fa5f81629885082753d URL: https://source.winehq.org/git/wine.git/?a=commit;h=bb03822f00f8c8e00f667fa5… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Sep 4 12:06:56 2017 -0600 msvcrt: Note that __stdio_common functions are for ucrtbase. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 5074bb9a4bf77d23dfcf11cf019ea4264f021928) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcrt/file.c | 4 ++-- dlls/msvcrt/scanf.c | 8 ++++---- dlls/msvcrt/wcs.c | 14 +++++++------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 51d2e23..bef27e1 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -5108,7 +5108,7 @@ int CDECL MSVCRT_vfwprintf_s(MSVCRT_FILE* file, const MSVCRT_wchar_t *format, __ } /********************************************************************* - * __stdio_common_vfprintf (MSVCRT.@) + * __stdio_common_vfprintf (UCRTBASE.@) */ int CDECL MSVCRT__stdio_common_vfprintf(unsigned __int64 options, MSVCRT_FILE *file, const char *format, MSVCRT__locale_t locale, __ms_va_list valist) @@ -5132,7 +5132,7 @@ int CDECL MSVCRT__stdio_common_vfprintf(unsigned __int64 options, MSVCRT_FILE *f } /********************************************************************* - * __stdio_common_vfwprintf (MSVCRT.@) + * __stdio_common_vfwprintf (UCRTBASE.@) */ int CDECL MSVCRT__stdio_common_vfwprintf(unsigned __int64 options, MSVCRT_FILE *file, const MSVCRT_wchar_t *format, MSVCRT__locale_t locale, __ms_va_list valist) diff --git a/dlls/msvcrt/scanf.c b/dlls/msvcrt/scanf.c index 3642307..fd776a6 100644 --- a/dlls/msvcrt/scanf.c +++ b/dlls/msvcrt/scanf.c @@ -663,7 +663,7 @@ int CDECL MSVCRT__snscanf_s_l(char *input, MSVCRT_size_t length, /********************************************************************* - * __stdio_common_vsscanf (MSVCRT.@) + * __stdio_common_vsscanf (UCRTBASE.@) */ int CDECL MSVCRT__stdio_common_vsscanf(unsigned __int64 options, const char *input, MSVCRT_size_t length, @@ -683,7 +683,7 @@ int CDECL MSVCRT__stdio_common_vsscanf(unsigned __int64 options, } /********************************************************************* - * __stdio_common_vswscanf (MSVCRT.@) + * __stdio_common_vswscanf (UCRTBASE.@) */ int CDECL MSVCRT__stdio_common_vswscanf(unsigned __int64 options, const MSVCRT_wchar_t *input, MSVCRT_size_t length, @@ -703,7 +703,7 @@ int CDECL MSVCRT__stdio_common_vswscanf(unsigned __int64 options, } /********************************************************************* - * __stdio_common_vfscanf (MSVCRT.@) + * __stdio_common_vfscanf (UCRTBASE.@) */ int CDECL MSVCRT__stdio_common_vfscanf(unsigned __int64 options, MSVCRT_FILE *file, @@ -720,7 +720,7 @@ int CDECL MSVCRT__stdio_common_vfscanf(unsigned __int64 options, } /********************************************************************* - * __stdio_common_vfwscanf (MSVCRT.@) + * __stdio_common_vfwscanf (UCRTBASE.@) */ int CDECL MSVCRT__stdio_common_vfwscanf(unsigned __int64 options, MSVCRT_FILE *file, diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index c497a10..2ff9ec8 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -749,7 +749,7 @@ static int puts_clbk_str_c99_a(void *ctx, int len, const char *str) } /********************************************************************* - * __stdio_common_vsprintf (MSVCRT.@) + * __stdio_common_vsprintf (UCRTBASE.@) */ int CDECL MSVCRT__stdio_common_vsprintf( unsigned __int64 options, char *str, MSVCRT_size_t len, const char *format, MSVCRT__locale_t locale, __ms_va_list valist ) @@ -918,7 +918,7 @@ int CDECL MSVCRT_vsnprintf_s( char *str, MSVCRT_size_t sizeOfBuffer, } /********************************************************************* - * __stdio_common_vsnprintf_s (MSVCRT.@) + * __stdio_common_vsnprintf_s (UCRTBASE.@) */ int CDECL MSVCRT__stdio_common_vsnprintf_s( unsigned __int64 options, char *str, MSVCRT_size_t sizeOfBuffer, MSVCRT_size_t count, @@ -930,7 +930,7 @@ int CDECL MSVCRT__stdio_common_vsnprintf_s( unsigned __int64 options, } /********************************************************************* - * __stdio_common_vsnwprintf_s (MSVCRT.@) + * __stdio_common_vsnwprintf_s (UCRTBASE.@) */ int CDECL MSVCRT__stdio_common_vsnwprintf_s( unsigned __int64 options, MSVCRT_wchar_t *str, MSVCRT_size_t sizeOfBuffer, MSVCRT_size_t count, @@ -942,7 +942,7 @@ int CDECL MSVCRT__stdio_common_vsnwprintf_s( unsigned __int64 options, } /********************************************************************* - * __stdio_common_vswprintf_s (MSVCRT.@) + * __stdio_common_vswprintf_s (UCRTBASE.@) */ int CDECL MSVCRT__stdio_common_vswprintf_s( unsigned __int64 options, MSVCRT_wchar_t *str, MSVCRT_size_t count, const MSVCRT_wchar_t *format, @@ -952,7 +952,7 @@ int CDECL MSVCRT__stdio_common_vswprintf_s( unsigned __int64 options, } /********************************************************************* - * __stdio_common_vsprintf_s (MSVCRT.@) + * __stdio_common_vsprintf_s (UCRTBASE.@) */ int CDECL MSVCRT__stdio_common_vsprintf_s( unsigned __int64 options, char *str, MSVCRT_size_t count, const char *format, @@ -1159,7 +1159,7 @@ int CDECL MSVCRT__vswprintf_p(MSVCRT_wchar_t *buffer, MSVCRT_size_t length, /********************************************************************* - * __stdio_common_vswprintf_p (MSVCRT.@) + * __stdio_common_vswprintf_p (UCRTBASE.@) */ int CDECL MSVCRT__stdio_common_vswprintf_p( unsigned __int64 options, MSVCRT_wchar_t *str, MSVCRT_size_t count, const MSVCRT_wchar_t *format, @@ -1266,7 +1266,7 @@ static int puts_clbk_str_c99_w(void *ctx, int len, const MSVCRT_wchar_t *str) } /********************************************************************* - * __stdio_common_vswprintf (MSVCRT.@) + * __stdio_common_vswprintf (UCRTBASE.@) */ int CDECL MSVCRT__stdio_common_vswprintf( unsigned __int64 options, MSVCRT_wchar_t *str, MSVCRT_size_t len, const MSVCRT_wchar_t *format,

1 0

Alex Henrie : ucrtbase: Add __stdio_common_vfprintf_s.
by Alexandre Julliard 02 Jan '18

02 Jan '18

Module: wine Branch: stable Commit: f81873a5998aa7aa78fd463d62d8c0f0e4055efa URL: https://source.winehq.org/git/wine.git/?a=commit;h=f81873a5998aa7aa78fd463d… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Sep 4 12:06:57 2017 -0600 ucrtbase: Add __stdio_common_vfprintf_s. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit a116f4a7abfe09182eb488a033dbbf0c20e2f9f4) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- .../api-ms-win-crt-stdio-l1-1-0.spec | 2 +- dlls/msvcrt/file.c | 27 ++++++++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 3 files changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec b/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec index 6acd08e..6196fb4 100644 --- a/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec +++ b/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec @@ -3,7 +3,7 @@ @ cdecl __p__fmode() ucrtbase.__p__fmode @ cdecl __stdio_common_vfprintf(int64 ptr str ptr ptr) ucrtbase.__stdio_common_vfprintf @ stub __stdio_common_vfprintf_p -@ stub __stdio_common_vfprintf_s +@ cdecl __stdio_common_vfprintf_s(int64 ptr str ptr ptr) ucrtbase.__stdio_common_vfprintf_s @ cdecl __stdio_common_vfscanf(int64 ptr str ptr ptr) ucrtbase.__stdio_common_vfscanf @ cdecl __stdio_common_vfwprintf(int64 ptr wstr ptr ptr) ucrtbase.__stdio_common_vfwprintf @ stub __stdio_common_vfwprintf_p diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index bef27e1..90a78f7a 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -5132,6 +5132,33 @@ int CDECL MSVCRT__stdio_common_vfprintf(unsigned __int64 options, MSVCRT_FILE *f } /********************************************************************* + * __stdio_common_vfprintf_s (UCRTBASE.@) + */ +int CDECL MSVCRT__stdio_common_vfprintf_s(unsigned __int64 options, MSVCRT_FILE *file, const char *format, + MSVCRT__locale_t locale, __ms_va_list valist) +{ + BOOL tmp_buf; + int ret; + + if (!MSVCRT_CHECK_PMT(file != NULL)) return -1; + + MSVCRT__lock_file(file); + tmp_buf = add_std_buffer(file); + + if (options & ~UCRTBASE_PRINTF_MASK) + FIXME("options %s not handled\n", wine_dbgstr_longlong(options)); + + ret = pf_printf_a(puts_clbk_file_a, file, format, locale, + (options & UCRTBASE_PRINTF_MASK) | MSVCRT_PRINTF_INVOKE_INVALID_PARAM_HANDLER, + arg_clbk_valist, NULL, &valist); + + if (tmp_buf) remove_std_buffer(file); + MSVCRT__unlock_file(file); + + return ret; +} + +/********************************************************************* * __stdio_common_vfwprintf (UCRTBASE.@) */ int CDECL MSVCRT__stdio_common_vfwprintf(unsigned __int64 options, MSVCRT_FILE *file, const MSVCRT_wchar_t *format, diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 440f2d8..a6b2043 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -148,7 +148,7 @@ @ cdecl __std_type_info_name(ptr ptr) MSVCRT_type_info_name_list @ cdecl __stdio_common_vfprintf(int64 ptr str ptr ptr) MSVCRT__stdio_common_vfprintf @ stub __stdio_common_vfprintf_p -@ stub __stdio_common_vfprintf_s +@ cdecl __stdio_common_vfprintf_s(int64 ptr str ptr ptr) MSVCRT__stdio_common_vfprintf_s @ cdecl __stdio_common_vfscanf(int64 ptr str ptr ptr) MSVCRT__stdio_common_vfscanf @ cdecl __stdio_common_vfwprintf(int64 ptr wstr ptr ptr) MSVCRT__stdio_common_vfwprintf @ stub __stdio_common_vfwprintf_p

1 0

Fabian Maurer : gdiplus: Avoid division by zero in SOFTWARE_GdipDrawThinPath.
by Alexandre Julliard 02 Jan '18

02 Jan '18

Module: wine Branch: stable Commit: 1e211e9d4f4f2a7a925de688dd9003466ba07624 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1e211e9d4f4f2a7a925de688… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Tue Jul 25 00:50:09 2017 +0200 gdiplus: Avoid division by zero in SOFTWARE_GdipDrawThinPath. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 400cfb0fd9d0f25316b680882fce938d2f0724b7) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/gdiplus/graphics.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index bd37d92..6465b26 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3593,6 +3593,9 @@ static GpStatus SOFTWARE_GdipDrawThinPath(GpGraphics *graphics, GpPen *pen, GpPa end_pointi.X = floorf(end_point.X); end_pointi.Y = floorf(end_point.Y); + if(start_pointi.X == end_pointi.X && start_pointi.Y == end_pointi.Y) + continue; + /* draw line segment */ if (abs(start_pointi.Y - end_pointi.Y) > abs(start_pointi.X - end_pointi.X)) {

1 0