wine-commits January 2018

2 participants
638 discussions

Hugh Bellamy : gdiplus: Define GpHatchStyle.

by Alexandre Julliard

Module: wine Branch: stable Commit: a37ea9543dc90ed2090bfe3509f134df1607e31c URL: https://source.winehq.org/git/wine.git/?a=commit;h=a37ea9543dc90ed2090bfe35… Author: Hugh Bellamy <hughbellars(a)gmail.com> Date: Fri Sep 15 16:39:59 2017 +0100 gdiplus: Define GpHatchStyle. Signed-off-by: Hugh Bellamy <hughbellars(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit c022c46613c137ab53185b5e7752aff14a085c4b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/gdiplus/brush.c | 6 +++--- dlls/gdiplus/gdiplus_private.h | 4 ++-- dlls/gdiplus/tests/brush.c | 22 ++++++++++++++++++++++ include/gdiplusflat.h | 4 ++-- include/gdiplusgpstubs.h | 1 + 5 files changed, 30 insertions(+), 7 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index a184276..9265ea6 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -227,7 +227,7 @@ static const char HatchBrushes[][8] = { { 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff }, /* HatchStyleDarkHorizontal */ }; -GpStatus get_hatch_data(HatchStyle hatchstyle, const char **result) +GpStatus get_hatch_data(GpHatchStyle hatchstyle, const char **result) { if (hatchstyle < sizeof(HatchBrushes) / sizeof(HatchBrushes[0])) { @@ -241,7 +241,7 @@ GpStatus get_hatch_data(HatchStyle hatchstyle, const char **result) /****************************************************************************** * GdipCreateHatchBrush [GDIPLUS.@] */ -GpStatus WINGDIPAPI GdipCreateHatchBrush(HatchStyle hatchstyle, ARGB forecol, ARGB backcol, GpHatch **brush) +GpStatus WINGDIPAPI GdipCreateHatchBrush(GpHatchStyle hatchstyle, ARGB forecol, ARGB backcol, GpHatch **brush) { TRACE("(%d, %d, %d, %p)\n", hatchstyle, forecol, backcol, brush); @@ -892,7 +892,7 @@ GpStatus WINGDIPAPI GdipGetHatchForegroundColor(GpHatch *brush, ARGB *forecol) return Ok; } -GpStatus WINGDIPAPI GdipGetHatchStyle(GpHatch *brush, HatchStyle *hatchstyle) +GpStatus WINGDIPAPI GdipGetHatchStyle(GpHatch *brush, GpHatchStyle *hatchstyle) { TRACE("(%p, %p)\n", brush, hatchstyle); diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 340e9bd..58689a7 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -123,7 +123,7 @@ extern GpStatus trace_path(GpGraphics *graphics, GpPath *path) DECLSPEC_HIDDEN; typedef struct region_element region_element; extern void delete_element(region_element *element) DECLSPEC_HIDDEN; -extern GpStatus get_hatch_data(HatchStyle hatchstyle, const char **result) DECLSPEC_HIDDEN; +extern GpStatus get_hatch_data(GpHatchStyle hatchstyle, const char **result) DECLSPEC_HIDDEN; static inline INT gdip_round(REAL x) { @@ -258,7 +258,7 @@ struct GpBrush{ struct GpHatch{ GpBrush brush; - HatchStyle hatchstyle; + GpHatchStyle hatchstyle; ARGB forecol; ARGB backcol; }; diff --git a/dlls/gdiplus/tests/brush.c b/dlls/gdiplus/tests/brush.c index 0942e88..ca324c2 100644 --- a/dlls/gdiplus/tests/brush.c +++ b/dlls/gdiplus/tests/brush.c @@ -1269,6 +1269,27 @@ static void test_pathgradientblend(void) expect(Ok, status); } +static void test_getHatchStyle(void) +{ + GpStatus status; + GpHatch *brush; + GpHatchStyle hatchStyle; + + GdipCreateHatchBrush(HatchStyleHorizontal, 11, 12, &brush); + + status = GdipGetHatchStyle(NULL, &hatchStyle); + expect(InvalidParameter, status); + + status = GdipGetHatchStyle(brush, NULL); + expect(InvalidParameter, status); + + status = GdipGetHatchStyle(brush, &hatchStyle); + expect(Ok, status); + expect(HatchStyleHorizontal, hatchStyle); + + GdipDeleteBrush((GpBrush *)brush); +} + START_TEST(brush) { struct GdiplusStartupInput gdiplusStartupInput; @@ -1297,6 +1318,7 @@ START_TEST(brush) test_pathgradientcenterpoint(); test_pathgradientpresetblend(); test_pathgradientblend(); + test_getHatchStyle(); GdiplusShutdown(gdiplusToken); } diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 101d73d..5cfdc59 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -385,10 +385,10 @@ GpStatus WINGDIPAPI GdipWarpPath(GpPath*,GpMatrix*,GDIPCONST GpPointF*,INT,REAL, GpStatus WINGDIPAPI GdipWidenPath(GpPath*,GpPen*,GpMatrix*,REAL); /* HatchBrush */ -GpStatus WINGDIPAPI GdipCreateHatchBrush(HatchStyle,ARGB,ARGB,GpHatch**); +GpStatus WINGDIPAPI GdipCreateHatchBrush(GpHatchStyle,ARGB,ARGB,GpHatch**); GpStatus WINGDIPAPI GdipGetHatchBackgroundColor(GpHatch*,ARGB*); GpStatus WINGDIPAPI GdipGetHatchForegroundColor(GpHatch*,ARGB*); -GpStatus WINGDIPAPI GdipGetHatchStyle(GpHatch*,HatchStyle*); +GpStatus WINGDIPAPI GdipGetHatchStyle(GpHatch*,GpHatchStyle*); /* Image */ GpStatus WINGDIPAPI GdipCloneImage(GpImage*, GpImage**); diff --git a/include/gdiplusgpstubs.h b/include/gdiplusgpstubs.h index 5a65cd8..67b6ac1 100644 --- a/include/gdiplusgpstubs.h +++ b/include/gdiplusgpstubs.h @@ -95,5 +95,6 @@ typedef FlushIntention GpFlushIntention; typedef CoordinateSpace GpCoordinateSpace; typedef PenAlignment GpPenAlignment; typedef PenType GpPenType; +typedef HatchStyle GpHatchStyle; #endif

