wine-commits October 2017

wine-commits@winehq.org

2 participants
478 discussions

Nikolay Sivov : gdiplus/metafile: Validate data size when playing back EmfPlusClear.
by Alexandre Julliard 18 Oct '17

18 Oct '17

Module: wine Branch: master Commit: b203b76190a8b68ee1cb0c64acd49e223b9a5edd URL: http://source.winehq.org/git/wine.git/?a=commit;h=b203b76190a8b68ee1cb0c64a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 17 15:49:11 2017 +0300 gdiplus/metafile: Validate data size when playing back EmfPlusClear. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/metafile.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 1fd4db2..9312a04 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -1823,6 +1823,9 @@ GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, { EmfPlusClear *record = (EmfPlusClear*)header; + if (dataSize != sizeof(record->Color)) + return InvalidParameter; + return GdipGraphicsClear(metafile->playback_graphics, record->Color); } case EmfPlusRecordTypeFillRects:

1 0

Stefan Dösinger : msvcp120/tests: Test _Xtime_diff_to_millis2 overflow behavior.
by Alexandre Julliard 17 Oct '17

17 Oct '17

Module: wine Branch: master Commit: 9787af34b1c23deb67902fc7dbf2c8421b987048 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9787af34b1c23deb67902fc7d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Oct 17 17:41:56 2017 +0200 msvcp120/tests: Test _Xtime_diff_to_millis2 overflow behavior. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp120/tests/msvcp120.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index 62165e9..c0d6f18 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -576,6 +576,15 @@ static void test__Xtime_diff_to_millis2(void) {0, 0, 0, 1234000001, 1235}, {0, 0, 0, 1234000009, 1235}, {0, 0, -1, 0, 0}, + {1, 0, 0, 0, 0}, + {0, 1000000000, 0, 0, 0}, + {0x7FFFFFFF / 1000, 0, 0, 0, 0}, + {2147484, 0, 0, 0, 0}, /* ceil(0x80000000 / 1000) */ + {2147485, 0, 0, 0, 0}, /* ceil(0x80000000 / 1000) + 1*/ + {0, 0, 0x7FFFFFFF / 1000, 0, 2147483000}, + {0, 0, 0x7FFFFFFF / 1000, 647000000, 0x7FFFFFFF}, /* max */ + {0, 0, 0x7FFFFFFF / 1000, 647000001, -2147483648}, /* overflow. */ + {0, 0, 2147484, 0, -2147483296}, /* ceil(0x80000000 / 1000), overflow*/ {0, 0, 0, -10000000, 0}, {0, 0, -1, -100000000, 0}, {-1, 0, 0, 0, 1000}, @@ -583,7 +592,18 @@ static void test__Xtime_diff_to_millis2(void) {-1, -100000000, 0, 0, 1100}, {0, 0, -1, 2000000000, 1000}, {0, 0, -2, 2000000000, 0}, - {0, 0, -2, 2100000000, 100} + {0, 0, -2, 2100000000, 100}, + {0, 0, _I64_MAX / 1000, 0, -808}, /* Still fits in a signed 64 bit number */ + {0, 0, _I64_MAX / 1000, 1000000000, 192}, /* Overflows a signed 64 bit number */ + {0, 0, (((ULONGLONG)0x80000000 << 32) | 0x1000) / 1000, 1000000000, 4192}, /* 64 bit overflow */ + {_I64_MAX - 2, 0, _I64_MAX, 0, 2000}, /* Not an overflow */ + {_I64_MAX, 0, _I64_MAX - 2, 0, 0}, /* Not an overflow */ + + /* October 11th 2017, 12:34:59 UTC */ + {1507725144, 983274000, 0, 0, 0}, + {0, 0, 1507725144, 983274000, 191624088}, + {1507725144, 983274000, 1507725145, 983274000, 1000}, + {1507725145, 983274000, 1507725145, 983274000, 0}, }; int i; MSVCRT_long ret;

1 0

Piotr Caban : msvcp120: Fix _Xtime_diff_to_millis2 overflow behavior.
by Alexandre Julliard 17 Oct '17

17 Oct '17

