- wine-devel - winehq.org

[PATCH v3 2/2] crypt32: Properly check root certificate in CERT_CHAIN_REVOCATION_CHECK_CHAIN.
by Zhiyi Zhang 22 Aug '18

22 Aug '18

Original patch by Michael Müller. Root certificates don't have CRL Distribution Point or Authority Info Access field. Don't report error with CERT_CHAIN_REVOCATION_CHECK_CHAIN in CertGetCertificateChain() because of this. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v3: v2 got altered somehow in the mail client. Ignore CRYPT_E_NO_REVOCATION_CHECK only with CERT_CHAIN_REVOCATION_CHECK_CHAIN. dlls/crypt32/chain.c | 5 +++++ dlls/crypt32/tests/chain.c | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index d7015d797d..41c87b7ae7 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -2698,6 +2698,11 @@ static void CRYPT_VerifyChainRevocation(PCERT_CHAIN_CONTEXT chain, ret = CertVerifyRevocation(X509_ASN_ENCODING, CERT_CONTEXT_REVOCATION_TYPE, 1, (void **)&certToCheck, revocationFlags, &revocationPara, &revocationStatus); + + if (!ret && chainFlags & CERT_CHAIN_REVOCATION_CHECK_CHAIN + && revocationStatus.dwError == CRYPT_E_NO_REVOCATION_CHECK && revocationPara.pIssuerCert == NULL) + ret = TRUE; + if (!ret) { PCERT_CHAIN_ELEMENT element = CRYPT_FindIthElementInChain( diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index a995c81239..e2a7633526 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -4156,9 +4156,9 @@ static void testGetCertChain(void) ret = CertGetCertificateChain(NULL, cert, &fileTime, store, &para, CERT_CHAIN_REVOCATION_CHECK_CHAIN, NULL, &chain); ok(ret, "CertGetCertificateChain failed: %u\n", GetLastError()); - todo_wine ok(!chain->TrustStatus.dwErrorStatus - || broken(chain->TrustStatus.dwErrorStatus == CERT_TRUST_REVOCATION_STATUS_UNKNOWN), /* XP */ - "chain->TrustStatus.dwErrorStatus = %x\n", chain->TrustStatus.dwErrorStatus); + ok(!chain->TrustStatus.dwErrorStatus + || broken(chain->TrustStatus.dwErrorStatus == CERT_TRUST_REVOCATION_STATUS_UNKNOWN), /* XP */ + "chain->TrustStatus.dwErrorStatus = %x\n", chain->TrustStatus.dwErrorStatus); pCertFreeCertificateChain(chain); ret = CertGetCertificateChain(NULL, cert, &fileTime, store, &para, CERT_CHAIN_REVOCATION_CHECK_CHAIN_EXCLUDE_ROOT, -- 2.18.0

1 0

[PATCH v3 1/2] crypt32/tests: Add revocation flags tests for CertGetCertificateChain().
by Zhiyi Zhang 22 Aug '18

22 Aug '18

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v3: Avoid leaking chain. Supersede 150010,150011. dlls/crypt32/tests/chain.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index a6599b21ae..a995c81239 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -4147,6 +4147,26 @@ static void testGetCertChain(void) pCertFreeCertificateChain(chain); + /* Test revocation flags */ + ret = CertGetCertificateChain(NULL, cert, &fileTime, store, &para, CERT_CHAIN_REVOCATION_CHECK_END_CERT, NULL, + &chain); + ok(ret, "CertGetCertificateChain failed: %u\n", GetLastError()); + ok(!chain->TrustStatus.dwErrorStatus, "chain->TrustStatus.dwErrorStatus = %x\n", chain->TrustStatus.dwErrorStatus); + pCertFreeCertificateChain(chain); + + ret = CertGetCertificateChain(NULL, cert, &fileTime, store, &para, CERT_CHAIN_REVOCATION_CHECK_CHAIN, NULL, &chain); + ok(ret, "CertGetCertificateChain failed: %u\n", GetLastError()); + todo_wine ok(!chain->TrustStatus.dwErrorStatus + || broken(chain->TrustStatus.dwErrorStatus == CERT_TRUST_REVOCATION_STATUS_UNKNOWN), /* XP */ + "chain->TrustStatus.dwErrorStatus = %x\n", chain->TrustStatus.dwErrorStatus); + pCertFreeCertificateChain(chain); + + ret = CertGetCertificateChain(NULL, cert, &fileTime, store, &para, CERT_CHAIN_REVOCATION_CHECK_CHAIN_EXCLUDE_ROOT, + NULL, &chain); + ok(ret, "CertGetCertificateChain failed: %u\n", GetLastError()); + ok(!chain->TrustStatus.dwErrorStatus, "chain->TrustStatus.dwErrorStatus = %x\n", chain->TrustStatus.dwErrorStatus); + pCertFreeCertificateChain(chain); + /* Test HCCE_LOCAL_MACHINE */ ret = CertGetCertificateChain(HCCE_LOCAL_MACHINE, cert, &fileTime, store, &para, 0, NULL, &chain); ok(ret, "CertGetCertificateChain failed: %u\n", GetLastError()); -- 2.18.0

1 0

[PATCH v2 2/2] crypt32: Properly check root certificate in CERT_CHAIN_REVOCATION_CHECK_CHAIN.
by Zhiyi Zhang 22 Aug '18

22 Aug '18

Original patch by Michael Müller. Root certificates don't have CRL Distribution Point or Authority Info Access field. Don't report error with CERT_CHAIN_REVOCATION_CHECK_CHAIN in CertGetCertificateChain() because of this. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v2: ignore CRYPT_E_NO_REVOCATION_CHECK only with CERT_CHAIN_REVOCATION_CHECK_CHAIN. dlls/crypt32/chain.c | 5 +++++ dlls/crypt32/tests/chain.c | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index d7015d797d..41c87b7ae7 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -2698,6 +2698,11 @@ static void CRYPT_VerifyChainRevocation(PCERT_CHAIN_CONTEXT chain, ret = CertVerifyRevocation(X509_ASN_ENCODING, CERT_CONTEXT_REVOCATION_TYPE, 1, (void **)&certToCheck, revocationFlags, &revocationPara, &revocationStatus); + + if (!ret && chainFlags & + && revocationStatus.dwError == CRYPT_E_NO_REVOCATION_CHECK && revocationPara.pIssuerCert == NULL) + ret = TRUE; + if (!ret) { PCERT_CHAIN_ELEMENT element = CRYPT_FindIthElementInChain( diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index a995c81239..e2a7633526 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -4156,9 +4156,9 @@ static void testGetCertChain(void) ret = CertGetCertificateChain(NULL, cert, &fileTime, store, &para, CERT_CHAIN_REVOCATION_CHECK_CHAIN, NULL, &chain); ok(ret, "CertGetCertificateChain failed: %u\n", GetLastError()); - todo_wine ok(!chain->TrustStatus.dwErrorStatus - || broken(chain->TrustStatus.dwErrorStatus == CERT_TRUST_REVOCATION_STATUS_UNKNOWN), /* XP */ - "chain->TrustStatus.dwErrorStatus = %x\n", chain->TrustStatus.dwErrorStatus); + ok(!chain->TrustStatus.dwErrorStatus + || broken(chain->TrustStatus.dwErrorStatus == CERT_TRUST_REVOCATION_STATUS_UNKNOWN), /* XP */ + "chain->TrustStatus.dwErrorStatus = %x\n", chain->TrustStatus.dwErrorStatus); pCertFreeCertificateChain(chain); ret = CertGetCertificateChain(NULL, cert, &fileTime, store, &para, CERT_CHAIN_REVOCATION_CHECK_CHAIN_EXCLUDE_ROOT, -- 2.18.0

2 1

[PATCH v2 1/2] crypt32/tests: Add revocation flags tests for CertGetCertificateChain().
by Zhiyi Zhang 22 Aug '18

22 Aug '18

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v2: Avoid leaking chain. Supersede 149966,149967. dlls/crypt32/tests/chain.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index a6599b21ae..a995c81239 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -4147,6 +4147,26 @@ static void testGetCertChain(void) pCertFreeCertificateChain(chain); + /* Test revocation flags */ + ret = CertGetCertificateChain(NULL, cert, &fileTime, store, &para, CERT_CHAIN_REVOCATION_CHECK_END_CERT, NULL, + &chain); + ok(ret, "CertGetCertificateChain failed: %u\n", GetLastError()); + ok(!chain->TrustStatus.dwErrorStatus, "chain->TrustStatus.dwErrorStatus = %x\n", chain->TrustStatus.dwErrorStatus); + pCertFreeCertificateChain(chain); + + ret = CertGetCertificateChain(NULL, cert, &fileTime, store, &para, CERT_CHAIN_REVOCATION_CHECK_CHAIN, NULL, &chain); + ok(ret, "CertGetCertificateChain failed: %u\n", GetLastError()); + todo_wine ok(!chain->TrustStatus.dwErrorStatus + || broken(chain->TrustStatus.dwErrorStatus == CERT_TRUST_REVOCATION_STATUS_UNKNOWN), /* XP */ + "chain->TrustStatus.dwErrorStatus = %x\n", chain->TrustStatus.dwErrorStatus); + pCertFreeCertificateChain(chain); + + ret = CertGetCertificateChain(NULL, cert, &fileTime, store, &para, CERT_CHAIN_REVOCATION_CHECK_CHAIN_EXCLUDE_ROOT, + NULL, &chain); + ok(ret, "CertGetCertificateChain failed: %u\n", GetLastError()); + ok(!chain->TrustStatus.dwErrorStatus, "chain->TrustStatus.dwErrorStatus = %x\n", chain->TrustStatus.dwErrorStatus); + pCertFreeCertificateChain(chain); + /* Test HCCE_LOCAL_MACHINE */ ret = CertGetCertificateChain(HCCE_LOCAL_MACHINE, cert, &fileTime, store, &para, 0, NULL, &chain); ok(ret, "CertGetCertificateChain failed: %u\n", GetLastError()); -- 2.18.0

1 0

[PATCH 1/7] shell32: Add eject icon
by Alex Henrie 22 Aug '18

22 Aug '18

Adapted from media-eject in the Tango Icon Library. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/shell32/Makefile.in | 1 + dlls/shell32/resources/eject.ico | Bin 0 -> 41496 bytes dlls/shell32/resources/eject.svg | 596 +++++++++++++++++++++++++++++++ dlls/shell32/shell32.rc | 3 + dlls/shell32/shresdef.h | 1 + 5 files changed, 601 insertions(+) create mode 100644 dlls/shell32/resources/eject.ico create mode 100644 dlls/shell32/resources/eject.svg diff --git a/dlls/shell32/Makefile.in b/dlls/shell32/Makefile.in index ee502c26df..62fb27097c 100644 --- a/dlls/shell32/Makefile.in +++ b/dlls/shell32/Makefile.in @@ -68,6 +68,7 @@ SVG_SRCS = \ resources/desktop.svg \ resources/document.svg \ resources/drive.svg \ + resources/eject.svg \ resources/floppy.svg \ resources/folder.svg \ resources/folder_open.svg \ diff --git a/dlls/shell32/resources/eject.ico b/dlls/shell32/resources/eject.ico new file mode 100644 index 0000000000000000000000000000000000000000..576b25b25c8ecc5e6c7b257ef640cbe9e4128b70 GIT binary patch literal 41496 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 literal 0 HcmV?d00001 diff --git a/dlls/shell32/resources/eject.svg b/dlls/shell32/resources/eject.svg new file mode 100644 index 0000000000..cd8414bdef --- /dev/null +++ b/dlls/shell32/resources/eject.svg @@ -0,0 +1,596 @@ +<?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.1" + id="svg1307" + height="272" + width="632"> + <defs + id="defs1309"> + <linearGradient + id="linearGradient4061"> + <stop + style="stop-color:#474845;stop-opacity:1;" + offset="0" + id="stop4063" /> + <stop + style="stop-color:#838681;stop-opacity:1" + offset="1" + id="stop4065" /> + </linearGradient> + <linearGradient + id="linearGradient2684"> + <stop + style="stop-color:#ffffff;stop-opacity:1;" + offset="0" + id="stop2686" /> + <stop + style="stop-color:#000000;stop-opacity:1;" + offset="1" + id="stop2688" /> + </linearGradient> + <linearGradient + id="linearGradient2679"> + <stop + id="stop2681" + offset="0" + style="stop-color:#ffffff;stop-opacity:1" /> + <stop + id="stop2683" + offset="1" + style="stop-color:#d3d7cf" /> + </linearGradient> + <radialGradient + r="12.551644" + fy="53.259945" + fx="101.15939" + cy="53.259945" + cx="101.15939" + gradientTransform="matrix(0.00402237,-4.19236,11.180094,0.00906826,-459.19255,601.23007)" + gradientUnits="userSpaceOnUse" + id="radialGradient3705" + xlink:href="#linearGradient2679" /> + <linearGradient + gradientTransform="matrix(5.33333,0,0,5.33333,11.036277,4.3243073)" + gradientUnits="userSpaceOnUse" + y2="34.510876" + x2="21.522573" + y1="14.977048" + x1="21.597084" + id="linearGradient3889" + xlink:href="#linearGradient4061" /> + <linearGradient + y2="90.142509" + x2="14.888244" + y1="107.7246" + x1="14.296268" + gradientTransform="matrix(6.0169616,0,0,6.0169616,54.94162,-440.26256)" + gradientUnits="userSpaceOnUse" + id="linearGradient3725" + xlink:href="#linearGradient2684" /> + <radialGradient + r="12.551644" + fy="53.086113" + fx="107.69903" + cy="53.086113" + cx="107.69903" + gradientTransform="matrix(0.00395609,-4.4853732,10.99586,0.00970202,-446.78082,621.57672)" + gradientUnits="userSpaceOnUse" + id="radialGradient2820" + xlink:href="#linearGradient2679" /> + <linearGradient + y2="88.591339" + x2="14.334254" + y1="107.05981" + x1="14.628661" + gradientTransform="matrix(6.0169616,0,0,6.0169616,54.94162,-440.26256)" + gradientUnits="userSpaceOnUse" + id="linearGradient3721" + xlink:href="#linearGradient2684" /> + <linearGradient + gradientTransform="matrix(5.33333,0,0,5.33333,11.036277,4.3243073)" + y2="34.510876" + x2="21.522573" + y1="14.977048" + x1="21.597084" + gradientUnits="userSpaceOnUse" + id="linearGradient967" + xlink:href="#linearGradient4061" /> + <radialGradient + r="12.551644" + fy="53.259945" + fx="101.15939" + cy="53.259945" + cx="101.15939" + gradientTransform="matrix(7.541952e-4,-0.786068,2.096269,0.0017003,183.83171,331.91943)" + gradientUnits="userSpaceOnUse" + id="radialGradient3705-6" + xlink:href="#linearGradient2679" /> + <linearGradient + gradientUnits="userSpaceOnUse" + y2="34.510876" + x2="21.522573" + y1="14.977048" + x1="21.597084" + id="linearGradient3889-1" + xlink:href="#linearGradient4061" + gradientTransform="translate(271.99967,219.99953)" /> + <linearGradient + y2="90.142509" + x2="14.888244" + y1="107.7246" + x1="14.296268" + gradientTransform="matrix(1.128181,0,0,1.128181,280.23193,136.63944)" + gradientUnits="userSpaceOnUse" + id="linearGradient3725-0" + xlink:href="#linearGradient2684" /> + <radialGradient + r="12.551644" + fy="53.086113" + fx="107.69903" + cy="53.086113" + cx="107.69903" + gradientTransform="matrix(7.417671e-4,-0.841008,2.061725,0.00181913,186.15891,335.73443)" + gradientUnits="userSpaceOnUse" + id="radialGradient2820-6" + xlink:href="#linearGradient2679" /> + <linearGradient + y2="88.591339" + x2="14.334254" + y1="107.05981" + x1="14.628661" + gradientTransform="matrix(1.128181,0,0,1.128181,280.23193,136.63944)" + gradientUnits="userSpaceOnUse" + id="linearGradient3721-6" + xlink:href="#linearGradient2684" /> + <linearGradient + y2="34.510876" + x2="21.522573" + y1="14.977048" + x1="21.597084" + gradientTransform="translate(271.99967,219.99953)" + gradientUnits="userSpaceOnUse" + id="linearGradient1064" + xlink:href="#linearGradient4061" /> + <radialGradient + r="12.551644" + fy="53.259945" + fx="101.15939" + cy="53.259945" + cx="101.15939" + gradientTransform="matrix(5.0279931e-4,-0.52404795,1.3975197,0.00113354,381.22079,310.61353)" + gradientUnits="userSpaceOnUse" + id="radialGradient3705-6-0" + xlink:href="#linearGradient2679" /> + <linearGradient + gradientUnits="userSpaceOnUse" + y2="34.510876" + x2="21.522573" + y1="14.977048" + x1="21.597084" + id="linearGradient3889-1-7" + xlink:href="#linearGradient4061" + gradientTransform="matrix(0.66667,0,0,0.66667,439.99973,235.99989)" /> + <linearGradient + y2="90.142509" + x2="14.888244" + y1="107.7246" + x1="14.296268" + gradientTransform="matrix(0.75212443,0,0,0.75212443,445.48793,180.42622)" + gradientUnits="userSpaceOnUse" + id="linearGradient3725-0-2" + xlink:href="#linearGradient2684" /> + <radialGradient + r="12.551644" + fy="53.086113" + fx="107.69903" + cy="53.086113" + cx="107.69903" + gradientTransform="matrix(4.9451387e-4,-0.5606748,1.3744902,0.00121276,382.77227,313.15687)" + gradientUnits="userSpaceOnUse" + id="radialGradient2820-6-9" + xlink:href="#linearGradient2679" /> + <linearGradient + y2="88.591339" + x2="14.334254" + y1="107.05981" + x1="14.628661" + gradientTransform="matrix(0.75212443,0,0,0.75212443,445.48793,180.42622)" + gradientUnits="userSpaceOnUse" + id="linearGradient3721-6-3" + xlink:href="#linearGradient2684" /> + <linearGradient + y2="34.510876" + x2="21.522573" + y1="14.977048" + x1="21.597084" + gradientTransform="matrix(0.66667,0,0,0.66667,439.99973,235.99989)" + gradientUnits="userSpaceOnUse" + id="linearGradient1361" + xlink:href="#linearGradient4061" /> + </defs> + <metadata + id="metadata1312"> + <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:creator> + <cc:Agent> + <dc:title>Jakub Steiner</dc:title> + </cc:Agent> + </dc:creator> + <cc:license + rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" /> + <dc:subject> + <rdf:Bag> + <rdf:li>media</rdf:li> + <rdf:li>eject</rdf:li> + </rdf:Bag> + </dc:subject> + <dc:contributor> + <cc:Agent> + <dc:title /> + </cc:Agent> + </dc:contributor> + </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> + <path + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.15;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3721);stroke-width:15.99999046;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" + d="M 137.3726,51.030437 69.018984,145.65749 H 205.72622 Z" + id="path3711" /> + <path + id="path2818" + d="M 137.3726,51.030437 69.018984,145.65749 H 205.72622 Z" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#radialGradient2820);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient967);stroke-width:5.33333063;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /> + <path + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:5.33333015;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" + d="M 137.37257,60.281837 79.365661,140.81155 195.37949,140.34014 Z" + id="path2828" /> + <rect + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.15;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3725);stroke-width:15.99999046;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" + id="rect3723" + width="138.03912" + height="26.533634" + x="67.645996" + y="167.01437" /> + <rect + y="167.01437" + x="67.645996" + height="26.533634" + width="138.03912" + id="rect3703" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#radialGradient3705);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3889);stroke-width:5.33333111;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" /> + <rect + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:5.33332729;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" + id="rect3707" + width="127.34952" + height="15.628088" + x="72.990623" + y="172.60706" /> + <path + id="path3709" + d="m 137.36953,64.657597 -31.99998,44.333313 c 26.64306,0.99659 35.79754,-0.89496 60.66663,-4.33333 z" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.56111109;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:5.33333015;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" /> + <rect + id="icon:256-32" + height="256" + width="256" + y="8" + x="8" + style="fill:none" /> + <path + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.15;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3721-6);stroke-width:3;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" + d="m 295.68775,228.75694 -12.81632,17.74258 h 25.63263 z" + id="path3711-2" /> + <path + id="path2818-6" + d="m 295.68775,228.75694 -12.81632,17.74258 h 25.63263 z" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#radialGradient2820-6);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient1064);stroke-width:1.00000012;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /> + <path + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1;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" + d="m 295.68774,230.49158 -10.8763,15.09933 21.7526,-0.0884 z" + id="path2828-1" /> + <rect + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.15;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3725-0);stroke-width:3;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" + id="rect3723-8" + width="25.882353" + height="4.9750595" + x="282.61401" + y="250.50394" /> + <rect + y="250.50394" + x="282.61401" + height="4.9750595" + width="25.882353" + id="rect3703-7" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#radialGradient3705-6);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3889-1);stroke-width:1.00000024;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" /> + <rect + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.99999952;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" + id="rect3707-9" + width="23.87805" + height="2.9302683" + x="283.61612" + y="251.55255" /> + <path + id="path3709-2" + d="m 295.68717,231.31203 -6,8.3125 c 4.99558,0.18686 6.71204,-0.1678 11.375,-0.8125 z" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.56111109;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;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" /> + <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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 +gg== +" + 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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 +gg== +" + id="icon:48-4" + x="384" + y="220" /> + <path + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.15;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3721-6-3);stroke-width:2.00001001;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" + d="m 455.79186,241.83819 -8.54425,11.82845 h 17.0885 z" + id="path3711-2-6" /> + <path + id="path2818-6-1" + d="m 455.79186,241.83819 -8.54425,11.82845 h 17.0885 z" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#radialGradient2820-6-9);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient1361);stroke-width:0.66667008;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /> + <path + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.66667002;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" + d="m 455.79186,242.99462 -7.25091,10.06627 14.50181,-0.0589 z" + id="path2828-1-2" /> + <rect + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.15;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3725-0-2);stroke-width:2.00001001;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" + id="rect3723-8-9" + width="17.254988" + height="3.3167229" + x="447.07602" + y="256.33627" /> + <rect + y="256.33627" + x="447.07602" + height="3.3167229" + width="17.254988" + id="rect3703-7-3" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#radialGradient3705-6-0);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3889-1-7);stroke-width:0.66667014;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" /> + <rect + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.66666967;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" + id="rect3707-9-1" + width="15.918779" + height="1.953522" + x="447.74408" + y="257.03534" /> + <path + id="path3709-2-9" + d="m 455.79148,243.54159 -4.00002,5.5417 c 3.3304,0.12457 4.47471,-0.11187 7.58337,-0.54167 z" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.56111109;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.66667002;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" /> + <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,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAMAAABEpIrGAAAABGdBTUEAALGPC/xhBQAAACBjSFJN +AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAABaFBMVEUAAAA3OjU3OTQoKCQM +DAw1NTIfHx8HBwcNDQ0aGhojIyNDQ0NNTUpQUE1HR0dgYGBaWlVfX1qAgICbm5tucGxwcm6ioqK8 +vLzDw8PV1dXW1tbd3d3c3Nzj4+MyMjJnZ2efn5////9OTktMTUrl5uTj5OJHR0Sio6D9/f38/Pyf +oZ5nZ2Pw8e7v8e77+/toaGVOTkzw8O/19vTs7urz9PLt7u1QUU3LzMr6+/ru8O3v8e35+fjJy8hR +UU1NTUyRk47y9PHx8/Hw8u/u7+zt7+z8/PuTlZJPT01maGT5+vnt7+3m6eXn6uXn6eXm6eTs7+z6 ++vpoaWZfYV3o6Of29/Xq7Onr7urs7uvq6+lfYF1namW+v7zx8/Dy9PLz9fP09fP7/PvCw8BnaWWM +jYn///+OkIxsbmppa2dnaWR0d3Fzd3FzdnF3e3V3enV7f3n+/v33+Pb+/v57fnl/g337+/r8/fx/ +gn2ChoDon6pCAAAAInRSTlMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPKwcEQAA +AAFiS0dEIcRsDRYAAAAHdElNRQfWBgwXJxrz6+FgAAABCElEQVQ4y2NgGIKAkQm/PLOSEjM+eRZl +FVVlFjwK1NQ1NLXUcMuzamvq6Orps+KSZzMwNDI2NjE1YMMuz25mbmFpZWVlbWPLgU2e085ew8HR +0cnZxdXNnQtTnpvHw9PL28fX19vPPyCQlw9dnl8gKDgkNCzcxcUlPCwkIlKQH1VeSCgq2tVSNyY2 +Lj4uNkY3ITFJSAhFgbBIcgoKSBUVQ1EgnpSWngQHGSAggaJAUlIKCKSRgIwsA0lALhMGsrKyssFA +DkWBfE4KGsiVR1GgkJcfrusYX+CpWajpWRDvqFtYpICiQKrYoiRBs1RDI78wX0OjVDOhpEwKRYFi +OQZQRFWABZDmzcENAOc0TlYRHRU2AAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE3LTEwLTE5VDAwOjE0 +OjA5LTA2OjAwjtUZ/AAAACV0RVh0ZGF0ZTptb2RpZnkAMjAwNi0wNi0xM1QwNTozOToyNi0wNjow +MHsLU9sAAAAASUVORK5CYII= +" + id="icon:32-8" + x="480" + y="236" /> + <image + width="32" + height="32" + preserveAspectRatio="none" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAMAAABEpIrGAAAABGdBTUEAALGPC/xhBQAAACBjSFJN +AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAABaFBMVEUAAAA3OjU3OTQoKCQM +DAw1NTIfHx8HBwcNDQ0aGhojIyNDQ0NNTUpQUE1HR0dgYGBaWlVfX1qAgICbm5tucGxwcm6ioqK8 +vLzDw8PV1dXW1tbd3d3c3Nzj4+MyMjJnZ2efn5////9OTktMTUrl5uTj5OJHR0Sio6D9/f38/Pyf +oZ5nZ2Pw8e7v8e77+/toaGVOTkzw8O/19vTs7urz9PLt7u1QUU3LzMr6+/ru8O3v8e35+fjJy8hR +UU1NTUyRk47y9PHx8/Hw8u/u7+zt7+z8/PuTlZJPT01maGT5+vnt7+3m6eXn6uXn6eXm6eTs7+z6 ++vpoaWZfYV3o6Of29/Xq7Onr7urs7uvq6+lfYF1namW+v7zx8/Dy9PLz9fP09fP7/PvCw8BnaWWM +jYn///+OkIxsbmppa2dnaWR0d3Fzd3FzdnF3e3V3enV7f3n+/v33+Pb+/v57fnl/g337+/r8/fx/ +gn2ChoDon6pCAAAAInRSTlMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPKwcEQAA +AAFiS0dEIcRsDRYAAAAHdElNRQfWBgwXJxrz6+FgAAABCElEQVQ4y2NgGIKAkQm/PLOSEjM+eRZl +FVVlFjwK1NQ1NLXUcMuzamvq6Orps+KSZzMwNDI2NjE1YMMuz25mbmFpZWVlbWPLgU2e085ew8HR +0cnZxdXNnQtTnpvHw9PL28fX19vPPyCQlw9dnl8gKDgkNCzcxcUlPCwkIlKQH1VeSCgq2tVSNyY2 +Lj4uNkY3ITFJSAhFgbBIcgoKSBUVQ1EgnpSWngQHGSAggaJAUlIKCKSRgIwsA0lALhMGsrKyssFA +DkWBfE4KGsiVR1GgkJcfrusYX+CpWajpWRDvqFtYpICiQKrYoiRBs1RDI78wX0OjVDOhpEwKRYFi +OQZQRFWABZDmzcENAOc0TlYRHRU2AAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE3LTEwLTE5VDAwOjE0 +OjA5LTA2OjAwjtUZ/AAAACV0RVh0ZGF0ZTptb2RpZnkAMjAwNi0wNi0xM1QwNTozOToyNi0wNjow +MHsLU9sAAAAASUVORK5CYII= +" + id="icon:32-4" + x="520" + y="236" /> + <image + width="16" + height="16" + preserveAspectRatio="none" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAABl0RVh0 +U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAIGSURBVDiNlVNNaBNhEH2zm5h2aSxB6Jrd +bhKCK2ICQkEFtVojiIoU/9oYmxgFQREET16UHjx5Us+eDFqqguDJg7Z68KLePBgRVOoPrWlN023a +JLttMh6aSNIkJQ58MIf3Hm9m3kfMjGZFRHYAxMxWM4xtDfJ6TdM2M7NARJ+Z2WhZgIjsLpdL27N3 +11OBIL1+9eYgESWZ2awDM3PNA0AAPCdOHX8yNvZi6d37t8uD4ZPjAHzlcWrwjRxs2Le/90ggGOjv +6wvZQMD2HTt3Z7Jz0ZfPx+8BmG7qAICk63pvLB7N5vI5zi7M83zWYNMy+fyFeK6nZ9thURQ7ajiV +RlEU0e/3bzo9FP6Q/JQs5gt5Ts1M8e/pSV5YzPLE94nSmVj4RzAY3Or1em11I/h8vo3dHuXKgVBo +i67rQmYuDSICESGXX4SqKBQeiMjMj25O/py6CuAXKkuJRCKdxWLxkOzuun/n9t02URAbnpaZcWP4 +euHbl6/XHI72h4lEImMDAFVVO2b+pAZm0+l1ly5ftKhqN1jVm6Zlb2t3xFSl+xmAFQGPx7PkdruH +DcO4RUSrM1HXS5JUcDqdFlAOkqZp0ujjkY8NfTep/qPHAgBSFQciAIw8GG2JfPZctKgoiljtoCQI +wnIsPkRrU/8Vy7JcAspXANAJoAsrMW5JAEAawCxVfWf6TwEGgL8Ut/ce2QnONgAAAABJRU5ErkJg +gg== +" + id="icon:16-32" + x="560" + y="252" /> + <image + width="16" + height="16" + preserveAspectRatio="none" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAABGdBTUEAALGPC/xhBQAAACBjSFJN +AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAABAlBMVEX///8AAAAdHR0cHBwR +EREaGho/QT1FSkMlJSUyMi8DAwMiIiIsLCwfHx86Ojo/Pz9YWFhVVVVXV1VeXl5zc3N6enqRkZGM +jIx9fX1+fn5/f3+AgICKioqXl5eurq6jo6PMzMy9vb3p6enU1NRZW1dbXFdSVFG8vLrJyshWV1N9 +gHz8/Pz8/fyLjYpdX1z29/bz9PLy8/H5+vlhZF9YW1fW19b3+Pfp6+fo6ub09fPg4eBaXVdWWFSb +nZn7/Pvq7Oj7+/qxsrBZXFhsbmv+/v79/f15e3heX1xaW1hjZmJkZmJjZWFiZGBhY19gYl5ZW1hf +YFxVV1P6+vpYWlZXWVX///9CgJXBAAAAJHRSTlMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAGAVEMAAAAAWJLR0QAiAUdSAAAAAd0SU1FB9UMDRcLJ+Yqy7UAAACUSURBVBjTY2CA +AEZGBhTAyMSMIsLIoqLKiiTCyKimrqGJpIuRTUtbR5cdLsDIoadvYGhkzMkF4bNym5iamVtYWlnz +8IIF+Gxs7eyBwMHRiR/EFxB0tnMBA1c3IWGggIi7h6eXt4+Pr5+ff4AoUEBMXEISCKSkpKSlZWSB +AnKBSEAeKKAQGAQHwYpAAaUQJKDMQBgAAFqUG9HptvClAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE3 +LTEwLTE5VDAwOjE0OjA5LTA2OjAwjtUZ/AAAACV0RVh0ZGF0ZTptb2RpZnkAMjAwNS0xMi0xNFQw +NjoxMTozOS0wNzowMEeqsqMAAAAZdEVYdFNvZnR3YXJlAHd3dy5pbmtzY2FwZS5vcmeb7jwaAAAA +AElFTkSuQmCC +" + id="icon:16-8" + x="584" + y="252" /> + <image + width="16" + height="16" + preserveAspectRatio="none" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAABGdBTUEAALGPC/xhBQAAACBjSFJN +AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAABAlBMVEX///8AAAAdHR0cHBwR +EREaGho/QT1FSkMlJSUyMi8DAwMiIiIsLCwfHx86Ojo/Pz9YWFhVVVVXV1VeXl5zc3N6enqRkZGM +jIx9fX1+fn5/f3+AgICKioqXl5eurq6jo6PMzMy9vb3p6enU1NRZW1dbXFdSVFG8vLrJyshWV1N9 +gHz8/Pz8/fyLjYpdX1z29/bz9PLy8/H5+vlhZF9YW1fW19b3+Pfp6+fo6ub09fPg4eBaXVdWWFSb +nZn7/Pvq7Oj7+/qxsrBZXFhsbmv+/v79/f15e3heX1xaW1hjZmJkZmJjZWFiZGBhY19gYl5ZW1hf +YFxVV1P6+vpYWlZXWVX///9CgJXBAAAAJHRSTlMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAGAVEMAAAAAWJLR0QAiAUdSAAAAAd0SU1FB9UMDRcLJ+Yqy7UAAACUSURBVBjTY2CA +AEZGBhTAyMSMIsLIoqLKiiTCyKimrqGJpIuRTUtbR5cdLsDIoadvYGhkzMkF4bNym5iamVtYWlnz +8IIF+Gxs7eyBwMHRiR/EFxB0tnMBA1c3IWGggIi7h6eXt4+Pr5+ff4AoUEBMXEISCKSkpKSlZWSB +AnKBSEAeKKAQGAQHwYpAAaUQJKDMQBgAAFqUG9HptvClAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE3 +LTEwLTE5VDAwOjE0OjA5LTA2OjAwjtUZ/AAAACV0RVh0ZGF0ZTptb2RpZnkAMjAwNS0xMi0xNFQw +NjoxMTozOS0wNzowMEeqsqMAAAAZdEVYdFNvZnR3YXJlAHd3dy5pbmtzY2FwZS5vcmeb7jwaAAAA +AElFTkSuQmCC +" + id="icon:16-4" + x="608" + y="252" /> +</svg> diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index a82abfefc3..f66949cee8 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -504,6 +504,9 @@ IDI_SHELL_RUN ICON resources/window.ico /* @makedep: resources/sleep.ico */ IDI_SHELL_SLEEP ICON resources/sleep.ico +/* @makedep: resources/eject.ico */ +IDI_SHELL_EJECT ICON resources/eject.ico + /* @makedep: resources/shortcut.ico */ IDI_SHELL_SHORTCUT ICON resources/shortcut.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 4a9ac9a385..589379b7af 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -195,6 +195,7 @@ #define IDI_SHELL_HELP 24 #define IDI_SHELL_RUN 25 #define IDI_SHELL_SLEEP 26 +#define IDI_SHELL_EJECT 27 #define IDI_SHELL_FOLDER_OPEN_LARGE 29 #define IDI_SHELL_SHORTCUT 30 #define IDI_SHELL_FOLDER_OPEN_SMALL 31 -- 2.18.0

1 6

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

21 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/explorer/desktop.c | 8 ++++---- programs/explorer/explorer.c | 32 +++++++++++++++----------------- programs/explorer/systray.c | 8 ++++---- 3 files changed, 23 insertions(+), 25 deletions(-) diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index 4f47ad0d36..ff58204530 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -709,7 +709,7 @@ static const WCHAR *get_default_desktop_name(void) WCHAR *ret = NULL; HKEY hkey; - if (desk && GetUserObjectInformationW( desk, UOI_NAME, buffer, sizeof(buffer)/sizeof(WCHAR), NULL )) + if (desk && GetUserObjectInformationW( desk, UOI_NAME, buffer, ARRAY_SIZE( buffer ), NULL )) { if (strcmpiW( buffer, defaultW )) return buffer; } @@ -792,7 +792,7 @@ static HMODULE load_graphics_driver( const WCHAR *driver, const GUID *guid ) static const WCHAR drv_formatW[] = {'w','i','n','e','%','s','.','d','r','v',0}; WCHAR buffer[MAX_PATH], libname[32], *name, *next; - WCHAR key[sizeof(device_keyW)/sizeof(WCHAR) + 39]; + WCHAR key[ARRAY_SIZE( device_keyW ) + 39]; HMODULE module = 0; HKEY hkey; char error[80]; @@ -809,7 +809,7 @@ static HMODULE load_graphics_driver( const WCHAR *driver, const GUID *guid ) RegCloseKey( hkey ); } } - else lstrcpynW( buffer, driver, sizeof(buffer)/sizeof(WCHAR) ); + else lstrcpynW( buffer, driver, ARRAY_SIZE( buffer )); name = buffer; while (name) @@ -817,7 +817,7 @@ static HMODULE load_graphics_driver( const WCHAR *driver, const GUID *guid ) next = strchrW( name, ',' ); if (next) *next++ = 0; - snprintfW( libname, sizeof(libname)/sizeof(WCHAR), drv_formatW, name ); + snprintfW( libname, ARRAY_SIZE( libname ), drv_formatW, name ); if ((module = LoadLibraryW( libname )) != 0) break; switch (GetLastError()) { diff --git a/programs/explorer/explorer.c b/programs/explorer/explorer.c index c50933661b..955678d23b 100644 --- a/programs/explorer/explorer.c +++ b/programs/explorer/explorer.c @@ -345,10 +345,8 @@ static void make_explorer_window(IShellFolder* startFolder) memset(nav_buttons,0,sizeof(nav_buttons)); - LoadStringW(explorer_hInstance,IDS_EXPLORER_TITLE,explorer_title, - sizeof(explorer_title)/sizeof(WCHAR)); - LoadStringW(explorer_hInstance,IDS_PATHBOX_LABEL,pathbox_label, - sizeof(pathbox_label)/sizeof(WCHAR)); + LoadStringW(explorer_hInstance,IDS_EXPLORER_TITLE,explorer_title, ARRAY_SIZE( explorer_title )); + LoadStringW(explorer_hInstance,IDS_PATHBOX_LABEL,pathbox_label, ARRAY_SIZE( pathbox_label )); hdc = GetDC(0); dpix = GetDeviceCaps(hdc, LOGPIXELSX); @@ -415,7 +413,7 @@ static void make_explorer_window(IShellFolder* startFolder) nav_buttons[2].fsState=TBSTATE_ENABLED; nav_buttons[2].fsStyle=BTNS_BUTTON|BTNS_AUTOSIZE; SendMessageW(nav_toolbar,TB_BUTTONSTRUCTSIZE,sizeof(TBBUTTON),0); - SendMessageW(nav_toolbar,TB_ADDBUTTONSW,sizeof(nav_buttons)/sizeof(TBBUTTON),(LPARAM)nav_buttons); + SendMessageW(nav_toolbar,TB_ADDBUTTONSW,ARRAY_SIZE( nav_buttons ),(LPARAM)nav_buttons); band_info.cbSize = sizeof(band_info); band_info.fMask = RBBIM_STYLE|RBBIM_CHILD|RBBIM_CHILDSIZE|RBBIM_SIZE; @@ -738,38 +736,38 @@ static void parse_command_line(LPWSTR commandline,parameters_struct *parameters) while (*p) { while (isspaceW(*p)) p++; - if (strncmpW(p, arg_n, sizeof(arg_n)/sizeof(WCHAR))==0) + if (strncmpW(p, arg_n, ARRAY_SIZE( arg_n ))==0) { parameters->explorer_mode = FALSE; - p += sizeof(arg_n)/sizeof(WCHAR); + p += ARRAY_SIZE( arg_n ); } - else if (strncmpW(p, arg_e, sizeof(arg_e)/sizeof(WCHAR))==0) + else if (strncmpW(p, arg_e, ARRAY_SIZE( arg_e ))==0) { parameters->explorer_mode = TRUE; - p += sizeof(arg_e)/sizeof(WCHAR); + p += ARRAY_SIZE( arg_e ); } - else if (strncmpW(p, arg_root, sizeof(arg_root)/sizeof(WCHAR))==0) + else if (strncmpW(p, arg_root, ARRAY_SIZE( arg_root ))==0) { - p += sizeof(arg_root)/sizeof(WCHAR); + p += ARRAY_SIZE( arg_root ); p = copy_path_string(parameters->root,p); } - else if (strncmpW(p, arg_select, sizeof(arg_select)/sizeof(WCHAR))==0) + else if (strncmpW(p, arg_select, ARRAY_SIZE( arg_select ))==0) { - p += sizeof(arg_select)/sizeof(WCHAR); + p += ARRAY_SIZE( arg_select ); p = copy_path_string(parameters->selection,p); if (!parameters->root[0]) copy_path_root(parameters->root, parameters->selection); } - else if (strncmpW(p, arg_desktop, sizeof(arg_desktop)/sizeof(WCHAR))==0) + else if (strncmpW(p, arg_desktop, ARRAY_SIZE( arg_desktop ))==0) { - p += sizeof(arg_desktop)/sizeof(WCHAR); + p += ARRAY_SIZE( arg_desktop ); manage_desktop( p ); /* the rest of the command line is handled by desktop mode */ } /* workaround for Worms Armageddon that hardcodes a /desktop option with quotes */ - else if (strncmpW(p, arg_desktop_quotes, sizeof(arg_desktop_quotes)/sizeof(WCHAR))==0) + else if (strncmpW(p, arg_desktop_quotes, ARRAY_SIZE( arg_desktop_quotes ))==0) { - p += sizeof(arg_desktop_quotes)/sizeof(WCHAR); + p += ARRAY_SIZE( arg_desktop_quotes ); manage_desktop( p ); /* the rest of the command line is handled by desktop mode */ } else diff --git a/programs/explorer/systray.c b/programs/explorer/systray.c index 9e58ad4833..3d36f74e16 100644 --- a/programs/explorer/systray.c +++ b/programs/explorer/systray.c @@ -405,13 +405,13 @@ static BOOL modify_icon( struct icon *icon, NOTIFYICONDATAW *nid ) } if (nid->uFlags & NIF_TIP) { - lstrcpynW(icon->tiptext, nid->szTip, sizeof(icon->tiptext)/sizeof(WCHAR)); + lstrcpynW( icon->tiptext, nid->szTip, ARRAY_SIZE( icon->tiptext )); if (icon->display != -1) update_tooltip_text(icon); } if (nid->uFlags & NIF_INFO && nid->cbSize >= NOTIFYICONDATAA_V2_SIZE) { - lstrcpynW( icon->info_text, nid->szInfo, sizeof(icon->info_text)/sizeof(WCHAR) ); - lstrcpynW( icon->info_title, nid->szInfoTitle, sizeof(icon->info_title)/sizeof(WCHAR) ); + lstrcpynW( icon->info_text, nid->szInfo, ARRAY_SIZE( icon->info_text )); + lstrcpynW( icon->info_title, nid->szInfoTitle, ARRAY_SIZE( icon->info_title )); icon->info_flags = nid->dwInfoFlags; icon->info_timeout = max(min(nid->u.uTimeout, BALLOON_SHOW_MAX_TIMEOUT), BALLOON_SHOW_MIN_TIMEOUT); icon->info_icon = nid->hBalloonIcon; @@ -933,7 +933,7 @@ void initialize_systray( HMODULE graphics_driver, BOOL using_root, BOOL arg_enab return; } - LoadStringW( NULL, IDS_START_LABEL, start_label, sizeof(start_label)/sizeof(WCHAR) ); + LoadStringW( NULL, IDS_START_LABEL, start_label, ARRAY_SIZE( start_label )); add_taskbar_button( 0 ); -- 2.14.4

1 0

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

21 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/dxdiag/information.c | 6 +++--- programs/dxdiag/main.c | 10 +++++----- programs/dxdiag/output.c | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/programs/dxdiag/information.c b/programs/dxdiag/information.c index 5cc862be63..ec2b2b5b0e 100644 --- a/programs/dxdiag/information.c +++ b/programs/dxdiag/information.c @@ -156,7 +156,7 @@ static BOOL fill_system_information(IDxDiagContainer *container, struct dxdiag_i fill_system_property_list(dxdiag_info, property_list); - for (i = 0; i < sizeof(property_list)/sizeof(property_list[0]); i++) + for (i = 0; i < ARRAY_SIZE(property_list); i++) { if (!property_to_string(container, property_list[i].property_name, property_list[i].output)) { @@ -193,7 +193,7 @@ void free_dxdiag_information(struct dxdiag_information *system_info) if (!system_info) return; - for (i = 0; i < sizeof(filler_list)/sizeof(filler_list[0]); i++) + for (i = 0; i < ARRAY_SIZE(filler_list); i++) filler_list[i].free_function(system_info); HeapFree(GetProcessHeap(), 0, system_info); @@ -230,7 +230,7 @@ struct dxdiag_information *collect_dxdiag_information(BOOL whql_check) if (!ret) goto error; - for (i = 0; i < sizeof(filler_list)/sizeof(filler_list[0]); i++) + for (i = 0; i < ARRAY_SIZE(filler_list); i++) { IDxDiagContainer *child; BOOL success; diff --git a/programs/dxdiag/main.c b/programs/dxdiag/main.c index d7d430b570..b073674ca1 100644 --- a/programs/dxdiag/main.c +++ b/programs/dxdiag/main.c @@ -43,8 +43,8 @@ static void usage(void) WCHAR title[MAX_STRING_LEN]; WCHAR usage[MAX_STRING_LEN]; - LoadStringW(hInstance, STRING_DXDIAG_TOOL, title, sizeof(title)/sizeof(WCHAR)); - LoadStringW(hInstance, STRING_USAGE, usage, sizeof(usage)/sizeof(WCHAR)); + LoadStringW(hInstance, STRING_DXDIAG_TOOL, title, ARRAY_SIZE(title)); + LoadStringW(hInstance, STRING_USAGE, usage, ARRAY_SIZE(usage)); MessageBoxW(NULL, usage, title, MB_OK | MB_ICONWARNING); @@ -126,7 +126,7 @@ static BOOL process_command_line(const WCHAR *cmdline, struct command_line_info { info->output_type = OUTPUT_TEXT; return process_file_name(cmdline, OUTPUT_TEXT, info->outfile, - sizeof(info->outfile)/sizeof(WCHAR)); + ARRAY_SIZE(info->outfile)); } cmdline++; @@ -137,12 +137,12 @@ static BOOL process_command_line(const WCHAR *cmdline, struct command_line_info case 't': info->output_type = OUTPUT_TEXT; return process_file_name(cmdline + 1, OUTPUT_TEXT, info->outfile, - sizeof(info->outfile)/sizeof(WCHAR)); + ARRAY_SIZE(info->outfile)); case 'X': case 'x': info->output_type = OUTPUT_XML; return process_file_name(cmdline + 1, OUTPUT_XML, info->outfile, - sizeof(info->outfile)/sizeof(WCHAR)); + ARRAY_SIZE(info->outfile)); case 'W': case 'w': if (strncmpiW(cmdline, whql_colonW, 5)) diff --git a/programs/dxdiag/output.c b/programs/dxdiag/output.c index c18c75d183..b1e0f188ee 100644 --- a/programs/dxdiag/output.c +++ b/programs/dxdiag/output.c @@ -179,7 +179,7 @@ static BOOL output_text_information(struct dxdiag_information *dxdiag_info, cons return FALSE; } - for (i = 0; i < sizeof(output_table)/sizeof(output_table[0]); i++) + for (i = 0; i < ARRAY_SIZE(output_table); i++) { const struct text_information_field *fields = output_table[i].fields; unsigned int j; @@ -313,7 +313,7 @@ static BOOL output_xml_information(struct dxdiag_information *dxdiag_info, const if (FAILED(hr)) goto error; - for (i = 0; i < sizeof(output_table)/sizeof(output_table[0]); i++) + for (i = 0; i < ARRAY_SIZE(output_table); i++) { IXMLDOMElement *info_element = xml_create_element(xmldoc, output_table[i].tag_name); const struct xml_information_field *fields = output_table[i].fields; @@ -394,14 +394,14 @@ static struct output_backend const WCHAR *get_output_extension(enum output_type type) { - assert(type > OUTPUT_NONE && type <= sizeof(output_backends)/sizeof(output_backends[0])); + assert(type > OUTPUT_NONE && type <= ARRAY_SIZE(output_backends)); return output_backends[type - 1].filename_ext; } BOOL output_dxdiag_information(struct dxdiag_information *dxdiag_info, const WCHAR *filename, enum output_type type) { - assert(type > OUTPUT_NONE && type <= sizeof(output_backends)/sizeof(output_backends[0])); + assert(type > OUTPUT_NONE && type <= ARRAY_SIZE(output_backends)); return output_backends[type - 1].output_handler(dxdiag_info, filename); } -- 2.14.4

1 0

[PATCH 1/4] comctl32/edit: Get rid of useless float cast
by Gabriel Ivăncescu 21 Aug '18

21 Aug '18

Since the division (the only operation with a fractional result) was immediately truncated to integer anyway, the float cast is completely useless. This works fine because the multiplication is done before the division (parentheses have been added to emphasize this point). Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/comctl32/edit.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/edit.c b/dlls/comctl32/edit.c index 10ff5fb..7bcf9ce 100644 --- a/dlls/comctl32/edit.c +++ b/dlls/comctl32/edit.c @@ -4911,7 +4911,7 @@ static LRESULT CALLBACK EDIT_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPAR case WM_MOUSEWHEEL: { - int wheelDelta; + INT wheelDelta; UINT pulScrollLines = 3; SystemParametersInfoW(SPI_GETWHEELSCROLLLINES,0, &pulScrollLines, 0); @@ -4931,10 +4931,10 @@ static LRESULT CALLBACK EDIT_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPAR if (es->wheelDeltaRemainder && pulScrollLines) { - int cLineScroll; - pulScrollLines = (int) min((UINT) es->line_count, pulScrollLines); - cLineScroll = pulScrollLines * (float)es->wheelDeltaRemainder / WHEEL_DELTA; - es->wheelDeltaRemainder -= WHEEL_DELTA * cLineScroll / (int)pulScrollLines; + INT cLineScroll; + pulScrollLines = (INT) min((UINT) es->line_count, pulScrollLines); + cLineScroll = ((INT)pulScrollLines * es->wheelDeltaRemainder) / WHEEL_DELTA; + es->wheelDeltaRemainder -= (cLineScroll * WHEEL_DELTA) / (INT)pulScrollLines; result = EDIT_EM_LineScroll(es, 0, -cLineScroll); } break; -- 1.9.1

1 3

[PATCH 1/2] comctl32/listbox: Update the size in SetColumnWidth unconditionally
by Gabriel Ivăncescu 21 Aug '18

21 Aug '18

When the listbox receives a WM_WINDOWPOSCHANGED message and calls DefWindowProc on it, which then ends up sending a WM_SIZE to the window, some applications swallow that up and won't pass the WM_SIZE to the listbox. However, they do pass a LB_SETCOLUMNWIDTH, even when the column width did not change at all. So we have to unconditionally update the size itself (not just the page) when we receive that message. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=22440 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/comctl32/listbox.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index b3491bb..b3719a6 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -1260,10 +1260,12 @@ static LRESULT LISTBOX_SetHorizontalExtent( LB_DESCR *descr, INT extent ) */ static LRESULT LISTBOX_SetColumnWidth( LB_DESCR *descr, INT width) { - if (width == descr->column_width) return LB_OKAY; - TRACE("[%p]: new column width = %d\n", descr->self, width ); + /* update the SIZE unconditionally, because some applications swallow + WM_SIZE from DefWindowProc and only send LB_SETCOLUMNWIDTH, even + when the column width doesn't even change (but its size does) */ + TRACE("[%p]: new column width = %d\n", descr->self, width); descr->column_width = width; - LISTBOX_UpdatePage( descr ); + LISTBOX_UpdateSize(descr); return LB_OKAY; } -- 1.9.1

2 5

[PATCH vkd3d 3/8] vkd3d: Reference count CPU descriptors.
by Józef Kucia 21 Aug '18

21 Aug '18

From: Józef Kucia <jkucia(a)codeweavers.com> We have to keep all image views referenced by all used VkFramebuffers. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 57 ++++++++++++++++++++++++++++++++++++++++------ libs/vkd3d/resource.c | 46 +++++++++++++++++++++++++------------ libs/vkd3d/vkd3d_private.h | 11 +++++++-- 3 files changed, 91 insertions(+), 23 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 8fb6b62b9169..f5b6558dab7b 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -750,6 +750,19 @@ static bool d3d12_command_allocator_add_descriptor_pool(struct d3d12_command_all return true; } +static bool d3d12_command_allocator_add_view(struct d3d12_command_allocator *allocator, + struct vkd3d_view *view) +{ + if (!vkd3d_array_reserve((void **)&allocator->views, &allocator->views_size, + allocator->view_count + 1, sizeof(*allocator->views))) + return false; + + vkd3d_view_incref(view); + allocator->views[allocator->view_count++] = view; + + return true; +} + static bool d3d12_command_allocator_add_buffer_view(struct d3d12_command_allocator *allocator, VkBufferView view) { @@ -808,6 +821,12 @@ static void d3d12_command_allocator_free_resources(struct d3d12_command_allocato } allocator->buffer_view_count = 0; + for (i = 0; i < allocator->view_count; ++i) + { + vkd3d_view_decref(allocator->views[i], device); + } + allocator->view_count = 0; + for (i = 0; i < allocator->descriptor_pool_count; ++i) { VK_CALL(vkDestroyDescriptorPool(device->vk_device, allocator->descriptor_pools[i], NULL)); @@ -889,6 +908,7 @@ static ULONG STDMETHODCALLTYPE d3d12_command_allocator_Release(ID3D12CommandAllo d3d12_command_allocator_free_resources(allocator); vkd3d_free(allocator->transfer_buffers); vkd3d_free(allocator->buffer_views); + vkd3d_free(allocator->views); vkd3d_free(allocator->descriptor_pools); vkd3d_free(allocator->pipelines); vkd3d_free(allocator->framebuffers); @@ -1077,6 +1097,10 @@ static HRESULT d3d12_command_allocator_init(struct d3d12_command_allocator *allo allocator->descriptor_pools_size = 0; allocator->descriptor_pool_count = 0; + allocator->views = NULL; + allocator->views_size = 0; + allocator->view_count = 0; + allocator->buffer_views = NULL; allocator->buffer_views_size = 0; allocator->buffer_view_count = 0; @@ -3497,6 +3521,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_OMSetRenderTargets(ID3D12Graphi struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList(iface); const struct d3d12_rtv_desc *rtv_desc; const struct d3d12_dsv_desc *dsv_desc; + struct vkd3d_view *view; unsigned int i; TRACE("iface %p, render_target_descriptor_count %u, render_target_descriptors %p, " @@ -3523,7 +3548,14 @@ static void STDMETHODCALLTYPE d3d12_command_list_OMSetRenderTargets(ID3D12Graphi d3d12_command_list_track_resource_usage(list, rtv_desc->resource); - list->views[i + 1] = rtv_desc->vk_view; + /* In D3D12 CPU descriptors are consumed when a command is recorded. */ + view = rtv_desc->view; + if (!d3d12_command_allocator_add_view(list->allocator, view)) + { + WARN("Failed to add view.\n"); + } + + list->views[i + 1] = view->u.vk_image_view; list->fb_width = max(list->fb_width, rtv_desc->width); list->fb_height = max(list->fb_height, rtv_desc->height); list->fb_layer_count = max(list->fb_layer_count, rtv_desc->layer_count); @@ -3535,11 +3567,17 @@ static void STDMETHODCALLTYPE d3d12_command_list_OMSetRenderTargets(ID3D12Graphi d3d12_command_list_track_resource_usage(list, dsv_desc->resource); + /* In D3D12 CPU descriptors are consumed when a command is recorded. */ + view = dsv_desc->view; + if (!d3d12_command_allocator_add_view(list->allocator, view)) + { + WARN("Failed to add view.\n"); + } + + list->views[0] = view->u.vk_image_view; list->fb_width = max(list->fb_width, dsv_desc->width); list->fb_height = max(list->fb_height, dsv_desc->height); list->fb_layer_count = max(list->fb_layer_count, 1); - - list->views[0] = dsv_desc->vk_view; } d3d12_command_list_invalidate_current_framebuffer(list); @@ -3549,7 +3587,7 @@ 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 VkAttachmentReference *color_reference, const struct VkAttachmentReference *ds_reference, - VkImageView vk_view, size_t width, size_t height, unsigned int layer_count, + 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) { struct VkSubpassDescription sub_pass_desc; @@ -3608,12 +3646,17 @@ static void d3d12_command_list_clear(struct d3d12_command_list *list, return; } + if (!d3d12_command_allocator_add_view(list->allocator, view)) + { + WARN("Failed to add view.\n"); + } + fb_desc.sType = VK_STRUCTURE_TYPE_FRAMEBUFFER_CREATE_INFO; fb_desc.pNext = NULL; fb_desc.flags = 0; fb_desc.renderPass = vk_render_pass; fb_desc.attachmentCount = 1; - fb_desc.pAttachments = &vk_view; + fb_desc.pAttachments = &view->u.vk_image_view; fb_desc.width = width; fb_desc.height = height; fb_desc.layers = layer_count; @@ -3693,7 +3736,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_ClearDepthStencilView(ID3D12Gra ds_reference.layout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL; d3d12_command_list_clear(list, &list->device->vk_procs, &attachment_desc, NULL, &ds_reference, - dsv_desc->vk_view, dsv_desc->width, dsv_desc->height, 1, &clear_value, rect_count, rects); + dsv_desc->view, dsv_desc->width, dsv_desc->height, 1, &clear_value, rect_count, rects); } static void STDMETHODCALLTYPE d3d12_command_list_ClearRenderTargetView(ID3D12GraphicsCommandList *iface, @@ -3724,7 +3767,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_ClearRenderTargetView(ID3D12Gra color_reference.layout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; d3d12_command_list_clear(list, &list->device->vk_procs, &attachment_desc, &color_reference, NULL, - rtv_desc->vk_view, rtv_desc->width, rtv_desc->height, rtv_desc->layer_count, + rtv_desc->view, rtv_desc->width, rtv_desc->height, rtv_desc->layer_count, &clear_value, rect_count, rects); } diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 44f323350056..f6dffbfda31e 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1099,12 +1099,12 @@ static struct vkd3d_view *vkd3d_view_create(void) return view; } -static void vkd3d_view_incref(struct vkd3d_view *view) +void vkd3d_view_incref(struct vkd3d_view *view) { InterlockedIncrement(&view->refcount); } -static void vkd3d_view_decref(struct vkd3d_view *view, +static void vkd3d_view_decref_descriptor(struct vkd3d_view *view, const struct d3d12_desc *descriptor, struct d3d12_device *device) { const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; @@ -1115,7 +1115,11 @@ static void vkd3d_view_decref(struct vkd3d_view *view, TRACE("Destroying view %p.\n", view); - if (descriptor->magic == VKD3D_DESCRIPTOR_MAGIC_SRV || descriptor->magic == VKD3D_DESCRIPTOR_MAGIC_UAV) + if (!descriptor) + { + VK_CALL(vkDestroyImageView(device->vk_device, view->u.vk_image_view, NULL)); + } + else if (descriptor->magic == VKD3D_DESCRIPTOR_MAGIC_SRV || descriptor->magic == VKD3D_DESCRIPTOR_MAGIC_UAV) { if (descriptor->vk_descriptor_type == VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER || descriptor->vk_descriptor_type == VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER) @@ -1134,6 +1138,11 @@ static void vkd3d_view_decref(struct vkd3d_view *view, vkd3d_free(view); } +void vkd3d_view_decref(struct vkd3d_view *view, struct d3d12_device *device) +{ + vkd3d_view_decref_descriptor(view, NULL, device); +} + static void d3d12_desc_destroy(struct d3d12_desc *descriptor, struct d3d12_device *device) { @@ -1142,7 +1151,7 @@ static void d3d12_desc_destroy(struct d3d12_desc *descriptor, || descriptor->magic == VKD3D_DESCRIPTOR_MAGIC_UAV || descriptor->magic == VKD3D_DESCRIPTOR_MAGIC_SAMPLER) { - vkd3d_view_decref(descriptor->u.view, descriptor, device); + vkd3d_view_decref_descriptor(descriptor->u.view, descriptor, device); } memset(descriptor, 0, sizeof(*descriptor)); @@ -1789,12 +1798,10 @@ HRESULT vkd3d_create_static_sampler(struct d3d12_device *device, /* RTVs */ static void d3d12_rtv_desc_destroy(struct d3d12_rtv_desc *rtv, struct d3d12_device *device) { - const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; - if (rtv->magic != VKD3D_DESCRIPTOR_MAGIC_RTV) return; - VK_CALL(vkDestroyImageView(device->vk_device, rtv->vk_view, NULL)); + vkd3d_view_decref(rtv->view, device); memset(rtv, 0, sizeof(*rtv)); } @@ -1803,6 +1810,7 @@ void d3d12_rtv_desc_create_rtv(struct d3d12_rtv_desc *rtv_desc, struct d3d12_dev { const struct vkd3d_format *format; VkImageViewType vk_view_type; + struct vkd3d_view *view; uint32_t miplevel_idx; d3d12_rtv_desc_destroy(rtv_desc, device); @@ -1834,30 +1842,35 @@ void d3d12_rtv_desc_create_rtv(struct d3d12_rtv_desc *rtv_desc, struct d3d12_dev if (desc && desc->u.Texture2D.PlaneSlice) FIXME("Ignoring plane slice %u.\n", desc->u.Texture2D.PlaneSlice); + if (!(view = vkd3d_view_create())) + return; + miplevel_idx = desc ? desc->u.Texture2D.MipSlice : 0; vk_view_type = resource->desc.DepthOrArraySize > 1 ? VK_IMAGE_VIEW_TYPE_2D_ARRAY : VK_IMAGE_VIEW_TYPE_2D; if (vkd3d_create_texture_view(device, resource, format, vk_view_type, - miplevel_idx, 1, 0, VK_REMAINING_ARRAY_LAYERS, false, &rtv_desc->vk_view) < 0) + miplevel_idx, 1, 0, VK_REMAINING_ARRAY_LAYERS, false, &view->u.vk_image_view) < 0) + { + vkd3d_free(view); return; + } + rtv_desc->magic = VKD3D_DESCRIPTOR_MAGIC_RTV; rtv_desc->format = format->vk_format; rtv_desc->width = d3d12_resource_desc_get_width(&resource->desc, miplevel_idx); rtv_desc->height = d3d12_resource_desc_get_height(&resource->desc, miplevel_idx); rtv_desc->layer_count = resource->desc.DepthOrArraySize; - rtv_desc->magic = VKD3D_DESCRIPTOR_MAGIC_RTV; + rtv_desc->view = view; rtv_desc->resource = resource; } /* DSVs */ static void d3d12_dsv_desc_destroy(struct d3d12_dsv_desc *dsv, struct d3d12_device *device) { - const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; - if (dsv->magic != VKD3D_DESCRIPTOR_MAGIC_DSV) return; - VK_CALL(vkDestroyImageView(device->vk_device, dsv->vk_view, NULL)); + vkd3d_view_decref(dsv->view, device); memset(dsv, 0, sizeof(*dsv)); } @@ -1865,6 +1878,7 @@ void d3d12_dsv_desc_create_dsv(struct d3d12_dsv_desc *dsv_desc, struct d3d12_dev struct d3d12_resource *resource, const D3D12_DEPTH_STENCIL_VIEW_DESC *desc) { const struct vkd3d_format *format; + struct vkd3d_view *view; uint32_t miplevel_idx; d3d12_dsv_desc_destroy(dsv_desc, device); @@ -1896,15 +1910,19 @@ void d3d12_dsv_desc_create_dsv(struct d3d12_dsv_desc *dsv_desc, struct d3d12_dev if (desc && desc->Flags) FIXME("Ignoring flags %#x.\n", desc->Flags); + if (!(view = vkd3d_view_create())) + return; + miplevel_idx = desc ? desc->u.Texture2D.MipSlice : 0; if (vkd3d_create_texture_view(device, resource, format, VK_IMAGE_VIEW_TYPE_2D, - miplevel_idx, 1, 0, 1, false, &dsv_desc->vk_view) < 0) + miplevel_idx, 1, 0, 1, false, &view->u.vk_image_view) < 0) return; + dsv_desc->magic = VKD3D_DESCRIPTOR_MAGIC_DSV; dsv_desc->format = format->vk_format; dsv_desc->width = d3d12_resource_desc_get_width(&resource->desc, miplevel_idx); dsv_desc->height = d3d12_resource_desc_get_height(&resource->desc, miplevel_idx); - dsv_desc->magic = VKD3D_DESCRIPTOR_MAGIC_DSV; + dsv_desc->view = view; dsv_desc->resource = resource; } diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 278f4f615c35..9b5d5db0c57a 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -257,6 +257,9 @@ struct vkd3d_view VkBufferView vk_counter_view; }; +void vkd3d_view_decref(struct vkd3d_view *view, struct d3d12_device *device) DECLSPEC_HIDDEN; +void vkd3d_view_incref(struct vkd3d_view *view) DECLSPEC_HIDDEN; + struct d3d12_desc { uint32_t magic; @@ -306,7 +309,7 @@ struct d3d12_rtv_desc uint64_t width; unsigned int height; unsigned int layer_count; - VkImageView vk_view; + struct vkd3d_view *view; struct d3d12_resource *resource; }; @@ -324,7 +327,7 @@ struct d3d12_dsv_desc VkFormat format; uint64_t width; unsigned int height; - VkImageView vk_view; + struct vkd3d_view *view; struct d3d12_resource *resource; }; @@ -561,6 +564,10 @@ struct d3d12_command_allocator size_t descriptor_pools_size; size_t descriptor_pool_count; + struct vkd3d_view **views; + size_t views_size; + size_t view_count; + VkBufferView *buffer_views; size_t buffer_views_size; size_t buffer_view_count; -- 2.16.4

2 1

[PATCH resend vkd3d 8/8] vkd3d-utils: Detect surface extensions at runtime.
by Józef Kucia 21 Aug '18

21 Aug '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- Makefile.am | 1 - libs/vkd3d-utils/vkd3d_utils_main.c | 16 ++++++++++++---- libs/vkd3d-utils/vkd3d_utils_private.h | 9 +++------ 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/Makefile.am b/Makefile.am index 79e31553cb7c..3ee2f130c50d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -106,7 +106,6 @@ libvkd3d_utils_la_SOURCES = \ libs/vkd3d-utils/vkd3d_utils.map \ libs/vkd3d-utils/vkd3d_utils_main.c \ libs/vkd3d-utils/vkd3d_utils_private.h -libvkd3d_utils_la_CFLAGS = @XCB_CFLAGS@ libvkd3d_utils_la_LDFLAGS = -version-info 1:0:0 libvkd3d_utils_la_LIBADD = libvkd3d-common.la libvkd3d.la if HAVE_LD_VERSION_SCRIPT diff --git a/libs/vkd3d-utils/vkd3d_utils_main.c b/libs/vkd3d-utils/vkd3d_utils_main.c index 8c2503784e37..fa6e5f8f1616 100644 --- a/libs/vkd3d-utils/vkd3d_utils_main.c +++ b/libs/vkd3d-utils/vkd3d_utils_main.c @@ -28,15 +28,18 @@ HRESULT WINAPI D3D12GetDebugInterface(REFIID iid, void **debug) HRESULT WINAPI D3D12CreateDevice(IUnknown *adapter, D3D_FEATURE_LEVEL minimum_feature_level, REFIID iid, void **device) { + struct vkd3d_optional_instance_extensions_info optional_extensions_info; struct vkd3d_instance_create_info instance_create_info; struct vkd3d_device_create_info device_create_info; static const char * const instance_extensions[] = { VK_KHR_SURFACE_EXTENSION_NAME, -#ifdef HAVE_XCB - VK_KHR_XCB_SURFACE_EXTENSION_NAME, -#endif + }; + static const char * const optional_instance_extensions[] = + { + "VK_KHR_xcb_surface", + "VK_MVK_macos_surface", }; static const char * const device_extensions[] = { @@ -49,9 +52,14 @@ HRESULT WINAPI D3D12CreateDevice(IUnknown *adapter, if (adapter) FIXME("Ignoring adapter %p.\n", adapter); + memset(&optional_extensions_info, 0, sizeof(optional_extensions_info)); + optional_extensions_info.type = VKD3D_STRUCTURE_TYPE_OPTIONAL_INSTANCE_EXTENSIONS_INFO; + optional_extensions_info.extensions = optional_instance_extensions; + optional_extensions_info.extension_count = ARRAY_SIZE(optional_instance_extensions); + memset(&instance_create_info, 0, sizeof(instance_create_info)); instance_create_info.type = VKD3D_STRUCTURE_TYPE_INSTANCE_CREATE_INFO; - instance_create_info.next = NULL; + instance_create_info.next = &optional_extensions_info; instance_create_info.pfn_signal_event = vkd3d_signal_event; instance_create_info.wchar_size = sizeof(WCHAR); instance_create_info.instance_extensions = instance_extensions; diff --git a/libs/vkd3d-utils/vkd3d_utils_private.h b/libs/vkd3d-utils/vkd3d_utils_private.h index 55d5300de0c1..6b5851e6bfc4 100644 --- a/libs/vkd3d-utils/vkd3d_utils_private.h +++ b/libs/vkd3d-utils/vkd3d_utils_private.h @@ -19,19 +19,16 @@ #ifndef __VKD3D_UTILS_PRIVATE_H #define __VKD3D_UTILS_PRIVATE_H -#include "vkd3d_memory.h" -#include <vkd3d_utils.h> - #define COBJMACROS #define NONAMELESSUNION #define VK_NO_PROTOTYPES -#ifdef HAVE_XCB -# define VK_USE_PLATFORM_XCB_KHR -#endif #include <pthread.h> #include <vkd3d.h> +#include "vkd3d_memory.h" +#include <vkd3d_utils.h> + struct vkd3d_event { pthread_mutex_t mutex; -- 2.16.4

2 1

[PATCH resend vkd3d 7/8] build: Add support for MoltenVK.
by Józef Kucia 21 Aug '18

21 Aug '18

From: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- configure.ac | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 90557ee42e68..ada7e9a7f0f8 100644 --- a/configure.ac +++ b/configure.ac @@ -79,7 +79,10 @@ AC_CHECK_LIB([pthread], [pthread_create], AC_SUBST([VULKAN_LIBS]) VKD3D_CHECK_SONAME([vulkan], [vkGetInstanceProcAddr], [VULKAN_LIBS="-lvulkan"], - [AC_MSG_ERROR([libvulkan not found.])]) + [VKD3D_CHECK_SONAME([MoltenVK], [vkGetInstanceProcAddr], + [VULKAN_LIBS="-lMoltenVK" + AC_DEFINE_UNQUOTED([SONAME_LIBVULKAN],["$ac_cv_lib_soname_MoltenVK"])], + [AC_MSG_ERROR([libvulkan and libMoltenVK not found.])])]) AS_IF([test "x$with_spirv_tools" = "xyes"], [PKG_CHECK_MODULES([SPIRV_TOOLS], [SPIRV-Tools-shared], -- 2.16.4

3 2

[PATCH v2 vkd3d 6/8] build: Detect soname of libvulkan at configure time.
by Józef Kucia 21 Aug '18

21 Aug '18

From: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- Version 2: Remove usage of $LIBEXT. --- configure.ac | 6 +++--- libs/vkd3d/device.c | 4 ++-- m4/check-soname.m4 | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 59 insertions(+), 5 deletions(-) create mode 100644 m4/check-soname.m4 diff --git a/configure.ac b/configure.ac index b5123b8d11de..90557ee42e68 100644 --- a/configure.ac +++ b/configure.ac @@ -77,9 +77,9 @@ AC_CHECK_LIB([pthread], [pthread_create], [AC_MSG_ERROR([libpthread not found.])]) AC_SUBST([VULKAN_LIBS]) -AC_CHECK_LIB([vulkan], [vkGetInstanceProcAddr], - [VULKAN_LIBS="-lvulkan"], - [AC_MSG_ERROR([libvulkan not found.])]) +VKD3D_CHECK_SONAME([vulkan], [vkGetInstanceProcAddr], + [VULKAN_LIBS="-lvulkan"], + [AC_MSG_ERROR([libvulkan not found.])]) AS_IF([test "x$with_spirv_tools" = "xyes"], [PKG_CHECK_MODULES([SPIRV_TOOLS], [SPIRV-Tools-shared], diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 8280fd5d03be..c11f474a28d2 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -283,9 +283,9 @@ static HRESULT vkd3d_init_vk_global_procs(struct vkd3d_instance *instance, if (!vkGetInstanceProcAddr) { - if (!(instance->libvulkan = dlopen("libvulkan.so.1", RTLD_NOW))) + if (!(instance->libvulkan = dlopen(SONAME_LIBVULKAN, RTLD_NOW))) { - ERR("Failed to load libvulkan.\n"); + ERR("Failed to load libvulkan: %s.\n", dlerror()); return E_FAIL; } diff --git a/m4/check-soname.m4 b/m4/check-soname.m4 new file mode 100644 index 000000000000..f1953413fa75 --- /dev/null +++ b/m4/check-soname.m4 @@ -0,0 +1,54 @@ +dnl +dnl Copyright 2002 Alexandre Julliard +dnl +dnl This library is free software; you can redistribute it and/or +dnl modify it under the terms of the GNU Lesser General Public +dnl License as published by the Free Software Foundation; either +dnl version 2.1 of the License, or (at your option) any later version. +dnl +dnl This library is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +dnl Lesser General Public License for more details. +dnl +dnl You should have received a copy of the GNU Lesser General Public +dnl License along with this library; if not, write to the Free Software +dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA +dnl +dnl As a special exception to the GNU Lesser General Public License, +dnl if you distribute this file as part of a program that contains a +dnl configuration script generated by Autoconf, you may include it +dnl under the same distribution terms that you use for the rest of +dnl that program. + +dnl VKD3D_PATH_SONAME_TOOLS +AC_DEFUN([VKD3D_PATH_SONAME_TOOLS], +[AC_PATH_PROG(LDD,ldd,true,/sbin:/usr/sbin:$PATH) +AC_CHECK_TOOL(OTOOL,otool,otool) +AC_CHECK_TOOL(READELF,[readelf],true)]) + +dnl VKD3D_CHECK_SONAME(library, function, [action-if-found, [action-if-not-found, [other_libraries, [pattern]]]]) +AC_DEFUN([VKD3D_CHECK_SONAME], +[AC_REQUIRE([VKD3D_PATH_SONAME_TOOLS])dnl +AS_VAR_PUSHDEF([ac_Lib],[ac_cv_lib_soname_$1])dnl +m4_pushdef([ac_lib_pattern],m4_default([$6],[lib$1]))dnl +AC_MSG_CHECKING([for -l$1]) +AC_CACHE_VAL(ac_Lib, +[ac_check_soname_save_LIBS=$LIBS + LIBS="-l$1 $5 $LIBS" + AC_LINK_IFELSE([AC_LANG_CALL([], [$2])], + [AS_CASE(["$host_os"], + [darwin*|macosx*], [AS_VAR_SET(ac_Lib,[`$OTOOL -L conftest$ac_exeext | grep "]ac_lib_pattern[\\.[[0-9A-Za-z.]]*dylib" | sed -e "s/^.*\/$]ac_lib_pattern[\.[[0-9A-Za-z.]]*dylib$.*$/\1/"';2,$d'`])], + [AS_VAR_SET(ac_Lib,[`$READELF -d conftest$ac_exeext | grep "NEEDED.*]ac_lib_pattern[" | sed -e "s/^.*\\m4_dquote(\$]ac_lib_pattern[[[^ ]]*\$\\).*$/\1/"';2,$d'`]) + AS_VAR_IF([ac_Lib],[], + [AS_VAR_SET(ac_Lib,[`$LDD conftest$ac_exeext | grep "]ac_lib_pattern[" | sed -e "s/^.*$]ac_lib_pattern[[[^ ]]*$.*$/\1/"';2,$d'`])])])]) + LIBS=$ac_check_soname_save_LIBS])dnl +AS_VAR_IF([ac_Lib],[], + [AC_MSG_RESULT([not found]) + $4], + [AC_MSG_RESULT(AS_VAR_GET(ac_Lib)) + AC_DEFINE_UNQUOTED(AS_TR_CPP(SONAME_LIB$1),["]AS_VAR_GET(ac_Lib)["], + [Define to the soname of the lib$1 library.]) + $3])dnl +m4_popdef([ac_lib_pattern])dnl +AS_VAR_POPDEF([ac_Lib])]) -- 2.16.4

3 2

[PATCH resend vkd3d 5/8] build: Make libxcb optional.
by Józef Kucia 21 Aug '18

21 Aug '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- configure.ac | 19 ++++++++++++++----- libs/vkd3d-utils/vkd3d_utils_main.c | 2 ++ libs/vkd3d-utils/vkd3d_utils_private.h | 14 ++++++++------ 3 files changed, 24 insertions(+), 11 deletions(-) diff --git a/configure.ac b/configure.ac index ddc6c972008f..b5123b8d11de 100644 --- a/configure.ac +++ b/configure.ac @@ -8,6 +8,7 @@ AC_CONFIG_HEADERS(include/config.h) AC_ARG_VAR([WIDL], [widl IDL compiler]) AC_ARG_VAR([CROSSCC32], [32-bit Windows cross compiler]) AC_ARG_VAR([CROSSCC64], [64-bit Windows cross compiler]) +AC_ARG_WITH([xcb], AS_HELP_STRING([--with-xcb], [Build with XCB library (default: test)])) AC_ARG_WITH([spirv-tools], AS_HELP_STRING([--with-spirv-tools], [Build with SPIRV-Tools library (default: disabled)])) AC_ARG_ENABLE([demos], AS_HELP_STRING([--enable-demos], [Build demo programs (default: disabled)])) @@ -80,13 +81,17 @@ AC_CHECK_LIB([vulkan], [vkGetInstanceProcAddr], [VULKAN_LIBS="-lvulkan"], [AC_MSG_ERROR([libvulkan not found.])]) -HAVE_SPIRV_TOOLS=no AS_IF([test "x$with_spirv_tools" = "xyes"], [PKG_CHECK_MODULES([SPIRV_TOOLS], [SPIRV-Tools-shared], - [AC_DEFINE([HAVE_SPIRV_TOOLS], [1], [Define to 1 if you have SPIRV-Tools.]) - HAVE_SPIRV_TOOLS=yes])]) + [AC_DEFINE([HAVE_SPIRV_TOOLS], [1], [Define to 1 if you have SPIRV-Tools.])])], + [with_spirv_tools=no]) -PKG_CHECK_MODULES([XCB], [xcb xcb-keysyms]) +HAVE_XCB=no +AS_IF([test "x$with_xcb" != "xno"], + [PKG_CHECK_MODULES([XCB], [xcb xcb-keysyms], + [AC_DEFINE([HAVE_XCB], [1], [Define to 1 if you have libxcb.]) + HAVE_XCB=yes], + [HAVE_XCB=no])]) dnl Check for functions VKD3D_CHECK_FUNC([HAVE_BUILTIN_CLZ], [__builtin_clz], [__builtin_clz(0)]) @@ -96,7 +101,10 @@ VKD3D_CHECK_FUNC([HAVE_SYNC_SUB_AND_FETCH], [__sync_sub_and_fetch], [__sync_sub_ VKD3D_CHECK_PTHREAD_SETNAME_NP +dnl Makefiles AS_IF([test "x$enable_demos" != "xyes"], [enable_demos=no]) +AS_IF([test "x$enable_demos" = "xyes" -a "x$HAVE_XCB" != "xyes"], + [AC_MSG_ERROR([libxcb is required for demos.])]) AM_CONDITIONAL([BUILD_DEMOS], [test "x$enable_demos" = "xyes"]) AM_CONDITIONAL([HAVE_WIDL], [test "x$WIDL" != "xno"]) AM_CONDITIONAL([HAVE_CROSSTARGET32], [test "x$CROSSTARGET32" != "xno"]) @@ -112,7 +120,8 @@ AS_IF([test "x$CROSSTARGET32" != "xno" -o "x$CROSSTARGET64" != "xno"], AS_ECHO([" Configuration summary for $PACKAGE $VERSION - Have SPIRV-Tools: ${HAVE_SPIRV_TOOLS} + Have XCB: ${HAVE_XCB} + Have SPIRV-Tools: ${with_spirv_tools} Building demos: ${enable_demos} diff --git a/libs/vkd3d-utils/vkd3d_utils_main.c b/libs/vkd3d-utils/vkd3d_utils_main.c index 2c4d89a7e38e..8c2503784e37 100644 --- a/libs/vkd3d-utils/vkd3d_utils_main.c +++ b/libs/vkd3d-utils/vkd3d_utils_main.c @@ -34,7 +34,9 @@ HRESULT WINAPI D3D12CreateDevice(IUnknown *adapter, static const char * const instance_extensions[] = { VK_KHR_SURFACE_EXTENSION_NAME, +#ifdef HAVE_XCB VK_KHR_XCB_SURFACE_EXTENSION_NAME, +#endif }; static const char * const device_extensions[] = { diff --git a/libs/vkd3d-utils/vkd3d_utils_private.h b/libs/vkd3d-utils/vkd3d_utils_private.h index 6aa0df6eeef5..55d5300de0c1 100644 --- a/libs/vkd3d-utils/vkd3d_utils_private.h +++ b/libs/vkd3d-utils/vkd3d_utils_private.h @@ -19,17 +19,19 @@ #ifndef __VKD3D_UTILS_PRIVATE_H #define __VKD3D_UTILS_PRIVATE_H +#include "vkd3d_memory.h" +#include <vkd3d_utils.h> + +#define COBJMACROS +#define NONAMELESSUNION #define VK_NO_PROTOTYPES -#define VK_USE_PLATFORM_XCB_KHR +#ifdef HAVE_XCB +# define VK_USE_PLATFORM_XCB_KHR +#endif #include <pthread.h> #include <vkd3d.h> -#define COBJMACROS -#define NONAMELESSUNION -#include "vkd3d_memory.h" -#include "vkd3d_utils.h" - struct vkd3d_event { pthread_mutex_t mutex; -- 2.16.4

3 2

[PATCH vkd3d 4/8] tests: Add test for CPU descriptors lifetime.
by Józef Kucia 21 Aug '18

21 Aug '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 128 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 128 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index f340d0915a7c..cf51ab9bbcdd 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -18077,6 +18077,133 @@ static void test_render_a8(void) destroy_test_context(&context); } +static void test_cpu_descriptors_lifetime(void) +{ + static const float blue[] = {0.0f, 0.0f, 1.0f, 1.0f}; + static const float red[] = {1.0f, 0.0f, 0.0f, 1.0f}; + ID3D12Resource *red_resource, *blue_resource; + ID3D12GraphicsCommandList *command_list; + D3D12_CPU_DESCRIPTOR_HANDLE rtv_handle; + D3D12_HEAP_PROPERTIES heap_properties; + D3D12_RESOURCE_DESC resource_desc; + ID3D12DescriptorHeap *rtv_heap; + D3D12_CLEAR_VALUE clear_value; + struct test_context context; + ID3D12CommandQueue *queue; + ID3D12Device *device; + HRESULT hr; + + if (!init_test_context(&context, NULL)) + return; + device = context.device; + command_list = context.list; + queue = context.queue; + + rtv_heap = create_cpu_descriptor_heap(device, D3D12_DESCRIPTOR_HEAP_TYPE_RTV, 1); + rtv_handle = ID3D12DescriptorHeap_GetCPUDescriptorHandleForHeapStart(rtv_heap); + + memset(&heap_properties, 0, sizeof(heap_properties)); + heap_properties.Type = D3D12_HEAP_TYPE_DEFAULT; + resource_desc.Dimension = D3D12_RESOURCE_DIMENSION_TEXTURE2D; + resource_desc.Alignment = 0; + resource_desc.Width = 32; + resource_desc.Height = 32; + resource_desc.DepthOrArraySize = 1; + resource_desc.MipLevels = 1; + resource_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + resource_desc.SampleDesc.Count = 1; + resource_desc.SampleDesc.Quality = 0; + resource_desc.Layout = D3D12_TEXTURE_LAYOUT_UNKNOWN; + resource_desc.Flags = D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET; + clear_value.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + clear_value.Color[0] = 1.0f; + clear_value.Color[1] = 0.0f; + clear_value.Color[2] = 0.0f; + clear_value.Color[3] = 1.0f; + hr = ID3D12Device_CreateCommittedResource(device, + &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc, + D3D12_RESOURCE_STATE_RENDER_TARGET, &clear_value, + &IID_ID3D12Resource, (void **)&red_resource); + ok(hr == S_OK, "Failed to create texture, hr %#x.\n", hr); + clear_value.Color[0] = 0.0f; + clear_value.Color[1] = 0.0f; + clear_value.Color[2] = 1.0f; + clear_value.Color[3] = 1.0f; + hr = ID3D12Device_CreateCommittedResource(device, + &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc, + D3D12_RESOURCE_STATE_RENDER_TARGET, &clear_value, + &IID_ID3D12Resource, (void **)&blue_resource); + ok(hr == S_OK, "Failed to create texture, hr %#x.\n", hr); + + ID3D12Device_CreateRenderTargetView(device, red_resource, NULL, rtv_handle); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, rtv_handle, red, 0, NULL); + /* Destroy the previous RTV and create a new one in its place. */ + ID3D12Device_CreateRenderTargetView(device, blue_resource, NULL, rtv_handle); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, rtv_handle, blue, 0, NULL); + + /* Destroy the CPU descriptor heap. */ + ID3D12DescriptorHeap_Release(rtv_heap); + + transition_resource_state(command_list, red_resource, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + transition_resource_state(command_list, blue_resource, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + check_sub_resource_uint(red_resource, 0, queue, command_list, 0xff0000ff, 0); + reset_command_list(command_list, context.allocator); + check_sub_resource_uint(blue_resource, 0, queue, command_list, 0xffff0000, 0); + + rtv_heap = create_cpu_descriptor_heap(device, D3D12_DESCRIPTOR_HEAP_TYPE_RTV, 1); + rtv_handle = ID3D12DescriptorHeap_GetCPUDescriptorHandleForHeapStart(rtv_heap); + + /* Try again with OMSetRenderTargets(). */ + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, red_resource, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + transition_resource_state(command_list, blue_resource, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + + ID3D12Device_CreateRenderTargetView(device, red_resource, NULL, rtv_handle); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, rtv_handle, red, 0, NULL); + + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &rtv_handle, FALSE, NULL); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + + /* Destroy the previous RTV and create a new one in its place. */ + ID3D12Device_CreateRenderTargetView(device, blue_resource, NULL, rtv_handle); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, rtv_handle, blue, 0, NULL); + + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &rtv_handle, FALSE, NULL); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + + /* Destroy the previous RTV and create a new one in its place. */ + ID3D12Device_CreateRenderTargetView(device, red_resource, NULL, rtv_handle); + + /* Destroy the CPU descriptor heap. */ + ID3D12DescriptorHeap_Release(rtv_heap); + + transition_resource_state(command_list, red_resource, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + transition_resource_state(command_list, blue_resource, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + check_sub_resource_uint(red_resource, 0, queue, command_list, 0xff00ff00, 0); + reset_command_list(command_list, context.allocator); + check_sub_resource_uint(blue_resource, 0, queue, command_list, 0xff00ff00, 0); + + ID3D12Resource_Release(blue_resource); + ID3D12Resource_Release(red_resource); + destroy_test_context(&context); +} + START_TEST(d3d12) { bool enable_debug_layer = false; @@ -18189,4 +18316,5 @@ START_TEST(d3d12) run_test(test_geometry_shader); run_test(test_layered_rendering); run_test(test_render_a8); + run_test(test_cpu_descriptors_lifetime); } -- 2.16.4

2 1

[PATCH vkd3d 1/8] vkd3d: Allow IASetVertexBuffers() with NULL buffer locations.
by Józef Kucia 21 Aug '18

21 Aug '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 39 ++++++++++++++++++++++++++++++++------- 1 file changed, 32 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 9aba589eadff..8fb6b62b9169 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -1738,6 +1738,10 @@ static bool d3d12_command_list_update_current_pipeline(struct d3d12_command_list b->binding = binding; b->stride = list->strides[binding]; b->inputRate = state->input_rates[binding]; + + if (!b->stride) + FIXME("Invalid stride for input slot %u.\n", binding); + ++binding_count; } @@ -3430,15 +3434,17 @@ static void STDMETHODCALLTYPE d3d12_command_list_IASetVertexBuffers(ID3D12Graphi UINT start_slot, UINT view_count, const D3D12_VERTEX_BUFFER_VIEW *views) { struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList(iface); + struct vkd3d_gpu_va_allocator *gpu_va_allocator; VkDeviceSize offsets[ARRAY_SIZE(list->strides)]; const struct vkd3d_vk_device_procs *vk_procs; VkBuffer buffers[ARRAY_SIZE(list->strides)]; + unsigned int i, first, count, stride; struct d3d12_resource *resource; - unsigned int i; TRACE("iface %p, start_slot %u, view_count %u, views %p.\n", iface, start_slot, view_count, views); vk_procs = &list->device->vk_procs; + gpu_va_allocator = &list->device->gpu_va_allocator; if (start_slot >= ARRAY_SIZE(list->strides) || view_count > ARRAY_SIZE(list->strides) - start_slot) { @@ -3446,15 +3452,34 @@ static void STDMETHODCALLTYPE d3d12_command_list_IASetVertexBuffers(ID3D12Graphi return; } - for (i = 0; i < view_count; ++i) + first = start_slot; + for (i = 0, count = 0; i < view_count; ++i) { - resource = vkd3d_gpu_va_allocator_dereference(&list->device->gpu_va_allocator, views[i].BufferLocation); - offsets[i] = views[i].BufferLocation - resource->gpu_address; - buffers[i] = resource->u.vk_buffer; - list->strides[start_slot + i] = views[i].StrideInBytes; + if (views[i].BufferLocation) + { + resource = vkd3d_gpu_va_allocator_dereference(gpu_va_allocator, views[i].BufferLocation); + buffers[count] = resource->u.vk_buffer; + offsets[count] = views[i].BufferLocation - resource->gpu_address; + stride = views[i].StrideInBytes; + ++count; + } + else + { + if (count) + VK_CALL(vkCmdBindVertexBuffers(list->vk_command_buffer, first, count, buffers, offsets)); + + stride = 0; + ++count; + + first += count; + count = 0; + } + + list->strides[start_slot + i] = stride; } - VK_CALL(vkCmdBindVertexBuffers(list->vk_command_buffer, start_slot, view_count, buffers, offsets)); + if (count) + VK_CALL(vkCmdBindVertexBuffers(list->vk_command_buffer, first, count, buffers, offsets)); d3d12_command_list_invalidate_current_pipeline(list); } -- 2.16.4

2 1

[PATCH vkd3d 2/8] tests: Test vertex buffer views with NULL buffer location.
by Józef Kucia 21 Aug '18

21 Aug '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 7d286614a2a0..f340d0915a7c 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -3711,7 +3711,7 @@ static void test_append_aligned_element(void) { ID3D12GraphicsCommandList *command_list; D3D12_INPUT_LAYOUT_DESC input_layout; - D3D12_VERTEX_BUFFER_VIEW vbv[3]; + D3D12_VERTEX_BUFFER_VIEW vbv[6]; struct test_context_desc desc; struct test_context context; struct resource_readback rb; @@ -3724,11 +3724,11 @@ static void test_append_aligned_element(void) { {"CoLoR", 2, DXGI_FORMAT_R32G32_FLOAT, 1, D3D12_APPEND_ALIGNED_ELEMENT, D3D12_INPUT_CLASSIFICATION_PER_INSTANCE_DATA, 1}, - {"ColoR", 3, DXGI_FORMAT_R32G32_FLOAT, 2, D3D12_APPEND_ALIGNED_ELEMENT, + {"ColoR", 3, DXGI_FORMAT_R32G32_FLOAT, 5, D3D12_APPEND_ALIGNED_ELEMENT, D3D12_INPUT_CLASSIFICATION_PER_INSTANCE_DATA, 1}, {"POSITION", 0, DXGI_FORMAT_R32G32B32A32_FLOAT, 0, D3D12_APPEND_ALIGNED_ELEMENT, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0}, - {"ColoR", 0, DXGI_FORMAT_R32G32_FLOAT, 2, D3D12_APPEND_ALIGNED_ELEMENT, + {"ColoR", 0, DXGI_FORMAT_R32G32_FLOAT, 5, D3D12_APPEND_ALIGNED_ELEMENT, D3D12_INPUT_CLASSIFICATION_PER_INSTANCE_DATA, 1}, {"cOLOr", 1, DXGI_FORMAT_R32G32_FLOAT, 1, D3D12_APPEND_ALIGNED_ELEMENT, D3D12_INPUT_CLASSIFICATION_PER_INSTANCE_DATA, 1}, @@ -3860,6 +3860,7 @@ static void test_append_aligned_element(void) context.pipeline_state = create_pipeline_state(context.device, context.root_signature, context.render_target_desc.Format, &vs, &ps, &input_layout); + memset(vbv, 0, sizeof(vbv)); vb[0] = create_upload_buffer(context.device, sizeof(stream0), stream0); vbv[0].BufferLocation = ID3D12Resource_GetGPUVirtualAddress(vb[0]); vbv[0].StrideInBytes = sizeof(*stream0); @@ -3871,9 +3872,9 @@ static void test_append_aligned_element(void) vbv[1].SizeInBytes = sizeof(stream1); vb[2] = create_upload_buffer(context.device, sizeof(stream2), stream2); - vbv[2].BufferLocation = ID3D12Resource_GetGPUVirtualAddress(vb[2]); - vbv[2].StrideInBytes = sizeof(*stream2); - vbv[2].SizeInBytes = sizeof(stream2); + vbv[5].BufferLocation = ID3D12Resource_GetGPUVirtualAddress(vb[2]); + vbv[5].StrideInBytes = sizeof(*stream2); + vbv[5].SizeInBytes = sizeof(stream2); ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); -- 2.16.4

2 1

[PATCH 2/2] crypt32: Properly check root certificate in CERT_CHAIN_REVOCATION_CHECK_CHAIN.
by Zhiyi Zhang 21 Aug '18

21 Aug '18

Original patch by Michael Müller. Root certificates don't have CRL Distribution Point or Authority Info Access field. Don't report error with CERT_CHAIN_REVOCATION_CHECK_CHAIN in CertGetCertificateChain() because of this. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/crypt32/chain.c | 8 ++++++++ dlls/crypt32/tests/chain.c | 6 +++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index d7015d797d..f77010a0fa 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -2698,6 +2698,14 @@ static void CRYPT_VerifyChainRevocation(PCERT_CHAIN_CONTEXT chain, ret = CertVerifyRevocation(X509_ASN_ENCODING, CERT_CONTEXT_REVOCATION_TYPE, 1, (void **)&certToCheck, revocationFlags, &revocationPara, &revocationStatus); + + if (!ret && revocationStatus.dwError == CRYPT_E_NO_REVOCATION_CHECK + && revocationPara.pIssuerCert == NULL) + { + WARN("Unable to find CRL or AIA for CA certificate\n"); + ret = TRUE; + } + if (!ret) { PCERT_CHAIN_ELEMENT element = CRYPT_FindIthElementInChain( diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index c997068a06..3503eb3e92 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -4153,9 +4153,9 @@ static void testGetCertChain(void) ret = CertGetCertificateChain(NULL, cert, &fileTime, store, &para, CERT_CHAIN_REVOCATION_CHECK_CHAIN, NULL, &chain); ok(ret, "CertGetCertificateChain failed: %u\n", GetLastError()); - todo_wine ok(!chain->TrustStatus.dwErrorStatus - || broken(chain->TrustStatus.dwErrorStatus == CERT_TRUST_REVOCATION_STATUS_UNKNOWN), /* XP */ - "chain->TrustStatus.dwErrorStatus = %x\n", chain->TrustStatus.dwErrorStatus); + ok(!chain->TrustStatus.dwErrorStatus + || broken(chain->TrustStatus.dwErrorStatus == CERT_TRUST_REVOCATION_STATUS_UNKNOWN), /* XP */ + "chain->TrustStatus.dwErrorStatus = %x\n", chain->TrustStatus.dwErrorStatus); ret = CertGetCertificateChain(NULL, cert, &fileTime, store, &para, CERT_CHAIN_REVOCATION_CHECK_CHAIN_EXCLUDE_ROOT, NULL, &chain); -- 2.18.0

2 2

COM tracing ...
by Michael Meeks 21 Aug '18

21 Aug '18

Hi guys, Rather a peripheral question; apologies for that - but I'd imagine there are experts here that may be able to help. I have a black-box problem - a Windows app dealing with confidential data that I can't easily touch (and thus can't get to run under Wine) - which does some small but critical automation of MS Office - using VBS / COM scripting. I'd -really- love some input on how best to trace that series of COM method calls on Windows itself ie. the (remote) service activation, and the RPC beyond that - particularly the method names, parameters etc. of the COM/OLE Office API. I've tried (so far): http://www.rohitab.com/apimonitor which, while closed, looks interesting; but traces a lot in a hard-to-search way and doesn't appear to do the trick. https://support.microsoft.com/en-us/help/926098/how-to-enable-com-and-com-d… Sounds useful: using Event Tracing for Windows (ETW) but has this rather unhelpful property: "The binary file must be formatted by Microsoft so that it can be analyzed. Please forward the .etl files to your support contact. ..." ;-) Component models used to be all the rage in my youth ;-) surely someone solved the "strace for COM calls" problem elegantly some-when ! Crazily - might it be possible to instrument, interpose and use Wine's COM impl. on Windows [ which sounds a bit 'exciting' ;-], or ? Anyhow - help much appreciated & sorry for the noise ! Regards, Michael. -- michael.meeks(a)collabora.com <><, Pseudo Engineer, itinerant idiot

2 4

[PATCH v2] dxgi/tests: Run the tests in parallel.
by Henri Verbeet 21 Aug '18

21 Aug '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- v2: Looks like some versions of WARP create multiple adapters with increasing LUIDs when concurrently using multiple WARP devices. This supersedes patch 149962. --- dlls/dxgi/tests/Makefile.in | 2 +- dlls/dxgi/tests/{device.c => dxgi.c} | 113 ++++++++++++++++++++++++++++------- 2 files changed, 93 insertions(+), 22 deletions(-) rename dlls/dxgi/tests/{device.c => dxgi.c} (98%) diff --git a/dlls/dxgi/tests/Makefile.in b/dlls/dxgi/tests/Makefile.in index 2676bc98d39..1c99d70957d 100644 --- a/dlls/dxgi/tests/Makefile.in +++ b/dlls/dxgi/tests/Makefile.in @@ -2,4 +2,4 @@ TESTDLL = dxgi.dll IMPORTS = d3d10_1 dxgi user32 C_SRCS = \ - device.c + dxgi.c diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/dxgi.c similarity index 98% rename from dlls/dxgi/tests/device.c rename to dlls/dxgi/tests/dxgi.c index 81b231a4d36..56065456eb0 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/dxgi.c @@ -39,6 +39,73 @@ static HRESULT (WINAPI *pCreateDXGIFactory2)(UINT flags, REFIID iid, void **fact static PFN_D3D12_CREATE_DEVICE pD3D12CreateDevice; static PFN_D3D12_GET_DEBUG_INTERFACE pD3D12GetDebugInterface; +static unsigned int use_adapter_idx; +static BOOL use_warp_adapter; +static BOOL use_mt = TRUE; + +static struct test_entry +{ + void (*test)(void); +} *mt_tests; +size_t mt_tests_size, mt_test_count; + +static void queue_test(void (*test)(void)) +{ + if (mt_test_count >= mt_tests_size) + { + mt_tests_size = max(16, mt_tests_size * 2); + mt_tests = heap_realloc(mt_tests, mt_tests_size * sizeof(*mt_tests)); + } + mt_tests[mt_test_count++].test = test; +} + +static DWORD WINAPI thread_func(void *ctx) +{ + LONG *i = ctx, j; + + while (*i < mt_test_count) + { + j = *i; + if (InterlockedCompareExchange(i, j + 1, j) == j) + mt_tests[j].test(); + } + + return 0; +} + +static void run_queued_tests(void) +{ + unsigned int thread_count, i; + HANDLE *threads; + SYSTEM_INFO si; + LONG test_idx; + + if (!use_mt) + { + for (i = 0; i < mt_test_count; ++i) + { + mt_tests[i].test(); + } + + return; + } + + GetSystemInfo(&si); + thread_count = si.dwNumberOfProcessors; + threads = heap_calloc(thread_count, sizeof(*threads)); + for (i = 0, test_idx = 0; i < thread_count; ++i) + { + threads[i] = CreateThread(NULL, 0, thread_func, &test_idx, 0, NULL); + ok(!!threads[i], "Failed to create thread %u.\n", i); + } + WaitForMultipleObjects(thread_count, threads, TRUE, INFINITE); + for (i = 0; i < thread_count; ++i) + { + CloseHandle(threads[i]); + } + heap_free(threads); +} + static ULONG get_refcount(IUnknown *iface) { IUnknown_AddRef(iface); @@ -394,9 +461,6 @@ static void compute_expected_swapchain_fullscreen_state_after_fullscreen_change_ } } -static BOOL use_warp_adapter; -static unsigned int use_adapter_idx; - static IDXGIAdapter *create_adapter(void) { IDXGIFactory4 *factory4; @@ -665,8 +729,9 @@ static void test_adapter_luid(void) refcount = IDXGIDevice_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); - is_null_luid_adapter = !device_adapter_desc.AdapterLuid.HighPart - && !device_adapter_desc.AdapterLuid.LowPart; + is_null_luid_adapter = !device_adapter_desc.AdapterLuid.LowPart + && !device_adapter_desc.SubSysId && !device_adapter_desc.Revision + && !device_adapter_desc.VendorId && !device_adapter_desc.DeviceId; hr = CreateDXGIFactory(&IID_IDXGIFactory, (void **)&factory); ok(hr == S_OK, "Failed to create DXGI factory, hr %#x.\n", hr); @@ -4040,7 +4105,7 @@ static void run_on_d3d12(void (*test_func)(IUnknown *device, BOOL is_d3d12)) ok(!refcount, "Device has %u references left.\n", refcount); } -START_TEST(device) +START_TEST(dxgi) { HMODULE dxgi_module, d3d12_module; BOOL enable_debug_layer = FALSE; @@ -4064,30 +4129,36 @@ START_TEST(device) use_warp_adapter = TRUE; else if (!strcmp(argv[i], "--adapter") && i + 1 < argc) use_adapter_idx = atoi(argv[++i]); + else if (!strcmp(argv[i], "--single")) + use_mt = FALSE; } - test_adapter_desc(); - test_adapter_luid(); - test_check_interface_support(); - test_create_surface(); - test_parents(); - test_output(); - test_find_closest_matching_mode(); + queue_test(test_adapter_desc); + queue_test(test_adapter_luid); + queue_test(test_check_interface_support); + queue_test(test_create_surface); + queue_test(test_parents); + queue_test(test_output); + queue_test(test_find_closest_matching_mode); + queue_test(test_get_containing_output); + queue_test(test_create_factory); + queue_test(test_private_data); + queue_test(test_swapchain_resize); + queue_test(test_swapchain_present); + queue_test(test_maximum_frame_latency); + queue_test(test_output_desc); + queue_test(test_object_wrapping); + + run_queued_tests(); + + /* These tests use full-screen swapchains, so shouldn't run in parallel. */ test_create_swapchain(); - test_get_containing_output(); test_set_fullscreen(); test_default_fullscreen_target_output(); test_resize_target(); test_inexact_modes(); - test_create_factory(); - test_private_data(); - test_swapchain_resize(); test_swapchain_parameters(); - test_swapchain_present(); run_on_d3d10(test_swapchain_backbuffer_index); - test_maximum_frame_latency(); - test_output_desc(); - test_object_wrapping(); if (!(d3d12_module = LoadLibraryA("d3d12.dll"))) { -- 2.11.0

1 0

[PATCH] quartz: Return correct error in IBasicAudio put_Volume
by Alistair Leslie-Hughes 21 Aug '18

21 Aug '18

Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=45366 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/quartz/filtergraph.c | 2 ++ dlls/quartz/tests/filtergraph.c | 15 +++++++++++++++ 2 files changed, 17 insertions(+) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 0113674..210eb3e 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -3140,6 +3140,8 @@ static HRESULT WINAPI BasicAudio_put_Volume(IBasicAudio *iface, LONG lVolume) if (hr == S_OK) hr = IBasicAudio_put_Volume(pBasicAudio, lVolume); + else + hr = E_NOTIMPL; LeaveCriticalSection(&This->cs); diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 85079d9..3842491 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -284,6 +284,20 @@ static void test_basic_video(IFilterGraph2 *graph) IBasicVideo_Release(pbv); } +static void test_basic_audio(IFilterGraph2 *graph) +{ + IBasicAudio* basic; + HRESULT hr; + + hr = IFilterGraph2_QueryInterface(graph, &IID_IBasicAudio, (void **)&basic); + ok(hr==S_OK, "Cannot get IBasicAudio interface returned: %x\n", hr); + + hr = IBasicAudio_put_Volume(basic, 0); + ok(hr==E_NOTIMPL || hr==S_OK, "returned: %x\n", hr); + + IBasicAudio_Release(basic); +} + static void test_media_seeking(IFilterGraph2 *graph) { IMediaSeeking *seeking; @@ -492,6 +506,7 @@ todo_wine static void rungraph(IFilterGraph2 *graph) { + test_basic_audio(graph); test_basic_video(graph); test_media_seeking(graph); test_state_change(graph); -- 1.9.1

2 1

[PATCH 1/2] crypt32/tests: Add revocation flags tests for CertGetCertificateChain().
by Zhiyi Zhang 21 Aug '18

21 Aug '18

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/crypt32/tests/chain.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index a6599b21ae..c997068a06 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -4145,6 +4145,23 @@ static void testGetCertChain(void) test_name_blob(&simple_chain->rgpElement[2]->pCertContext->pCertInfo->Issuer, "US, GeoTrust Inc., GeoTrust Global CA"); test_name_blob(&simple_chain->rgpElement[2]->pCertContext->pCertInfo->Subject, "US, GeoTrust Inc., GeoTrust Global CA"); + /* Test revocation flags */ + ret = CertGetCertificateChain(NULL, cert, &fileTime, store, &para, CERT_CHAIN_REVOCATION_CHECK_END_CERT, NULL, + &chain); + ok(ret, "CertGetCertificateChain failed: %u\n", GetLastError()); + ok(!chain->TrustStatus.dwErrorStatus, "chain->TrustStatus.dwErrorStatus = %x\n", chain->TrustStatus.dwErrorStatus); + + ret = CertGetCertificateChain(NULL, cert, &fileTime, store, &para, CERT_CHAIN_REVOCATION_CHECK_CHAIN, NULL, &chain); + ok(ret, "CertGetCertificateChain failed: %u\n", GetLastError()); + todo_wine ok(!chain->TrustStatus.dwErrorStatus + || broken(chain->TrustStatus.dwErrorStatus == CERT_TRUST_REVOCATION_STATUS_UNKNOWN), /* XP */ + "chain->TrustStatus.dwErrorStatus = %x\n", chain->TrustStatus.dwErrorStatus); + + ret = CertGetCertificateChain(NULL, cert, &fileTime, store, &para, CERT_CHAIN_REVOCATION_CHECK_CHAIN_EXCLUDE_ROOT, + NULL, &chain); + ok(ret, "CertGetCertificateChain failed: %u\n", GetLastError()); + ok(!chain->TrustStatus.dwErrorStatus, "chain->TrustStatus.dwErrorStatus = %x\n", chain->TrustStatus.dwErrorStatus); + pCertFreeCertificateChain(chain); /* Test HCCE_LOCAL_MACHINE */ -- 2.18.0

1 0

[v2 PATCH] d2d1/tests: Add some tests for ID2D1Bitmap1::GetSurface().
by Nikolay Sivov 21 Aug '18

21 Aug '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v2: improve individual tests traceability. dlls/d2d1/tests/d2d1.c | 232 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 232 insertions(+) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index a8b67f144b..f6846c092f 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -6529,6 +6529,237 @@ static void test_create_device(void) ok(!refcount, "Factory has %u references left.\n", refcount); } +#define check_bitmap_surface(b, s, o) check_bitmap_surface_(__LINE__, b, s, o) +static void check_bitmap_surface_(unsigned int line, ID2D1Bitmap1 *bitmap, BOOL has_surface, DWORD expected_options) +{ + D2D1_BITMAP_OPTIONS options; + IDXGISurface *surface; + HRESULT hr; + + options = ID2D1Bitmap1_GetOptions(bitmap); + ok_(__FILE__, line)(options == expected_options, "Unexpected bitmap options %#x, expected %#x.\n", + options, expected_options); + + surface = (void *)0xdeadbeef; + hr = ID2D1Bitmap1_GetSurface(bitmap, &surface); + if (has_surface) + { + D3D10_TEXTURE2D_DESC desc; + ID3D10Texture2D *texture; + + todo_wine + ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to get bitmap surface, hr %#x.\n", hr); + ok_(__FILE__, line)(!!surface, "Expected surface instance.\n"); + + if (SUCCEEDED(hr)) + { + /* Correlate with resource configuration. */ + hr = IDXGISurface_QueryInterface(surface, &IID_ID3D10Texture2D, (void **)&texture); + ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to get texture pointer, hr %#x.\n", hr); + + ID3D10Texture2D_GetDesc(texture, &desc); + ok_(__FILE__, line)(desc.Usage == 0, "Unexpected usage %#x.\n", desc.Usage); + ok_(__FILE__, line)(desc.BindFlags == (options & D2D1_BITMAP_OPTIONS_TARGET ? + D3D10_BIND_RENDER_TARGET : D3D10_BIND_SHADER_RESOURCE), + "Unexpected bind flags %#x, bitmap options %#x.\n", desc.BindFlags, options); + ok_(__FILE__, line)(desc.CPUAccessFlags == 0, "Unexpected cpu access flags %#x.\n", desc.CPUAccessFlags); + ok_(__FILE__, line)(desc.MiscFlags == 0, "Unexpected misc flags %#x.\n", desc.MiscFlags); + + ID3D10Texture2D_Release(texture); + + IDXGISurface_Release(surface); + } + } + else + { + todo_wine { + ok_(__FILE__, line)(hr == D2DERR_INVALID_CALL, "Unexpected hr %#x.\n", hr); + ok_(__FILE__, line)(!surface, "Unexpected surface instance.\n"); + } + } +} + +#define check_rt_bitmap_surface(r, s, o) check_rt_bitmap_surface_(__LINE__, r, s, o) +static void check_rt_bitmap_surface_(unsigned int line, ID2D1RenderTarget *rt, BOOL has_surface, DWORD options) +{ + D2D1_BITMAP_PROPERTIES bitmap_desc; + ID2D1RenderTarget *compatible_rt; + ID2D1DeviceContext *context; + ID2D1Bitmap1 *bitmap1; + ID2D1Bitmap *bitmap; + D2D1_SIZE_U size; + HRESULT hr; + + static const DWORD bitmap_data[] = + { + 0x7f7f0000, + }; + + set_size_u(&size, 1, 1); + bitmap_desc.pixelFormat.format = DXGI_FORMAT_B8G8R8A8_UNORM; + bitmap_desc.pixelFormat.alphaMode = D2D1_ALPHA_MODE_IGNORE; + bitmap_desc.dpiX = 96.0f; + bitmap_desc.dpiY = 96.0f; + hr = ID2D1RenderTarget_CreateBitmap(rt, size, bitmap_data, sizeof(*bitmap_data), &bitmap_desc, &bitmap); + ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to create bitmap, hr %#x.\n", hr); + + hr = ID2D1Bitmap_QueryInterface(bitmap, &IID_ID2D1Bitmap1, (void **)&bitmap1); + ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to get ID2D1Bitmap1 interface, hr %#x.\n", hr); + + check_bitmap_surface_(line, bitmap1, has_surface, options); + + ID2D1Bitmap1_Release(bitmap1); + ID2D1Bitmap_Release(bitmap); + + if (FAILED(ID2D1RenderTarget_QueryInterface(rt, &IID_ID2D1DeviceContext, (void **)&context))) + { + /* Compatible target follows its parent. */ + hr = ID2D1RenderTarget_CreateCompatibleRenderTarget(rt, NULL, NULL, NULL, + D2D1_COMPATIBLE_RENDER_TARGET_OPTIONS_NONE, (ID2D1BitmapRenderTarget **)&compatible_rt); + ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to create compatible render target, hr %#x.\n", hr); + + hr = ID2D1RenderTarget_CreateBitmap(compatible_rt, size, bitmap_data, sizeof(*bitmap_data), &bitmap_desc, &bitmap); + ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to create bitmap, hr %#x.\n", hr); + + hr = ID2D1Bitmap_QueryInterface(bitmap, &IID_ID2D1Bitmap1, (void **)&bitmap1); + ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to get ID2D1Bitmap1 interface, hr %#x.\n", hr); + + check_bitmap_surface_(line, bitmap1, has_surface, options); + ID2D1RenderTarget_Release(compatible_rt); + + ID2D1Bitmap1_Release(bitmap1); + ID2D1Bitmap_Release(bitmap); + } + else + ID2D1DeviceContext_Release(context); +} + +static void test_bitmap_surface(void) +{ + D2D1_HWND_RENDER_TARGET_PROPERTIES hwnd_rt_desc; + D2D1_RENDER_TARGET_PROPERTIES rt_desc; + ID3D10Device1 *d3d_device; + IDXGISwapChain *swapchain; + IDXGIDevice *dxgi_device; + ID2D1Factory1 *factory; + ID2D1RenderTarget *rt; + IDXGISurface *surface; + ID2D1Device *device; + ID2D1DeviceContext *device_context; + D2D1_BITMAP_PROPERTIES1 bitmap_desc; + ID2D1Bitmap1 *bitmap; + HWND window; + HRESULT hr; + + IWICBitmap *wic_bitmap; + IWICImagingFactory *wic_factory; + + if (!(d3d_device = create_device())) + { + skip("Failed to create device, skipping tests.\n"); + return; + } + + if (FAILED(D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, &IID_ID2D1Factory1, NULL, (void **)&factory))) + { + win_skip("ID2D1Factory1 is not supported.\n"); + ID3D10Device1_Release(d3d_device); + return; + } + + /* DXGI target */ + window = create_window(); + swapchain = create_swapchain(d3d_device, window, TRUE); + hr = IDXGISwapChain_GetBuffer(swapchain, 0, &IID_IDXGISurface, (void **)&surface); + ok(SUCCEEDED(hr), "Failed to get buffer, hr %#x.\n", hr); + rt = create_render_target(surface); + ok(!!rt, "Failed to create render target.\n"); + + check_rt_bitmap_surface(rt, TRUE, D2D1_BITMAP_OPTIONS_NONE); + ID2D1RenderTarget_Release(rt); + + /* Bitmap created from DXGI surface. */ + hr = ID3D10Device1_QueryInterface(d3d_device, &IID_IDXGIDevice, (void **)&dxgi_device); + ok(SUCCEEDED(hr), "Failed to get IDXGIDevice interface, hr %#x.\n", hr); + + hr = ID2D1Factory1_CreateDevice(factory, dxgi_device, &device); + ok(SUCCEEDED(hr), "Failed to get ID2D1Device, hr %#x.\n", hr); + + hr = ID2D1Device_CreateDeviceContext(device, D2D1_DEVICE_CONTEXT_OPTIONS_NONE, &device_context); +todo_wine + ok(SUCCEEDED(hr), "Failed to create device context, hr %#x.\n", hr); + +if (SUCCEEDED(hr)) +{ + memset(&bitmap_desc, 0, sizeof(bitmap_desc)); + bitmap_desc.pixelFormat.format = DXGI_FORMAT_B8G8R8A8_UNORM; + bitmap_desc.pixelFormat.alphaMode = D2D1_ALPHA_MODE_IGNORE; + bitmap_desc.dpiX = 96.0f; + bitmap_desc.dpiY = 96.0f; + hr = ID2D1DeviceContext_CreateBitmapFromDxgiSurface(device_context, surface, NULL, &bitmap); + ok(SUCCEEDED(hr), "Failed to create a bitmap, hr %#x.\n", hr); + + check_bitmap_surface(bitmap, TRUE, D2D1_BITMAP_OPTIONS_TARGET | D2D1_BITMAP_OPTIONS_CANNOT_DRAW); + check_rt_bitmap_surface((ID2D1RenderTarget *)device_context, TRUE, D2D1_BITMAP_OPTIONS_NONE); + + ID2D1DeviceContext_Release(device_context); +} + ID2D1Device_Release(device); + IDXGIDevice_Release(dxgi_device); + IDXGISurface_Release(surface); + + /* DC target */ + rt_desc.type = D2D1_RENDER_TARGET_TYPE_DEFAULT; + rt_desc.pixelFormat.format = DXGI_FORMAT_B8G8R8A8_UNORM; + rt_desc.pixelFormat.alphaMode = D2D1_ALPHA_MODE_PREMULTIPLIED; + rt_desc.dpiX = 96.0f; + rt_desc.dpiY = 96.0f; + rt_desc.usage = D2D1_RENDER_TARGET_USAGE_NONE; + rt_desc.minLevel = D2D1_FEATURE_LEVEL_DEFAULT; + hr = ID2D1Factory1_CreateDCRenderTarget(factory, &rt_desc, (ID2D1DCRenderTarget **)&rt); + ok(SUCCEEDED(hr), "Failed to create target, hr %#x.\n", hr); + + check_rt_bitmap_surface(rt, FALSE, D2D1_BITMAP_OPTIONS_NONE); + ID2D1RenderTarget_Release(rt); + + /* HWND target */ + hwnd_rt_desc.hwnd = NULL; + hwnd_rt_desc.pixelSize.width = 64; + hwnd_rt_desc.pixelSize.height = 64; + hwnd_rt_desc.presentOptions = D2D1_PRESENT_OPTIONS_NONE; + hwnd_rt_desc.hwnd = CreateWindowA("static", "d2d_test", 0, 0, 0, 0, 0, 0, 0, 0, 0); + ok(!!hwnd_rt_desc.hwnd, "Failed to create target window.\n"); + + hr = ID2D1Factory1_CreateHwndRenderTarget(factory, &rt_desc, &hwnd_rt_desc, (ID2D1HwndRenderTarget **)&rt); + ok(SUCCEEDED(hr), "Failed to create render target, hr %#x.\n", hr); + + check_rt_bitmap_surface(rt, FALSE, D2D1_BITMAP_OPTIONS_NONE); + ID2D1RenderTarget_Release(rt); + DestroyWindow(hwnd_rt_desc.hwnd); + + /* WIC target */ + CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + + hr = CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICImagingFactory, (void **)&wic_factory); + ok(SUCCEEDED(hr), "Failed to create WIC imaging factory, hr %#x.\n", hr); + hr = IWICImagingFactory_CreateBitmap(wic_factory, 16, 16, + &GUID_WICPixelFormat32bppPBGRA, WICBitmapCacheOnDemand, &wic_bitmap); + ok(SUCCEEDED(hr), "Failed to create bitmap, hr %#x.\n", hr); + IWICImagingFactory_Release(wic_factory); + + hr = ID2D1Factory1_CreateWicBitmapRenderTarget(factory, wic_bitmap, &rt_desc, &rt); + ok(SUCCEEDED(hr), "Failed to create render target, hr %#x.\n", hr); + + check_rt_bitmap_surface(rt, FALSE, D2D1_BITMAP_OPTIONS_NONE); + ID2D1RenderTarget_Release(rt); + + CoUninitialize(); + + ID2D1Factory1_Release(factory); + ID3D10Device1_Release(d3d_device); +} + START_TEST(d2d1) { unsigned int argc, i; @@ -6568,6 +6799,7 @@ START_TEST(d2d1) queue_test(test_layer); queue_test(test_bezier_intersect); queue_test(test_create_device); + queue_test(test_bitmap_surface); run_queued_tests(); } -- 2.18.0

2 1

[PATCH 2/2] dxgi/tests: Run the tests in parallel.
by Henri Verbeet 21 Aug '18

21 Aug '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/dxgi/tests/Makefile.in | 2 +- dlls/dxgi/tests/{device.c => dxgi.c} | 108 +++++++++++++++++++++++++++++------ 2 files changed, 90 insertions(+), 20 deletions(-) rename dlls/dxgi/tests/{device.c => dxgi.c} (98%) diff --git a/dlls/dxgi/tests/Makefile.in b/dlls/dxgi/tests/Makefile.in index 2676bc98d39..1c99d70957d 100644 --- a/dlls/dxgi/tests/Makefile.in +++ b/dlls/dxgi/tests/Makefile.in @@ -2,4 +2,4 @@ TESTDLL = dxgi.dll IMPORTS = d3d10_1 dxgi user32 C_SRCS = \ - device.c + dxgi.c diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/dxgi.c similarity index 98% rename from dlls/dxgi/tests/device.c rename to dlls/dxgi/tests/dxgi.c index 81b231a4d36..8ee7091b19d 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/dxgi.c @@ -39,6 +39,73 @@ static HRESULT (WINAPI *pCreateDXGIFactory2)(UINT flags, REFIID iid, void **fact static PFN_D3D12_CREATE_DEVICE pD3D12CreateDevice; static PFN_D3D12_GET_DEBUG_INTERFACE pD3D12GetDebugInterface; +static unsigned int use_adapter_idx; +static BOOL use_warp_adapter; +static BOOL use_mt = TRUE; + +static struct test_entry +{ + void (*test)(void); +} *mt_tests; +size_t mt_tests_size, mt_test_count; + +static void queue_test(void (*test)(void)) +{ + if (mt_test_count >= mt_tests_size) + { + mt_tests_size = max(16, mt_tests_size * 2); + mt_tests = heap_realloc(mt_tests, mt_tests_size * sizeof(*mt_tests)); + } + mt_tests[mt_test_count++].test = test; +} + +static DWORD WINAPI thread_func(void *ctx) +{ + LONG *i = ctx, j; + + while (*i < mt_test_count) + { + j = *i; + if (InterlockedCompareExchange(i, j + 1, j) == j) + mt_tests[j].test(); + } + + return 0; +} + +static void run_queued_tests(void) +{ + unsigned int thread_count, i; + HANDLE *threads; + SYSTEM_INFO si; + LONG test_idx; + + if (!use_mt) + { + for (i = 0; i < mt_test_count; ++i) + { + mt_tests[i].test(); + } + + return; + } + + GetSystemInfo(&si); + thread_count = si.dwNumberOfProcessors; + threads = heap_calloc(thread_count, sizeof(*threads)); + for (i = 0, test_idx = 0; i < thread_count; ++i) + { + threads[i] = CreateThread(NULL, 0, thread_func, &test_idx, 0, NULL); + ok(!!threads[i], "Failed to create thread %u.\n", i); + } + WaitForMultipleObjects(thread_count, threads, TRUE, INFINITE); + for (i = 0; i < thread_count; ++i) + { + CloseHandle(threads[i]); + } + heap_free(threads); +} + static ULONG get_refcount(IUnknown *iface) { IUnknown_AddRef(iface); @@ -394,9 +461,6 @@ static void compute_expected_swapchain_fullscreen_state_after_fullscreen_change_ } } -static BOOL use_warp_adapter; -static unsigned int use_adapter_idx; - static IDXGIAdapter *create_adapter(void) { IDXGIFactory4 *factory4; @@ -4040,7 +4104,7 @@ static void run_on_d3d12(void (*test_func)(IUnknown *device, BOOL is_d3d12)) ok(!refcount, "Device has %u references left.\n", refcount); } -START_TEST(device) +START_TEST(dxgi) { HMODULE dxgi_module, d3d12_module; BOOL enable_debug_layer = FALSE; @@ -4064,30 +4128,36 @@ START_TEST(device) use_warp_adapter = TRUE; else if (!strcmp(argv[i], "--adapter") && i + 1 < argc) use_adapter_idx = atoi(argv[++i]); + else if (!strcmp(argv[i], "--single")) + use_mt = FALSE; } - test_adapter_desc(); - test_adapter_luid(); - test_check_interface_support(); - test_create_surface(); - test_parents(); - test_output(); - test_find_closest_matching_mode(); + queue_test(test_adapter_desc); + queue_test(test_adapter_luid); + queue_test(test_check_interface_support); + queue_test(test_create_surface); + queue_test(test_parents); + queue_test(test_output); + queue_test(test_find_closest_matching_mode); + queue_test(test_get_containing_output); + queue_test(test_create_factory); + queue_test(test_private_data); + queue_test(test_swapchain_resize); + queue_test(test_swapchain_present); + queue_test(test_maximum_frame_latency); + queue_test(test_output_desc); + queue_test(test_object_wrapping); + + run_queued_tests(); + + /* These tests use full-screen swapchains, so shouldn't run in parallel. */ test_create_swapchain(); - test_get_containing_output(); test_set_fullscreen(); test_default_fullscreen_target_output(); test_resize_target(); test_inexact_modes(); - test_create_factory(); - test_private_data(); - test_swapchain_resize(); test_swapchain_parameters(); - test_swapchain_present(); run_on_d3d10(test_swapchain_backbuffer_index); - test_maximum_frame_latency(); - test_output_desc(); - test_object_wrapping(); if (!(d3d12_module = LoadLibraryA("d3d12.dll"))) { -- 2.11.0

2 1

[PATCH 1/2] d3d10core/tests: Run the tests in parallel.
by Henri Verbeet 21 Aug '18

21 Aug '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d10core/tests/Makefile.in | 2 +- dlls/d3d10core/tests/{device.c => d3d10core.c} | 259 ++++++++++++++++--------- 2 files changed, 166 insertions(+), 95 deletions(-) rename dlls/d3d10core/tests/{device.c => d3d10core.c} (99%) diff --git a/dlls/d3d10core/tests/Makefile.in b/dlls/d3d10core/tests/Makefile.in index 6401cc8473a..313a042b246 100644 --- a/dlls/d3d10core/tests/Makefile.in +++ b/dlls/d3d10core/tests/Makefile.in @@ -2,4 +2,4 @@ TESTDLL = d3d10core.dll IMPORTS = d3d10 dxgi user32 C_SRCS = \ - device.c + d3d10core.c diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/d3d10core.c similarity index 99% rename from dlls/d3d10core/tests/device.c rename to dlls/d3d10core/tests/d3d10core.c index 569c8eed51a..e675c12a39e 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -33,6 +33,16 @@ #define BITS_N1_0 0xbf800000 #define BITS_1_0 0x3f800000 +static unsigned int use_adapter_idx; +static BOOL use_warp_adapter; +static BOOL use_mt = TRUE; + +static struct test_entry +{ + void (*test)(void); +} *mt_tests; +size_t mt_tests_size, mt_test_count; + struct format_support { DXGI_FORMAT format; @@ -70,6 +80,63 @@ struct uvec4 unsigned int x, y, z, w; }; +static void queue_test(void (*test)(void)) +{ + if (mt_test_count >= mt_tests_size) + { + mt_tests_size = max(16, mt_tests_size * 2); + mt_tests = heap_realloc(mt_tests, mt_tests_size * sizeof(*mt_tests)); + } + mt_tests[mt_test_count++].test = test; +} + +static DWORD WINAPI thread_func(void *ctx) +{ + LONG *i = ctx, j; + + while (*i < mt_test_count) + { + j = *i; + if (InterlockedCompareExchange(i, j + 1, j) == j) + mt_tests[j].test(); + } + + return 0; +} + +static void run_queued_tests(void) +{ + unsigned int thread_count, i; + HANDLE *threads; + SYSTEM_INFO si; + LONG test_idx; + + if (!use_mt) + { + for (i = 0; i < mt_test_count; ++i) + { + mt_tests[i].test(); + } + + return; + } + + GetSystemInfo(&si); + thread_count = si.dwNumberOfProcessors; + threads = heap_calloc(thread_count, sizeof(*threads)); + for (i = 0, test_idx = 0; i < thread_count; ++i) + { + threads[i] = CreateThread(NULL, 0, thread_func, &test_idx, 0, NULL); + ok(!!threads[i], "Failed to create thread %u.\n", i); + } + WaitForMultipleObjects(thread_count, threads, TRUE, INFINITE); + for (i = 0; i < thread_count; ++i) + { + CloseHandle(threads[i]); + } + heap_free(threads); +} + static void set_box(D3D10_BOX *box, UINT left, UINT top, UINT front, UINT right, UINT bottom, UINT back) { box->left = left; @@ -946,9 +1013,6 @@ static void check_texture_uvec4_(unsigned int line, ID3D10Texture2D *texture, check_texture_sub_resource_uvec4_(line, texture, sub_resource_idx, NULL, expected_value); } -static BOOL use_warp_adapter; -static unsigned int use_adapter_idx; - static IDXGIAdapter *create_adapter(void) { IDXGIFactory4 *factory4; @@ -17143,7 +17207,7 @@ static void test_depth_clip(void) release_test_context(&test_context); } -START_TEST(device) +START_TEST(d3d10core) { unsigned int argc, i; char **argv; @@ -17155,99 +17219,106 @@ START_TEST(device) use_warp_adapter = TRUE; else if (!strcmp(argv[i], "--adapter") && i + 1 < argc) use_adapter_idx = atoi(argv[++i]); + else if (!strcmp(argv[i], "--single")) + use_mt = FALSE; } print_adapter_info(); - test_feature_level(); - test_device_interfaces(); - test_create_texture1d(); - test_texture1d_interfaces(); - test_create_texture2d(); - test_texture2d_interfaces(); - test_create_texture3d(); - test_create_buffer(); - test_create_depthstencil_view(); - test_depthstencil_view_interfaces(); - test_create_rendertarget_view(); - test_render_target_views(); - test_layered_rendering(); - test_create_shader_resource_view(); - test_create_shader(); - test_create_sampler_state(); - test_create_blend_state(); - test_create_depthstencil_state(); - test_create_rasterizer_state(); - test_create_query(); - test_occlusion_query(); - test_pipeline_statistics_query(); - test_timestamp_query(); - test_device_removed_reason(); - test_scissor(); - test_clear_state(); - test_blend(); - test_texture1d(); - test_texture(); - test_cube_maps(); - test_depth_stencil_sampling(); - test_multiple_render_targets(); - test_private_data(); - test_state_refcounting(); - test_il_append_aligned(); - test_instance_id(); - test_fragment_coords(); - test_update_subresource(); - test_copy_subresource_region(); - test_copy_subresource_region_1d(); - test_resource_access(); - test_check_multisample_quality_levels(); - test_cb_relative_addressing(); - test_vs_input_relative_addressing(); - test_swapchain_formats(); - test_swapchain_views(); - test_swapchain_flip(); - test_clear_render_target_view_1d(); - test_clear_render_target_view_2d(); - test_clear_depth_stencil_view(); - test_initial_depth_stencil_state(); - test_draw_depth_only(); - test_shader_stage_input_output_matching(); - test_shader_interstage_interface(); - test_sm4_if_instruction(); - test_sm4_breakc_instruction(); - test_sm4_continuec_instruction(); - test_sm4_discard_instruction(); - test_create_input_layout(); - test_input_assembler(); - test_null_sampler(); - test_immediate_constant_buffer(); - test_fp_specials(); - test_uint_shader_instructions(); - test_index_buffer_offset(); - test_face_culling(); - test_line_antialiasing_blending(); - test_required_format_support(); - test_ddy(); - test_shader_input_registers_limits(); - test_unbind_shader_resource_view(); - test_stencil_separate(); - test_sm4_ret_instruction(); - test_primitive_restart(); - test_resinfo_instruction(); - test_render_target_device_mismatch(); - test_buffer_srv(); - test_geometry_shader(); - test_stream_output(); - test_stream_output_resume(); + queue_test(test_feature_level); + queue_test(test_device_interfaces); + queue_test(test_create_texture1d); + queue_test(test_texture1d_interfaces); + queue_test(test_create_texture2d); + queue_test(test_texture2d_interfaces); + queue_test(test_create_texture3d); + queue_test(test_create_buffer); + queue_test(test_create_depthstencil_view); + queue_test(test_depthstencil_view_interfaces); + queue_test(test_create_rendertarget_view); + queue_test(test_render_target_views); + queue_test(test_layered_rendering); + queue_test(test_create_shader_resource_view); + queue_test(test_create_shader); + queue_test(test_create_sampler_state); + queue_test(test_create_blend_state); + queue_test(test_create_depthstencil_state); + queue_test(test_create_rasterizer_state); + queue_test(test_create_query); + queue_test(test_occlusion_query); + queue_test(test_pipeline_statistics_query); + queue_test(test_timestamp_query); + queue_test(test_device_removed_reason); + queue_test(test_scissor); + queue_test(test_clear_state); + queue_test(test_blend); + queue_test(test_texture1d); + queue_test(test_texture); + queue_test(test_cube_maps); + queue_test(test_depth_stencil_sampling); + queue_test(test_multiple_render_targets); + queue_test(test_private_data); + queue_test(test_state_refcounting); + queue_test(test_il_append_aligned); + queue_test(test_instance_id); + queue_test(test_fragment_coords); + queue_test(test_update_subresource); + queue_test(test_copy_subresource_region); + queue_test(test_copy_subresource_region_1d); + queue_test(test_resource_access); + queue_test(test_check_multisample_quality_levels); + queue_test(test_cb_relative_addressing); + queue_test(test_vs_input_relative_addressing); + queue_test(test_swapchain_formats); + queue_test(test_swapchain_views); + queue_test(test_swapchain_flip); + queue_test(test_clear_render_target_view_1d); + queue_test(test_clear_render_target_view_2d); + queue_test(test_clear_depth_stencil_view); + queue_test(test_initial_depth_stencil_state); + queue_test(test_draw_depth_only); + queue_test(test_shader_stage_input_output_matching); + queue_test(test_shader_interstage_interface); + queue_test(test_sm4_if_instruction); + queue_test(test_sm4_breakc_instruction); + queue_test(test_sm4_continuec_instruction); + queue_test(test_sm4_discard_instruction); + queue_test(test_create_input_layout); + queue_test(test_input_assembler); + queue_test(test_null_sampler); + queue_test(test_immediate_constant_buffer); + queue_test(test_fp_specials); + queue_test(test_uint_shader_instructions); + queue_test(test_index_buffer_offset); + queue_test(test_face_culling); + queue_test(test_line_antialiasing_blending); + queue_test(test_required_format_support); + queue_test(test_ddy); + queue_test(test_shader_input_registers_limits); + queue_test(test_unbind_shader_resource_view); + queue_test(test_stencil_separate); + queue_test(test_sm4_ret_instruction); + queue_test(test_primitive_restart); + queue_test(test_resinfo_instruction); + queue_test(test_render_target_device_mismatch); + queue_test(test_buffer_srv); + queue_test(test_geometry_shader); + queue_test(test_stream_output); + queue_test(test_stream_output_resume); + queue_test(test_depth_bias); + queue_test(test_format_compatibility); + queue_test(test_clip_distance); + queue_test(test_combined_clip_and_cull_distances); + queue_test(test_generate_mips); + queue_test(test_alpha_to_coverage); + queue_test(test_unbound_multisample_texture); + queue_test(test_multiple_viewports); + queue_test(test_multisample_resolve); + queue_test(test_depth_clip); + + run_queued_tests(); + + /* There should be no reason this test can't be run in parallel with the + * others, yet it fails when doing so. (AMD Radeon HD 6310, Windows 7) */ test_stream_output_vs(); - test_depth_bias(); - test_format_compatibility(); - test_clip_distance(); - test_combined_clip_and_cull_distances(); - test_generate_mips(); - test_alpha_to_coverage(); - test_unbound_multisample_texture(); - test_multiple_viewports(); - test_multisample_resolve(); - test_depth_clip(); } -- 2.11.0

2 1

[PATCH] user32: Create a mask from alpha channel when loading a 32 bpp icon. (v3)
by Dmitry Timoshkov 21 Aug '18

21 Aug '18

This patch fixes applications that draws 32 bpp icons manually. v3: create 8-bit intermediate mask from alpha instead of 32-bit. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/user32/cursoricon.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 0adb73bf56..5d63a42373 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -1296,6 +1296,41 @@ static HICON create_icon_from_bmi( const BITMAPINFO *bmi, DWORD maxsize, HMODULE 0, 0, bmi_width, bmi_height, mask_bits, bmi_copy, DIB_RGB_COLORS, SRCCOPY ); } + else + { + if (bmi_has_alpha( bmi, color_bits )) + { + DWORD alpha_mask_bits_size = bmi_width * bmi_height; + unsigned char *alpha_mask_bits = HeapAlloc( GetProcessHeap(), 0, alpha_mask_bits_size ); + + if (alpha_mask_bits) + { + const unsigned char *src = color_bits; + unsigned char *dst = alpha_mask_bits; + + while (alpha_mask_bits_size--) + { + *dst++ = src[3] == 0xff ? 0 : 1; + src += 4; + } + + /* DIB palette and color count are already initialized correctly + * for the monochrome case, so just correct the bit depth. + */ + if (bmi_copy->bmiHeader.biSize != sizeof(BITMAPCOREHEADER)) + bmi_copy->bmiHeader.biBitCount = 8; + else + ((BITMAPCOREINFO *)bmi_copy)->bmciHeader.bcBitCount = 8; + + SelectObject( hdc, mask ); + StretchDIBits( hdc, 0, 0, width, height, + 0, 0, bmi_width, bmi_height, + alpha_mask_bits, bmi_copy, DIB_RGB_COLORS, SRCCOPY ); + + HeapFree( GetProcessHeap(), 0, alpha_mask_bits ); + } + } + } ret = TRUE; done: -- 2.17.1

2 5

[PATCH] include/msvcrt: Include calling convention with function pointers.
by Daniel Lehman 21 Aug '18

21 Aug '18

2 1

[PATCH] d2d1/tests: Add some tests for ID2D1Bitmap1::GetSurface().
by Nikolay Sivov 21 Aug '18

21 Aug '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/tests/d2d1.c | 228 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 228 insertions(+) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index a8b67f144b..5f448dc1a1 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -6529,6 +6529,233 @@ static void test_create_device(void) ok(!refcount, "Factory has %u references left.\n", refcount); } +static void test_check_bitmap_surface(ID2D1Bitmap1 *bitmap, BOOL has_surface, DWORD expected_options) +{ + D2D1_BITMAP_OPTIONS options; + IDXGISurface *surface; + HRESULT hr; + + options = ID2D1Bitmap1_GetOptions(bitmap); + ok(options == expected_options, "Unexpected bitmap options %#x, expected %#x.\n", options, expected_options); + + surface = (void *)0xdeadbeef; + hr = ID2D1Bitmap1_GetSurface(bitmap, &surface); + if (has_surface) + { + D3D10_TEXTURE2D_DESC desc; + ID3D10Texture2D *texture; + + todo_wine + ok(SUCCEEDED(hr), "Failed to get bitmap surface, hr %#x.\n", hr); + ok(!!surface, "Expected surface instance.\n"); + + if (SUCCEEDED(hr)) + { + /* Correlate with resource configuration. */ + hr = IDXGISurface_QueryInterface(surface, &IID_ID3D10Texture2D, (void **)&texture); + ok(SUCCEEDED(hr), "Failed to get texture pointer, hr %#x.\n", hr); + + ID3D10Texture2D_GetDesc(texture, &desc); + ok(desc.Usage == 0, "Unexpected usage %#x.\n", desc.Usage); + ok(desc.BindFlags == (options & D2D1_BITMAP_OPTIONS_TARGET ? D3D10_BIND_RENDER_TARGET : D3D10_BIND_SHADER_RESOURCE), + "Unexpected bind flags %#x, bitmap options %#x.\n", desc.BindFlags, options); + ok(desc.CPUAccessFlags == 0, "Unexpected cpu access flags %#x.\n", desc.CPUAccessFlags); + ok(desc.MiscFlags == 0, "Unexpected misc flags %#x.\n", desc.MiscFlags); + + ID3D10Texture2D_Release(texture); + + IDXGISurface_Release(surface); + } + } + else + { + todo_wine { + ok(hr == D2DERR_INVALID_CALL, "Unexpected hr %#x.\n", hr); + ok(!surface, "Unexpected surface instance.\n"); + } + } +} + +static void test_check_rt_bitmap_surface(ID2D1RenderTarget *rt, BOOL has_surface, DWORD options) +{ + D2D1_BITMAP_PROPERTIES bitmap_desc; + ID2D1RenderTarget *compatible_rt; + ID2D1DeviceContext *context; + ID2D1Bitmap1 *bitmap1; + ID2D1Bitmap *bitmap; + D2D1_SIZE_U size; + HRESULT hr; + + static const DWORD bitmap_data[] = + { + 0x7f7f0000, + }; + + set_size_u(&size, 1, 1); + bitmap_desc.pixelFormat.format = DXGI_FORMAT_B8G8R8A8_UNORM; + bitmap_desc.pixelFormat.alphaMode = D2D1_ALPHA_MODE_IGNORE; + bitmap_desc.dpiX = 96.0f; + bitmap_desc.dpiY = 96.0f; + hr = ID2D1RenderTarget_CreateBitmap(rt, size, bitmap_data, sizeof(*bitmap_data), &bitmap_desc, &bitmap); + ok(SUCCEEDED(hr), "Failed to create bitmap, hr %#x.\n", hr); + + hr = ID2D1Bitmap_QueryInterface(bitmap, &IID_ID2D1Bitmap1, (void **)&bitmap1); + ok(SUCCEEDED(hr), "Failed to get ID2D1Bitmap1 interface, hr %#x.\n", hr); + + test_check_bitmap_surface(bitmap1, has_surface, options); + + ID2D1Bitmap1_Release(bitmap1); + ID2D1Bitmap_Release(bitmap); + + if (FAILED(ID2D1RenderTarget_QueryInterface(rt, &IID_ID2D1DeviceContext, (void **)&context))) + { + /* Compatible target follows its parent. */ + hr = ID2D1RenderTarget_CreateCompatibleRenderTarget(rt, NULL, NULL, NULL, + D2D1_COMPATIBLE_RENDER_TARGET_OPTIONS_NONE, (ID2D1BitmapRenderTarget **)&compatible_rt); + ok(SUCCEEDED(hr), "Failed to create compatible render target, hr %#x.\n", hr); + + hr = ID2D1RenderTarget_CreateBitmap(compatible_rt, size, bitmap_data, sizeof(*bitmap_data), &bitmap_desc, &bitmap); + ok(SUCCEEDED(hr), "Failed to create bitmap, hr %#x.\n", hr); + + hr = ID2D1Bitmap_QueryInterface(bitmap, &IID_ID2D1Bitmap1, (void **)&bitmap1); + ok(SUCCEEDED(hr), "Failed to get ID2D1Bitmap1 interface, hr %#x.\n", hr); + + test_check_bitmap_surface(bitmap1, has_surface, options); + ID2D1RenderTarget_Release(compatible_rt); + + ID2D1Bitmap1_Release(bitmap1); + ID2D1Bitmap_Release(bitmap); + } + else + ID2D1DeviceContext_Release(context); +} + +static void test_bitmap_surface(void) +{ + D2D1_HWND_RENDER_TARGET_PROPERTIES hwnd_rt_desc; + D2D1_RENDER_TARGET_PROPERTIES rt_desc; + ID3D10Device1 *d3d_device; + IDXGISwapChain *swapchain; + IDXGIDevice *dxgi_device; + ID2D1Factory1 *factory; + ID2D1RenderTarget *rt; + IDXGISurface *surface; + ID2D1Device *device; + ID2D1DeviceContext *device_context; + D2D1_BITMAP_PROPERTIES1 bitmap_desc; + ID2D1Bitmap1 *bitmap; + HWND window; + HRESULT hr; + + IWICBitmap *wic_bitmap; + IWICImagingFactory *wic_factory; + + if (!(d3d_device = create_device())) + { + skip("Failed to create device, skipping tests.\n"); + return; + } + + if (FAILED(D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, &IID_ID2D1Factory1, NULL, (void **)&factory))) + { + win_skip("ID2D1Factory1 is not supported.\n"); + ID3D10Device1_Release(d3d_device); + return; + } + + /* DXGI target */ + window = create_window(); + swapchain = create_swapchain(d3d_device, window, TRUE); + hr = IDXGISwapChain_GetBuffer(swapchain, 0, &IID_IDXGISurface, (void **)&surface); + ok(SUCCEEDED(hr), "Failed to get buffer, hr %#x.\n", hr); + rt = create_render_target(surface); + ok(!!rt, "Failed to create render target.\n"); + + test_check_rt_bitmap_surface(rt, TRUE, D2D1_BITMAP_OPTIONS_NONE); + ID2D1RenderTarget_Release(rt); + + /* Bitmap created from DXGI surface. */ + hr = ID3D10Device1_QueryInterface(d3d_device, &IID_IDXGIDevice, (void **)&dxgi_device); + ok(SUCCEEDED(hr), "Failed to get IDXGIDevice interface, hr %#x.\n", hr); + + hr = ID2D1Factory1_CreateDevice(factory, dxgi_device, &device); + ok(SUCCEEDED(hr), "Failed to get ID2D1Device, hr %#x.\n", hr); + + hr = ID2D1Device_CreateDeviceContext(device, D2D1_DEVICE_CONTEXT_OPTIONS_NONE, &device_context); +todo_wine + ok(SUCCEEDED(hr), "Failed to create device context, hr %#x.\n", hr); + +if (SUCCEEDED(hr)) +{ + memset(&bitmap_desc, 0, sizeof(bitmap_desc)); + bitmap_desc.pixelFormat.format = DXGI_FORMAT_B8G8R8A8_UNORM; + bitmap_desc.pixelFormat.alphaMode = D2D1_ALPHA_MODE_IGNORE; + bitmap_desc.dpiX = 96.0f; + bitmap_desc.dpiY = 96.0f; + hr = ID2D1DeviceContext_CreateBitmapFromDxgiSurface(device_context, surface, NULL, &bitmap); + ok(SUCCEEDED(hr), "Failed to create a bitmap, hr %#x.\n", hr); + + test_check_bitmap_surface(bitmap, TRUE, D2D1_BITMAP_OPTIONS_TARGET | D2D1_BITMAP_OPTIONS_CANNOT_DRAW); + test_check_rt_bitmap_surface((ID2D1RenderTarget *)device_context, TRUE, D2D1_BITMAP_OPTIONS_NONE); + + ID2D1DeviceContext_Release(device_context); +} + ID2D1Device_Release(device); + IDXGIDevice_Release(dxgi_device); + IDXGISurface_Release(surface); + + /* DC target */ + rt_desc.type = D2D1_RENDER_TARGET_TYPE_DEFAULT; + rt_desc.pixelFormat.format = DXGI_FORMAT_B8G8R8A8_UNORM; + rt_desc.pixelFormat.alphaMode = D2D1_ALPHA_MODE_PREMULTIPLIED; + rt_desc.dpiX = 96.0f; + rt_desc.dpiY = 96.0f; + rt_desc.usage = D2D1_RENDER_TARGET_USAGE_NONE; + rt_desc.minLevel = D2D1_FEATURE_LEVEL_DEFAULT; + hr = ID2D1Factory1_CreateDCRenderTarget(factory, &rt_desc, (ID2D1DCRenderTarget **)&rt); + ok(SUCCEEDED(hr), "Failed to create target, hr %#x.\n", hr); + + test_check_rt_bitmap_surface(rt, FALSE, D2D1_BITMAP_OPTIONS_NONE); + ID2D1RenderTarget_Release(rt); + + /* HWND target */ + hwnd_rt_desc.hwnd = NULL; + hwnd_rt_desc.pixelSize.width = 64; + hwnd_rt_desc.pixelSize.height = 64; + hwnd_rt_desc.presentOptions = D2D1_PRESENT_OPTIONS_NONE; + hwnd_rt_desc.hwnd = CreateWindowA("static", "d2d_test", 0, 0, 0, 0, 0, 0, 0, 0, 0); + ok(!!hwnd_rt_desc.hwnd, "Failed to create target window.\n"); + + hr = ID2D1Factory1_CreateHwndRenderTarget(factory, &rt_desc, &hwnd_rt_desc, (ID2D1HwndRenderTarget **)&rt); + ok(SUCCEEDED(hr), "Failed to create render target, hr %#x.\n", hr); + + test_check_rt_bitmap_surface(rt, FALSE, D2D1_BITMAP_OPTIONS_NONE); + ID2D1RenderTarget_Release(rt); + DestroyWindow(hwnd_rt_desc.hwnd); + + /* WIC target */ + CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + + hr = CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICImagingFactory, (void **)&wic_factory); + ok(SUCCEEDED(hr), "Failed to create WIC imaging factory, hr %#x.\n", hr); + hr = IWICImagingFactory_CreateBitmap(wic_factory, 16, 16, + &GUID_WICPixelFormat32bppPBGRA, WICBitmapCacheOnDemand, &wic_bitmap); + ok(SUCCEEDED(hr), "Failed to create bitmap, hr %#x.\n", hr); + IWICImagingFactory_Release(wic_factory); + + hr = ID2D1Factory1_CreateWicBitmapRenderTarget(factory, wic_bitmap, &rt_desc, &rt); + ok(SUCCEEDED(hr), "Failed to create render target, hr %#x.\n", hr); + + test_check_rt_bitmap_surface(rt, FALSE, D2D1_BITMAP_OPTIONS_NONE); + ID2D1RenderTarget_Release(rt); + + CoUninitialize(); + + ID2D1Factory1_Release(factory); + ID3D10Device1_Release(d3d_device); +} + START_TEST(d2d1) { unsigned int argc, i; @@ -6568,6 +6795,7 @@ START_TEST(d2d1) queue_test(test_layer); queue_test(test_bezier_intersect); queue_test(test_create_device); + queue_test(test_bitmap_surface); run_queued_tests(); } -- 2.18.0

2 2

[PATCH 5/5] wined3d: Use local gl_info variable in wined3d_get_device_caps().
by Józef Kucia 21 Aug '18

21 Aug '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/directx.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index a5c7b9731615..a6f190c4d0ae 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2205,9 +2205,9 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte WINED3DPTFILTERCAPS_MAGFLINEAR; caps->VertexTextureFilterCaps = 0; - adapter->shader_backend->shader_get_caps(&adapter->gl_info, &shader_caps); - adapter->fragment_pipe->get_caps(&adapter->gl_info, &fragment_caps); - adapter->vertex_pipe->vp_get_caps(&adapter->gl_info, &vertex_caps); + adapter->shader_backend->shader_get_caps(gl_info, &shader_caps); + adapter->fragment_pipe->get_caps(gl_info, &fragment_caps); + adapter->vertex_pipe->vp_get_caps(gl_info, &vertex_caps); /* Add shader misc caps. Only some of them belong to the shader parts of the pipeline */ caps->PrimitiveMiscCaps |= fragment_caps.PrimitiveMiscCaps; @@ -2243,19 +2243,19 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte caps->VS20Caps.caps = WINED3DVS20CAPS_PREDICATION; /* VS 3.0 requires MAX_DYNAMICFLOWCONTROLDEPTH (24) */ caps->VS20Caps.dynamic_flow_control_depth = WINED3DVS20_MAX_DYNAMICFLOWCONTROLDEPTH; - caps->VS20Caps.temp_count = max(32, adapter->gl_info.limits.arb_vs_temps); + caps->VS20Caps.temp_count = max(32, gl_info->limits.arb_vs_temps); /* level of nesting in loops / if-statements; VS 3.0 requires MAX (4) */ caps->VS20Caps.static_flow_control_depth = WINED3DVS20_MAX_STATICFLOWCONTROLDEPTH; caps->MaxVShaderInstructionsExecuted = 65535; /* VS 3.0 needs at least 65535, some cards even use 2^32-1 */ - caps->MaxVertexShader30InstructionSlots = max(512, adapter->gl_info.limits.arb_vs_instructions); + caps->MaxVertexShader30InstructionSlots = max(512, gl_info->limits.arb_vs_instructions); caps->VertexTextureFilterCaps = WINED3DPTFILTERCAPS_MINFPOINT | WINED3DPTFILTERCAPS_MAGFPOINT; } else if (caps->VertexShaderVersion == 2) { caps->VS20Caps.caps = 0; caps->VS20Caps.dynamic_flow_control_depth = WINED3DVS20_MIN_DYNAMICFLOWCONTROLDEPTH; - caps->VS20Caps.temp_count = max(12, adapter->gl_info.limits.arb_vs_temps); + caps->VS20Caps.temp_count = max(12, gl_info->limits.arb_vs_temps); caps->VS20Caps.static_flow_control_depth = 1; caps->MaxVShaderInstructionsExecuted = 65535; @@ -2289,7 +2289,7 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte WINED3DPS20CAPS_NOTEXINSTRUCTIONLIMIT; /* PS 3.0 requires MAX_DYNAMICFLOWCONTROLDEPTH (24) */ caps->PS20Caps.dynamic_flow_control_depth = WINED3DPS20_MAX_DYNAMICFLOWCONTROLDEPTH; - caps->PS20Caps.temp_count = max(32, adapter->gl_info.limits.arb_ps_temps); + caps->PS20Caps.temp_count = max(32, gl_info->limits.arb_ps_temps); /* PS 3.0 requires MAX_STATICFLOWCONTROLDEPTH (4) */ caps->PS20Caps.static_flow_control_depth = WINED3DPS20_MAX_STATICFLOWCONTROLDEPTH; /* PS 3.0 requires MAX_NUMINSTRUCTIONSLOTS (512) */ @@ -2297,14 +2297,14 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte caps->MaxPShaderInstructionsExecuted = 65535; caps->MaxPixelShader30InstructionSlots = max(WINED3DMIN30SHADERINSTRUCTIONS, - adapter->gl_info.limits.arb_ps_instructions); + gl_info->limits.arb_ps_instructions); } else if(caps->PixelShaderVersion == 2) { /* Below we assume PS2.0 specs, not extended 2.0a(GeforceFX)/2.0b(Radeon R3xx) ones */ caps->PS20Caps.caps = 0; caps->PS20Caps.dynamic_flow_control_depth = 0; /* WINED3DVS20_MIN_DYNAMICFLOWCONTROLDEPTH = 0 */ - caps->PS20Caps.temp_count = max(12, adapter->gl_info.limits.arb_ps_temps); + caps->PS20Caps.temp_count = max(12, gl_info->limits.arb_ps_temps); caps->PS20Caps.static_flow_control_depth = WINED3DPS20_MIN_STATICFLOWCONTROLDEPTH; /* Minimum: 1 */ /* Minimum number (64 ALU + 32 Texture), a GeforceFX uses 512 */ caps->PS20Caps.instruction_slot_count = WINED3DPS20_MIN_NUMINSTRUCTIONSLOTS; -- 2.16.4

2 1

[PATCH 4/5] wined3d: Get gl_info from context in query_issue() functions.
by Józef Kucia 21 Aug '18

21 Aug '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/query.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 9828fc21aab4..01e6bcb9905c 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -526,7 +526,7 @@ static BOOL wined3d_occlusion_query_ops_issue(struct wined3d_query *query, DWORD { struct wined3d_occlusion_query *oq = wined3d_occlusion_query_from_query(query); struct wined3d_device *device = query->device; - const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; + const struct wined3d_gl_info *gl_info; struct wined3d_context *context; BOOL poll = FALSE; @@ -540,6 +540,7 @@ static BOOL wined3d_occlusion_query_ops_issue(struct wined3d_query *query, DWORD { if ((context = context_reacquire(device, oq->context))) { + gl_info = context->gl_info; GL_EXTCALL(glEndQuery(GL_SAMPLES_PASSED)); checkGLcall("glEndQuery()"); } @@ -558,6 +559,7 @@ static BOOL wined3d_occlusion_query_ops_issue(struct wined3d_query *query, DWORD context = context_acquire(device, NULL, 0); context_alloc_occlusion_query(context, oq); } + gl_info = context->gl_info; GL_EXTCALL(glBeginQuery(GL_SAMPLES_PASSED, oq->id)); checkGLcall("glBeginQuery()"); @@ -574,6 +576,7 @@ static BOOL wined3d_occlusion_query_ops_issue(struct wined3d_query *query, DWORD { if ((context = context_reacquire(device, oq->context))) { + gl_info = context->gl_info; GL_EXTCALL(glEndQuery(GL_SAMPLES_PASSED)); checkGLcall("glEndQuery()"); @@ -713,7 +716,7 @@ static BOOL wined3d_so_statistics_query_ops_issue(struct wined3d_query *query, D { struct wined3d_so_statistics_query *pq = wined3d_so_statistics_query_from_query(query); struct wined3d_device *device = query->device; - const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; + const struct wined3d_gl_info *gl_info; struct wined3d_context *context; BOOL poll = FALSE; @@ -725,6 +728,7 @@ static BOOL wined3d_so_statistics_query_ops_issue(struct wined3d_query *query, D { if ((context = context_reacquire(device, pq->context))) { + gl_info = context->gl_info; GL_EXTCALL(glEndQueryIndexed(GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN, pq->stream_idx)); GL_EXTCALL(glEndQueryIndexed(GL_PRIMITIVES_GENERATED, pq->stream_idx)); } @@ -743,6 +747,7 @@ static BOOL wined3d_so_statistics_query_ops_issue(struct wined3d_query *query, D context = context_acquire(device, NULL, 0); context_alloc_so_statistics_query(context, pq); } + gl_info = context->gl_info; GL_EXTCALL(glBeginQueryIndexed(GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN, pq->stream_idx, pq->u.query.written)); @@ -759,6 +764,7 @@ static BOOL wined3d_so_statistics_query_ops_issue(struct wined3d_query *query, D { if ((context = context_reacquire(device, pq->context))) { + gl_info = context->gl_info; GL_EXTCALL(glEndQueryIndexed(GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN, pq->stream_idx)); GL_EXTCALL(glEndQueryIndexed(GL_PRIMITIVES_GENERATED, pq->stream_idx)); checkGLcall("end query"); @@ -846,7 +852,7 @@ static BOOL wined3d_pipeline_query_ops_issue(struct wined3d_query *query, DWORD { struct wined3d_pipeline_statistics_query *pq = wined3d_pipeline_statistics_query_from_query(query); struct wined3d_device *device = query->device; - const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; + const struct wined3d_gl_info *gl_info; struct wined3d_context *context; BOOL poll = FALSE; @@ -875,6 +881,7 @@ static BOOL wined3d_pipeline_query_ops_issue(struct wined3d_query *query, DWORD context = context_acquire(device, NULL, 0); context_alloc_pipeline_statistics_query(context, pq); } + gl_info = context->gl_info; GL_EXTCALL(glBeginQuery(GL_VERTICES_SUBMITTED_ARB, pq->u.query.vertices)); GL_EXTCALL(glBeginQuery(GL_PRIMITIVES_SUBMITTED_ARB, pq->u.query.primitives)); -- 2.16.4

2 1

[PATCH 3/5] wined3d: Get D3D and GL info from context in create_dummy_textures().
by Józef Kucia 21 Aug '18

21 Aug '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 5079113120eb..271ee28034b2 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -610,9 +610,9 @@ out: /* Context activation is done by the caller. */ static void create_dummy_textures(struct wined3d_device *device, struct wined3d_context *context) { - const struct wined3d_d3d_info *d3d_info = &device->adapter->d3d_info; - const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; struct wined3d_dummy_textures *textures = &device->dummy_textures; + const struct wined3d_d3d_info *d3d_info = context->d3d_info; + const struct wined3d_gl_info *gl_info = context->gl_info; unsigned int i; DWORD color; -- 2.16.4

2 1

[PATCH 1/5] wined3d: Simplify shader_arb_destroy().
by Józef Kucia 21 Aug '18

21 Aug '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/arb_program_shader.c | 54 +++++++++++++++------------------------ 1 file changed, 20 insertions(+), 34 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 00b326fcee5f..7cd7d2d03085 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4733,56 +4733,42 @@ static void shader_arb_disable(void *shader_priv, struct wined3d_context *contex static void shader_arb_destroy(struct wined3d_shader *shader) { struct wined3d_device *device = shader->device; - const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; + const struct wined3d_gl_info *gl_info; + struct wined3d_context *context; + unsigned int i; + + /* This can happen if a shader was never compiled */ + if (!shader->backend_data) + return; + + context = context_acquire(device, NULL, 0); + gl_info = context->gl_info; if (shader_is_pshader_version(shader->reg_maps.shader_version.type)) { struct arb_pshader_private *shader_data = shader->backend_data; - UINT i; - - if(!shader_data) return; /* This can happen if a shader was never compiled */ - - if (shader_data->num_gl_shaders) - { - struct wined3d_context *context = context_acquire(device, NULL, 0); - for (i = 0; i < shader_data->num_gl_shaders; ++i) - { - GL_EXTCALL(glDeleteProgramsARB(1, &shader_data->gl_shaders[i].prgId)); - checkGLcall("GL_EXTCALL(glDeleteProgramsARB(1, &shader_data->gl_shaders[i].prgId))"); - } - - context_release(context); - } + for (i = 0; i < shader_data->num_gl_shaders; ++i) + GL_EXTCALL(glDeleteProgramsARB(1, &shader_data->gl_shaders[i].prgId)); heap_free(shader_data->gl_shaders); - heap_free(shader_data); - shader->backend_data = NULL; } else { struct arb_vshader_private *shader_data = shader->backend_data; - UINT i; - if(!shader_data) return; /* This can happen if a shader was never compiled */ + for (i = 0; i < shader_data->num_gl_shaders; ++i) + GL_EXTCALL(glDeleteProgramsARB(1, &shader_data->gl_shaders[i].prgId)); - if (shader_data->num_gl_shaders) - { - struct wined3d_context *context = context_acquire(device, NULL, 0); + heap_free(shader_data->gl_shaders); + } - for (i = 0; i < shader_data->num_gl_shaders; ++i) - { - GL_EXTCALL(glDeleteProgramsARB(1, &shader_data->gl_shaders[i].prgId)); - checkGLcall("GL_EXTCALL(glDeleteProgramsARB(1, &shader_data->gl_shaders[i].prgId))"); - } + checkGLcall("delete programs"); - context_release(context); - } + context_release(context); - heap_free(shader_data->gl_shaders); - heap_free(shader_data); - shader->backend_data = NULL; - } + heap_free(shader->backend_data); + shader->backend_data = NULL; } static int sig_tree_compare(const void *key, const struct wine_rb_entry *entry) -- 2.16.4

2 1

[PATCH 2/5] wined3d: Pass context to find_arb_pshader().
by Józef Kucia 21 Aug '18

21 Aug '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/arb_program_shader.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 7cd7d2d03085..67fd193a7bb4 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4230,12 +4230,12 @@ static GLuint shader_arb_generate_vshader(const struct wined3d_shader *shader, } /* Context activation is done by the caller. */ -static struct arb_ps_compiled_shader *find_arb_pshader(struct wined3d_shader *shader, - const struct arb_ps_compile_args *args) +static struct arb_ps_compiled_shader *find_arb_pshader(struct wined3d_context *context, + struct wined3d_shader *shader, const struct arb_ps_compile_args *args) { + const struct wined3d_d3d_info *d3d_info = context->d3d_info; + const struct wined3d_gl_info *gl_info = context->gl_info; struct wined3d_device *device = shader->device; - const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; - const struct wined3d_d3d_info *d3d_info = &device->adapter->d3d_info; UINT i; DWORD new_size; struct arb_ps_compiled_shader *new_array; @@ -4566,7 +4566,7 @@ static void shader_arb_select(void *shader_priv, struct wined3d_context *context TRACE("Using pixel shader %p.\n", ps); find_arb_ps_compile_args(state, context, ps, &compile_args); - compiled = find_arb_pshader(ps, &compile_args); + compiled = find_arb_pshader(context, ps, &compile_args); priv->current_fprogram_id = compiled->prgId; priv->compiled_fprog = compiled; -- 2.16.4

2 1

[PATCH 2/2] user32/listbox: Fix scrolling for multi-column listboxes
by Gabriel Ivăncescu 21 Aug '18

21 Aug '18

2 1

[PATCH 1/2] comctl32/listbox: Fix scrolling for multi-column listboxes
by Gabriel Ivăncescu 21 Aug '18

21 Aug '18

2 1

[PATCH v2] msi: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 21 Aug '18

21 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- v2: Rebased dlls/msi/action.c | 12 ++++++------ dlls/msi/appsearch.c | 3 +-- dlls/msi/assembly.c | 2 +- dlls/msi/automation.c | 2 +- dlls/msi/custom.c | 8 ++++---- dlls/msi/database.c | 2 +- dlls/msi/dialog.c | 2 +- dlls/msi/msi.c | 4 ++-- dlls/msi/package.c | 2 +- dlls/msi/patch.c | 2 +- dlls/msi/registry.c | 38 +++++++++++++++++++------------------- dlls/msi/source.c | 2 +- dlls/msi/upgrade.c | 2 +- 13 files changed, 40 insertions(+), 41 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 03fab71588..af867618c6 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -2152,7 +2152,7 @@ static WCHAR *create_temp_dir( MSIDATABASE *db ) if (!db->tempfolder) { WCHAR tmp[MAX_PATH]; - UINT len = sizeof(tmp)/sizeof(tmp[0]); + UINT len = ARRAY_SIZE( tmp ); if (msi_get_property( db, szTempFolder, tmp, &len ) || GetFileAttributesW( tmp ) != FILE_ATTRIBUTE_DIRECTORY) @@ -5546,9 +5546,9 @@ UINT ACTION_ForceReboot(MSIPACKAGE *package) squash_guid( package->ProductCode, squashed_pc ); - GetSystemDirectoryW(sysdir, sizeof(sysdir)/sizeof(sysdir[0])); + GetSystemDirectoryW(sysdir, ARRAY_SIZE(sysdir)); RegCreateKeyW(HKEY_LOCAL_MACHINE,RunOnce,&hkey); - snprintfW( buffer, sizeof(buffer)/sizeof(buffer[0]), msiexec_fmt, sysdir, squashed_pc ); + snprintfW(buffer, ARRAY_SIZE(buffer), msiexec_fmt, sysdir, squashed_pc); msi_reg_set_val_str( hkey, squashed_pc, buffer ); RegCloseKey(hkey); @@ -6214,7 +6214,7 @@ static LPCWSTR *msi_service_args_to_vector(LPWSTR args, DWORD *numargs) static const WCHAR separator[] = {'[','~',']',0}; *numargs = 0; - sep_len = sizeof(separator) / sizeof(WCHAR) - 1; + sep_len = ARRAY_SIZE(separator) - 1; if (!args) return NULL; @@ -7686,7 +7686,7 @@ static UINT ITERATE_RemoveExistingProducts( MSIRECORD *rec, LPVOID param ) MSIPACKAGE *package = param; const WCHAR *property = MSI_RecordGetString( rec, 7 ); int attrs = MSI_RecordGetInteger( rec, 5 ); - UINT len = sizeof(fmtW)/sizeof(fmtW[0]); + UINT len = ARRAY_SIZE( fmtW ); WCHAR *product, *features, *cmd; STARTUPINFOW si; PROCESS_INFORMATION info; @@ -7701,7 +7701,7 @@ static UINT ITERATE_RemoveExistingProducts( MSIRECORD *rec, LPVOID param ) if (features) len += strlenW( features ); else - len += sizeof(szAll) / sizeof(szAll[0]); + len += ARRAY_SIZE( szAll ); if (!(cmd = msi_alloc( len * sizeof(WCHAR) ))) { diff --git a/dlls/msi/appsearch.c b/dlls/msi/appsearch.c index 693da18355..fbed073bd4 100644 --- a/dlls/msi/appsearch.c +++ b/dlls/msi/appsearch.c @@ -949,8 +949,7 @@ static UINT ACTION_SearchDirectory(MSIPACKAGE *package, MSISIGNATURE *sig, if (GetDriveTypeW(pathWithDrive) != DRIVE_FIXED) continue; - lstrcpynW(pathWithDrive + 3, path, - sizeof(pathWithDrive) / sizeof(pathWithDrive[0]) - 3); + lstrcpynW(pathWithDrive + 3, path, ARRAY_SIZE(pathWithDrive) - 3); if (sig->File) rc = ACTION_RecurseSearchDirectory(package, &val, sig, diff --git a/dlls/msi/assembly.c b/dlls/msi/assembly.c index 59fd332d25..e3bd965150 100644 --- a/dlls/msi/assembly.c +++ b/dlls/msi/assembly.c @@ -344,7 +344,7 @@ static const WCHAR *clr_version[] = static const WCHAR *get_clr_version_str( enum clr_version version ) { - if (version >= sizeof(clr_version)/sizeof(clr_version[0])) return clr_version_unknown; + if (version >= ARRAY_SIZE( clr_version )) return clr_version_unknown; return clr_version[version]; } diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index 06ad2f90a4..80254e6df4 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -130,7 +130,7 @@ void release_typelib(void) { unsigned i; - for (i = 0; i < sizeof(typeinfos)/sizeof(*typeinfos); i++) + for (i = 0; i < ARRAY_SIZE(typeinfos); i++) if (typeinfos[i]) ITypeInfo_Release(typeinfos[i]); diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index ee259e8ba3..436a096f37 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -213,7 +213,7 @@ WCHAR *msi_create_temp_file( MSIDATABASE *db ) if (!db->tempfolder) { WCHAR tmp[MAX_PATH]; - UINT len = sizeof(tmp)/sizeof(tmp[0]); + UINT len = ARRAY_SIZE( tmp ); if (msi_get_property( db, szTempFolder, tmp, &len ) || GetFileAttributesW( tmp ) != FILE_ATTRIBUTE_DIRECTORY) @@ -605,9 +605,9 @@ static DWORD custom_start_server(MSIPACKAGE *package, DWORD arch) wow64 = FALSE; if ((sizeof(void *) == 8 || wow64) && arch == SCS_32BIT_BINARY) - GetSystemWow64DirectoryW(path, MAX_PATH - sizeof(msiexecW)/sizeof(WCHAR)); + GetSystemWow64DirectoryW(path, MAX_PATH - ARRAY_SIZE(msiexecW)); else - GetSystemDirectoryW(path, MAX_PATH - sizeof(msiexecW)/sizeof(WCHAR)); + GetSystemDirectoryW(path, MAX_PATH - ARRAY_SIZE(msiexecW)); strcatW(path, msiexecW); sprintfW(cmdline, argsW, path, GetCurrentProcessId()); @@ -943,7 +943,7 @@ static UINT HANDLE_CustomType23( MSIPACKAGE *package, const WCHAR *source, const static const WCHAR msiexecW[] = {'m','s','i','e','x','e','c',0}; static const WCHAR paramsW[] = {'/','q','b',' ','/','i',' '}; WCHAR *dir, *arg, *p; - UINT len_src, len_dir, len_tgt, len = sizeof(paramsW)/sizeof(paramsW[0]); + UINT len_src, len_dir, len_tgt, len = ARRAY_SIZE( paramsW ); HANDLE handle; if (!(dir = msi_dup_property( package->db, szOriginalDatabase ))) return ERROR_OUTOFMEMORY; diff --git a/dlls/msi/database.c b/dlls/msi/database.c index ef0221d2b8..c1fb37b583 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -451,7 +451,7 @@ static LPWSTR msi_build_createsql_prelude(LPWSTR table) static const WCHAR create_fmt[] = {'C','R','E','A','T','E',' ','T','A','B','L','E',' ','`','%','s','`',' ','(',' ',0}; - size = sizeof(create_fmt)/sizeof(create_fmt[0]) + lstrlenW(table) - 2; + size = ARRAY_SIZE(create_fmt) + lstrlenW(table) - 2; prelude = msi_alloc(size * sizeof(WCHAR)); if (!prelude) return NULL; diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index b96c44be44..68e8ab2258 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -3377,7 +3377,7 @@ static UINT msi_dialog_hyperlink_handler( msi_dialog *dialog, msi_control *contr { static const WCHAR hrefW[] = {'h','r','e','f'}; static const WCHAR openW[] = {'o','p','e','n',0}; - int len, len_href = sizeof(hrefW) / sizeof(hrefW[0]); + int len, len_href = ARRAY_SIZE( hrefW ); const WCHAR *p, *q; WCHAR quote = 0; LITEM item; diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 7d805afeda..ae146e626f 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -1028,7 +1028,7 @@ UINT WINAPI MsiGetProductCodeW(LPCWSTR szComponent, LPWSTR szBuffer) UINT rc, index; HKEY compkey, prodkey; WCHAR squashed_comp[SQUASHED_GUID_SIZE], squashed_prod[SQUASHED_GUID_SIZE]; - DWORD sz = sizeof(squashed_prod)/sizeof(squashed_prod[0]); + DWORD sz = ARRAY_SIZE(squashed_prod); TRACE("%s %p\n", debugstr_w(szComponent), szBuffer); @@ -3482,7 +3482,7 @@ static UINT MSI_ProvideQualifiedComponentEx(LPCWSTR szComponent, return ERROR_FILE_NOT_FOUND; } msi_free( components ); - StringFromGUID2( &guid, comp, sizeof(comp)/sizeof(comp[0]) ); + StringFromGUID2( &guid, comp, ARRAY_SIZE( comp )); } state = MSI_GetComponentPath( szProduct, comp, szAllSid, MSIINSTALLCONTEXT_ALL, lpPathBuf, pcchPathBuf ); diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 0d937d609d..273ca71418 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -559,7 +559,7 @@ static LPWSTR get_fusion_filename(MSIPACKAGE *package) if (!RegCreateKeyExW(netsetup, v4client, 0, NULL, 0, KEY_QUERY_VALUE, NULL, &hkey, NULL)) { - size = sizeof(path)/sizeof(path[0]); + size = ARRAY_SIZE(path); if (!RegQueryValueExW(hkey, installpath, NULL, &type, (BYTE *)path, &size)) { len = strlenW(path) + strlenW(fusion) + 2; diff --git a/dlls/msi/patch.c b/dlls/msi/patch.c index f6ed3c1f1a..bd9b7b87df 100644 --- a/dlls/msi/patch.c +++ b/dlls/msi/patch.c @@ -1037,7 +1037,7 @@ UINT msi_apply_registered_patch( MSIPACKAGE *package, LPCWSTR patch_code ) TRACE("%p, %s\n", package, debugstr_w(patch_code)); - len = sizeof(patch_file) / sizeof(WCHAR); + len = ARRAY_SIZE( patch_file ); r = MsiGetPatchInfoExW( patch_code, package->ProductCode, NULL, package->Context, INSTALLPROPERTY_LOCALPACKAGEW, patch_file, &len ); if (r != ERROR_SUCCESS) diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c index cbc8d8d6f0..efc72725ce 100644 --- a/dlls/msi/registry.c +++ b/dlls/msi/registry.c @@ -1297,12 +1297,12 @@ static UINT fetch_machine_component( DWORD ctx, DWORD index, DWORD *idx, WCHAR g if (RegOpenKeyExW( HKEY_LOCAL_MACHINE, componentsW, 0, access, &key_components )) return ERROR_NO_MORE_ITEMS; - len_component = sizeof(component)/sizeof(component[0]); + len_component = ARRAY_SIZE( component ); while (!RegEnumKeyExW( key_components, i, component, &len_component, NULL, NULL, NULL, NULL )) { if (*idx == index) goto found; (*idx)++; - len_component = sizeof(component)/sizeof(component[0]); + len_component = ARRAY_SIZE( component ); i++; } RegCloseKey( key_components ); @@ -1349,14 +1349,14 @@ static UINT fetch_user_component( const WCHAR *usersid, DWORD ctx, DWORD index, if (RegOpenKeyExW( HKEY_LOCAL_MACHINE, userdataW, 0, access, &key_users )) return ERROR_NO_MORE_ITEMS; - len_user = sizeof(user)/sizeof(user[0]); + len_user = ARRAY_SIZE( user ); while (!RegEnumKeyExW( key_users, i, user, &len_user, NULL, NULL, NULL, NULL )) { if ((strcmpW( usersid, szAllSid ) && strcmpW( usersid, user )) || !strcmpW( szLocalSid, user )) { i++; - len_user = sizeof(user)/sizeof(user[0]); + len_user = ARRAY_SIZE( user ); continue; } strcpyW( path, user ); @@ -1364,19 +1364,19 @@ static UINT fetch_user_component( const WCHAR *usersid, DWORD ctx, DWORD index, if (RegOpenKeyExW( key_users, path, 0, access, &key_components )) { i++; - len_user = sizeof(user)/sizeof(user[0]); + len_user = ARRAY_SIZE( user ); continue; } - len_component = sizeof(component)/sizeof(component[0]); + len_component = ARRAY_SIZE( component ); while (!RegEnumKeyExW( key_components, j, component, &len_component, NULL, NULL, NULL, NULL )) { if (*idx == index) goto found; (*idx)++; - len_component = sizeof(component)/sizeof(component[0]); + len_component = ARRAY_SIZE( component ); j++; } RegCloseKey( key_components ); - len_user = sizeof(user)/sizeof(user[0]); + len_user = ARRAY_SIZE( user ); i++; } RegCloseKey( key_users ); @@ -1709,7 +1709,7 @@ UINT WINAPI MsiEnumRelatedProductsW(LPCWSTR szUpgradeCode, DWORD dwReserved, UINT r; HKEY hkey; WCHAR szKeyName[SQUASHED_GUID_SIZE]; - DWORD dwSize = sizeof(szKeyName)/sizeof(szKeyName[0]); + DWORD dwSize = ARRAY_SIZE(szKeyName); TRACE("%s %u %u %p\n", debugstr_w(szUpgradeCode), dwReserved, iProductIndex, lpProductBuf); @@ -2324,18 +2324,18 @@ static UINT fetch_machine_product( const WCHAR *match, DWORD index, DWORD *idx, if (RegOpenKeyExW( HKEY_LOCAL_MACHINE, productsW, 0, access, &key )) return ERROR_NO_MORE_ITEMS; - len = sizeof(product)/sizeof(product[0]); + len = ARRAY_SIZE( product ); while (!RegEnumKeyExW( key, i, product, &len, NULL, NULL, NULL, NULL )) { if (match && strcmpW( match, product )) { i++; - len = sizeof(product)/sizeof(product[0]); + len = ARRAY_SIZE( product ); continue; } if (*idx == index) goto found; (*idx)++; - len = sizeof(product)/sizeof(product[0]); + len = ARRAY_SIZE( product ); i++; } RegCloseKey( key ); @@ -2396,13 +2396,13 @@ static UINT fetch_user_product( const WCHAR *match, const WCHAR *usersid, DWORD } else return ERROR_INVALID_PARAMETER; - len_user = sizeof(user)/sizeof(user[0]); + len_user = ARRAY_SIZE( user ); while (!RegEnumKeyExW( key_users, i, user, &len_user, NULL, NULL, NULL, NULL )) { if (strcmpW( usersid, user ) && strcmpW( usersid, szAllSid )) { i++; - len_user = sizeof(user)/sizeof(user[0]); + len_user = ARRAY_SIZE( user ); continue; } strcpyW( path, user ); @@ -2410,25 +2410,25 @@ static UINT fetch_user_product( const WCHAR *match, const WCHAR *usersid, DWORD if (RegOpenKeyExW( key_users, path, 0, access, &key_products )) { i++; - len_user = sizeof(user)/sizeof(user[0]); + len_user = ARRAY_SIZE( user ); continue; } - len_product = sizeof(product)/sizeof(product[0]); + len_product = ARRAY_SIZE( product ); while (!RegEnumKeyExW( key_products, j, product, &len_product, NULL, NULL, NULL, NULL )) { if (match && strcmpW( match, product )) { j++; - len_product = sizeof(product)/sizeof(product[0]); + len_product = ARRAY_SIZE( product ); continue; } if (*idx == index) goto found; (*idx)++; - len_product = sizeof(product)/sizeof(product[0]); + len_product = ARRAY_SIZE( product ); j++; } RegCloseKey( key_products ); - len_user = sizeof(user)/sizeof(user[0]); + len_user = ARRAY_SIZE( user ); i++; } RegCloseKey( key_users ); diff --git a/dlls/msi/source.c b/dlls/msi/source.c index 68bf9d0a22..904589e947 100644 --- a/dlls/msi/source.c +++ b/dlls/msi/source.c @@ -1006,7 +1006,7 @@ static UINT fill_source_list(struct list *sourcelist, HKEY sourcekey, DWORD *cou while (r == ERROR_SUCCESS) { - size = sizeof(name) / sizeof(name[0]); + size = ARRAY_SIZE(name); r = RegEnumValueW(sourcekey, index, name, &size, NULL, NULL, NULL, &val_size); if (r != ERROR_SUCCESS) return r; diff --git a/dlls/msi/upgrade.c b/dlls/msi/upgrade.c index ac58d909e0..bbc7df6eec 100644 --- a/dlls/msi/upgrade.c +++ b/dlls/msi/upgrade.c @@ -103,7 +103,7 @@ static UINT ITERATE_FindRelatedProducts(MSIRECORD *rec, LPVOID param) { MSIPACKAGE *package = param; WCHAR product[SQUASHED_GUID_SIZE]; - DWORD index = 0, attributes = 0, sz = sizeof(product)/sizeof(product[0]); + DWORD index = 0, attributes = 0, sz = ARRAY_SIZE(product); LPCWSTR upgrade_code; HKEY hkey = 0; UINT rc = ERROR_SUCCESS; -- 2.14.4

2 1

[v2 PATCH] wmp: Implement GetClassInfo().
by Nikolay Sivov 21 Aug '18

21 Aug '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v2: removed failing test dlls/wmp/oleobj.c | 11 +++++-- dlls/wmp/tests/oleobj.c | 10 +++++++ dlls/wmp/wmp_main.c | 66 +++++++++++++++++++++++++++++++++++++++++ dlls/wmp/wmp_private.h | 15 ++++++++++ 4 files changed, 99 insertions(+), 3 deletions(-) diff --git a/dlls/wmp/oleobj.c b/dlls/wmp/oleobj.c index a90a0c2c6c..cbbd965c38 100644 --- a/dlls/wmp/oleobj.c +++ b/dlls/wmp/oleobj.c @@ -760,11 +760,16 @@ static ULONG WINAPI ProvideClassInfo2_Release(IProvideClassInfo2 *iface) return IOleObject_Release(&This->IOleObject_iface); } -static HRESULT WINAPI ProvideClassInfo2_GetClassInfo(IProvideClassInfo2 *iface, ITypeInfo **ppTI) +static HRESULT WINAPI ProvideClassInfo2_GetClassInfo(IProvideClassInfo2 *iface, ITypeInfo **ti) { WindowsMediaPlayer *This = impl_from_IProvideClassInfo2(iface); - FIXME("(%p)->(%p)\n", This, ppTI); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, ti); + + if (!ti) + return E_POINTER; + + return get_typeinfo(WindowsMediaPlayer_tid, ti); } static HRESULT WINAPI ProvideClassInfo2_GetGUID(IProvideClassInfo2 *iface, DWORD dwGuidKind, GUID *pGUID) diff --git a/dlls/wmp/tests/oleobj.c b/dlls/wmp/tests/oleobj.c index 472b985244..2250b75aa9 100644 --- a/dlls/wmp/tests/oleobj.c +++ b/dlls/wmp/tests/oleobj.c @@ -1199,6 +1199,8 @@ static void test_wmp(void) IOleObject *oleobj; IWMPCore *wmpcore; DWORD misc_status; + TYPEATTR *attr; + ITypeInfo *ti; RECT pos = {0,0,100,100}; HWND hwnd; GUID guid; @@ -1232,6 +1234,14 @@ static void test_wmp(void) ok(hres == S_OK, "GetGUID failed: %08x\n", hres); ok(IsEqualGUID(&guid, &IID__WMPOCXEvents), "guid = %s\n", wine_dbgstr_guid(&guid)); + hres = IProvideClassInfo2_GetClassInfo(class_info, &ti); + ok(hres == S_OK, "Failed to get class info, hr %#x.\n", hres); + hres = ITypeInfo_GetTypeAttr(ti, &attr); + ok(hres == S_OK, "Failed to get type attributes, hr %#x.\n", hres); + ok(IsEqualGUID(&CLSID_WindowsMediaPlayer, &attr->guid), "Unexpected typeinfo guid %s\n", wine_dbgstr_guid(&attr->guid)); + ITypeInfo_ReleaseTypeAttr(ti, attr); + ITypeInfo_Release(ti); + IProvideClassInfo2_Release(class_info); test_QI((IUnknown*)oleobj); diff --git a/dlls/wmp/wmp_main.c b/dlls/wmp/wmp_main.c index 273d193e58..2541fc54ff 100644 --- a/dlls/wmp/wmp_main.c +++ b/dlls/wmp/wmp_main.c @@ -27,6 +27,71 @@ WINE_DEFAULT_DEBUG_CHANNEL(wmp); HINSTANCE wmp_instance; DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); +static REFIID tid_ids[] = { +#define XIID(iface) &IID_ ## iface, +#define CTID(name) &CLSID_ ## name, +TID_LIST +#undef XIID +#undef CTID +}; + +static ITypeLib *typelib; +static ITypeInfo *typeinfos[LAST_tid]; + +static HRESULT load_typelib(void) +{ + ITypeLib *tl; + HRESULT hr; + + hr = LoadRegTypeLib(&LIBID_WMPLib, 1, 0, LOCALE_SYSTEM_DEFAULT, &tl); + if (FAILED(hr)) { + ERR("LoadRegTypeLib failed: %08x\n", hr); + return hr; + } + + if (InterlockedCompareExchangePointer((void **)&typelib, tl, NULL)) + ITypeLib_Release(tl); + return hr; +} + +HRESULT get_typeinfo(typeinfo_id tid, ITypeInfo **typeinfo) +{ + HRESULT hr; + + if (!typelib) + hr = load_typelib(); + if (!typelib) + return hr; + + if (!typeinfos[tid]) { + ITypeInfo *ti; + + hr = ITypeLib_GetTypeInfoOfGuid(typelib, tid_ids[tid], &ti); + if (FAILED(hr)) { + ERR("GetTypeInfoOfGuid (%s) failed: %08x\n", debugstr_guid(tid_ids[tid]), hr); + return hr; + } + + if (InterlockedCompareExchangePointer((void **)(typeinfos + tid), ti, NULL)) + ITypeInfo_Release(ti); + } + + *typeinfo = typeinfos[tid]; + ITypeInfo_AddRef(*typeinfo); + return S_OK; +} + +static void release_typelib(void) +{ + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(typeinfos); i++) + if (typeinfos[i]) + ITypeInfo_Release(typeinfos[i]); + + ITypeLib_Release(typelib); +} + static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, void **ppv) { *ppv = NULL; @@ -93,6 +158,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) case DLL_PROCESS_DETACH: unregister_wmp_class(); unregister_player_msg_class(); + release_typelib(); break; } diff --git a/dlls/wmp/wmp_private.h b/dlls/wmp/wmp_private.h index 9617be0c7f..ab9c6d098c 100644 --- a/dlls/wmp/wmp_private.h +++ b/dlls/wmp/wmp_private.h @@ -25,6 +25,21 @@ #include "dshow.h" #include "wmp.h" +#define TID_LIST \ + XIID(NULL) \ + CTID(WindowsMediaPlayer) + +typedef enum { +#define XIID(iface) iface ## _tid, +#define CTID(name) name ## _tid, +TID_LIST +#undef XIID +#undef CTID + LAST_tid +} typeinfo_id; + +HRESULT get_typeinfo(typeinfo_id tid, ITypeInfo **typeinfo) DECLSPEC_HIDDEN; + typedef struct { IConnectionPoint IConnectionPoint_iface; -- 2.18.0

1 0

[PATCH] wmp: Implement GetClassInfo().
by Nikolay Sivov 21 Aug '18

21 Aug '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/wmp/oleobj.c | 11 +++++-- dlls/wmp/tests/oleobj.c | 12 ++++++++ dlls/wmp/wmp_main.c | 66 +++++++++++++++++++++++++++++++++++++++++ dlls/wmp/wmp_private.h | 15 ++++++++++ 4 files changed, 101 insertions(+), 3 deletions(-) diff --git a/dlls/wmp/oleobj.c b/dlls/wmp/oleobj.c index a90a0c2c6c..cbbd965c38 100644 --- a/dlls/wmp/oleobj.c +++ b/dlls/wmp/oleobj.c @@ -760,11 +760,16 @@ static ULONG WINAPI ProvideClassInfo2_Release(IProvideClassInfo2 *iface) return IOleObject_Release(&This->IOleObject_iface); } -static HRESULT WINAPI ProvideClassInfo2_GetClassInfo(IProvideClassInfo2 *iface, ITypeInfo **ppTI) +static HRESULT WINAPI ProvideClassInfo2_GetClassInfo(IProvideClassInfo2 *iface, ITypeInfo **ti) { WindowsMediaPlayer *This = impl_from_IProvideClassInfo2(iface); - FIXME("(%p)->(%p)\n", This, ppTI); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, ti); + + if (!ti) + return E_POINTER; + + return get_typeinfo(WindowsMediaPlayer_tid, ti); } static HRESULT WINAPI ProvideClassInfo2_GetGUID(IProvideClassInfo2 *iface, DWORD dwGuidKind, GUID *pGUID) diff --git a/dlls/wmp/tests/oleobj.c b/dlls/wmp/tests/oleobj.c index 472b985244..2a69a102de 100644 --- a/dlls/wmp/tests/oleobj.c +++ b/dlls/wmp/tests/oleobj.c @@ -1199,6 +1199,8 @@ static void test_wmp(void) IOleObject *oleobj; IWMPCore *wmpcore; DWORD misc_status; + TYPEATTR *attr; + ITypeInfo *ti; RECT pos = {0,0,100,100}; HWND hwnd; GUID guid; @@ -1232,6 +1234,16 @@ static void test_wmp(void) ok(hres == S_OK, "GetGUID failed: %08x\n", hres); ok(IsEqualGUID(&guid, &IID__WMPOCXEvents), "guid = %s\n", wine_dbgstr_guid(&guid)); + hres = IProvideClassInfo2_GetClassInfo(class_info, NULL); + ok(hres == E_POINTER, "Unexpected hr %#x.\n", hres); + hres = IProvideClassInfo2_GetClassInfo(class_info, &ti); + ok(hres == S_OK, "Failed to get class info, hr %#x.\n", hres); + hres = ITypeInfo_GetTypeAttr(ti, &attr); + ok(hres == S_OK, "Failed to get type attributes, hr %#x.\n", hres); + ok(IsEqualGUID(&CLSID_WindowsMediaPlayer, &attr->guid), "Unexpected typeinfo guid %s\n", wine_dbgstr_guid(&attr->guid)); + ITypeInfo_ReleaseTypeAttr(ti, attr); + ITypeInfo_Release(ti); + IProvideClassInfo2_Release(class_info); test_QI((IUnknown*)oleobj); diff --git a/dlls/wmp/wmp_main.c b/dlls/wmp/wmp_main.c index 273d193e58..2541fc54ff 100644 --- a/dlls/wmp/wmp_main.c +++ b/dlls/wmp/wmp_main.c @@ -27,6 +27,71 @@ WINE_DEFAULT_DEBUG_CHANNEL(wmp); HINSTANCE wmp_instance; DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); +static REFIID tid_ids[] = { +#define XIID(iface) &IID_ ## iface, +#define CTID(name) &CLSID_ ## name, +TID_LIST +#undef XIID +#undef CTID +}; + +static ITypeLib *typelib; +static ITypeInfo *typeinfos[LAST_tid]; + +static HRESULT load_typelib(void) +{ + ITypeLib *tl; + HRESULT hr; + + hr = LoadRegTypeLib(&LIBID_WMPLib, 1, 0, LOCALE_SYSTEM_DEFAULT, &tl); + if (FAILED(hr)) { + ERR("LoadRegTypeLib failed: %08x\n", hr); + return hr; + } + + if (InterlockedCompareExchangePointer((void **)&typelib, tl, NULL)) + ITypeLib_Release(tl); + return hr; +} + +HRESULT get_typeinfo(typeinfo_id tid, ITypeInfo **typeinfo) +{ + HRESULT hr; + + if (!typelib) + hr = load_typelib(); + if (!typelib) + return hr; + + if (!typeinfos[tid]) { + ITypeInfo *ti; + + hr = ITypeLib_GetTypeInfoOfGuid(typelib, tid_ids[tid], &ti); + if (FAILED(hr)) { + ERR("GetTypeInfoOfGuid (%s) failed: %08x\n", debugstr_guid(tid_ids[tid]), hr); + return hr; + } + + if (InterlockedCompareExchangePointer((void **)(typeinfos + tid), ti, NULL)) + ITypeInfo_Release(ti); + } + + *typeinfo = typeinfos[tid]; + ITypeInfo_AddRef(*typeinfo); + return S_OK; +} + +static void release_typelib(void) +{ + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(typeinfos); i++) + if (typeinfos[i]) + ITypeInfo_Release(typeinfos[i]); + + ITypeLib_Release(typelib); +} + static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, void **ppv) { *ppv = NULL; @@ -93,6 +158,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) case DLL_PROCESS_DETACH: unregister_wmp_class(); unregister_player_msg_class(); + release_typelib(); break; } diff --git a/dlls/wmp/wmp_private.h b/dlls/wmp/wmp_private.h index 9617be0c7f..ab9c6d098c 100644 --- a/dlls/wmp/wmp_private.h +++ b/dlls/wmp/wmp_private.h @@ -25,6 +25,21 @@ #include "dshow.h" #include "wmp.h" +#define TID_LIST \ + XIID(NULL) \ + CTID(WindowsMediaPlayer) + +typedef enum { +#define XIID(iface) iface ## _tid, +#define CTID(name) name ## _tid, +TID_LIST +#undef XIID +#undef CTID + LAST_tid +} typeinfo_id; + +HRESULT get_typeinfo(typeinfo_id tid, ITypeInfo **typeinfo) DECLSPEC_HIDDEN; + typedef struct { IConnectionPoint IConnectionPoint_iface; -- 2.18.0

2 1

[PATCH] testbot/WineRunBuild: Use the new Build command line options.
by Francois Gouget 21 Aug '18

21 Aug '18

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineRunBuild.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index c681d2e14..32369b191 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -363,7 +363,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 %Bitnesses) ."\n". ") >Build.log 2>&1\n"; Debug(Elapsed($Start), " Sending the script: [$Script]\n"); if (!$TA->SendFileFromString($Script, "task", $TestAgent::SENDFILE_EXE)) -- 2.18.0

1 0

[PATCH] testbot/WineRunWineTest: Use the new WineTest command line options.
by Francois Gouget 21 Aug '18

21 Aug '18

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineRunWineTest.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl index 6c0c923c9..ac5594654 100755 --- a/testbot/bin/WineRunWineTest.pl +++ b/testbot/bin/WineRunWineTest.pl @@ -428,7 +428,7 @@ if ($Step->Type eq "suite") my $Tag = lc($VM->Name); $Tag =~ s/^$TagPrefix//; $Tag =~ s/[^a-zA-Z0-9]/-/g; - $Script .= $Task->CmdLineArg .",submit winetest $TagPrefix-$Tag "; + $Script .= "--winetest ". $Task->CmdLineArg ." $TagPrefix-$Tag "; if (defined $WebHostName) { my $StepTask = 100 * $StepNo + $TaskNo; @@ -444,7 +444,7 @@ if ($Step->Type eq "suite") } else { - $Script .= $Task->CmdLineArg ." build patch.diff"; + $Script .= "--testpatch ". $Task->CmdLineArg ." patch.diff"; } $Script .= "\n) >Task.log 2>&1\n"; Debug(Elapsed($Start), " Sending the script: [$Script]\n"); -- 2.18.0

1 0

[PATCH] testbot/Build: There is no need to create build-native.
by Francois Gouget 21 Aug '18

21 Aug '18

That directory is created by Reconfig.pl which must be run before Build.pl. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/build/Build.pl | 2 -- 1 file changed, 2 deletions(-) diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl index b729d95f4..e1133aaee 100755 --- a/testbot/bin/build/Build.pl +++ b/testbot/bin/build/Build.pl @@ -132,8 +132,6 @@ sub ApplyPatch($) sub BuildNative() { - mkdir "$DataDir/build-native" if (! -d "$DataDir/build-native"); - InfoMsg "\nRebuilding native tools\n"; system("cd '$DataDir/build-native' && set -x && ". "time make -j$ncpus __tooldeps__"); -- 2.18.0

1 0

[PATCH] testbot/WineRunWine*: Better check the step type.
by Francois Gouget 21 Aug '18

21 Aug '18

This can help avoid errors when testing the script manually. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineRunBuild.pl | 6 +++++- testbot/bin/WineRunReconfig.pl | 6 +++++- testbot/bin/WineRunTask.pl | 6 +++++- testbot/bin/WineRunWineTest.pl | 6 +++++- 4 files changed, 20 insertions(+), 4 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index 47e4b3bbd..c681d2e14 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -325,9 +325,13 @@ if (!$VM->GetDomain()->IsPoweredOn()) FatalError("The VM is not powered on\n"); } +if ($Step->Type ne "build") +{ + FatalError("Unexpected step type '". $Step->Type ."' found\n"); +} if ($Step->FileType ne "patch") { - FatalError("Unexpected file type '". $Step->FileType ."' found\n"); + FatalError("Unexpected file type '". $Step->FileType ."' found for ". $Step->Type ." step\n"); } diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 24a24d067..b45dba5c7 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -325,9 +325,13 @@ if (!$VM->GetDomain()->IsPoweredOn()) FatalError("The VM is not powered on\n"); } +if ($Step->Type ne "reconfig") +{ + FatalError("Unexpected step type '". $Step->Type ."' found\n"); +} if ($Step->FileType ne "none") { - FatalError("Unexpected file type '". $Step->FileType ."' found\n"); + FatalError("Unexpected file type '". $Step->FileType ."' found for ". $Step->Type ." step\n"); } diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 204f86305..27dd8e7b3 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -381,9 +381,13 @@ if (!$VM->GetDomain()->IsPoweredOn()) FatalError("The VM is not powered on\n"); } +if ($Step->Type ne "single" and $Step->Type ne "suite") +{ + FatalError("Unexpected step type '". $Step->Type ."' found\n"); +} if ($Step->FileType ne "exe32" and $Step->FileType ne "exe64") { - FatalError("Unexpected file type '". $Step->FileType ."' found\n"); + FatalError("Unexpected file type '". $Step->FileType ."' found for ". $Step->Type ." step\n"); } diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl index ee4c8537a..6c0c923c9 100755 --- a/testbot/bin/WineRunWineTest.pl +++ b/testbot/bin/WineRunWineTest.pl @@ -382,10 +382,14 @@ if (!$VM->GetDomain()->IsPoweredOn()) FatalError("The VM is not powered on\n"); } +if ($Step->Type ne "build" and $Step->Type ne "suite") +{ + FatalError("Unexpected step type '". $Step->Type ."' found\n"); +} if (($Step->Type eq "suite" and $Step->FileType ne "none") or ($Step->Type ne "suite" and $Step->FileType ne "patch")) { - FatalError("Unexpected file type '". $Step->FileType ."' found\n"); + FatalError("Unexpected file type '". $Step->FileType ."' found for ". $Step->Type ." step\n"); } -- 2.18.0

1 0

[PATCH] testbot: Always recognize 'Task:' status lines in the logs
by Francois Gouget 21 Aug '18

21 Aug '18

This opens the door to standardizing the format of the status lines. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/LogUtils.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index e6f9a27af..d39c81b38 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -60,16 +60,16 @@ sub ParseTaskLog($$) foreach my $Line (<$LogFile>) { chomp $Line; - if ($Line =~ /^$ResultPrefix: ok$/) + if ($Line =~ /^(?:$ResultPrefix|Task): ok$/) { $Result ||= "ok"; } - elsif ($Line =~ /^$ResultPrefix: Patch failed to apply$/) + elsif ($Line =~ /^(?:$ResultPrefix|Task): Patch failed to apply$/) { $Result = "badpatch"; last; # Should be the last and most specific message } - elsif ($Line =~ /^$ResultPrefix: /) + elsif ($Line =~ /^(?:$ResultPrefix|Task): /) { $Result = "failed"; } -- 2.18.0

1 0

[PATCH 1/6] shell32: Remove alpha channel from 4-bit and 8-bit Internet icons
by Alex Henrie 21 Aug '18

21 Aug '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- I used Tango's raster icons for these bit depths, but forgot that they are only supposed to have a 1-bit transparency mask. Also, it turns out that it looks much better to take Tango's 32x32 Internet icon, scale it up, and then reduce the color depth, rather than taking the 48x48 icon, scaling it down, and reducing the color depth. This commit also includes that change. --- dlls/shell32/resources/internet.ico | Bin 78510 -> 76974 bytes dlls/shell32/resources/internet.svg | 373 ++++++++++++++++++++-------- 2 files changed, 274 insertions(+), 99 deletions(-) diff --git a/dlls/shell32/resources/internet.ico b/dlls/shell32/resources/internet.ico index cf326639b8a38894eab41af159f94ca982451589..7145da1423908508661725b37ae0d396cb54e899 100644 GIT binary patch delta 14870 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 OWRFYs`2WTpxBfR5+&M`A delta 14884 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 diff --git a/dlls/shell32/resources/internet.svg b/dlls/shell32/resources/internet.svg index 07b6e67e98..3d926f1d30 100644 --- a/dlls/shell32/resources/internet.svg +++ b/dlls/shell32/resources/internet.svg @@ -2120,7 +2120,86 @@ y="220" x="328" id="icon:48-8" - xlink:href="data:image/png;base64,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 ZWk+nudlRcARCkdo1lYX03uiD/FhXym7ur5HPO7y1n8eZfu6EnxfMecqfnTMo/O901nCk8kkyWQS E6j5IpZLhS+2+Vna6ADP83BdNwORTKV4/uV2zo6GaKkr40rfFeIzSW62d7ryxlYgxOHXO/Fm4zRV F6TFSEPXZZklPJVKEY/HOXxu5EYrnY/CwvViCN9XxBM+w9fGl0BMTk4x4hVRW1NJQczh/eOX0YG4 6e7JigBdXX+D9KR46bmXqC+NUVEYxfXSk8wHI3Co410e/+7rJPOb5+cAmf70bnSiBQjpS7T0CPwU 710Yzoh3XZeLlweJ2IKWujKOvX0Go1fegr/l1mJ39/eZm42LF/7+JVobiqkoinJpQjI7G894P5lM MjAygVNQi6/MkggsTiMpJYH00NLFSA8jPfomwHXdjF0Zn+PO1o2c6DjL3MwcHR0rnx/ccmcOYGjw XYqKNx8YujDA3fu2grBoKJTo+dWjUoofv3kOL1R6Y0MrCNJvZSogUAqjJEZJCHyM8kH5GCWRUrGp ymFg6Crn+4apadzOqc6zTIxN09VZJqB9RW0fane6bc+T5K6Kmt9+6AHaNhQwOTlJIpHk737SxWS0 GSccw6QXRPOmMVqD0aADjA4gUBidPgBZaJU5apTGpo3kR8Oc6DhLfCZBV1eZgAO31PShzwfa2h7D DtnmM59t5vP33cGh7lO80R8j5Qfc2ARKi8cYzGLxmU+FCQJCQlNXWURteSGDF69y6cwAgTGi653b P635SCc0O3Y8QjgWMTkxh5adG2jcvInxmSSD16YZvR7HdWV62WsWvK8xJg3g2FCaH6W8JJ+ywlxG BkbpOz1AMuFitC0OH/7Oh9LyS52RtbU9hrEsE3YcappqqG6oprS8iMDAbCKF70t8X2JbAscS5EQc HEswMXqd8SvjDPePoZQkUFp0d//gI2n4WE4pd+x4hHA4Cnb6rT4nN4e8gjzCsRC2baGkwvckiZkE yYQHlkFohJQBR458NOEfK8AHx86dX8VxbIRIb9EZk952sayAysoJnn/++V/FYz8Zn4z/l+O/AUIp xNBeLkr4AAAAFHRFWHRBdXRob3IASmFrdWIgU3RlaW5lcub79y8AAABYdEVYdENvcHlyaWdodABD QzAgUHVibGljIERvbWFpbiBEZWRpY2F0aW9uIGh0dHA6Ly9jcmVhdGl2ZWNvbW1vbnMub3JnL3B1 YmxpY2RvbWFpbi96ZXJvLzEuMC/G4735AAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE4LTA4LTE3VDIx OjU2OjA4LTA2OjAwMKhk9wAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxOC0wOC0xN1QyMTo1NjowOC0w NjowMEH13EsAAAAZdEVYdFNvZnR3YXJlAHd3dy5pbmtzY2FwZS5vcmeb7jwaAAAAIXRFWHRTb3Vy Y2UAaHR0cDovL2ppbW1hYy5tdXNpY2hhbGwuY3ppZuNeAAAAAElFTkSuQmCC " + xlink:href="data:image/png;base64,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 +" preserveAspectRatio="none" height="48" width="48" /> @@ -2128,7 +2207,86 @@ y="220" x="384" id="icon:48-4" - xlink:href="data:image/png;base64,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 JHhXMzW15djsNpJyVcjN4zQBKAoYcYPhwetc6LzM6ZfbMU2T8PKK6Ox8alsc3pVbyv37P4fDYcfu tMuYbuD3uymvLiEnz4vD7kDXdRYXlrg+OsHczDJ2p5WVFV0YMYOuru0Rf1cF3IoDBx5E01SEkIBE SoEQoChJSkpmOXny5O+j2ffwHv5f4r8AcHf64g75RHYAAAAUdEVYdEF1dGhvcgBKYWt1YiBTdGVp bmVy5vv3LwAAAFh0RVh0Q29weXJpZ2h0AENDMCBQdWJsaWMgRG9tYWluIERlZGljYXRpb24gaHR0 cDovL2NyZWF0aXZlY29tbW9ucy5vcmcvcHVibGljZG9tYWluL3plcm8vMS4wL8bjvfkAAAAldEVY dGRhdGU6Y3JlYXRlADIwMTgtMDgtMTdUMjE6NTY6MDktMDY6MDCW329DAAAAJXRFWHRkYXRlOm1v ZGlmeQAyMDE4LTA4LTE3VDIxOjU2OjA5LTA2OjAw54LX/wAAABl0RVh0U29mdHdhcmUAd3d3Lmlu a3NjYXBlLm9yZ5vuPBoAAAAhdEVYdFNvdXJjZQBodHRwOi8vamltbWFjLm11c2ljaGFsbC5jemlm 414AAAAASUVORK5CYII= " + xlink:href="data:image/png;base64,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 +" preserveAspectRatio="none" height="48" width="48" /> @@ -2459,47 +2617,43 @@ preserveAspectRatio="none" xlink:href="data:image/png;base64,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 -Mzk6MjYtMDY6MDB7C1PbAAAAAElFTkSuQmCC +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 +YII= " id="icon:32-8" x="480" @@ -2508,29 +2662,45 @@ Mzk6MjYtMDY6MDB7C1PbAAAAAElFTkSuQmCC width="32" height="32" preserveAspectRatio="none" - xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAMAAABEpIrGAAAABGdBTUEAALGPC/xhBQAAACBjSFJN -AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAABelBMVEUAAAAzM2YzM2ZERHdE -RHdERHdERHczRHdmd5kzM3czRGZERHdERHczRHdERGYzM2YzM3czM2ZERGYzRHczM2YzM2YzM2ZV -VYgzRGZVZogzM1UAAAAAAAAzM2YzM1UAAAAzM1UiM1UAAAAiIkQiIjMAAAAREREiM1UiIlUAABEA -AAAzM1UiIjMAAAAzM2ZERHeIiKq7zN3d7u7u7u7u///MzN2qqsyZqrvd3d3///+Zmaq7zO7M3e53 -iKpVVYjMzMy7zMyIiJmqu8yqzN3d3e5EVXd3d5m7u7uqqruqqqq7u8xVZojd7v/d3f+qu7t3iJnM -3f+ImbtmZoiImarM3d2IqrvM7v+qzO673e6Zu91VZmZ3mbtVd4iIqt2Iqsyqu92ZqsyZmZmZqqpE -Zoh3qsx3mcxEVWZmiKpmd5lmmcwzVYhmd4hmiLtEZpl3mapmd6pmmbtViLuImZlEd7tEZndEd6pV -d6qIiIiZu8xVd7tEZqozZpmImcxEd5kn8GoFAAAALnRSTlMAEVWq3e4RiO6IVYh3d0REEXfuqt3u -qu7u7mYRIpmZM6qqRIiZVWa7zHdm3ap3hPx+dwAAAAFiS0dEOdcAlUAAAAAHdElNRQfWBgwXJxrz -6+FgAAACRUlEQVQ4y62S7UPSQBzHEZhpWdkDPWFRJJVYw+1a3NjBzQGNIQELdSyCwFyIgISKPf/v -3W2wIHvZ993u89n3frubx/M/M+f1+RmW8fu8c//C8xdiGxwPXvLCqwVmcf4c9zJxAKEoiglJQijJ -XPyLX0oBgGVexJuKJKUzQMguzvCl10DlhFxGU1Cek3ic58HW5Sl+JSXKSIR8ARXeIMQpCV4EIHvV -5csMEMmKXCyQIE4mk5BHgVl2N8jRJaGIbAEBQAUIStfcAsq1eIbyQhngUk6GgHzT9XGFd4NwlSs4 -QTLOKLpOP/qt1xF8gohxpTwR7HkgD/B24oYj+MHmTlwq7zo78KKdooxL2k1HYMR42jCqVdKxW0YO -F0EC4krAEdgMwKZhSNUqInGF4judHTegWk7hBcmws+1wiIvv9XGDn6s3dsgaZxgfTLOptvbolFj9 -mBzP4Gua+xx9TTFNs163LIseAv7UPrg1PoeFtAWd4ma9sW9ZHYVw7bB22zs5ybQVd0brUtzp6RDj -Vv/ozuQylgbmZ5neAG5TPBzGMVaP23cnd0Eqmo0eBgCovR7Bw5OKqrZOkwH3Nsn/ZnZUCPdOhxSP -Rmeq9iXJ3AtOeHDlfuprEePu8NsJwaPvfU0rxR6EVoKuEHoYy8Pjw9HIxj/6pW7sUXhGCD9mu5Wf -vbNRv/9rkDzaYlcjU4KHCJEnT9nUoKbrevIgyz5bi1LB45mqCEfWVtcDLMsG1p+/iEZmuKtEonYI -ne6fKMQJEYskdJ7+sUhmVn4DYn6kFqJ4JssAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTctMTAtMTlU -MDA6MTQ6MDktMDY6MDCO1Rn8AAAAJXRFWHRkYXRlOm1vZGlmeQAyMDA2LTA2LTEzVDA1OjM5OjI2 -LTA2OjAwewtT2wAAAABJRU5ErkJggg== + xlink:href="data:image/png;base64,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 +YII= " id="icon:32-4" x="520" @@ -2565,26 +2735,25 @@ MdodlQAAAABJRU5ErkJggg== height="16" preserveAspectRatio="none" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAABGdBTUEAALGPC/xhBQAAACBjSFJN -AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAACFlBMVEUAAABYdqBYdqBbeqRa -eqRZeKJYd6JaeqRYd6FeeqNZeaNaeqRWcZ1hf6ZaeaNphKlaeqRie6Nwiq1aeqRjgKhaeqRaeqRe -faZjf6hifKVhf6hRaZRZeaNLYYlpg6ZZd6AQEiFXb5Vadp9aeaNZeKJYdJ1XdZ+Dm7u7ydrc5O3m -6/TV3+uxwtZ+l7mxwNXg5evP2eK6v8S+y9q+1Ou+ytbZ4emjts6vv9Te4ufO0dPi7/7e7fvU5fa8 -yNTAxs7b3uDm6/CgtM2Bmrrw9Pjj5OXK1d/i8f/j8f/a6vrGz9jX2dv09PX7+/vV3+l5lLa1xdjg -4+TM3e/g7//h8P/a6/zHzdK+x9Cktcm1vsjk5uijuNDU3emqvtPM4/re7v/f7//O2+r9/f3+/v7i -5Obc3d+8zd9beqTb5O+syum81/LJ4fnV6PzS5fnIz9X5+fmutbzD0uPM2ee3ws3IztSzzOi10e6x -zuypvNH4+fnx8vPv7+/O0NG4yd2rvdPc4eXf4eOivdqcveCTttyEpsqLp8f19fXi4uKdpq6ds816 -lbfW3+nt7u+Dp86Ap9F1n8tslsXg4ODT09Olt8l1kbWcssvc4+n29va4v8Zxm8lrlsZij8FZiLzR -0dG8xMyUrMhdfaaasMvM1+JtkLdcir1WhrpPgLZWhbezwdCTq8d3kraftM63yNy+z+G0x9ybssx1 -kbRaeaT///97RkPcAAAAJ3RSTlMAZ833/vO9YTDoyi41/uzxx4Totv3q/P3lk/NQ7ln51gam7v77 -2WeTE3hRAAAAAWJLR0SxNGOeUgAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB9UKCAYiLJDE -QQMAAADrSURBVBjTY2AAAkYmZhZWNnYGKODgVNfQ1NLW0eXiBvN5ePX0DQyNjE1MzfjAIvzmFpZW -1ja2dvYOjgJAvqCTs4urm7uHp5e3j68f0Bwh/4DAoODgkNCw8IjIKGEGBpHomNi4+PiExKTE5JRU -UQaGtPSMzKzsnNykpKS8/AIxBgbxwqLiktKy8orKpKrqGqAKidq6pPqGxqbmlta29g6gGZKdXUlJ -3T29ff0TJk6aDHKt1JSp06bPmDlr9py580DuYJCev2DhosVLli5bvkIG4nZZuZWrVq9Zu269PDfU -dwqKSsobVFTVGLACAPRHQQF1AQg/AAAANXRFWHRDb21tZW50AChjKSAyMDA0IEpha3ViIFN0ZWlu -ZXIKCkNyZWF0ZWQgd2l0aCBUaGUgR0lNUJDZi28AAAAldEVYdGRhdGU6Y3JlYXRlADIwMTctMTAt -MTlUMDA6MTQ6MDktMDY6MDCO1Rn8AAAAJXRFWHRkYXRlOm1vZGlmeQAyMDA1LTEwLTA4VDEyOjM0 -OjQ0LTA2OjAwI8daAAAAAABJRU5ErkJggg== +AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAB+1BMVEUAAABYdqBaeqRYd6FW +cZ1RaZRLYYkQEiFXdZ9YdqBbeqRaeqRZeKJYd6JeeqODm7u7ydrc5O3m6/TV3+uxwtZ+l7lZeaNh +f6axwNXg5evP2eK6v8S+y9q+1Ou+ytbZ4emjts5aeaNphKmvv9Te4ufO0dPi7/7e7fvU5fa8yNTA +xs7b3uDm6/CgtM1ie6OBmrrw9Pjj5OXK1d/i8f/j8f/a6vrGz9jX2dv09PX7+/vV3+l5lLZwiq21 +xdjg4+TM3e/g7//h8P/a6/zHzdK+x9Cktcm1vsjk5uijuNBjgKjU3emqvtPM4/re7v/f7//O2+r9 +/f3+/v7i5Obc3d+8zd/b5O+syum81/LJ4fnV6PzS5fnIz9X5+fmutbzD0uNefabM2ee3ws3IztSz +zOi10e6xzuypvNH4+fnx8vPv7+/O0NG4yd1jf6irvdPc4eXf4eOivdqcveCTttyEpsqLp8f19fXi +4uKdpq6ds81ifKV6lbfW3+nt7u+Dp86Ap9F1n8tslsXg4ODT09Olt8l1kbVhf6icssvc4+n29va4 +v8Zxm8lrlsZij8FZiLzR0dG8xMyUrMhdfaaasMvM1+JtkLdcir1WhrpPgLZWhbezwdCTq8dpg6Z3 +kraftM63yNy+z+G0x9ybssx1kbRZd6BXb5Vadp9aeaRYdJ3///8MrB2GAAAACXRSTlMAAAAAAAAA +AABzZJuhAAAAAWJLR0SoUAg2kgAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB9UKCAYiLJDE +QQMAAADjSURBVBjTY2AAAkZOLm4eXiYGKGDm4xcQFBIWERWDCLGIS0hKScvIyskrKIJFlJRVVNXU +NTS1tHV0uYF8PX0DQyNjE1MzcwtLK2ugEhtbO3sHR0cnZxdXN3cPoBJPL28fXz8//4DAgKDgEKAA +V2hYeERkVHRgYGBMbBxQID4hMSk5JTUtPSMwMysbKJCTmxeYX1BYVFxSWlZeARSorKoODKypratv +aGxqbgE5pLWtvaOzq7unt69/AsgdDKwTJ02eMnXa9BkzZ0HdzjZ7ztx58xcsXLQY5j32JUsVl/Es +52DACgAVCzqJEii+ZQAAADV0RVh0Q29tbWVudAAoYykgMjAwNCBKYWt1YiBTdGVpbmVyCgpDcmVh +dGVkIHdpdGggVGhlIEdJTVCQ2YtvAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE3LTEwLTE5VDAwOjE0 +OjA5LTA2OjAwjtUZ/AAAACV0RVh0ZGF0ZTptb2RpZnkAMjAwNS0xMC0wOFQxMjozNDo0NC0wNjow +MCPHWgAAAAAASUVORK5CYII= " id="icon:16-8" x="584" @@ -2594,19 +2763,25 @@ OjQ0LTA2OjAwI8daAAAAAABJRU5ErkJggg== height="16" preserveAspectRatio="none" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAABGdBTUEAALGPC/xhBQAAACBjSFJN -AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAqFBMVEUAAAARESJVd5lVd5lV -d6pVd6pVd6pVd5lmd6pVd6pVd6pmiKpmd6p3iKpmd6pmd6pVZplEZohVd5lVd5lVd5lVd6qImbu7 -zN3d3e7u7u6qu913mbtmd6rM3d27u8y7zO6qu8zMzMzd7v/M3e67zMzd3d2Zu8zu7v/MzN3////d -7u5miKrM3f+qzO673e6qu7uZu92IqsyZqqp3mcxmmcyZqsxmiLtViLtAZtkKAAAAFXRSTlMAAGbM -7rtmM+7MM+6I7t2ZVVXdqu79Lj6bAAAAAWJLR0QpyreFJAAAAAlwSFlzAAALEwAACxMBAJqcGAAA -AAd0SU1FB9UKCAYiLJDEQQMAAADFSURBVBjTbY/bVsJADEUjFgW8oOCQTIdO59IUIkWpMPD/f+ZU -eHS/7bOyThKAzOheqWL8ADceJyskTaWZzq6+LqmyWCO54i95cuRDiE3Dup1mf15tuAohbFkLmdzz -ghyzB984++nGALvouuxRRIixAFC0/+pCt82BfKMCWEfr63rvRIv2w8SrY+HycOh7zT9t7pgbEtF9 -fzyxd8MWmCTS9ng6X3yThjvgTaXqfMnYdL0U3nemRcRkFrPbd3fLD6XUYgT/8gsgyBahFA1FIAAA -ADV0RVh0Q29tbWVudAAoYykgMjAwNCBKYWt1YiBTdGVpbmVyCgpDcmVhdGVkIHdpdGggVGhlIEdJ -TVCQ2YtvAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE3LTEwLTE5VDAwOjE0OjA5LTA2OjAwjtUZ/AAA -ACV0RVh0ZGF0ZTptb2RpZnkAMjAwNS0xMC0wOFQxMjozNDo0NC0wNjowMCPHWgAAAAAASUVORK5C -YII= +AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAB+1BMVEUAAABYdqBaeqRYd6FW +cZ1RaZRLYYkQEiFXdZ9YdqBbeqRaeqRZeKJYd6JeeqODm7u7ydrc5O3m6/TV3+uxwtZ+l7lZeaNh +f6axwNXg5evP2eK6v8S+y9q+1Ou+ytbZ4emjts5aeaNphKmvv9Te4ufO0dPi7/7e7fvU5fa8yNTA +xs7b3uDm6/CgtM1ie6OBmrrw9Pjj5OXK1d/i8f/j8f/a6vrGz9jX2dv09PX7+/vV3+l5lLZwiq21 +xdjg4+TM3e/g7//h8P/a6/zHzdK+x9Cktcm1vsjk5uijuNBjgKjU3emqvtPM4/re7v/f7//O2+r9 +/f3+/v7i5Obc3d+8zd/b5O+syum81/LJ4fnV6PzS5fnIz9X5+fmutbzD0uNefabM2ee3ws3IztSz +zOi10e6xzuypvNH4+fnx8vPv7+/O0NG4yd1jf6irvdPc4eXf4eOivdqcveCTttyEpsqLp8f19fXi +4uKdpq6ds81ifKV6lbfW3+nt7u+Dp86Ap9F1n8tslsXg4ODT09Olt8l1kbVhf6icssvc4+n29va4 +v8Zxm8lrlsZij8FZiLzR0dG8xMyUrMhdfaaasMvM1+JtkLdcir1WhrpPgLZWhbezwdCTq8dpg6Z3 +kraftM63yNy+z+G0x9ybssx1kbRZd6BXb5Vadp9aeaRYdJ3///8MrB2GAAAACXRSTlMAAAAAAAAA +AABzZJuhAAAAAWJLR0SoUAg2kgAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB9UKCAYiLJDE +QQMAAADjSURBVBjTY2AAAkZOLm4eXiYGKGDm4xcQFBIWERWDCLGIS0hKScvIyskrKIJFlJRVVNXU +NTS1tHV0uYF8PX0DQyNjE1MzcwtLK2ugEhtbO3sHR0cnZxdXN3cPoBJPL28fXz8//4DAgKDgEKAA +V2hYeERkVHRgYGBMbBxQID4hMSk5JTUtPSMwMysbKJCTmxeYX1BYVFxSWlZeARSorKoODKypratv +aGxqbgE5pLWtvaOzq7unt69/AsgdDKwTJ02eMnXa9BkzZ0HdzjZ7ztx58xcsXLQY5j32JUsVl/Es +52DACgAVCzqJEii+ZQAAADV0RVh0Q29tbWVudAAoYykgMjAwNCBKYWt1YiBTdGVpbmVyCgpDcmVh +dGVkIHdpdGggVGhlIEdJTVCQ2YtvAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE3LTEwLTE5VDAwOjE0 +OjA5LTA2OjAwjtUZ/AAAACV0RVh0ZGF0ZTptb2RpZnkAMjAwNS0xMC0wOFQxMjozNDo0NC0wNjow +MCPHWgAAAAAASUVORK5CYII= " id="icon:16-4" x="608" -- 2.18.0

1 5

[PATCH] odbccp32: Implement SQLValidDSN/W
by Alistair Leslie-Hughes 21 Aug '18

21 Aug '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/odbccp32/odbccp32.c | 25 ++++++++++++++----- dlls/odbccp32/tests/misc.c | 61 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 80 insertions(+), 6 deletions(-) diff --git a/dlls/odbccp32/odbccp32.c b/dlls/odbccp32/odbccp32.c index c2342e6..5ef8336 100644 --- a/dlls/odbccp32/odbccp32.c +++ b/dlls/odbccp32/odbccp32.c @@ -29,6 +29,7 @@ #include "winbase.h" #include "winreg.h" #include "winnls.h" +#include "sqlext.h" #include "wine/unicode.h" #include "wine/debug.h" #include "wine/heap.h" @@ -1553,18 +1554,30 @@ BOOL WINAPI SQLSetConfigMode(UWORD wConfigMode) BOOL WINAPI SQLValidDSNW(LPCWSTR lpszDSN) { + static const WCHAR invalid[] = {'[',']','{','}','(',')',',',';','?','*','=','!','@','\\',0}; clear_errors(); - FIXME("%s\n", debugstr_w(lpszDSN)); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + TRACE("%s\n", debugstr_w(lpszDSN)); + + if(strlenW(lpszDSN) > SQL_MAX_DSN_LENGTH || strpbrkW(lpszDSN, invalid) != NULL) + { + return FALSE; + } + + return TRUE; } BOOL WINAPI SQLValidDSN(LPCSTR lpszDSN) { + static const char *invalid = "[]{}(),;?*=!@\\"; clear_errors(); - FIXME("%s\n", debugstr_a(lpszDSN)); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + TRACE("%s\n", debugstr_a(lpszDSN)); + + if(strlen(lpszDSN) > SQL_MAX_DSN_LENGTH || strpbrk(lpszDSN, invalid) != NULL) + { + return FALSE; + } + + return TRUE; } BOOL WINAPI SQLWriteDSNToIniW(LPCWSTR lpszDSN, LPCWSTR lpszDriver) diff --git a/dlls/odbccp32/tests/misc.c b/dlls/odbccp32/tests/misc.c index be3873ac..dc65bdf 100644 --- a/dlls/odbccp32/tests/misc.c +++ b/dlls/odbccp32/tests/misc.c @@ -682,6 +682,65 @@ static void test_SQLGetInstalledDrivers(void) SQLRemoveDriver("Wine test", TRUE, NULL); } +static void test_SQLValidDSN(void) +{ + static const char *invalid = "[]{}(),;?*=!@\\"; + char str[10]; + int i; + BOOL ret; + + strcpy(str, "wine10"); + for(i = 0; i < strlen(invalid); i++) + { + str[4] = invalid[i]; + ret = SQLValidDSN(str); + ok(!ret, "got %d\n", ret); + } + + /* Too large */ + ret = SQLValidDSN("Wine123456789012345678901234567890"); + ok(!ret, "got %d\n", ret); + + /* Valid with a space */ + ret = SQLValidDSN("Wine Vinegar"); + ok(ret, "got %d\n", ret); + + /* Max DSN name value */ + ret = SQLValidDSN("12345678901234567890123456789012"); + ok(ret, "got %d\n", ret); +} + +static void test_SQLValidDSNW(void) +{ + static const WCHAR invalid[] = {'[',']','{','}','(',')',',',';','?','*','=','!','@','\\',0}; + static const WCHAR value[] = { 'w','i','n','e','1','0',0}; + static const WCHAR too_large[] = { 'W','i','n','e','1','2','3','4','5','6','7','8','9','0','1','2','3','4','5', + '6','7','8','9','0','1','2','3','4','5','6','7','8','9','0', 0}; + static const WCHAR with_space[] = { 'W','i','n','e',' ','V','i','n','e','g','a','r', 0}; + static const WCHAR max_dsn[] = { '1','2','3','4','5','6','7','8','9','0','1','2','3','4','5','6','7','8','9','0', + '1','2','3','4','5','6','7','8','9','0','1','2', 0}; + WCHAR str[10]; + int i; + BOOL ret; + + lstrcpyW(str, value); + for(i = 0; i < lstrlenW(invalid); i++) + { + str[4] = invalid[i]; + ret = SQLValidDSNW(str); + ok(!ret, "got %d\n", ret); + } + + ret = SQLValidDSNW(too_large); + ok(!ret, "got %d\n", ret); + + ret = SQLValidDSNW(with_space); + ok(ret, "got %d\n", ret); + + ret = SQLValidDSNW(max_dsn); + ok(ret, "got %d\n", ret); +} + START_TEST(misc) { test_SQLConfigMode(); @@ -693,4 +752,6 @@ START_TEST(misc) test_SQLInstallDriverEx(); test_SQLInstallTranslatorEx(); test_SQLGetInstalledDrivers(); + test_SQLValidDSN(); + test_SQLValidDSNW(); } -- 1.9.1

1 0

[PATCH v3] regedit: Dont expand items on initial tree creation.
by Alistair Leslie-Hughes 20 Aug '18

20 Aug '18

The Message TVM_EXPAND is captured in treeview_notify, then passes g_pChildWnd->hTreeWnd on to OnTreeExpanding which hasn't been initialized yet. The function get_last_key is already called after the hTreeWnd has been assigned to select the previous selected item (if it exists). Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- programs/regedit/childwnd.c | 15 ++++++++++----- programs/regedit/treeview.c | 3 --- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/programs/regedit/childwnd.c b/programs/regedit/childwnd.c index d8431f1..aa690f9 100644 --- a/programs/regedit/childwnd.c +++ b/programs/regedit/childwnd.c @@ -240,16 +240,21 @@ static void get_last_key(HWND hwndTV) if (RegCreateKeyExW(HKEY_CURRENT_USER, wszKeyName, 0, NULL, 0, KEY_READ, NULL, &hkey, NULL) == ERROR_SUCCESS) { + HTREEITEM selection = NULL; if (RegQueryValueExW(hkey, wszLastKey, NULL, NULL, (LPBYTE)wszVal, &dwSize) == ERROR_SUCCESS) { - HTREEITEM selection; - if (!strcmpW(wszVal, g_pChildWnd->szPath)) - selection = (HTREEITEM)SendMessageW(g_pChildWnd->hTreeWnd, TVM_GETNEXTITEM, TVGN_ROOT, 0); - else + if (strcmpW(wszVal, g_pChildWnd->szPath)) selection = FindPathInTree(hwndTV, wszVal); - SendMessageW(hwndTV, TVM_SELECTITEM, TVGN_CARET, (LPARAM)selection); } + if(!selection) + { + selection = (HTREEITEM)SendMessageW(g_pChildWnd->hTreeWnd, TVM_GETNEXTITEM, TVGN_ROOT, 0); + SendMessageW(hwndTV, TVM_EXPAND, TVE_EXPAND, (LPARAM)selection ); + } + else + SendMessageW(hwndTV, TVM_SELECTITEM, TVGN_CARET, (LPARAM)selection); + RegCloseKey(hkey); } } diff --git a/programs/regedit/treeview.c b/programs/regedit/treeview.c index d5a6767..15a5136 100644 --- a/programs/regedit/treeview.c +++ b/programs/regedit/treeview.c @@ -572,9 +572,6 @@ static BOOL InitTreeViewItems(HWND hwndTV, LPWSTR pHostName) if (!AddEntryToTree(hwndTV, hRoot, hkcc, HKEY_CURRENT_CONFIG, 1)) return FALSE; if (!AddEntryToTree(hwndTV, hRoot, hkdd, HKEY_DYN_DATA, 1)) return FALSE; - /* expand and select host name */ - SendMessageW(hwndTV, TVM_EXPAND, TVE_EXPAND, (LPARAM)hRoot ); - SendMessageW(hwndTV, TVM_SELECTITEM, TVGN_CARET, (LPARAM)hRoot); return TRUE; } -- 1.9.1

1 0

[PATCH] dmusic: Fake success in two stub midi port methods
by Michael Stefaniuc 20 Aug '18

20 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- This lets MidiStation start. 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 9a18c8844d..1fa94694a9 100644 --- a/dlls/dmusic/port.c +++ b/dlls/dmusic/port.c @@ -977,7 +977,7 @@ static HRESULT WINAPI midi_IDirectMusicPort_SetReadNotificationHandle(IDirectMus { FIXME("(%p, %p) stub!\n", iface, event); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI midi_IDirectMusicPort_Read(IDirectMusicPort *iface, @@ -1164,7 +1164,7 @@ static HRESULT WINAPI midi_IDirectMusicThru_ThruChannel(IDirectMusicThru *iface, FIXME("(%p, %u, %u, %u, %u, %p) stub!\n", iface, src_group, src_channel, dest_group, dest_channel, dest_port); - return E_NOTIMPL; + return S_OK; } static const IDirectMusicThruVtbl midi_thru_vtbl = { -- 2.14.4

1 0

Wine staging 3.14 release
by Alistair Leslie-Hughes 20 Aug '18

20 Aug '18

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary of the past few weeks * Rebased to current wine 3.14 (880 patches are applied to wine vanilla) * Reviewed and upstreamed patches. Updated patchsets * Corrected regression with sound not playing in Star Craft 2 * Updated ntdll-futex-condition-var Added * [41573] Stop a crash in Battle.Net. * [45524] Speed Improvements in Tital Fall 2. * [45568] dinput8 to share code with dinput. * [45327] Improvements to support for League of Legends. * [45550] Correct NtQuerySystemInformation implementation. * [45570] Refactor LdrInitializeThunk. * [45571] Allow hooking of NtCreateThreadEx. Where can you help * Run Steam/Battle.net/UPlay. * Try you favorite game: League of Legends, Titan Fall 2 * Test your favorite applications. * Steal staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

1 0

[PATCH 1/6] include: Fix definition of RAWHID.
by Zebediah Figura 20 Aug '18

20 Aug '18

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- include/winuser.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/winuser.h b/include/winuser.h index 8489d05..d09f8cd 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -486,7 +486,7 @@ typedef struct tagRAWINPUTDEVICELIST typedef struct tagRAWHID { DWORD dwSizeHid; DWORD dwCount; - BYTE bRawData; + BYTE bRawData[1]; } RAWHID, *LPRAWHID; typedef struct tagRAWKEYBOARD { -- 2.7.4

1 5

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

20 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/cmd/batch.c | 2 +- programs/cmd/builtins.c | 150 ++++++++++++++++++++--------------------------- programs/cmd/directory.c | 12 ++-- programs/cmd/wcmdmain.c | 66 ++++++++++----------- 4 files changed, 102 insertions(+), 128 deletions(-) diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c index 1a78b55557..14e2539bf7 100644 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -599,7 +599,7 @@ void WCMD_HandleTildaModifiers(WCHAR **start, BOOL atExecute) if (memchrW(firstModifier, 's', modifierLen) != NULL) { if (finaloutput[0] != 0x00) strcatW(finaloutput, spaceW); /* Don't flag as doneModifier - %~s on its own is processed later */ - GetShortPathNameW(outputparam, outputparam, sizeof(outputparam)/sizeof(outputparam[0])); + GetShortPathNameW(outputparam, outputparam, ARRAY_SIZE(outputparam)); } /* 5. Handle 'f' : Fully qualified path (File doesn't have to exist) */ diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 088632f214..1da61556d9 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -191,12 +191,12 @@ static BOOL WCMD_ask_confirm (const WCHAR *message, BOOL showSureText, /* Load the translated valid answers */ if (showSureText) - LoadStringW(hinst, WCMD_CONFIRM, confirm, sizeof(confirm)/sizeof(WCHAR)); + LoadStringW(hinst, WCMD_CONFIRM, confirm, ARRAY_SIZE(confirm)); msgid = optionAll ? WCMD_YESNOALL : WCMD_YESNO; - LoadStringW(hinst, msgid, options, sizeof(options)/sizeof(WCHAR)); - LoadStringW(hinst, WCMD_YES, Ybuffer, sizeof(Ybuffer)/sizeof(WCHAR)); - LoadStringW(hinst, WCMD_NO, Nbuffer, sizeof(Nbuffer)/sizeof(WCHAR)); - LoadStringW(hinst, WCMD_ALL, Abuffer, sizeof(Abuffer)/sizeof(WCHAR)); + LoadStringW(hinst, msgid, options, ARRAY_SIZE(options)); + LoadStringW(hinst, WCMD_YES, Ybuffer, ARRAY_SIZE(Ybuffer)); + LoadStringW(hinst, WCMD_NO, Nbuffer, ARRAY_SIZE(Nbuffer)); + LoadStringW(hinst, WCMD_ALL, Abuffer, ARRAY_SIZE(Abuffer)); /* Loop waiting on a valid answer */ if (optionAll) @@ -207,7 +207,7 @@ static BOOL WCMD_ask_confirm (const WCHAR *message, BOOL showSureText, if (showSureText) WCMD_output_asis (confirm); WCMD_output_asis (options); - WCMD_ReadFile(GetStdHandle(STD_INPUT_HANDLE), answer, sizeof(answer)/sizeof(WCHAR), &count); + WCMD_ReadFile(GetStdHandle(STD_INPUT_HANDLE), answer, ARRAY_SIZE(answer), &count); answer[0] = toupperW(answer[0]); if (answer[0] == Ybuffer[0]) return TRUE; @@ -370,8 +370,8 @@ void WCMD_choice (const WCHAR * args) { /* use default keys, when needed: localized versions of "Y"es and "No" */ if (!opt_c) { - LoadStringW(hinst, WCMD_YES, buffer, sizeof(buffer)/sizeof(WCHAR)); - LoadStringW(hinst, WCMD_NO, buffer + 1, sizeof(buffer)/sizeof(WCHAR) - 1); + LoadStringW(hinst, WCMD_YES, buffer, ARRAY_SIZE(buffer)); + LoadStringW(hinst, WCMD_NO, buffer + 1, ARRAY_SIZE(buffer) - 1); opt_c = buffer; buffer[2] = 0; } @@ -793,8 +793,8 @@ void WCMD_copy(WCHAR * args) { /* If COPYCMD is set, then we force the overwrite with /Y and ask for * confirmation with /-Y. If COPYCMD is neither of those, then we use the * default behavior. */ - len = GetEnvironmentVariableW(copyCmdW, copycmd, sizeof(copycmd)/sizeof(WCHAR)); - if (len && len < (sizeof(copycmd)/sizeof(WCHAR))) { + len = GetEnvironmentVariableW(copyCmdW, copycmd, ARRAY_SIZE(copycmd)); + if (len && len < ARRAY_SIZE(copycmd)) { if (!lstrcmpiW (copycmd, parmY)) prompt = FALSE; else if (!lstrcmpiW (copycmd, parmNoY)) @@ -825,7 +825,7 @@ void WCMD_copy(WCHAR * args) { WINE_TRACE("Destination supplied, processing to see if file or directory\n"); /* Convert to fully qualified path/filename */ - GetFullPathNameW(destination->name, sizeof(destname)/sizeof(WCHAR), destname, &filenamepart); + GetFullPathNameW(destination->name, ARRAY_SIZE(destname), destname, &filenamepart); WINE_TRACE("Full dest name is '%s'\n", wine_dbgstr_w(destname)); /* If parameter is a directory, ensure it ends in \ */ @@ -907,7 +907,7 @@ void WCMD_copy(WCHAR * args) { /* Convert to fully qualified path/filename in srcpath, file filenamepart pointing to where the filename portion begins (used for wildcard expansion). */ - GetFullPathNameW(thiscopy->name, sizeof(srcpath)/sizeof(WCHAR), srcpath, &filenamepart); + GetFullPathNameW(thiscopy->name, ARRAY_SIZE(srcpath), srcpath, &filenamepart); WINE_TRACE("Full src name is '%s'\n", wine_dbgstr_w(srcpath)); /* If parameter is a directory, ensure it ends in \* */ @@ -917,7 +917,7 @@ void WCMD_copy(WCHAR * args) { /* We need to know where the filename part starts, so append * and recalculate the full resulting path */ strcatW(thiscopy->name, starW); - GetFullPathNameW(thiscopy->name, sizeof(srcpath)/sizeof(WCHAR), srcpath, &filenamepart); + GetFullPathNameW(thiscopy->name, ARRAY_SIZE(srcpath), srcpath, &filenamepart); WINE_TRACE("Directory, so full name is now '%s'\n", wine_dbgstr_w(srcpath)); } else if ((strpbrkW(srcpath, wildcardsW) == NULL) && @@ -927,7 +927,7 @@ void WCMD_copy(WCHAR * args) { /* We need to know where the filename part starts, so append \* and recalculate the full resulting path */ strcatW(thiscopy->name, slashstarW); - GetFullPathNameW(thiscopy->name, sizeof(srcpath)/sizeof(WCHAR), srcpath, &filenamepart); + GetFullPathNameW(thiscopy->name, ARRAY_SIZE(srcpath), srcpath, &filenamepart); WINE_TRACE("Directory, so full name is now '%s'\n", wine_dbgstr_w(srcpath)); } @@ -1216,7 +1216,7 @@ static BOOL WCMD_delete_confirm_wildcard(const WCHAR *filename, BOOL *pPrompted) WCHAR fpath[MAX_PATH]; /* Convert path into actual directory spec */ - GetFullPathNameW(filename, sizeof(fpath)/sizeof(WCHAR), fpath, NULL); + GetFullPathNameW(filename, ARRAY_SIZE(fpath), fpath, NULL); WCMD_splitpath(fpath, drive, dir, fname, ext); /* Only prompt for * and *.*, not *a, a*, *.a* etc */ @@ -1351,7 +1351,7 @@ static BOOL WCMD_delete_one (const WCHAR *thisArg) { WCHAR ext[MAX_PATH]; /* Convert path into actual directory spec */ - GetFullPathNameW(argCopy, sizeof(thisDir)/sizeof(WCHAR), thisDir, NULL); + GetFullPathNameW(argCopy, ARRAY_SIZE(thisDir), thisDir, NULL); WCMD_splitpath(thisDir, drive, dir, fname, ext); strcpyW(thisDir, drive); @@ -1598,16 +1598,13 @@ static void WCMD_part_execute(CMD_LIST **cmdList, const WCHAR *firstcmd, /* End of the command - does 'ELSE ' follow as the next command? */ } else { - if (isIF - && WCMD_keyword_ws_found(ifElse, sizeof(ifElse)/sizeof(ifElse[0]), - (*cmdList)->command)) { - + if (isIF && WCMD_keyword_ws_found(ifElse, ARRAY_SIZE(ifElse), (*cmdList)->command)) { /* Swap between if and else processing */ processThese = !executecmds; /* Process the ELSE part */ if (processThese) { - const int keyw_len = sizeof(ifElse)/sizeof(ifElse[0]) + 1; + const int keyw_len = ARRAY_SIZE(ifElse) + 1; WCHAR *cmd = ((*cmdList)->command) + keyw_len; /* Skip leading whitespace between condition and the command */ @@ -1692,39 +1689,35 @@ static BOOL WCMD_parse_forf_options(WCHAR *options, WCHAR *eol, int *skip, /* Save End of line character (Ignore line if first token (based on delims) starts with it) */ } else if (CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, - pos, sizeof(eolW)/sizeof(WCHAR), - eolW, sizeof(eolW)/sizeof(WCHAR)) == CSTR_EQUAL) { - *eol = *(pos + sizeof(eolW)/sizeof(WCHAR)); - pos = pos + sizeof(eolW)/sizeof(WCHAR) + 1; + pos, ARRAY_SIZE(eolW), eolW, ARRAY_SIZE(eolW)) == CSTR_EQUAL) { + *eol = *(pos + ARRAY_SIZE(eolW)); + pos = pos + ARRAY_SIZE(eolW) + 1; WINE_TRACE("Found eol as %c(%x)\n", *eol, *eol); /* Save number of lines to skip (Can be in base 10, hex (0x...) or octal (0xx) */ } else if (CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, - pos, sizeof(skipW)/sizeof(WCHAR), - skipW, sizeof(skipW)/sizeof(WCHAR)) == CSTR_EQUAL) { + pos, ARRAY_SIZE(skipW), skipW, ARRAY_SIZE(skipW)) == CSTR_EQUAL) { WCHAR *nextchar = NULL; - pos = pos + sizeof(skipW)/sizeof(WCHAR); + pos = pos + ARRAY_SIZE(skipW); *skip = strtoulW(pos, &nextchar, 0); WINE_TRACE("Found skip as %d lines\n", *skip); pos = nextchar; /* Save if usebackq semantics are in effect */ - } else if (CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, - pos, sizeof(usebackqW)/sizeof(WCHAR), - usebackqW, sizeof(usebackqW)/sizeof(WCHAR)) == CSTR_EQUAL) { + } else if (CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, pos, + ARRAY_SIZE(usebackqW), usebackqW, ARRAY_SIZE(usebackqW)) == CSTR_EQUAL) { *usebackq = TRUE; - pos = pos + sizeof(usebackqW)/sizeof(WCHAR); + pos = pos + ARRAY_SIZE(usebackqW); WINE_TRACE("Found usebackq\n"); /* Save the supplied delims. Slightly odd as space can be a delimiter but only if you finish the optionsroot string with delims= otherwise the space is just a token delimiter! */ } else if (CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, - pos, sizeof(delimsW)/sizeof(WCHAR), - delimsW, sizeof(delimsW)/sizeof(WCHAR)) == CSTR_EQUAL) { + pos, ARRAY_SIZE(delimsW), delimsW, ARRAY_SIZE(delimsW)) == CSTR_EQUAL) { int i=0; - pos = pos + sizeof(delimsW)/sizeof(WCHAR); + pos = pos + ARRAY_SIZE(delimsW); while (*pos && *pos != ' ') { delims[i++] = *pos; pos++; @@ -1735,11 +1728,10 @@ static BOOL WCMD_parse_forf_options(WCHAR *options, WCHAR *eol, int *skip, /* Save the tokens being requested */ } else if (CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, - pos, sizeof(tokensW)/sizeof(WCHAR), - tokensW, sizeof(tokensW)/sizeof(WCHAR)) == CSTR_EQUAL) { + pos, ARRAY_SIZE(tokensW), tokensW, ARRAY_SIZE(tokensW)) == CSTR_EQUAL) { int i=0; - pos = pos + sizeof(tokensW)/sizeof(WCHAR); + pos = pos + ARRAY_SIZE(tokensW); while (*pos && *pos != ' ') { tokens[i++] = *pos; pos++; @@ -2086,7 +2078,7 @@ static HANDLE WCMD_forf_getinputhandle(BOOL usebackq, WCHAR *itemstr, BOOL iscmd if (iscmd) { /* Get temp filename */ - GetTempPathW(sizeof(temp_str)/sizeof(WCHAR), temp_str); + GetTempPathW(ARRAY_SIZE(temp_str), temp_str); GetTempFileNameW(temp_str, cmdW, 0, temp_file); /* Redirect output to the temporary file */ @@ -2170,7 +2162,7 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { /* When recursing directories, use current directory as the starting point unless subsequently overridden */ doRecurse = (toupperW(*thisArg) == 'R'); - if (doRecurse) GetCurrentDirectoryW(sizeof(optionsRoot)/sizeof(WCHAR), optionsRoot); + if (doRecurse) GetCurrentDirectoryW(ARRAY_SIZE(optionsRoot), optionsRoot); doFileset = (toupperW(*thisArg) == 'F'); @@ -2227,8 +2219,7 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { thisArg = WCMD_parameter(p, parameterNo++, NULL, FALSE, FALSE); if (!thisArg || !(CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, - thisArg, sizeof(inW)/sizeof(inW[0]), inW, - sizeof(inW)/sizeof(inW[0])) == CSTR_EQUAL)) { + thisArg, ARRAY_SIZE(inW), inW, ARRAY_SIZE(inW)) == CSTR_EQUAL)) { WCMD_output_stderr (WCMD_LoadMessage(WCMD_SYNTAXERR)); return; } @@ -2253,9 +2244,7 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { /* Syntax error if missing close bracket, or nothing following it and once we have the complete set, we expect a DO */ WINE_TRACE("Looking for 'do ' in %p\n", *cmdList); - if ((*cmdList == NULL) - || !WCMD_keyword_ws_found(doW, sizeof(doW)/sizeof(doW[0]), (*cmdList)->command)) { - + if ((*cmdList == NULL) || !WCMD_keyword_ws_found(doW, ARRAY_SIZE(doW), (*cmdList)->command)) { WCMD_output_stderr (WCMD_LoadMessage(WCMD_SYNTAXERR)); return; } @@ -2418,7 +2407,7 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { } else { /* Read line by line until end of file */ - while (WCMD_fgets(buffer, sizeof(buffer)/sizeof(WCHAR), input)) { + while (WCMD_fgets(buffer, ARRAY_SIZE(buffer), input)) { WCMD_parse_line(cmdStart, firstCmd, &cmdEnd, variable[1], buffer, &doExecuted, &forf_skip, forf_eol, forf_delims, forf_tokens); buffer[0] = 0; @@ -2549,7 +2538,7 @@ void WCMD_give_help (const WCHAR *args) } } /* Launch the command with the /? option for external commands shipped with cmd.exe */ - for (i = 0; i <= (sizeof(externals)/sizeof(externals[0])); i++) { + for (i = 0; i <= ARRAY_SIZE(externals); i++) { if (CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, args, -1, externals[i], -1) == CSTR_EQUAL) { WCHAR cmd[128]; @@ -2622,7 +2611,7 @@ void WCMD_goto (CMD_LIST **cmdList) { if (loop==1) SetFilePointer (context -> h, 0, NULL, FILE_BEGIN); } - while (WCMD_fgets (string, sizeof(string)/sizeof(WCHAR), context -> h)) { + while (WCMD_fgets (string, ARRAY_SIZE(string), context -> h)) { str = string; /* Ignore leading whitespace or no-echo character */ @@ -2947,8 +2936,8 @@ void WCMD_move (void) /* If 2nd parm is directory, then use original filename */ /* Convert partial path to full path */ - GetFullPathNameW(param1, sizeof(input)/sizeof(WCHAR), input, NULL); - GetFullPathNameW(param2, sizeof(output)/sizeof(WCHAR), output, NULL); + GetFullPathNameW(param1, ARRAY_SIZE(input), input, NULL); + GetFullPathNameW(param2, ARRAY_SIZE(output), output, NULL); WINE_TRACE("Move from '%s'('%s') to '%s'\n", wine_dbgstr_w(input), wine_dbgstr_w(param1), wine_dbgstr_w(output)); @@ -3000,9 +2989,8 @@ void WCMD_move (void) force = TRUE; else { static const WCHAR copyCmdW[] = {'C','O','P','Y','C','M','D','\0'}; - len = GetEnvironmentVariableW(copyCmdW, copycmd, sizeof(copycmd)/sizeof(WCHAR)); - force = (len && len < (sizeof(copycmd)/sizeof(WCHAR)) - && ! lstrcmpiW (copycmd, parmY)); + len = GetEnvironmentVariableW(copyCmdW, copycmd, ARRAY_SIZE(copycmd)); + force = (len && len < ARRAY_SIZE(copycmd) && !lstrcmpiW(copycmd, parmY)); } /* Prompt if overwriting */ @@ -3169,7 +3157,7 @@ void WCMD_rename (void) } /* Convert partial path to full path */ - GetFullPathNameW(param1, sizeof(input)/sizeof(WCHAR), input, NULL); + GetFullPathNameW(param1, ARRAY_SIZE(input), input, NULL); WINE_TRACE("Rename from '%s'('%s') to '%s'\n", wine_dbgstr_w(input), wine_dbgstr_w(param1), wine_dbgstr_w(param2)); dotDst = strchrW(param2, '.'); @@ -3427,7 +3415,7 @@ void WCMD_setshow_default (const WCHAR *args) { args++; } - GetCurrentDirectoryW(sizeof(cwd)/sizeof(WCHAR), cwd); + GetCurrentDirectoryW(ARRAY_SIZE(cwd), cwd); if (strlenW(args) == 0) { strcatW (cwd, newlineW); WCMD_output_asis (cwd); @@ -3458,7 +3446,7 @@ void WCMD_setshow_default (const WCHAR *args) { static const WCHAR fmt[] = {'%','s','%','s','%','s','\0'}; /* Convert path into actual directory spec */ - GetFullPathNameW(string, sizeof(fpath)/sizeof(WCHAR), fpath, NULL); + GetFullPathNameW(string, ARRAY_SIZE(fpath), fpath, NULL); WCMD_splitpath(fpath, drive, dir, fname, ext); /* Rebuild path */ @@ -3480,7 +3468,7 @@ void WCMD_setshow_default (const WCHAR *args) { } else { /* Save away the actual new directory, to store as current location */ - GetCurrentDirectoryW (sizeof(string)/sizeof(WCHAR), string); + GetCurrentDirectoryW(ARRAY_SIZE(string), string); /* Restore old directory if drive letter would change, and CD x:\directory /D (or pushd c:\directory) not supplied */ @@ -3521,12 +3509,11 @@ void WCMD_setshow_date (void) { static const WCHAR parmT[] = {'/','T','\0'}; if (strlenW(param1) == 0) { - if (GetDateFormatW(LOCALE_USER_DEFAULT, 0, NULL, NULL, - curdate, sizeof(curdate)/sizeof(WCHAR))) { + if (GetDateFormatW(LOCALE_USER_DEFAULT, 0, NULL, NULL, curdate, ARRAY_SIZE(curdate))) { WCMD_output (WCMD_LoadMessage(WCMD_CURRENTDATE), curdate); if (strstrW (quals, parmT) == NULL) { WCMD_output (WCMD_LoadMessage(WCMD_NEWDATE)); - WCMD_ReadFile(GetStdHandle(STD_INPUT_HANDLE), buffer, sizeof(buffer)/sizeof(WCHAR), &count); + WCMD_ReadFile(GetStdHandle(STD_INPUT_HANDLE), buffer, ARRAY_SIZE(buffer), &count); if (count > 2) { WCMD_output_stderr (WCMD_LoadMessage(WCMD_NYI)); } @@ -4166,7 +4153,7 @@ void WCMD_setshow_env (WCHAR *s) { if (strlenW(p) != 0) WCMD_output_asis(p); /* Read the reply */ - WCMD_ReadFile(GetStdHandle(STD_INPUT_HANDLE), string, sizeof(string)/sizeof(WCHAR), &count); + WCMD_ReadFile(GetStdHandle(STD_INPUT_HANDLE), string, ARRAY_SIZE(string), &count); if (count > 1) { string[count-1] = '\0'; /* ReadFile output is not null-terminated! */ if (string[count-2] == '\r') string[count-2] = '\0'; /* Under Windoze we get CRLF! */ @@ -4263,7 +4250,7 @@ void WCMD_setshow_path (const WCHAR *args) { static const WCHAR pathEqW[] = {'P','A','T','H','=','\0'}; if (strlenW(param1) == 0 && strlenW(param2) == 0) { - status = GetEnvironmentVariableW(pathW, string, sizeof(string)/sizeof(WCHAR)); + status = GetEnvironmentVariableW(pathW, string, ARRAY_SIZE(string)); if (status != 0) { WCMD_output_asis ( pathEqW); WCMD_output_asis ( string); @@ -4320,12 +4307,11 @@ void WCMD_setshow_time (void) { if (strlenW(param1) == 0) { GetLocalTime(&st); - if (GetTimeFormatW(LOCALE_USER_DEFAULT, 0, &st, NULL, - curtime, sizeof(curtime)/sizeof(WCHAR))) { + if (GetTimeFormatW(LOCALE_USER_DEFAULT, 0, &st, NULL, curtime, ARRAY_SIZE(curtime))) { WCMD_output (WCMD_LoadMessage(WCMD_CURRENTTIME), curtime); if (strstrW (quals, parmT) == NULL) { WCMD_output (WCMD_LoadMessage(WCMD_NEWTIME)); - WCMD_ReadFile(GetStdHandle(STD_INPUT_HANDLE), buffer, sizeof(buffer)/sizeof(WCHAR), &count); + WCMD_ReadFile(GetStdHandle(STD_INPUT_HANDLE), buffer, ARRAY_SIZE(buffer), &count); if (count > 2) { WCMD_output_stderr (WCMD_LoadMessage(WCMD_NYI)); } @@ -4547,7 +4533,7 @@ void WCMD_type (WCHAR *args) { static const WCHAR fmt[] = {'\n','%','1','\n','\n','\0'}; WCMD_output(fmt, thisArg); } - while (WCMD_ReadFile(h, buffer, sizeof(buffer)/sizeof(WCHAR) - 1, &count)) { + while (WCMD_ReadFile(h, buffer, ARRAY_SIZE(buffer) - 1, &count)) { if (count == 0) break; /* ReadFile reports success on EOF! */ buffer[count] = 0; WCMD_output_asis (buffer); @@ -4580,8 +4566,7 @@ void WCMD_more (WCHAR *args) { /* Prefix the NLS more with '-- ', then load the text */ errorlevel = 0; strcpyW(moreStr, moreStart); - LoadStringW(hinst, WCMD_MORESTR, &moreStr[3], - (sizeof(moreStr)/sizeof(WCHAR))-3); + LoadStringW(hinst, WCMD_MORESTR, &moreStr[3], ARRAY_SIZE(moreStr)-3); if (param1[0] == 0x00) { @@ -4601,7 +4586,7 @@ void WCMD_more (WCHAR *args) { wsprintfW(moreStrPage, moreFmt, moreStr); WCMD_enter_paged_mode(moreStrPage); - while (WCMD_ReadFile(hstdin, buffer, (sizeof(buffer)/sizeof(WCHAR))-1, &count)) { + while (WCMD_ReadFile(hstdin, buffer, ARRAY_SIZE(buffer)-1, &count)) { if (count == 0) break; /* ReadFile reports success on EOF! */ buffer[count] = 0; WCMD_output_asis (buffer); @@ -4632,7 +4617,7 @@ void WCMD_more (WCHAR *args) { wsprintfW(moreStrPage, moreFmt2, moreStr, 100); WCMD_leave_paged_mode(); WCMD_output_asis(moreStrPage); - WCMD_ReadFile(GetStdHandle(STD_INPUT_HANDLE), buffer, sizeof(buffer)/sizeof(WCHAR), &count); + WCMD_ReadFile(GetStdHandle(STD_INPUT_HANDLE), buffer, ARRAY_SIZE(buffer), &count); WCMD_enter_paged_mode(moreStrPage); } @@ -4654,7 +4639,7 @@ void WCMD_more (WCHAR *args) { fileLen = (((ULONG64)fileInfo.nFileSizeHigh) << 32) + fileInfo.nFileSizeLow; needsPause = TRUE; - while (WCMD_ReadFile(h, buffer, (sizeof(buffer)/sizeof(WCHAR))-1, &count)) { + while (WCMD_ReadFile(h, buffer, ARRAY_SIZE(buffer)-1, &count)) { if (count == 0) break; /* ReadFile reports success on EOF! */ buffer[count] = 0; curPos += count; @@ -4728,13 +4713,12 @@ int WCMD_volume(BOOL set_label, const WCHAR *path) BOOL status; if (strlenW(path) == 0) { - status = GetCurrentDirectoryW(sizeof(curdir)/sizeof(WCHAR), curdir); + status = GetCurrentDirectoryW(ARRAY_SIZE(curdir), curdir); if (!status) { WCMD_print_error (); return 0; } - status = GetVolumeInformationW(NULL, label, sizeof(label)/sizeof(WCHAR), - &serial, NULL, NULL, NULL, 0); + status = GetVolumeInformationW(NULL, label, ARRAY_SIZE(label), &serial, NULL, NULL, NULL, 0); } else { static const WCHAR fmt[] = {'%','s','\\','\0'}; @@ -4743,9 +4727,7 @@ int WCMD_volume(BOOL set_label, const WCHAR *path) return 0; } wsprintfW (curdir, fmt, path); - status = GetVolumeInformationW(curdir, label, sizeof(label)/sizeof(WCHAR), - &serial, NULL, - NULL, NULL, 0); + status = GetVolumeInformationW(curdir, label, ARRAY_SIZE(label), &serial, NULL, NULL, NULL, 0); } if (!status) { WCMD_print_error (); @@ -4763,7 +4745,7 @@ int WCMD_volume(BOOL set_label, const WCHAR *path) HIWORD(serial), LOWORD(serial)); if (set_label) { WCMD_output (WCMD_LoadMessage(WCMD_VOLUMEPROMPT)); - WCMD_ReadFile(GetStdHandle(STD_INPUT_HANDLE), string, sizeof(string)/sizeof(WCHAR), &count); + WCMD_ReadFile(GetStdHandle(STD_INPUT_HANDLE), string, ARRAY_SIZE(string), &count); if (count > 1) { string[count-1] = '\0'; /* ReadFile output is not null-terminated! */ if (string[count-2] == '\r') string[count-2] = '\0'; /* Under Windoze we get CRLF! */ @@ -4856,7 +4838,7 @@ void WCMD_assoc (const WCHAR *args, BOOL assoc) { if (RegOpenKeyExW(key, subkey, 0, accessOptions, &readKey) == ERROR_SUCCESS) { - valueLen = sizeof(keyValue)/sizeof(WCHAR); + valueLen = ARRAY_SIZE(keyValue); rc = RegQueryValueExW(readKey, NULL, NULL, NULL, (LPBYTE)keyValue, &valueLen); WCMD_output_asis(keyName); WCMD_output_asis(equalW); @@ -4902,9 +4884,9 @@ void WCMD_assoc (const WCHAR *args, BOOL assoc) { /* Load the translated 'File association not found' */ if (assoc) { - LoadStringW(hinst, WCMD_NOASSOC, msgbuffer, sizeof(msgbuffer)/sizeof(WCHAR)); + LoadStringW(hinst, WCMD_NOASSOC, msgbuffer, ARRAY_SIZE(msgbuffer)); } else { - LoadStringW(hinst, WCMD_NOFTYPE, msgbuffer, sizeof(msgbuffer)/sizeof(WCHAR)); + LoadStringW(hinst, WCMD_NOFTYPE, msgbuffer, ARRAY_SIZE(msgbuffer)); } WCMD_output_stderr(msgbuffer, keyValue); errorlevel = 2; @@ -4939,11 +4921,9 @@ void WCMD_assoc (const WCHAR *args, BOOL assoc) { /* Load the translated 'File association not found' */ if (assoc) { - LoadStringW(hinst, WCMD_NOASSOC, msgbuffer, - sizeof(msgbuffer)/sizeof(WCHAR)); + LoadStringW(hinst, WCMD_NOASSOC, msgbuffer, ARRAY_SIZE(msgbuffer)); } else { - LoadStringW(hinst, WCMD_NOFTYPE, msgbuffer, - sizeof(msgbuffer)/sizeof(WCHAR)); + LoadStringW(hinst, WCMD_NOFTYPE, msgbuffer, ARRAY_SIZE(msgbuffer)); } WCMD_output_stderr(msgbuffer, args); errorlevel = 2; diff --git a/programs/cmd/directory.c b/programs/cmd/directory.c index 91142be670..70507892ea 100644 --- a/programs/cmd/directory.c +++ b/programs/cmd/directory.c @@ -370,7 +370,7 @@ static DIRECTORY_STACK *WCMD_list_directory (DIRECTORY_STACK *inputparms, int le if (usernames) { strcpyW (string, inputparms->dirName); strcatW (string, fd[i].cFileName); - WCMD_getfileowner(string, username, sizeof(username)/sizeof(WCHAR)); + WCMD_getfileowner(string, username, ARRAY_SIZE(username)); } if (dirTime == Written) { @@ -381,10 +381,8 @@ static DIRECTORY_STACK *WCMD_list_directory (DIRECTORY_STACK *inputparms, int le FileTimeToLocalFileTime (&fd[i].ftCreationTime, &ft); } FileTimeToSystemTime (&ft, &st); - GetDateFormatW(0, DATE_SHORTDATE, &st, NULL, datestring, - sizeof(datestring)/sizeof(WCHAR)); - GetTimeFormatW(0, TIME_NOSECONDS, &st, - NULL, timestring, sizeof(timestring)/sizeof(WCHAR)); + GetDateFormatW(0, DATE_SHORTDATE, &st, NULL, datestring, ARRAY_SIZE(datestring)); + GetTimeFormatW(0, TIME_NOSECONDS, &st, NULL, timestring, ARRAY_SIZE(timestring)); if (wide) { @@ -612,7 +610,7 @@ void WCMD_directory (WCHAR *args) errorlevel = 0; /* Prefill quals with (uppercased) DIRCMD env var */ - if (GetEnvironmentVariableW(dircmdW, string, sizeof(string)/sizeof(WCHAR))) { + if (GetEnvironmentVariableW(dircmdW, string, ARRAY_SIZE(string))) { p = string; while ( (*p = toupper(*p)) ) ++p; strcatW(string,quals); @@ -823,7 +821,7 @@ void WCMD_directory (WCHAR *args) } WINE_TRACE("Using location '%s'\n", wine_dbgstr_w(fullname)); - status = GetFullPathNameW(fullname, sizeof(path)/sizeof(WCHAR), path, NULL); + status = GetFullPathNameW(fullname, ARRAY_SIZE(path), path, NULL); /* * If the path supplied does not include a wildcard, and the endpoint of the diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 5135be4751..b269635c75 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -272,7 +272,7 @@ static void WCMD_output_asis_handle (DWORD std_handle, const WCHAR *message) { if (++line_count >= max_height - 1) { line_count = 0; WCMD_output_asis_len(pagedMessage, strlenW(pagedMessage), handle); - WCMD_ReadFile(GetStdHandle(STD_INPUT_HANDLE), string, sizeof(string)/sizeof(WCHAR), &count); + WCMD_ReadFile(GetStdHandle(STD_INPUT_HANDLE), string, ARRAY_SIZE(string), &count); } } while (((message = ptr) != NULL) && (*ptr)); } else { @@ -343,9 +343,8 @@ static void WCMD_show_prompt (void) { DWORD len; static const WCHAR envPrompt[] = {'P','R','O','M','P','T','\0'}; - len = GetEnvironmentVariableW(envPrompt, prompt_string, - sizeof(prompt_string)/sizeof(WCHAR)); - if ((len == 0) || (len >= (sizeof(prompt_string)/sizeof(WCHAR)))) { + len = GetEnvironmentVariableW(envPrompt, prompt_string, ARRAY_SIZE(prompt_string)); + if ((len == 0) || (len >= ARRAY_SIZE(prompt_string))) { static const WCHAR dfltPrompt[] = {'$','P','$','G','\0'}; strcpyW (prompt_string, dfltPrompt); } @@ -394,13 +393,13 @@ static void WCMD_show_prompt (void) { *q++ = '<'; break; case 'N': - status = GetCurrentDirectoryW(sizeof(curdir)/sizeof(WCHAR), curdir); + status = GetCurrentDirectoryW(ARRAY_SIZE(curdir), curdir); if (status) { *q++ = curdir[0]; } break; case 'P': - status = GetCurrentDirectoryW(sizeof(curdir)/sizeof(WCHAR), curdir); + status = GetCurrentDirectoryW(ARRAY_SIZE(curdir), curdir); if (status) { strcatW (q, curdir); while (*q) q++; @@ -641,8 +640,7 @@ static WCHAR *WCMD_expand_envvar(WCHAR *start, WCHAR startchar) len = strlenW(thisVarContents); } else { - len = ExpandEnvironmentStringsW(thisVar, thisVarContents, - sizeof(thisVarContents)/sizeof(WCHAR)); + len = ExpandEnvironmentStringsW(thisVar, thisVarContents, ARRAY_SIZE(thisVarContents)); } if (len == 0) @@ -1060,8 +1058,8 @@ void WCMD_run_program (WCHAR *command, BOOL called) if (strpbrkW (firstParam, delims) == NULL) { /* No explicit path given, search path */ static const WCHAR curDir[] = {'.',';','\0'}; strcpyW(pathtosearch, curDir); - len = GetEnvironmentVariableW(envPath, &pathtosearch[2], (sizeof(pathtosearch)/sizeof(WCHAR))-2); - if ((len == 0) || (len >= (sizeof(pathtosearch)/sizeof(WCHAR)) - 2)) { + len = GetEnvironmentVariableW(envPath, &pathtosearch[2], ARRAY_SIZE(pathtosearch)-2); + if ((len == 0) || (len >= ARRAY_SIZE(pathtosearch) - 2)) { static const WCHAR curDir[] = {'.','\0'}; strcpyW (pathtosearch, curDir); } @@ -1077,7 +1075,7 @@ void WCMD_run_program (WCHAR *command, BOOL called) } else { /* Convert eg. ..\fred to include a directory by removing file part */ - GetFullPathNameW(firstParam, sizeof(pathtosearch)/sizeof(WCHAR), pathtosearch, NULL); + GetFullPathNameW(firstParam, ARRAY_SIZE(pathtosearch), pathtosearch, NULL); lastSlash = strrchrW(pathtosearch, '\\'); if (lastSlash && strchrW(lastSlash, '.') != NULL) extensionsupplied = TRUE; strcpyW(stemofsearch, lastSlash+1); @@ -1088,8 +1086,8 @@ void WCMD_run_program (WCHAR *command, BOOL called) } /* Now extract PATHEXT */ - len = GetEnvironmentVariableW(envPathExt, pathext, sizeof(pathext)/sizeof(WCHAR)); - if ((len == 0) || (len >= (sizeof(pathext)/sizeof(WCHAR)))) { + len = GetEnvironmentVariableW(envPathExt, pathext, ARRAY_SIZE(pathext)); + if ((len == 0) || (len >= ARRAY_SIZE(pathext))) { strcpyW (pathext, dfltPathExt); } @@ -1315,7 +1313,7 @@ void WCMD_execute (const WCHAR *command, const WCHAR *redirects, piped = TRUE; /* Generate a unique temporary filename */ - GetTempPathW(sizeof(temp_path)/sizeof(WCHAR), temp_path); + GetTempPathW(ARRAY_SIZE(temp_path), temp_path); GetTempFileNameW(temp_path, cmdW, 0, (*cmdList)->nextcommand->pipeFile); WINE_TRACE("Using temporary file of %s\n", wine_dbgstr_w((*cmdList)->nextcommand->pipeFile)); @@ -1662,7 +1660,7 @@ WCHAR *WCMD_LoadMessage(UINT id) { static WCHAR msg[2048]; static const WCHAR failedMsg[] = {'F','a','i','l','e','d','!','\0'}; - if (!LoadStringW(GetModuleHandleW(NULL), id, msg, sizeof(msg)/sizeof(WCHAR))) { + if (!LoadStringW(GetModuleHandleW(NULL), id, msg, ARRAY_SIZE(msg))) { WINE_FIXME("LoadString failed with %d\n", GetLastError()); strcpyW(msg, failedMsg); } @@ -1879,7 +1877,7 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE static const WCHAR echoDot[] = {'e','c','h','o','.'}; static const WCHAR echoCol[] = {'e','c','h','o',':'}; static const WCHAR echoSlash[] = {'e','c','h','o','/'}; - const DWORD len = sizeof(echoDot)/sizeof(echoDot[0]); + const DWORD len = ARRAY_SIZE(echoDot); DWORD curr_size = strlenW(curPos); DWORD min_len = (curr_size < len ? curr_size : len); WCMD_show_prompt(); @@ -1929,11 +1927,10 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE static const WCHAR forDO[] = {'d','o'}; /* If command starts with 'rem ' or identifies a label, ignore any &&, ( etc. */ - if (WCMD_keyword_ws_found(remCmd, sizeof(remCmd)/sizeof(remCmd[0]), curPos) || - *curPos == ':') { + if (WCMD_keyword_ws_found(remCmd, ARRAY_SIZE(remCmd), curPos) || *curPos == ':') { inOneLine = TRUE; - } else if (WCMD_keyword_ws_found(forCmd, sizeof(forCmd)/sizeof(forCmd[0]), curPos)) { + } else if (WCMD_keyword_ws_found(forCmd, ARRAY_SIZE(forCmd), curPos)) { inFor = TRUE; /* If command starts with 'if ' or 'else ', handle ('s mid line. We should ensure this @@ -1942,11 +1939,11 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE FIXME: Silly syntax like "if 1(==1( ( echo they equal )" will be parsed wrong */ - } else if (WCMD_keyword_ws_found(ifCmd, sizeof(ifCmd)/sizeof(ifCmd[0]), curPos)) { + } else if (WCMD_keyword_ws_found(ifCmd, ARRAY_SIZE(ifCmd), curPos)) { inIf = TRUE; - } else if (WCMD_keyword_ws_found(ifElse, sizeof(ifElse)/sizeof(ifElse[0]), curPos)) { - const int keyw_len = sizeof(ifElse)/sizeof(ifElse[0]) + 1; + } else if (WCMD_keyword_ws_found(ifElse, ARRAY_SIZE(ifElse), curPos)) { + const int keyw_len = ARRAY_SIZE(ifElse) + 1; inElse = TRUE; lastWasElse = TRUE; onlyWhiteSpace = TRUE; @@ -1958,9 +1955,8 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE /* In a for loop, the DO command will follow a close bracket followed by whitespace, followed by DO, ie closeBracket inserts a NULL entry, curLen is then 0, and all whitespace is skipped */ - } else if (inFor && - WCMD_keyword_ws_found(forDO, sizeof(forDO)/sizeof(forDO[0]), curPos)) { - const int keyw_len = sizeof(forDO)/sizeof(forDO[0]) + 1; + } else if (inFor && WCMD_keyword_ws_found(forDO, ARRAY_SIZE(forDO), curPos)) { + const int keyw_len = ARRAY_SIZE(forDO) + 1; WINE_TRACE("Found 'DO '\n"); lastWasDo = TRUE; onlyWhiteSpace = TRUE; @@ -1977,8 +1973,8 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE WINE_TRACE("Found 'FOR ', comparing next parm: '%s'\n", wine_dbgstr_w(curPos)); - if (WCMD_keyword_ws_found(forIN, sizeof(forIN)/sizeof(forIN[0]), curPos)) { - const int keyw_len = sizeof(forIN)/sizeof(forIN[0]) + 1; + if (WCMD_keyword_ws_found(forIN, ARRAY_SIZE(forIN), curPos)) { + const int keyw_len = ARRAY_SIZE(forIN) + 1; WINE_TRACE("Found 'IN '\n"); lastWasIn = TRUE; onlyWhiteSpace = TRUE; @@ -2509,8 +2505,8 @@ int wmain (int argc, WCHAR *argvW[]) BOOL found = FALSE; /* Now extract PATHEXT */ - len = GetEnvironmentVariableW(envPathExt, pathext, sizeof(pathext)/sizeof(WCHAR)); - if ((len == 0) || (len >= (sizeof(pathext)/sizeof(WCHAR)))) { + len = GetEnvironmentVariableW(envPathExt, pathext, ARRAY_SIZE(pathext)); + if ((len == 0) || (len >= ARRAY_SIZE(pathext))) { strcpyW (pathext, dfltPathExt); } @@ -2518,7 +2514,7 @@ int wmain (int argc, WCHAR *argvW[]) WINE_TRACE("First parameter is '%s'\n", wine_dbgstr_w(thisArg)); if (strchrW(thisArg, '\\') != NULL) { - GetFullPathNameW(thisArg, sizeof(string)/sizeof(WCHAR), string, NULL); + GetFullPathNameW(thisArg, ARRAY_SIZE(string), string, NULL); WINE_TRACE("Full path name '%s'\n", wine_dbgstr_w(string)); p = string + strlenW(string); @@ -2553,7 +2549,7 @@ int wmain (int argc, WCHAR *argvW[]) /* Otherwise we now need to look in the path to see if we can find it */ } else { /* Does file exist with this name? */ - if (SearchPathW(NULL, thisArg, NULL, sizeof(string)/sizeof(WCHAR), string, NULL) != 0) { + if (SearchPathW(NULL, thisArg, NULL, ARRAY_SIZE(string), string, NULL) != 0) { WINE_TRACE("Found on path as '%s'\n", wine_dbgstr_w(string)); found = TRUE; } else { @@ -2571,7 +2567,7 @@ int wmain (int argc, WCHAR *argvW[]) } /* Does file exist with this extension? */ - if (SearchPathW(NULL, thisArg, thisExt, sizeof(string)/sizeof(WCHAR), string, NULL) != 0) { + if (SearchPathW(NULL, thisArg, thisExt, ARRAY_SIZE(string), string, NULL) != 0) { WINE_TRACE("Found on path as '%s' with extension '%s'\n", wine_dbgstr_w(string), wine_dbgstr_w(thisExt)); found = TRUE; @@ -2596,7 +2592,7 @@ int wmain (int argc, WCHAR *argvW[]) } /* Save cwd into appropriate env var (Must be before the /c processing */ - GetCurrentDirectoryW(sizeof(string)/sizeof(WCHAR), string); + GetCurrentDirectoryW(ARRAY_SIZE(string), string); if (IsCharAlphaW(string[0]) && string[1] == ':') { static const WCHAR fmt[] = {'=','%','c',':','\0'}; wsprintfW(envvar, fmt, string[0]); @@ -2656,7 +2652,7 @@ int wmain (int argc, WCHAR *argvW[]) RegQueryValueExW(key, dfltColorW, NULL, NULL, (LPBYTE)&value, &size); } else if (type == REG_SZ) { - size = sizeof(strvalue)/sizeof(WCHAR); + size = ARRAY_SIZE(strvalue); RegQueryValueExW(key, dfltColorW, NULL, NULL, (LPBYTE)strvalue, &size); value = strtoulW(strvalue, NULL, 10); @@ -2677,7 +2673,7 @@ int wmain (int argc, WCHAR *argvW[]) RegQueryValueExW(key, dfltColorW, NULL, NULL, (LPBYTE)&value, &size); } else if (type == REG_SZ) { - size = sizeof(strvalue)/sizeof(WCHAR); + size = ARRAY_SIZE(strvalue); RegQueryValueExW(key, dfltColorW, NULL, NULL, (LPBYTE)strvalue, &size); value = strtoulW(strvalue, NULL, 10); -- 2.14.4

1 0

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