- wine-devel - winehq.org

[v3 resend PATCH 1/2] user32: When registering redirected class use correct base class name.
by Nikolay Sivov 27 Aug '18

27 Aug '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45689 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/user32/class.c | 31 +++++++++++++++++++++---------- dlls/user32/user_private.h | 2 +- dlls/user32/win.c | 2 +- 3 files changed, 23 insertions(+), 12 deletions(-) diff --git a/dlls/user32/class.c b/dlls/user32/class.c index 07d36f05d7..5383b6771f 100644 --- a/dlls/user32/class.c +++ b/dlls/user32/class.c @@ -320,7 +320,7 @@ static void CLASS_FreeClass( CLASS *classPtr ) USER_Unlock(); } -const WCHAR *CLASS_GetVersionedName( const WCHAR *name, UINT *basename_offset, BOOL register_class ) +const WCHAR *CLASS_GetVersionedName( const WCHAR *name, UINT *basename_offset, WCHAR *combined, BOOL register_class ) { ACTCTX_SECTION_KEYED_DATA data; struct wndclass_redirect_data @@ -335,9 +335,12 @@ const WCHAR *CLASS_GetVersionedName( const WCHAR *name, UINT *basename_offset, B const WCHAR *module, *ret; UNICODE_STRING name_us; HMODULE hmod; + UINT offset; - if (basename_offset) - *basename_offset = 0; + if (!basename_offset) + basename_offset = &offset; + + *basename_offset = 0; if (IS_INTRESOURCE( name )) return name; @@ -352,14 +355,21 @@ const WCHAR *CLASS_GetVersionedName( const WCHAR *name, UINT *basename_offset, B return name; wndclass = (struct wndclass_redirect_data *)data.lpData; - if (basename_offset) - *basename_offset = wndclass->name_len / sizeof(WCHAR) - strlenW(name); + *basename_offset = wndclass->name_len / sizeof(WCHAR) - strlenW(name); module = (const WCHAR *)((BYTE *)data.lpSectionBase + wndclass->module_offset); if (!(hmod = GetModuleHandleW( module ))) hmod = LoadLibraryW( module ); + /* Combined name is used to register versioned class name. Base name part will match exactly + original class name and won't be reused from context data. */ ret = (const WCHAR *)((BYTE *)wndclass + wndclass->name_offset); + if (combined) + { + memcpy(combined, ret, *basename_offset * sizeof(WCHAR)); + strcpyW(&combined[*basename_offset], name); + ret = combined; + } if (register_class && hmod) { @@ -409,7 +419,7 @@ static CLASS *CLASS_FindClass( LPCWSTR name, HINSTANCE hinstance ) if (!name) return NULL; - name = CLASS_GetVersionedName( name, NULL, TRUE ); + name = CLASS_GetVersionedName( name, NULL, NULL, TRUE ); for (;;) { @@ -662,8 +672,8 @@ ATOM WINAPI RegisterClassW( const WNDCLASSW* wc ) */ ATOM WINAPI RegisterClassExA( const WNDCLASSEXA* wc ) { + WCHAR name[MAX_ATOM_LEN + 1], combined[MAX_ATOM_LEN + 1]; const WCHAR *classname = NULL; - WCHAR name[MAX_ATOM_LEN + 1]; ATOM atom; CLASS *classPtr; HINSTANCE instance; @@ -682,7 +692,7 @@ ATOM WINAPI RegisterClassExA( const WNDCLASSEXA* wc ) { UINT basename_offset; if (!MultiByteToWideChar( CP_ACP, 0, wc->lpszClassName, -1, name, MAX_ATOM_LEN + 1 )) return 0; - classname = CLASS_GetVersionedName( name, &basename_offset, FALSE ); + classname = CLASS_GetVersionedName( name, &basename_offset, combined, FALSE ); classPtr = CLASS_RegisterClass( classname, basename_offset, instance, !(wc->style & CS_GLOBALCLASS), wc->style, wc->cbClsExtra, wc->cbWndExtra ); } @@ -720,6 +730,7 @@ ATOM WINAPI RegisterClassExA( const WNDCLASSEXA* wc ) */ ATOM WINAPI RegisterClassExW( const WNDCLASSEXW* wc ) { + WCHAR name[MAX_ATOM_LEN + 1]; const WCHAR *classname; UINT basename_offset; ATOM atom; @@ -736,7 +747,7 @@ ATOM WINAPI RegisterClassExW( const WNDCLASSEXW* wc ) } if (!(instance = wc->hInstance)) instance = GetModuleHandleW( NULL ); - classname = CLASS_GetVersionedName( wc->lpszClassName, &basename_offset, FALSE ); + classname = CLASS_GetVersionedName( wc->lpszClassName, &basename_offset, name, FALSE ); if (!(classPtr = CLASS_RegisterClass( classname, basename_offset, instance, !(wc->style & CS_GLOBALCLASS), wc->style, wc->cbClsExtra, wc->cbWndExtra ))) return 0; @@ -789,7 +800,7 @@ BOOL WINAPI UnregisterClassW( LPCWSTR className, HINSTANCE hInstance ) GetDesktopWindow(); /* create the desktop window to trigger builtin class registration */ - className = CLASS_GetVersionedName( className, NULL, FALSE ); + className = CLASS_GetVersionedName( className, NULL, NULL, FALSE ); SERVER_START_REQ( destroy_class ) { req->instance = wine_server_client_ptr( hInstance ); diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 73a2badc7d..0ee7dbeece 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -273,7 +273,7 @@ extern BOOL WINPROC_call_window( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPar LRESULT *result, BOOL unicode, enum wm_char_mapping mapping ) DECLSPEC_HIDDEN; extern const WCHAR *CLASS_GetVersionedName(const WCHAR *classname, UINT *basename_offset, - BOOL register_class) DECLSPEC_HIDDEN; + WCHAR *combined, BOOL register_class) DECLSPEC_HIDDEN; /* message spy definitions */ diff --git a/dlls/user32/win.c b/dlls/user32/win.c index e7bbc4eb90..2a55ab4ce6 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -1349,7 +1349,7 @@ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, CBT_CREATEWNDW cbtc; CREATESTRUCTW cbcs; - className = CLASS_GetVersionedName(className, NULL, TRUE); + className = CLASS_GetVersionedName(className, NULL, NULL, TRUE); TRACE("%s %s%s%s ex=%08x style=%08x %d,%d %dx%d parent=%p menu=%p inst=%p params=%p\n", unicode ? debugstr_w(cs->lpszName) : debugstr_a((LPCSTR)cs->lpszName), -- 2.18.0

1 1

[PATCH 01/20] shell32: Add favorites icon
by Alex Henrie 27 Aug '18

27 Aug '18

Adapted from emblem-favorite in the Tango Icon Library. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/shell32/Makefile.in | 1 + dlls/shell32/resources/favorites.ico | Bin 0 -> 49876 bytes dlls/shell32/resources/favorites.svg | 548 +++++++++++++++++++++++++++ dlls/shell32/shell32.rc | 11 +- dlls/shell32/shresdef.h | 4 +- 5 files changed, 560 insertions(+), 4 deletions(-) create mode 100644 dlls/shell32/resources/favorites.ico create mode 100644 dlls/shell32/resources/favorites.svg diff --git a/dlls/shell32/Makefile.in b/dlls/shell32/Makefile.in index 8bac5903e9..5d76218d9a 100644 --- a/dlls/shell32/Makefile.in +++ b/dlls/shell32/Makefile.in @@ -69,6 +69,7 @@ SVG_SRCS = \ resources/document.svg \ resources/drive.svg \ resources/eject.svg \ + resources/favorites.svg \ resources/floppy.svg \ resources/folder.svg \ resources/folder_open.svg \ diff --git a/dlls/shell32/resources/favorites.ico b/dlls/shell32/resources/favorites.ico new file mode 100644 index 0000000000000000000000000000000000000000..e976000d032900c0b4a414ffc023cdd260137941 GIT binary patch literal 49876 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 literal 0 HcmV?d00001 diff --git a/dlls/shell32/resources/favorites.svg b/dlls/shell32/resources/favorites.svg new file mode 100644 index 0000000000..f4b4352516 --- /dev/null +++ b/dlls/shell32/resources/favorites.svg @@ -0,0 +1,548 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + version="1.0" + height="272" + width="632" + id="svg1"> + <defs + id="defs3"> + <linearGradient + id="linearGradient3111"> + <stop + id="stop3113" + offset="0" + style="stop-color:#ffffff;stop-opacity:1;" /> + <stop + id="stop3115" + offset="1" + style="stop-color:#ffffff;stop-opacity:0;" /> + </linearGradient> + <linearGradient + id="linearGradient3101"> + <stop + id="stop3103" + offset="0" + style="stop-color:#000000;stop-opacity:1;" /> + <stop + id="stop3105" + offset="1" + style="stop-color:#000000;stop-opacity:0;" /> + </linearGradient> + <linearGradient + id="linearGradient118"> + <stop + id="stop119" + offset="0.0000000" + style="stop-color:#f5a108;stop-opacity:0.0000000;" /> + <stop + id="stop120" + offset="1.0000000" + style="stop-color:#fefdc3;stop-opacity:0.74251497;" /> + </linearGradient> + <linearGradient + id="linearGradient6621"> + <stop + id="stop6622" + offset="0.0000000" + style="stop-color:#f5a108;stop-opacity:0.0000000;" /> + <stop + id="stop6623" + offset="1.0000000" + style="stop-color:#fefdc3;stop-opacity:0.74251497;" /> + </linearGradient> + <linearGradient + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.94697898,0,0,0.487322,3.734953,4.0497072)" + y2="12.239423" + x2="12.849945" + y1="28.829224" + x1="22.819513" + id="linearGradient7881" + xlink:href="#linearGradient6621" /> + <linearGradient + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.012297,0,0,1.079974,0.83512302,-1.3406628)" + y2="6.1003184" + x2="6.3578372" + y1="32.756931" + x1="11.355036" + id="linearGradient1697" + xlink:href="#linearGradient6621" /> + <radialGradient + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.182912,0,0,0.76754023,-13.527047,18.845937)" + r="9.6875" + fy="25.53125" + fx="17.3125" + cy="25.53125" + cx="17.3125" + id="radialGradient3107" + xlink:href="#linearGradient3101" /> + <linearGradient + gradientTransform="matrix(0.90340098,0,0,0.903401,2.335433,2.1777372)" + gradientUnits="userSpaceOnUse" + y2="-6.8890476" + x2="17.444614" + y1="29.173397" + x1="34.797703" + id="linearGradient3117" + xlink:href="#linearGradient3111" /> + <radialGradient + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.182912,0,0,0.76754024,-13.527041,18.845928)" + r="9.6875" + fy="25.53125" + fx="17.3125" + cy="25.53125" + cx="17.3125" + id="radialGradient3107-3" + xlink:href="#linearGradient3101" /> + <linearGradient + y2="12.239423" + x2="12.849945" + y1="28.829224" + x1="22.819513" + gradientTransform="matrix(0.946979,0,0,0.487322,3.7349493,4.0497076)" + gradientUnits="userSpaceOnUse" + id="linearGradient906" + xlink:href="#linearGradient6621" /> + <linearGradient + y2="6.1003184" + x2="6.3578372" + y1="32.756931" + x1="11.355036" + gradientTransform="matrix(2.012297,0,0,1.079974,0.8351293,-1.3406624)" + gradientUnits="userSpaceOnUse" + id="linearGradient908" + xlink:href="#linearGradient6621" /> + <linearGradient + y2="-6.8890476" + x2="17.444614" + y1="29.173397" + x1="34.797703" + gradientTransform="matrix(0.903401,0,0,0.903401,2.3354393,2.1777376)" + gradientUnits="userSpaceOnUse" + id="linearGradient910" + xlink:href="#linearGradient3111" /> + <linearGradient + y2="-6.8890476" + x2="17.444614" + y1="29.173397" + x1="34.797703" + gradientTransform="matrix(0.90340098,0,0,0.90340099,2.3354294,2.1777415)" + gradientUnits="userSpaceOnUse" + id="linearGradient910-9" + xlink:href="#linearGradient3111" /> + <linearGradient + y2="6.1003184" + x2="6.3578372" + y1="32.756931" + x1="11.355036" + gradientTransform="matrix(2.012297,0,0,1.079974,0.83511544,-1.3406581)" + gradientUnits="userSpaceOnUse" + id="linearGradient908-0" + xlink:href="#linearGradient118" /> + <linearGradient + y2="12.239423" + x2="12.849945" + y1="28.829224" + x1="22.819513" + gradientTransform="matrix(0.946979,0,0,0.487322,3.7349364,4.0497121)" + gradientUnits="userSpaceOnUse" + id="linearGradient906-6" + xlink:href="#linearGradient118" /> + <radialGradient + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.182912,0,0,0.76754027,-13.527057,18.845931)" + r="9.6875" + fy="25.53125" + fx="17.3125" + cy="25.53125" + cx="17.3125" + id="radialGradient3107-3-1" + xlink:href="#linearGradient3101" /> + </defs> + <metadata + id="metadata4"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + <dc:date>2005-02-01</dc:date> + <dc:creator> + <cc:Agent> + <dc:title>Jakub Steiner</dc:title> + </cc:Agent> + </dc:creator> + <dc:source>http://jimmac.musichall.cz/</dc:source> + <dc:contributor> + <cc:Agent> + <dc:title>Andreas Nilsson <nisses.mail(a)home.se></dc:title> + </cc:Agent> + </dc:contributor> + <cc:license + rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" /> + </cc:Work> + <cc:License + rdf:about="http://creativecommons.org/publicdomain/zero/1.0/"> + <cc:permits + rdf:resource="http://creativecommons.org/ns#Reproduction" /> + <cc:permits + rdf:resource="http://creativecommons.org/ns#Distribution" /> + <cc:permits + rdf:resource="http://creativecommons.org/ns#DerivativeWorks" /> + </cc:License> + </rdf:RDF> + </metadata> + <ellipse + ry="40.048054" + rx="112.78371" + cy="212.63495" + cx="137.4127" + id="path3099" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.40909095;fill:url(#radialGradient3107);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.41285896;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /> + <path + id="path5378" + d="m 126.73192,201.14524 c 0.30704,-0.46476 5.31612,5.98814 5.31612,5.98814 21.96303,-24.1331 78.02088,-69.2246 93.31318,-106.83095 -30.92557,34.63818 -81.45413,90.3636 -98.6293,100.84281 z" + style="fill:#d4572d;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000003pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + <path + id="path7876" + d="m 88.884799,45.895357 c -25.590843,-1.27207 -37.512887,15.32992 -43.961788,31.12321 -6.399725,20.79769 2.646791,60.079643 46.979002,57.091243 25.286877,0 35.337507,-26.18825 48.645857,-32.98657 12.09479,-4.618303 13.0467,-5.031643 25.82504,-5.031643 17.75792,0 49.871,-12.97851 49.87101,-25.8562 -5.45836,-10.33357 -19.9496,-28.73605 -46.57817,-25.59957 -16.95017,1.99227 -32.98604,14.2281 -37.17483,20.31669 -10.26116,-9.13988 -23.36309,-19.05716 -43.606121,-19.05716 z" + style="fill:url(#linearGradient7881);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000003pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + <path + id="path920" + d="M 135.60111,54.075757 C 179.88387,9.3554272 240.73877,50.574337 240.33847,92.985927 239.97253,131.75749 210.71218,150.32568 137.20228,219.28869 60.259562,155.13336 33.14988,140.33889 33.550176,94.337717 33.950472,46.719537 86.047393,10.981877 135.60111,54.075757 Z" + style="fill:#c71807;fill-opacity:1;fill-rule:evenodd;stroke:#820000;stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + <path + id="path922" + d="M 35.085143,92.776547 C 33.922531,131.4479 39.323228,125.32083 49.081261,137.57227 58.674256,149.61652 100.50476,142.036 138.05319,106.28315 176.05011,70.103247 214.78157,90.581497 233.55651,70.437007 219.56988,46.216937 175.91589,16.871337 135.72623,57.536227 84.222135,10.531457 36.247755,53.675117 35.085143,92.776547 Z" + style="opacity:0.625;fill:url(#linearGradient1697);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000003pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + <path + style="opacity:0.39204544;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3117);stroke-width:1.00000072;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 136.11884,60.786357 c 42.1045,-45.96114 99.6472,-7.56258 99.27429,31.94703 C 235.05223,128.85205 205.66466,148.73018 137.1846,212.97447 65.506606,153.20889 38.122543,137.27635 38.495449,94.422767 38.868356,50.062807 89.955796,15.050157 136.11884,60.786357 Z" + id="path3109" /> + <rect + id="icon:256-32" + height="256" + width="256" + y="8" + x="8" + style="fill:none" /> + <ellipse + id="path3099-2" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.40909095;fill:url(#radialGradient3107-3);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.41285896;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" + cx="296.26495" + cy="258.44244" + rx="21.146959" + ry="7.435544" /> + <path + id="path5378-9" + d="m 294.26231,256.30921 c 0.0576,-0.0863 0.99677,1.11179 0.99677,1.11179 4.11807,-4.48069 14.62893,-12.85262 17.49624,-19.83483 -5.79855,6.43112 -15.27266,16.77741 -18.49301,18.72304 z" + style="fill:#d4572d;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000003pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + <path + id="path7876-1" + d="m 287.16597,227.48465 c -4.79829,-0.23618 -7.03367,2.84624 -8.24284,5.77851 -1.19995,3.86141 0.49627,11.15472 8.80857,10.59988 4.74129,0 6.62579,-4.86226 9.1211,-6.12447 2.26778,-0.85746 2.44626,-0.93421 4.8422,-0.93421 3.32961,0 9.35082,-2.40966 9.35082,-4.8006 -1.02344,-1.91859 -3.74055,-5.3353 -8.73341,-4.75296 -3.17816,0.3699 -6.18489,2.64167 -6.97029,3.77211 -1.92396,-1.69696 -4.38058,-3.53826 -8.17615,-3.53826 z" + style="fill:url(#linearGradient906);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000003pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + <path + id="path920-2" + d="m 295.92528,229.00347 c 8.30303,-8.30303 19.71333,-0.65009 19.63827,7.22428 -0.0686,7.19854 -5.55493,10.64602 -19.33805,23.45007 -14.42677,-11.91143 -19.50983,-14.65826 -19.43478,-23.19909 0.0751,-8.84106 9.84324,-15.47631 19.13456,-7.47526 z" + style="fill:#c71807;fill-opacity:1;fill-rule:evenodd;stroke:#820000;stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + <path + id="path922-7" + d="m 277.07853,236.18887 c -0.21799,7.17994 0.79464,6.04236 2.62427,8.31703 1.79869,2.2362 9.64191,0.82876 16.68225,-5.80932 7.12443,-6.71736 14.38658,-2.91525 17.90688,-6.65539 -2.62249,-4.49683 -10.80762,-9.9453 -18.34319,-2.39523 -9.65702,-8.72717 -18.65222,-0.71687 -18.87021,6.54291 z" + style="opacity:0.625;fill:url(#linearGradient908);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000003pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + <path + style="opacity:0.39204544;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient910);stroke-width:1.00000072;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 296.02236,230.2494 c 7.8946,-8.5334 18.68386,-1.40411 18.61394,5.93146 -0.0639,6.70599 -5.57409,10.39668 -18.41411,22.32463 -13.43963,-11.09641 -18.57415,-14.05454 -18.50423,-22.01097 0.0699,-8.23612 9.64882,-14.73676 18.3044,-6.24512 z" + id="path3109-0" /> + <rect + id="icon:48-32" + height="48" + width="48" + y="220" + x="272" + style="fill:none" /> + <image + width="48" + height="48" + preserveAspectRatio="none" + xlink:href="data:image/png;base64,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 +7FPIs1/bypZtmxj/+O94iaGSfa1Fi4m376PzdCc9V7v5vaCGZxl/1gIAGoGfKGTN2mZ2fns3Ttc/ +ydy8XtQnunwF1dt3cebDk1y/dZvfgqrEzqkiAkK8ZiAtCxrY+8pLWIkBkuc7QWuq1qzD2voNjr/7 +N64+6OePunJxKyoA4GWQnVUx2r+zj0WWwh14AOta+Ojw+3w2PMJfKhyz4gIANgHfMw3Z1r6dFc1N +HD/8PieS4xybg3hzIgBgCfAjhcRNkw/9QJ2dq0BziRjQ+r8mMY95zGMe85gO/wEEGFhCsflliQAA +ABR0RVh0QXV0aG9yAEpha3ViIFN0ZWluZXLm+/cvAAAAWHRFWHRDb3B5cmlnaHQAQ0MwIFB1Ymxp +YyBEb21haW4gRGVkaWNhdGlvbiBodHRwOi8vY3JlYXRpdmVjb21tb25zLm9yZy9wdWJsaWNkb21h +aW4vemVyby8xLjAvxuO9+QAAABh0RVh0Q3JlYXRpb24gVGltZQAyMDA1LTAyLTAxhIsTNAAAACV0 +RVh0ZGF0ZTpjcmVhdGUAMjAxOC0wOC0yNFQxNzoyNjozMC0wNjowMAIlLYAAAAAldEVYdGRhdGU6 +bW9kaWZ5ADIwMTgtMDgtMjRUMTc6MjY6MzAtMDY6MDBzeJU8AAAAGXRFWHRTb2Z0d2FyZQB3d3cu +aW5rc2NhcGUub3Jnm+48GgAAACJ0RVh0U291cmNlAGh0dHA6Ly9qaW1tYWMubXVzaWNoYWxsLmN6 +L/VpyMQAAAAZdEVYdFRpdGxlAEZhdm91cml0ZXMgKGVtYmxlbSmyreP+AAAAAElFTkSuQmCC +" + id="icon:48-8" + x="328" + y="220" /> + <image + width="48" + height="48" + preserveAspectRatio="none" + xlink:href="data:image/png;base64,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 +7FPIs1/bypZtmxj/+O94iaGSfa1Fi4m376PzdCc9V7v5vaCGZxl/1gIAGoGfKGTN2mZ2fns3Ttc/ +ydy8XtQnunwF1dt3cebDk1y/dZvfgqrEzqkiAkK8ZiAtCxrY+8pLWIkBkuc7QWuq1qzD2voNjr/7 +N64+6OePunJxKyoA4GWQnVUx2r+zj0WWwh14AOta+Ojw+3w2PMJfKhyz4gIANgHfMw3Z1r6dFc1N +HD/8PieS4xybg3hzIgBgCfAjhcRNkw/9QJ2dq0BziRjQ+r8mMY95zGMe85gO/wEEGFhCsflliQAA +ABR0RVh0QXV0aG9yAEpha3ViIFN0ZWluZXLm+/cvAAAAWHRFWHRDb3B5cmlnaHQAQ0MwIFB1Ymxp +YyBEb21haW4gRGVkaWNhdGlvbiBodHRwOi8vY3JlYXRpdmVjb21tb25zLm9yZy9wdWJsaWNkb21h +aW4vemVyby8xLjAvxuO9+QAAABh0RVh0Q3JlYXRpb24gVGltZQAyMDA1LTAyLTAxhIsTNAAAACV0 +RVh0ZGF0ZTpjcmVhdGUAMjAxOC0wOC0yNFQxNzoyNjozMS0wNjowMKRSJjQAAAAldEVYdGRhdGU6 +bW9kaWZ5ADIwMTgtMDgtMjRUMTc6MjY6MzEtMDY6MDDVD56IAAAAGXRFWHRTb2Z0d2FyZQB3d3cu +aW5rc2NhcGUub3Jnm+48GgAAACJ0RVh0U291cmNlAGh0dHA6Ly9qaW1tYWMubXVzaWNoYWxsLmN6 +L/VpyMQAAAAZdEVYdFRpdGxlAEZhdm91cml0ZXMgKGVtYmxlbSmyreP+AAAAAElFTkSuQmCC +" + id="icon:48-4" + x="384" + y="220" /> + <ellipse + id="path3099-2-9" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.40909095;fill:url(#radialGradient3107-3-1);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.41285896;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" + cx="456.17703" + cy="261.65808" + rx="14.098043" + ry="4.9269128" /> + <path + id="path5378-9-2" + d="m 454.84193,260.24458 c 0.0384,-0.0572 0.66452,0.73669 0.66452,0.73669 2.7454,-2.96898 9.75267,-8.51636 11.66422,-13.14289 -3.86572,4.26137 -10.18182,11.11699 -12.32874,12.4062 z" + style="fill:#d4572d;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000003pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + <path + id="path7876-1-0" + d="m 450.11102,241.14495 c -3.19888,-0.15649 -4.68914,1.88597 -5.49526,3.82894 -0.79997,2.55863 0.33085,7.3913 5.87241,7.02365 3.16088,0 4.41722,-3.22181 6.08077,-4.05817 1.51186,-0.56817 1.63085,-0.61903 3.22815,-0.61903 2.21975,0 6.23391,-1.59668 6.23391,-3.18095 -0.6823,-1.27129 -2.49371,-3.53526 -5.8223,-3.14939 -2.11879,0.2451 -4.12329,1.75041 -4.64689,2.49946 -1.28264,-1.12443 -2.9204,-2.34451 -5.45079,-2.34451 z" + style="fill:url(#linearGradient906-6);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000003pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + <path + id="path920-2-2" + d="m 455.95059,242.15135 c 5.53538,-5.50173 13.14228,-0.43076 13.09224,4.78692 -0.0457,4.76987 -3.7033,7.05423 -12.8921,15.5384 -9.61789,-7.89271 -13.00661,-9.7128 -12.95658,-15.37209 0.0501,-5.85823 6.56219,-10.25486 12.75644,-4.95323 z" + style="fill:#c71807;fill-opacity:1;fill-rule:evenodd;stroke:#820000;stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + <path + id="path922-7-3" + d="m 443.38602,246.91251 c -0.14532,4.75755 0.52977,4.00377 1.74953,5.511 1.19913,1.48174 6.42797,0.54915 11.12155,-3.84935 4.74965,-4.45103 9.5911,-1.93169 11.93798,-4.40997 -1.74833,-2.97967 -7.20511,-6.58992 -12.22885,-1.58712 -6.43805,-5.78276 -12.43488,-0.47501 -12.58021,4.33544 z" + style="opacity:0.625;fill:url(#linearGradient908-0);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000003pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + <path + style="opacity:0.39204544;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient910-9);stroke-width:1.00000072;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 456.01531,242.97692 c 5.26309,-5.65437 12.45597,-0.93039 12.40935,3.93028 -0.0426,4.4435 -3.71608,6.88901 -12.27613,14.79267 -8.9598,-7.35267 -12.38283,-9.31277 -12.33622,-14.58483 0.0466,-5.45739 6.43258,-9.76482 12.203,-4.13812 z" + id="path3109-0-7" /> + <rect + id="icon:32-32" + height="32" + width="32" + y="236" + x="440" + style="fill:none" /> + <image + width="32" + height="32" + preserveAspectRatio="none" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAACBjSFJN +AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAABmJLR0QAAAAAAAD5Q7t/AAAA +B3RJTUUH1gYMFyca8+vhYAAABIpJREFUWMPtls9vVFUUxz/3zcybaTvTklZtIRZaVH4IVBIVEQwt +KJgQjQsJrvUPYGHCAmNMdcFeo3FvYlQMATagafwBQhHEFI0EQULTX7TTX7Sdmc689+69x8W005lS +SgcXJIaTvMzk3nO/388957zJwMN4wKEW2/wQcBWC4yCAA4i1aEHFgINFuR8BYQdRKGRmzRHBKJSy +8F45AO1AVCFuzKWldRMrN68hFo+hPc3A1R7+7rzCyNA4xopyAVFIyA2zccs6Vm3ZQKKuGqsNyX96 +ud75F73dScSKen8pAJ8AaUfJ6rXL2fJmKw6C9X1EDIigQhEc12W4b5TTX58mm/N5Yv1Ktu5rQ5kc +NpdFjI9ywjhujFBVNWP9I5z5soNsxuPQPM87AA47SFNzPVv3tyJeFquD/IZYQEDIg0SiiFtF39U+ +mlpWYm6PIUaDSP5BEBFQinB1LdaNc/Kzo0ync+qQvQtAO1ARCcm+A69j/WlEB2BnOjpfGFBOiFC8 +Bj1xG8TM5UE+ZyYfK4Rr6tBuguOfHkUCqw7NeIaLASIOsnbT44ifw05nwJIXuIuwWMFOTxe+F+eV +fIrgD98iVLOCpoZabg6MCjZ/+RIAhaJxfSMmk0J8v1DyOdM7hREQNdcaRLBpD53OYbI+Nhcgnsbm +AkKJEZqeXE13/2jBswTAiBCvqkBS44jWpcIlbaDQhtk1MRZ/aJIgmcIGZsFXzmTSJBrq0cLCAAqF +WIvxfZgdqHm3LhgXtUZPeWS7x0BbFgsVChFog6PmjpcAOA5kM1lca5DAzy9ayecWIEor4Y1kCJKp +guBiEYrHSY2Nl0x+CUAo7DA+MMbyuijWy+SHS6D49ZulEBGCwTTBpHdv55mINjZx9c9rGJljcIoT +fI3qvZnEqYxjdYANNKIDJND5RxskMJi0T/bmRFnm4do6gsQyegdHKZ6Q0iE0hqHBSSYnPSorEpjJ +iZL+W2MxEx46HSyp5IVbulESz22j48QpBFHtxXvFie1AYESd7fgDahrAiWCyAXoyh5ecxutPo1Pl +matIhOrtrVw8c57UVIY18+bUmX/gAyAXaH45eRGnuhmTcgjGPWxWl2WcN3ep2fEyl7uu0NdzC19Q +++dXZ6GDT1nURCrL2XO/E9vQQrh6WXnOgBONsWzXHi792kX3tW4cKS19AfJuAkeAGwqpqozRumcH +pvs6/tDg0swrKqlp282Fnzrp7+knEBY0XxQA8hU/DBKJhNm5t43I2DDZG9cWNQ8lqqlp3c25734k +OZAkLKIOLpK/KMBs5P/tOLKt7QUeqYqS7voN0fqOvHBtHYmXdvHzsZOMjY5TIah376G9JACAA8Bj +SsnGlrWse+ZppjrPYNKpwr7bsJzY89v54chxJqYyfCGoG0vQXTIAwE5gp1LSuOJRtr32KukLZ/GH +bhFd1Uxkw2a+/+oYw57Hxxa11J+osgAA6oG3FVJfWcErb72BqyDtBXR8c4Ieo/nclqdZNgBACHjH +QZqdEJtffJauzktcNpZv70PvvgBmYy/IVuA8cOo/at13JB6I68P4P8W/3Fhxee98CpgAAAAldEVY +dGRhdGU6Y3JlYXRlADIwMTgtMDgtMjNUMjI6MTQ6NTctMDY6MDAATcIIAAAAJXRFWHRkYXRlOm1v +ZGlmeQAyMDA2LTA2LTEzVDA1OjM5OjI2LTA2OjAwewtT2wAAAABJRU5ErkJggg== +" + id="icon:32-8" + x="480" + y="236" /> + <image + width="32" + height="32" + preserveAspectRatio="none" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAACBjSFJN +AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAABmJLR0QAAAAAAAD5Q7t/AAAA +B3RJTUUH1gYMFyca8+vhYAAABIpJREFUWMPtls9vVFUUxz/3zcybaTvTklZtIRZaVH4IVBIVEQwt +KJgQjQsJrvUPYGHCAmNMdcFeo3FvYlQMATagafwBQhHEFI0EQULTX7TTX7Sdmc689+69x8W005lS +SgcXJIaTvMzk3nO/388957zJwMN4wKEW2/wQcBWC4yCAA4i1aEHFgINFuR8BYQdRKGRmzRHBKJSy +8F45AO1AVCFuzKWldRMrN68hFo+hPc3A1R7+7rzCyNA4xopyAVFIyA2zccs6Vm3ZQKKuGqsNyX96 +ud75F73dScSKen8pAJ8AaUfJ6rXL2fJmKw6C9X1EDIigQhEc12W4b5TTX58mm/N5Yv1Ktu5rQ5kc +NpdFjI9ywjhujFBVNWP9I5z5soNsxuPQPM87AA47SFNzPVv3tyJeFquD/IZYQEDIg0SiiFtF39U+ +mlpWYm6PIUaDSP5BEBFQinB1LdaNc/Kzo0ync+qQvQtAO1ARCcm+A69j/WlEB2BnOjpfGFBOiFC8 +Bj1xG8TM5UE+ZyYfK4Rr6tBuguOfHkUCqw7NeIaLASIOsnbT44ifw05nwJIXuIuwWMFOTxe+F+eV +fIrgD98iVLOCpoZabg6MCjZ/+RIAhaJxfSMmk0J8v1DyOdM7hREQNdcaRLBpD53OYbI+Nhcgnsbm +AkKJEZqeXE13/2jBswTAiBCvqkBS44jWpcIlbaDQhtk1MRZ/aJIgmcIGZsFXzmTSJBrq0cLCAAqF +WIvxfZgdqHm3LhgXtUZPeWS7x0BbFgsVChFog6PmjpcAOA5kM1lca5DAzy9ayecWIEor4Y1kCJKp +guBiEYrHSY2Nl0x+CUAo7DA+MMbyuijWy+SHS6D49ZulEBGCwTTBpHdv55mINjZx9c9rGJljcIoT +fI3qvZnEqYxjdYANNKIDJND5RxskMJi0T/bmRFnm4do6gsQyegdHKZ6Q0iE0hqHBSSYnPSorEpjJ +iZL+W2MxEx46HSyp5IVbulESz22j48QpBFHtxXvFie1AYESd7fgDahrAiWCyAXoyh5ecxutPo1Pl +matIhOrtrVw8c57UVIY18+bUmX/gAyAXaH45eRGnuhmTcgjGPWxWl2WcN3ep2fEyl7uu0NdzC19Q +++dXZ6GDT1nURCrL2XO/E9vQQrh6WXnOgBONsWzXHi792kX3tW4cKS19AfJuAkeAGwqpqozRumcH +pvs6/tDg0swrKqlp282Fnzrp7+knEBY0XxQA8hU/DBKJhNm5t43I2DDZG9cWNQ8lqqlp3c25734k +OZAkLKIOLpK/KMBs5P/tOLKt7QUeqYqS7voN0fqOvHBtHYmXdvHzsZOMjY5TIah376G9JACAA8Bj +SsnGlrWse+ZppjrPYNKpwr7bsJzY89v54chxJqYyfCGoG0vQXTIAwE5gp1LSuOJRtr32KukLZ/GH +bhFd1Uxkw2a+/+oYw57Hxxa11J+osgAA6oG3FVJfWcErb72BqyDtBXR8c4Ieo/nclqdZNgBACHjH +QZqdEJtffJauzktcNpZv70PvvgBmYy/IVuA8cOo/at13JB6I68P4P8W/3Fhxee98CpgAAAAldEVY +dGRhdGU6Y3JlYXRlADIwMTgtMDgtMjNUMjI6MTQ6NTctMDY6MDAATcIIAAAAJXRFWHRkYXRlOm1v +ZGlmeQAyMDA2LTA2LTEzVDA1OjM5OjI2LTA2OjAwewtT2wAAAABJRU5ErkJggg== +" + id="icon:32-4" + x="520" + y="236" /> + <image + width="16" + height="16" + preserveAspectRatio="none" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAAlwSFlz +AAAN1wAADdcBQiibeAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAKRSURB +VDiNpZNLSJRRFMf/595v/GbmS4XyQRQUCWEQJT1BRO2BYrQoWgUR1SZatC0oJirNli2iTa0kgiCS +CJGwbCFliD2IohcUpZSpozPTNzPf6957Wthba9OBA2fx//05nAcxM/4nrO9FB9FuS9BekqKWma1I +mZMAugAstggdEGKbEJQB87NQmYsp5l4AIGbGGUFH40n7xPrWtcmyynL4hQiP+4aD3JSbY7Czoq4m +sbxxtQjyHjIf03jc/8SLlO48pnQHnQZ2Oo59pW3f1oRtC3DoAwyIhIOx0QzshI35FQ60mwWEhHRK +4WuJW5d6/ELePyJbJJ1auaGmrqq6FDo3DQ58cOBDu1/gxAlxRFCZSbDnwRQL0NkpWIbgJOdZn0bG +l1oMal20pBIqmwEHPsAMZgaYgWIBMAwTKARjOWjXh/YikHyHqvpmGH66zGJmSUbA5F2wUjMwZgzY +AFE6j/CzCzY/t8Vag2IlYLCwLElvM+PTqysSBO3NdAAArAyCMRe6EM1aXWxBBdITk5CED0IZvvz8 +yTtPllfCBCGMFyJKF+C9z84JkxVDvG4dhgaGipHBUaE1n8tlvdcvHr3XZC+EP+oiTHtgZWbDsRhK +G5oxeOdeEIVRd4q5W6SYjTK88+Wb0YlXI9ORs2oNSMpZsLBtlDW1YKD/vp+emLqjGAd+HBIAtBNV +WIJuV1fNr93YuCFeGH4A43kzcDIJp2Ez7t7s8/M594Zi7Ekx698MvpnYFuHqvFKnddOOtoT/cBAc +hojXN6H/eq9fLHpdmnEo9QtEfz5TOxFJwtmSktjhLbu2J6UUuH2txw+C4Pwxw0dmzeVv39hBtN+S +4oIQgiKl2o8b7pxTyN8ub648DTS3Awf/pfkKvceKsypI9XkAAAAASUVORK5CYII= +" + id="icon:16-32" + x="560" + y="252" /> + <image + width="16" + height="16" + preserveAspectRatio="none" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAABGdBTUEAALGPC/xhBQAAACBjSFJN +AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAABg1BMVEX///+DAACCAACEAQCF +AwKFAwGHAgGIBQOHBAKGAQCGAwKIBAKMCwfBUjrPZ0nHXESVFg+FAwGuMyTUcVPNZUq8SjaKBwWN +CwfWa0vdck3cbEXca0XedFDFVz/MYEbedFHbZ0HbaUTWcVSODAiHAwG2PSfca0bZXzfZXjbZXTXY +WzTZYTraYDvYWTHYVzDXVi/XVS3aYUG/QDDRXDzYWzXXVC3XUyzWUivWUSrWUSnWTyjUSCTNLxXK +Ig3HGQjIHAvVVkuFAQGFAgHSWj7WTijVSiTUSSPUSSLUSCHTRiHOMhXIGgjHGAfWW1GEAQCJBQLB +QyzVTCnSQRzSQBvRPBnKIwzMLBzCRTyHAgCVEgrYWz7QOhbQNxXNLBDIHAnIHAzUXFCLBwWGAgGu +KB7RQS/IHQzVWEyaGBSpIx3TSDrIGwrJHw7WXFKXFRGdGBPUVknJIRDJIhHUXlOSEA2SDgvTXlTL +KhrKJBTSXlOPCwmFAQDOWlHRXVOMCAeHAwKJBQQAAAAkgy4/AAAABnRSTlMAAAAAAABupgeRAAAA +AWJLR0SAZb2eaAAAAAlwSFlzAAAN1wAADdcBQiibeAAAAAd0SU1FB9cEAgsBLcz3aqkAAADRSURB +VBjTY2DABIxs7BxMTEycXOzcTCA+Mw8vH78Al6CQsIioGAsDA5O4hKSUtIysnLyCorySMiODiqqa +uoamlraOrp6+gaERGwOXsYmpmbmFpZW1ja2dvYMjg5Ozi6ubu4enl7ePj4+drx+Df0BgUHBwSKgP +CISFRzCwRkZFx8TGgfnxCYlMDExJySneYK5Palo6J9AdTE4ZmVkgfnZObhLYZUxJefkFPj6FRcWc +TBC3M3GWlJaVV1RWMcF8w1SVWF1TW4Xiwbp6ZlQvMzFCGQCmliqV/01FkgAAACV0RVh0ZGF0ZTpj +cmVhdGUAMjAxOC0wOC0yM1QyMjoxNDo1Ny0wNjowMABNwggAAAAldEVYdGRhdGU6bW9kaWZ5ADIw +MDctMDQtMDJUMTc6MDE6NDUtMDY6MDCxuArqAAAAGXRFWHRTb2Z0d2FyZQB3d3cuaW5rc2NhcGUu +b3Jnm+48GgAAAABJRU5ErkJggg== +" + id="icon:16-8" + x="584" + y="252" /> + <image + width="16" + height="16" + preserveAspectRatio="none" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAABGdBTUEAALGPC/xhBQAAACBjSFJN +AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAABg1BMVEX///+DAACCAACEAQCF +AwKFAwGHAgGIBQOHBAKGAQCGAwKIBAKMCwfBUjrPZ0nHXESVFg+FAwGuMyTUcVPNZUq8SjaKBwWN +CwfWa0vdck3cbEXca0XedFDFVz/MYEbedFHbZ0HbaUTWcVSODAiHAwG2PSfca0bZXzfZXjbZXTXY +WzTZYTraYDvYWTHYVzDXVi/XVS3aYUG/QDDRXDzYWzXXVC3XUyzWUivWUSrWUSnWTyjUSCTNLxXK +Ig3HGQjIHAvVVkuFAQGFAgHSWj7WTijVSiTUSSPUSSLUSCHTRiHOMhXIGgjHGAfWW1GEAQCJBQLB +QyzVTCnSQRzSQBvRPBnKIwzMLBzCRTyHAgCVEgrYWz7QOhbQNxXNLBDIHAnIHAzUXFCLBwWGAgGu +KB7RQS/IHQzVWEyaGBSpIx3TSDrIGwrJHw7WXFKXFRGdGBPUVknJIRDJIhHUXlOSEA2SDgvTXlTL +KhrKJBTSXlOPCwmFAQDOWlHRXVOMCAeHAwKJBQQAAAAkgy4/AAAABnRSTlMAAAAAAABupgeRAAAA +AWJLR0SAZb2eaAAAAAlwSFlzAAAN1wAADdcBQiibeAAAAAd0SU1FB9cEAgsBLcz3aqkAAADRSURB +VBjTY2DABIxs7BxMTEycXOzcTCA+Mw8vH78Al6CQsIioGAsDA5O4hKSUtIysnLyCorySMiODiqqa +uoamlraOrp6+gaERGwOXsYmpmbmFpZW1ja2dvYMjg5Ozi6ubu4enl7ePj4+drx+Df0BgUHBwSKgP +CISFRzCwRkZFx8TGgfnxCYlMDExJySneYK5Palo6J9AdTE4ZmVkgfnZObhLYZUxJefkFPj6FRcWc +TBC3M3GWlJaVV1RWMcF8w1SVWF1TW4Xiwbp6ZlQvMzFCGQCmliqV/01FkgAAACV0RVh0ZGF0ZTpj +cmVhdGUAMjAxOC0wOC0yM1QyMjoxNDo1Ny0wNjowMABNwggAAAAldEVYdGRhdGU6bW9kaWZ5ADIw +MDctMDQtMDJUMTc6MDE6NDUtMDY6MDCxuArqAAAAGXRFWHRTb2Z0d2FyZQB3d3cuaW5rc2NhcGUu +b3Jnm+48GgAAAABJRU5ErkJggg== +" + id="icon:16-4" + x="608" + y="252" /> +</svg> diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 2333e397f1..2192327a76 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -553,21 +553,26 @@ IDI_SHELL_TREE ICON resources/menu.ico /* @makedep: resources/folder.ico */ IDI_SHELL_REMOTE_FOLDER ICON resources/folder.ico +/* @makedep: resources/favorites.ico */ +IDI_SHELL_FAVORITES ICON resources/favorites.ico + /* @makedep: resources/trash_file.ico */ IDI_SHELL_TRASH_FILE ICON resources/trash_file.ico /* @makedep: resources/delete.ico */ IDI_SHELL_CONFIRM_DELETE ICON resources/delete.ico +/* @makedep: resources/favorites.ico */ +IDI_SHELL_FAVORITES_FOLDER ICON resources/favorites.ico + /* @makedep: resources/mydocs.ico */ IDI_SHELL_MY_DOCUMENTS ICON resources/mydocs.ico /* @makedep: resources/optical_disc.ico */ IDI_SHELL_OPTICAL_DISC ICON resources/optical_disc.ico -/* FIXME: Following resource is not yet added */ -/* @makedep: resources/mydocs.ico */ -IDI_SHELL_FAVORITES ICON resources/mydocs.ico +/* @makedep: resources/favorites.ico */ +IDI_SHELL_FAVORITES_SMALL ICON resources/favorites.ico /* @makedep: resources/idb_tb_large.bmp */ IDB_TB_LARGE_LIGHT BITMAP resources/idb_tb_large.bmp diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 651d52ea37..174f76076f 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -212,6 +212,7 @@ #define IDI_SHELL_MUSIC_CD 41 #define IDI_SHELL_TREE 42 #define IDI_SHELL_REMOTE_FOLDER 43 +#define IDI_SHELL_FAVORITES 44 #define IDI_SHELL_REMOTE_PRINTER 140 #define IDI_SHELL_TO_FILE_PRINTER 141 #define IDI_SHELL_TRASH_FILE 142 @@ -219,9 +220,10 @@ #define IDI_SHELL_DEFAULT_PRINTER 168 #define IDI_SHELL_DEFAULT_REMOTE_PRINTER 169 #define IDI_SHELL_DEFAULT_TO_FILE_PRINTER 170 +#define IDI_SHELL_FAVORITES_FOLDER 173 #define IDI_SHELL_MY_DOCUMENTS 235 #define IDI_SHELL_OPTICAL_DISC 302 -#define IDI_SHELL_FAVORITES 319 +#define IDI_SHELL_FAVORITES_SMALL 322 /* AVI resources, windows shell32 has 14 of them: 150-152 and 160-170 -- 2.18.0

1 19

[PATCH] include: Add sal.h
by Alistair Leslie-Hughes 27 Aug '18

27 Aug '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/Makefile.in | 1 + include/sal.h | 95 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 96 insertions(+) create mode 100644 include/sal.h diff --git a/include/Makefile.in b/include/Makefile.in index fec158d..a89fef6 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -549,6 +549,7 @@ SOURCES = \ rstloc.idl \ rstnot.idl \ rtutils.h \ + sal.h \ sapi.idl \ sapiddk.idl \ scarderr.h \ diff --git a/include/sal.h b/include/sal.h new file mode 100644 index 0000000..3c4d419 --- /dev/null +++ b/include/sal.h @@ -0,0 +1,95 @@ +/* + * Copyright (C) 2018 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_SAL_H__ +#define __WINE_SAL_H__ + +#define _Check_return_ + +#define _Deref_out_ +#define _Deref_out_opt_ +#define _Deref_out_opt_z_ +#define _Deref_post_opt_cap_(count) +#define _Deref_post_opt_valid_ + +#define _In_ +#define _In_bytecount_(count) +#define _In_count_(count) +#define _In_opt_ +#define _In_opt_count_(count) +#define _In_opt_z_ +#define _In_reads_(count) +#define _In_reads_bytes_(count) +#define _In_reads_opt_z_(count) +#define _In_reads_z_(count) +#define _In_z_ + +#define _Inout_ +#define _Inout_cap_(count) +#define _Inout_opt_ +#define _Inout_updates_z_(count) +#define _Inout_z_ +#define _Inout_z_bytecap_(count) +#define _Inout_z_cap_(count) +#define _Inout_z_cap_c_(count) + +#define _Null_terminated_ + +#define _Out_ +#define _Out_bytecap_(count) +#define _Out_bytecapcount_(count) +#define _Out_bytecap_post_bytecount_(count1, count2) +#define _Out_cap_(count) +#define _Out_cap_post_count_(count1, count2) +#define _Out_opt_ +#define _Out_opt_z_cap_(count) +#define _Out_opt_z_cap_post_count_(count1, count2) +#define _Out_writes_(count) +#define _Out_writes_bytes_to_(count1, count2) +#define _Out_writes_opt_(count) +#define _Out_writes_opt_z_(count) +#define _Out_writes_to_(count1, count2) +#define _Out_writes_z_(count) +#define _Out_z_cap_(count) +#define _Out_z_cap_c_(count) +#define _Out_z_cap_post_count_(count1, count2) + +#define _Outptr_result_buffer_(count) +#define _Outptr_result_maybenull_z_ + +#define _Post_invalid_ +#define _Post_writable_byte_size_(count) +#define _Post_z_ + +#define _Pre_maybenull_ +#define _Pre_notnull_ +#define _Pre_writable_size_(count) + +#define _Printf_format_string_ + +#define _Ret_maybenull_ +#define _Ret_maybenull_z_ +#define _Ret_opt_ +#define _Ret_opt_z_cap_(count) +#define _Ret_writes_bytes_maybenull_(count) +#define _Ret_z_ + +#define _Success_(exp) + +#endif + -- 1.9.1

1 0

[PATCH] dpnet: Implement IDirectPlay8Peer SetSPCaps
by Alistair Leslie-Hughes 27 Aug '18

27 Aug '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dpnet/peer.c | 12 ++++++++++-- dlls/dpnet/tests/client.c | 25 +++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 2 deletions(-) diff --git a/dlls/dpnet/peer.c b/dlls/dpnet/peer.c index e8a60c3..3e3cd9b 100644 --- a/dlls/dpnet/peer.c +++ b/dlls/dpnet/peer.c @@ -526,9 +526,17 @@ static HRESULT WINAPI IDirectPlay8PeerImpl_SetCaps(IDirectPlay8Peer *iface, cons static HRESULT WINAPI IDirectPlay8PeerImpl_SetSPCaps(IDirectPlay8Peer *iface, const GUID * const pguidSP, const DPN_SP_CAPS * const pdpspCaps, const DWORD dwFlags ) { - FIXME("(%p)->(%p,%p,%x): stub\n", iface, pguidSP, pdpspCaps, dwFlags); + IDirectPlay8PeerImpl* This = impl_from_IDirectPlay8Peer(iface); - return DPNERR_GENERIC; + TRACE("(%p)->(%p,%p,%x): stub\n", iface, pguidSP, pdpspCaps, dwFlags); + + if(!This->msghandler || pdpspCaps->dwSize != sizeof(DPN_SP_CAPS)) + return DPNERR_INVALIDPARAM; + + /* Only dwSystemBufferSize is set by this call. */ + This->spcaps.dwSystemBufferSize = pdpspCaps->dwSystemBufferSize; + + return DPN_OK; } static HRESULT WINAPI IDirectPlay8PeerImpl_GetSPCaps(IDirectPlay8Peer *iface, const GUID * const pguidSP, diff --git a/dlls/dpnet/tests/client.c b/dlls/dpnet/tests/client.c index 431203b..47d8b01 100644 --- a/dlls/dpnet/tests/client.c +++ b/dlls/dpnet/tests/client.c @@ -561,6 +561,9 @@ static void test_init_dp_peer(void) memset(&caps, 0, sizeof(DPN_SP_CAPS)); caps.dwSize = sizeof(DPN_SP_CAPS); + hr = IDirectPlay8Peer_SetSPCaps(peer, &CLSID_DP8SP_TCPIP, &caps, 0); + ok(hr == DPNERR_INVALIDPARAM, "SetSPCaps failed with %x\n", hr); + hr = IDirectPlay8Peer_GetSPCaps(peer, &CLSID_DP8SP_TCPIP, &caps, 0); ok(hr == DPNERR_UNINITIALIZED, "GetSPCaps failed with %x\n", hr); @@ -815,6 +818,28 @@ static void test_get_sp_caps_peer(void) ok(caps.dwBuffersPerThread == 1, "expected 1, got %d\n", caps.dwBuffersPerThread); ok(caps.dwSystemBufferSize == 0x10000 || broken(caps.dwSystemBufferSize == 0x2000 /* before Win8 */), "expected 0x10000, got 0x%x\n", caps.dwSystemBufferSize); + + caps.dwNumThreads = 2; + caps.dwDefaultEnumCount = 3; + caps.dwDefaultEnumRetryInterval = 1400; + caps.dwDefaultEnumTimeout = 1400; + caps.dwMaxEnumPayloadSize = 900; + caps.dwBuffersPerThread = 2; + caps.dwSystemBufferSize = 0x0ffff; + hr = IDirectPlay8Peer_SetSPCaps(peer, &CLSID_DP8SP_TCPIP, &caps, 0); + ok(hr == DPN_OK, "SetSPCaps failed with %x\n", hr); + + hr = IDirectPlay8Peer_GetSPCaps(peer, &CLSID_DP8SP_TCPIP, &caps, 0); + ok(hr == DPN_OK, "GetSPCaps failed with %x\n", hr); + + ok(caps.dwSize == sizeof(DPN_SP_CAPS), "got %d\n", caps.dwSize); + ok(caps.dwNumThreads >= 3, "got %d\n", caps.dwNumThreads); + ok(caps.dwDefaultEnumCount == 5, "expected 5, got %d\n", caps.dwDefaultEnumCount); + ok(caps.dwDefaultEnumRetryInterval == 1500, "expected 1500, got %d\n", caps.dwDefaultEnumRetryInterval); + ok(caps.dwDefaultEnumTimeout == 1500, "expected 1500, got %d\n", caps.dwDefaultEnumTimeout); + ok(caps.dwMaxEnumPayloadSize == 983, "expected 983, got %d\n", caps.dwMaxEnumPayloadSize); + ok(caps.dwBuffersPerThread == 1, "expected 1, got %d\n", caps.dwBuffersPerThread); + ok(caps.dwSystemBufferSize == 0x0ffff, "expected 0x0ffff, got 0x%x\n", caps.dwSystemBufferSize); } static void test_player_info_peer(void) -- 1.9.1

1 0

[PATCH] explorer: Replace the desktop window procedure instead of wrapping it.
by Fabian Maurer 26 Aug '18

26 Aug '18

This reverts commit fc14753dc0188a52a05243d5d82c4062b93daaff. According to Alexandre, we should be passing all messages to DefWindowProc. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- programs/explorer/desktop.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index ff58204530..49d3ee6928 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -599,8 +599,6 @@ static BOOL start_screensaver( void ) return FALSE; } -static WNDPROC desktop_orig_wndproc; - /* window procedure for the desktop window */ static LRESULT WINAPI desktop_wnd_proc( HWND hwnd, UINT message, WPARAM wp, LPARAM lp ) { @@ -662,9 +660,10 @@ static LRESULT WINAPI desktop_wnd_proc( HWND hwnd, UINT message, WPARAM wp, LPAR EndPaint( hwnd, &ps ); } return 0; - } - return desktop_orig_wndproc( hwnd, message, wp, lp ); + default: + return DefWindowProcW( hwnd, message, wp, lp ); + } } /* create the desktop and the associated driver window, and make it the current desktop */ @@ -979,8 +978,7 @@ void manage_desktop( WCHAR *arg ) CreateWindowExW( 0, messageW, NULL, WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN, 0, 0, 100, 100, 0, 0, 0, NULL ); - desktop_orig_wndproc = (WNDPROC)SetWindowLongPtrW( hwnd, GWLP_WNDPROC, - (LONG_PTR)desktop_wnd_proc ); + SetWindowLongPtrW( hwnd, GWLP_WNDPROC, (LONG_PTR)desktop_wnd_proc ); using_root = !desktop || !create_desktop( graphics_driver, name, width, height ); SendMessageW( hwnd, WM_SETICON, ICON_BIG, (LPARAM)LoadIconW( 0, MAKEINTRESOURCEW(OIC_WINLOGO))); if (name) set_desktop_window_title( hwnd, name ); -- 2.18.0

1 1

[PATCH 1/2] comctl32/listview: Use mask to disable change notifications.
by Nikolay Sivov 26 Aug '18

26 Aug '18

From: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/listview.c | 48 +++++++++++++++++++++++----------------- 1 file changed, 28 insertions(+), 20 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 200bf93be5..d463607e45 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -211,6 +211,12 @@ typedef struct tagDELAYED_ITEM_EDIT INT iItem; } DELAYED_ITEM_EDIT; +enum notification_mask +{ + NOTIFY_MASK_ITEM_CHANGE = 0x1, + NOTIFY_MASK_UNMASK_ALL = 0xffffffff +}; + typedef struct tagLISTVIEW_INFO { /* control window */ @@ -225,7 +231,7 @@ typedef struct tagLISTVIEW_INFO /* notification window */ SHORT notifyFormat; HWND hwndNotify; - BOOL bDoChangeNotify; /* send change notification messages? */ + DWORD notify_mask; UINT uCallbackMask; /* tooltips */ @@ -3507,13 +3513,13 @@ Parameters: */ static void LISTVIEW_ShiftFocus(LISTVIEW_INFO *infoPtr, INT focus, INT item, INT direction) { - BOOL old_change = infoPtr->bDoChangeNotify; + DWORD old_mask = infoPtr->notify_mask & NOTIFY_MASK_ITEM_CHANGE; - infoPtr->bDoChangeNotify = FALSE; + infoPtr->notify_mask &= ~NOTIFY_MASK_ITEM_CHANGE; focus = shift_item(infoPtr, focus, item, direction); if (focus != infoPtr->nFocusedItem) LISTVIEW_SetItemFocus(infoPtr, focus); - infoPtr->bDoChangeNotify = old_change; + infoPtr->notify_mask |= old_mask; } /** @@ -3556,8 +3562,8 @@ static BOOL LISTVIEW_AddGroupSelection(LISTVIEW_INFO *infoPtr, INT nItem) INT nLast = max(infoPtr->nSelectionMark, nItem); HWND hwndSelf = infoPtr->hwndSelf; NMLVODSTATECHANGE nmlv; + DWORD old_mask; LVITEMW item; - BOOL bOldChange; INT i; /* Temporarily disable change notification @@ -3565,8 +3571,9 @@ static BOOL LISTVIEW_AddGroupSelection(LISTVIEW_INFO *infoPtr, INT nItem) * only one LVN_ODSTATECHANGED notification. * See MSDN documentation for LVN_ITEMCHANGED. */ - bOldChange = infoPtr->bDoChangeNotify; - if (infoPtr->dwStyle & LVS_OWNERDATA) infoPtr->bDoChangeNotify = FALSE; + old_mask = infoPtr->notify_mask & NOTIFY_MASK_ITEM_CHANGE; + if (infoPtr->dwStyle & LVS_OWNERDATA) + infoPtr->notify_mask &= ~NOTIFY_MASK_ITEM_CHANGE; if (nFirst == -1) nFirst = nItem; @@ -3585,7 +3592,7 @@ static BOOL LISTVIEW_AddGroupSelection(LISTVIEW_INFO *infoPtr, INT nItem) notify_hdr(infoPtr, LVN_ODSTATECHANGED, (LPNMHDR)&nmlv); if (!IsWindow(hwndSelf)) return FALSE; - infoPtr->bDoChangeNotify = bOldChange; + infoPtr->notify_mask |= old_mask; return TRUE; } @@ -3604,9 +3611,9 @@ static BOOL LISTVIEW_AddGroupSelection(LISTVIEW_INFO *infoPtr, INT nItem) static void LISTVIEW_SetGroupSelection(LISTVIEW_INFO *infoPtr, INT nItem) { RANGES selection; + DWORD old_mask; LVITEMW item; ITERATOR i; - BOOL bOldChange; if (!(selection = ranges_create(100))) return; @@ -3656,8 +3663,9 @@ static void LISTVIEW_SetGroupSelection(LISTVIEW_INFO *infoPtr, INT nItem) /* disable per item notifications on LVS_OWNERDATA style FIXME: single LVN_ODSTATECHANGED should be used */ - bOldChange = infoPtr->bDoChangeNotify; - if (infoPtr->dwStyle & LVS_OWNERDATA) infoPtr->bDoChangeNotify = FALSE; + old_mask = infoPtr->notify_mask & NOTIFY_MASK_ITEM_CHANGE; + if (infoPtr->dwStyle & LVS_OWNERDATA) + infoPtr->notify_mask &= ~NOTIFY_MASK_ITEM_CHANGE; LISTVIEW_DeselectAllSkipItems(infoPtr, selection); @@ -3668,8 +3676,7 @@ static void LISTVIEW_SetGroupSelection(LISTVIEW_INFO *infoPtr, INT nItem) /* this will also destroy the selection */ iterator_destroy(&i); - infoPtr->bDoChangeNotify = bOldChange; - + infoPtr->notify_mask |= old_mask; LISTVIEW_SetItemFocus(infoPtr, nItem); } @@ -4257,7 +4264,7 @@ static BOOL set_main_item(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem, BOOL and we are _NOT_ virtual (LVS_OWNERDATA), and change notifications are enabled. Even nothing really changed we still need to send this, in this case uChanged mask is just set to passed item mask. */ - if(lpItem && !isNew && infoPtr->bDoChangeNotify) + if (lpItem && !isNew && (infoPtr->notify_mask & NOTIFY_MASK_ITEM_CHANGE)) { HWND hwndSelf = infoPtr->hwndSelf; @@ -4350,7 +4357,8 @@ static BOOL set_main_item(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem, BOOL /* send LVN_ITEMCHANGED notification */ if (lpLVItem->mask & LVIF_PARAM) nmlv.lParam = lpLVItem->lParam; - if (infoPtr->bDoChangeNotify) notify_listview(infoPtr, LVN_ITEMCHANGED, &nmlv); + if (infoPtr->notify_mask & NOTIFY_MASK_ITEM_CHANGE) + notify_listview(infoPtr, LVN_ITEMCHANGED, &nmlv); return TRUE; } @@ -8973,7 +8981,7 @@ static BOOL LISTVIEW_SetItemState(LISTVIEW_INFO *infoPtr, INT nItem, const LVITE if (nItem == -1) { UINT oldstate = 0; - BOOL notify; + DWORD old_mask; /* special case optimization for recurring attempt to deselect all */ if (lvItem.state == 0 && lvItem.stateMask == LVIS_SELECTED && !LISTVIEW_GetSelectedCount(infoPtr)) @@ -8986,10 +8994,10 @@ static BOOL LISTVIEW_SetItemState(LISTVIEW_INFO *infoPtr, INT nItem, const LVITE /* focus all isn't allowed */ if (lvItem.state & lvItem.stateMask & LVIS_FOCUSED) return FALSE; - notify = infoPtr->bDoChangeNotify; + old_mask = infoPtr->notify_mask & NOTIFY_MASK_ITEM_CHANGE; if (infoPtr->dwStyle & LVS_OWNERDATA) { - infoPtr->bDoChangeNotify = FALSE; + infoPtr->notify_mask &= ~NOTIFY_MASK_ITEM_CHANGE; if (!(lvItem.state & LVIS_SELECTED) && LISTVIEW_GetSelectedCount(infoPtr)) oldstate |= LVIS_SELECTED; if (infoPtr->nFocusedItem != -1) oldstate |= LVIS_FOCUSED; @@ -9003,7 +9011,7 @@ static BOOL LISTVIEW_SetItemState(LISTVIEW_INFO *infoPtr, INT nItem, const LVITE { NMLISTVIEW nmlv; - infoPtr->bDoChangeNotify = notify; + infoPtr->notify_mask |= old_mask; nmlv.iItem = -1; nmlv.iSubItem = 0; @@ -9484,7 +9492,7 @@ static LRESULT LISTVIEW_NCCreate(HWND hwnd, WPARAM wParam, const CREATESTRUCTW * infoPtr->nHotItem = -1; infoPtr->redraw = TRUE; infoPtr->bNoItemMetrics = TRUE; - infoPtr->bDoChangeNotify = TRUE; + infoPtr->notify_mask = NOTIFY_MASK_UNMASK_ALL; infoPtr->autoSpacing = TRUE; infoPtr->iconSpacing.cx = GetSystemMetrics(SM_CXICONSPACING) - GetSystemMetrics(SM_CXICON); infoPtr->iconSpacing.cy = GetSystemMetrics(SM_CYICONSPACING) - GetSystemMetrics(SM_CYICON); -- 2.18.0

1 1

[PATCH] ntdll/tests: Add Nt[WaitFor|Release]KeyedEvent test with NULL handle.
by Gijs Vermeulen 26 Aug '18

26 Aug '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44620 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/ntdll/tests/om.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index 52b4a83968..c2b40cb69c 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -1677,6 +1677,13 @@ static void test_keyed_events(void) status = pNtReleaseKeyedEvent( handle, NULL, 0, &timeout ); ok( status == STATUS_TIMEOUT, "NtReleaseKeyedEvent %x\n", status ); + status = pNtWaitForKeyedEvent( NULL, (void *)8, 0, &timeout ); + todo_wine ok( status == STATUS_TIMEOUT || broken(status == STATUS_INVALID_HANDLE), /* XP/2003 */ + "NtWaitForKeyedEvent %x\n", status ); + status = pNtReleaseKeyedEvent( NULL, (void *)8, 0, &timeout ); + todo_wine ok( status == STATUS_TIMEOUT || broken(status == STATUS_INVALID_HANDLE), /* XP/2003 */ + "NtReleaseKeyedEvent %x\n", status ); + status = pNtWaitForKeyedEvent( (HANDLE)0xdeadbeef, (void *)9, 0, &timeout ); ok( status == STATUS_INVALID_PARAMETER_1, "NtWaitForKeyedEvent %x\n", status ); status = pNtReleaseKeyedEvent( (HANDLE)0xdeadbeef, (void *)9, 0, &timeout ); -- 2.15.2 (Apple Git-101.1)

1 0

[PATCH 3/3] comctl32/pager: Support WM_NOTIFYFORMAT message.
by Zhiyi Zhang 26 Aug '18

26 Aug '18

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/pager.c | 25 +++++++++++++++++++++++++ dlls/comctl32/tests/pager.c | 8 ++++---- 2 files changed, 29 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/pager.c b/dlls/comctl32/pager.c index fe68515e67..de63cad717 100644 --- a/dlls/comctl32/pager.c +++ b/dlls/comctl32/pager.c @@ -71,6 +71,7 @@ typedef struct HWND hwndSelf; /* handle of the control wnd */ HWND hwndChild; /* handle of the contained wnd */ HWND hwndNotify; /* handle of the parent wnd */ + BOOL bUnicode; /* send notifications in Unicode */ DWORD dwStyle; /* styles for this control */ COLORREF clrBk; /* background color */ INT nBorder; /* border size for the control */ @@ -555,6 +556,7 @@ static LRESULT PAGER_Create (HWND hwnd, const CREATESTRUCTW *lpcs) { PAGER_INFO *infoPtr; + INT ret; /* allocate memory for info structure */ infoPtr = heap_alloc_zero (sizeof(*infoPtr)); @@ -581,6 +583,9 @@ PAGER_Create (HWND hwnd, const CREATESTRUCTW *lpcs) if (infoPtr->dwStyle & PGS_DRAGNDROP) FIXME("[%p] Drag and Drop style is not implemented yet.\n", infoPtr->hwndSelf); + ret = SendMessageW(infoPtr->hwndNotify, WM_NOTIFYFORMAT, (WPARAM)infoPtr->hwndSelf, NF_QUERY); + infoPtr->bUnicode = (ret == NFR_UNICODE); + return 0; } @@ -998,6 +1003,23 @@ PAGER_StyleChanged(PAGER_INFO *infoPtr, WPARAM wStyleType, const STYLESTRUCT *lp return 0; } +static LRESULT PAGER_NotifyFormat(PAGER_INFO *infoPtr, INT command) +{ + INT ret; + switch (command) + { + case NF_REQUERY: + ret = SendMessageW(infoPtr->hwndNotify, WM_NOTIFYFORMAT, (WPARAM)infoPtr->hwndSelf, NF_QUERY); + infoPtr->bUnicode = (ret == NFR_UNICODE); + return ret; + case NF_QUERY: + /* Pager always wants Unicode notifications from children */ + return NFR_UNICODE; + default: + return 0; + } +} + static LRESULT WINAPI PAGER_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { @@ -1089,6 +1111,9 @@ PAGER_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case WM_TIMER: return PAGER_Timer (infoPtr, (INT)wParam); + case WM_NOTIFYFORMAT: + return PAGER_NotifyFormat (infoPtr, lParam); + case WM_NOTIFY: case WM_COMMAND: return SendMessageW (infoPtr->hwndNotify, uMsg, wParam, lParam); diff --git a/dlls/comctl32/tests/pager.c b/dlls/comctl32/tests/pager.c index f2ac8b299a..a1f6683a57 100644 --- a/dlls/comctl32/tests/pager.c +++ b/dlls/comctl32/tests/pager.c @@ -392,8 +392,8 @@ static void test_wm_notifyformat(void) /* Test parent */ notify_query_received = FALSE; ret = SendMessageW(pager, WM_NOTIFYFORMAT, (WPARAM)parent, NF_REQUERY); - todo_wine_if(notify_format == NFR_ANSI) ok(ret == notify_format, "Expect %d, got %ld\n", notify_format, ret); - todo_wine ok(notify_query_received, "Didn't receive notify\n"); + ok(ret == notify_format, "Expect %d, got %ld\n", notify_format, ret); + ok(notify_query_received, "Didn't receive notify\n"); /* Send NF_QUERY directly to parent */ notify_query_received = FALSE; @@ -404,8 +404,8 @@ static void test_wm_notifyformat(void) /* Pager send notifications to its parent regardless of wParam */ notify_query_received = FALSE; ret = SendMessageW(pager, WM_NOTIFYFORMAT, (WPARAM)parent_wnd, NF_REQUERY); - todo_wine_if(notify_format == NFR_ANSI) ok(ret == notify_format, "Expect %d, got %ld\n", notify_format, ret); - todo_wine ok(notify_query_received, "Didn't receive notify\n"); + ok(ret == notify_format, "Expect %d, got %ld\n", notify_format, ret); + ok(notify_query_received, "Didn't receive notify\n"); /* Pager always wants Unicode notifications from children */ ret = SendMessageW(child, WM_NOTIFYFORMAT, (WPARAM)pager, NF_REQUERY); -- 2.18.0

2 1

[PATCH 2/3] comctl32/tests: Add WM_NOTIFYFORMAT tests for pager.
by Zhiyi Zhang 26 Aug '18

26 Aug '18

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/tests/pager.c | 90 +++++++++++++++++++++++++++++++++++++ 1 file changed, 90 insertions(+) diff --git a/dlls/comctl32/tests/pager.c b/dlls/comctl32/tests/pager.c index fa505dce68..f2ac8b299a 100644 --- a/dlls/comctl32/tests/pager.c +++ b/dlls/comctl32/tests/pager.c @@ -28,6 +28,8 @@ #define PAGER_SEQ_INDEX 0 static HWND parent_wnd, child1_wnd, child2_wnd; +static INT notify_format; +static BOOL notify_query_received; #define CHILD1_ID 1 #define CHILD2_ID 2 @@ -330,6 +332,93 @@ static void test_pager(void) DestroyWindow( pager ); } +static LRESULT WINAPI test_notifyformat_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + switch (message) + { + case WM_NOTIFYFORMAT: + if (lParam == NF_QUERY) + { + notify_query_received = TRUE; + return notify_format; + } + else if (lParam == NF_REQUERY) + return SendMessageA(GetParent(hwnd), WM_NOTIFYFORMAT, (WPARAM)hwnd, NF_QUERY); + else + return 0; + default: + return notify_format == NFR_UNICODE ? DefWindowProcW(hwnd, message, wParam, lParam) + : DefWindowProcA(hwnd, message, wParam, lParam); + } +} + +static BOOL register_notifyformat_class(void) +{ + static const WCHAR class_w[] = {'P', 'a', 'g', 'e', 'r', ' ', 'n', 'o', 't', 'i', 'f', 'y', 'f', + 'o', 'r', 'm', 'a', 't', ' ', 'c', 'l', 'a', 's', 's', 0}; + WNDCLASSW cls = {0}; + + cls.lpfnWndProc = test_notifyformat_proc; + cls.hInstance = GetModuleHandleW(NULL); + cls.lpszClassName = class_w; + return RegisterClassW(&cls); +} + +static void test_wm_notifyformat(void) +{ + static const WCHAR class_w[] = {'P', 'a', 'g', 'e', 'r', ' ', 'n', 'o', 't', 'i', 'f', 'y', 'f', + 'o', 'r', 'm', 'a', 't', ' ', 'c', 'l', 'a', 's', 's', 0}; + static const WCHAR parent_w[] = {'p', 'a', 'r', 'e', 'n', 't', 0}; + static const WCHAR pager_w[] = {'p', 'a', 'g', 'e', 'r', 0}; + static const WCHAR child_w[] = {'c', 'h', 'i', 'l', 'd', 0}; + static const INT formats[] = {NFR_UNICODE, NFR_ANSI}; + HWND parent, pager, child; + LRESULT ret; + INT i; + + ok(register_notifyformat_class(), "Register test class failed, error 0x%08x\n", GetLastError()); + + for (i = 0; i < ARRAY_SIZE(formats); i++) + { + notify_format = formats[i]; + parent = CreateWindowW(class_w, parent_w, WS_OVERLAPPED, 0, 0, 100, 100, 0, 0, GetModuleHandleW(0), 0); + ok(parent != NULL, "CreateWindow failed\n"); + pager = CreateWindowW(WC_PAGESCROLLERW, pager_w, WS_CHILD, 0, 0, 100, 100, parent, 0, GetModuleHandleW(0), 0); + ok(pager != NULL, "CreateWindow failed\n"); + child = CreateWindowW(class_w, child_w, WS_CHILD, 0, 0, 100, 100, pager, 0, GetModuleHandleW(0), 0); + ok(child != NULL, "CreateWindow failed\n"); + SendMessageW(pager, PGM_SETCHILD, 0, (LPARAM)child); + + /* Test parent */ + notify_query_received = FALSE; + ret = SendMessageW(pager, WM_NOTIFYFORMAT, (WPARAM)parent, NF_REQUERY); + todo_wine_if(notify_format == NFR_ANSI) ok(ret == notify_format, "Expect %d, got %ld\n", notify_format, ret); + todo_wine ok(notify_query_received, "Didn't receive notify\n"); + + /* Send NF_QUERY directly to parent */ + notify_query_received = FALSE; + ret = SendMessageW(parent, WM_NOTIFYFORMAT, (WPARAM)pager, NF_QUERY); + ok(ret == notify_format, "Expect %d, got %ld\n", notify_format, ret); + ok(notify_query_received, "Didn't receive notify\n"); + + /* Pager send notifications to its parent regardless of wParam */ + notify_query_received = FALSE; + ret = SendMessageW(pager, WM_NOTIFYFORMAT, (WPARAM)parent_wnd, NF_REQUERY); + todo_wine_if(notify_format == NFR_ANSI) ok(ret == notify_format, "Expect %d, got %ld\n", notify_format, ret); + todo_wine ok(notify_query_received, "Didn't receive notify\n"); + + /* Pager always wants Unicode notifications from children */ + ret = SendMessageW(child, WM_NOTIFYFORMAT, (WPARAM)pager, NF_REQUERY); + ok(ret == NFR_UNICODE, "Expect %d, got %ld\n", NFR_UNICODE, ret); + ret = SendMessageW(pager, WM_NOTIFYFORMAT, (WPARAM)child, NF_QUERY); + ok(ret == NFR_UNICODE, "Expect %d, got %ld\n", NFR_UNICODE, ret); + + DestroyWindow(parent); + } + + UnregisterClassW(class_w, GetModuleHandleW(NULL)); +} + static void init_functions(void) { HMODULE mod = LoadLibraryA("comctl32.dll"); @@ -357,6 +446,7 @@ START_TEST(pager) ok(parent_wnd != NULL, "Failed to create parent window!\n"); test_pager(); + test_wm_notifyformat(); DestroyWindow(parent_wnd); } -- 2.18.0

2 1

[PATCH 1/3] comctl32/tests: Remove pager skip check.
by Zhiyi Zhang 26 Aug '18

26 Aug '18

Pager should be available on all VMs(XP+) on TestBot. So there's no need to check for the availability of pager control. Add calling InitCommonControls() so that pager control can be correctly initialized on XP. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/tests/pager.c | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/tests/pager.c b/dlls/comctl32/tests/pager.c index 0da396cdd1..fa505dce68 100644 --- a/dlls/comctl32/tests/pager.c +++ b/dlls/comctl32/tests/pager.c @@ -32,6 +32,7 @@ static HWND parent_wnd, child1_wnd, child2_wnd; #define CHILD1_ID 1 #define CHILD2_ID 2 +static BOOL (WINAPI *pInitCommonControlsEx)(const INITCOMMONCONTROLSEX*); static BOOL (WINAPI *pSetWindowSubclass)(HWND, SUBCLASSPROC, UINT_PTR, DWORD_PTR); static struct msg_sequence *sequences[NUM_MSG_SEQUENCES]; @@ -257,11 +258,7 @@ static void test_pager(void) RECT rect, rect2; pager = create_pager_control( PGS_HORZ ); - if (!pager) - { - win_skip( "Pager control not supported\n" ); - return; - } + ok(pager != NULL, "Fail to create pager\n"); register_child_wnd_class(); @@ -333,11 +330,26 @@ static void test_pager(void) DestroyWindow( pager ); } -START_TEST(pager) +static void init_functions(void) { - HMODULE mod = GetModuleHandleA("comctl32.dll"); + HMODULE mod = LoadLibraryA("comctl32.dll"); + +#define X(f) p##f = (void*)GetProcAddress(mod, #f); + X(InitCommonControlsEx); +#undef X pSetWindowSubclass = (void*)GetProcAddress(mod, (LPSTR)410); +} + +START_TEST(pager) +{ + INITCOMMONCONTROLSEX iccex; + + init_functions(); + + iccex.dwSize = sizeof(iccex); + iccex.dwICC = ICC_PAGESCROLLER_CLASS; + pInitCommonControlsEx(&iccex); init_msg_sequences(sequences, NUM_MSG_SEQUENCES); @@ -345,4 +357,6 @@ START_TEST(pager) ok(parent_wnd != NULL, "Failed to create parent window!\n"); test_pager(); + + DestroyWindow(parent_wnd); } -- 2.18.0

2 1

[PATCH 1/2] d3drm: Partially implement IDirect3DRMTexture*::InitFromFile. (v6)
by Aaryaman Vasishta 26 Aug '18

26 Aug '18

v6: Rebased on top of master as of this patch date v5: Redundant newline removed. Signed-off-by: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> --- dlls/d3drm/d3drm_private.h | 1 + dlls/d3drm/tests/d3drm.c | 79 ++++++++- dlls/d3drm/texture.c | 325 ++++++++++++++++++++++++++++++++++++- 3 files changed, 393 insertions(+), 12 deletions(-) diff --git a/dlls/d3drm/d3drm_private.h b/dlls/d3drm/d3drm_private.h index 858911f350..333b809896 100644 --- a/dlls/d3drm/d3drm_private.h +++ b/dlls/d3drm/d3drm_private.h @@ -26,6 +26,7 @@ #define COBJMACROS #include <assert.h> #include <math.h> +#include <limits.h> #include "dxfile.h" #include "d3drmwin.h" #include "rmxfguid.h" diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index f78e098fec..4ed90ca682 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -5572,6 +5572,7 @@ static void test_load_texture(void) char *filename; HRESULT hr; BOOL ret; + ULONG ref1, ref2; int i; static const struct @@ -5595,6 +5596,7 @@ static void test_load_texture(void) ok(SUCCEEDED(hr), "Failed to get IDirect3DRM2 interface, hr %#x.\n", hr); hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM3, (void **)&d3drm3); ok(SUCCEEDED(hr), "Failed to get IDirect3DRM3 interface, hr %#x.\n", hr); + ref1 = get_refcount((IUnknown *)d3drm1); for (i = 0; i < ARRAY_SIZE(tests); ++i) { @@ -5602,24 +5604,74 @@ static void test_load_texture(void) hr = IDirect3DRM_LoadTexture(d3drm1, filename, &texture1); ok(SUCCEEDED(hr), "Test %u: Failed to load texture, hr %#x.\n", i, hr); + ref2 = get_refcount((IUnknown *)d3drm1); + todo_wine ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2); + + hr = IDirect3DRMTexture_InitFromFile(texture1, filename); + todo_wine ok(hr == D3DRMERR_BADOBJECT, "Test %u: Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", i, hr); + /* InitFromFile seems to AddRef IDirect3DRM even if it fails. */ + if (FAILED(hr)) + IDirect3DRM_Release(d3drm1); d3drm_img = IDirect3DRMTexture_GetImage(texture1); - todo_wine ok(!!d3drm_img, "Test %u: Failed to get image.\n", i); + ok(!!d3drm_img, "Test %u: Failed to get image.\n", i); if (d3drm_img) - test_bitmap_data(i * 4, d3drm_img, FALSE, tests[i].w, tests[i].h, tests[i].palettized); + test_bitmap_data(i * 7, d3drm_img, FALSE, tests[i].w, tests[i].h, tests[i].palettized); + IDirect3DRMTexture_Release(texture1); + ref2 = get_refcount((IUnknown *)d3drm1); + ok(ref1 == ref2, "Test %u: expected ref1 == ref2, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2); + hr = IDirect3DRM_CreateObject(d3drm1, &CLSID_CDirect3DRMTexture, NULL, &IID_IDirect3DRMTexture, (void **)&texture1); + ok(SUCCEEDED(hr), "Test %u: Failed to create texture, hr %#x.\n", i, hr); + hr = IDirect3DRMTexture_InitFromFile(texture1, NULL); + ok(hr == D3DRMERR_BADOBJECT, "Test %u: Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", i, hr); + hr = IDirect3DRMTexture_InitFromFile(texture1, ""); + ok(hr == D3DRMERR_BADOBJECT, "Test %u: Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", i, hr); + hr = IDirect3DRMTexture_InitFromFile(texture1, filename); + ok(SUCCEEDED(hr), "Test %u: Failed to initialize texture from file, hr %#x.\n", i, hr); + d3drm_img = IDirect3DRMTexture_GetImage(texture1); + ok(!!d3drm_img, "Test %u: Failed to get image.\n", i); + test_bitmap_data(i * 7 + 1, d3drm_img, FALSE, tests[i].w, tests[i].h, tests[i].palettized); IDirect3DRMTexture_Release(texture1); hr = IDirect3DRM2_LoadTexture(d3drm2, filename, &texture2); ok(SUCCEEDED(hr), "Test %u: Failed to load texture, hr %#x.\n", i, hr); + ref2 = get_refcount((IUnknown *)d3drm1); + todo_wine ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2); + + hr = IDirect3DRMTexture2_InitFromFile(texture2, filename); + todo_wine ok(hr == D3DRMERR_BADOBJECT, "Test %u: Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", i, hr); + if (FAILED(hr)) + IDirect3DRM_Release(d3drm1); d3drm_img = IDirect3DRMTexture2_GetImage(texture2); - todo_wine ok(!!d3drm_img, "Test %u: Failed to get image.\n", i); + ok(!!d3drm_img, "Test %u: Failed to get image.\n", i); if (d3drm_img) - test_bitmap_data(i * 4 + 1, d3drm_img, TRUE, tests[i].w, tests[i].h, tests[i].palettized); + test_bitmap_data(i * 7 + 2, d3drm_img, TRUE, tests[i].w, tests[i].h, tests[i].palettized); + IDirect3DRMTexture2_Release(texture2); + ref2 = get_refcount((IUnknown *)d3drm1); + ok(ref1 == ref2, "Test %u: expected ref1 == ref2, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2); + hr = IDirect3DRM2_CreateObject(d3drm2, &CLSID_CDirect3DRMTexture, NULL, &IID_IDirect3DRMTexture2, (void **)&texture2); + ok(SUCCEEDED(hr), "Test %u: Failed to create texture, hr %#x.\n", i, hr); + hr = IDirect3DRMTexture2_InitFromFile(texture2, NULL); + ok(hr == D3DRMERR_BADOBJECT, "Test %u: Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", i, hr); + hr = IDirect3DRMTexture2_InitFromFile(texture2, ""); + ok(hr == D3DRMERR_BADOBJECT, "Test %u: Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", i, hr); + hr = IDirect3DRMTexture2_InitFromFile(texture2, filename); + ok(SUCCEEDED(hr), "Test %u: Failed to initialize texture from file, hr %#x.\n", i, hr); + d3drm_img = IDirect3DRMTexture2_GetImage(texture2); + ok(!!d3drm_img, "Test %u: Failed to get image.\n", i); + test_bitmap_data(i * 7 + 3, d3drm_img, TRUE, tests[i].w, tests[i].h, tests[i].palettized); IDirect3DRMTexture2_Release(texture2); hr = IDirect3DRM3_LoadTexture(d3drm3, filename, &texture3); ok(SUCCEEDED(hr), "Test %u: Failed to load texture, hr %#x.\n", i, hr); + ref2 = get_refcount((IUnknown *)d3drm1); + todo_wine ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2); + + hr = IDirect3DRMTexture3_InitFromFile(texture3, filename); + todo_wine ok(hr == D3DRMERR_BADOBJECT, "Test %u: Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", i, hr); + if (FAILED(hr)) + IDirect3DRM_Release(d3drm1); d3drm_img = IDirect3DRMTexture3_GetImage(texture3); - todo_wine ok(!!d3drm_img, "Test %u: Failed to get image.\n", i); + ok(!!d3drm_img, "Test %u: Failed to get image.\n", i); if (d3drm_img) test_bitmap_data(i * 4 + 2, d3drm_img, TRUE, tests[i].w, tests[i].h, tests[i].palettized); /* Test whether querying a version 1 texture from version 3 causes a @@ -5627,11 +5679,26 @@ static void test_load_texture(void) hr = IDirect3DRMTexture3_QueryInterface(texture3, &IID_IDirect3DRMTexture, (void **)&texture1); ok(SUCCEEDED(hr), "Failed to get IDirect3DRMTexture interface, hr %#x.\n", hr); d3drm_img = IDirect3DRMTexture_GetImage(texture1); - todo_wine ok(!!d3drm_img, "Test %u: Failed to get image.\n", i); + ok(!!d3drm_img, "Test %u: Failed to get image.\n", i); if (d3drm_img) test_bitmap_data(i * 4 + 3, d3drm_img, TRUE, tests[i].w, tests[i].h, tests[i].palettized); IDirect3DRMTexture_Release(texture1); IDirect3DRMTexture3_Release(texture3); + ref2 = get_refcount((IUnknown *)d3drm1); + ok(ref1 == ref2, "Test %u: expected ref1 == ref2, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2); + + hr = IDirect3DRM3_CreateObject(d3drm3, &CLSID_CDirect3DRMTexture, NULL, &IID_IDirect3DRMTexture3, (void **)&texture3); + ok(SUCCEEDED(hr), "Test %u: Failed to create texture, hr %#x.\n", i, hr); + hr = IDirect3DRMTexture3_InitFromFile(texture3, NULL); + ok(hr == D3DRMERR_BADOBJECT, "Test %u: Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", i, hr); + hr = IDirect3DRMTexture3_InitFromFile(texture3, ""); + ok(hr == D3DRMERR_BADOBJECT, "Test %u: Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", i, hr); + hr = IDirect3DRMTexture3_InitFromFile(texture3, filename); + ok(SUCCEEDED(hr), "Test %u: Failed to initialize texture from file, hr %#x.\n", i, hr); + d3drm_img = IDirect3DRMTexture3_GetImage(texture3); + ok(!!d3drm_img, "Test %u: Failed to get image.\n", i); + test_bitmap_data(i * 7 + 6, d3drm_img, TRUE, tests[i].w, tests[i].h, tests[i].palettized); + IDirect3DRMTexture3_Release(texture3); ret = DeleteFileA(filename); ok(ret, "Test %u: Failed to delete bitmap \"%s\".\n", i, filename); diff --git a/dlls/d3drm/texture.c b/dlls/d3drm/texture.c index fd56e76ff9..4c81c788bf 100644 --- a/dlls/d3drm/texture.c +++ b/dlls/d3drm/texture.c @@ -2,6 +2,7 @@ * Implementation of IDirect3DRMTextureX interfaces * * Copyright 2012 Christian Costa + * Copyright 2016 Aaryaman Vasishta * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -67,6 +68,294 @@ static BOOL d3drm_validate_image(D3DRMIMAGE *image) return TRUE; } +static void CDECL destroy_image_callback(IDirect3DRMObject *obj, void *arg) +{ + D3DRMIMAGE *image = arg; + + TRACE("image %p texture object %p.\n", arg, obj); + + HeapFree(GetProcessHeap(), 0, image->buffer1); + HeapFree(GetProcessHeap(), 0, image); +} + +HRESULT d3drm_texture_load(struct d3drm_texture *texture, const char *path, BOOL load_upside_down, D3DRMIMAGE **image_out) +{ + BITMAPINFO *info; + BITMAPFILEHEADER *bmp_header; + unsigned char *buffer; + DWORD size; + HANDLE hfile, hmapping; + HRESULT hr = D3DRM_OK; + D3DRMPALETTEENTRY *colors = NULL; + D3DRMIMAGE *image = NULL; + BOOL black_used = FALSE, palette_used; + LONG w; + LONG h; + UINT i, j, k; + UINT idx, buffer1_idx; + unsigned char *buffer1; + UINT bpp; + UINT bpl; + UINT num_colors = 0; + struct colors_24bpp + { + BYTE red; + BYTE green; + BYTE blue; + } *color = NULL; + + /* Load the bitmap data */ + hfile = CreateFileA(path, GENERIC_READ, FILE_SHARE_READ, 0, OPEN_EXISTING, 0, 0); + if (hfile == INVALID_HANDLE_VALUE) + return D3DRMERR_BADOBJECT; + + size = GetFileSize(hfile, NULL); + if (size == INVALID_FILE_SIZE) + { + CloseHandle(hfile); + return D3DRMERR_BADVALUE; + } + if (!(hmapping = CreateFileMappingA(hfile, NULL, PAGE_READONLY, 0, 0, NULL))) + { + CloseHandle(hfile); + return D3DRMERR_BADVALUE; + } + if (!(buffer = MapViewOfFile(hmapping, FILE_MAP_READ, 0, 0, 0))) + { + CloseHandle(hmapping); + CloseHandle(hfile); + return D3DRMERR_BADVALUE; + } + + bmp_header = (BITMAPFILEHEADER *)buffer; + if (bmp_header->bfType != 0x4d42) /* BM */ + { + hr = D3DRMERR_BADFILE; + goto cleanup; + } + + info = (BITMAPINFO *)(bmp_header + 1); + /* Only allow version 1 DIB's (BITMAPINFOHEADER) to be loaded */ + if (info->bmiHeader.biSize != sizeof(info->bmiHeader)) + { + hr = D3DRMERR_BADFILE; + goto cleanup; + } + + bpp = info->bmiHeader.biBitCount == 24 ? 32 : info->bmiHeader.biBitCount; + w = info->bmiHeader.biWidth; + h = abs(info->bmiHeader.biHeight); + + if (bpp == 8) + { + buffer += sizeof(BITMAPINFOHEADER) + sizeof(BITMAPFILEHEADER) + 256 * sizeof(RGBQUAD); + palette_used = TRUE; + } + else if (bpp == 32) + { + buffer += sizeof(BITMAPINFOHEADER) + sizeof(BITMAPFILEHEADER); + palette_used = FALSE; + } + else + { + hr = D3DRMERR_BADFILE; + goto cleanup; + } + + /* Create and initialize the image struct. */ + color = (struct colors_24bpp *)buffer; + + if (palette_used) + bpl = w; + else if ((bpl = ((w + 3) & ~3)) > UINT_MAX / (bpp / 8)) + { + hr = D3DRMERR_BADALLOC; + goto cleanup; + } + + bpl = bpl * bpp / 8; + + if (bpl > UINT_MAX / h) + { + hr = D3DRMERR_BADALLOC; + goto cleanup; + } + + if (!(colors = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, 256 * sizeof(*colors)))) + { + WARN("Not enough memory to allocate palette, returning NULL.\n"); + hr = D3DRMERR_BADALLOC; + goto cleanup; + } + + if (!(image = HeapAlloc(GetProcessHeap(), 0, sizeof(*image)))) + { + WARN("Not enough memory to allocate image struct, returning NULL.\n"); + hr = D3DRMERR_BADALLOC; + goto cleanup; + } + image->buffer1 = NULL; + + if (!(image->buffer1 = HeapAlloc(GetProcessHeap(), 0, bpl * h))) + { + WARN("Not enough memory to allocate image buffer, returning NULL.\n"); + hr = D3DRMERR_BADALLOC; + goto cleanup; + } + + buffer1 = image->buffer1; + memset(buffer1, 0xff, bpl * h); + if (!palette_used) + { + for (i = 0; i < h; i++) + { + for (j = 0; j < w; j++) + { + buffer1_idx = ((w + 3) & ~3) * i + j; + idx = load_upside_down ? (h - 1 - i) * w + j : i * w + j; + for (k = 0; k < 256; k++) + { + if (color[idx].blue == colors[k].blue && + color[idx].green == colors[k].green && + color[idx].red == colors[k].red) + { + if (color[idx].blue == 0 && + color[idx].green == 0 && + color[idx].red == 0 && + !black_used) + { + black_used = TRUE; + colors[num_colors++].flags = D3DRMPALETTE_READONLY; + } + buffer1[buffer1_idx] = k; + + break; + } + } + if (k == 256) + { + if (num_colors == 256) + { + num_colors++; + i = h; + break; + } + buffer1[buffer1_idx] = num_colors; + colors[num_colors].red = color[idx].red; + colors[num_colors].green = color[idx].green; + colors[num_colors].blue = color[idx].blue; + colors[num_colors++].flags = D3DRMPALETTE_READONLY; + } + } + } + + if (num_colors <= 256) + { + if (!(image->palette = HeapAlloc(GetProcessHeap(), 0, num_colors * sizeof(*image->palette)))) + { + WARN("Not enough memory to allocate image palette, returning NULL.\n"); + hr = D3DRMERR_BADALLOC; + goto cleanup; + } + image->red_mask = 0xff; + image->green_mask = 0xff; + image->blue_mask = 0xff; + image->rgb = 0; + bpl = bpl / (bpp / 8); + memcpy(image->palette, colors, num_colors * sizeof(D3DRMPALETTEENTRY)); + image->palette_size = num_colors; + palette_used = TRUE; + } + else + { + bpl = w * 4; + image->rgb = 1; + image->palette = NULL; + image->palette_size = 0; + for (i = 0; i < h; ++i) + { + for (j = 0; j < w; ++j) + { + unsigned char *ptr = &buffer1[i * bpl + j * 4]; + idx = load_upside_down ? (h - 1 - i) * w * 3 + j * 3 : i * w * 3 + j * 3; + ptr[0] = buffer[idx]; + ptr[1] = buffer[idx + 1]; + ptr[2] = buffer[idx + 2]; + ptr[3] = 0xff; + } + } + + image->red_mask = 0xff0000; + image->green_mask = 0x00ff00; + image->blue_mask = 0x0000ff; + } + } + else + { + if (!(image->palette = HeapAlloc(GetProcessHeap(), 0, 256 * sizeof(*image->palette)))) + { + WARN("Not enough memory to allocate image palette, returning NULL.\n"); + hr = D3DRMERR_BADALLOC; + goto cleanup; + } + + memcpy(image->palette, info->bmiColors, 256 * sizeof(D3DRMPALETTEENTRY)); + for (i = 0; i < 256; i++) + { + image->palette[i].flags = D3DRMPALETTE_READONLY; + } + if (load_upside_down) + { + for (i = 0; i < h; i++) + { + for (j = 0; j < w; j++) + { + idx = (h - 1 - i) * bpl + j; + buffer1[i * bpl + j] = buffer[idx]; + } + } + } + else + { + memcpy(buffer1, buffer, bpl * h); + } + image->palette_size = 256; + image->red_mask = 0xff; + image->green_mask = 0xff; + image->blue_mask = 0xff; + image->rgb = 0; + } + image->width = w; + image->height = h; + image->aspectx = 1; + image->aspecty = 1; + image->alpha_mask = 0; + image->depth = palette_used ? 8 : bpp; + image->bytes_per_line = bpl; + image->buffer2 = NULL; + + /* Use an internal destroy callback to destroy image struct */ + hr = IDirect3DRMObject_AddDestroyCallback(&texture->IDirect3DRMTexture3_iface, destroy_image_callback, image); + + *image_out = image; + +cleanup: + UnmapViewOfFile(buffer); + CloseHandle(hmapping); + CloseHandle(hfile); + + HeapFree(GetProcessHeap(), 0, colors); + + if (FAILED(hr)) + { + if (image) + HeapFree(GetProcessHeap(), 0, image->buffer1); + HeapFree(GetProcessHeap(), 0, image); + } + + return hr; +} + static HRESULT WINAPI d3drm_texture1_QueryInterface(IDirect3DRMTexture *iface, REFIID riid, void **out) { struct d3drm_texture *texture = impl_from_IDirect3DRMTexture(iface); @@ -171,9 +460,18 @@ static HRESULT WINAPI d3drm_texture1_GetClassName(IDirect3DRMTexture *iface, DWO static HRESULT WINAPI d3drm_texture1_InitFromFile(IDirect3DRMTexture *iface, const char *filename) { - FIXME("iface %p, filename %s stub!\n", iface, debugstr_a(filename)); + struct d3drm_texture *texture = impl_from_IDirect3DRMTexture(iface); + D3DRMIMAGE *image; + HRESULT hr; - return E_NOTIMPL; + TRACE("iface %p, filename %s.\n", iface, debugstr_a(filename)); + + if (FAILED(hr = d3drm_texture_load(texture, filename, FALSE, &image))) + return hr; + + hr = IDirect3DRMTexture3_InitFromImage(&texture->IDirect3DRMTexture3_iface, image); + + return hr; } static HRESULT WINAPI d3drm_texture1_InitFromSurface(IDirect3DRMTexture *iface, @@ -473,9 +771,15 @@ static HRESULT WINAPI d3drm_texture2_GetClassName(IDirect3DRMTexture2 *iface, DW static HRESULT WINAPI d3drm_texture2_InitFromFile(IDirect3DRMTexture2 *iface, const char *filename) { - FIXME("iface %p, filename %s stub!\n", iface, debugstr_a(filename)); + struct d3drm_texture *object = impl_from_IDirect3DRMTexture2(iface); + HRESULT hr; - return E_NOTIMPL; + TRACE("iface %p, filename %s.\n", iface, debugstr_a(filename)); + + if (FAILED(hr = IDirect3DRMTexture3_InitFromFile(&object->IDirect3DRMTexture3_iface, filename))) + return hr; + + return D3DRM_OK; } static HRESULT WINAPI d3drm_texture2_InitFromSurface(IDirect3DRMTexture2 *iface, @@ -833,9 +1137,18 @@ static HRESULT WINAPI d3drm_texture3_GetClassName(IDirect3DRMTexture3 *iface, DW static HRESULT WINAPI d3drm_texture3_InitFromFile(IDirect3DRMTexture3 *iface, const char *filename) { - FIXME("iface %p, filename %s stub!\n", iface, debugstr_a(filename)); + struct d3drm_texture *texture = impl_from_IDirect3DRMTexture3(iface); + D3DRMIMAGE *image; + HRESULT hr; - return E_NOTIMPL; + TRACE("iface %p, filename %s.\n", iface, debugstr_a(filename)); + + if (FAILED(hr = d3drm_texture_load(texture, filename, TRUE, &image))) + return hr; + + hr = IDirect3DRMTexture3_InitFromImage(iface, image); + + return hr; } static HRESULT WINAPI d3drm_texture3_InitFromSurface(IDirect3DRMTexture3 *iface, -- 2.17.1

2 3

[PATCH 4/4] testbot: Detect the TestBot scripts usage errors in LogUtils.
by Francois Gouget 26 Aug '18

26 Aug '18

They indicate a TestBot error obviously. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/LogUtils.pm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index a9ab20b5f..17b9093aa 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -119,7 +119,11 @@ sub GetLogLineCategory($) { return "diag"; } - if ($Line =~ /^BotError:/ or + if (# TestBot script error messages + $Line =~ /^[a-zA-Z.]+:error: / or + # TestBot error + $Line =~ /^BotError:/ or + # X errors $Line =~ /^X Error of failed request: / or $Line =~ / opcode of failed request: /) { -- 2.18.0

1 0

[PATCH 3/4] testbot: Fix detection of new exceptions and too much data errors.
by Francois Gouget 26 Aug '18

26 Aug '18

The address of the crashing code changes with each patch and should thus be ignored. The exact amount of data printed does not change the error. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/LogUtils.pm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 19a39aaf5..a9ab20b5f 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -756,6 +756,12 @@ sub _GetLineKey($) # Remove the line number $Line =~ s/^([_a-z0-9]+\.c:)\d+:( Test (?:failed|succeeded inside todo block): )/$1$2/; + # Remove the crash code address: it changes whenever the test is recompiled + $Line =~ s/^(Unhandled exception: .* code) $0x[0-9a-fA-F]{8,16}$\.$/$1/; + + # The exact amount of data printed does not change the error + $Line =~ s/^([_.a-z0-9-]+:[_a-z0-9]* prints too much data )$[0-9]+ bytes$$/$1/; + # Note: Only the 'done (258)' lines are reported as errors and they are # modified by GetLogErrors() so that they no longer contain the pid. # So there is no need to remove the pid from the done lines. -- 2.18.0

1 0

[PATCH 2/4] testbot: Add a note regarding the detection of new errors.
by Francois Gouget 26 Aug '18

26 Aug '18

The detection of new errors may be based on a WineTest report which is not up-to-date. However this should not be a real issue in practice. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This is not a new issue. testbot/bin/WineSendLog.pl | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index f3b56d8c9..b0efa8c33 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -266,6 +266,12 @@ EOF # Build a job summary with only the new errors # + # Note that this may be a bit inaccurate right after a Wine commit if this + # job's patch got compiled on top of the new Wine before all the reference + # WineTest results were updated. This is made more likely by the job + # priorities: high for Wine updates, and low for WineTest runs. + # However in practice this would only be an issue if the patch reintroduced + # an error that just disappeared in the latest Wine which is highly unlikely. my @Messages; foreach my $Key (@SortedKeys) { -- 2.18.0

1 0

[PATCH 1/4] testbot/WineSendLog: Use LogUtils to identify (new) errors.
by Francois Gouget 26 Aug '18

26 Aug '18

Added LogUtils::GetNewLogErrors() to identify new errors in test reports and their associated extra errors files. Note that unlike WineSendLog.pl's old CompareLogs() function GetNewLogErrors() can deal with reports containing the errors for multiple modules, which is a requirement for running the tests on Wine. WineSendLog.pl now uses LogUtils instead of duplicating the code. Besides reaping the benefits from the improved GetNewLogErrors() this also improves error detection and ensures it is consistent with JobDetails.pl. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineSendLog.pl | 380 ++++++---------------------- testbot/lib/WineTestBot/LogUtils.pm | 106 +++++++- 2 files changed, 183 insertions(+), 303 deletions(-) diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index 2127eadb7..f3b56d8c9 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -78,129 +78,47 @@ sub Error(@) # -# Log analysis +# Reporting # -sub IsBotFailure($) +sub GetTitle($$) { - my ($ErrLine) = @_; + my ($StepTask, $LogName) = @_; - return ($ErrLine =~ m/Can't set VM status to running/ || - $ErrLine =~ m/Can't copy exe to VM/ || - $ErrLine =~ m/Can't copy log from VM/ || - $ErrLine =~ m/Can't copy generated executable from VM/); -} - -sub CheckErrLog($) -{ - my ($ErrLogFileName) = @_; - - my $BotFailure = !1; - my $Messages = ""; - if (open ERRFILE, "$ErrLogFileName") - { - my $Line; - while (defined($Line = <ERRFILE>)) - { - if (IsBotFailure($Line)) - { - if (! $Messages) - { - $BotFailure = 1; - } - } - else - { - $Messages .= $Line; - } - } - close ERRFILE; - } - - return ($BotFailure, $Messages); -} - -sub ReadLog($$$) -{ - my ($LogName, $BaseName, $TestSet) = @_; - - my @Messages; - if (open LOG, "<$LogName") - { - my $Line; - my $Found = !1; - while (! $Found && defined($Line = <LOG>)) - { - $Found = ($Line =~ m/${BaseName}:${TestSet} start/); - } - if ($Found) - { - $Found = !1; - while (! $Found && defined($Line = <LOG>)) - { - $Line =~ s/[\r\n]*$//; - if ($Line =~ m/${BaseName}:${TestSet}(?::[0-9a-f]+)? done/) - { - if ($Line =~ m/${BaseName}:${TestSet}(?::[0-9a-f]+)? done $258$/) - { - push @Messages, "The test timed out"; - } - $Found = 1; - } - else - { - push @Messages, $Line; - } - } - } - - close LOG; - } - else + my $Label = GetLogLabel($LogName); + if ($LogName !~ /\.report$/ and + ($StepTask->Type eq "build" or $StepTask->VM->Type eq "wine")) { - Error "Unable to open '$LogName' for reading: $!\n"; + $Label = "build log"; } - return \@Messages; + return $StepTask->VM->Name . " ($Label)"; } -sub GetLineKey($) +sub DumpLogAndErr($$) { - my ($Line) = @_; - - $Line =~ s/^([\w_.]+:)\d+(:.*)$/$1$2/; - - return $Line; -} - -sub CompareLogs($$$$) -{ - my ($SuiteLog, $TaskLog, $BaseName, $TestSet) = @_; - - my $Messages = ""; + my ($File, $Path) = @_; - my $SuiteMessages = ReadLog($SuiteLog, $BaseName, $TestSet); - my $TaskMessages = ReadLog($TaskLog, $BaseName, $TestSet); - - my $Diff = Algorithm::Diff->new($SuiteMessages, $TaskMessages, - { keyGen => \&GetLineKey }); - while ($Diff->Next()) + my $PrintSeparator; + foreach my $FileName ($Path, "$Path.err") { - if (! $Diff->Same()) + if (open(my $LogFile, "<", $FileName)) { - foreach my $Line ($Diff->Items(2)) + my $First = 1; + foreach my $Line (<$LogFile>) { - if ($Line =~ m/: Test failed: / || - $Line =~ m/: unhandled exception [0-9a-fA-F]{8} at / || - $Line =~ m/The test timed out/) + $Line =~ s/\s*$//; + if ($First and $PrintSeparator) { - $Messages .= "$Line\n"; + print $File "\n"; + $First = 0; } + print $File "$Line\n"; } + close($LogFile); + $PrintSeparator = 1; } } - - return $Messages; } sub SendLog($) @@ -279,110 +197,28 @@ EOF print $Sendmail "\nYou can also see the results at:\n$JobURL\n\n"; # Print the job summary - my @FailureKeys; + my ($JobErrors, $ReportCounts); foreach my $Key (@SortedKeys) { my $StepTask = $StepsTasks->GetItem($Key); my $TaskDir = $StepTask->GetTaskDir(); - print $Sendmail "\n=== ", $StepTask->GetTitle(), " ===\n"; - - my $LogFiles = GetLogFileNames($TaskDir); - my $LogName = $LogFiles->[0] || "log"; - if (open LOGFILE, "<$TaskDir/$LogName") + my $LogNames = GetLogFileNames($TaskDir); + $JobErrors->{$Key}->{LogNames} = $LogNames; + foreach my $LogName (@$LogNames) { - my $HasLogEntries = !1; - my $PrintedSomething = !1; - my $CurrentDll = ""; - my $PrintedDll = ""; - my $Line; - while (defined($Line = <LOGFILE>)) - { - $HasLogEntries = 1; - $Line =~ s/\s*$//; - if ($Line =~ m/^([^:]+):[^ ]+ start [^ ]+ -$/) - { - $CurrentDll = $1; - } - my $Category = $LogName =~ /\.report$/ ? - GetReportLineCategory($Line) : - GetLogLineCategory($Line); - if ($Category eq "error") - { - if ($PrintedDll ne $CurrentDll) - { - print $Sendmail "\n$CurrentDll:\n"; - $PrintedDll = $CurrentDll; - } - if ($Line =~ m/^[^:]+:([^ ]+)(?::[0-9a-f]+)? done $258$/) - { - print $Sendmail "$1: The test timed out\n"; - } - else - { - print $Sendmail "$Line\n"; - } - $PrintedSomething = 1; - } - } - close LOGFILE; + my ($Groups, $Errors) = GetLogErrors("$TaskDir/$LogName"); + next if (!$Groups or !@$Groups); + $JobErrors->{$Key}->{HasErrors} = 1; + $JobErrors->{$Key}->{$LogName}->{Groups} = $Groups; + $JobErrors->{$Key}->{$LogName}->{Errors} = $Errors; - if (open ERRFILE, "<$TaskDir/log.err") - { - my $First = 1; - while (defined($Line = <ERRFILE>)) - { - if ($First) - { - print $Sendmail "\n"; - $First = !1; - } - $HasLogEntries = 1; - $Line =~ s/\s*$//; - print $Sendmail "$Line\n"; - $PrintedSomething = 1; - } - close ERRFILE; - } + print $Sendmail "\n=== ", GetTitle($StepTask, $LogName), " ===\n"; - if (! $PrintedSomething) - { - if (! $HasLogEntries) - { - print $Sendmail "Empty test log and no error message\n"; - } - elsif ($StepTask->Type eq "build") - { - print $Sendmail "No build failures found\n"; - } - else - { - print $Sendmail "No test failures found\n"; - } - } - else + foreach my $GroupName (@$Groups) { - push @FailureKeys, $Key; - } - } - elsif (open ERRFILE, "<$TaskDir/log.err") - { - my $HasErrEntries = !1; - my $Line; - while (defined($Line = <ERRFILE>)) - { - $HasErrEntries = 1; - $Line =~ s/\s*$//; - print $Sendmail "$Line\n"; - } - close ERRFILE; - if (! $HasErrEntries) - { - print $Sendmail "No test log and no error message"; - } - else - { - push @FailureKeys, $Key; + print $Sendmail ($GroupName ? "\n$GroupName:\n" : "\n"); + print $Sendmail "$_\n" for (@{$Errors->{$GroupName}}); } } } @@ -393,46 +229,25 @@ EOF my $StepTask = $StepsTasks->GetItem($Key); my $TaskDir = $StepTask->GetTaskDir(); - print $Sendmail <<"EOF"; + foreach my $LogName (@{$JobErrors->{$Key}->{LogNames}}) + { + print $Sendmail <<"EOF"; --$PART_BOUNDARY Content-Type: text/plain; charset="UTF-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit EOF - print $Sendmail "Content-Disposition: attachment; filename=", - $StepTask->VM->Name, ".log\n\n"; - print $Sendmail "Not dumping logs in debug mode\n" if ($Debug); - - my $LogFiles = GetLogFileNames($TaskDir); - my $LogName = $LogFiles->[0] || "log"; - my $PrintSeparator = !1; - if (open LOGFILE, "<$TaskDir/$LogName") - { - my $Line; - while (defined($Line = <LOGFILE>)) + print $Sendmail "Content-Disposition: attachment; filename=", + $StepTask->VM->Name, "_$LogName\n\n"; + if ($Debug) { - $Line =~ s/\s*$//; - print $Sendmail "$Line\n" if (!$Debug); - $PrintSeparator = 1; + print $Sendmail "Not dumping logs in debug mode\n"; } - close LOGFILE; - } - - if (open ERRFILE, "<$TaskDir/log.err") - { - my $Line; - while (defined($Line = <ERRFILE>)) + else { - if ($PrintSeparator) - { - print $Sendmail "\n" if (!$Debug); - $PrintSeparator = !1; - } - $Line =~ s/\s*$//; - print $Sendmail "$Line\n" if (!$Debug); + DumpLogAndErr($Sendmail, "$TaskDir/$LogName"); } - close ERRFILE; } } @@ -446,75 +261,62 @@ EOF return; } + # # Build a job summary with only the new errors # - my $Messages = ""; - foreach my $Key (@FailureKeys) + my @Messages; + foreach my $Key (@SortedKeys) { + next if (!$JobErrors->{$Key}->{HasErrors}); my $StepTask = $StepsTasks->GetItem($Key); my $TaskDir = $StepTask->GetTaskDir(); - my ($BotFailure, $MessagesFromErr) = CheckErrLog("$TaskDir/log.err"); - if ($BotFailure) + if ($StepTask->Status eq "boterror") { - # TestBot errors are not the developer's fault and prevent us from doing - # any meaningful analysis. So skip. - Error "A TestBot error was found in $TaskDir/log.err\n"; + # TestBot errors are not the developer's fault and prevent us from + # identifying new errors. So skip. + Error "A Task error was found in '$TaskDir/log.err'\n"; next; } - my $MessagesFromLog = ""; - my $LogFiles = GetLogFileNames($TaskDir); - my $LogName = $LogFiles->[0] || "log"; - if ($LogName =~ /\.report$/) + foreach my $LogName (@{$JobErrors->{$Key}->{LogNames}}) { - my $LatestName = "$DataDir/latest/". $StepTask->VM->Name ."_$LogName"; - my ($LatestBotFailure, $Dummy) = CheckErrLog("$LatestName.err"); - if (! $LatestBotFailure) + my $LogErrors = $JobErrors->{$Key}->{$LogName}; + my $RefFileName = "$DataDir/latest". $StepTask->VM->Name ."_$LogName"; + my ($NewGroups, $NewErrors) = GetNewLogErrors($RefFileName, $LogErrors->{Groups}, $LogErrors->{Errors}); + if (!$NewGroups) { - if (defined($StepTask->CmdLineArg)) - { - # Filter out failures that happened in the full test suite: - # the test suite is run against code which is already in Wine - # so any failure it reported is not caused by this patch. - $StepTask->FileName =~ m/^(.*)_test/; - my $BaseName = $1; - $MessagesFromLog = CompareLogs($LatestName, "$TaskDir/$LogName", - $BaseName, $StepTask->CmdLineArg); - } + # There was no reference log (typical of build logs) + # so every error is new + $NewGroups = $LogErrors->{Groups}; + $NewErrors = $LogErrors->{Errors}; } - else + elsif (!@$NewGroups) { - Error "BotFailure found in $LatestName.err\n"; + # There is no new error + next; } - } - elsif (open(my $LogFile, "<", "$TaskDir/$LogName")) - { - foreach my $Line (<$LogFile>) + + push @Messages, "\n=== ". GetTitle($StepTask, $LogName) ." ===\n"; + + foreach my $GroupName (@$NewGroups) { - my $Category = $LogName =~ /\.report$/ ? - GetReportLineCategory($Line) : - GetLogLineCategory($Line); - $MessagesFromLog .= $Line if ($Category eq "error"); + push @Messages, ($GroupName ? "\n$GroupName:\n" : "\n"); + push @Messages, "$_\n" for (@{$NewErrors->{$GroupName}}); } - close($LogFile); - } - if ($MessagesFromErr || $MessagesFromLog) - { - $Messages .= "\n=== " . $StepTask->GetTitle() . " ===\n" . - $MessagesFromLog . $MessagesFromErr; } } + # # Send a summary of the new errors to the mailing list # Debug("\n-------------------- Mailing list email --------------------\n"); - if ($Messages) + if (@Messages) { if ($Debug) { @@ -548,7 +350,7 @@ Your paranoid android. EOF - print $Sendmail $Messages; + print $Sendmail $_ for (@Messages); close($Sendmail); } else @@ -556,6 +358,7 @@ EOF Debug("Found no error to report to the mailing list\n"); } + # # Create a .testbot file for the patches website # @@ -570,7 +373,7 @@ EOF { # Only take into account new errors to decide whether the job was # successful or not. - DebugTee($Result, "Status: ". ($Messages ? "Failed" : "OK") ."\n"); + DebugTee($Result, "Status: ". (@Messages ? "Failed" : "OK") ."\n"); DebugTee($Result, "Job-ID: ". $Job->Id ."\n"); DebugTee($Result, "URL: $JobURL\n"); @@ -579,37 +382,10 @@ EOF my $StepTask = $StepsTasks->GetItem($Key); my $TaskDir = $StepTask->GetTaskDir(); - print $Result "\n=== ", $StepTask->GetTitle(), " ===\n"; - - my $LogFiles = GetLogFileNames($TaskDir); - my $LogName = $LogFiles->[0] || "log"; - my $PrintSeparator = !1; - if (open(my $logfile, "<", "$TaskDir/$LogName")) - { - my $Line; - while (defined($Line = <$logfile>)) - { - $Line =~ s/\s*$//; - print $Result "$Line\n"; - $PrintSeparator = 1; - } - close($logfile); - } - - if (open(my $errfile, "<", "$TaskDir/log.err")) + foreach my $LogName (@{$JobErrors->{$Key}->{LogNames}}) { - my $Line; - while (defined($Line = <$errfile>)) - { - if ($PrintSeparator) - { - print $Result "\n"; - $PrintSeparator = !1; - } - $Line =~ s/\s*$//; - print $Result "$Line\n"; - } - close($errfile); + print $Result "=== ", GetTitle($StepTask, $LogName), " ===\n"; + DumpLogAndErr($Result, "$TaskDir/$LogName"); } } print $Result "--- END FULL_LOGS ---\n"; diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index a5a1a68b5..19a39aaf5 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -27,11 +27,12 @@ WineTestBot::LogUtils - Provides functions to parse task logs use Exporter 'import'; -our @EXPORT = qw(GetLogFileNames GetLogLabel GetLogErrors +our @EXPORT = qw(GetLogFileNames GetLogLabel GetLogErrors GetNewLogErrors GetLogLineCategory GetReportLineCategory RenameReferenceLogs RenameTaskLogs ParseTaskLog ParseWineTestReport); +use Algorithm::Diff; use File::Basename; use WineTestBot::Config; # For $MaxUnitSize @@ -697,6 +698,8 @@ sub GetLogErrors($) $Line =~ s/\s*$//; if (!$CurrentGroup) { + # Note: $GroupName must not depend on the previous content as this + # would break diffs. my $GroupName = $IsReport ? "Report errors" : "Task errors"; $CurrentGroup = _AddErrorGroup($Groups, $Errors, $GroupName); } @@ -714,4 +717,105 @@ sub GetLogErrors($) return $NoLog ? (undef, undef) : ($Groups, $Errors); } +sub _DumpDiff($$) +{ + my ($Label, $Diff) = @_; + + print STDERR "$Label:\n"; + $Diff = $Diff->Copy(); + while ($Diff->Next()) + { + if ($Diff->Same()) + { + print STDERR " $_\n" for ($Diff->Same()); + } + else + { + print STDERR "-$_\n" for ($Diff->Items(1)); + print STDERR "+$_\n" for ($Diff->Items(2)); + } + } +} + +=pod +=over 12 + +=item C<_GetLineKey()> + +This is a helper for GetNewLogErrors(). It reformats the log lines so they can +meaningfully be compared to the reference log even if line numbers change, etc. + +=back +=cut + +sub _GetLineKey($) +{ + my ($Line) = @_; + return undef if (!defined $Line); + + # Remove the line number + $Line =~ s/^([_a-z0-9]+\.c:)\d+:( Test (?:failed|succeeded inside todo block): )/$1$2/; + + # Note: Only the 'done (258)' lines are reported as errors and they are + # modified by GetLogErrors() so that they no longer contain the pid. + # So there is no need to remove the pid from the done lines. + + return $Line; +} + +=pod +=over 12 + +=item C<GetNewLogErrors()> + +Compares the specified errors to the reference log and returns only the ones +that are new. + +Returns a list of error groups containing new errors and a hashtable containing +the list of new errors for each group. + +=back +=cut + +sub GetNewLogErrors($$$) +{ + my ($RefFileName, $Groups, $Errors) = @_; + + my ($_Dummy, $RefErrors, $NoLog) = GetLogErrors($RefFileName); + return (undef, undef) if ($NoLog); + + my (@NewGroups, %NewErrors); + foreach my $GroupName (@$Groups) + { + if ($RefErrors->{$GroupName}) + { + my $Diff = Algorithm::Diff->new($RefErrors->{$GroupName}, + $Errors->{$GroupName}, + { keyGen => \&_GetLineKey }); + my $CurrentGroup; + while ($Diff->Next()) + { + # Skip if there are no new lines + next if ($Diff->Same() or !$Diff->Items(2)); + + if (!$CurrentGroup) + { + push @NewGroups, $GroupName; + $CurrentGroup = $NewErrors{$GroupName} = []; + } + push @$CurrentGroup, $Diff->Items(2); + } + } + else + { + # This module did not have errors before, so every error is new + push @NewGroups, $GroupName; + $NewErrors{$GroupName} = $Errors->{$GroupName}; + my $Last = @{$Errors->{$GroupName}} - 1; + } + } + + return (\@NewGroups, \%NewErrors); +} + 1; -- 2.18.0

1 0

[PATCH v2 1/2] comctl32/listview: Use bitmask to check if we can send notifications
by Fabian Maurer 25 Aug '18

25 Aug '18

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/comctl32/listview.c | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 200bf93be5..fa0d18e5d6 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -211,6 +211,8 @@ typedef struct tagDELAYED_ITEM_EDIT INT iItem; } DELAYED_ITEM_EDIT; +#define FLAG_NOTIFY_CHANGE (0x1) /* Whether we can send change notification messages */ + typedef struct tagLISTVIEW_INFO { /* control window */ @@ -225,7 +227,6 @@ typedef struct tagLISTVIEW_INFO /* notification window */ SHORT notifyFormat; HWND hwndNotify; - BOOL bDoChangeNotify; /* send change notification messages? */ UINT uCallbackMask; /* tooltips */ @@ -326,6 +327,7 @@ typedef struct tagLISTVIEW_INFO /* misc */ DWORD iVersion; /* CCM_[G,S]ETVERSION */ + DWORD notify_mask; } LISTVIEW_INFO; /* @@ -3507,13 +3509,13 @@ Parameters: */ static void LISTVIEW_ShiftFocus(LISTVIEW_INFO *infoPtr, INT focus, INT item, INT direction) { - BOOL old_change = infoPtr->bDoChangeNotify; + BOOL old_change = infoPtr->notify_mask & FLAG_NOTIFY_CHANGE; - infoPtr->bDoChangeNotify = FALSE; + infoPtr->notify_mask &= ~FLAG_NOTIFY_CHANGE; focus = shift_item(infoPtr, focus, item, direction); if (focus != infoPtr->nFocusedItem) LISTVIEW_SetItemFocus(infoPtr, focus); - infoPtr->bDoChangeNotify = old_change; + infoPtr->notify_mask |= old_change; } /** @@ -3565,8 +3567,8 @@ static BOOL LISTVIEW_AddGroupSelection(LISTVIEW_INFO *infoPtr, INT nItem) * only one LVN_ODSTATECHANGED notification. * See MSDN documentation for LVN_ITEMCHANGED. */ - bOldChange = infoPtr->bDoChangeNotify; - if (infoPtr->dwStyle & LVS_OWNERDATA) infoPtr->bDoChangeNotify = FALSE; + bOldChange = infoPtr->notify_mask & FLAG_NOTIFY_CHANGE; + if (infoPtr->dwStyle & LVS_OWNERDATA) infoPtr->notify_mask &= ~FLAG_NOTIFY_CHANGE; if (nFirst == -1) nFirst = nItem; @@ -3585,7 +3587,7 @@ static BOOL LISTVIEW_AddGroupSelection(LISTVIEW_INFO *infoPtr, INT nItem) notify_hdr(infoPtr, LVN_ODSTATECHANGED, (LPNMHDR)&nmlv); if (!IsWindow(hwndSelf)) return FALSE; - infoPtr->bDoChangeNotify = bOldChange; + infoPtr->notify_mask |= bOldChange; return TRUE; } @@ -3656,8 +3658,8 @@ static void LISTVIEW_SetGroupSelection(LISTVIEW_INFO *infoPtr, INT nItem) /* disable per item notifications on LVS_OWNERDATA style FIXME: single LVN_ODSTATECHANGED should be used */ - bOldChange = infoPtr->bDoChangeNotify; - if (infoPtr->dwStyle & LVS_OWNERDATA) infoPtr->bDoChangeNotify = FALSE; + bOldChange = infoPtr->notify_mask & FLAG_NOTIFY_CHANGE; + if (infoPtr->dwStyle & LVS_OWNERDATA) infoPtr->notify_mask &= ~FLAG_NOTIFY_CHANGE; LISTVIEW_DeselectAllSkipItems(infoPtr, selection); @@ -3668,7 +3670,7 @@ static void LISTVIEW_SetGroupSelection(LISTVIEW_INFO *infoPtr, INT nItem) /* this will also destroy the selection */ iterator_destroy(&i); - infoPtr->bDoChangeNotify = bOldChange; + infoPtr->notify_mask |= bOldChange; LISTVIEW_SetItemFocus(infoPtr, nItem); } @@ -4257,7 +4259,7 @@ static BOOL set_main_item(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem, BOOL and we are _NOT_ virtual (LVS_OWNERDATA), and change notifications are enabled. Even nothing really changed we still need to send this, in this case uChanged mask is just set to passed item mask. */ - if(lpItem && !isNew && infoPtr->bDoChangeNotify) + if(lpItem && !isNew && (infoPtr->notify_mask & FLAG_NOTIFY_CHANGE)) { HWND hwndSelf = infoPtr->hwndSelf; @@ -4350,7 +4352,7 @@ static BOOL set_main_item(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem, BOOL /* send LVN_ITEMCHANGED notification */ if (lpLVItem->mask & LVIF_PARAM) nmlv.lParam = lpLVItem->lParam; - if (infoPtr->bDoChangeNotify) notify_listview(infoPtr, LVN_ITEMCHANGED, &nmlv); + if (infoPtr->notify_mask & FLAG_NOTIFY_CHANGE) notify_listview(infoPtr, LVN_ITEMCHANGED, &nmlv); return TRUE; } @@ -8986,10 +8988,10 @@ static BOOL LISTVIEW_SetItemState(LISTVIEW_INFO *infoPtr, INT nItem, const LVITE /* focus all isn't allowed */ if (lvItem.state & lvItem.stateMask & LVIS_FOCUSED) return FALSE; - notify = infoPtr->bDoChangeNotify; + notify = infoPtr->notify_mask & FLAG_NOTIFY_CHANGE; if (infoPtr->dwStyle & LVS_OWNERDATA) { - infoPtr->bDoChangeNotify = FALSE; + infoPtr->notify_mask &= ~FLAG_NOTIFY_CHANGE; if (!(lvItem.state & LVIS_SELECTED) && LISTVIEW_GetSelectedCount(infoPtr)) oldstate |= LVIS_SELECTED; if (infoPtr->nFocusedItem != -1) oldstate |= LVIS_FOCUSED; @@ -9003,7 +9005,7 @@ static BOOL LISTVIEW_SetItemState(LISTVIEW_INFO *infoPtr, INT nItem, const LVITE { NMLISTVIEW nmlv; - infoPtr->bDoChangeNotify = notify; + infoPtr->notify_mask |= notify; nmlv.iItem = -1; nmlv.iSubItem = 0; @@ -9484,7 +9486,7 @@ static LRESULT LISTVIEW_NCCreate(HWND hwnd, WPARAM wParam, const CREATESTRUCTW * infoPtr->nHotItem = -1; infoPtr->redraw = TRUE; infoPtr->bNoItemMetrics = TRUE; - infoPtr->bDoChangeNotify = TRUE; + infoPtr->notify_mask = ~(0U); /* By default allow sending all notifications */ infoPtr->autoSpacing = TRUE; infoPtr->iconSpacing.cx = GetSystemMetrics(SM_CXICONSPACING) - GetSystemMetrics(SM_CXICON); infoPtr->iconSpacing.cy = GetSystemMetrics(SM_CYICONSPACING) - GetSystemMetrics(SM_CYICON); -- 2.18.0

1 1

[v3 PATCH 1/2] user32: When registering redirected class use correct base class name.
by Nikolay Sivov 25 Aug '18

25 Aug '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45689 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/user32/class.c | 31 +++++++++++++++++++++---------- dlls/user32/user_private.h | 2 +- dlls/user32/win.c | 2 +- 3 files changed, 23 insertions(+), 12 deletions(-) diff --git a/dlls/user32/class.c b/dlls/user32/class.c index 07d36f05d7..5383b6771f 100644 --- a/dlls/user32/class.c +++ b/dlls/user32/class.c @@ -320,7 +320,7 @@ static void CLASS_FreeClass( CLASS *classPtr ) USER_Unlock(); } -const WCHAR *CLASS_GetVersionedName( const WCHAR *name, UINT *basename_offset, BOOL register_class ) +const WCHAR *CLASS_GetVersionedName( const WCHAR *name, UINT *basename_offset, WCHAR *combined, BOOL register_class ) { ACTCTX_SECTION_KEYED_DATA data; struct wndclass_redirect_data @@ -335,9 +335,12 @@ const WCHAR *CLASS_GetVersionedName( const WCHAR *name, UINT *basename_offset, B const WCHAR *module, *ret; UNICODE_STRING name_us; HMODULE hmod; + UINT offset; - if (basename_offset) - *basename_offset = 0; + if (!basename_offset) + basename_offset = &offset; + + *basename_offset = 0; if (IS_INTRESOURCE( name )) return name; @@ -352,14 +355,21 @@ const WCHAR *CLASS_GetVersionedName( const WCHAR *name, UINT *basename_offset, B return name; wndclass = (struct wndclass_redirect_data *)data.lpData; - if (basename_offset) - *basename_offset = wndclass->name_len / sizeof(WCHAR) - strlenW(name); + *basename_offset = wndclass->name_len / sizeof(WCHAR) - strlenW(name); module = (const WCHAR *)((BYTE *)data.lpSectionBase + wndclass->module_offset); if (!(hmod = GetModuleHandleW( module ))) hmod = LoadLibraryW( module ); + /* Combined name is used to register versioned class name. Base name part will match exactly + original class name and won't be reused from context data. */ ret = (const WCHAR *)((BYTE *)wndclass + wndclass->name_offset); + if (combined) + { + memcpy(combined, ret, *basename_offset * sizeof(WCHAR)); + strcpyW(&combined[*basename_offset], name); + ret = combined; + } if (register_class && hmod) { @@ -409,7 +419,7 @@ static CLASS *CLASS_FindClass( LPCWSTR name, HINSTANCE hinstance ) if (!name) return NULL; - name = CLASS_GetVersionedName( name, NULL, TRUE ); + name = CLASS_GetVersionedName( name, NULL, NULL, TRUE ); for (;;) { @@ -662,8 +672,8 @@ ATOM WINAPI RegisterClassW( const WNDCLASSW* wc ) */ ATOM WINAPI RegisterClassExA( const WNDCLASSEXA* wc ) { + WCHAR name[MAX_ATOM_LEN + 1], combined[MAX_ATOM_LEN + 1]; const WCHAR *classname = NULL; - WCHAR name[MAX_ATOM_LEN + 1]; ATOM atom; CLASS *classPtr; HINSTANCE instance; @@ -682,7 +692,7 @@ ATOM WINAPI RegisterClassExA( const WNDCLASSEXA* wc ) { UINT basename_offset; if (!MultiByteToWideChar( CP_ACP, 0, wc->lpszClassName, -1, name, MAX_ATOM_LEN + 1 )) return 0; - classname = CLASS_GetVersionedName( name, &basename_offset, FALSE ); + classname = CLASS_GetVersionedName( name, &basename_offset, combined, FALSE ); classPtr = CLASS_RegisterClass( classname, basename_offset, instance, !(wc->style & CS_GLOBALCLASS), wc->style, wc->cbClsExtra, wc->cbWndExtra ); } @@ -720,6 +730,7 @@ ATOM WINAPI RegisterClassExA( const WNDCLASSEXA* wc ) */ ATOM WINAPI RegisterClassExW( const WNDCLASSEXW* wc ) { + WCHAR name[MAX_ATOM_LEN + 1]; const WCHAR *classname; UINT basename_offset; ATOM atom; @@ -736,7 +747,7 @@ ATOM WINAPI RegisterClassExW( const WNDCLASSEXW* wc ) } if (!(instance = wc->hInstance)) instance = GetModuleHandleW( NULL ); - classname = CLASS_GetVersionedName( wc->lpszClassName, &basename_offset, FALSE ); + classname = CLASS_GetVersionedName( wc->lpszClassName, &basename_offset, name, FALSE ); if (!(classPtr = CLASS_RegisterClass( classname, basename_offset, instance, !(wc->style & CS_GLOBALCLASS), wc->style, wc->cbClsExtra, wc->cbWndExtra ))) return 0; @@ -789,7 +800,7 @@ BOOL WINAPI UnregisterClassW( LPCWSTR className, HINSTANCE hInstance ) GetDesktopWindow(); /* create the desktop window to trigger builtin class registration */ - className = CLASS_GetVersionedName( className, NULL, FALSE ); + className = CLASS_GetVersionedName( className, NULL, NULL, FALSE ); SERVER_START_REQ( destroy_class ) { req->instance = wine_server_client_ptr( hInstance ); diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 73a2badc7d..0ee7dbeece 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -273,7 +273,7 @@ extern BOOL WINPROC_call_window( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPar LRESULT *result, BOOL unicode, enum wm_char_mapping mapping ) DECLSPEC_HIDDEN; extern const WCHAR *CLASS_GetVersionedName(const WCHAR *classname, UINT *basename_offset, - BOOL register_class) DECLSPEC_HIDDEN; + WCHAR *combined, BOOL register_class) DECLSPEC_HIDDEN; /* message spy definitions */ diff --git a/dlls/user32/win.c b/dlls/user32/win.c index c7a3b06c3a..7ba0b4c312 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -1344,7 +1344,7 @@ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, CBT_CREATEWNDW cbtc; CREATESTRUCTW cbcs; - className = CLASS_GetVersionedName(className, NULL, TRUE); + className = CLASS_GetVersionedName(className, NULL, NULL, TRUE); TRACE("%s %s%s%s ex=%08x style=%08x %d,%d %dx%d parent=%p menu=%p inst=%p params=%p\n", unicode ? debugstr_w(cs->lpszName) : debugstr_a((LPCSTR)cs->lpszName), -- 2.18.0

3 6

[PATCH] comctl32/listview: Don't send LVN_ENDLABELEDIT twice under some circumstances
by Fabian Maurer 25 Aug '18

25 Aug '18

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/comctl32/listview.c | 10 +++++++++ dlls/comctl32/tests/listview.c | 41 ++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 200bf93be55..0193c038ebb 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -326,6 +326,7 @@ typedef struct tagLISTVIEW_INFO /* misc */ DWORD iVersion; /* CCM_[G,S]ETVERSION */ + BOOL inEndEditLabel; /* To prevent sending LVN_ENDLABELEDIT during LVN_ENDLABELEDIT */ } LISTVIEW_INFO; /* @@ -5869,6 +5870,9 @@ static BOOL LISTVIEW_EndEditLabelT(LISTVIEW_INFO *infoPtr, BOOL storeText, BOOL WCHAR *pszText = NULL; BOOL res; + if (infoPtr->inEndEditLabel) + return FALSE; + if (storeText) { DWORD len = isW ? GetWindowTextLengthW(infoPtr->hwndEdit) : GetWindowTextLengthA(infoPtr->hwndEdit); @@ -5914,9 +5918,14 @@ static BOOL LISTVIEW_EndEditLabelT(LISTVIEW_INFO *infoPtr, BOOL storeText, BOOL dispInfo.item.pszText = same ? NULL : pszText; dispInfo.item.cchTextMax = textlenT(dispInfo.item.pszText, isW); + /* Sending LVN_ENDLABELEDITW might trigger EN_KILLFOCUS which would call this function again */ + infoPtr->inEndEditLabel = TRUE; + /* Do we need to update the Item Text */ res = notify_dispinfoT(infoPtr, LVN_ENDLABELEDITW, &dispInfo, isW); + infoPtr->inEndEditLabel = FALSE; + infoPtr->nEditLabelItem = -1; infoPtr->hwndEdit = 0; @@ -9497,6 +9506,7 @@ static LRESULT LISTVIEW_NCCreate(HWND hwnd, WPARAM wParam, const CREATESTRUCTW * infoPtr->itemEdit.fEnabled = FALSE; infoPtr->iVersion = COMCTL32_VERSION; infoPtr->colRectsDirty = FALSE; + infoPtr->inEndEditLabel = FALSE; /* get default font (icon title) */ SystemParametersInfoW(SPI_GETICONTITLELOGFONT, 0, &logFont, 0); diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index e9b715ee412..3e9e9697a4f 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -75,6 +75,10 @@ static BOOL g_disp_A_to_W; static NMLVDISPINFOA g_editbox_disp_info; /* when this is set focus will be tested on LVN_DELETEITEM */ static BOOL g_focus_test_LVN_DELETEITEM; +/* Whether to send WM_KILLFOCUS to the edit control during LVN_ENDLABELEDIT */ +static BOOL do_LVN_ENDLABELEDIT_killfocus = FALSE; +/* Number of LVN_ENDLABELEDIT notifications received */ +static BOOL LVN_ENDLABELEDITA_count = 0; static HWND subclass_editbox(HWND hwndListview); @@ -510,6 +514,11 @@ static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LP ok(IsWindow(edit), "expected valid edit control handle\n"); ok((GetWindowLongA(edit, GWL_STYLE) & ES_MULTILINE) == 0, "edit is multiline\n"); + LVN_ENDLABELEDITA_count++; + + if (do_LVN_ENDLABELEDIT_killfocus) + SendMessageA(edit, WM_KILLFOCUS, 0, 0); + return TRUE; } case LVN_BEGINSCROLL: @@ -6322,6 +6331,37 @@ static void test_LVSCW_AUTOSIZE(void) DestroyWindow(hwnd); } +static void test_LVN_ENDLABELEDITW(void) +{ + HWND hwnd, hwndedit; + LVITEMW item = {0}; + WCHAR text[] = {'l','a','l','a',0}; + DWORD ret; + + hwnd = create_listview_control(LVS_REPORT | LVS_EDITLABELS); + + insert_column(hwnd, 0); + + item.mask = LVIF_TEXT; + item.pszText = text; + ListView_InsertItemW(hwnd, &item); + + SetFocus(hwnd); + hwndedit = (HWND)SendMessageW(hwnd, LVM_EDITLABELW, 0, 0); + + ret = SendMessageA(hwndedit, WM_SETTEXT, 0, (LPARAM)"test"); + expect(TRUE, ret); + + LVN_ENDLABELEDITA_count = 0; + do_LVN_ENDLABELEDIT_killfocus = TRUE; + ret = SendMessageA(hwndedit, WM_KEYDOWN, VK_RETURN, 0); + do_LVN_ENDLABELEDIT_killfocus = FALSE; + ok(LVN_ENDLABELEDITA_count == 1, + "messagebox during LVN_ENDLABELEDIT gave wrong number of LVN_ENDLABELEDITA: %d\n", LVN_ENDLABELEDITA_count); + + DestroyWindow(hwnd); +} + START_TEST(listview) { ULONG_PTR ctx_cookie; @@ -6425,6 +6465,7 @@ START_TEST(listview) test_oneclickactivate(); test_state_image(); test_LVSCW_AUTOSIZE(); + test_LVN_ENDLABELEDITW(); unload_v6_module(ctx_cookie, hCtx); -- 2.18.0

2 4

URGENT REQUEST - WINEHQ PROBLEM
by Emanuele Caracci 25 Aug '18

25 Aug '18

Dear WineHQ developer, I write this because I installed your program to authenticate Logic Pro X by following this guide: https://www.youtube.com/watch?v=ufULIABO4qs&t=183s 1) Uninstalling WineHQ by removing it from the Applications section does not remove even the Codecs that have been installed. I would like to know how you can completely remove the application. 2) Following the program FAQ in the Unistall section (4.1 and 4.4) at the link: https://wiki.winehq.org/FAQ I inserted those codes on the terminal of my Mac and in this mode it has been removed all the files on the Mac! It's a nice mess because I lost all my documents! All the application data and all user files on the Mac have been erased. The Mac is also unable to shut down. Can they be recovered with inverse codes? I need help urgently! *I await your urgent reply as soon as possible.* Thank you, *Emanuele Caracci - www.emanuelecaracci.com <http://www.emanuelecaracci.com/> - +39/3461314467* [image: image.png] Le informazioni contenute in questo messaggio e negli eventuali allegati sono da considerarsi riservati ed il loro utilizzo è consentito unicamente al destinatario ed unicamente per le finalità sopra indicate. Qualora riceveste il presente messaggio per errore e non ne siate i destinatari, Vi preghiamo di darcene notizia via e-mail, di astenervi dal consultare eventuali files allegati, di cancellare il messaggio dal Vs. sistema informatico. Costituisce comportamento contrario ai principi dettati dal D.Lg. 196/2003 il trattenere il messaggio, diffonderne il contenuto, inviarlo ad altri soggetti, eseguirne copia in tutto od in parte, l’utilizzo da parte di soggetti diversi dal destinatario e per finalità diverse da quelle sopra indicate. — Notice: This message and any attachments may be of a confidential nature or may require protection for other reasons. Should you not be the intended recipient of this message or should you have received this message by mistake, you are not allowed to forward, copy or disseminate the content of the message in any form. Should you have received this message by mistake, please inform the sender and delete the message along with the enclosures.

3 2

[PATCH v2 1/3] ntoskrnl.exe/tests: Add basic tests for ZwLoadDriver()/ZwUnloadDriver().
by Zebediah Figura 25 Aug '18

25 Aug '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- v2: fix test failures on w8adm dlls/ntoskrnl.exe/tests/Makefile.in | 4 ++ dlls/ntoskrnl.exe/tests/driver.c | 44 ++++++++++++++ dlls/ntoskrnl.exe/tests/driver.h | 1 + dlls/ntoskrnl.exe/tests/{driver.h => driver2.c} | 37 +++++++----- dlls/ntoskrnl.exe/tests/driver2.spec | 1 + dlls/ntoskrnl.exe/tests/ntoskrnl.c | 77 ++++++++++++++++++------- 6 files changed, 129 insertions(+), 35 deletions(-) copy dlls/ntoskrnl.exe/tests/{driver.h => driver2.c} (55%) create mode 100644 dlls/ntoskrnl.exe/tests/driver2.spec diff --git a/dlls/ntoskrnl.exe/tests/Makefile.in b/dlls/ntoskrnl.exe/tests/Makefile.in index 6a427ca..fae11bb 100644 --- a/dlls/ntoskrnl.exe/tests/Makefile.in +++ b/dlls/ntoskrnl.exe/tests/Makefile.in @@ -3,8 +3,12 @@ IMPORTS = advapi32 driver_IMPORTS = winecrt0 ntoskrnl driver_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native +driver2_IMPORTS = winecrt0 ntoskrnl +driver2_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native SOURCES = \ driver.c \ driver.spec \ + driver2.c \ + driver2.spec \ ntoskrnl.c diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index cde78e5..d424396 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -187,6 +187,29 @@ static void test_init_funcs(void) ok(timer2.Header.SignalState == 0, "got: %u\n", timer2.Header.SignalState); } +static const WCHAR driver2_path[] = { + '\\','R','e','g','i','s','t','r','y', + '\\','M','a','c','h','i','n','e', + '\\','S','y','s','t','e','m', + '\\','C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t', + '\\','S','e','r','v','i','c','e','s', + '\\','W','i','n','e','T','e','s','t','D','r','i','v','e','r','2',0 +}; + +static void test_load_driver(void) +{ + UNICODE_STRING name; + NTSTATUS ret; + + RtlInitUnicodeString(&name, driver2_path); + + ret = ZwLoadDriver(&name); + ok(!ret, "got %#x\n", ret); + + ret = ZwUnloadDriver(&name); + ok(!ret, "got %#x\n", ret); +} + static NTSTATUS main_test(IRP *irp, IO_STACK_LOCATION *stack, ULONG_PTR *info) { ULONG length = stack->Parameters.DeviceIoControl.OutputBufferLength; @@ -213,6 +236,7 @@ static NTSTATUS main_test(IRP *irp, IO_STACK_LOCATION *stack, ULONG_PTR *info) test_currentprocess(); test_mdl_map(); test_init_funcs(); + test_load_driver(); /* print process report */ if (test_input->winetest_debug) @@ -245,6 +269,23 @@ static NTSTATUS test_basic_ioctl(IRP *irp, IO_STACK_LOCATION *stack, ULONG_PTR * return STATUS_SUCCESS; } +static NTSTATUS test_load_driver_ioctl(IRP *irp, IO_STACK_LOCATION *stack, ULONG_PTR *info) +{ + BOOL *load = irp->AssociatedIrp.SystemBuffer; + UNICODE_STRING name; + + if (!load) + return STATUS_ACCESS_VIOLATION; + + *info = 0; + + RtlInitUnicodeString(&name, driver2_path); + if (*load) + return ZwLoadDriver(&name); + else + return ZwUnloadDriver(&name); +} + static NTSTATUS WINAPI driver_Create(DEVICE_OBJECT *device, IRP *irp) { irp->IoStatus.Status = STATUS_SUCCESS; @@ -265,6 +306,9 @@ static NTSTATUS WINAPI driver_IoControl(DEVICE_OBJECT *device, IRP *irp) case IOCTL_WINETEST_MAIN_TEST: status = main_test(irp, stack, &irp->IoStatus.Information); break; + case IOCTL_WINETEST_LOAD_DRIVER: + status = test_load_driver_ioctl(irp, stack, &irp->IoStatus.Information); + break; default: break; } diff --git a/dlls/ntoskrnl.exe/tests/driver.h b/dlls/ntoskrnl.exe/tests/driver.h index b254d44..6a4179e 100644 --- a/dlls/ntoskrnl.exe/tests/driver.h +++ b/dlls/ntoskrnl.exe/tests/driver.h @@ -24,6 +24,7 @@ /* All custom IOCTLs need to have a function value >= 0x800. */ #define IOCTL_WINETEST_BASIC_IOCTL CTL_CODE(FILE_DEVICE_UNKNOWN, 0x800, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_WINETEST_MAIN_TEST CTL_CODE(FILE_DEVICE_UNKNOWN, 0x801, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_WINETEST_LOAD_DRIVER CTL_CODE(FILE_DEVICE_UNKNOWN, 0x802, METHOD_BUFFERED, FILE_ANY_ACCESS) static const char teststr[] = "Wine is not an emulator"; diff --git a/dlls/ntoskrnl.exe/tests/driver.h b/dlls/ntoskrnl.exe/tests/driver2.c similarity index 55% copy from dlls/ntoskrnl.exe/tests/driver.h copy to dlls/ntoskrnl.exe/tests/driver2.c index b254d44..c648ec6 100644 --- a/dlls/ntoskrnl.exe/tests/driver.h +++ b/dlls/ntoskrnl.exe/tests/driver2.c @@ -1,9 +1,7 @@ /* - * ntoskrnl.exe testing framework + * Second driver loaded by driver.c * - * Copyright 2015 Sebastian Lackner - * Copyright 2015 Michael Müller - * Copyright 2015 Christian Costa + * Copyright 2018 Zebediah Figura * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -20,17 +18,28 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <stdarg.h> -/* All custom IOCTLs need to have a function value >= 0x800. */ -#define IOCTL_WINETEST_BASIC_IOCTL CTL_CODE(FILE_DEVICE_UNKNOWN, 0x800, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_WINETEST_MAIN_TEST CTL_CODE(FILE_DEVICE_UNKNOWN, 0x801, METHOD_BUFFERED, FILE_ANY_ACCESS) +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winbase.h" +#include "winternl.h" +#include "winioctl.h" +#include "ddk/wdm.h" -static const char teststr[] = "Wine is not an emulator"; +#include "driver.h" -struct test_input +static void WINAPI driver_Unload(DRIVER_OBJECT *driver) { - int running_under_wine; - int winetest_report_success; - int winetest_debug; - WCHAR path[1]; -}; + DbgPrint("unloading driver2\n"); +} + +NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, UNICODE_STRING *registry) +{ + DbgPrint("loading driver2\n"); + + driver->DriverUnload = driver_Unload; + + return STATUS_SUCCESS; +} diff --git a/dlls/ntoskrnl.exe/tests/driver2.spec b/dlls/ntoskrnl.exe/tests/driver2.spec new file mode 100644 index 0000000..ad33444 --- /dev/null +++ b/dlls/ntoskrnl.exe/tests/driver2.spec @@ -0,0 +1 @@ +# nothing here yet diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 40de760..73f0e85 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -30,9 +30,6 @@ #include "driver.h" -static const char driver_name[] = "WineTestDriver"; -static const char device_path[] = "\\\\.\\WineTestDriver"; - static HANDLE device; static BOOL (WINAPI *pRtlDosPathNameToNtPathName_U)( LPCWSTR, PUNICODE_STRING, PWSTR*, CURDIR* ); @@ -80,11 +77,9 @@ static void unload_driver(SC_HANDLE service) CloseServiceHandle(service); } -static SC_HANDLE load_driver(char *filename) +static SC_HANDLE load_driver(char *filename, const char *resname, const char *driver_name) { SC_HANDLE manager, service; - SERVICE_STATUS status; - BOOL ret; manager = OpenSCManagerA(NULL, NULL, SC_MANAGER_ALL_ACCESS); if (!manager && GetLastError() == ERROR_ACCESS_DENIED) @@ -94,12 +89,11 @@ static SC_HANDLE load_driver(char *filename) } ok(!!manager, "OpenSCManager failed\n"); - /* before we start with the actual tests, make sure to terminate - * any old wine test drivers. */ + /* stop any old drivers running under this name */ service = OpenServiceA(manager, driver_name, SERVICE_ALL_ACCESS); if (service) unload_driver(service); - load_resource("driver.dll", filename); + load_resource(resname, filename); trace("Trying to load driver %s\n", filename); service = CreateServiceA(manager, driver_name, driver_name, @@ -107,7 +101,15 @@ static SC_HANDLE load_driver(char *filename) SERVICE_DEMAND_START, SERVICE_ERROR_NORMAL, filename, NULL, NULL, NULL, NULL, NULL); ok(!!service, "CreateService failed: %u\n", GetLastError()); + CloseServiceHandle(manager); + return service; +} + +static BOOL start_driver(HANDLE service) +{ + SERVICE_STATUS status; + BOOL ret; SetLastError(0xdeadbeef); ret = StartServiceA(service, 0, NULL); @@ -117,8 +119,7 @@ static SC_HANDLE load_driver(char *filename) skip("Failed to start service; probably your machine doesn't accept unsigned drivers.\n"); DeleteService(service); CloseServiceHandle(service); - DeleteFileA(filename); - return NULL; + return FALSE; } ok(ret, "StartService failed: %u\n", GetLastError()); @@ -134,10 +135,7 @@ static SC_HANDLE load_driver(char *filename) ok(status.dwCurrentState == SERVICE_RUNNING, "expected SERVICE_RUNNING, got %d\n", status.dwCurrentState); - device = CreateFileA(device_path, 0, 0, NULL, OPEN_EXISTING, 0, NULL); - ok(device != INVALID_HANDLE_VALUE, "failed to open device: %u\n", GetLastError()); - - return service; + return TRUE; } static void main_test(void) @@ -194,22 +192,59 @@ static void test_basic_ioctl(void) ok(!strcmp(buf, teststr), "got '%s'\n", buf); } +static void test_load_driver(SC_HANDLE service) +{ + SERVICE_STATUS status; + BOOL load, res; + DWORD sz; + + res = QueryServiceStatus(service, &status); + ok(res, "QueryServiceStatusEx failed: %u\n", GetLastError()); + ok(status.dwCurrentState == SERVICE_STOPPED, "got state %#x\n", status.dwCurrentState); + + load = TRUE; + res = DeviceIoControl(device, IOCTL_WINETEST_LOAD_DRIVER, &load, sizeof(load), NULL, 0, &sz, NULL); + ok(res, "DeviceIoControl failed: %u\n", GetLastError()); + + res = QueryServiceStatus(service, &status); + ok(res, "QueryServiceStatusEx failed: %u\n", GetLastError()); + ok(status.dwCurrentState == SERVICE_RUNNING, "got state %#x\n", status.dwCurrentState); + + load = FALSE; + res = DeviceIoControl(device, IOCTL_WINETEST_LOAD_DRIVER, &load, sizeof(load), NULL, 0, &sz, NULL); + ok(res, "DeviceIoControl failed: %u\n", GetLastError()); + + res = QueryServiceStatus(service, &status); + ok(res, "QueryServiceStatusEx failed: %u\n", GetLastError()); + ok(status.dwCurrentState == SERVICE_STOPPED, "got state %#x\n", status.dwCurrentState); +} + START_TEST(ntoskrnl) { - char filename[MAX_PATH]; - SC_HANDLE service; - BOOL ret; + char filename[MAX_PATH], filename2[MAX_PATH]; + SC_HANDLE service, service2; HMODULE hntdll = GetModuleHandleA("ntdll.dll"); pRtlDosPathNameToNtPathName_U = (void *)GetProcAddress(hntdll, "RtlDosPathNameToNtPathName_U"); - if (!(service = load_driver(filename))) + if (!(service = load_driver(filename, "driver.dll", "WineTestDriver"))) return; + if (!start_driver(service)) + { + DeleteFileA(filename); + return; + } + service2 = load_driver(filename2, "driver2.dll", "WineTestDriver2"); + + device = CreateFileA("\\\\.\\WineTestDriver", 0, 0, NULL, OPEN_EXISTING, 0, NULL); + ok(device != INVALID_HANDLE_VALUE, "failed to open device: %u\n", GetLastError()); test_basic_ioctl(); main_test(); + test_load_driver(service2); + unload_driver(service2); unload_driver(service); - ret = DeleteFileA(filename); - ok(ret, "DeleteFile failed: %u\n", GetLastError()); + ok(DeleteFileA(filename), "DeleteFile failed: %u\n", GetLastError()); + ok(DeleteFileA(filename2), "DeleteFile failed: %u\n", GetLastError()); } -- 2.7.4

1 0

[PATCH 1/3] ntoskrnl.exe/tests: Add basic tests for ZwLoadDriver()/ZwUnloadDriver().
by Zebediah Figura 25 Aug '18

25 Aug '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntoskrnl.exe/tests/Makefile.in | 4 ++ dlls/ntoskrnl.exe/tests/driver.c | 44 ++++++++++++++ dlls/ntoskrnl.exe/tests/driver.h | 1 + dlls/ntoskrnl.exe/tests/{driver.h => driver2.c} | 37 +++++++----- dlls/ntoskrnl.exe/tests/driver2.spec | 1 + dlls/ntoskrnl.exe/tests/ntoskrnl.c | 76 ++++++++++++++++++------- 6 files changed, 128 insertions(+), 35 deletions(-) copy dlls/ntoskrnl.exe/tests/{driver.h => driver2.c} (55%) create mode 100644 dlls/ntoskrnl.exe/tests/driver2.spec diff --git a/dlls/ntoskrnl.exe/tests/Makefile.in b/dlls/ntoskrnl.exe/tests/Makefile.in index 6a427ca..fae11bb 100644 --- a/dlls/ntoskrnl.exe/tests/Makefile.in +++ b/dlls/ntoskrnl.exe/tests/Makefile.in @@ -3,8 +3,12 @@ IMPORTS = advapi32 driver_IMPORTS = winecrt0 ntoskrnl driver_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native +driver2_IMPORTS = winecrt0 ntoskrnl +driver2_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native SOURCES = \ driver.c \ driver.spec \ + driver2.c \ + driver2.spec \ ntoskrnl.c diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index cde78e5..d424396 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -187,6 +187,29 @@ static void test_init_funcs(void) ok(timer2.Header.SignalState == 0, "got: %u\n", timer2.Header.SignalState); } +static const WCHAR driver2_path[] = { + '\\','R','e','g','i','s','t','r','y', + '\\','M','a','c','h','i','n','e', + '\\','S','y','s','t','e','m', + '\\','C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t', + '\\','S','e','r','v','i','c','e','s', + '\\','W','i','n','e','T','e','s','t','D','r','i','v','e','r','2',0 +}; + +static void test_load_driver(void) +{ + UNICODE_STRING name; + NTSTATUS ret; + + RtlInitUnicodeString(&name, driver2_path); + + ret = ZwLoadDriver(&name); + ok(!ret, "got %#x\n", ret); + + ret = ZwUnloadDriver(&name); + ok(!ret, "got %#x\n", ret); +} + static NTSTATUS main_test(IRP *irp, IO_STACK_LOCATION *stack, ULONG_PTR *info) { ULONG length = stack->Parameters.DeviceIoControl.OutputBufferLength; @@ -213,6 +236,7 @@ static NTSTATUS main_test(IRP *irp, IO_STACK_LOCATION *stack, ULONG_PTR *info) test_currentprocess(); test_mdl_map(); test_init_funcs(); + test_load_driver(); /* print process report */ if (test_input->winetest_debug) @@ -245,6 +269,23 @@ static NTSTATUS test_basic_ioctl(IRP *irp, IO_STACK_LOCATION *stack, ULONG_PTR * return STATUS_SUCCESS; } +static NTSTATUS test_load_driver_ioctl(IRP *irp, IO_STACK_LOCATION *stack, ULONG_PTR *info) +{ + BOOL *load = irp->AssociatedIrp.SystemBuffer; + UNICODE_STRING name; + + if (!load) + return STATUS_ACCESS_VIOLATION; + + *info = 0; + + RtlInitUnicodeString(&name, driver2_path); + if (*load) + return ZwLoadDriver(&name); + else + return ZwUnloadDriver(&name); +} + static NTSTATUS WINAPI driver_Create(DEVICE_OBJECT *device, IRP *irp) { irp->IoStatus.Status = STATUS_SUCCESS; @@ -265,6 +306,9 @@ static NTSTATUS WINAPI driver_IoControl(DEVICE_OBJECT *device, IRP *irp) case IOCTL_WINETEST_MAIN_TEST: status = main_test(irp, stack, &irp->IoStatus.Information); break; + case IOCTL_WINETEST_LOAD_DRIVER: + status = test_load_driver_ioctl(irp, stack, &irp->IoStatus.Information); + break; default: break; } diff --git a/dlls/ntoskrnl.exe/tests/driver.h b/dlls/ntoskrnl.exe/tests/driver.h index b254d44..6a4179e 100644 --- a/dlls/ntoskrnl.exe/tests/driver.h +++ b/dlls/ntoskrnl.exe/tests/driver.h @@ -24,6 +24,7 @@ /* All custom IOCTLs need to have a function value >= 0x800. */ #define IOCTL_WINETEST_BASIC_IOCTL CTL_CODE(FILE_DEVICE_UNKNOWN, 0x800, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_WINETEST_MAIN_TEST CTL_CODE(FILE_DEVICE_UNKNOWN, 0x801, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_WINETEST_LOAD_DRIVER CTL_CODE(FILE_DEVICE_UNKNOWN, 0x802, METHOD_BUFFERED, FILE_ANY_ACCESS) static const char teststr[] = "Wine is not an emulator"; diff --git a/dlls/ntoskrnl.exe/tests/driver.h b/dlls/ntoskrnl.exe/tests/driver2.c similarity index 55% copy from dlls/ntoskrnl.exe/tests/driver.h copy to dlls/ntoskrnl.exe/tests/driver2.c index b254d44..c648ec6 100644 --- a/dlls/ntoskrnl.exe/tests/driver.h +++ b/dlls/ntoskrnl.exe/tests/driver2.c @@ -1,9 +1,7 @@ /* - * ntoskrnl.exe testing framework + * Second driver loaded by driver.c * - * Copyright 2015 Sebastian Lackner - * Copyright 2015 Michael Müller - * Copyright 2015 Christian Costa + * Copyright 2018 Zebediah Figura * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -20,17 +18,28 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <stdarg.h> -/* All custom IOCTLs need to have a function value >= 0x800. */ -#define IOCTL_WINETEST_BASIC_IOCTL CTL_CODE(FILE_DEVICE_UNKNOWN, 0x800, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_WINETEST_MAIN_TEST CTL_CODE(FILE_DEVICE_UNKNOWN, 0x801, METHOD_BUFFERED, FILE_ANY_ACCESS) +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winbase.h" +#include "winternl.h" +#include "winioctl.h" +#include "ddk/wdm.h" -static const char teststr[] = "Wine is not an emulator"; +#include "driver.h" -struct test_input +static void WINAPI driver_Unload(DRIVER_OBJECT *driver) { - int running_under_wine; - int winetest_report_success; - int winetest_debug; - WCHAR path[1]; -}; + DbgPrint("unloading driver2\n"); +} + +NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, UNICODE_STRING *registry) +{ + DbgPrint("loading driver2\n"); + + driver->DriverUnload = driver_Unload; + + return STATUS_SUCCESS; +} diff --git a/dlls/ntoskrnl.exe/tests/driver2.spec b/dlls/ntoskrnl.exe/tests/driver2.spec new file mode 100644 index 0000000..ad33444 --- /dev/null +++ b/dlls/ntoskrnl.exe/tests/driver2.spec @@ -0,0 +1 @@ +# nothing here yet diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 40de760..febf4c6 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -30,9 +30,6 @@ #include "driver.h" -static const char driver_name[] = "WineTestDriver"; -static const char device_path[] = "\\\\.\\WineTestDriver"; - static HANDLE device; static BOOL (WINAPI *pRtlDosPathNameToNtPathName_U)( LPCWSTR, PUNICODE_STRING, PWSTR*, CURDIR* ); @@ -80,11 +77,9 @@ static void unload_driver(SC_HANDLE service) CloseServiceHandle(service); } -static SC_HANDLE load_driver(char *filename) +static SC_HANDLE load_driver(char *filename, const char *resname, const char *driver_name) { SC_HANDLE manager, service; - SERVICE_STATUS status; - BOOL ret; manager = OpenSCManagerA(NULL, NULL, SC_MANAGER_ALL_ACCESS); if (!manager && GetLastError() == ERROR_ACCESS_DENIED) @@ -94,12 +89,11 @@ static SC_HANDLE load_driver(char *filename) } ok(!!manager, "OpenSCManager failed\n"); - /* before we start with the actual tests, make sure to terminate - * any old wine test drivers. */ + /* stop any old drivers running under this name */ service = OpenServiceA(manager, driver_name, SERVICE_ALL_ACCESS); if (service) unload_driver(service); - load_resource("driver.dll", filename); + load_resource(resname, filename); trace("Trying to load driver %s\n", filename); service = CreateServiceA(manager, driver_name, driver_name, @@ -107,7 +101,15 @@ static SC_HANDLE load_driver(char *filename) SERVICE_DEMAND_START, SERVICE_ERROR_NORMAL, filename, NULL, NULL, NULL, NULL, NULL); ok(!!service, "CreateService failed: %u\n", GetLastError()); + CloseServiceHandle(manager); + return service; +} + +static BOOL start_driver(HANDLE service) +{ + SERVICE_STATUS status; + BOOL ret; SetLastError(0xdeadbeef); ret = StartServiceA(service, 0, NULL); @@ -117,8 +119,7 @@ static SC_HANDLE load_driver(char *filename) skip("Failed to start service; probably your machine doesn't accept unsigned drivers.\n"); DeleteService(service); CloseServiceHandle(service); - DeleteFileA(filename); - return NULL; + return FALSE; } ok(ret, "StartService failed: %u\n", GetLastError()); @@ -134,10 +135,7 @@ static SC_HANDLE load_driver(char *filename) ok(status.dwCurrentState == SERVICE_RUNNING, "expected SERVICE_RUNNING, got %d\n", status.dwCurrentState); - device = CreateFileA(device_path, 0, 0, NULL, OPEN_EXISTING, 0, NULL); - ok(device != INVALID_HANDLE_VALUE, "failed to open device: %u\n", GetLastError()); - - return service; + return TRUE; } static void main_test(void) @@ -194,22 +192,58 @@ static void test_basic_ioctl(void) ok(!strcmp(buf, teststr), "got '%s'\n", buf); } +static void test_load_driver(SC_HANDLE service) +{ + SERVICE_STATUS status; + BOOL load, res; + DWORD sz; + + res = QueryServiceStatus(service, &status); + ok(res, "QueryServiceStatusEx failed: %u\n", GetLastError()); + ok(status.dwCurrentState == SERVICE_STOPPED, "got state %#x\n", status.dwCurrentState); + + load = TRUE; + res = DeviceIoControl(device, IOCTL_WINETEST_LOAD_DRIVER, &load, sizeof(load), NULL, 0, &sz, NULL); + ok(res, "DeviceIoControl failed: %u\n", GetLastError()); + + res = QueryServiceStatus(service, &status); + ok(res, "QueryServiceStatusEx failed: %u\n", GetLastError()); + ok(status.dwCurrentState == SERVICE_RUNNING, "got state %#x\n", status.dwCurrentState); + + load = FALSE; + res = DeviceIoControl(device, IOCTL_WINETEST_LOAD_DRIVER, &load, sizeof(load), NULL, 0, &sz, NULL); + ok(res, "DeviceIoControl failed: %u\n", GetLastError()); + + res = QueryServiceStatus(service, &status); + ok(res, "QueryServiceStatusEx failed: %u\n", GetLastError()); + ok(status.dwCurrentState == SERVICE_STOPPED, "got state %#x\n", status.dwCurrentState); +} + START_TEST(ntoskrnl) { - char filename[MAX_PATH]; - SC_HANDLE service; - BOOL ret; + char filename[MAX_PATH], filename2[MAX_PATH]; + SC_HANDLE service, service2; HMODULE hntdll = GetModuleHandleA("ntdll.dll"); pRtlDosPathNameToNtPathName_U = (void *)GetProcAddress(hntdll, "RtlDosPathNameToNtPathName_U"); - if (!(service = load_driver(filename))) + service = load_driver(filename, "driver.dll", "WineTestDriver"); + if (!start_driver(service)) + { + DeleteFileA(filename); return; + } + service2 = load_driver(filename2, "driver2.dll", "WineTestDriver2"); + + device = CreateFileA("\\\\.\\WineTestDriver", 0, 0, NULL, OPEN_EXISTING, 0, NULL); + ok(device != INVALID_HANDLE_VALUE, "failed to open device: %u\n", GetLastError()); test_basic_ioctl(); main_test(); + test_load_driver(service2); + unload_driver(service2); unload_driver(service); - ret = DeleteFileA(filename); - ok(ret, "DeleteFile failed: %u\n", GetLastError()); + ok(DeleteFileA(filename), "DeleteFile failed: %u\n", GetLastError()); + ok(DeleteFileA(filename2), "DeleteFile failed: %u\n", GetLastError()); } -- 2.7.4

2 3

[PATCH] libs/port/mbtowc: Convert 1 character at a time if dst overlaps into src
by Gabriel Ivăncescu 24 Aug '18

24 Aug '18

Some applications partially overlap the two buffers. For such rare corner cases, do a single check so that there will be no performance regressions, as unsigned operations are defined to wrap around. Bug discovered by Jason Edmeades, revised from bug report. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=38558 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- libs/port/mbtowc.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/libs/port/mbtowc.c b/libs/port/mbtowc.c index 4977c82..6ed2c2e 100644 --- a/libs/port/mbtowc.c +++ b/libs/port/mbtowc.c @@ -65,6 +65,17 @@ static inline int mbstowcs_sbcs( const struct sbcs_table *table, int flags, ret = -1; } + /* dst can overlap into src, in which case we need to handle 1 char at a time, + but when src < dst, there is no issue no matter how many we handle at once */ + if ((UINT_PTR) ((UINT_PTR)src - (UINT_PTR)dst) < srclen * sizeof(*dst)) + { + do + *dst++ = cp2uni[*src++]; + while (--srclen); + return ret; + } + + /* dst doesn't overlap into src */ for (;;) { switch(srclen) -- 1.9.1

1 0

[PATCH v3 1/2] iphlpapi: Implement GetUdp6Table().
by Guillaume Charifi 24 Aug '18

24 Aug '18

Signed-off-by: Guillaume Charifi <guillaume.charifi(a)sfr.fr> --- dlls/iphlpapi/iphlpapi.spec | 2 +- dlls/iphlpapi/iphlpapi_main.c | 30 ++++- dlls/iphlpapi/ipstats.c | 241 ++++++++++++++++++++++++++++++++++ dlls/iphlpapi/ipstats.h | 1 + include/iphlpapi.h | 2 + include/udpmib.h | 53 ++++++++ 6 files changed, 322 insertions(+), 7 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi.spec b/dlls/iphlpapi/iphlpapi.spec index 1686644de0..fd00cc093a 100644 --- a/dlls/iphlpapi/iphlpapi.spec +++ b/dlls/iphlpapi/iphlpapi.spec @@ -141,7 +141,7 @@ @ stdcall GetTcpTable2( ptr ptr long ) @ stub GetTcpTableFromStack #@ stub GetTeredoPort -#@ stub GetUdp6Table +@ stdcall GetUdp6Table( ptr ptr long ) @ stdcall GetUdpStatisticsEx( ptr long ) @ stdcall GetUdpStatistics( ptr ) @ stub GetUdpStatsFromStack diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 7de70c9ef4..c7140cd974 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -2442,6 +2442,14 @@ DWORD WINAPI GetUdpTable(PMIB_UDPTABLE pUdpTable, PDWORD pdwSize, BOOL bOrder) return GetExtendedUdpTable(pUdpTable, pdwSize, bOrder, WS_AF_INET, UDP_TABLE_BASIC, 0); } +/****************************************************************** + * GetUdp6Table (IPHLPAPI.@) + */ +DWORD WINAPI GetUdp6Table(PMIB_UDP6TABLE pUdpTable, PDWORD pdwSize, BOOL bOrder) +{ + return GetExtendedUdpTable(pUdpTable, pdwSize, bOrder, WS_AF_INET6, UDP_TABLE_BASIC, 0); +} + /****************************************************************** * GetExtendedUdpTable (IPHLPAPI.@) */ @@ -2456,15 +2464,25 @@ DWORD WINAPI GetExtendedUdpTable(PVOID pUdpTable, PDWORD pdwSize, BOOL bOrder, if (!pdwSize) return ERROR_INVALID_PARAMETER; - if (ulAf != WS_AF_INET) - { - FIXME("ulAf = %u not supported\n", ulAf); - return ERROR_NOT_SUPPORTED; - } if (TableClass == UDP_TABLE_OWNER_MODULE) FIXME("UDP_TABLE_OWNER_MODULE not fully supported\n"); - if ((ret = build_udp_table(TableClass, &table, bOrder, GetProcessHeap(), 0, &size))) + switch (ulAf) + { + case WS_AF_INET: + ret = build_udp_table(TableClass, &table, bOrder, GetProcessHeap(), 0, &size); + break; + + case WS_AF_INET6: + ret = build_udp6_table(TableClass, &table, bOrder, GetProcessHeap(), 0, &size); + break; + + default: + FIXME("ulAf = %u not supported\n", ulAf); + ret = ERROR_NOT_SUPPORTED; + } + + if (ret) return ret; if (!pUdpTable || *pdwSize < size) diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index 799d03d574..08d1fa428b 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -2565,6 +2565,247 @@ DWORD build_udp_table( UDP_TABLE_CLASS class, void **tablep, BOOL order, HANDLE return ret; } +static DWORD get_udp6_table_sizes( UDP_TABLE_CLASS class, DWORD row_count, DWORD *row_size ) +{ + DWORD table_size; + + switch (class) + { + case UDP_TABLE_BASIC: + { + table_size = FIELD_OFFSET(MIB_UDP6TABLE, table[row_count]); + if (row_size) *row_size = sizeof(MIB_UDP6ROW); + break; + } + case UDP_TABLE_OWNER_PID: + { + table_size = FIELD_OFFSET(MIB_UDP6TABLE_OWNER_PID, table[row_count]); + if (row_size) *row_size = sizeof(MIB_UDP6ROW_OWNER_PID); + break; + } + case UDP_TABLE_OWNER_MODULE: + { + table_size = FIELD_OFFSET(MIB_UDP6TABLE_OWNER_MODULE, table[row_count]); + if (row_size) *row_size = sizeof(MIB_UDP6ROW_OWNER_MODULE); + break; + } + default: + ERR("unhandled class %u\n", class); + return 0; + } + return table_size; +} + +static MIB_UDP6TABLE *append_udp6_row( UDP_TABLE_CLASS class, HANDLE heap, DWORD flags, + MIB_UDP6TABLE *table, DWORD *count, + const MIB_UDP6ROW_OWNER_MODULE *row, DWORD row_size ) +{ + if (table->dwNumEntries >= *count) + { + MIB_UDP6TABLE *new_table; + DWORD new_count = table->dwNumEntries * 2, new_table_size; + + new_table_size = get_udp6_table_sizes( class, new_count, NULL ); + if (!(new_table = HeapReAlloc( heap, flags, table, new_table_size ))) + { + HeapFree( heap, 0, table ); + return NULL; + } + *count = new_count; + table = new_table; + } + memcpy( (char *)table->table + (table->dwNumEntries * row_size), row, row_size ); + table->dwNumEntries++; + return table; +} + +static int compare_udp6_rows(const void *a, const void *b) +{ + const MIB_UDP6ROW *rowA = a; + const MIB_UDP6ROW *rowB = b; + int ret; + + if ((ret = memcmp(&rowA->dwLocalAddr, &rowB->dwLocalAddr, sizeof(rowA->dwLocalAddr)) != 0)) return ret; + if ((ret = rowA->dwLocalScopeId - rowB->dwLocalScopeId) != 0) return ret; + return rowA->dwLocalPort - rowB->dwLocalPort; +} + +struct ipv6_addr_scope +{ + IN6_ADDR addr; + DWORD scope; +}; + +static struct ipv6_addr_scope *get_ipv6_addr_scope_table(unsigned int *size) +{ + struct ipv6_addr_scope *table = NULL; + unsigned int table_size = 0; + + if (!(table = HeapAlloc( GetProcessHeap(), 0, sizeof(table[0]) ))) + return NULL; + +#ifdef __linux__ + { + FILE *fp; + char buf[512], *ptr; + + if (!(fp = fopen( "/proc/net/if_inet6", "r" ))) + goto failed; + + while ((ptr = fgets( buf, sizeof(buf), fp ))) + { + WORD a[8]; + DWORD scope; + struct ipv6_addr_scope *new_table; + struct ipv6_addr_scope *entry; + unsigned int i; + + if (sscanf( ptr, "%4hx%4hx%4hx%4hx%4hx%4hx%4hx%4hx %*s %*s %x", + &a[0], &a[1], &a[2], &a[3], &a[4], &a[5], &a[6], &a[7], &scope ) != 9) + continue; + + table_size++; + if (!(new_table = HeapReAlloc( GetProcessHeap(), 0, table, table_size * sizeof(table[0]) ))) + { + fclose(fp); + goto failed; + } + + table = new_table; + entry = &table[table_size - 1]; + + i = 0; + while (i < 8) + { + entry->addr.u.Word[i] = htons(a[i]); + i++; + } + + entry->scope = htons(scope); + } + } +#else + FIXME( "not implemented\n" ); + goto failed; +#endif + + *size = table_size; + return table; + +failed: + HeapFree( GetProcessHeap(), 0, table ); + return NULL; +} + +static DWORD find_ipv6_addr_scope(const IN6_ADDR *addr, const struct ipv6_addr_scope *table, unsigned int size) +{ + const BYTE multicast_scope_mask = 0x0F; + const BYTE multicast_scope_shift = 0; + unsigned int i = 0; + + if (IN6_IS_ADDR_UNSPECIFIED(addr)) + return 0; + + if (IN6_IS_ADDR_MULTICAST(addr)) + return htons((addr->u.Byte[1] & multicast_scope_mask) >> multicast_scope_shift); + + if (!table) + return -1; + + while (i < size) + { + if (memcmp(&table[i].addr, addr, sizeof(table[i].addr)) == 0) + return table[i].scope; + i++; + } + + return -1; +} + +DWORD build_udp6_table( UDP_TABLE_CLASS class, void **tablep, BOOL order, HANDLE heap, DWORD flags, + DWORD *size ) +{ + MIB_UDP6TABLE *table; + MIB_UDP6ROW_OWNER_MODULE row; + DWORD ret = NO_ERROR, count = 16, table_size, row_size; + + if (!(table_size = get_udp6_table_sizes( class, count, &row_size ))) + return ERROR_INVALID_PARAMETER; + + if (!(table = HeapAlloc( heap, flags, table_size ))) + return ERROR_OUTOFMEMORY; + + table->dwNumEntries = 0; + memset( &row, 0, sizeof(row) ); + +#ifdef __linux__ + { + FILE *fp; + + if ((fp = fopen( "/proc/net/udp6", "r" ))) + { + char buf[512], *ptr; + struct pid_map *map = NULL; + unsigned int num_entries = 0; + struct ipv6_addr_scope *addr_scopes; + unsigned int addr_scopes_size = 0; + unsigned int dummy; + int inode; + + addr_scopes = get_ipv6_addr_scope_table(&addr_scopes_size); + + if (class >= UDP_TABLE_OWNER_PID) map = get_pid_map( &num_entries ); + + /* skip header line */ + ptr = fgets( buf, sizeof(buf), fp ); + while ((ptr = fgets( buf, sizeof(buf), fp ))) + { + DWORD in6_addr32[4]; + + if (sscanf( ptr, "%u: %8x%8x%8x%8x:%x %*s %*s %*s %*s %*s %*s %*s %d", &dummy, + &in6_addr32[0], &in6_addr32[1], &in6_addr32[2], &in6_addr32[3], + &row.dwLocalPort, &inode ) != 7) + continue; + memcpy(&row.ucLocalAddr, in6_addr32, sizeof(row.ucLocalAddr)); + row.dwLocalScopeId = find_ipv6_addr_scope((const IN6_ADDR *)&row.ucLocalAddr, addr_scopes, addr_scopes_size); + row.dwLocalPort = htons( row.dwLocalPort ); + + if (class >= UDP_TABLE_OWNER_PID) + row.dwOwningPid = find_owning_pid( map, num_entries, inode ); + if (class >= UDP_TABLE_OWNER_MODULE) + { + row.liCreateTimestamp.QuadPart = 0; /* FIXME */ + row.u.dwFlags = 0; + memset( &row.OwningModuleInfo, 0, sizeof(row.OwningModuleInfo) ); + } + if (!(table = append_udp6_row( class, heap, flags, table, &count, &row, row_size ))) + break; + } + HeapFree( GetProcessHeap(), 0, map ); + if (addr_scopes) + HeapFree( GetProcessHeap(), 0, addr_scopes ); + fclose( fp ); + } + else ret = ERROR_NOT_SUPPORTED; + } +#else + FIXME( "not implemented\n" ); + ret = ERROR_NOT_SUPPORTED; +#endif + + if (!table) return ERROR_OUTOFMEMORY; + if (!ret) + { + if (order && table->dwNumEntries) + qsort( table->table, table->dwNumEntries, row_size, compare_udp6_rows ); + *tablep = table; + } + else HeapFree( heap, flags, table ); + if (size) *size = get_udp6_table_sizes( class, count, NULL ); + TRACE( "returning ret %u table %p\n", ret, table ); + return ret; +} + /****************************************************************** * AllocateAndGetUdpTableFromStack (IPHLPAPI.@) * diff --git a/dlls/iphlpapi/ipstats.h b/dlls/iphlpapi/ipstats.h index d742d6380a..acf43ee27c 100644 --- a/dlls/iphlpapi/ipstats.h +++ b/dlls/iphlpapi/ipstats.h @@ -34,5 +34,6 @@ DWORD getInterfaceStatsByName(const char *name, PMIB_IFROW entry) DECLSPEC_HIDDE DWORD build_tcp_table(TCP_TABLE_CLASS, void **, BOOL, HANDLE, DWORD, DWORD *) DECLSPEC_HIDDEN; DWORD build_udp_table(UDP_TABLE_CLASS, void **, BOOL, HANDLE, DWORD, DWORD *) DECLSPEC_HIDDEN; +DWORD build_udp6_table(UDP_TABLE_CLASS, void **, BOOL, HANDLE, DWORD, DWORD *) DECLSPEC_HIDDEN; #endif /* ndef WINE_IPSTATS_H_ */ diff --git a/include/iphlpapi.h b/include/iphlpapi.h index 54d93d1c9c..86507dfd4d 100644 --- a/include/iphlpapi.h +++ b/include/iphlpapi.h @@ -51,6 +51,8 @@ DWORD WINAPI GetTcpTable(PMIB_TCPTABLE pTcpTable, PDWORD pdwSize, BOOL bOrder); DWORD WINAPI GetUdpTable(PMIB_UDPTABLE pUdpTable, PDWORD pdwSize, BOOL bOrder); +DWORD WINAPI GetUdp6Table(PMIB_UDP6TABLE pUdpTable, PDWORD pdwSize, BOOL bOrder); + DWORD WINAPI GetIpStatistics(PMIB_IPSTATS pStats); DWORD WINAPI GetIpStatisticsEx(PMIB_IPSTATS pStats, DWORD dwFamily); diff --git a/include/udpmib.h b/include/udpmib.h index 6b3f51cf2f..3d1bba5ee5 100644 --- a/include/udpmib.h +++ b/include/udpmib.h @@ -18,6 +18,8 @@ #ifndef __WINE_UDPMIB_H #define __WINE_UDPMIB_H +#include <in6addr.h> + #define TCPIP_OWNING_MODULE_SIZE 16 @@ -71,6 +73,57 @@ typedef struct _MIB_UDPTABLE_OWNER_MODULE MIB_UDPROW_OWNER_MODULE table[1]; } MIB_UDPTABLE_OWNER_MODULE, *PMIB_UDPTABLE_OWNER_MODULE; +typedef struct _MIB_UDP6ROW +{ + IN6_ADDR dwLocalAddr; + DWORD dwLocalScopeId; + DWORD dwLocalPort; +} MIB_UDP6ROW, *PMIB_UDP6ROW; + +typedef struct _MIB_UDP6TABLE +{ + DWORD dwNumEntries; + MIB_UDP6ROW table[1]; +} MIB_UDP6TABLE, *PMIB_UDP6TABLE; + +typedef struct _MIB_UDP6ROW_OWNER_PID +{ + UCHAR ucLocalAddr[16]; + DWORD dwLocalScopeId; + DWORD dwLocalPort; + DWORD dwOwningPid; +} MIB_UDP6ROW_OWNER_PID, *PMIB_UDP6ROW_OWNER_PID; + +typedef struct _MIB_UDP6TABLE_OWNER_PID +{ + DWORD dwNumEntries; + MIB_UDP6ROW_OWNER_PID table[1]; +} MIB_UDP6TABLE_OWNER_PID, *PMIB_UDP6TABLE_OWNER_PID; + +typedef struct _MIB_UDP6ROW_OWNER_MODULE +{ + UCHAR ucLocalAddr[16]; + DWORD dwLocalScopeId; + DWORD dwLocalPort; + DWORD dwOwningPid; + LARGE_INTEGER liCreateTimestamp; + __C89_NAMELESS union + { + __C89_NAMELESS struct + { + int SpecificPortBind:1; + } __C89_NAMELESSSTRUCTNAME; + int dwFlags; + } __C89_NAMELESSUNIONNAME; + ULONGLONG OwningModuleInfo[TCPIP_OWNING_MODULE_SIZE]; +} MIB_UDP6ROW_OWNER_MODULE, *PMIB_UDP6ROW_OWNER_MODULE; + +typedef struct _MIB_UDP6TABLE_OWNER_MODULE +{ + DWORD dwNumEntries; + MIB_UDP6ROW_OWNER_MODULE table[1]; +} MIB_UDP6TABLE_OWNER_MODULE, *PMIB_UDP6TABLE_OWNER_MODULE; + /* UDP statistics */ typedef struct _MIB_UDPSTATS -- Guillaume Charifi <guillaume.charifi(a)sfr.fr>

2 1

[PATCH 4/5] wined3d: Add shadow sampler capability bit to d3d_info.
by Józef Kucia 24 Aug '18

24 Aug '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/adapter_gl.c | 1 + dlls/wined3d/directx.c | 2 +- dlls/wined3d/wined3d_private.h | 6 +++++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 8c1cce457ed0..39671f2f30cf 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -3657,6 +3657,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, adapter->vertex_pipe = select_vertex_implementation(gl_info, adapter->shader_backend); adapter->fragment_pipe = select_fragment_implementation(gl_info, adapter->shader_backend); + d3d_info->shadow_sampler = gl_info->supported[ARB_SHADOW]; d3d_info->limits.pointsize_max = gl_info->limits.pointsize_max; adapter->shader_backend->shader_get_caps(gl_info, &shader_caps); diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 774cd48caec6..d2229c20b2eb 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1607,7 +1607,7 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad } else if ((usage & WINED3DUSAGE_DEPTHSTENCIL) && (format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_SHADOW) - && !adapter->gl_info.supported[ARB_SHADOW]) + && !adapter->d3d_info.shadow_sampler) { TRACE("[FAILED] - No shadow sampler support.\n"); return WINED3DERR_NOTAVAILABLE; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index de0b4867de79..834ca151cf6a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -193,7 +193,11 @@ struct wined3d_d3d_info BOOL shader_color_key; DWORD valid_rt_mask; DWORD wined3d_creation_flags; - BOOL shader_double_precision; + + DWORD shadow_sampler : 1; + DWORD shader_double_precision : 1; + DWORD padding : 30; + enum wined3d_feature_level feature_level; }; -- 2.16.4

3 2

[PATCH] winhttp: Escape untrusted URL paths.
by Hans Leidekker 24 Aug '18

24 Aug '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/request.c | 24 ++++++++++----------- dlls/winhttp/session.c | 8 +++---- dlls/winhttp/tests/url.c | 1 + dlls/winhttp/tests/winhttp.c | 40 ++++++++++++++++++++++++++++++++++ dlls/winhttp/url.c | 49 ++++++++++++++++++++++++------------------ dlls/winhttp/winhttp_private.h | 1 + 6 files changed, 86 insertions(+), 37 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 65d641f3cb..6f6de7c63d 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2517,7 +2517,7 @@ static WCHAR *get_redirect_url( request_t *request, DWORD *len ) query_headers( request, WINHTTP_QUERY_LOCATION, NULL, NULL, &size, NULL ); if (get_last_error() != ERROR_INSUFFICIENT_BUFFER) return FALSE; if (!(ret = heap_alloc( size ))) return NULL; - *len = size / sizeof(WCHAR); + *len = size / sizeof(WCHAR) - 1; if (query_headers( request, WINHTTP_QUERY_LOCATION, NULL, ret, &size, NULL )) return ret; heap_free( ret ); return NULL; @@ -2526,42 +2526,42 @@ static WCHAR *get_redirect_url( request_t *request, DWORD *len ) static BOOL handle_redirect( request_t *request, DWORD status ) { BOOL ret = FALSE; - DWORD len, len_url; + DWORD len, len_loc; URL_COMPONENTS uc; connect_t *connect = request->connect; INTERNET_PORT port; WCHAR *hostname = NULL, *location; int index; - if (!(location = get_redirect_url( request, &len_url ))) return FALSE; + if (!(location = get_redirect_url( request, &len_loc ))) return FALSE; memset( &uc, 0, sizeof(uc) ); uc.dwStructSize = sizeof(uc); uc.dwSchemeLength = uc.dwHostNameLength = uc.dwUrlPathLength = uc.dwExtraInfoLength = ~0u; - if (!WinHttpCrackUrl( location, len_url, 0, &uc )) /* assume relative redirect */ + if (!WinHttpCrackUrl( location, len_loc, 0, &uc )) /* assume relative redirect */ { WCHAR *path, *p; if (location[0] == '/') { - len = strlenW( location ); + len = escape_string( NULL, location, len_loc ); if (!(path = heap_alloc( (len + 1) * sizeof(WCHAR) ))) goto end; - strcpyW( path, location ); + escape_string( path, location, len_loc ); } else { if ((p = strrchrW( request->path, '/' ))) *p = 0; - len = strlenW( request->path ) + 1 + strlenW( location ); + len = strlenW( request->path ) + 1 + escape_string( NULL, location, len_loc ); if (!(path = heap_alloc( (len + 1) * sizeof(WCHAR) ))) goto end; strcpyW( path, request->path ); strcatW( path, slashW ); - strcatW( path, location ); + escape_string( path + strlenW(path), location, len_loc ); } heap_free( request->path ); request->path = path; - send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_REDIRECT, location, len_url + 1 ); + send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_REDIRECT, location, len_loc + 1 ); } else { @@ -2577,7 +2577,7 @@ static BOOL handle_redirect( request_t *request, DWORD status ) request->hdr.flags |= WINHTTP_FLAG_SECURE; } - send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_REDIRECT, location, len_url + 1 ); + send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_REDIRECT, location, len_loc + 1 ); len = uc.dwHostNameLength; if (!(hostname = heap_alloc( (len + 1) * sizeof(WCHAR) ))) goto end; @@ -2607,9 +2607,9 @@ static BOOL handle_redirect( request_t *request, DWORD status ) request->path = NULL; if (uc.dwUrlPathLength) { - len = uc.dwUrlPathLength + uc.dwExtraInfoLength; + len = escape_string( NULL, uc.lpszUrlPath, uc.dwUrlPathLength + uc.dwExtraInfoLength ); if (!(request->path = heap_alloc( (len + 1) * sizeof(WCHAR) ))) goto end; - strcpyW( request->path, uc.lpszUrlPath ); + escape_string( request->path, uc.lpszUrlPath, uc.dwUrlPathLength + uc.dwExtraInfoLength ); } else request->path = strdupW( slashW ); } diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 788f7c613f..8da09a2e21 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -1142,14 +1142,14 @@ HINTERNET WINAPI WinHttpOpenRequest( HINTERNET hconnect, LPCWSTR verb, LPCWSTR o if (object) { WCHAR *path, *p; - unsigned int len; + unsigned int len, len_object = strlenW(object); - len = strlenW( object ) + 1; + len = escape_string( NULL, object, len_object ); if (object[0] != '/') len++; - if (!(p = path = heap_alloc( len * sizeof(WCHAR) ))) goto end; + if (!(p = path = heap_alloc( (len + 1) * sizeof(WCHAR) ))) goto end; if (object[0] != '/') *p++ = '/'; - strcpyW( p, object ); + escape_string( p, object, len_object ); request->path = path; } else if (!(request->path = strdupW( slashW ))) goto end; diff --git a/dlls/winhttp/tests/url.c b/dlls/winhttp/tests/url.c index 6bde1de70e..214b7f34cf 100644 --- a/dlls/winhttp/tests/url.c +++ b/dlls/winhttp/tests/url.c @@ -667,6 +667,7 @@ static void WinHttpCrackUrl_test( void ) ok( ret, "WinHttpCrackUrl failed le=%u\n", GetLastError() ); ok( !lstrcmpW( uc.lpszHostName, hostnameW ), "unexpected host name\n" ); ok( !lstrcmpW( uc.lpszUrlPath, pathW ), "unexpected path\n" ); + ok( uc.dwUrlPathLength == lstrlenW(pathW), "got %u\n", uc.dwUrlPathLength ); uc.dwStructSize = sizeof(uc); uc.lpszScheme = NULL; diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 2e903e1105..df822b2e46 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -2274,6 +2274,11 @@ static DWORD CALLBACK server_thread(LPVOID param) if (!strstr(buffer, "Cookie: name=value\r\n")) send(c, cookiemsg, sizeof(cookiemsg) - 1, 0); else send(c, notokmsg, sizeof(notokmsg) - 1, 0); } + else if (strstr(buffer, "GET /escape")) + { + if (strstr(buffer, "GET /escape?one%20two%0D%0A HTTP/1.1")) send(c, okmsg, sizeof(okmsg) - 1, 0); + else send(c, notokmsg, sizeof(notokmsg) - 1, 0); + } if (strstr(buffer, "GET /quit")) { send(c, okmsg, sizeof okmsg - 1, 0); @@ -3229,6 +3234,40 @@ static void test_cookies( int port ) WinHttpCloseHandle( ses ); } +static void test_request_path_escapes( int port ) +{ + static const WCHAR objW[] = + {'/','e','s','c','a','p','e','?','o','n','e',' ','t','w','o','\r','\n',0}; + HINTERNET ses, con, req; + DWORD status, size; + BOOL ret; + + ses = WinHttpOpen( test_useragent, WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0 ); + ok( ses != NULL, "failed to open session %u\n", GetLastError() ); + + con = WinHttpConnect( ses, localhostW, port, 0 ); + ok( con != NULL, "failed to open a connection %u\n", GetLastError() ); + + req = WinHttpOpenRequest( con, NULL, objW, NULL, NULL, NULL, 0 ); + ok( req != NULL, "failed to open a request %u\n", GetLastError() ); + + ret = WinHttpSendRequest( req, NULL, 0, NULL, 0, 0, 0 ); + ok( ret, "failed to send request %u\n", GetLastError() ); + + ret = WinHttpReceiveResponse( req, NULL ); + ok( ret, "failed to receive response %u\n", GetLastError() ); + + status = 0xdeadbeef; + size = sizeof(status); + ret = WinHttpQueryHeaders( req, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL ); + ok( ret, "failed to query status code %u\n", GetLastError() ); + ok( status == HTTP_STATUS_OK, "request failed unexpectedly %u\n", status ); + + WinHttpCloseHandle( req ); + WinHttpCloseHandle( con ); + WinHttpCloseHandle( ses ); +} + static void test_connection_info( int port ) { static const WCHAR basicW[] = {'/','b','a','s','i','c',0}; @@ -4555,6 +4594,7 @@ START_TEST (winhttp) test_bad_header(si.port); test_multiple_reads(si.port); test_cookies(si.port); + test_request_path_escapes(si.port); /* send the basic request again to shutdown the server thread */ test_basic_request(si.port, NULL, quitW); diff --git a/dlls/winhttp/url.c b/dlls/winhttp/url.c index 32b30da0ce..52a175c84d 100644 --- a/dlls/winhttp/url.c +++ b/dlls/winhttp/url.c @@ -118,7 +118,7 @@ static BOOL need_escape( WCHAR c ) } } -static DWORD copy_escape( WCHAR *dst, const WCHAR *src, DWORD len ) +DWORD escape_string( WCHAR *dst, const WCHAR *src, DWORD len ) { static const WCHAR hex[] = {'0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F'}; DWORD ret = len; @@ -129,38 +129,45 @@ static DWORD copy_escape( WCHAR *dst, const WCHAR *src, DWORD len ) { if (need_escape( src[i] )) { - p[0] = '%'; - p[1] = hex[(src[i] >> 4) & 0xf]; - p[2] = hex[src[i] & 0xf]; + if (dst) + { + p[0] = '%'; + p[1] = hex[(src[i] >> 4) & 0xf]; + p[2] = hex[src[i] & 0xf]; + p += 2; + } ret += 2; - p += 2; } - else *p = src[i]; + else if (dst) *p = src[i]; } - dst[ret] = 0; + if (dst) dst[ret] = 0; return ret; } -static WCHAR *escape_url( LPCWSTR url, DWORD *len ) +static WCHAR *escape_url( const WCHAR *url, DWORD *len ) { WCHAR *ret; - const WCHAR *p, *q; + const WCHAR *p; + DWORD len_base, len_path; - if ((p = q = strrchrW( url, '/' ))) + if ((p = strrchrW( url, '/' ))) { - while (*q) - { - if (need_escape( *q )) *len += 2; - q++; - } + len_base = p - url; + len_path = escape_string( NULL, p, *len - len_base ); } - if (!(ret = heap_alloc( (*len + 1) * sizeof(WCHAR) ))) return NULL; - if (!p) strcpyW( ret, url ); else { - memcpy( ret, url, (p - url) * sizeof(WCHAR) ); - copy_escape( ret + (p - url), p, q - p ); + len_base = *len; + len_path = 0; } + + if (!(ret = heap_alloc( (len_base + len_path + 1) * sizeof(WCHAR) ))) return NULL; + memcpy( ret, url, len_base * sizeof(WCHAR) ); + + if (p) escape_string( ret + len_base, p, *len - (p - url) ); + ret[len_base + len_path] = 0; + + *len = len_base + len_path; return ret; } @@ -516,7 +523,7 @@ BOOL WINAPI WinHttpCreateUrl( LPURL_COMPONENTS uc, DWORD flags, LPWSTR url, LPDW if (uc->lpszUrlPath) { len = comp_length( uc->dwUrlPathLength, 0, uc->lpszUrlPath ); - if (flags & ICU_ESCAPE) url += copy_escape( url, uc->lpszUrlPath, len ); + if (flags & ICU_ESCAPE) url += escape_string( url, uc->lpszUrlPath, len ); else { memcpy( url, uc->lpszUrlPath, len * sizeof(WCHAR) ); @@ -526,7 +533,7 @@ BOOL WINAPI WinHttpCreateUrl( LPURL_COMPONENTS uc, DWORD flags, LPWSTR url, LPDW if (uc->lpszExtraInfo) { len = comp_length( uc->dwExtraInfoLength, 0, uc->lpszExtraInfo ); - if (flags & ICU_ESCAPE) url += copy_escape( url, uc->lpszExtraInfo, len ); + if (flags & ICU_ESCAPE) url += escape_string( url, uc->lpszExtraInfo, len ); else { memcpy( url, uc->lpszExtraInfo, len * sizeof(WCHAR) ); diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index f1aa5622c6..7b92afc7ce 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -322,6 +322,7 @@ BOOL set_server_for_hostname( connect_t *, LPCWSTR, INTERNET_PORT ) DECLSPEC_HID void destroy_authinfo( struct authinfo * ) DECLSPEC_HIDDEN; void release_host( hostdata_t *host ) DECLSPEC_HIDDEN; +DWORD escape_string( WCHAR *, const WCHAR *, DWORD ) DECLSPEC_HIDDEN; extern HRESULT WinHttpRequest_create( void ** ) DECLSPEC_HIDDEN; void release_typelib( void ) DECLSPEC_HIDDEN; -- 2.11.0

1 0

[PATCH] winhttp: Add support for WINHTTP_ENABLE_SSL_REVOCATION.
by Zhiyi Zhang 24 Aug '18

24 Aug '18

This also fixes a regression caused by 0b61334b9d6392e8c8a9772d762efaf0c2eb0835, which is causing Office 2013 to fail to login, saying that there is a problem with your account. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winhttp/net.c | 14 ++++++++------ dlls/winhttp/request.c | 2 +- dlls/winhttp/session.c | 12 ++++++++++++ dlls/winhttp/tests/winhttp.c | 31 +++++++++++++++++++++++++++++++ dlls/winhttp/winhttp_private.h | 3 ++- 5 files changed, 54 insertions(+), 8 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index d577a64783..2625e4a9d7 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -160,7 +160,7 @@ static int sock_recv(int fd, void *msg, size_t len, int flags) return ret; } -static DWORD netconn_verify_cert( PCCERT_CONTEXT cert, WCHAR *server, DWORD security_flags ) +static DWORD netconn_verify_cert( PCCERT_CONTEXT cert, WCHAR *server, DWORD security_flags, BOOL check_revocation ) { HCERTSTORE store = cert->hCertStore; BOOL ret; @@ -173,9 +173,10 @@ static DWORD netconn_verify_cert( PCCERT_CONTEXT cert, WCHAR *server, DWORD secu TRACE("verifying %s\n", debugstr_w( server )); chainPara.RequestedUsage.Usage.cUsageIdentifier = 1; chainPara.RequestedUsage.Usage.rgpszUsageIdentifier = server_auth; - if ((ret = CertGetCertificateChain( NULL, cert, NULL, store, &chainPara, - CERT_CHAIN_REVOCATION_CHECK_CHAIN_EXCLUDE_ROOT, - NULL, &chain ))) + ret = CertGetCertificateChain( NULL, cert, NULL, store, &chainPara, + check_revocation ? CERT_CHAIN_REVOCATION_CHECK_CHAIN_EXCLUDE_ROOT : 0, + NULL, &chain ); + if (ret) { if (chain->TrustStatus.dwErrorStatus) { @@ -370,7 +371,8 @@ BOOL netconn_close( netconn_t *conn ) return TRUE; } -BOOL netconn_secure_connect( netconn_t *conn, WCHAR *hostname, DWORD security_flags, CredHandle *cred_handle ) +BOOL netconn_secure_connect( netconn_t *conn, WCHAR *hostname, DWORD security_flags, CredHandle *cred_handle, + BOOL check_revocation) { SecBuffer out_buf = {0, SECBUFFER_TOKEN, NULL}, in_bufs[2] = {{0, SECBUFFER_TOKEN}, {0, SECBUFFER_EMPTY}}; SecBufferDesc out_desc = {SECBUFFER_VERSION, 1, &out_buf}, in_desc = {SECBUFFER_VERSION, 2, in_bufs}; @@ -466,7 +468,7 @@ BOOL netconn_secure_connect( netconn_t *conn, WCHAR *hostname, DWORD security_fl status = QueryContextAttributesW(&ctx, SECPKG_ATTR_REMOTE_CERT_CONTEXT, (void*)&cert); if(status == SEC_E_OK) { - res = netconn_verify_cert(cert, hostname, security_flags); + res = netconn_verify_cert(cert, hostname, security_flags, check_revocation); CertFreeCertificateContext(cert); if(res != ERROR_SUCCESS) { WARN("cert verify failed: %u\n", res); diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 5e5b229a1f..65d641f3cb 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1769,7 +1769,7 @@ static BOOL open_connection( request_t *request ) if (!ensure_cred_handle( connect->session ) || !netconn_secure_connect( netconn, connect->hostname, request->security_flags, - &connect->session->cred_handle )) + &connect->session->cred_handle, request->check_revocation )) { heap_free( addressW ); netconn_close( netconn ); diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index fb815682c2..788f7c613f 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -1020,6 +1020,18 @@ static BOOL request_set_option( object_header_t *hdr, DWORD option, LPVOID buffe } FIXME("WINHTTP_OPTION_CLIENT_CERT_CONTEXT\n"); return TRUE; + case WINHTTP_OPTION_ENABLE_FEATURE: + if(buflen == sizeof( DWORD ) && *(DWORD *)buffer == WINHTTP_ENABLE_SSL_REVOCATION) + { + request->check_revocation = TRUE; + SetLastError( NO_ERROR ); + return TRUE; + } + else + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } default: FIXME("unimplemented option %u\n", option); set_last_error( ERROR_WINHTTP_INVALID_OPTION ); diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index c9e053fbea..2e903e1105 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -201,6 +201,37 @@ static void test_QueryOption(void) ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + feature = 0xdeadbeef; + size = sizeof(feature); + SetLastError(0xdeadbeef); + ret = WinHttpQueryOption(request, WINHTTP_OPTION_ENABLE_FEATURE, &feature, &size); + ok(!ret, "should fail to query enabled features for a request\n"); + ok(feature == 0xdeadbeef, "expect feature 0xdeadbeef, got %u\n", feature); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + + feature = WINHTTP_ENABLE_SSL_REVOCATION; + SetLastError(0xdeadbeef); + ret = WinHttpSetOption(request, WINHTTP_OPTION_ENABLE_FEATURE, 0, sizeof(feature)); + ok(!ret, "should fail to enable WINHTTP_ENABLE_SSL_REVOCATION with invalid parameters\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = WinHttpSetOption(request, WINHTTP_OPTION_ENABLE_FEATURE, &feature, 0); + ok(!ret, "should fail to enable WINHTTP_ENABLE_SSL_REVOCATION with invalid parameters\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = WinHttpSetOption(request, WINHTTP_OPTION_ENABLE_FEATURE, &feature, sizeof(feature)); + ok(ret, "failed to set feature\n"); + ok(GetLastError() == NO_ERROR || broken(GetLastError() == 0xdeadbeef), /* Doesn't set error code on Vista or older */ + "expected NO_ERROR, got %u\n", GetLastError()); + + feature = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = WinHttpSetOption(request, WINHTTP_OPTION_ENABLE_FEATURE, &feature, sizeof(feature)); + ok(!ret, "should fail to enable WINHTTP_ENABLE_SSL_REVOCATION with invalid parameters\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + SetLastError(0xdeadbeef); ret = WinHttpCloseHandle(request); ok(ret, "WinHttpCloseHandle failed on closing request: %u\n", GetLastError()); diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index d639a2deb2..f1aa5622c6 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -210,6 +210,7 @@ typedef struct DWORD optional_len; netconn_t *netconn; DWORD security_flags; + BOOL check_revocation; const CERT_CONTEXT *server_cert; int resolve_timeout; int connect_timeout; @@ -306,7 +307,7 @@ void netconn_unload( void ) DECLSPEC_HIDDEN; ULONG netconn_query_data_available( netconn_t * ) DECLSPEC_HIDDEN; BOOL netconn_recv( netconn_t *, void *, size_t, int, int * ) DECLSPEC_HIDDEN; BOOL netconn_resolve( WCHAR *, INTERNET_PORT, struct sockaddr_storage *, int ) DECLSPEC_HIDDEN; -BOOL netconn_secure_connect( netconn_t *, WCHAR *, DWORD, CredHandle * ) DECLSPEC_HIDDEN; +BOOL netconn_secure_connect( netconn_t *, WCHAR *, DWORD, CredHandle *, BOOL ) DECLSPEC_HIDDEN; BOOL netconn_send( netconn_t *, const void *, size_t, int * ) DECLSPEC_HIDDEN; DWORD netconn_set_timeout( netconn_t *, BOOL, int ) DECLSPEC_HIDDEN; BOOL netconn_is_alive( netconn_t * ) DECLSPEC_HIDDEN; -- 2.18.0

2 1

[PATCH 2/2] widl: Allow defaultvalue() attribute on any pointer type.
by Jacek Caban 24 Aug '18

24 Aug '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- tools/widl/write_msft.c | 130 +++++++++++++++++++++--------------------------- 1 file changed, 56 insertions(+), 74 deletions(-)

1 0

[PATCH 1/2] widl: Split write_value for string and int values.
by Jacek Caban 24 Aug '18

24 Aug '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- tools/widl/write_msft.c | 49 +++++++++++++++++++++++++------------------------ 1 file changed, 25 insertions(+), 24 deletions(-)

1 0

[PATCH] comctl32/tests: Fix test failures on XP.
by Nikolay Sivov 24 Aug '18

24 Aug '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/tests/treeview.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 14d814d8e0..c60aa8a6c4 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -2225,8 +2225,8 @@ static void _check_item(HWND hwnd, HTREEITEM item, BOOL is_version_6, int line) else width = data->width; todo_wine - ok_(__FILE__, line)(width == (rect.right - rect.left), "Width %d, rect width %d.\n", - width, rect.right - rect.left); + ok_(__FILE__, line)(width == (rect.right - rect.left) || broken(is_version_6 && width == 0) /* XP */, + "Width %d, rect width %d.\n", width, rect.right - rect.left); } } -- 2.18.0

1 0

[PATCH] include: Add IWbemUnsecuredApartment interfaces
by Alistair Leslie-Hughes 24 Aug '18

24 Aug '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/wbemcli.idl | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/include/wbemcli.idl b/include/wbemcli.idl index 4a0f4e2..2dc451a 100644 --- a/include/wbemcli.idl +++ b/include/wbemcli.idl @@ -660,3 +660,46 @@ interface IWbemQualifierSet : IUnknown HRESULT EndEnumeration(); } + + +typedef [v1_enum] enum tag_WBEM_UNSECAPP_FLAG_TYPE +{ + WBEM_FLAG_UNSECAPP_DEFAULT_CHECK_ACCESS = 0, + WBEM_FLAG_UNSECAPP_CHECK_ACCESS = 1, + WBEM_FLAG_UNSECAPP_DONT_CHECK_ACCESS = 2 +} WBEM_UNSECAPP_FLAG_TYPE; + +[ + object, + restricted, + uuid(1cfaba8c-1523-11d1-ad79-00c04fd8fdff) +] +interface IUnsecuredApartment : IUnknown +{ + HRESULT CreateObjectStub( + [in] IUnknown *object, + [out] IUnknown **stub); +}; + +[ + object, + restricted, + uuid(31739d04-3471-4cf4-9a7c-57a44ae71956) +] +interface IWbemUnsecuredApartment : IUnsecuredApartment +{ + HRESULT CreateSinkStub( + [in] IWbemObjectSink *sink, + [in] DWORD flags, + [in,unique] const WCHAR *reserved, + [out] IWbemObjectSink **stub); +}; + +[ + uuid(49bd2028-1523-11d1-ad79-00c04fd8fdff) +] +coclass UnsecuredApartment +{ + interface IUnsecuredApartment; + interface IWbemUnsecuredApartment; +}; -- 1.9.1

2 1

[PATCH 3/3] oleaut32: Use common helper for masked bitmaps to render an icon. (Resend)
by Dmitry Timoshkov 24 Aug '18

24 Aug '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/oleaut32/olepicture.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index aa82b057ee..0ef0ecfeb6 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -711,9 +711,18 @@ static HRESULT WINAPI OLEPictureImpl_Render(IPicture *iface, HDC hdc, } case PICTYPE_ICON: - FIXME("Not quite correct implementation of rendering icons...\n"); - DrawIconEx(hdc, x, y, This->desc.u.icon.hicon, cx, cy, 0, NULL, DI_NORMAL); + { + ICONINFO info; + + if (!GetIconInfo(This->desc.u.icon.hicon, &info)) + return E_FAIL; + + render_masked_bitmap(This, hdc, x, y, cx, cy, xSrc, ySrc, cxSrc, cySrc, info.hbmMask, info.hbmColor); + + DeleteObject(info.hbmMask); + if (info.hbmColor) DeleteObject(info.hbmColor); break; + } case PICTYPE_METAFILE: { -- 2.17.1

1 0

[PATCH 2/3] oleaut32: Move rendering a bitmap to a separate helper. (Resend)
by Dmitry Timoshkov 24 Aug '18

24 Aug '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/oleaut32/olepicture.c | 103 +++++++++++++++++++++++-------------- 1 file changed, 64 insertions(+), 39 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index a2a54bdcd2..aa82b057ee 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -610,6 +610,55 @@ static HRESULT WINAPI OLEPictureImpl_get_Height(IPicture *iface, return S_OK; } +static void render_masked_bitmap(OLEPictureImpl *This, HDC hdc, + LONG x, LONG y, LONG cx, LONG cy, OLE_XPOS_HIMETRIC xSrc, OLE_YPOS_HIMETRIC ySrc, + OLE_XSIZE_HIMETRIC cxSrc, OLE_YSIZE_HIMETRIC cySrc, HBITMAP hbmMask, HBITMAP hbmXor) +{ + HBITMAP hbmpOld; + HDC hdcBmp; + + /* Set a mapping mode that maps bitmap pixels into HIMETRIC units. + * NB y-axis gets flipped + */ + + hdcBmp = CreateCompatibleDC(0); + SetMapMode(hdcBmp, MM_ANISOTROPIC); + SetWindowOrgEx(hdcBmp, 0, 0, NULL); + SetWindowExtEx(hdcBmp, This->himetricWidth, This->himetricHeight, NULL); + SetViewportOrgEx(hdcBmp, 0, This->origHeight, NULL); + SetViewportExtEx(hdcBmp, This->origWidth, -This->origHeight, NULL); + + if (hbmMask) + { + HDC hdcMask = CreateCompatibleDC(0); + HBITMAP hOldbm = SelectObject(hdcMask, hbmMask); + + hbmpOld = SelectObject(hdcBmp, hbmXor); + + SetMapMode(hdcMask, MM_ANISOTROPIC); + SetWindowOrgEx(hdcMask, 0, 0, NULL); + SetWindowExtEx(hdcMask, This->himetricWidth, This->himetricHeight, NULL); + SetViewportOrgEx(hdcMask, 0, This->origHeight, NULL); + SetViewportExtEx(hdcMask, This->origWidth, -This->origHeight, NULL); + + SetBkColor(hdc, RGB(255, 255, 255)); + SetTextColor(hdc, RGB(0, 0, 0)); + StretchBlt(hdc, x, y, cx, cy, hdcMask, xSrc, ySrc, cxSrc, cySrc, SRCAND); + StretchBlt(hdc, x, y, cx, cy, hdcBmp, xSrc, ySrc, cxSrc, cySrc, SRCPAINT); + + SelectObject(hdcMask, hOldbm); + DeleteDC(hdcMask); + } + else + { + hbmpOld = SelectObject(hdcBmp, hbmXor); + StretchBlt(hdc, x, y, cx, cy, hdcBmp, xSrc, ySrc, cxSrc, cySrc, SRCCOPY); + } + + SelectObject(hdcBmp, hbmpOld); + DeleteDC(hdcBmp); +} + /************************************************************************ * OLEPictureImpl_Render */ @@ -643,48 +692,24 @@ static HRESULT WINAPI OLEPictureImpl_Render(IPicture *iface, HDC hdc, /* nothing to do */ return S_OK; case PICTYPE_BITMAP: - { - HBITMAP hbmpOld; - HDC hdcBmp; - - /* Set a mapping mode that maps bitmap pixels into HIMETRIC units. - NB y-axis gets flipped */ - - hdcBmp = CreateCompatibleDC(0); - SetMapMode(hdcBmp, MM_ANISOTROPIC); - SetWindowOrgEx(hdcBmp, 0, 0, NULL); - SetWindowExtEx(hdcBmp, This->himetricWidth, This->himetricHeight, NULL); - SetViewportOrgEx(hdcBmp, 0, This->origHeight, NULL); - SetViewportExtEx(hdcBmp, This->origWidth, -This->origHeight, NULL); - - if (This->hbmMask) { - HDC hdcMask = CreateCompatibleDC(0); - HBITMAP hOldbm = SelectObject(hdcMask, This->hbmMask); - - hbmpOld = SelectObject(hdcBmp, This->hbmXor); - - SetMapMode(hdcMask, MM_ANISOTROPIC); - SetWindowOrgEx(hdcMask, 0, 0, NULL); - SetWindowExtEx(hdcMask, This->himetricWidth, This->himetricHeight, NULL); - SetViewportOrgEx(hdcMask, 0, This->origHeight, NULL); - SetViewportExtEx(hdcMask, This->origWidth, -This->origHeight, NULL); - - SetBkColor(hdc, RGB(255, 255, 255)); - SetTextColor(hdc, RGB(0, 0, 0)); - StretchBlt(hdc, x, y, cx, cy, hdcMask, xSrc, ySrc, cxSrc, cySrc, SRCAND); - StretchBlt(hdc, x, y, cx, cy, hdcBmp, xSrc, ySrc, cxSrc, cySrc, SRCPAINT); - - SelectObject(hdcMask, hOldbm); - DeleteDC(hdcMask); - } else { - hbmpOld = SelectObject(hdcBmp, This->desc.u.bmp.hbitmap); - StretchBlt(hdc, x, y, cx, cy, hdcBmp, xSrc, ySrc, cxSrc, cySrc, SRCCOPY); - } + { + HBITMAP hbmMask, hbmXor; - SelectObject(hdcBmp, hbmpOld); - DeleteDC(hdcBmp); + if (This->hbmMask) + { + hbmMask = This->hbmMask; + hbmXor = This->hbmXor; + } + else + { + hbmMask = 0; + hbmXor = This->desc.u.bmp.hbitmap; } + + render_masked_bitmap(This, hdc, x, y, cx, cy, xSrc, ySrc, cxSrc, cySrc, hbmMask, hbmXor); break; + } + case PICTYPE_ICON: FIXME("Not quite correct implementation of rendering icons...\n"); DrawIconEx(hdc, x, y, This->desc.u.icon.hicon, cx, cy, 0, NULL, DI_NORMAL); -- 2.17.1

1 0

[PATCH 1/3] oleaut32/tests: Fix the IPicture::Render() usage. (Resend)
by Dmitry Timoshkov 24 Aug '18

24 Aug '18

When one specifies the target rectangle (0, 0, width, -height) IPicture::Render() places the origin at 0,0 and flips the image vertically. This means that in order to paint an icon on the DC it's necessary to specify the rectangle (0, height, width, -height), i.e. place the origin at 0,height. I've written a test app that verifies this behaviour, ufortunately I don't see a way to add a Wine test case for this. The test currently works by chance under Windows because in case of (0, 0, width, -height) IPicture::Render() draws black rectangle instead of an icon at (0, 0, width, height). If Wine intends to replicate this behaviour it should be fixed by a separate patch. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/oleaut32/tests/olepicture.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/oleaut32/tests/olepicture.c b/dlls/oleaut32/tests/olepicture.c index c06cec19ec..6a5f7ee042 100644 --- a/dlls/oleaut32/tests/olepicture.c +++ b/dlls/oleaut32/tests/olepicture.c @@ -864,7 +864,7 @@ static void test_Render(void) SetPixelV(hdc, 10, 10, 0x00223344); expected = GetPixel(hdc, 0, 0); - hres = picture_render(pic, hdc, 1, 1, 9, 9, 0, 0, pWidth, -pHeight, NULL); + hres = picture_render(pic, hdc, 1, 1, 9, 9, 0, pHeight, pWidth, -pHeight, NULL); ole_expect(hres, S_OK); if(hres != S_OK) goto done; -- 2.17.1

1 0

[PATCH] mshtml: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 24 Aug '18

24 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mshtml/dispex.c | 6 +++--- dlls/mshtml/htmlbody.c | 2 +- dlls/mshtml/htmldoc.c | 2 +- dlls/mshtml/htmlelem.c | 2 +- dlls/mshtml/htmlevent.c | 8 ++++---- dlls/mshtml/htmlimg.c | 2 +- dlls/mshtml/htmllocation.c | 2 +- dlls/mshtml/htmlstyle.c | 18 +++++++++--------- dlls/mshtml/htmlwindow.c | 9 +++------ dlls/mshtml/main.c | 8 ++++---- dlls/mshtml/mutation.c | 6 +++--- dlls/mshtml/navigate.c | 4 ++-- dlls/mshtml/nsembed.c | 8 ++++---- dlls/mshtml/nsio.c | 21 ++++++++++----------- dlls/mshtml/olecmd.c | 11 ++++------- dlls/mshtml/pluginhost.c | 4 ++-- dlls/mshtml/protocol.c | 26 +++++++++++++------------- dlls/mshtml/script.c | 4 ++-- dlls/mshtml/view.c | 6 ++---- 19 files changed, 70 insertions(+), 79 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 360d915523..02ba5d41d5 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -182,7 +182,7 @@ void release_typelib(void) if(!typelib) return; - for(i=0; i < sizeof(typeinfos)/sizeof(*typeinfos); i++) + for(i=0; i < ARRAY_SIZE(typeinfos); i++) if(typeinfos[i]) ITypeInfo_Release(typeinfos[i]); @@ -774,12 +774,12 @@ static HRESULT function_value(DispatchEx *dispex, LCID lcid, WORD flags, DISPPAR return E_ACCESSDENIED; name_len = SysStringLen(This->info->name); - ptr = str = SysAllocStringLen(NULL, name_len + (sizeof(func_prefixW)+sizeof(func_suffixW))/sizeof(WCHAR)); + ptr = str = SysAllocStringLen(NULL, name_len + ARRAY_SIZE(func_prefixW) + ARRAY_SIZE(func_suffixW)); if(!str) return E_OUTOFMEMORY; memcpy(ptr, func_prefixW, sizeof(func_prefixW)); - ptr += sizeof(func_prefixW)/sizeof(WCHAR); + ptr += ARRAY_SIZE(func_prefixW); memcpy(ptr, This->info->name, name_len*sizeof(WCHAR)); ptr += name_len; diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c index 4913c45995..2cfd46dc50 100644 --- a/dlls/mshtml/htmlbody.c +++ b/dlls/mshtml/htmlbody.c @@ -140,7 +140,7 @@ HRESULT nscolor_to_str(LPCWSTR color, BSTR *ret) } if(*color != '#') { - for(i=0; i < sizeof(keyword_table)/sizeof(keyword_table[0]); i++) { + for(i=0; i < ARRAY_SIZE(keyword_table); i++) { if(!strcmpiW(color, keyword_table[i].keyword)) rgb = keyword_table[i].rgb; } diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index eab7b1feb0..17c9e6307f 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1191,7 +1191,7 @@ static BOOL cmdid_from_string(const WCHAR *str, OLECMDID *cmdid) { int i; - for(i = 0; i < sizeof(command_names)/sizeof(*command_names); i++) { + for(i = 0; i < ARRAY_SIZE(command_names); i++) { if(!strcmpiW(command_names[i].name, str)) { *cmdid = command_names[i].id; return TRUE; diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 40e558c62a..4da01560e2 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -103,7 +103,7 @@ static const tag_desc_t tag_descs[] = { static const tag_desc_t *get_tag_desc(const WCHAR *tag_name) { - DWORD min=0, max=sizeof(tag_descs)/sizeof(*tag_descs)-1, i; + DWORD min=0, max=ARRAY_SIZE(tag_descs)-1, i; int r; while(min <= max) { diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index d5d59905cd..1a93ae2fe8 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -230,7 +230,7 @@ static eventid_t str_to_eid(const WCHAR *str) { int i; - for(i=0; i < sizeof(event_info)/sizeof(event_info[0]); i++) { + for(i=0; i < ARRAY_SIZE(event_info); i++) { if(!strcmpW(event_info[i].name, str)) return i; } @@ -245,7 +245,7 @@ static eventid_t attr_to_eid(const WCHAR *str) if((str[0] != 'o' && str[0] != 'O') || (str[1] != 'n' && str[1] != 'N')) return EVENTID_LAST; - for(i=0; i < sizeof(event_info)/sizeof(event_info[0]); i++) { + for(i=0; i < ARRAY_SIZE(event_info); i++) { if(!strcmpW(event_info[i].name, str+2) && event_info[i].dispid) return i; } @@ -2345,7 +2345,7 @@ static void call_event_handlers(EventTarget *event_target, DOMEvent *event, disp } listeners_cnt = 0; - listeners_size = sizeof(listeners_buf)/sizeof(*listeners_buf); + listeners_size = ARRAY_SIZE(listeners_buf); if(container) { LIST_FOR_EACH_ENTRY(listener, &container->listeners, event_listener_t, entry) { @@ -2529,7 +2529,7 @@ static HRESULT dispatch_event_object(EventTarget *event_target, DOMEvent *event, IEventTarget_AddRef(&event_target->IEventTarget_iface); chain_cnt = 0; - chain_buf_size = sizeof(target_chain_buf)/sizeof(*target_chain_buf); + chain_buf_size = ARRAY_SIZE(target_chain_buf); do { if(chain_cnt == chain_buf_size) { diff --git a/dlls/mshtml/htmlimg.c b/dlls/mshtml/htmlimg.c index 90681e4783..13dd3edbb5 100644 --- a/dlls/mshtml/htmlimg.c +++ b/dlls/mshtml/htmlimg.c @@ -312,7 +312,7 @@ static HRESULT WINAPI HTMLImgElement_get_src(IHTMLImgElement *iface, BSTR *p) if(NS_SUCCEEDED(nsres)) { nsAString_GetData(&src_str, &src); - if(!strncmpiW(src, blockedW, sizeof(blockedW)/sizeof(WCHAR)-1)) { + if(!strncmpiW(src, blockedW, ARRAY_SIZE(blockedW)-1)) { TRACE("returning BLOCKED::\n"); *p = SysAllocString(blockedW); if(!*p) diff --git a/dlls/mshtml/htmllocation.c b/dlls/mshtml/htmllocation.c index 59b20f614d..769951643c 100644 --- a/dlls/mshtml/htmllocation.c +++ b/dlls/mshtml/htmllocation.c @@ -355,7 +355,7 @@ static HRESULT WINAPI HTMLLocation_get_host(IHTMLLocation *iface, BSTR *p) WCHAR portW[6]; WCHAR *buf; - port_len = snprintfW(portW, sizeof(portW)/sizeof(portW[0]), format, url.nPort); + port_len = snprintfW(portW, ARRAY_SIZE(portW), format, url.nPort); len = url.dwHostNameLength + 1 /* ':' */ + port_len; buf = *p = SysAllocStringLen(NULL, len); memcpy(buf, url.lpszHostName, url.dwHostNameLength * sizeof(WCHAR)); diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index b99ea08318..bab8923c90 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -303,7 +303,7 @@ static const style_tbl_entry_t style_tbl[] = { {attrZIndex, DISPID_IHTMLSTYLE_ZINDEX} }; -C_ASSERT(sizeof(style_tbl)/sizeof(*style_tbl) == STYLEID_MAX_VALUE); +C_ASSERT(ARRAY_SIZE(style_tbl) == STYLEID_MAX_VALUE); static const WCHAR valLineThrough[] = {'l','i','n','e','-','t','h','r','o','u','g','h',0}; @@ -323,7 +323,7 @@ static const WCHAR emptyW[] = {0}; static const style_tbl_entry_t *lookup_style_tbl(const WCHAR *name) { - int c, i, min = 0, max = sizeof(style_tbl)/sizeof(*style_tbl)-1; + int c, i, min = 0, max = ARRAY_SIZE(style_tbl)-1; while(min <= max) { i = (min+max)/2; @@ -388,7 +388,7 @@ static LPWSTR fix_url_value(LPCWSTR val) static const WCHAR urlW[] = {'u','r','l','('}; - if(strncmpW(val, urlW, sizeof(urlW)/sizeof(WCHAR)) || !strchrW(val, '\\')) + if(strncmpW(val, urlW, ARRAY_SIZE(urlW)) || !strchrW(val, '\\')) return NULL; ret = heap_strdupW(val); @@ -1250,7 +1250,7 @@ static HRESULT WINAPI HTMLStyle_put_backgroundPositionY(IHTMLStyle *iface, VARIA TRACE("no space in %s\n", debugstr_w(pos)); pos = zero_pxW; - space = pos + sizeof(zero_pxW)/sizeof(WCHAR)-1; + space = pos + ARRAY_SIZE(zero_pxW)-1; } posx_len = space-pos; @@ -2718,7 +2718,7 @@ static void update_filter(HTMLStyle *This) continue; } - if(ptr2 + sizeof(alphaW)/sizeof(WCHAR) == ptr && !memcmp(ptr2, alphaW, sizeof(alphaW))) { + if(ptr2 + ARRAY_SIZE(alphaW) == ptr && !memcmp(ptr2, alphaW, sizeof(alphaW))) { static const WCHAR formatW[] = {'%','f',0}; static const WCHAR opacityW[] = {'o','p','a','c','i','t','y','='}; @@ -2735,11 +2735,11 @@ static void update_filter(HTMLStyle *This) break; } - if(ptr-ptr2 > sizeof(opacityW)/sizeof(WCHAR) && !memcmp(ptr2, opacityW, sizeof(opacityW))) { + if(ptr-ptr2 > ARRAY_SIZE(opacityW) && !memcmp(ptr2, opacityW, sizeof(opacityW))) { float fval = 0.0f, e = 0.1f; WCHAR buf[32]; - ptr2 += sizeof(opacityW)/sizeof(WCHAR); + ptr2 += ARRAY_SIZE(opacityW); while(isdigitW(*ptr2)) fval = fval*10.0f + (float)(*ptr2++ - '0'); @@ -2915,12 +2915,12 @@ static HRESULT WINAPI HTMLStyle_removeAttribute(IHTMLStyle *iface, BSTR strAttri return S_OK; } - for(i=0; i < sizeof(style_tbl)/sizeof(*style_tbl); i++) { + for(i=0; i < ARRAY_SIZE(style_tbl); i++) { if(dispid == style_tbl[i].dispid) break; } - if(i == sizeof(style_tbl)/sizeof(*style_tbl)) + if(i == ARRAY_SIZE(style_tbl)) return remove_attribute(&This->dispex, dispid, pfSuccess); style_entry = style_tbl+i; } diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 581de990ee..44f633798a 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -626,8 +626,7 @@ static HRESULT WINAPI HTMLWindow2_alert(IHTMLWindow2 *iface, BSTR message) TRACE("(%p)->(%s)\n", This, debugstr_w(message)); - if(!LoadStringW(get_shdoclc(), IDS_MESSAGE_BOX_TITLE, title, - sizeof(title)/sizeof(WCHAR))) { + if(!LoadStringW(get_shdoclc(), IDS_MESSAGE_BOX_TITLE, title, ARRAY_SIZE(title))) { WARN("Could not load message box title: %d\n", GetLastError()); return S_OK; } @@ -657,8 +656,7 @@ static HRESULT WINAPI HTMLWindow2_confirm(IHTMLWindow2 *iface, BSTR message, if(!confirmed) return E_INVALIDARG; - if(!LoadStringW(get_shdoclc(), IDS_MESSAGE_BOX_TITLE, wszTitle, - sizeof(wszTitle)/sizeof(WCHAR))) { + if(!LoadStringW(get_shdoclc(), IDS_MESSAGE_BOX_TITLE, wszTitle, ARRAY_SIZE(wszTitle))) { WARN("Could not load message box title: %d\n", GetLastError()); *confirmed = VARIANT_TRUE; return S_OK; @@ -689,8 +687,7 @@ static INT_PTR CALLBACK prompt_dlgproc(HWND hwnd, UINT msg, prompt_arg *arg = (prompt_arg*)lparam; WCHAR wszTitle[100]; - if(!LoadStringW(get_shdoclc(), IDS_MESSAGE_BOX_TITLE, wszTitle, - sizeof(wszTitle)/sizeof(WCHAR))) { + if(!LoadStringW(get_shdoclc(), IDS_MESSAGE_BOX_TITLE, wszTitle, ARRAY_SIZE(wszTitle))) { WARN("Could not load message box title: %d\n", GetLastError()); EndDialog(hwnd, wparam); return FALSE; diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c index 9b2f1993ae..6ce8198aee 100644 --- a/dlls/mshtml/main.c +++ b/dlls/mshtml/main.c @@ -126,7 +126,7 @@ static void thread_detach(void) static void free_strings(void) { unsigned int i; - for(i = 0; i < sizeof(status_strings)/sizeof(*status_strings); i++) + for(i = 0; i < ARRAY_SIZE(status_strings); i++) heap_free(status_strings[i]); } @@ -490,7 +490,7 @@ static HRESULT register_server(BOOL do_register) INF_SET_CLSID(TridentAPI); INF_SET_ID(LIBID_MSHTML); - for(i=0; i < sizeof(pse)/sizeof(pse[0]); i++) { + for(i=0; i < ARRAY_SIZE(pse); i++) { pse[i].pszValue = heap_alloc(39); sprintf(pse[i].pszValue, "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", clsids[i]->Data1, clsids[i]->Data2, clsids[i]->Data3, clsids[i]->Data4[0], @@ -498,7 +498,7 @@ static HRESULT register_server(BOOL do_register) clsids[i]->Data4[5], clsids[i]->Data4[6], clsids[i]->Data4[7]); } - strtable.cEntries = sizeof(pse)/sizeof(pse[0]); + strtable.cEntries = ARRAY_SIZE(pse); strtable.pse = pse; hAdvpack = LoadLibraryW(wszAdvpack); @@ -508,7 +508,7 @@ static HRESULT register_server(BOOL do_register) FreeLibrary(hAdvpack); - for(i=0; i < sizeof(pse)/sizeof(pse[0]); i++) + for(i=0; i < ARRAY_SIZE(pse); i++) heap_free(pse[i].pszValue); if(FAILED(hres)) diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index 39a0e58308..6508270d35 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -131,10 +131,10 @@ static PRUnichar *handle_insert_comment(HTMLDocumentNode *doc, const PRUnichar * ptr += 2; len = strlenW(ptr); - if(len < sizeof(endifW)/sizeof(WCHAR)) + if(len < ARRAY_SIZE(endifW)) return NULL; - end = ptr + len-sizeof(endifW)/sizeof(WCHAR); + end = ptr + len - ARRAY_SIZE(endifW); if(memcmp(end, endifW, sizeof(endifW))) return NULL; @@ -398,7 +398,7 @@ static BOOL parse_ua_compatible(const WCHAR *p, compat_mode_t *r) TRACE("%s\n", debugstr_w(p)); - if(strncmpiW(ie_eqW, p, sizeof(ie_eqW)/sizeof(WCHAR))) + if(strncmpiW(ie_eqW, p, ARRAY_SIZE(ie_eqW))) return FALSE; p += 3; diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index cd18287178..f331cfdef5 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -728,13 +728,13 @@ static void parse_content_type(nsChannelBSC *This, const WCHAR *value) ptr++; len = strlenW(value); - if(ptr + sizeof(charsetW)/sizeof(WCHAR) < value+len && !memicmpW(ptr, charsetW, sizeof(charsetW)/sizeof(WCHAR))) { + if(ptr + ARRAY_SIZE(charsetW) < value+len && !memicmpW(ptr, charsetW, ARRAY_SIZE(charsetW))) { size_t charset_len, lena; nsACString charset_str; const WCHAR *charset; char *charseta; - ptr += sizeof(charsetW)/sizeof(WCHAR); + ptr += ARRAY_SIZE(charsetW); if(*ptr == '\'') { FIXME("Quoted value\n"); diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 9c2d5e51f9..6aae9c2948 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -242,7 +242,7 @@ static nsresult create_profile_directory(void) { static const WCHAR wine_geckoW[] = {'\\','w','i','n','e','_','g','e','c','k','o',0}; - WCHAR path[MAX_PATH + sizeof(wine_geckoW)/sizeof(WCHAR)]; + WCHAR path[MAX_PATH + ARRAY_SIZE(wine_geckoW)]; cpp_bool exists; nsresult nsres; HRESULT hres; @@ -309,7 +309,7 @@ static nsresult NSAPI nsDirectoryServiceProvider2_GetFiles(nsIDirectoryServicePr if(!plugin_directory) { static const WCHAR gecko_pluginW[] = {'\\','g','e','c','k','o','\\','p','l','u','g','i','n',0}; - len = GetSystemDirectoryW(plugin_path, (sizeof(plugin_path)-sizeof(gecko_pluginW))/sizeof(WCHAR)+1); + len = GetSystemDirectoryW(plugin_path, ARRAY_SIZE(plugin_path)-ARRAY_SIZE(gecko_pluginW)+1); if(!len) return NS_ERROR_UNEXPECTED; @@ -413,7 +413,7 @@ static BOOL install_wine_gecko(void) static const WCHAR argsW[] = {' ','a','p','p','w','i','z','.','c','p','l',' ','i','n','s','t','a','l','l','_','g','e','c','k','o',0}; - len = GetSystemDirectoryW(app, MAX_PATH-sizeof(controlW)/sizeof(WCHAR)); + len = GetSystemDirectoryW(app, MAX_PATH-ARRAY_SIZE(controlW)); memcpy(app+len, controlW, sizeof(controlW)); args = heap_alloc(len*sizeof(WCHAR) + sizeof(controlW) + sizeof(argsW)); @@ -421,7 +421,7 @@ static BOOL install_wine_gecko(void) return FALSE; memcpy(args, app, len*sizeof(WCHAR) + sizeof(controlW)); - memcpy(args + len + sizeof(controlW)/sizeof(WCHAR)-1, argsW, sizeof(argsW)); + memcpy(args + len + ARRAY_SIZE(controlW)-1, argsW, sizeof(argsW)); TRACE("starting %s\n", debugstr_w(args)); diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 7333334f6e..d5e4983616 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -198,8 +198,8 @@ HRESULT nsuri_to_url(LPCWSTR nsuri, BOOL ret_empty, BSTR *ret) static const WCHAR wine_prefixW[] = {'w','i','n','e',':'}; - if(!strncmpW(nsuri, wine_prefixW, sizeof(wine_prefixW)/sizeof(WCHAR))) - ptr += sizeof(wine_prefixW)/sizeof(WCHAR); + if(!strncmpW(nsuri, wine_prefixW, ARRAY_SIZE(wine_prefixW))) + ptr += ARRAY_SIZE(wine_prefixW); if(*ptr || ret_empty) { *ret = SysAllocString(ptr); @@ -1271,7 +1271,7 @@ static nsresult NSAPI nsChannel_SetRequestMethod(nsIHttpChannel *iface, TRACE("(%p)->(%s)\n", This, debugstr_nsacstr(aRequestMethod)); nsACString_GetData(aRequestMethod, &method); - for(i=0; i < sizeof(request_method_strings)/sizeof(*request_method_strings); i++) { + for(i=0; i < ARRAY_SIZE(request_method_strings); i++) { if(!strcasecmp(method, request_method_strings[i])) { This->request_method = i; return NS_OK; @@ -1356,7 +1356,7 @@ static nsresult NSAPI nsChannel_SetReferrerWithPolicy(nsIHttpChannel *iface, nsI hres = IUri_GetDisplayUri(referrer->uri, &referrer_uri); if(SUCCEEDED(hres)) { - set_http_header(&This->request_headers, refererW, sizeof(refererW)/sizeof(WCHAR), referrer_uri, SysStringLen(referrer_uri)); + set_http_header(&This->request_headers, refererW, ARRAY_SIZE(refererW), referrer_uri, SysStringLen(referrer_uri)); SysFreeString(referrer_uri); } @@ -1584,7 +1584,7 @@ static nsresult NSAPI nsChannel_IsNoStoreResponse(nsIHttpChannel *iface, cpp_boo TRACE("(%p)->(%p)\n", This, _retval); - header = find_http_header(&This->response_headers, cache_controlW, sizeof(cache_controlW)/sizeof(WCHAR)); + header = find_http_header(&This->response_headers, cache_controlW, ARRAY_SIZE(cache_controlW)); *_retval = header && !strcmpiW(header->data, no_storeW); return NS_OK; } @@ -1756,8 +1756,7 @@ static nsresult NSAPI nsUploadChannel_SetUploadStream(nsIUploadChannel *iface, if(!ct) return NS_ERROR_UNEXPECTED; - set_http_header(&This->request_headers, content_typeW, - sizeof(content_typeW)/sizeof(WCHAR), ct, strlenW(ct)); + set_http_header(&This->request_headers, content_typeW, ARRAY_SIZE(content_typeW), ct, strlenW(ct)); heap_free(ct); This->post_data_contains_headers = FALSE; } @@ -2840,7 +2839,7 @@ static nsresult NSAPI nsURI_SchemeIs(nsIFileURL *iface, const char *scheme, cpp_ if(FAILED(hres)) return NS_ERROR_UNEXPECTED; - MultiByteToWideChar(CP_UTF8, 0, scheme, -1, buf, sizeof(buf)/sizeof(WCHAR)); + MultiByteToWideChar(CP_UTF8, 0, scheme, -1, buf, ARRAY_SIZE(buf)); *_retval = !strcmpW(scheme_name, buf); SysFreeString(scheme_name); return NS_OK; @@ -3296,7 +3295,7 @@ static nsresult NSAPI nsFileURL_GetFile(nsIFileURL *iface, nsIFile **aFile) TRACE("(%p)->(%p)\n", This, aFile); - hres = CoInternetParseIUri(This->uri, PARSE_PATH_FROM_URL, 0, path, sizeof(path)/sizeof(WCHAR), &size, 0); + hres = CoInternetParseIUri(This->uri, PARSE_PATH_FROM_URL, 0, path, ARRAY_SIZE(path), &size, 0); if(FAILED(hres)) { WARN("CoInternetParseIUri failed: %08x\n", hres); return NS_ERROR_FAILURE; @@ -3830,7 +3829,7 @@ static BOOL is_gecko_special_uri(const char *spec) static const char *special_schemes[] = {"chrome:", "data:", "jar:", "moz-safe-about", "resource:", "javascript:", "wyciwyg:"}; unsigned int i; - for(i=0; i < sizeof(special_schemes)/sizeof(*special_schemes); i++) { + for(i=0; i < ARRAY_SIZE(special_schemes); i++) { if(!strncasecmp(spec, special_schemes[i], strlen(special_schemes[i]))) return TRUE; } @@ -3894,7 +3893,7 @@ static nsresult NSAPI nsIOServiceHook_NewURI(nsIIOServiceHook *iface, const nsAC SysFreeString(charset); } - MultiByteToWideChar(cp, 0, spec, -1, new_spec, sizeof(new_spec)/sizeof(WCHAR)); + MultiByteToWideChar(cp, 0, spec, -1, new_spec, ARRAY_SIZE(new_spec)); if(base_wine_uri) { hres = combine_url(base_wine_uri->uri, new_spec, &urlmon_uri); diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index ece5874f07..e5fc474bbe 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -228,13 +228,10 @@ static void set_default_templates(nsIPrintSettings *settings) nsIPrintSettings_SetFooterStrRight(settings, empty); nsIPrintSettings_SetFooterStrCenter(settings, empty); - if(LoadStringW(get_shdoclc(), IDS_PRINT_HEADER_TEMPLATE, buf, - sizeof(buf)/sizeof(WCHAR))) + if(LoadStringW(get_shdoclc(), IDS_PRINT_HEADER_TEMPLATE, buf, ARRAY_SIZE(buf))) set_print_template(settings, buf, TRUE); - - if(LoadStringW(get_shdoclc(), IDS_PRINT_FOOTER_TEMPLATE, buf, - sizeof(buf)/sizeof(WCHAR))) + if(LoadStringW(get_shdoclc(), IDS_PRINT_FOOTER_TEMPLATE, buf, ARRAY_SIZE(buf))) set_print_template(settings, buf, FALSE); } @@ -838,7 +835,7 @@ static HRESULT WINAPI OleCommandTarget_QueryStatus(IOleCommandTarget *iface, con ULONG i; for(i=0; i<cCmds; i++) { - if(prgCmds[i].cmdID < OLECMDID_OPEN || prgCmds[i].cmdID >= sizeof(exec_table)/sizeof(*exec_table)) { + if(prgCmds[i].cmdID < OLECMDID_OPEN || prgCmds[i].cmdID >= ARRAY_SIZE(exec_table)) { WARN("Unsupported cmdID = %d\n", prgCmds[i].cmdID); prgCmds[i].cmdf = 0; }else { @@ -909,7 +906,7 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID HTMLDocument *This = impl_from_IOleCommandTarget(iface); if(!pguidCmdGroup) { - if(nCmdID < OLECMDID_OPEN || nCmdID >= sizeof(exec_table)/sizeof(*exec_table) || !exec_table[nCmdID].func) { + if(nCmdID < OLECMDID_OPEN || nCmdID >= ARRAY_SIZE(exec_table) || !exec_table[nCmdID].func) { WARN("Unsupported cmdID = %d\n", nCmdID); return OLECMDERR_E_NOTSUPPORTED; } diff --git a/dlls/mshtml/pluginhost.c b/dlls/mshtml/pluginhost.c index 256850be06..933e35cdcd 100644 --- a/dlls/mshtml/pluginhost.c +++ b/dlls/mshtml/pluginhost.c @@ -2269,10 +2269,10 @@ static BOOL parse_classid(const PRUnichar *classid, CLSID *clsid) static const PRUnichar clsidW[] = {'c','l','s','i','d',':'}; - if(strncmpiW(classid, clsidW, sizeof(clsidW)/sizeof(WCHAR))) + if(strncmpiW(classid, clsidW, ARRAY_SIZE(clsidW))) return FALSE; - ptr = classid + sizeof(clsidW)/sizeof(WCHAR); + ptr = classid + ARRAY_SIZE(clsidW); len = strlenW(ptr); if(len == 38) { diff --git a/dlls/mshtml/protocol.c b/dlls/mshtml/protocol.c index d385f16185..f7b02c9aa0 100644 --- a/dlls/mshtml/protocol.c +++ b/dlls/mshtml/protocol.c @@ -370,8 +370,8 @@ static HRESULT WINAPI AboutProtocol_Start(IInternetProtocol *iface, LPCWSTR szUr TRACE("bindf %x\n", grfBINDF); - if(strlenW(szUrl)>=sizeof(wszAbout)/sizeof(WCHAR) && !memcmp(wszAbout, szUrl, sizeof(wszAbout))) { - text = szUrl + sizeof(wszAbout)/sizeof(WCHAR); + if(strlenW(szUrl) >= ARRAY_SIZE(wszAbout) && !memcmp(wszAbout, szUrl, sizeof(wszAbout))) { + text = szUrl + ARRAY_SIZE(wszAbout); if(!strcmpW(wszBlank, text)) text = NULL; } @@ -570,14 +570,14 @@ static HRESULT WINAPI ResProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, return hres; } - if(len < sizeof(wszRes)/sizeof(wszRes[0]) || memcmp(url, wszRes, sizeof(wszRes))) { + if(len < ARRAY_SIZE(wszRes) || memcmp(url, wszRes, sizeof(wszRes))) { WARN("Wrong protocol of url: %s\n", debugstr_w(url)); IInternetProtocolSink_ReportResult(pOIProtSink, E_INVALIDARG, 0, NULL); heap_free(url); return E_INVALIDARG; } - url_dll = url + sizeof(wszRes)/sizeof(wszRes[0]); + url_dll = url + ARRAY_SIZE(wszRes); if(!(res_type = strchrW(url_dll, '/'))) { WARN("wrong url: %s\n", debugstr_w(url)); IInternetProtocolSink_ReportResult(pOIProtSink, MK_E_SYNTAX, 0, NULL); @@ -692,23 +692,23 @@ static HRESULT WINAPI ResProtocolInfo_ParseUrl(IInternetProtocolInfo *iface, LPC static const WCHAR wszFile[] = {'f','i','l','e',':','/','/'}; static const WCHAR wszRes[] = {'r','e','s',':','/','/'}; - if(strlenW(pwzUrl) <= sizeof(wszRes)/sizeof(WCHAR) || memcmp(pwzUrl, wszRes, sizeof(wszRes))) + if(strlenW(pwzUrl) <= ARRAY_SIZE(wszRes) || memcmp(pwzUrl, wszRes, sizeof(wszRes))) return E_INVALIDARG; - ptr = strchrW(pwzUrl + sizeof(wszRes)/sizeof(WCHAR), '/'); + ptr = strchrW(pwzUrl + ARRAY_SIZE(wszRes), '/'); if(!ptr) return E_INVALIDARG; - len = ptr - (pwzUrl + sizeof(wszRes)/sizeof(WCHAR)); - if(len >= sizeof(file_part)/sizeof(WCHAR)) { + len = ptr - (pwzUrl + ARRAY_SIZE(wszRes)); + if(len >= ARRAY_SIZE(file_part)) { FIXME("Too long URL\n"); return MK_E_SYNTAX; } - memcpy(file_part, pwzUrl + sizeof(wszRes)/sizeof(WCHAR), len*sizeof(WCHAR)); + memcpy(file_part, pwzUrl + ARRAY_SIZE(wszRes), len*sizeof(WCHAR)); file_part[len] = 0; - len = SearchPathW(NULL, file_part, NULL, sizeof(full_path)/sizeof(WCHAR), full_path, NULL); + len = SearchPathW(NULL, file_part, NULL, ARRAY_SIZE(full_path), full_path, NULL); if(!len) { HMODULE module; @@ -720,20 +720,20 @@ static HRESULT WINAPI ResProtocolInfo_ParseUrl(IInternetProtocolInfo *iface, LPC return MK_E_SYNTAX; } - len = GetModuleFileNameW(module, full_path, sizeof(full_path)/sizeof(WCHAR)); + len = GetModuleFileNameW(module, full_path, ARRAY_SIZE(full_path)); FreeLibrary(module); if(!len) return E_FAIL; } - size = sizeof(wszFile)/sizeof(WCHAR) + len + 1; + size = ARRAY_SIZE(wszFile) + len + 1; if(pcchResult) *pcchResult = size; if(size > cchResult) return S_FALSE; memcpy(pwzResult, wszFile, sizeof(wszFile)); - memcpy(pwzResult + sizeof(wszFile)/sizeof(WCHAR), full_path, (len+1)*sizeof(WCHAR)); + memcpy(pwzResult + ARRAY_SIZE(wszFile), full_path, (len+1)*sizeof(WCHAR)); return S_OK; } diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index 7acbd5bd0a..d7b4e92310 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -1054,8 +1054,8 @@ HRESULT load_script(HTMLScriptElement *script_elem, const WCHAR *src, BOOL async static const WCHAR wine_schemaW[] = {'w','i','n','e',':'}; - if(strlenW(src) > sizeof(wine_schemaW)/sizeof(WCHAR) && !memcmp(src, wine_schemaW, sizeof(wine_schemaW))) - src += sizeof(wine_schemaW)/sizeof(WCHAR); + if(strlenW(src) > ARRAY_SIZE(wine_schemaW) && !memcmp(src, wine_schemaW, sizeof(wine_schemaW))) + src += ARRAY_SIZE(wine_schemaW); TRACE("(%p %s %x)\n", script_elem, debugstr_w(src), async); diff --git a/dlls/mshtml/view.c b/dlls/mshtml/view.c index 531c680523..442b07d89a 100644 --- a/dlls/mshtml/view.c +++ b/dlls/mshtml/view.c @@ -411,10 +411,8 @@ HRESULT call_set_active_object(IOleInPlaceUIWindow *window, IOleInPlaceActiveObj { static WCHAR html_documentW[30]; - if(act_obj && !html_documentW[0]) { - LoadStringW(hInst, IDS_HTMLDOCUMENT, html_documentW, - sizeof(html_documentW)/sizeof(WCHAR)); - } + if(act_obj && !html_documentW[0]) + LoadStringW(hInst, IDS_HTMLDOCUMENT, html_documentW, ARRAY_SIZE(html_documentW)); return IOleInPlaceUIWindow_SetActiveObject(window, act_obj, act_obj ? html_documentW : NULL); } -- 2.14.4

2 1

[PATCH 1/7] shell32: Scale SVG properly to create 48x48 sleep icons
by Alex Henrie 24 Aug '18

24 Aug '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- The version of ImageMagick that was released last week started requiring the -density parameter to scale SVGs properly, and I didn't notice until after I had done several of these icons. For the sleep and shutdown icons, redoing them correctly makes them look noticeably better. --- dlls/shell32/resources/sleep.ico | Bin 65140 -> 65144 bytes dlls/shell32/resources/sleep.svg | 244 ++++++++++++++----------------- 2 files changed, 112 insertions(+), 132 deletions(-) diff --git a/dlls/shell32/resources/sleep.ico b/dlls/shell32/resources/sleep.ico index df7a0b05321f0ef3f7f029a1df735cd2f0e75ef3..7c3f26ecb6df0007b8f85ae704a67989d47996da 100644 GIT binary patch delta 34726 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 delta 34939 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%0DcuW&b)ysoq4W9jV5@ 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 DmC}B; diff --git a/dlls/shell32/resources/sleep.svg b/dlls/shell32/resources/sleep.svg index 845d67248b..659f74e417 100644 --- a/dlls/shell32/resources/sleep.svg +++ b/dlls/shell32/resources/sleep.svg @@ -1133,72 +1133,62 @@ preserveAspectRatio="none" xlink:href="data:image/png;base64,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 +gqRg3L24yOXLV5ifn+eDDz743wOgo1jkCwW3sbnJ0SNHyeVyVKoVarUajUZ96H92lFJkwyxhmMX3 +fZaXr1EoFKjXG2xVt25Jj1sGcO7cr9g1u4u3z5+nVCqxa2aGgwfnmT+wwMTEBABRFKGNxlc+vu8T +RRFr62ssX7/G0tIS1WqV82+fp1gssnJt5Zb0uK0k9kd8HvjMA25sfJS5uf3s2j2DEII4jgkzWSZy +O8hkQypbZUpbZbSN8VWA1k2ufniNjY0NVq+vitdf/8Ut63BbANo0OTPJ0YXDTM3sdL7yMa3+NZvN +Ir3kPqdeT0qw53k0mk3W19bFO2+/QxzHt7X2fwuAfspms9x1126CYATnOZx2VCoVVldXb1vhO3SH +7tD/MfpP5j2HCh7EY8QAAAAUdEVYdEF1dGhvcgBKYWt1YiBTdGVpbmVy5vv3LwAAAFh0RVh0Q29w +eXJpZ2h0AENDMCBQdWJsaWMgRG9tYWluIERlZGljYXRpb24gaHR0cDovL2NyZWF0aXZlY29tbW9u +cy5vcmcvcHVibGljZG9tYWluL3plcm8vMS4wL8bjvfkAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTgt +MDgtMjNUMjI6Mjg6MjctMDY6MDCJVk2eAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE4LTA4LTIzVDIy +OjI4OjI3LTA2OjAw+Av1IgAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAAi +dEVYdFNvdXJjZQBodHRwOi8vamltbWFjLm11c2ljaGFsbC5jei/1acjEAAAAEXRFWHRUaXRsZQBT +Y3JlZW5zYWNlcrPCbswAAAAASUVORK5CYII= " id="icon:48-8" x="328" @@ -1209,72 +1199,62 @@ dFRpdGxlAFNjcmVlbnNhY2Vys8JuzAAAAABJRU5ErkJggg== preserveAspectRatio="none" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAABGdBTUEAALGPC/xhBQAAACBjSFJN AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAABmJLR0QAAAAAAAD5Q7t/AAAA -CXBIWXMAAAsvAAALLwEA0SIxAAAAB3RJTUUH4ggUDzI5wXoAZAAADQhJREFUaN7tmVtvXNd1x3/7 -cubOISmJrGjJpiXZjls7toygaYEE6IvT9rmAX/0RCgQI3E9Q5M1A4Je0efNn8IORpzYBWtSpr7El -2fFFlkSLskRyOJzLuey9Vh/OmTMzJJ3WdoC+eAMHnBmes/f6r8t/XQ58t/5/l1n88st//SUAqkqz -0aDZbJI0GhhjvtamKgqqKIqKoqr1vrNr/l2IC/eICGi1DwoqDIdHjMdjDg+HZFlGo9Hg5ZdfBsAv -HbywsYgQY8SJfCMAqqUgS0JrKdQyEEWiIMdAzu5FlRgjMUZEBFkAewLAoqDWWnXe46zFWLv00P9u -V0XFVAJ8lebnADAGIycBVHDx3uG9N9ZarLVLctYAVJVXX32VGCOqyvnz59nefgTrDMbwlVY4Dmvp -8FqT1Z31v3TmINU91efZhqqIKFEEVJmmGQ/uP9D//t2bBqDRaJxuAWstV65c4ebNm9rv9zm3scnN -mw84OBgTQmQZg6mEPA5gZk0wpharfsYasxR5qooKyIJGnLOcOdNha6tXHWOwxmKtVWutsdaeBPD6 -66/T7XYZDAZ02h2SxDEYjPj1r6/x6ae75FkOJ6ygtcQzb5iJayw4C6jMxTfgvMMaU2tbUUKAKLPI -VaxrcPW5h3j++ctYa+h1VzDGLF0nAFy7do2f/eyf+MUvXubRR7dxzhFCZHBwRKctnN9soHN55wxT -gVClDESdWUUrIc38uyqqYdnXKZ/TynVUlcPDgsPBiPF4jPeeTruHQh3IMcaTAIwx/PSn/4iqkiQJ -3ntEhTwPGATvDTEqUZROKwFgMs0XBAMqQM45AEIIKIox1CBmbrcY0KaOEsUAISohzFnMVBuISn2d -GgPdThdVxSce60rmiVGJIZDniveWrU3Hha0VRhPlwz8ckOdhidqaTcv5zQYhCLfuZIjMY2DOPiUg -rT1sHiuqEEMJpNFIwBisteiC8IsA7CIA70s8zjucc3U+KEKkCIJ3cOlhz9Xv97j8aA/vLSJCCJEQ -BFWh2bRcOO/ZPOsqJimVEIKUyohKjEKMgkrEuxQIhKDkeSBNC7K8QBSc87XPL1LvqXnAOUfSSLDW -4l2Cc5YiCFHKg0MRGR4F3r8+IcuF0dgwGEwQkVqrIsreXsp/vZUjAkUhx7h/bgkRaDUzLl+8yd37 -59i51ydLJ0ynGUejJtNpTpbnhKIgrIbKRcuYmlPWAoAYIyqlxp1zWOsQCUgsM2WMEIJy776Q5WNC -NOR5WHIPKEuBNIsL7KlLws/cJMsizgx5/OGP2Dr7Gelki9990ifGSBF6FEVJ27PMDYp3DhHBe3d6 -DMzoaZbxRLWygCBCpVVDlhe1xstco7WwNaVyUmgRIcsKsixnPA70e4c0/ICnrowZDidc/3CbvUGb -Ii9LBmNt6dYVCTjv8Ko4508CMFWw1H+r8kHjzIfn7BHjoqDQbpUamaaBGPUEAJGynsmynMPDMaPR -hMkkEM5M2Bs0+YsnCv7y2ZTbX+zz729cZD83VWxRJr7K7611OKdYd0oiExGilEWTcxbnLCrzGCgF -m4NQrRKTszz79ArWWt54a0hRFKjK0r2TScrR0YTxOCWEkrWMcRjjEXH4xjmuXCr48Q93efP9C+wd -GEIRGY8y0Iz+Sh9MKbhVi7NzF6qhWGsr3y+1b41BKwaZMYkqrHQTvLe1VYpC2NvPebCXkWWhrhhD -EKbTjL29Ifv7R4xGKUURUTUY47DWk3jLSreg2WzS7rQ4ty50O+BsuW+eK51uB+9dZYFSRmMNL7zw -wle7kKm+l76vSGWBVtNx8UKbB3s5u1+mhBCJUbl5a4pCBQDyonSXLM2YTsv7tKLF6jQwhmbTsNYv -aDYMxjTxvsFKT2g2SgVkqdBqtXAVAO89IkK32z1pgeXMWK48hLJWF63MDv1+QrfbwHtXB/HgsGAw -KIhBQCcYOaDIBkwmU0QM1nqc80t/+z3h4a0JZ9YtjYYDHNY5Wk1oNCAGYTQqCFGQqidJvEdFufrs -M6e50PzCGKJAOg2IxFrQ0Tjwxpv7fPzpIZNJXjGTEiNkmVAUYzbXP+OvnvmAHzx1m343kvjS7N57 -fJUgrfU8eWWff/j7j7nw0Co+6aISCKHgaNJFtImIMDrKkShlVWXAJwkhBp5//m9PBnGpd4NiFEqh -0jQgVUDOQOR5gVJVuQvUWOaEwN5Bix//YJ+/+eGAZ578kvv7He49WOHgsEMRLasrGRfPH/DUE0Oe -+p5npb+OtQlRAkWhhNDA+QYiymiUl2WKCNYYkqR0ITB1vbXU0OjC3xiU6TTUmbbqLUqQooSqHAgh -kueBECJgeXCwRogNLm2nXLky4OioYPd+xt5BgxAsa/2CRy6M2DjnaLbOkiQdYjji/oOCj29uEmKL -JHEoVOdr5daGxCfEENne3iaEcAyAzLRcChyiMJmUmVirJDajxhiFoggLhRxY6wBDFM/Hn29xeVt5 -6knP6mqHixciUXJUFO8SrH8I61olfcecwWCPDz5s8p/vPEFWtGkkDtSS5zKvXI0hSRJCCDSShKIo -TpYSEiNiLagQCmE8Kt1FFIoiVgXZYmNtmTVHZcFV5oa3rz1Oq2U5u3aN838W6XTX8clqVS6bstsB -YkgZDna49lGTt689wp3dLVQ93isYu5B7FGMNLnGIRJrNVk06yy6k82lCCMp4nNecboyprGAqLp81 -aGahUSs/TLOEd29cQsXz18/d5bFLu6z2wZomWIvEUGr+yPDmexu8c/0in9zaIkoLa8tW1FDS+Kwi -NpUFyn7l1FKiEsiU04SQR8ajosoJVEKbSuOmfmZR8BkggIPhGd74fY9p1uazO/c4uz6l0zJ4r2R5 -k8m0x/5hm/c/usyd3U2maQvvZUYPGGOJUrlQ1RSVxVxpjRMWMNZiq0yMUfIiMpkEjLEY41luHUxd -Cy0KvditW2PIixZvffAkb1//Ht12ylr/iGajYDxtMxz1SLN2tYehJBVXAxAxhFk5XgWxs6ULganY -aLEfsA4VxRoLClHKJiYvPEWhS430ouZPWuG08YshTRMGwy7WKKIWEXsq8FoeB2laDrxmwjpfspP3 -rj6nBmCtqYu4GIWzZ1v86EcXuHy5X9bmp4hV54Njv4sIRVFQFBmq0Gq18L5Rmb1yEQCj843qWCxd -JvGO9TMt2i1PrNzGOYcxRpvNlpl1j0suZKoGWkTpdhyPPb7ChYvtE33tEohZCbKAKkokz3LyPEUV -2u0OSaNRu8OS1HpyX1XFOUOSWIwJZGlZDfhqJNNsJHVTs0Sjs3FFEQJ5URBjQZKUp9RDhaVGZfH3 -2SyzpN3EO9rtNihYZ7A2Lsw7F54/8Xlek8UIIZbeIbGc0KlKPS1cAjA8PCTGiPeeo+ER6+trdDsr -zFvCucZkYYo1GxXOhoX1OHFGyQv6LqfWc2Hrp/R4E7R8nrGWew++5Ma1G4xGY5OlOVkrXwaQ5zkx -RGKM5s7OHR0MBlhjUbRMcFVzo1JWh1IPYZUQQtmoqJAkyYx3lwe61SBMRCjyskQpew9Ta3zGauUk -ogzusrw3jMYj7n6xa6bTlMl0SqfbWwbwm9/8B7/97b/xk5/8HQfDQ5P4BG8dRREoinzhCsQQCTGi -Kuq8o9Fo0O106PW6JM3mPLCPjUC00vBkMuHwcMjoaESRFzPlGWNLqrTOlYRiHc47DIYQA+PxmDRN -WV9fx9pjLHT16vd5+uk/xyee3kqPjY0NfvUvv+LWrVsURVHXSLN42dzc5LHHHzPblx7R1bVVNjc3 -OHNmnSzLlsy/NNo1BucdMQqDwYDd3V0GBwMe7N037733+3L+yvJwwTnH6uoqL774ItevX6fT6QDw -2muvLQNYXDs7O/z8n3/OH1vb249w6dK2Xn3uKuc2ztFqtVAV9vf2CSGcyAdaCeaThF6vy8MPX+DS -o9t88slneJ9oluXm3XfeXXomxkhRFKRpysbGBjdu3CBNU5rNZn1PDeCVV17h66z+al/7a6uc29hg -c3MDYw3pdMrq2ioShVMTB6UFOu02rWaTTqvDdJoyGAxYW1tVa62ZJa3j66WXXjr191Mt8H9ZCkZE -dDweMZl06fa69Ff6rK+tl/WUzt+PGVPlGajGJYEsyzgajZhOpyUJxGC+1lugbwvg4GDA3t4eN29+ -xnQ64fz5LbbOb9Ht9KomnIqtBIup50x5ljGZDvjy/n3u7Oxw+9Ztdm7fYefW7W8kxzcG8IcPPyKG -wmRZqrt37/H52i3OnDlDb2UFn3iSxNNstHDOkRc5eZ4TKkY7HA452D9gcDDg3r0vzec3P2fni7tf -7z1ctb7e68fj6L3jymOXWVtfp7/SZ6W/ou1Om6SR0PDlOwZrLSFGihAIRUGR54wnE46GI3M0HLJz -5wvu7d4jSvxGMnwrAMfX1tYWG5sb9FZ6tJoNLd9lVf1FCCZNM4aDQ3bv7nIwGPxJzvyTAphR5x97 -r7w4f/pufbe+W99+/Q8+zYNZmzUjnwAAABR0RVh0QXV0aG9yAEpha3ViIFN0ZWluZXLm+/cvAAAA -WHRFWHRDb3B5cmlnaHQAQ0MwIFB1YmxpYyBEb21haW4gRGVkaWNhdGlvbiBodHRwOi8vY3JlYXRp -dmVjb21tb25zLm9yZy9wdWJsaWNkb21haW4vemVyby8xLjAvxuO9+QAAACV0RVh0ZGF0ZTpjcmVh -dGUAMjAxOC0wOC0yMFQyMTo1MDo1Ny0wNjowMC19ycwAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTgt -MDgtMjBUMjE6NTA6NTctMDY6MDBcIHFwAAAAGXRFWHRTb2Z0d2FyZQB3d3cuaW5rc2NhcGUub3Jn -m+48GgAAACJ0RVh0U291cmNlAGh0dHA6Ly9qaW1tYWMubXVzaWNoYWxsLmN6L/VpyMQAAAARdEVY -dFRpdGxlAFNjcmVlbnNhY2Vys8JuzAAAAABJRU5ErkJggg== +CXBIWXMAACWAAAAlgAFsVQgHAAAAB3RJTUUH4ggXEBwgq9nqKwAACsZJREFUaN7tmVuMXdV5x39r +r7X32WcuPjPjGXtsPI494wtjE2ha1ymJCRASRRFCifKQPvWheSAPkRJFVIr6EtFKlaASfahU9SGJ +UvWhioTaKqpKQFRtMBQDITbBYAiuMzbY47mey5z73uvSh33OPlePqd32ofUnHc23v7X3Wt//u631 +rYE7dIf+f5MYJnz66acZGRtxWLDW3tLEzjmstT1/+/ntft3vCQHGWPHUU08NrKOGLZ7JZDhy+Agn +P/27SE/eXFlct+Z9Y/1Mr8DdQN7NRc0mP/rhj90TTzwhnnnmmZsD8H3fzc8foNGsUa5UqdX0tpbu +5sdGfaQSA/JhPK4L/Db85MROFo8tcvql0x/PAwjw/QBrDT/5u3d54fm3mJzI9ljGGIvWZoiCHdMl +YoeUAillj7WtdWgt+ryQMJubMd/74we577cmk3Ayhkwm6AW/LQDnUEphnWFjvcLBA45Dh3I411G2 +nRuduKUvjkn/CtGRWZsgHP5NAujixQorK1tMX60TZkKmpqYJwxCt9ccD4FoAIq0pFusI4YhjnS46 +Pj5KqVTuU7ajqFKKKIpbYAcVbVu9d7xjHCkdm5s15vYfxzqLs5YgEyCEcPQVHm8oAEApiXOWajXG +8xxRFBNFmkA1eODTITOTVbQ2xLEhjjVxnIwbY/nao+NI6dDa9P0sxji0dimfPNuuMYuUkN+ss3zt +OssfrWCtJfB9hBgsmjcIIZBSYZ0jijUg0NoyNjbCww/kuP+z9zM+pvjp80UKhVJa8gDCMEsulyUb ++tRqMe0qPNz6vWPWghDgeY5iqcmevbNYazHW4PsBQ/S/cQglSWfRsUYID60txWKZ069sMjYqePXM ++6yuZtNEbYdBqVTlr354lWYzSmWJT3tDpS0/9anXeeXcSayFer1BpVInn99ido9mczNPqVhm8dhR +fF8xpBbfGIDneVhriWOD53kYk1Sc6+uKf3yuyMZGFrBp8nVb15hmn6JtkK4HlHOC+46c5/DcBZ74 +s9+jUk3cJYRg57RhamqSiYkczll830+TfNscePLJJ1FKpQppbRDCS+PTGMfGRgljDMYkbjemHc82 +cXnKO6x1ady3Yz6ODWtrRS5c+A0XL2e458gy3//2a0ipkFLheQqtDZVKlf/4YIk41kilUiNu64HR +0VGCwMc5Cw6iyKTlz1oSeWrR7qrlEcft0tpr/fZzHGtWVzcpFstpvC99mEOoOU7cu8GpEyucObcP +gDgyjI6NsHD4QKKoUlg7CGDAA845MplMUr5ILAkitW4CxLasn4yPZjUPn8phDGhNaumOxTUrK5tc +vPgRpVINISRSSjxP0YgyGOOY3Hk33/j9C6kXtDFEzZj3L1wkjmOUVOnGuS0AIPGAbW9Yvco45wiC +IJWDx/HFaX77vlnCMEyBJV6DfL7MpUvLFApVhJB4nkyVlFKyc7JJJpPBD2Y5sLdAbtwkAGKLHygW +jx/B8wRSeR9vI/M8jyAIEw84h7MWY5Lk8X3JV748xd694/z1jz6i0WhijOHlM3nefKtGtVpvgYZm +M2J9vUizGQMeUkL3HtSu6b9zzzp+sAeEh7bj7NtT5eLlEbSxadGxziI9OfQoMeABrTVB4GOtpdHQ +QBL71joaDc3Lr67x2uur1GrN1MrGOMrlOtaC1paNjRLXrxdam5JME7PNt62/Z1edQ59YRwW7Wlnl +EWZIkridT8nJDtsq7Y899tjHCKHWwam8FSM8m24y1jquXnecebOGcy4Nl/ZYrdZkR/Z9vv7l00zs +iFpKDyoupSLwPb73zZfIjs0jRBIIUtQolHYgpQLhqNd1xwutA93Y2Nj2IWSMSZLYGiqVCCHasd6p +JsboFi8AhzGGra0azWZMqbibP/nOc3z1i+/wr68t8uIri1y6sgvrBCAQAg7u2+Bbf/BzDu53jI0f +ThTUWzRjj43iFFKCJxzlckQmDBMPWEMYhkTR+vYArLX4gY9teaCTA90gRCu0LNVqoxXnLrEccObs +Yb70UJ5HvxDz4MkX8Lwa+WKOZuQzldsiEzjGdsyTHT1I+3xQKl3in//tU+kcQljK5Zjp6TAxrLNk +wnAgDwYAOOdc4Ac4a9kqRwhBWrOT8eRc1GzG6YnT82TXOUXwk+c+w6kTf8P07Dyj40dwLmJqpgrO +IrwQT472rBk1l9kqlfjZ6ZOtuZLJyltxmgfWWLLZ7ACAgRzwPA+lJMYaCvk6qtVdGQONhqZSaVKp +NFpHDJnGdXe8b1Vy/OXfPkp+7Q1MtIEQAVJNIv2dg8rXr5Bfe5c//8HXifVIK+ElSnmUilGisEsq +UZjJDPToAx4QQqB8H+ccm/kGnge1WtTahZMGu+3m9vtdX6eeOPfe3Tz9gyx/9I2/Jwin2DGxH6km +EUJhbQMTb1IqXGGz4PEXP/5DltdmekptJuPYzNc7od1K4n4aEkIGKSXGGErFBkolyed5nckTJQdr +ej//66UFvvWn3+WR+8/y4Mnz7Jl5A+lpGtEIV5b38i///jC/fPc4xnpIKXrCMAgcxUKzU0ZtkgM3 +9YC14CuFc5atrYhMRiFE7+T9ILYDZKzixVc/y4uvnrohYCk7c7eHwhCKxahTRq0lEwYDB7qhVUgq +hTYRzaZBKTUweT+/PYj/GuD23FJCvd65NLDOEoZZSCClHwzuA9YgpUekDY88sp833vAZIDdM5Fpy +0fNCmxN9H7obztOhEydmOn2GtfhKdRl0Gw8oqXDWcepzezj1uT3b3tn0Kt/hr350lUq1Rr1WY/HY +IkHG3/b9Ab6v5bStxv6mAIw2OOcoFIvUqtVehekHQhffC1AqRS63g1xuB/l8vsvEN7/w6lmvJZ+e +nsETYqCxH1pG33vvPY4dP0YcR12udimfLtZS1nUp5vqQdffM/e+kT0OAtOdsPyul+Ok//BONRqMH +wQCAWq0mXnj+RffSz18mzIY9l6zGGrC0Gh3TuWlIOzBLp++1Qy9y203RoKz33R4wzlGtVrHWMjIy +0mtwbkCPP/44UkpWVlYoFApUq1UajQbNZhOtNVproigiCAIOzO93uclJfE9x7333sB055zh79lc4 +a7m+ssLSpSXheR6e57V2dA/f9wmCgDAMGRsbY3JykpGREZ599tmB+QS3Qcc+eYxDCwtudnY39957 +D7tnZ1n6zdJNAMCBg/u5cvlDzp57i0q5wi/efFOsLq/ekg7qlr4C9n1iH4cXDrmHPv8Qc3N3IYRI ++2m44W16sqjyWTi0wPzCPGd/eRaBcD977nkxrGX8HwOwf27OHT66wL679uL7Plrr5D5n584hZh+C +gqRg3L24yOXLV5ifn+eDDz743wOgo1jkCwW3sbnJ0SNHyeVyVKoVarUajUZ96H92lFJkwyxhmMX3 +fZaXr1EoFKjXG2xVt25Jj1sGcO7cr9g1u4u3z5+nVCqxa2aGgwfnmT+wwMTEBABRFKGNxlc+vu8T +RRFr62ssX7/G0tIS1WqV82+fp1gssnJt5Zb0uK0k9kd8HvjMA25sfJS5uf3s2j2DEII4jgkzWSZy +O8hkQypbZUpbZbSN8VWA1k2ufniNjY0NVq+vitdf/8Ut63BbANo0OTPJ0YXDTM3sdL7yMa3+NZvN +Ir3kPqdeT0qw53k0mk3W19bFO2+/QxzHt7X2fwuAfspms9x1126CYATnOZx2VCoVVldXb1vhO3SH +7tD/MfpP5j2HCh7EY8QAAAAUdEVYdEF1dGhvcgBKYWt1YiBTdGVpbmVy5vv3LwAAAFh0RVh0Q29w +eXJpZ2h0AENDMCBQdWJsaWMgRG9tYWluIERlZGljYXRpb24gaHR0cDovL2NyZWF0aXZlY29tbW9u +cy5vcmcvcHVibGljZG9tYWluL3plcm8vMS4wL8bjvfkAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTgt +MDgtMjNUMjI6Mjg6MzItMDY6MDAXxGKnAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE4LTA4LTIzVDIy +OjI4OjMyLTA2OjAwZpnaGwAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAAi +dEVYdFNvdXJjZQBodHRwOi8vamltbWFjLm11c2ljaGFsbC5jei/1acjEAAAAEXRFWHRUaXRsZQBT +Y3JlZW5zYWNlcrPCbswAAAAASUVORK5CYII= " id="icon:48-4" x="384" -- 2.18.0

1 6

[PATCH 1/4] ntdll: Also accept \\? as a UNC or device path in RtlDetermineDosPathNameType_U().
by Zebediah Figura 24 Aug '18

24 Aug '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntdll/path.c | 8 ++++---- dlls/ntdll/tests/path.c | 7 +++++++ 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/path.c b/dlls/ntdll/path.c index ccc95e3..8fe61da 100644 --- a/dlls/ntdll/path.c +++ b/dlls/ntdll/path.c @@ -244,10 +244,10 @@ DOS_PATHNAME_TYPE WINAPI RtlDetermineDosPathNameType_U( PCWSTR path ) if (IS_SEPARATOR(path[0])) { if (!IS_SEPARATOR(path[1])) return ABSOLUTE_PATH; /* "/foo" */ - if (path[2] != '.') return UNC_PATH; /* "//foo" */ - if (IS_SEPARATOR(path[3])) return DEVICE_PATH; /* "//./foo" */ - if (path[3]) return UNC_PATH; /* "//.foo" */ - return UNC_DOT_PATH; /* "//." */ + if (path[2] != '.' && path[2] != '?') return UNC_PATH; /* "//foo" */ + if (IS_SEPARATOR(path[3])) return DEVICE_PATH; /* "//./foo" or "//?/foo" */ + if (path[3]) return UNC_PATH; /* "//.foo" or "//?foo" */ + return UNC_DOT_PATH; /* "//." or "//?" */ } else { diff --git a/dlls/ntdll/tests/path.c b/dlls/ntdll/tests/path.c index 9369e1c..94b76c1 100644 --- a/dlls/ntdll/tests/path.c +++ b/dlls/ntdll/tests/path.c @@ -68,6 +68,13 @@ static void test_RtlDetermineDosPathNameType_U(void) { "//.foo", 1 }, { "\\\\.", 7 }, { "//.", 7 }, + { "\\\\?\\foo", 6 }, + { "//?/foo", 6 }, + { "/\\?/foo", 6 }, + { "\\\\?foo", 1 }, + { "//?foo", 1 }, + { "\\\\?", 7 }, + { "//?", 7 }, { NULL, 0 } }; -- 2.7.4

1 3

[PATCH] user32: When registering redirected class use correct base class name
by Fabian Maurer 23 Aug '18

23 Aug '18

Some applications are dependent on the correct spelling of "ComboBox", it can't be the "Combobox" from the comctl32 manifest. We have to take it from the base class instead of the versioned class name. Supersedes 150043 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45689 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/comctl32/tests/combo.c | 15 +++++++++++++ dlls/user32/class.c | 41 ++++++++++++++++------------------ dlls/user32/user_private.h | 3 +-- dlls/user32/win.c | 2 +- include/wine/server_protocol.h | 9 ++++---- server/class.c | 14 +++++++----- server/protocol.def | 6 +++-- server/request.h | 3 ++- server/trace.c | 6 +++-- 9 files changed, 59 insertions(+), 40 deletions(-) diff --git a/dlls/comctl32/tests/combo.c b/dlls/comctl32/tests/combo.c index 923d826b30..065ce1a620 100644 --- a/dlls/comctl32/tests/combo.c +++ b/dlls/comctl32/tests/combo.c @@ -1254,6 +1254,20 @@ static void test_combo_dropdown_size(DWORD style) } } +static void test_combo(void) +{ + HWND handle_combo; + char classname[10]; + + handle_combo = create_combobox(CBS_DROPDOWNLIST); + + GetClassNameA(handle_combo, classname, sizeof(classname)); + + ok(strcmp(classname, "ComboBox") == 0, "Got wrong classname: %s\n", classname); + + DestroyWindow(handle_combo); +} + START_TEST(combo) { ULONG_PTR ctx_cookie; @@ -1281,6 +1295,7 @@ START_TEST(combo) } /* ComboBox control tests. */ + test_combo(); test_combo_WS_VSCROLL(); test_combo_setfont(CBS_DROPDOWN); test_combo_setfont(CBS_DROPDOWNLIST); diff --git a/dlls/user32/class.c b/dlls/user32/class.c index 07d36f05d7..3d4105d91b 100644 --- a/dlls/user32/class.c +++ b/dlls/user32/class.c @@ -61,7 +61,7 @@ typedef struct tagCLASS HBRUSH hbrBackground; /* Default background */ ATOM atomName; /* Name of the class */ WCHAR name[MAX_ATOM_LEN + 1]; - WCHAR *basename; /* Base name for redirected classes, pointer within 'name'. */ + WCHAR basename[MAX_ATOM_LEN + 1]; /* Base name for redirected classes */ } CLASS; static struct list class_list = LIST_INIT( class_list ); @@ -320,7 +320,7 @@ static void CLASS_FreeClass( CLASS *classPtr ) USER_Unlock(); } -const WCHAR *CLASS_GetVersionedName( const WCHAR *name, UINT *basename_offset, BOOL register_class ) +const WCHAR *CLASS_GetVersionedName( const WCHAR *name, BOOL register_class ) { ACTCTX_SECTION_KEYED_DATA data; struct wndclass_redirect_data @@ -336,9 +336,6 @@ const WCHAR *CLASS_GetVersionedName( const WCHAR *name, UINT *basename_offset, B UNICODE_STRING name_us; HMODULE hmod; - if (basename_offset) - *basename_offset = 0; - if (IS_INTRESOURCE( name )) return name; @@ -352,8 +349,6 @@ const WCHAR *CLASS_GetVersionedName( const WCHAR *name, UINT *basename_offset, B return name; wndclass = (struct wndclass_redirect_data *)data.lpData; - if (basename_offset) - *basename_offset = wndclass->name_len / sizeof(WCHAR) - strlenW(name); module = (const WCHAR *)((BYTE *)data.lpSectionBase + wndclass->module_offset); if (!(hmod = GetModuleHandleW( module ))) @@ -409,7 +404,7 @@ static CLASS *CLASS_FindClass( LPCWSTR name, HINSTANCE hinstance ) if (!name) return NULL; - name = CLASS_GetVersionedName( name, NULL, TRUE ); + name = CLASS_GetVersionedName( name, TRUE ); for (;;) { @@ -450,11 +445,12 @@ static CLASS *CLASS_FindClass( LPCWSTR name, HINSTANCE hinstance ) * * The real RegisterClass() functionality. */ -static CLASS *CLASS_RegisterClass( LPCWSTR name, UINT basename_offset, HINSTANCE hInstance, BOOL local, +static CLASS *CLASS_RegisterClass( LPCWSTR name, LPCWSTR basename, HINSTANCE hInstance, BOOL local, DWORD style, INT classExtra, INT winExtra ) { CLASS *classPtr; BOOL ret; + int name_len = 0, basename_len = 0; TRACE("name=%s hinst=%p style=0x%x clExtr=0x%x winExtr=0x%x\n", debugstr_w(name), hInstance, style, classExtra, winExtra ); @@ -470,11 +466,12 @@ static CLASS *CLASS_RegisterClass( LPCWSTR name, UINT basename_offset, HINSTANCE if (!classPtr) return NULL; classPtr->atomName = get_int_atom_value( name ); - classPtr->basename = classPtr->name; if (!classPtr->atomName && name) { strcpyW( classPtr->name, name ); - classPtr->basename += basename_offset; + name_len = strlenW(name) * sizeof(WCHAR); + strcpyW( classPtr->basename, basename ); + basename_len = strlenW(basename) * sizeof(WCHAR); } else GlobalGetAtomNameW( classPtr->atomName, classPtr->name, ARRAY_SIZE( classPtr->name )); @@ -487,8 +484,10 @@ static CLASS *CLASS_RegisterClass( LPCWSTR name, UINT basename_offset, HINSTANCE req->win_extra = winExtra; req->client_ptr = wine_server_client_ptr( classPtr ); req->atom = classPtr->atomName; - req->name_offset = basename_offset; - if (!req->atom && name) wine_server_add_data( req, name, strlenW(name) * sizeof(WCHAR) ); + req->name_len = name_len; + req->basename_len = basename_len; + if (name_len) wine_server_add_data( req, name, name_len); + if (basename_len) wine_server_add_data( req, basename, basename_len); ret = !wine_server_call_err( req ); classPtr->atomName = reply->atom; } @@ -524,7 +523,7 @@ static void register_builtin( const struct builtin_class_descr *descr ) { CLASS *classPtr; - if (!(classPtr = CLASS_RegisterClass( descr->name, 0, user32_module, FALSE, + if (!(classPtr = CLASS_RegisterClass( descr->name, descr->name, user32_module, FALSE, descr->style, 0, descr->extra ))) return; if (descr->cursor) classPtr->hCursor = LoadCursorA( 0, (LPSTR)descr->cursor ); @@ -680,15 +679,14 @@ ATOM WINAPI RegisterClassExA( const WNDCLASSEXA* wc ) if (!IS_INTRESOURCE(wc->lpszClassName)) { - UINT basename_offset; if (!MultiByteToWideChar( CP_ACP, 0, wc->lpszClassName, -1, name, MAX_ATOM_LEN + 1 )) return 0; - classname = CLASS_GetVersionedName( name, &basename_offset, FALSE ); - classPtr = CLASS_RegisterClass( classname, basename_offset, instance, !(wc->style & CS_GLOBALCLASS), + classname = CLASS_GetVersionedName( name, FALSE ); + classPtr = CLASS_RegisterClass( classname, name, instance, !(wc->style & CS_GLOBALCLASS), wc->style, wc->cbClsExtra, wc->cbWndExtra ); } else { - classPtr = CLASS_RegisterClass( (LPCWSTR)wc->lpszClassName, 0, instance, + classPtr = CLASS_RegisterClass( (LPCWSTR)wc->lpszClassName, (LPCWSTR)wc->lpszClassName, instance, !(wc->style & CS_GLOBALCLASS), wc->style, wc->cbClsExtra, wc->cbWndExtra ); } @@ -721,7 +719,6 @@ ATOM WINAPI RegisterClassExA( const WNDCLASSEXA* wc ) ATOM WINAPI RegisterClassExW( const WNDCLASSEXW* wc ) { const WCHAR *classname; - UINT basename_offset; ATOM atom; CLASS *classPtr; HINSTANCE instance; @@ -736,8 +733,8 @@ ATOM WINAPI RegisterClassExW( const WNDCLASSEXW* wc ) } if (!(instance = wc->hInstance)) instance = GetModuleHandleW( NULL ); - classname = CLASS_GetVersionedName( wc->lpszClassName, &basename_offset, FALSE ); - if (!(classPtr = CLASS_RegisterClass( classname, basename_offset, instance, !(wc->style & CS_GLOBALCLASS), + classname = CLASS_GetVersionedName( wc->lpszClassName, FALSE ); + if (!(classPtr = CLASS_RegisterClass( classname, wc->lpszClassName, instance, !(wc->style & CS_GLOBALCLASS), wc->style, wc->cbClsExtra, wc->cbWndExtra ))) return 0; @@ -789,7 +786,7 @@ BOOL WINAPI UnregisterClassW( LPCWSTR className, HINSTANCE hInstance ) GetDesktopWindow(); /* create the desktop window to trigger builtin class registration */ - className = CLASS_GetVersionedName( className, NULL, FALSE ); + className = CLASS_GetVersionedName( className, FALSE ); SERVER_START_REQ( destroy_class ) { req->instance = wine_server_client_ptr( hInstance ); diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 73a2badc7d..8051f15d30 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -272,8 +272,7 @@ extern INT_PTR WINPROC_CallDlgProcW( DLGPROC func, HWND hwnd, UINT msg, WPARAM w extern BOOL WINPROC_call_window( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, LRESULT *result, BOOL unicode, enum wm_char_mapping mapping ) DECLSPEC_HIDDEN; -extern const WCHAR *CLASS_GetVersionedName(const WCHAR *classname, UINT *basename_offset, - BOOL register_class) DECLSPEC_HIDDEN; +extern const WCHAR *CLASS_GetVersionedName(const WCHAR *classname, BOOL register_class) DECLSPEC_HIDDEN; /* message spy definitions */ diff --git a/dlls/user32/win.c b/dlls/user32/win.c index cbfd8bb14a..48cf947b36 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -1323,7 +1323,7 @@ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, CBT_CREATEWNDW cbtc; CREATESTRUCTW cbcs; - className = CLASS_GetVersionedName(className, NULL, TRUE); + className = CLASS_GetVersionedName(className, TRUE); TRACE("%s %s%s%s ex=%08x style=%08x %d,%d %dx%d parent=%p menu=%p inst=%p params=%p\n", unicode ? debugstr_w(cs->lpszName) : debugstr_a((LPCSTR)cs->lpszName), diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index c636bacb35..4f29006036 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -4496,9 +4496,10 @@ struct create_class_request int extra; int win_extra; client_ptr_t client_ptr; - data_size_t name_offset; - /* VARARG(name,unicode_str); */ - char __pad_52[4]; + data_size_t name_len; + data_size_t basename_len; + /* VARARG(name,unicode_str,name_len); */ + /* VARARG(name,unicode_str,basename_len); */ }; struct create_class_reply { @@ -6533,6 +6534,6 @@ union generic_reply struct terminate_job_reply terminate_job_reply; }; -#define SERVER_PROTOCOL_VERSION 556 +#define SERVER_PROTOCOL_VERSION 557 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/class.c b/server/class.c index 6a7de7843e..da6191d6aa 100644 --- a/server/class.c +++ b/server/class.c @@ -151,19 +151,21 @@ client_ptr_t get_class_client_ptr( struct window_class *class ) DECL_HANDLER(create_class) { struct window_class *class; - struct unicode_str name = get_req_unicode_str(); + struct unicode_str name, basename; atom_t atom, base_atom; + name.len = req->name_len; + name.str = get_req_data(); + basename.len = req->basename_len; + basename.str = (WCHAR *)((char *)get_req_data() + req->name_len); + if (name.len) { atom = add_global_atom( NULL, &name ); if (!atom) return; - if (req->name_offset && req->name_offset < name.len / sizeof(WCHAR)) + if (basename.len) { - name.str += req->name_offset; - name.len -= req->name_offset * sizeof(WCHAR); - - base_atom = add_global_atom( NULL, &name ); + base_atom = add_global_atom( NULL, &basename ); if (!base_atom) { release_global_atom( NULL, atom ); diff --git a/server/protocol.def b/server/protocol.def index c8bb3b1100..c55f888a6d 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -3159,8 +3159,10 @@ enum caret_state int extra; /* number of extra class bytes */ int win_extra; /* number of window extra bytes */ client_ptr_t client_ptr; /* pointer to class in client address space */ - data_size_t name_offset; /* base class name offset for specified atom */ - VARARG(name,unicode_str); /* class name */ + data_size_t name_len; /* class name length */ + data_size_t basename_len; /* base class name length */ + VARARG(name,unicode_str,name_len); /* class name */ + VARARG(name,unicode_str,basename_len); /* base class name */ @REPLY atom_t atom; /* resulting class atom */ @END diff --git a/server/request.h b/server/request.h index d3028f0b1d..56562be81c 100644 --- a/server/request.h +++ b/server/request.h @@ -2044,7 +2044,8 @@ C_ASSERT( FIELD_OFFSET(struct create_class_request, instance) == 24 ); C_ASSERT( FIELD_OFFSET(struct create_class_request, extra) == 32 ); C_ASSERT( FIELD_OFFSET(struct create_class_request, win_extra) == 36 ); C_ASSERT( FIELD_OFFSET(struct create_class_request, client_ptr) == 40 ); -C_ASSERT( FIELD_OFFSET(struct create_class_request, name_offset) == 48 ); +C_ASSERT( FIELD_OFFSET(struct create_class_request, name_len) == 48 ); +C_ASSERT( FIELD_OFFSET(struct create_class_request, basename_len) == 52 ); C_ASSERT( sizeof(struct create_class_request) == 56 ); C_ASSERT( FIELD_OFFSET(struct create_class_reply, atom) == 8 ); C_ASSERT( sizeof(struct create_class_reply) == 16 ); diff --git a/server/trace.c b/server/trace.c index 68e47d49b8..966022aaac 100644 --- a/server/trace.c +++ b/server/trace.c @@ -3770,8 +3770,10 @@ static void dump_create_class_request( const struct create_class_request *req ) fprintf( stderr, ", extra=%d", req->extra ); fprintf( stderr, ", win_extra=%d", req->win_extra ); dump_uint64( ", client_ptr=", &req->client_ptr ); - fprintf( stderr, ", name_offset=%u", req->name_offset ); - dump_varargs_unicode_str( ", name=", cur_size ); + fprintf( stderr, ", name_len=%u", req->name_len ); + fprintf( stderr, ", basename_len=%u", req->basename_len ); + dump_varargs_unicode_str( ", name=", min(cur_size,req->name_len) ); + dump_varargs_unicode_str( ", name=", min(cur_size,req->basename_len) ); } static void dump_create_class_reply( const struct create_class_reply *req ) -- 2.18.0

2 7

[PATCH v2] user32: When registering redirected class use correct base class name
by Fabian Maurer 23 Aug '18

23 Aug '18

Based on a patch by Nikolay Sivov Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45689 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/comctl32/tests/combo.c | 15 +++++++++++++++ dlls/user32/class.c | 14 ++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/dlls/comctl32/tests/combo.c b/dlls/comctl32/tests/combo.c index 923d826b30..065ce1a620 100644 --- a/dlls/comctl32/tests/combo.c +++ b/dlls/comctl32/tests/combo.c @@ -1254,6 +1254,20 @@ static void test_combo_dropdown_size(DWORD style) } } +static void test_combo(void) +{ + HWND handle_combo; + char classname[10]; + + handle_combo = create_combobox(CBS_DROPDOWNLIST); + + GetClassNameA(handle_combo, classname, sizeof(classname)); + + ok(strcmp(classname, "ComboBox") == 0, "Got wrong classname: %s\n", classname); + + DestroyWindow(handle_combo); +} + START_TEST(combo) { ULONG_PTR ctx_cookie; @@ -1281,6 +1295,7 @@ START_TEST(combo) } /* ComboBox control tests. */ + test_combo(); test_combo_WS_VSCROLL(); test_combo_setfont(CBS_DROPDOWN); test_combo_setfont(CBS_DROPDOWNLIST); diff --git a/dlls/user32/class.c b/dlls/user32/class.c index 07d36f05d7..b8309025ca 100644 --- a/dlls/user32/class.c +++ b/dlls/user32/class.c @@ -664,6 +664,7 @@ ATOM WINAPI RegisterClassExA( const WNDCLASSEXA* wc ) { const WCHAR *classname = NULL; WCHAR name[MAX_ATOM_LEN + 1]; + WCHAR classname_versioned[MAX_ATOM_LEN + 1]; ATOM atom; CLASS *classPtr; HINSTANCE instance; @@ -683,6 +684,12 @@ ATOM WINAPI RegisterClassExA( const WNDCLASSEXA* wc ) UINT basename_offset; if (!MultiByteToWideChar( CP_ACP, 0, wc->lpszClassName, -1, name, MAX_ATOM_LEN + 1 )) return 0; classname = CLASS_GetVersionedName( name, &basename_offset, FALSE ); + if (basename_offset) /* Make sure redirected classes have the same name as their base class */ + { + strcpyW(classname_versioned, classname); + strcpyW(&classname_versioned[basename_offset], name); + classname = classname_versioned; + } classPtr = CLASS_RegisterClass( classname, basename_offset, instance, !(wc->style & CS_GLOBALCLASS), wc->style, wc->cbClsExtra, wc->cbWndExtra ); } @@ -721,6 +728,7 @@ ATOM WINAPI RegisterClassExA( const WNDCLASSEXA* wc ) ATOM WINAPI RegisterClassExW( const WNDCLASSEXW* wc ) { const WCHAR *classname; + WCHAR classname_versioned[MAX_ATOM_LEN + 1]; UINT basename_offset; ATOM atom; CLASS *classPtr; @@ -737,6 +745,12 @@ ATOM WINAPI RegisterClassExW( const WNDCLASSEXW* wc ) if (!(instance = wc->hInstance)) instance = GetModuleHandleW( NULL ); classname = CLASS_GetVersionedName( wc->lpszClassName, &basename_offset, FALSE ); + if (basename_offset) /* Make sure redirected classes have the same name as their base class */ + { + strcpyW(classname_versioned, classname); + strcpyW(&classname_versioned[basename_offset], wc->lpszClassName); + classname = classname_versioned; + } if (!(classPtr = CLASS_RegisterClass( classname, basename_offset, instance, !(wc->style & CS_GLOBALCLASS), wc->style, wc->cbClsExtra, wc->cbWndExtra ))) return 0; -- 2.18.0

1 0

[PATCH] dmusic: Make midi_port_create() static.
by Michael Stefaniuc 23 Aug '18

23 Aug '18

From: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmusic/port.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dmusic/port.c b/dlls/dmusic/port.c index 1fa94694a9..91913a716f 100644 --- a/dlls/dmusic/port.c +++ b/dlls/dmusic/port.c @@ -1174,8 +1174,8 @@ static const IDirectMusicThruVtbl midi_thru_vtbl = { midi_IDirectMusicThru_ThruChannel, }; -HRESULT midi_port_create(IDirectMusic8Impl *parent, DMUS_PORTPARAMS *params, DMUS_PORTCAPS *caps, - IDirectMusicPort **port) +static HRESULT midi_port_create(IDirectMusic8Impl *parent, DMUS_PORTPARAMS *params, + DMUS_PORTCAPS *caps, IDirectMusicPort **port) { struct midi_port *obj; HRESULT hr; -- 2.14.4

1 0

[PATCH] testbot: Let LogUtils detect and return the list of errors.
by Francois Gouget 23 Aug '18

23 Aug '18

LogUtils now exports GetLogErrors() which analyzes the specified log and associated extra errors file and returns per-module lists of errors. For test reports modules correspond to dlls or programs and for other types of log there is a single module called "". Errors from the extra errors file go to an extra module. JobDetails now uses that to offload most of the work of identifying errors. It now can also show errors from more than one report / log when in summary mode. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/LogUtils.pm | 140 +++++++++++++++- testbot/web/JobDetails.pl | 237 +++++++++++++--------------- 2 files changed, 247 insertions(+), 130 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 6f7cef5e8..a5a1a68b5 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -27,7 +27,7 @@ WineTestBot::LogUtils - Provides functions to parse task logs use Exporter 'import'; -our @EXPORT = qw(GetLogFileNames GetLogLabel +our @EXPORT = qw(GetLogFileNames GetLogLabel GetLogErrors GetLogLineCategory GetReportLineCategory RenameReferenceLogs RenameTaskLogs ParseTaskLog ParseWineTestReport); @@ -547,13 +547,17 @@ sub GetLogFileNames($;$) my @Candidates = ("exe32.report", "exe64.report", "win32.report", "wow32.report", "wow64.report", - "log", "log.err"); - push @Candidates, "old_log", "old_log.err" if ($IncludeOld); + "log"); + push @Candidates, "old_log" if ($IncludeOld); my @Logs; foreach my $FileName (@Candidates) { - push @Logs, $FileName if (-f "$Dir/$FileName" and !-z "$Dir/$FileName"); + if ((-f "$Dir/$FileName" and !-z "$Dir/$FileName") or + (-f "$Dir/$FileName.err" and !-z "$Dir/$FileName.err")) + { + push @Logs, $FileName; + } } return \@Logs; } @@ -565,9 +569,7 @@ my %_LogFileLabels = ( "wow32.report" => "32 bit WoW Wine report", "wow64.report" => "64 bit Wow Wine report", "log" => "task log", - "log.err" => "task errors", "old_log" => "old logs", - "old_log.err" => "old task errors", ); =pod @@ -586,4 +588,130 @@ sub GetLogLabel($) return $_LogFileLabels{$LogFileName}; } + +sub _DumpErrors($$$) +{ + my ($Label, $Groups, $Errors) = @_; + + print STDERR "$Label:\n"; + print STDERR " Groups=", scalar(@$Groups), " [", join(",", @$Groups), "]\n"; + my @ErrorKeys = sort keys %$Errors; + print STDERR " Errors=", scalar(@ErrorKeys), " [", join(",", @ErrorKeys), "]\n"; + foreach my $GroupName (@$Groups) + { + print STDERR " [$GroupName]\n"; + print STDERR " [$_]\n" for (@{$Errors->{$GroupName}}); + } +} + +sub _AddErrorGroup($$$) +{ + my ($Groups, $Errors, $GroupName) = @_; + + # In theory the error group names are all unique. But, just in case, make + # sure we don't overwrite $Errors->{$GroupName}. + if (!$Errors->{$GroupName}) + { + push @$Groups, $GroupName; + $Errors->{$GroupName} = []; + } + return $Errors->{$GroupName}; +} + +=pod +=over 12 + +=item C<GetLogErrors()> + +Analyzes the specified log and associated error file to filter out unimportant +messages and only return the errors, split by module (for Wine reports that's +per dll / program being tested). + +Returns a list of modules containing errors, and a hashtable containing the list of errors for each module. + +=back +=cut + +sub GetLogErrors($) +{ + my ($LogFileName) = @_; + + my ($IsReport, $GetCategory); + if ($LogFileName =~ /\.report$/) + { + $IsReport = 1; + $GetCategory = \&GetReportLineCategory; + } + else + { + $GetCategory = \&GetLogLineCategory; + } + + my $NoLog = 1; + my $Groups = []; + my $Errors = {}; + if (open(my $LogFile, "<", $LogFileName)) + { + $NoLog = 0; + my $CurrentModule = ""; + my $CurrentGroup; + foreach my $Line (<$LogFile>) + { + $Line =~ s/\s*$//; + if ($IsReport and $Line =~ /^([_.a-z0-9-]+):[_a-z0-9]* start /) + { + $CurrentModule = $1; + $CurrentGroup = undef; + next; + } + + next if ($GetCategory->($Line) !~ /error/); + + if ($Line =~ m/^[^:]+:([^:]*)(?::[0-9a-f]+)? done $258$/) + { + my $Unit = $1; + $Line = $Unit ne "" ? "$Unit: Timeout" : "Timeout"; + } + if (!$CurrentGroup) + { + $CurrentGroup = _AddErrorGroup($Groups, $Errors, $CurrentModule); + } + push @$CurrentGroup, $Line; + } + close($LogFile); + } + elsif (-f $LogFileName) + { + $NoLog = 0; + my $Group = _AddErrorGroup($Groups, $Errors, "TestBot errors"); + push @$Group, "Could not open '". basename($LogFileName) ."' for reading: $!"; + } + + if (open(my $LogFile, "<", "$LogFileName.err")) + { + $NoLog = 0; + # Add the related extra errors + my $CurrentGroup; + foreach my $Line (<$LogFile>) + { + $Line =~ s/\s*$//; + if (!$CurrentGroup) + { + my $GroupName = $IsReport ? "Report errors" : "Task errors"; + $CurrentGroup = _AddErrorGroup($Groups, $Errors, $GroupName); + } + push @$CurrentGroup, $Line; + } + close($LogFile); + } + elsif (-f "$LogFileName.err") + { + $NoLog = 0; + my $Group = _AddErrorGroup($Groups, $Errors, "TestBot errors"); + push @$Group, "Could not open '". basename($LogFileName) .".err' for reading: $!"; + } + + return $NoLog ? (undef, undef) : ($Groups, $Errors); +} + 1; diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index e1fe20f18..37185eb1f 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -2,6 +2,7 @@ # Job details page # # Copyright 2009 Ge van Geldorp +# Copyright 2012-2014,2017-2018 Francois Gouget # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -229,45 +230,6 @@ sub GeneratePage($) $self->SUPER::GeneratePage(); } -=pod -=over 12 - -=item C<GetHtmlLine()> - -Determines if the log line should be shown, how, and escapes it so it is valid -HTML. - -When not showing the full log, returns undef except for error messages which -are the only lines tha should be shown. -When showing the full log error messages and other lines of interest are -highlighted to make the log more readable. - -=back -=cut - -sub GetHtmlLine($$$$) -{ - my ($self, $LogName, $FullLog, $Line) = @_; - - my $Category = $LogName =~ /\.report$/ ? - GetReportLineCategory($Line) : - GetLogLineCategory($Line); - return undef if ($Category !~ /error/ and !$FullLog); - - my $Html = $self->escapeHTML($Line); - if (!$FullLog and $Html =~ m/^[^:]+:([^:]*)(?::[0-9a-f]+)? done $258$/) - { - my $Unit = $1; - return $Unit ne "" ? "$Unit: Timeout" : "Timeout"; - } - if ($FullLog and $Category ne "none") - { - # Highlight all line categories in the full log - $Html =~ s~^(.*\S)\s*\r?$~<span class='log-$Category'>$1</span>~; - } - return $Html; -} - sub InitMoreInfo($) { my ($self) = @_; @@ -283,12 +245,6 @@ sub InitMoreInfo($) my $TaskDir = $StepTask->GetTaskDir(); foreach my $Log (@{GetLogFileNames($TaskDir, 1)}) { - if ($Log =~ s/^err/log/) - { - # We don't want separate entries for log* and err* but we also want a - # log* entry even if only err* exists. - next if (($More->{$Key}->{Logs}->[-1] || "") eq $Log); - } push @{$More->{$Key}->{Logs}}, $Log; $More->{$Key}->{Full} = $Log if (uri_escape($Log) eq $Value); } @@ -348,6 +304,47 @@ sub GenerateMoreInfoLink($$$;$) print "<div class='TaskMoreInfoLink'>$Html</div>\n"; } +sub GetErrorCategory($) +{ + return "error"; +} + +sub GenerateFullLog($$;$) +{ + my ($self, $FileName, $Header) = @_; + + my $GetCategory = $FileName =~ /\.err$/ ? \&GetErrorCategory : + $FileName =~ /\.report$/ ? \&GetReportLineCategory : + \&GetLogLineCategory; + + my $IsEmpty = 1; + if (open(my $LogFile, "<", $FileName)) + { + foreach my $Line (<$LogFile>) + { + $Line =~ s/\s*$//; + if ($IsEmpty) + { + print $Header if (defined $Header); + print "<pre><code>"; + $IsEmpty = 0; + } + + my $Category = $GetCategory->($Line); + my $Html = $self->escapeHTML($Line); + if ($Category ne "none") + { + $Html =~ s~^(.*\S)\s*\r?$~<span class='log-$Category'>$1</span>~; + } + print "$Html\n"; + } + close($LogFile); + } + print "</code></pre>\n" if (!$IsEmpty); + + return $IsEmpty; +} + sub GenerateBody($) { my ($self) = @_; @@ -386,109 +383,101 @@ sub GenerateBody($) $self->GenerateMoreInfoLink($Key, "final screenshot", "Screenshot"); } - foreach my $Log (@{$MoreInfo->{Logs}}) + my $ReportCount; + foreach my $LogName (@{$MoreInfo->{Logs}}) { - $self->GenerateMoreInfoLink($Key, GetLogLabel($Log), "Full", $Log); + $self->GenerateMoreInfoLink($Key, GetLogLabel($LogName), "Full", $LogName); + $ReportCount++ if ($LogName !~ /^old_/ and $LogName =~ /\.report$/); } print "</div>\n"; - my $LogName = $MoreInfo->{Full} || $MoreInfo->{Logs}->[0] || "log"; - my $ErrName = "$LogName.err"; - - my ($EmptyDiag, $LogFirst) = (undef, 1); - if (open(my $LogFile, "<", "$TaskDir/$LogName")) + if ($MoreInfo->{Full}) { - my $HasLogEntries; - my ($CurrentDll, $PrintedDll) = ("", ""); - foreach my $Line (<$LogFile>) - { - $HasLogEntries = 1; - chomp $Line; - $CurrentDll = $1 if ($Line =~ m/^([_.a-z0-9-]+):[_a-z0-9]* start /); - my $Html = $self->GetHtmlLine($LogName, $MoreInfo->{Full}, $Line); - next if (!defined $Html); + # + # Show this log in full, highlighting the important lines + # - if ($PrintedDll ne $CurrentDll && !$MoreInfo->{Full}) + my $LogIsEmpty = $self->GenerateFullLog("$TaskDir/$MoreInfo->{Full}"); + my $EmptyDiag; + if ($LogIsEmpty) + { + if ($StepTask->Status eq "canceled") { - print "</code></pre>" if (!$LogFirst); - print "<div class='LogDllName'>$CurrentDll:</div><pre><code>"; - $PrintedDll = $CurrentDll; - $LogFirst = 0; + $EmptyDiag = "No log, task was canceled\n"; } - elsif ($LogFirst) + elsif ($StepTask->Status eq "skipped") { - print "<pre><code>"; - $LogFirst = 0; + $EmptyDiag = "No log, task skipped\n"; } - print "$Html\n"; - } - close($LogFile); - - if (!$LogFirst) - { - print "</code></pre>\n"; - } - elsif ($HasLogEntries) - { - # Here we know we did not show the full log since it was not empty, - # and yet we did not show anything to the user. But don't claim there - # is no failure if the error log is not empty. - if (-z "$TaskDir/$ErrName") + else { - print "No ". ($StepTask->Type eq "single" || - $StepTask->Type eq "suite" ? "test" : "build") . - " failures found"; - $LogFirst = 0; + print "Empty log\n"; + $LogIsEmpty = 0; } } - elsif ($StepTask->Status eq "canceled") - { - $EmptyDiag = "<p>No log, task was canceled</p>\n"; - } - elsif ($StepTask->Status eq "skipped") - { - $EmptyDiag = "<p>No log, task skipped</p>\n"; - } - else - { - print "Empty log"; - $LogFirst = 0; - } + + # And append the associated extra errors + my $ErrHeader = $MoreInfo->{Full} =~ /\.report/ ? "report" : "task"; + $ErrHeader = "old $ErrHeader" if ($MoreInfo->{Full} =~ /^old_/); + $ErrHeader = "<div class='HrTitle'>". ucfirst($ErrHeader) ." errors<div class='HrLine'></div></div>"; + my $ErrIsEmpty = $self->GenerateFullLog("$TaskDir/$MoreInfo->{Full}.err", $ErrHeader); + print $EmptyDiag if ($ErrIsEmpty and defined $EmptyDiag); } else { - print "No log". ($StepTask->Status =~ /^(?:queued|running)$/ ? " yet" : ""); - $LogFirst = 0; - } + # + # Show a summary of the errors from all the reports and logs + # - if (open(my $ErrFile, "<", "$TaskDir/$ErrName")) - { - my $ErrFirst = 1; - foreach my $Line (<$ErrFile>) + # Figure out which logs / reports actually have errors + my $LogSummaries; + foreach my $LogName (@{$MoreInfo->{Logs}}) + { + next if ($LogName =~ /^old_/); + my ($Groups, $Errors) = GetLogErrors("$TaskDir/$LogName"); + next if (!$Groups or !@$Groups); + $LogSummaries->{$LogName}->{Groups} = $Groups; + $LogSummaries->{$LogName}->{Errors} = $Errors; + } + my $ShowLogName = ($ReportCount > 1 or scalar(keys %$LogSummaries) > 1); + + my $LogIsEmpty = 1; + foreach my $LogName (@{$MoreInfo->{Logs}}) { - chomp $Line; - if ($ErrFirst) + next if (!$LogSummaries->{$LogName}); + $LogIsEmpty = 0; + + if ($ShowLogName) + { + # Show the log / report name to avoid ambiguity + my $Label = ucfirst(GetLogLabel($LogName)); + print "<div class='HrTitle'>$Label<div class='HrLine'></div></div>\n"; + } + + my $Summary = $LogSummaries->{$LogName}; + foreach my $GroupName (@{$Summary->{Groups}}) { - if (!$LogFirst) - { - print "<div class='HrTitle'>". - ($ErrName =~ /^old_/ ? "Old errors" : "Extra errors") . - "<div class='HrLine'></div></div>\n"; - } + print "<div class='LogDllName'>$GroupName:</div>\n" if ($GroupName); print "<pre><code>"; - $ErrFirst = 0; + print $self->escapeHTML($_), "\n" for (@{$Summary->{Errors}->{$GroupName}}); + print "</code></pre>\n"; } - print $self->GetHtmlLine($ErrName, 1, $Line), "\n"; } - close($ErrFile); - if (!$ErrFirst) + if ($LogIsEmpty) { - print "</code></pre>\n"; - } - elsif (defined $EmptyDiag) - { - print $EmptyDiag; + if ($StepTask->Status eq "canceled") + { + print "No log, task was canceled\n"; + } + elsif ($StepTask->Status eq "skipped") + { + print "No log, task skipped\n"; + } + else + { + print "No errors\n"; + } } } } -- 2.18.0

1 0

[PATCH] testbot/WineRunBuild: Use the new Build.pl parameters and paths.
by Francois Gouget 23 Aug '18

23 Aug '18

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineRunBuild.pl | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index cca96b92a..117b06551 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -339,14 +339,14 @@ if ($Step->FileType ne "patch") # Figure out what to build # -my (%Bitnesses, %TestExes); +my (%Builds, %TestExes); foreach my $TestStep (@{$Job->Steps->GetItems()}) { if (($TestStep->PreviousNo || 0) == $Step->No and - $TestStep->FileType =~ /^exe([0-9]+)$/) + $TestStep->FileType =~ /^exe/) { - $Bitnesses{$1} = 1; - $TestExes{$TestStep->FileName} = 1; + $Builds{$TestStep->FileType} = 1; + $TestExes{$TestStep->FileName} = $TestStep->FileType; } } @@ -364,7 +364,7 @@ if (!$TA->SendFile($FileName, "staging/patch.diff", 0)) } my $Script = "#!/bin/sh\n". "( set -x\n". - " ../bin/build/Build.pl patch.diff ". join(":", sort keys %Bitnesses) ."\n". + " ../bin/build/Build.pl patch.diff ". join(":", sort keys %Builds) ."\n". ") >Build.log 2>&1\n"; Debug(Elapsed($Start), " Sending the script: [$Script]\n"); if (!$TA->SendFileFromString($Script, "task", $TestAgent::SENDFILE_EXE)) @@ -455,9 +455,10 @@ foreach my $TestInfo (values %{$Impacts->{Tests}}) my $Local = "$TestInfo->{ExeBase}$Bits.exe"; next if (!$TestExes{$Local}); - my $Remote = "build-mingw". ($Bits || "32") ."/$TestInfo->{Path}/$TestInfo->{ExeBase}.exe"; Debug(Elapsed($Start), " Retrieving '$Local'\n"); - if ($TA->GetFile($Remote, "$StepDir/$Local")) + my $BuildDir = "wine-$TestExes{$Local}"; + if ($TA->GetFile("$BuildDir/$TestInfo->{Path}/$TestInfo->{ExeBase}.exe", + "$StepDir/$Local")) { chmod 0664, "$StepDir/$Local"; } -- 2.18.0

1 0

[PATCH] winemac: Use fallback implementation for screen dimensions in GetDeviceCaps().
by Ken Thomases 23 Aug '18

23 Aug '18

Signed-off-by: Ken Thomases <ken(a)codeweavers.com> --- dlls/winemac.drv/gdi.c | 39 ++++++--------------------------------- 1 file changed, 6 insertions(+), 33 deletions(-) diff --git a/dlls/winemac.drv/gdi.c b/dlls/winemac.drv/gdi.c index 79dc348..40478fd 100644 --- a/dlls/winemac.drv/gdi.c +++ b/dlls/winemac.drv/gdi.c @@ -42,10 +42,6 @@ static inline MACDRV_PDEVICE *get_macdrv_dev(PHYSDEV dev) static CGRect desktop_rect; /* virtual desktop rectangle */ static int horz_size; /* horz. size of screen in millimeters */ static int vert_size; /* vert. size of screen in millimeters */ -static int horz_res; /* width in pixels of screen */ -static int vert_res; /* height in pixels of screen */ -static int desktop_horz_res; /* width in pixels of virtual desktop */ -static int desktop_vert_res; /* height in pixels of virtual desktop */ static int bits_per_pixel; /* pixel depth of screen */ static int device_data_valid; /* do the above variables have up-to-date values? */ @@ -133,9 +129,6 @@ static void device_init(void) { CFStringRef pixelEncoding = CGDisplayModeCopyPixelEncoding(mode); - horz_res = CGDisplayModeGetWidth(mode); - vert_res = CGDisplayModeGetHeight(mode); - if (pixelEncoding) { if (CFEqual(pixelEncoding, CFSTR(IO32BitDirectPixels))) @@ -149,21 +142,8 @@ static void device_init(void) CGDisplayModeRelease(mode); } - else - { - horz_res = CGDisplayPixelsWide(mainDisplay); - vert_res = CGDisplayPixelsHigh(mainDisplay); - } - - if (retina_on) - { - horz_res *= 2; - vert_res *= 2; - } compute_desktop_rect(); - desktop_horz_res = desktop_rect.size.width; - desktop_vert_res = desktop_rect.size.height; device_data_valid = TRUE; } @@ -260,25 +240,18 @@ static INT macdrv_GetDeviceCaps(PHYSDEV dev, INT cap) case VERTSIZE: ret = vert_size; break; - case HORZRES: - ret = horz_res; - break; - case VERTRES: - ret = vert_res; - break; - case DESKTOPHORZRES: - ret = desktop_horz_res; - break; - case DESKTOPVERTRES: - ret = desktop_vert_res; - break; case BITSPIXEL: ret = bits_per_pixel; break; + case HORZRES: + case VERTRES: default: LeaveCriticalSection(&device_data_section); dev = GET_NEXT_PHYSDEV( dev, pGetDeviceCaps ); - return dev->funcs->pGetDeviceCaps( dev, cap ); + ret = dev->funcs->pGetDeviceCaps( dev, cap ); + if ((cap == HORZRES || cap == VERTRES) && retina_on) + ret *= 2; + return ret; } TRACE("cap %d -> %d\n", cap, ret); -- 2.10.2

1 0

[PATCH v2 1/2] comctl32/edit: Move common calls outside the blocks
by Gabriel Ivăncescu 23 Aug '18

23 Aug '18

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- v2: Move more stuff outside the blocks and use ~0 This supersedes 150050. dlls/comctl32/edit.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/dlls/comctl32/edit.c b/dlls/comctl32/edit.c index 10ff5fb..3895dc5 100644 --- a/dlls/comctl32/edit.c +++ b/dlls/comctl32/edit.c @@ -3308,22 +3308,17 @@ static LRESULT EDIT_WM_KeyDown(EDITSTATE *es, INT key) else EDIT_WM_Clear(es); } else { - if (shift) { + EDIT_EM_SetSel(es, ~0, 0, FALSE); + if (shift) /* delete character left of caret */ - EDIT_EM_SetSel(es, (UINT)-1, 0, FALSE); EDIT_MoveBackward(es, TRUE); - EDIT_WM_Clear(es); - } else if (control) { + else if (control) /* delete to end of line */ - EDIT_EM_SetSel(es, (UINT)-1, 0, FALSE); EDIT_MoveEnd(es, TRUE, FALSE); - EDIT_WM_Clear(es); - } else { + else /* delete character right of caret */ - EDIT_EM_SetSel(es, (UINT)-1, 0, FALSE); EDIT_MoveForward(es, TRUE); - EDIT_WM_Clear(es); - } + EDIT_WM_Clear(es); } } break; -- 1.9.1

2 4

[PATCH vkd3d 6/9] vkd3d: Do not store VkPipelineInputAssemblyStateCreateInfo in d3d12_command_list.
by Józef Kucia 23 Aug '18

23 Aug '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 17 ++++++++++------- libs/vkd3d/vkd3d_private.h | 2 +- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 39b0d1820bc0..3c254c046868 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -1695,6 +1695,7 @@ static bool d3d12_command_list_update_current_pipeline(struct d3d12_command_list struct VkVertexInputBindingDescription bindings[D3D12_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT]; const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs; struct VkPipelineVertexInputStateCreateInfo input_desc; + struct VkPipelineInputAssemblyStateCreateInfo ia_desc; struct VkPipelineColorBlendStateCreateInfo blend_desc; struct VkGraphicsPipelineCreateInfo pipeline_desc; const struct d3d12_device *device = list->device; @@ -1776,6 +1777,12 @@ static bool d3d12_command_list_update_current_pipeline(struct d3d12_command_list input_desc.vertexAttributeDescriptionCount = state->attribute_count; input_desc.pVertexAttributeDescriptions = state->attributes; + ia_desc.sType = VK_STRUCTURE_TYPE_PIPELINE_INPUT_ASSEMBLY_STATE_CREATE_INFO; + ia_desc.pNext = NULL; + ia_desc.flags = 0; + ia_desc.topology = list->primitive_topology; + ia_desc.primitiveRestartEnable = VK_FALSE; + blend_desc.sType = VK_STRUCTURE_TYPE_PIPELINE_COLOR_BLEND_STATE_CREATE_INFO; blend_desc.pNext = NULL; blend_desc.flags = 0; @@ -1795,7 +1802,7 @@ static bool d3d12_command_list_update_current_pipeline(struct d3d12_command_list pipeline_desc.stageCount = state->stage_count; pipeline_desc.pStages = state->stages; pipeline_desc.pVertexInputState = &input_desc; - pipeline_desc.pInputAssemblyState = &list->ia_desc; + pipeline_desc.pInputAssemblyState = &ia_desc; pipeline_desc.pTessellationState = NULL; pipeline_desc.pViewportState = &vp_desc; pipeline_desc.pRasterizationState = &state->rs_desc; @@ -2806,7 +2813,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_IASetPrimitiveTopology(ID3D12Gr TRACE("iface %p, topology %#x.\n", iface, topology); - list->ia_desc.topology = vk_topology_from_d3d12_topology(topology); + list->primitive_topology = vk_topology_from_d3d12_topology(topology); d3d12_command_list_invalidate_current_pipeline(list); } @@ -4151,11 +4158,7 @@ static HRESULT d3d12_command_list_init(struct d3d12_command_list *list, struct d list->pipeline_state = initial_pipeline_state; memset(list->strides, 0, sizeof(list->strides)); - list->ia_desc.sType = VK_STRUCTURE_TYPE_PIPELINE_INPUT_ASSEMBLY_STATE_CREATE_INFO; - list->ia_desc.pNext = NULL; - list->ia_desc.flags = 0; - list->ia_desc.topology = VK_PRIMITIVE_TOPOLOGY_POINT_LIST; - list->ia_desc.primitiveRestartEnable = VK_FALSE; + list->primitive_topology = VK_PRIMITIVE_TOPOLOGY_POINT_LIST; memset(list->views, 0, sizeof(list->views)); list->fb_width = 0; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 9b5d5db0c57a..df444471cf5b 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -615,7 +615,7 @@ struct d3d12_command_list bool is_valid; uint32_t strides[D3D12_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT]; - struct VkPipelineInputAssemblyStateCreateInfo ia_desc; + VkPrimitiveTopology primitive_topology; VkImageView views[D3D12_SIMULTANEOUS_RENDER_TARGET_COUNT + 1]; unsigned int fb_width; -- 2.16.4

2 1

[PATCH vkd3d 7/9] tests: Add test for creating graphics pipelines.
by Józef Kucia 23 Aug '18

23 Aug '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 115 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 110 insertions(+), 5 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index cf51ab9bbcdd..eefef3becdb4 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -2268,7 +2268,7 @@ static void test_root_signature_limits(void) ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); } -static void test_create_pipeline_state(void) +static void test_create_compute_pipeline_state(void) { D3D12_COMPUTE_PIPELINE_STATE_DESC pipeline_state_desc; D3D12_ROOT_SIGNATURE_DESC root_signature_desc; @@ -2302,7 +2302,7 @@ static void test_create_pipeline_state(void) root_signature_desc.pStaticSamplers = NULL; root_signature_desc.Flags = D3D12_ROOT_SIGNATURE_FLAG_NONE; hr = create_root_signature(device, &root_signature_desc, &root_signature); - ok(SUCCEEDED(hr), "Failed to create root signature, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create root signature, hr %#x.\n", hr); refcount = get_refcount(device); ok(refcount == 2, "Got unexpected refcount %u.\n", (unsigned int)refcount); @@ -2315,7 +2315,7 @@ static void test_create_pipeline_state(void) hr = ID3D12Device_CreateComputePipelineState(device, &pipeline_state_desc, &IID_ID3D12PipelineState, (void **)&pipeline_state); - ok(SUCCEEDED(hr), "Failed to create compute pipeline, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create compute pipeline, hr %#x.\n", hr); refcount = get_refcount(root_signature); ok(refcount == 1, "Got unexpected refcount %u.\n", (unsigned int)refcount); @@ -2323,7 +2323,7 @@ static void test_create_pipeline_state(void) refcount = get_refcount(device); ok(refcount == 3, "Got unexpected refcount %u.\n", (unsigned int)refcount); hr = ID3D12PipelineState_GetDevice(pipeline_state, &IID_ID3D12Device, (void **)&tmp_device); - ok(SUCCEEDED(hr), "Failed to get device, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to get device, hr %#x.\n", hr); refcount = get_refcount(device); ok(refcount == 4, "Got unexpected refcount %u.\n", (unsigned int)refcount); refcount = ID3D12Device_Release(tmp_device); @@ -2343,6 +2343,110 @@ static void test_create_pipeline_state(void) ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); } +static void test_create_graphics_pipeline_state(void) +{ + D3D12_ROOT_SIGNATURE_DESC root_signature_desc; + D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc; + ID3D12RootSignature *root_signature; + ID3D12PipelineState *pipeline_state; + ID3D12Device *device, *tmp_device; + D3D12_BLEND_DESC *blend; + ULONG refcount; + unsigned int i; + HRESULT hr; + + if (!(device = create_device())) + { + skip("Failed to create device.\n"); + return; + } + + root_signature_desc.NumParameters = 0; + root_signature_desc.pParameters = NULL; + root_signature_desc.NumStaticSamplers = 0; + root_signature_desc.pStaticSamplers = NULL; + root_signature_desc.Flags = D3D12_ROOT_SIGNATURE_FLAG_NONE; + hr = create_root_signature(device, &root_signature_desc, &root_signature); + ok(hr == S_OK, "Failed to create root signature, hr %#x.\n", hr); + + refcount = get_refcount(device); + ok(refcount == 2, "Got unexpected refcount %u.\n", (unsigned int)refcount); + + init_pipeline_state_desc(&pso_desc, root_signature, DXGI_FORMAT_R8G8B8A8_UNORM, NULL, NULL, NULL); + hr = ID3D12Device_CreateGraphicsPipelineState(device, &pso_desc, + &IID_ID3D12PipelineState, (void **)&pipeline_state); + ok(hr == S_OK, "Failed to create pipeline, hr %#x.\n", hr); + + refcount = get_refcount(root_signature); + ok(refcount == 1, "Got unexpected refcount %u.\n", (unsigned int)refcount); + + refcount = get_refcount(device); + ok(refcount == 3, "Got unexpected refcount %u.\n", (unsigned int)refcount); + hr = ID3D12PipelineState_GetDevice(pipeline_state, &IID_ID3D12Device, (void **)&tmp_device); + ok(hr == S_OK, "Failed to get device, hr %#x.\n", hr); + refcount = get_refcount(device); + ok(refcount == 4, "Got unexpected refcount %u.\n", (unsigned int)refcount); + refcount = ID3D12Device_Release(tmp_device); + ok(refcount == 3, "Got unexpected refcount %u.\n", (unsigned int)refcount); + + check_interface(pipeline_state, &IID_ID3D12Object, TRUE); + check_interface(pipeline_state, &IID_ID3D12DeviceChild, TRUE); + check_interface(pipeline_state, &IID_ID3D12Pageable, TRUE); + check_interface(pipeline_state, &IID_ID3D12PipelineState, TRUE); + + refcount = ID3D12PipelineState_Release(pipeline_state); + ok(!refcount, "ID3D12PipelineState has %u references left.\n", (unsigned int)refcount); + + blend = &pso_desc.BlendState; + blend->IndependentBlendEnable = FALSE; + blend->RenderTarget[0].BlendEnable = TRUE; + blend->RenderTarget[0].SrcBlend = D3D12_BLEND_SRC_COLOR; + blend->RenderTarget[0].DestBlend = D3D12_BLEND_DEST_COLOR; + blend->RenderTarget[0].BlendOp = D3D12_BLEND_OP_ADD; + blend->RenderTarget[0].SrcBlendAlpha = D3D12_BLEND_SRC_ALPHA; + blend->RenderTarget[0].DestBlendAlpha = D3D12_BLEND_DEST_ALPHA; + blend->RenderTarget[0].BlendOpAlpha = D3D12_BLEND_OP_ADD; + blend->RenderTarget[0].RenderTargetWriteMask = D3D12_COLOR_WRITE_ENABLE_ALL; + hr = ID3D12Device_CreateGraphicsPipelineState(device, &pso_desc, + &IID_ID3D12PipelineState, (void **)&pipeline_state); + ok(hr == S_OK, "Failed to create pipeline, hr %#x.\n", hr); + ID3D12PipelineState_Release(pipeline_state); + + /* Only one of BlendEnable or LogicOpEnable can be set to true. */ + blend->IndependentBlendEnable = FALSE; + blend->RenderTarget[0].BlendEnable = TRUE; + blend->RenderTarget[0].LogicOpEnable = TRUE; + hr = ID3D12Device_CreateGraphicsPipelineState(device, &pso_desc, + &IID_ID3D12PipelineState, (void **)&pipeline_state); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + pso_desc.RTVFormats[0] = DXGI_FORMAT_R32_UINT; + hr = ID3D12Device_CreateGraphicsPipelineState(device, &pso_desc, + &IID_ID3D12PipelineState, (void **)&pipeline_state); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + blend->IndependentBlendEnable = FALSE; + blend->RenderTarget[0].BlendEnable = FALSE; + blend->RenderTarget[0].LogicOpEnable = TRUE; + hr = ID3D12Device_CreateGraphicsPipelineState(device, &pso_desc, + &IID_ID3D12PipelineState, (void **)&pipeline_state); + ok(hr == S_OK, "Failed to create pipeline, hr %#x.\n", hr); + ID3D12PipelineState_Release(pipeline_state); + + /* IndependentBlendEnable must be set to false when logic operations are enabled. */ + blend->IndependentBlendEnable = TRUE; + blend->RenderTarget[0].LogicOpEnable = TRUE; + for (i = 1; i < ARRAY_SIZE(blend->RenderTarget); ++i) + blend->RenderTarget[i] = blend->RenderTarget[0]; + hr = ID3D12Device_CreateGraphicsPipelineState(device, &pso_desc, + &IID_ID3D12PipelineState, (void **)&pipeline_state); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + refcount = ID3D12RootSignature_Release(root_signature); + ok(!refcount, "ID3D12RootSignature has %u references left.\n", (unsigned int)refcount); + refcount = ID3D12Device_Release(device); + ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); +} + static void test_create_fence(void) { ID3D12Device *device, *tmp_device; @@ -18238,7 +18342,8 @@ START_TEST(d3d12) run_test(test_create_unordered_access_view); run_test(test_create_root_signature); run_test(test_root_signature_limits); - run_test(test_create_pipeline_state); + run_test(test_create_compute_pipeline_state); + run_test(test_create_graphics_pipeline_state); run_test(test_create_fence); run_test(test_reset_command_allocator); run_test(test_cpu_signal_fence); -- 2.16.4

2 1

[PATCH vkd3d 5/9] vkd3d: Avoid passing vkd3d_vk_device_procs to helper functions.
by Józef Kucia 23 Aug '18

23 Aug '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 94 +++++++++++++++++++++++++++++----------------------- 1 file changed, 52 insertions(+), 42 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index aa77c6c79f21..39b0d1820bc0 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -1165,9 +1165,10 @@ static void d3d12_command_list_invalidate_current_pipeline(struct d3d12_command_ list->current_pipeline = VK_NULL_HANDLE; } -static void d3d12_command_list_end_current_render_pass(struct d3d12_command_list *list, - const struct vkd3d_vk_device_procs *vk_procs) +static void d3d12_command_list_end_current_render_pass(struct d3d12_command_list *list) { + const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs; + if (list->current_render_pass) VK_CALL(vkCmdEndRenderPass(list->vk_command_buffer)); @@ -1176,8 +1177,7 @@ static void d3d12_command_list_end_current_render_pass(struct d3d12_command_list static void d3d12_command_list_invalidate_current_render_pass(struct d3d12_command_list *list) { - const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs; - d3d12_command_list_end_current_render_pass(list, vk_procs); + d3d12_command_list_end_current_render_pass(list); } static void d3d12_command_list_invalidate_bindings(struct d3d12_command_list *list, @@ -1433,8 +1433,7 @@ static void d3d12_command_list_track_resource_usage(struct d3d12_command_list *l { if (resource->flags & VKD3D_RESOURCE_INITIAL_STATE_TRANSITION) { - const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs; - d3d12_command_list_end_current_render_pass(list, vk_procs); + d3d12_command_list_end_current_render_pass(list); d3d12_command_list_transition_resource_to_initial_state(list, resource); resource->flags &= ~VKD3D_RESOURCE_INITIAL_STATE_TRANSITION; @@ -1564,7 +1563,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_command_list_Close(ID3D12GraphicsCommandL vk_procs = &list->device->vk_procs; - d3d12_command_list_end_current_render_pass(list, vk_procs); + d3d12_command_list_end_current_render_pass(list); if ((vr = VK_CALL(vkEndCommandBuffer(list->vk_command_buffer))) < 0) { @@ -1651,10 +1650,10 @@ static void d3d12_command_list_get_fb_extent(struct d3d12_command_list *list, } } -static bool d3d12_command_list_update_current_framebuffer(struct d3d12_command_list *list, - const struct vkd3d_vk_device_procs *vk_procs) +static bool d3d12_command_list_update_current_framebuffer(struct d3d12_command_list *list) { struct d3d12_device *device = list->device; + const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; struct VkFramebufferCreateInfo fb_desc; VkFramebuffer vk_framebuffer; size_t start_idx = 0; @@ -1691,10 +1690,10 @@ static bool d3d12_command_list_update_current_framebuffer(struct d3d12_command_l return true; } -static bool d3d12_command_list_update_current_pipeline(struct d3d12_command_list *list, - const struct vkd3d_vk_device_procs *vk_procs) +static bool d3d12_command_list_update_current_pipeline(struct d3d12_command_list *list) { struct VkVertexInputBindingDescription bindings[D3D12_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT]; + const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs; struct VkPipelineVertexInputStateCreateInfo input_desc; struct VkPipelineColorBlendStateCreateInfo blend_desc; struct VkGraphicsPipelineCreateInfo pipeline_desc; @@ -1833,7 +1832,7 @@ static VkDescriptorSet d3d12_command_list_allocate_descriptor_set(struct d3d12_c const VkDescriptorPoolSize *pool_sizes, unsigned int pool_size_count, VkDescriptorSetLayout vk_set_layout) { - const struct vkd3d_vk_device_procs *vk_procs; + const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs; VkDevice vk_device = list->device->vk_device; struct VkDescriptorSetAllocateInfo set_desc; struct VkDescriptorPoolCreateInfo pool_desc; @@ -1844,8 +1843,6 @@ static VkDescriptorSet d3d12_command_list_allocate_descriptor_set(struct d3d12_c if (!pool_size_count) return VK_NULL_HANDLE; - vk_procs = &list->device->vk_procs; - pool_desc.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO; pool_desc.pNext = NULL; pool_desc.flags = 0; @@ -2245,9 +2242,9 @@ static void d3d12_command_list_update_descriptors(struct d3d12_command_list *lis d3d12_command_list_update_uav_counter_descriptors(list, bind_point); } -static bool d3d12_command_list_begin_render_pass(struct d3d12_command_list *list, - const struct vkd3d_vk_device_procs *vk_procs) +static bool d3d12_command_list_begin_render_pass(struct d3d12_command_list *list) { + const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs; struct VkRenderPassBeginInfo begin_desc; VkRenderPass vk_render_pass; @@ -2257,9 +2254,9 @@ static bool d3d12_command_list_begin_render_pass(struct d3d12_command_list *list return false; } - if (!d3d12_command_list_update_current_framebuffer(list, vk_procs)) + if (!d3d12_command_list_update_current_framebuffer(list)) return false; - if (!d3d12_command_list_update_current_pipeline(list, vk_procs)) + if (!d3d12_command_list_update_current_pipeline(list)) return false; d3d12_command_list_update_descriptors(list, VK_PIPELINE_BIND_POINT_GRAPHICS); @@ -2300,7 +2297,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_DrawInstanced(ID3D12GraphicsCom vk_procs = &list->device->vk_procs; - if (!d3d12_command_list_begin_render_pass(list, vk_procs)) + if (!d3d12_command_list_begin_render_pass(list)) { WARN("Failed to begin render pass, ignoring draw call.\n"); return; @@ -2324,7 +2321,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_DrawIndexedInstanced(ID3D12Grap vk_procs = &list->device->vk_procs; - if (!d3d12_command_list_begin_render_pass(list, vk_procs)) + if (!d3d12_command_list_begin_render_pass(list)) { WARN("Failed to begin render pass, ignoring draw call.\n"); return; @@ -2350,7 +2347,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_Dispatch(ID3D12GraphicsCommandL vk_procs = &list->device->vk_procs; - d3d12_command_list_end_current_render_pass(list, vk_procs); + d3d12_command_list_end_current_render_pass(list); d3d12_command_list_update_descriptors(list, VK_PIPELINE_BIND_POINT_COMPUTE); @@ -2379,7 +2376,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_CopyBufferRegion(ID3D12Graphics d3d12_command_list_track_resource_usage(list, dst_resource); d3d12_command_list_track_resource_usage(list, src_resource); - d3d12_command_list_end_current_render_pass(list, vk_procs); + d3d12_command_list_end_current_render_pass(list); buffer_copy.srcOffset = src_offset; buffer_copy.dstOffset = dst_offset; @@ -2457,8 +2454,8 @@ static void vk_image_copy_from_d3d12(VkImageCopy *image_copy, static HRESULT d3d12_command_list_allocate_transfer_buffer(struct d3d12_command_list *list, VkDeviceSize size, struct vkd3d_buffer *buffer) { + const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs; struct d3d12_device *device = list->device; - const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; D3D12_HEAP_PROPERTIES heap_properties; D3D12_RESOURCE_DESC buffer_desc; HRESULT hr; @@ -2601,7 +2598,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_CopyTextureRegion(ID3D12Graphic d3d12_command_list_track_resource_usage(list, dst_resource); d3d12_command_list_track_resource_usage(list, src_resource); - d3d12_command_list_end_current_render_pass(list, vk_procs); + d3d12_command_list_end_current_render_pass(list); if (src->Type == D3D12_TEXTURE_COPY_TYPE_SUBRESOURCE_INDEX && dst->Type == D3D12_TEXTURE_COPY_TYPE_PLACED_FOOTPRINT) @@ -2716,7 +2713,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_CopyResource(ID3D12GraphicsComm d3d12_command_list_track_resource_usage(list, dst_resource); d3d12_command_list_track_resource_usage(list, src_resource); - d3d12_command_list_end_current_render_pass(list, vk_procs); + d3d12_command_list_end_current_render_pass(list); if (d3d12_resource_is_buffer(dst_resource)) { @@ -2892,10 +2889,12 @@ static void STDMETHODCALLTYPE d3d12_command_list_SetPipelineState(ID3D12Graphics { struct d3d12_pipeline_state *state = unsafe_impl_from_ID3D12PipelineState(pipeline_state); struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList(iface); - const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs; + const struct vkd3d_vk_device_procs *vk_procs; TRACE("iface %p, pipeline_state %p.\n", iface, pipeline_state); + vk_procs = &list->device->vk_procs; + d3d12_command_list_invalidate_bindings(list, state); if (d3d12_pipeline_state_is_compute(state)) @@ -2927,7 +2926,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_ResourceBarrier(ID3D12GraphicsC vk_procs = &list->device->vk_procs; - d3d12_command_list_end_current_render_pass(list, vk_procs); + d3d12_command_list_end_current_render_pass(list); for (i = 0; i < barrier_count; ++i) { @@ -3587,11 +3586,12 @@ static void STDMETHODCALLTYPE d3d12_command_list_OMSetRenderTargets(ID3D12Graphi } static void d3d12_command_list_clear(struct d3d12_command_list *list, - const struct vkd3d_vk_device_procs *vk_procs, const struct VkAttachmentDescription *attachment_desc, + const struct VkAttachmentDescription *attachment_desc, const struct VkAttachmentReference *color_reference, const struct VkAttachmentReference *ds_reference, struct vkd3d_view *view, size_t width, size_t height, unsigned int layer_count, const union VkClearValue *clear_value, unsigned int rect_count, const D3D12_RECT *rects) { + const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs; struct VkSubpassDescription sub_pass_desc; struct VkRenderPassCreateInfo pass_desc; struct VkRenderPassBeginInfo begin_desc; @@ -3602,7 +3602,7 @@ static void d3d12_command_list_clear(struct d3d12_command_list *list, unsigned int i; VkResult vr; - d3d12_command_list_end_current_render_pass(list, vk_procs); + d3d12_command_list_end_current_render_pass(list); if (!rect_count) { @@ -3737,7 +3737,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_ClearDepthStencilView(ID3D12Gra ds_reference.attachment = 0; ds_reference.layout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL; - d3d12_command_list_clear(list, &list->device->vk_procs, &attachment_desc, NULL, &ds_reference, + d3d12_command_list_clear(list, &attachment_desc, NULL, &ds_reference, dsv_desc->view, dsv_desc->width, dsv_desc->height, 1, &clear_value, rect_count, rects); } @@ -3768,7 +3768,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_ClearRenderTargetView(ID3D12Gra color_reference.attachment = 0; color_reference.layout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; - d3d12_command_list_clear(list, &list->device->vk_procs, &attachment_desc, &color_reference, NULL, + d3d12_command_list_clear(list, &attachment_desc, &color_reference, NULL, rtv_desc->view, rtv_desc->width, rtv_desc->height, rtv_desc->layer_count, &clear_value, rect_count, rects); } @@ -3778,13 +3778,15 @@ static void STDMETHODCALLTYPE d3d12_command_list_ClearUnorderedAccessViewUint(ID const UINT values[4], UINT rect_count, const D3D12_RECT *rects) { struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList(iface); - const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs; + const struct vkd3d_vk_device_procs *vk_procs; const struct d3d12_desc *cpu_descriptor; struct d3d12_resource *resource_impl; TRACE("iface %p, gpu_handle %#"PRIx64", cpu_handle %lx, resource %p, values %p, rect_count %u, rects %p.\n", iface, gpu_handle.ptr, cpu_handle.ptr, resource, values, rect_count, rects); + vk_procs = &list->device->vk_procs; + resource_impl = unsafe_impl_from_ID3D12Resource(resource); d3d12_command_list_track_resource_usage(list, resource_impl); @@ -3800,7 +3802,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_ClearUnorderedAccessViewUint(ID return; } - d3d12_command_list_end_current_render_pass(list, vk_procs); + d3d12_command_list_end_current_render_pass(list); cpu_descriptor = d3d12_desc_from_cpu_handle(cpu_handle); if (!cpu_descriptor->view_size) @@ -3839,12 +3841,14 @@ static void STDMETHODCALLTYPE d3d12_command_list_BeginQuery(ID3D12GraphicsComman { struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList(iface); struct d3d12_query_heap *query_heap = unsafe_impl_from_ID3D12QueryHeap(heap); - const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs; + const struct vkd3d_vk_device_procs *vk_procs; VkQueryControlFlags flags = 0; TRACE("iface %p, heap %p, type %#x, index %u.\n", iface, heap, type, index); - d3d12_command_list_end_current_render_pass(list, vk_procs); + vk_procs = &list->device->vk_procs; + + d3d12_command_list_end_current_render_pass(list); if (type == D3D12_QUERY_TYPE_OCCLUSION) flags = VK_QUERY_CONTROL_PRECISE_BIT; @@ -3858,11 +3862,13 @@ static void STDMETHODCALLTYPE d3d12_command_list_EndQuery(ID3D12GraphicsCommandL { struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList(iface); struct d3d12_query_heap *query_heap = unsafe_impl_from_ID3D12QueryHeap(heap); - const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs; + const struct vkd3d_vk_device_procs *vk_procs; TRACE("iface %p, heap %p, type %#x, index %u.\n", iface, heap, type, index); - d3d12_command_list_end_current_render_pass(list, vk_procs); + vk_procs = &list->device->vk_procs; + + d3d12_command_list_end_current_render_pass(list); d3d12_query_heap_mark_result_as_available(query_heap, index); @@ -3884,8 +3890,8 @@ static void STDMETHODCALLTYPE d3d12_command_list_ResolveQueryData(ID3D12Graphics const struct d3d12_query_heap *query_heap = unsafe_impl_from_ID3D12QueryHeap(heap); struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList(iface); struct d3d12_resource *buffer = unsafe_impl_from_ID3D12Resource(dst_buffer); - const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs; VkDeviceSize offset, stride = sizeof(uint64_t); + const struct vkd3d_vk_device_procs *vk_procs; unsigned int i, first, count; TRACE("iface %p, heap %p, type %#x, start_index %u, query_count %u, " @@ -3893,6 +3899,8 @@ static void STDMETHODCALLTYPE d3d12_command_list_ResolveQueryData(ID3D12Graphics iface, heap, type, start_index, query_count, dst_buffer, aligned_dst_buffer_offset); + vk_procs = &list->device->vk_procs; + /* Vulkan is less strict than D3D12 here. Vulkan implementations are free * to return any non-zero result for binary occlusion with at least one * sample passing, while D3D12 guarantees that the result is 1 then. @@ -3909,7 +3917,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_ResolveQueryData(ID3D12Graphics return; } - d3d12_command_list_end_current_render_pass(list, vk_procs); + d3d12_command_list_end_current_render_pass(list); if (type == D3D12_QUERY_TYPE_PIPELINE_STATISTICS) stride = sizeof(struct D3D12_QUERY_DATA_PIPELINE_STATISTICS); @@ -3988,8 +3996,8 @@ static void STDMETHODCALLTYPE d3d12_command_list_ExecuteIndirect(ID3D12GraphicsC struct d3d12_command_signature *sig_impl = unsafe_impl_from_ID3D12CommandSignature(command_signature); struct d3d12_resource *arg_impl = unsafe_impl_from_ID3D12Resource(arg_buffer); struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList(iface); - const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs; const D3D12_COMMAND_SIGNATURE_DESC *signature_desc; + const struct vkd3d_vk_device_procs *vk_procs; unsigned int i; TRACE("iface %p, command_signature %p, max_command_count %u, arg_buffer %p, " @@ -3997,6 +4005,8 @@ static void STDMETHODCALLTYPE d3d12_command_list_ExecuteIndirect(ID3D12GraphicsC iface, command_signature, max_command_count, arg_buffer, arg_buffer_offset, count_buffer, count_buffer_offset); + vk_procs = &list->device->vk_procs; + if (count_buffer) { FIXME("Count buffers not implemented.\n"); @@ -4011,7 +4021,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_ExecuteIndirect(ID3D12GraphicsC switch (arg_desc->Type) { case D3D12_INDIRECT_ARGUMENT_TYPE_DRAW: - if (!d3d12_command_list_begin_render_pass(list, vk_procs)) + if (!d3d12_command_list_begin_render_pass(list)) { WARN("Failed to begin render pass, ignoring draw.\n"); break; @@ -4032,7 +4042,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_ExecuteIndirect(ID3D12GraphicsC break; } - d3d12_command_list_end_current_render_pass(list, vk_procs); + d3d12_command_list_end_current_render_pass(list); d3d12_command_list_update_descriptors(list, VK_PIPELINE_BIND_POINT_COMPUTE); -- 2.16.4

2 1

[PATCH vkd3d 9/9] tests: Use single ResolveQueryData() call for multiple queries.
by Józef Kucia 23 Aug '18

23 Aug '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index eefef3becdb4..ca83680d36c9 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -15777,19 +15777,19 @@ static void test_create_query_heap(void) static void test_query_timestamp(void) { + UINT64 timestamps[4], timestamp_frequency, timestamp_diff, time_diff; ID3D12GraphicsCommandList *command_list; - struct test_context_desc desc; - struct test_context context; - ID3D12CommandQueue *queue; - ID3D12Device *device; D3D12_QUERY_HEAP_DESC heap_desc; + struct test_context_desc desc; ID3D12QueryHeap *query_heap; - ID3D12Resource *resource; struct resource_readback rb; - UINT64 timestamps[4], timestamp_frequency, timestamp_diff, time_diff; + struct test_context context; time_t time_start, time_end; + ID3D12CommandQueue *queue; + ID3D12Resource *resource; + ID3D12Device *device; + unsigned int i; HRESULT hr; - int i; time_start = time(NULL); @@ -15813,11 +15813,12 @@ static void test_query_timestamp(void) resource = create_readback_buffer(device, sizeof(timestamps)); for (i = 0; i < ARRAY_SIZE(timestamps); ++i) - { ID3D12GraphicsCommandList_EndQuery(command_list, query_heap, D3D12_QUERY_TYPE_TIMESTAMP, i); - ID3D12GraphicsCommandList_ResolveQueryData(command_list, query_heap, D3D12_QUERY_TYPE_TIMESTAMP, i, 1, - resource, i * sizeof(UINT64)); - } + + ID3D12GraphicsCommandList_ResolveQueryData(command_list, query_heap, + D3D12_QUERY_TYPE_TIMESTAMP, 0, 1, resource, 0); + ID3D12GraphicsCommandList_ResolveQueryData(command_list, query_heap, + D3D12_QUERY_TYPE_TIMESTAMP, 1, 3, resource, sizeof(UINT64)); get_buffer_readback_with_command_list(resource, DXGI_FORMAT_UNKNOWN, &rb, queue, command_list); @@ -15827,14 +15828,16 @@ static void test_query_timestamp(void) timestamps[i] = get_readback_uint64(&rb, i, 0); for (i = 0; i < ARRAY_SIZE(timestamps) - 1; ++i) + { ok(timestamps[i] <= timestamps[i + 1], "Expected timestamps to monotonically increase, " "but got %"PRIu64" > %"PRIu64".\n", timestamps[i], timestamps[i + 1]); + } time_diff = (UINT64)difftime(time_end, time_start) * timestamp_frequency; timestamp_diff = timestamps[ARRAY_SIZE(timestamps) - 1] - timestamps[0]; ok(timestamp_diff <= time_diff, "Expected timestamp difference to be bounded by CPU time difference, " - "but got %"PRIu64" > %"PRIu64".\n", timestamp_diff, time_diff); + "but got %"PRIu64" > %"PRIu64".\n", timestamp_diff, time_diff); release_resource_readback(&rb); ID3D12QueryHeap_Release(query_heap); -- 2.16.4

2 1

[PATCH vkd3d 1/9] vkd3d: Add support for DXGI_FORMAT_R8G8_SNORM.
by Józef Kucia 23 Aug '18

23 Aug '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/utils.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/vkd3d/utils.c b/libs/vkd3d/utils.c index e6b949d068cf..18e3aa18014b 100644 --- a/libs/vkd3d/utils.c +++ b/libs/vkd3d/utils.c @@ -37,6 +37,7 @@ static const struct vkd3d_format vkd3d_formats[] = {DXGI_FORMAT_R11G11B10_FLOAT, VK_FORMAT_B10G11R11_UFLOAT_PACK32, 4, 1, 1, 1, COLOR}, {DXGI_FORMAT_R8G8_TYPELESS, VK_FORMAT_R8G8_UNORM, 2, 1, 1, 1, COLOR}, {DXGI_FORMAT_R8G8_UNORM, VK_FORMAT_R8G8_UNORM, 2, 1, 1, 1, COLOR}, + {DXGI_FORMAT_R8G8_SNORM, VK_FORMAT_R8G8_SNORM, 2, 1, 1, 1, COLOR}, {DXGI_FORMAT_R8G8B8A8_TYPELESS, VK_FORMAT_R8G8B8A8_UNORM, 4, 1, 1, 1, COLOR}, {DXGI_FORMAT_R8G8B8A8_UNORM, VK_FORMAT_R8G8B8A8_UNORM, 4, 1, 1, 1, COLOR}, {DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, VK_FORMAT_R8G8B8A8_SRGB, 4, 1, 1, 1, COLOR}, -- 2.16.4

2 1

[PATCH vkd3d 8/9] vkd3d: Validate D3D12_BLEND_DESC.
by Józef Kucia 23 Aug '18

23 Aug '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 1 - libs/vkd3d/state.c | 24 ++++++++++++++++++++---- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 3c254c046868..7aa16957e114 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -1786,7 +1786,6 @@ static bool d3d12_command_list_update_current_pipeline(struct d3d12_command_list blend_desc.sType = VK_STRUCTURE_TYPE_PIPELINE_COLOR_BLEND_STATE_CREATE_INFO; blend_desc.pNext = NULL; blend_desc.flags = 0; - /* FIXME: Logic ops are per-target in D3D. */ blend_desc.logicOpEnable = VK_FALSE; blend_desc.logicOp = VK_LOGIC_OP_COPY; blend_desc.attachmentCount = state->attachment_count - state->rt_idx; diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 43b1c1574fd0..5e401fdd9523 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1876,6 +1876,9 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s state->vk_set_layout = VK_NULL_HANDLE; state->uav_counters = NULL; state->uav_counter_mask = 0; + graphics->stage_count = 0; + + memset(&input_signature, 0, sizeof(input_signature)); if (!(root_signature = unsafe_impl_from_ID3D12RootSignature(desc->pRootSignature))) { @@ -1943,7 +1946,7 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s for (i = 0; i < rt_count; ++i) { - unsigned int blend_idx = desc->BlendState.IndependentBlendEnable ? i : 0; + const D3D12_RENDER_TARGET_BLEND_DESC *rt_desc; size_t idx = graphics->rt_idx + i; if (!(format = vkd3d_get_format(desc->RTVFormats[i], false))) @@ -1953,6 +1956,20 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s goto fail; } + rt_desc = &desc->BlendState.RenderTarget[desc->BlendState.IndependentBlendEnable ? i : 0]; + if (desc->BlendState.IndependentBlendEnable && rt_desc->LogicOpEnable) + { + WARN("IndependentBlendEnable must be FALSE when logic operations are enabled.\n"); + hr = E_INVALIDARG; + goto fail; + } + if (rt_desc->BlendEnable && rt_desc->LogicOpEnable) + { + WARN("Only one of BlendEnable or LogicOpEnable can be set to TRUE."); + hr = E_INVALIDARG; + goto fail; + } + ps_output_swizzle[i] = vkd3d_get_rt_format_swizzle(format); graphics->attachments[idx].flags = 0; @@ -1968,7 +1985,7 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s graphics->attachment_references[idx].attachment = idx; graphics->attachment_references[idx].layout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; - blend_attachment_from_d3d12(&graphics->blend_attachments[i], &desc->BlendState.RenderTarget[blend_idx]); + blend_attachment_from_d3d12(&graphics->blend_attachments[i], rt_desc); } graphics->attachment_count = graphics->rt_idx + rt_count; @@ -1983,8 +2000,7 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s shader_interface.uav_counters = NULL; shader_interface.uav_counter_count = 0; - memset(&input_signature, 0, sizeof(input_signature)); - for (i = 0, graphics->stage_count = 0; i < ARRAY_SIZE(shader_stages); ++i) + for (i = 0; i < ARRAY_SIZE(shader_stages); ++i) { const D3D12_SHADER_BYTECODE *b = (const void *)((uintptr_t)desc + shader_stages[i].offset); const struct vkd3d_shader_code dxbc = {b->pShaderBytecode, b->BytecodeLength}; -- 2.16.4

2 1

[PATCH vkd3d 4/9] vkd3d: Try to call vkCmdCopyQueryPoolResults() for multiple queries.
by Józef Kucia 23 Aug '18

23 Aug '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 47 +++++++++++++++++++++++++++++++++-------------- 1 file changed, 33 insertions(+), 14 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 793417eaddff..aa77c6c79f21 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -3885,8 +3885,8 @@ static void STDMETHODCALLTYPE d3d12_command_list_ResolveQueryData(ID3D12Graphics struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList(iface); struct d3d12_resource *buffer = unsafe_impl_from_ID3D12Resource(dst_buffer); const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs; - VkDeviceSize stride = sizeof(uint64_t); - unsigned int i; + VkDeviceSize offset, stride = sizeof(uint64_t); + unsigned int i, first, count; TRACE("iface %p, heap %p, type %#x, start_index %u, query_count %u, " "dst_buffer %p, aligned_dst_buffer_offset %#"PRIx64".\n", @@ -3914,26 +3914,45 @@ static void STDMETHODCALLTYPE d3d12_command_list_ResolveQueryData(ID3D12Graphics if (type == D3D12_QUERY_TYPE_PIPELINE_STATISTICS) stride = sizeof(struct D3D12_QUERY_DATA_PIPELINE_STATISTICS); - /* We cannot copy query results if a query was not issued: - * - * "If the query does not become available in a finite amount of time - * (e.g. due to not issuing a query since the last reset), - * a VK_ERROR_DEVICE_LOST error may occur." - */ + count = 0; + first = start_index; + offset = aligned_dst_buffer_offset; for (i = 0; i < query_count; ++i) { - const UINT64 offset = aligned_dst_buffer_offset + i * stride; - const unsigned int query_index = start_index + i; - - if (!d3d12_query_heap_is_result_available(query_heap, query_index)) + if (d3d12_query_heap_is_result_available(query_heap, start_index + i)) + { + ++count; + } + else { + if (count) + { + VK_CALL(vkCmdCopyQueryPoolResults(list->vk_command_buffer, + query_heap->vk_query_pool, first, count, buffer->u.vk_buffer, + offset, stride, VK_QUERY_RESULT_64_BIT | VK_QUERY_RESULT_WAIT_BIT)); + } + count = 0; + first = start_index + i; + offset = aligned_dst_buffer_offset + i * stride; + + /* We cannot copy query results if a query was not issued: + * + * "If the query does not become available in a finite amount of + * time (e.g. due to not issuing a query since the last reset), + * a VK_ERROR_DEVICE_LOST error may occur." + */ VK_CALL(vkCmdFillBuffer(list->vk_command_buffer, buffer->u.vk_buffer, offset, stride, 0x00000000)); - continue; + + ++first; + offset += stride; } + } + if (count) + { VK_CALL(vkCmdCopyQueryPoolResults(list->vk_command_buffer, - query_heap->vk_query_pool, query_index, 1, buffer->u.vk_buffer, + query_heap->vk_query_pool, first, count, buffer->u.vk_buffer, offset, stride, VK_QUERY_RESULT_64_BIT | VK_QUERY_RESULT_WAIT_BIT)); } } -- 2.16.4

2 1

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-devel