6 years, 5 months

Alistair Leslie-Hughes : ole32: Add pointer check.

by Alexandre Julliard

Module: wine Branch: stable Commit: c0337fae4def9cef6ccdcd4644e993baf21e8845 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c0337fae4def9cef6ccdcd46… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Sep 26 01:12:52 2017 +0000 ole32: Add pointer check. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit fcc261adfd402133385820b06bf0d6589829fcf9) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ole32/storage32.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 2bc9d3d..bccb2f3 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -7267,6 +7267,8 @@ BlockChainStream* BlockChainStream_Construct( BlockChainStream* newStream; newStream = HeapAlloc(GetProcessHeap(), 0, sizeof(BlockChainStream)); + if(!newStream) + return NULL; newStream->parentStorage = parentStorage; newStream->headOfStreamPlaceHolder = headOfStreamPlaceHolder;

6 years, 5 months

Alex Henrie : include: Add D3D_DISABLE_9EX checks to d3d9.h.

by Alexandre Julliard

Module: wine Branch: stable Commit: 5090048e20eeee6cef15dc23ef9c8635958031db URL: https://source.winehq.org/git/wine.git/?a=commit;h=5090048e20eeee6cef15dc23… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Sep 26 17:21:20 2017 +0200 include: Add D3D_DISABLE_9EX checks to d3d9.h. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 7abed27908f637fe738cffa1e574aa1db3907d89) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- include/d3d9.h | 1121 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 569 insertions(+), 552 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5090048e20eeee6cef15…

6 years, 5 months

Alex Henrie : shell32: Implement ShellExec_RunDLL.

by Alexandre Julliard

Module: wine Branch: stable Commit: afd8c13c7585a4a3d4a8e4d20513bed39803d803 URL: https://source.winehq.org/git/wine.git/?a=commit;h=afd8c13c7585a4a3d4a8e4d2… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Sep 25 22:52:52 2017 -0600 shell32: Implement ShellExec_RunDLL. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 67826491a69f9cddfea6feef0ba27ddd0efe384a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/shell32.spec | 6 +++--- dlls/shell32/shlexec.c | 52 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index cd4f24a..4f8d6cd 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -436,9 +436,9 @@ @ stub SheShortenPathW @ stdcall ShellAboutA(long str str long) @ stdcall ShellAboutW(long wstr wstr long) -@ stub ShellExec_RunDLL -@ stub ShellExec_RunDLLA -@ stub ShellExec_RunDLLW +@ stdcall ShellExec_RunDLL(long long str long) ShellExec_RunDLLA +@ stdcall ShellExec_RunDLLA(long long str long) +@ stdcall ShellExec_RunDLLW(long long wstr long) @ stdcall ShellExecuteA(long str str str str long) @ stdcall ShellExecuteEx (long) ShellExecuteExA @ stdcall ShellExecuteExA (long) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index 6aa3eec..1c2f1a4 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -2014,6 +2014,58 @@ HINSTANCE WINAPI WOWShellExecute(HWND hWnd, LPCSTR lpVerb,LPCSTR lpFile, } /************************************************************************* + * ShellExec_RunDLLW [SHELL32.@] + */ +void WINAPI ShellExec_RunDLLW(HWND hwnd, HINSTANCE instance, WCHAR *cmdline, int cmdshow) +{ + BOOL in_single_quotes = FALSE, in_double_quotes = FALSE; + WCHAR *args; + + TRACE("%p, %p, %s, %d\n", hwnd, instance, debugstr_w(cmdline), cmdshow); + + /* Replace the first whitespace character in the command line string with a + null terminator to separate the program name from the program arguments */ + for (args = cmdline; *args; args++) + { + switch (*args) + { + case '\\': + args++; /* skip the next character */ + break; + case '\'': + if (!in_double_quotes) + in_single_quotes = !in_single_quotes; + break; + case '"': + if (!in_single_quotes) + in_double_quotes = !in_double_quotes; + break; + case ' ': + case '\t': + if (!in_single_quotes && !in_double_quotes) + { + *args = 0; + args++; + goto execute; + } + } + } + +execute: + ShellExecuteW(hwnd, NULL, cmdline, args, NULL, cmdshow); +} + +/************************************************************************* + * ShellExec_RunDLLA [SHELL32.@] + */ +void WINAPI ShellExec_RunDLLA(HWND hwnd, HINSTANCE instance, CHAR *cmdline, int cmdshow) +{ + WCHAR *cmdlineW; + ShellExec_RunDLLW(hwnd, instance, __SHCloneStrAtoW(&cmdlineW, cmdline), cmdshow); + SHFree(cmdlineW); +} + +/************************************************************************* * OpenAs_RunDLLA [SHELL32.@] */ void WINAPI OpenAs_RunDLLA(HWND hwnd, HINSTANCE hinst, LPCSTR cmdline, int cmdshow)

6 years, 5 months

Gijs Vermeulen : msvcrt: Add _vfprintf_l.

by Alexandre Julliard

Module: wine Branch: stable Commit: ee2fb1b11e1e72703116c62f48ac9efa9d93cf30 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee2fb1b11e1e72703116c62f… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Tue Sep 19 01:41:52 2017 +0200 msvcrt: Add _vfprintf_l. Signed-off-by: Gijs Vermeulen <gijsvrm(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 4a75c37b41a8dabbdd96b6b255a98b6eb814e323) 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/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/file.c | 20 ++++++++++++++++++++ dlls/msvcrt/msvcrt.spec | 2 +- 8 files changed, 27 insertions(+), 7 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 76f88e6..cc610f6 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1433,7 +1433,7 @@ @ stub _vcwprintf_p_l @ stub _vcwprintf_s @ stub _vcwprintf_s_l -@ stub _vfprintf_l +@ cdecl _vfprintf_l(ptr str ptr ptr) MSVCRT__vfprintf_l @ stub _vfprintf_p @ stub _vfprintf_p_l @ stub _vfprintf_s_l diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 416d43b..c37cfdd 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1790,7 +1790,7 @@ @ stub _vcwprintf_p_l @ stub _vcwprintf_s @ stub _vcwprintf_s_l -@ stub _vfprintf_l +@ cdecl _vfprintf_l(ptr str ptr ptr) MSVCRT__vfprintf_l @ stub _vfprintf_p @ stub _vfprintf_p_l @ stub _vfprintf_s_l diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index aec2eb6..a15db46 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1808,7 +1808,7 @@ @ stub _vcwprintf_p_l @ stub _vcwprintf_s @ stub _vcwprintf_s_l -@ stub _vfprintf_l +@ cdecl _vfprintf_l(ptr str ptr ptr) MSVCRT__vfprintf_l @ stub _vfprintf_p @ stub _vfprintf_p_l @ stub _vfprintf_s_l diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 83b0862..1226fa5 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1502,7 +1502,7 @@ @ cdecl _utime32(str ptr) msvcr120._utime32 @ cdecl _utime64(str ptr) msvcr120._utime64 @ cdecl _vacopy(ptr ptr) msvcr120._vacopy -@ stub _vfprintf_l +@ cdecl _vfprintf_l(ptr str ptr ptr) msvcr120._vfprintf_l @ stub _vfprintf_p @ stub _vfprintf_p_l @ stub _vfprintf_s_l diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 0aec6e8..e2ed06f 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1112,7 +1112,7 @@ @ stub _vcwprintf_p_l @ stub _vcwprintf_s @ stub _vcwprintf_s_l -@ stub _vfprintf_l +@ cdecl _vfprintf_l(ptr str ptr ptr) MSVCRT__vfprintf_l @ stub _vfprintf_p @ stub _vfprintf_p_l @ stub _vfprintf_s_l diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index d2e4fc5..bdf6420 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1088,7 +1088,7 @@ @ stub _vcwprintf_p_l @ stub _vcwprintf_s @ stub _vcwprintf_s_l -@ stub _vfprintf_l +@ cdecl _vfprintf_l(ptr str ptr ptr) MSVCRT__vfprintf_l @ stub _vfprintf_p @ stub _vfprintf_p_l @ stub _vfprintf_s_l diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 90a78f7a..12e5c26 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -5187,6 +5187,26 @@ int CDECL MSVCRT__stdio_common_vfwprintf(unsigned __int64 options, MSVCRT_FILE * /********************************************************************* + * _vfprintf_l (MSVCRT.@) + */ +int CDECL MSVCRT__vfprintf_l(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); + ret = pf_printf_a(puts_clbk_file_a, file, format, locale, 0, arg_clbk_valist, NULL, &valist); + if(tmp_buf) remove_std_buffer(file); + MSVCRT__unlock_file(file); + + return ret; +} + +/********************************************************************* * _vfwprintf_l (MSVCRT.@) */ int CDECL MSVCRT__vfwprintf_l(MSVCRT_FILE* file, const MSVCRT_wchar_t *format, diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index a5579a2..24634c1 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1044,7 +1044,7 @@ # stub _vcwprintf_p_l(wstr ptr ptr) # stub _vcwprintf_s(wstr ptr) # stub _vcwprintf_s_l(wstr ptr ptr) -# stub _vfprintf_l(ptr str ptr ptr) +@ cdecl _vfprintf_l(ptr str ptr ptr) MSVCRT__vfprintf_l # stub _vfprintf_p(ptr str ptr) # stub _vfprintf_p_l(ptr str ptr ptr) # stub _vfprintf_s_l(ptr str ptr ptr)

6 years, 5 months

Nikolay Sivov : msxml3/httpreq: Support HEAD request.

by Alexandre Julliard

Module: wine Branch: stable Commit: bff1891f57bc5d4ef1eb7fde80e43ed6598ffe16 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bff1891f57bc5d4ef1eb7fde… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 8 17:47:27 2017 +0300 msxml3/httpreq: Support HEAD request. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 79f11f228216f6b6fa6aaf02704a86592b44aba3) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msxml3/httprequest.c | 2 ++ dlls/msxml3/tests/httpreq.c | 22 ++++++++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index 55339e1..d9f3f98 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -880,6 +880,7 @@ static HRESULT verify_uri(httprequest *This, IUri *uri) static HRESULT httprequest_open(httprequest *This, BSTR method, BSTR url, VARIANT async, VARIANT user, VARIANT password) { + static const WCHAR MethodHeadW[] = {'H','E','A','D',0}; static const WCHAR MethodGetW[] = {'G','E','T',0}; static const WCHAR MethodPutW[] = {'P','U','T',0}; static const WCHAR MethodPostW[] = {'P','O','S','T',0}; @@ -915,6 +916,7 @@ static HRESULT httprequest_open(httprequest *This, BSTR method, BSTR url, This->verb = BINDVERB_POST; } else if (!strcmpiW(method, MethodDeleteW) || + !strcmpiW(method, MethodHeadW) || !strcmpiW(method, MethodPropFindW)) { This->verb = BINDVERB_CUSTOM; diff --git a/dlls/msxml3/tests/httpreq.c b/dlls/msxml3/tests/httpreq.c index 55ea8b6..a744b95 100644 --- a/dlls/msxml3/tests/httpreq.c +++ b/dlls/msxml3/tests/httpreq.c @@ -1731,6 +1731,28 @@ static void test_XMLHTTP(void) EXPECT_HR(hr, S_OK); IObjectWithSite_Release(obj_site); + + /* HEAD request */ + hr = IXMLHttpRequest_put_onreadystatechange(xhr, NULL); + ok(hr == S_OK, "Failed to reset state change handler, hr %#x.\n", hr); + + test_open(xhr, "HEAD", xmltestA, S_OK); + + V_VT(&varbody) = VT_EMPTY; + hr = IXMLHttpRequest_send(xhr, varbody); + ok(hr == S_OK, "Failed to send HEAD request, hr %#x.\n", hr); + + str = NULL; + hr = IXMLHttpRequest_get_responseText(xhr, &str); + ok(hr == S_OK, "Failed to get response text, hr %#x.\n", hr); + ok(!*str, "Unexpected text %s.\n", wine_dbgstr_w(str)); + SysFreeString(str); + + hr = IXMLHttpRequest_getAllResponseHeaders(xhr, &str); + ok(hr == S_OK, "Failed to get response headers, hr %#x.\n", hr); + ok(str && *str, "Expected response headers.\n"); + SysFreeString(str); + IXMLHttpRequest_Release(xhr); free_bstrs(); }

6 years, 5 months

Fabian Maurer : gdiplus: Avoid division by zero in SOFTWARE_GdipDrawThinPath.

by Alexandre Julliard

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)) {

6 years, 5 months

Alex Henrie : ucrtbase: Add __stdio_common_vfprintf_s.

by Alexandre Julliard

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

6 years, 5 months

Alex Henrie : msvcrt: Note that __stdio_common functions are for ucrtbase.

by Alexandre Julliard

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,

6 years, 5 months

Fabian Maurer : shell32: Draw text on message boxes without background.

by Alexandre Julliard

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 */

6 years, 5 months

← Newer
1
...
56
57
58
59
60
61
62
63
64
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2018