Module: wine Branch: master Commit: 1d35db9f570490b664f97d3b7e5152be4f07fcb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d35db9f570490b664f97d3b7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 17 17:08:15 2017 +0200 msvcp120: Fix _Xtime_diff_to_millis2 overflow behavior. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/misc.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index 1dcc590..9f26a48 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -362,6 +362,7 @@ void __thiscall _Container_base12__Swap_all( #define TICKS_1601_TO_1970 (SECS_1601_TO_1970 * TICKSPERSEC) #define NANOSEC_PER_MILLISEC 1000000 #define MILLISEC_PER_SEC 1000 +#define NANOSEC_PER_SEC (NANOSEC_PER_MILLISEC * MILLISEC_PER_SEC) typedef int MSVCRT_long; @@ -401,16 +402,24 @@ int __cdecl xtime_get(xtime* t, int unknown) /* _Xtime_diff_to_millis2 */ MSVCRT_long __cdecl _Xtime_diff_to_millis2(const xtime *t1, const xtime *t2) { - __time64_t diff_sec; - MSVCRT_long diff_nsec, ret; + LONGLONG diff_sec, diff_nsec; TRACE("(%p, %p)\n", t1, t2); diff_sec = t1->sec - t2->sec; diff_nsec = t1->nsec - t2->nsec; - ret = diff_sec * MILLISEC_PER_SEC + - (diff_nsec + NANOSEC_PER_MILLISEC - 1) / NANOSEC_PER_MILLISEC; - return ret > 0 ? ret : 0; + + diff_sec += diff_nsec / NANOSEC_PER_SEC; + diff_nsec %= NANOSEC_PER_SEC; + if (diff_nsec < 0) { + diff_sec -= 1; + diff_nsec += NANOSEC_PER_SEC; + } + + if (diff_sec<0 || (diff_sec==0 && diff_nsec<0)) + return 0; + return diff_sec * MILLISEC_PER_SEC + + (diff_nsec + NANOSEC_PER_MILLISEC - 1) / NANOSEC_PER_MILLISEC; } /* _Xtime_diff_to_millis */

1 0

Andrey Gusev : winepulse.drv: Remove redundant comparison.
by Alexandre Julliard 17 Oct '17

17 Oct '17

Module: wine Branch: master Commit: d9131acb895bc777379e92bb843a7a41d62c5226 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9131acb895bc777379e92bb8… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Oct 13 17:15:02 2017 +0300 winepulse.drv: Remove redundant comparison. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/mmdevdrv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index f6946ce..50b4188 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -611,7 +611,7 @@ fail: static HRESULT pulse_stream_valid(ACImpl *This) { if (!This->stream) return AUDCLNT_E_NOT_INITIALIZED; - if (!This->stream || pa_stream_get_state(This->stream) != PA_STREAM_READY) + if (pa_stream_get_state(This->stream) != PA_STREAM_READY) return AUDCLNT_E_DEVICE_INVALIDATED; return S_OK; }

1 0

Alexandre Julliard : wordpad: Specify cursor hotspots separately for each size.
by Alexandre Julliard 17 Oct '17

17 Oct '17

Module: wine Branch: master Commit: 86aad73177f70eb4c759d3f2ddbf86b762a19ec9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86aad73177f70eb4c759d3f2d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 17 16:26:37 2017 +0200 wordpad: Specify cursor hotspots separately for each size. This is supported in icoutils as of version 0.32.0. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wordpad/zoom.cur | Bin 33134 -> 33134 bytes programs/wordpad/zoom.svg | 28 +++++++++++++++++++++------- 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/programs/wordpad/zoom.cur b/programs/wordpad/zoom.cur index eb2d01d..adb941c 100644 Binary files a/programs/wordpad/zoom.cur and b/programs/wordpad/zoom.cur differ diff --git a/programs/wordpad/zoom.svg b/programs/wordpad/zoom.svg index 516d23d..4154186 100644 --- a/programs/wordpad/zoom.svg +++ b/programs/wordpad/zoom.svg @@ -51,6 +51,27 @@ inkscape:window-maximized="0" inkscape:current-layer="svg2" /> <rect + id="hotspot:64" + height="1" + width="1" + y="15" + x="15" + style="fill:none" /> + <rect + id="hotspot:48" + height="1" + width="1" + y="11" + x="11" + style="fill:none" /> + <rect + id="hotspot:32" + height="1" + width="1" + y="7" + x="7" + style="fill:none" /> + <rect id="cursor:64-32" height="64" width="64" @@ -71,13 +92,6 @@ y="32" x="112" style="fill:none" /> - <rect - id="hotspot" - height="1" - width="1" - y="7" - x="7" - style="fill:none" /> <g style="display:inline;opacity:1;stroke-width:0.95640075" transform="matrix(1.902027,0,0,1.902027,-431.17055,-1616.8392)"

1 0

Alexandre Julliard : comctl32: Specify cursor hotspots separately for each size.
by Alexandre Julliard 17 Oct '17

17 Oct '17

Module: wine Branch: master Commit: 4d577f9662c9de5207ff944736fa4e0eb84f2675 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d577f9662c9de5207ff94473… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 17 16:26:26 2017 +0200 comctl32: Specify cursor hotspots separately for each size. This is supported in icoutils as of version 0.32.0. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/idc_copy.svg | 28 +++++++++++++++++++++------- dlls/comctl32/idc_divider.cur | Bin 33134 -> 33134 bytes dlls/comctl32/idc_divider.svg | 28 +++++++++++++++++++++------- dlls/comctl32/idc_divideropen.svg | 28 +++++++++++++++++++++------- dlls/comctl32/idc_movebutton.svg | 28 +++++++++++++++++++++------- 5 files changed, 84 insertions(+), 28 deletions(-) diff --git a/dlls/comctl32/idc_copy.svg b/dlls/comctl32/idc_copy.svg index 70a21ac..6bd0de6 100644 --- a/dlls/comctl32/idc_copy.svg +++ b/dlls/comctl32/idc_copy.svg @@ -51,6 +51,27 @@ inkscape:window-maximized="0" inkscape:current-layer="svg2" /> <rect + id="hotspot:64" + height="1" + width="1" + y="0" + x="0" + style="fill:none" /> + <rect + id="hotspot:48" + height="1" + width="1" + y="0" + x="0" + style="fill:none" /> + <rect + id="hotspot:32" + height="1" + width="1" + y="0" + x="0" + style="fill:none" /> + <rect id="cursor:64-32" height="64" width="64" @@ -71,13 +92,6 @@ y="32" x="112" style="fill:none" /> - <rect - id="hotspot" - height="1" - width="1" - y="0" - x="0" - style="fill:none" /> <g style="display:inline;opacity:1" id="g6054" diff --git a/dlls/comctl32/idc_divider.cur b/dlls/comctl32/idc_divider.cur index 9627a9d..0ec6178 100644 Binary files a/dlls/comctl32/idc_divider.cur and b/dlls/comctl32/idc_divider.cur differ diff --git a/dlls/comctl32/idc_divider.svg b/dlls/comctl32/idc_divider.svg index 337c0f2..6c12913 100644 --- a/dlls/comctl32/idc_divider.svg +++ b/dlls/comctl32/idc_divider.svg @@ -51,6 +51,27 @@ inkscape:window-maximized="0" inkscape:current-layer="svg2" /> <rect + id="hotspot:64" + height="1" + width="1" + y="18" + x="20" + style="fill:none" /> + <rect + id="hotspot:48" + height="1" + width="1" + y="14" + x="15" + style="fill:none" /> + <rect + id="hotspot:32" + height="1" + width="1" + y="9" + x="10" + style="fill:none" /> + <rect id="cursor:64-32" height="64" width="64" @@ -71,13 +92,6 @@ y="32" x="112" style="fill:none" /> - <rect - id="hotspot" - height="1" - width="1" - y="9" - x="10" - style="fill:none" /> <g style="display:inline;opacity:1" id="g8966" diff --git a/dlls/comctl32/idc_divideropen.svg b/dlls/comctl32/idc_divideropen.svg index cdf13a5..3046974 100644 --- a/dlls/comctl32/idc_divideropen.svg +++ b/dlls/comctl32/idc_divideropen.svg @@ -51,6 +51,27 @@ inkscape:window-maximized="0" inkscape:current-layer="svg2" /> <rect + id="hotspot:64" + height="1" + width="1" + y="18" + x="26" + style="fill:none" /> + <rect + id="hotspot:48" + height="1" + width="1" + y="13" + x="19" + style="fill:none" /> + <rect + id="hotspot:32" + height="1" + width="1" + y="9" + x="13" + style="fill:none" /> + <rect id="cursor:64-32" height="64" width="64" @@ -71,13 +92,6 @@ y="32" x="112" style="fill:none" /> - <rect - id="hotspot" - height="1" - width="1" - y="9" - x="13" - style="fill:none" /> <g style="display:inline;opacity:1" id="g8966" diff --git a/dlls/comctl32/idc_movebutton.svg b/dlls/comctl32/idc_movebutton.svg index acd23d6..91cf866 100644 --- a/dlls/comctl32/idc_movebutton.svg +++ b/dlls/comctl32/idc_movebutton.svg @@ -51,6 +51,27 @@ inkscape:window-maximized="0" inkscape:current-layer="svg2" /> <rect + id="hotspot:64" + height="1" + width="1" + y="20" + x="28" + style="fill:none" /> + <rect + id="hotspot:48" + height="1" + width="1" + y="15" + x="21" + style="fill:none" /> + <rect + id="hotspot:32" + height="1" + width="1" + y="10" + x="14" + style="fill:none" /> + <rect id="cursor:64-32" height="64" width="64" @@ -71,13 +92,6 @@ y="32" x="112" style="fill:none" /> - <rect - id="hotspot" - height="1" - width="1" - y="10" - x="14" - style="fill:none" /> <g id="g6096" transform="matrix(1.704871,0,0,1.7043829,-121.23079,-1354.1285)"

1 0

Alexandre Julliard : riched20: Specify cursor hotspots separately for each size.
by Alexandre Julliard 17 Oct '17

17 Oct '17

Module: wine Branch: master Commit: 70eef947a1bf27dc8f5e2ad5e7c35294c9e5b29d URL: http://source.winehq.org/git/wine.git/?a=commit;h=70eef947a1bf27dc8f5e2ad5e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 17 16:23:18 2017 +0200 riched20: Specify cursor hotspots separately for each size. This is supported in icoutils as of version 0.32.0. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/ocr_reverse.cur | Bin 33134 -> 33134 bytes dlls/riched20/ocr_reverse.svg | 28 +++++++++++++++++++++------- 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/dlls/riched20/ocr_reverse.cur b/dlls/riched20/ocr_reverse.cur index f6b5ca2..6392093 100644 Binary files a/dlls/riched20/ocr_reverse.cur and b/dlls/riched20/ocr_reverse.cur differ diff --git a/dlls/riched20/ocr_reverse.svg b/dlls/riched20/ocr_reverse.svg index a6a356a..d88aceb 100644 --- a/dlls/riched20/ocr_reverse.svg +++ b/dlls/riched20/ocr_reverse.svg @@ -51,6 +51,27 @@ inkscape:window-maximized="0" inkscape:current-layer="svg2" /> <rect + id="hotspot:64" + height="1" + width="1" + y="0" + x="27" + style="fill:none" /> + <rect + id="hotspot:48" + height="1" + width="1" + y="0" + x="20" + style="fill:none" /> + <rect + id="hotspot:32" + height="1" + width="1" + y="0" + x="13" + style="fill:none" /> + <rect id="cursor:64-32" height="64" width="64" @@ -71,13 +92,6 @@ y="32" x="112" style="fill:none" /> - <rect - id="hotspot" - height="1" - width="1" - y="0" - x="13" - style="fill:none" /> <g id="g4928" transform="matrix(1.9642525,0,0,1.9642525,-194.7906,458.0998)">

1 0

Alexandre Julliard : ole32: Specify cursor hotspots separately for each size.
by Alexandre Julliard 17 Oct '17

17 Oct '17

Module: wine Branch: master Commit: 0a199813d9f44adf279c26827f5afc3df8902b05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a199813d9f44adf279c26827… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 17 16:21:47 2017 +0200 ole32: Specify cursor hotspots separately for each size. This is supported in icoutils as of version 0.32.0. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/drag_copy.svg | 28 +++++++++++++++++++++------- dlls/ole32/drag_link.svg | 28 +++++++++++++++++++++------- dlls/ole32/drag_move.svg | 28 +++++++++++++++++++++------- dlls/ole32/nodrop.svg | 28 +++++++++++++++++++++------- 4 files changed, 84 insertions(+), 28 deletions(-) diff --git a/dlls/ole32/drag_copy.svg b/dlls/ole32/drag_copy.svg index 42867cb..deb126f 100644 --- a/dlls/ole32/drag_copy.svg +++ b/dlls/ole32/drag_copy.svg @@ -51,6 +51,27 @@ inkscape:window-maximized="0" inkscape:current-layer="svg2" /> <rect + id="hotspot:64" + height="1" + width="1" + y="0" + x="0" + style="fill:none" /> + <rect + id="hotspot:48" + height="1" + width="1" + y="0" + x="0" + style="fill:none" /> + <rect + id="hotspot:32" + height="1" + width="1" + y="0" + x="0" + style="fill:none" /> + <rect id="cursor:64-32" height="64" width="64" @@ -71,13 +92,6 @@ y="32" x="112" style="fill:none" /> - <rect - id="hotspot" - height="1" - width="1" - y="0" - x="0" - style="fill:none" /> <g style="display:inline;opacity:1" id="g6054" diff --git a/dlls/ole32/drag_link.svg b/dlls/ole32/drag_link.svg index 0b1dc7e..e8a1c0e 100644 --- a/dlls/ole32/drag_link.svg +++ b/dlls/ole32/drag_link.svg @@ -51,6 +51,27 @@ inkscape:window-maximized="0" inkscape:current-layer="svg2" /> <rect + id="hotspot:64" + height="1" + width="1" + y="0" + x="0" + style="fill:none" /> + <rect + id="hotspot:48" + height="1" + width="1" + y="0" + x="0" + style="fill:none" /> + <rect + id="hotspot:32" + height="1" + width="1" + y="0" + x="0" + style="fill:none" /> + <rect id="cursor:64-32" height="64" width="64" @@ -71,13 +92,6 @@ y="32" x="112" style="fill:none" /> - <rect - id="hotspot" - height="1" - width="1" - y="0" - x="0" - style="fill:none" /> <g style="display:inline;opacity:1" id="g6054" diff --git a/dlls/ole32/drag_move.svg b/dlls/ole32/drag_move.svg index 2f2514b..66045e7 100644 --- a/dlls/ole32/drag_move.svg +++ b/dlls/ole32/drag_move.svg @@ -51,6 +51,27 @@ inkscape:window-maximized="0" inkscape:current-layer="svg2" /> <rect + id="hotspot:64" + height="1" + width="1" + y="0" + x="0" + style="fill:none" /> + <rect + id="hotspot:48" + height="1" + width="1" + y="0" + x="0" + style="fill:none" /> + <rect + id="hotspot:32" + height="1" + width="1" + y="0" + x="0" + style="fill:none" /> + <rect id="cursor:64-32" height="64" width="64" @@ -71,13 +92,6 @@ y="32" x="112" style="fill:none" /> - <rect - id="hotspot" - height="1" - width="1" - y="0" - x="0" - style="fill:none" /> <g style="display:inline;opacity:1" id="g6054" diff --git a/dlls/ole32/nodrop.svg b/dlls/ole32/nodrop.svg index cb5a0f0..481a7b4 100644 --- a/dlls/ole32/nodrop.svg +++ b/dlls/ole32/nodrop.svg @@ -51,6 +51,27 @@ inkscape:window-maximized="0" inkscape:current-layer="svg2" /> <rect + id="hotspot:64" + height="1" + width="1" + y="0" + x="0" + style="fill:none" /> + <rect + id="hotspot:48" + height="1" + width="1" + y="0" + x="0" + style="fill:none" /> + <rect + id="hotspot;32" + height="1" + width="1" + y="0" + x="0" + style="fill:none" /> + <rect id="cursor:64-32" height="64" width="64" @@ -71,13 +92,6 @@ y="32" x="112" style="fill:none" /> - <rect - id="hotspot" - height="1" - width="1" - y="0" - x="0" - style="fill:none" /> <g style="display:inline;opacity:1" id="g6054"

1 0

Alexandre Julliard : user32: Specify cursor hotspots separately for each size.
by Alexandre Julliard 17 Oct '17

17 Oct '17

Module: wine Branch: master Commit: 3dd6046d7c641d0096d790d400b0953ddb2429db URL: http://source.winehq.org/git/wine.git/?a=commit;h=3dd6046d7c641d0096d790d40… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 17 16:14:28 2017 +0200 user32: Specify cursor hotspots separately for each size. This is supported in icoutils as of version 0.32.0. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/resources/ocr_appstarting.svg | 28 +++++++++++++++++++++------- dlls/user32/resources/ocr_cross.cur | Bin 33134 -> 33134 bytes dlls/user32/resources/ocr_cross.svg | 28 +++++++++++++++++++++------- dlls/user32/resources/ocr_hand.cur | Bin 33134 -> 33134 bytes dlls/user32/resources/ocr_hand.svg | 28 +++++++++++++++++++++------- dlls/user32/resources/ocr_help.svg | 28 +++++++++++++++++++++------- dlls/user32/resources/ocr_ibeam.cur | Bin 33134 -> 33134 bytes dlls/user32/resources/ocr_ibeam.svg | 28 +++++++++++++++++++++------- dlls/user32/resources/ocr_no.svg | 28 +++++++++++++++++++++------- dlls/user32/resources/ocr_normal.svg | 28 +++++++++++++++++++++------- dlls/user32/resources/ocr_pen.cur | Bin 33134 -> 33134 bytes dlls/user32/resources/ocr_pen.svg | 28 +++++++++++++++++++++------- dlls/user32/resources/ocr_size.cur | Bin 33134 -> 33134 bytes dlls/user32/resources/ocr_size.svg | 28 +++++++++++++++++++++------- dlls/user32/resources/ocr_sizeall.cur | Bin 35374 -> 35374 bytes dlls/user32/resources/ocr_sizeall.svg | 28 +++++++++++++++++++++------- dlls/user32/resources/ocr_sizenesw.svg | 28 +++++++++++++++++++++------- dlls/user32/resources/ocr_sizens.cur | Bin 33134 -> 33134 bytes dlls/user32/resources/ocr_sizens.svg | 28 +++++++++++++++++++++------- dlls/user32/resources/ocr_sizenwse.svg | 28 +++++++++++++++++++++------- dlls/user32/resources/ocr_sizewe.cur | Bin 33134 -> 33134 bytes dlls/user32/resources/ocr_sizewe.svg | 28 +++++++++++++++++++++------- dlls/user32/resources/ocr_up.cur | Bin 33134 -> 33134 bytes dlls/user32/resources/ocr_up.svg | 28 +++++++++++++++++++++------- dlls/user32/resources/ocr_wait.cur | Bin 33134 -> 33134 bytes dlls/user32/resources/ocr_wait.svg | 28 +++++++++++++++++++++------- tools/buildimage | 11 +++++++++-- 27 files changed, 345 insertions(+), 114 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3dd6046d7c641d0096d79…

1 0

Hans Leidekker : webservices: Fix handling of namespace attributes in WsWriteNode.
by Alexandre Julliard 17 Oct '17

17 Oct '17

Module: wine Branch: master Commit: 6d2f4471ed541abeb3c8377a74b7736c5517f494 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d2f4471ed541abeb3c8377a7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 17 11:37:27 2017 +0200 webservices: Fix handling of namespace attributes in WsWriteNode. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/writer.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 1baac07..f6917c6 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -4472,9 +4472,20 @@ static HRESULT write_set_attributes( struct writer *writer, WS_XML_ATTRIBUTE **a for (i = 0; i < count; i++) { - if ((hr = write_add_attribute( writer, attrs[i]->prefix, attrs[i]->localName, attrs[i]->ns, - attrs[i]->singleQuote )) != S_OK) return hr; - if ((hr = write_set_attribute_value( writer, attrs[i]->value )) != S_OK) return hr; + const WS_XML_STRING *prefix = attrs[i]->prefix; + const WS_XML_STRING *localname = attrs[i]->localName; + const WS_XML_STRING *ns = attrs[i]->ns; + BOOL single = attrs[i]->singleQuote; + + if (attrs[i]->isXmlNs) + { + if ((hr = add_namespace_attribute( writer, prefix, ns, single )) != S_OK) return hr; + } + else + { + if ((hr = write_add_attribute( writer, prefix, localname, ns, single )) != S_OK) return hr; + if ((hr = write_set_attribute_value( writer, attrs[i]->value )) != S_OK) return hr; + } } return S_OK; }

1 0

← Newer
1
...
21
22
23
24
25
26
27
...
48
Older →

Jump to page:

2025

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 October 2017