June 2018 - Wine-commits - list.winehq.org

Alexandre Julliard : winex11: Store only the pixmap size instead of the window rectangle in the GL drawable.
by Alexandre Julliard 26 Jun '18

26 Jun '18

Module: wine Branch: stable Commit: e6fcc8503ef64f37bc2c0a9bc9bf9c238df320d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e6fcc8503ef64f37bc2c0a9b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 9 13:08:04 2018 +0100 winex11: Store only the pixmap size instead of the window rectangle in the GL drawable. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 99041a6fd369deeeb60ce1f11195414d16c9dc44) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winex11.drv/opengl.c | 40 +++++++++++++++++++--------------------- dlls/winex11.drv/window.c | 7 ++++++- dlls/winex11.drv/x11drv.h | 2 +- 3 files changed, 26 insertions(+), 23 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 32df651..de09925 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -257,7 +257,7 @@ struct gl_drawable Pixmap pixmap; /* base pixmap if drawable is a GLXPixmap */ Colormap colormap; /* colormap used for the drawable */ const struct wgl_pixel_format *format; /* pixel format for the drawable */ - RECT rect; /* drawable rect, relative to whole window drawable */ + SIZE pixmap_size; /* pixmap size for GLXPixmap drawables */ int swap_interval; BOOL refresh_swap_interval; }; @@ -1346,6 +1346,12 @@ static void free_gl_drawable( struct gl_drawable *gl ) static BOOL create_gl_drawable( HWND hwnd, struct gl_drawable *gl ) { XVisualInfo *visual = gl->format->visual; + RECT rect; + int width, height; + + GetClientRect( hwnd, &rect ); + width = min( max( 1, rect.right ), 65535 ); + height = min( max( 1, rect.bottom ), 65535 ); gl->drawable = 0; @@ -1387,8 +1393,7 @@ static BOOL create_gl_drawable( HWND hwnd, struct gl_drawable *gl ) XInstallColormap(gdi_display, attrib.colormap); gl->type = DC_GL_CHILD_WIN; - gl->window = XCreateWindow( gdi_display, dummy_parent, 0, 0, - gl->rect.right - gl->rect.left, gl->rect.bottom - gl->rect.top, + gl->window = XCreateWindow( gdi_display, dummy_parent, 0, 0, width, height, 0, visual->depth, InputOutput, visual->visual, CWColormap | CWBorderPixel | CWOverrideRedirect, &attrib ); if (gl->window) @@ -1408,13 +1413,13 @@ static BOOL create_gl_drawable( HWND hwnd, struct gl_drawable *gl ) WARN("XComposite is not available, using GLXPixmap hack\n"); gl->type = DC_GL_PIXMAP_WIN; - gl->pixmap = XCreatePixmap( gdi_display, root_window, - gl->rect.right - gl->rect.left, gl->rect.bottom - gl->rect.top, - visual->depth ); + gl->pixmap = XCreatePixmap( gdi_display, root_window, width, height, visual->depth ); if (gl->pixmap) { gl->drawable = pglXCreatePixmap( gdi_display, gl->format->fbconfig, gl->pixmap, NULL ); if (!gl->drawable) XFreePixmap( gdi_display, gl->pixmap ); + gl->pixmap_size.cx = width; + gl->pixmap_size.cy = height; } } @@ -1440,9 +1445,6 @@ static BOOL set_win_format( HWND hwnd, const struct wgl_pixel_format *format ) gl->swap_interval = 1; gl->refresh_swap_interval = TRUE; gl->format = format; - GetClientRect( hwnd, &gl->rect ); - gl->rect.right = min( max( 1, gl->rect.right ), 65535 ); - gl->rect.bottom = min( max( 1, gl->rect.bottom ), 65535 ); if (!create_gl_drawable( hwnd, gl )) { @@ -1515,31 +1517,26 @@ static BOOL set_pixel_format(HDC hdc, int format, BOOL allow_change) /*********************************************************************** * sync_gl_drawable */ -void sync_gl_drawable( HWND hwnd, const RECT *visible_rect, const RECT *client_rect ) +void sync_gl_drawable( HWND hwnd, int width, int height ) { struct gl_drawable *gl; GLXDrawable glxp; Pixmap pix; - int mask = 0; XWindowChanges changes; - changes.width = min( max( 1, client_rect->right - client_rect->left ), 65535 ); - changes.height = min( max( 1, client_rect->bottom - client_rect->top ), 65535 ); + changes.width = min( max( 1, width ), 65535 ); + changes.height = min( max( 1, height ), 65535 ); if (!(gl = get_gl_drawable( hwnd, 0 ))) return; - if (changes.width != gl->rect.right - gl->rect.left) mask |= CWWidth; - if (changes.height != gl->rect.bottom - gl->rect.top) mask |= CWHeight; - TRACE( "setting drawable %lx size %dx%d\n", gl->drawable, changes.width, changes.height ); switch (gl->type) { case DC_GL_CHILD_WIN: - if (mask) XConfigureWindow( gdi_display, gl->window, mask, &changes ); + XConfigureWindow( gdi_display, gl->window, CWWidth | CWHeight, &changes ); break; case DC_GL_PIXMAP_WIN: - if (!mask) break; pix = XCreatePixmap(gdi_display, root_window, changes.width, changes.height, gl->format->visual->depth); if (!pix) goto done; @@ -1558,11 +1555,12 @@ void sync_gl_drawable( HWND hwnd, const RECT *visible_rect, const RECT *client_r gl->pixmap = pix; gl->drawable = glxp; + gl->pixmap_size.cx = width; + gl->pixmap_size.cy = height; break; default: break; } - SetRect( &gl->rect, 0, 0, changes.width, changes.height ); done: release_gl_drawable( gl ); } @@ -3334,7 +3332,7 @@ static BOOL glxdrv_wglSwapBuffers( HDC hdc ) * copying */ pglFlush(); pglXCopySubBufferMESA( gdi_display, gl->drawable, 0, 0, - gl->rect.right - gl->rect.left, gl->rect.bottom - gl->rect.top ); + gl->pixmap_size.cx, gl->pixmap_size.cy ); break; } if (pglXSwapBuffersMscOML) @@ -3403,7 +3401,7 @@ struct opengl_funcs *get_glx_driver( UINT version ) return NULL; } -void sync_gl_drawable( HWND hwnd, const RECT *visible_rect, const RECT *client_rect ) +void sync_gl_drawable( HWND hwnd, int width, int height ) { } diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index d35328c..4f61758 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2304,8 +2304,13 @@ void CDECL X11DRV_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flags if (!data->whole_window) { + int width = data->client_rect.right - data->client_rect.left; + int height = data->client_rect.bottom - data->client_rect.top; + release_win_data( data ); - sync_gl_drawable( hwnd, visible_rect, rectClient ); + if (width != old_client_rect.right - old_client_rect.left || + height != old_client_rect.bottom - old_client_rect.top) + sync_gl_drawable( hwnd, width, height ); return; } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 938ff22..0bb5b37 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -578,7 +578,7 @@ extern void release_win_data( struct x11drv_win_data *data ) DECLSPEC_HIDDEN; extern Window X11DRV_get_whole_window( HWND hwnd ) DECLSPEC_HIDDEN; extern XIC X11DRV_get_ic( HWND hwnd ) DECLSPEC_HIDDEN; -extern void sync_gl_drawable( HWND hwnd, const RECT *visible_rect, const RECT *client_rect ) DECLSPEC_HIDDEN; +extern void sync_gl_drawable( HWND hwnd, int width, int height ) DECLSPEC_HIDDEN; extern void set_gl_drawable_parent( HWND hwnd, HWND parent ) DECLSPEC_HIDDEN; extern void destroy_gl_drawable( HWND hwnd ) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : winex11: Implement refcounting of GL drawables.
by Alexandre Julliard 26 Jun '18

26 Jun '18

Module: wine Branch: stable Commit: a49ad69e99d07fa065ef946f7dc68cb274d77d2d URL: https://source.winehq.org/git/wine.git/?a=commit;h=a49ad69e99d07fa065ef946f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 12 15:34:28 2018 +0100 winex11: Implement refcounting of GL drawables. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 6dc30a2ed31091698f5a0cac47d0959780f08c9c) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winex11.drv/opengl.c | 251 +++++++++++++++++++++++----------------------- 1 file changed, 125 insertions(+), 126 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a49ad69e99d07fa065ef…

1 0

Alexandre Julliard : winex11: Hold a reference to the drawable from the GL context.
by Alexandre Julliard 26 Jun '18

26 Jun '18

Module: wine Branch: stable Commit: f06906b3557e6ed9b60dfb846477f152534d2d72 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f06906b3557e6ed9b60dfb84… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 12 15:41:45 2018 +0100 winex11: Hold a reference to the drawable from the GL context. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit ac4f2ac36f1b06f7bfe7647753dacbc4ce8522b3) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winex11.drv/opengl.c | 76 ++++++++++++++++++++++++++++++++++++----------- dlls/winex11.drv/window.c | 59 ++++++++++++++++++++++++++++-------- 2 files changed, 106 insertions(+), 29 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f06906b3557e6ed9b60d…

1 0

Nikolay Sivov : crypt32: Correctly return how the issuer of a self signed certificate was matched.
by Alexandre Julliard 25 Jun '18

25 Jun '18

Module: wine Branch: master Commit: e3536568041a8626066cc1d5c463581a86c14e5d URL: https://source.winehq.org/git/wine.git/?a=commit;h=e3536568041a8626066cc1d5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 25 14:12:12 2018 +0300 crypt32: Correctly return how the issuer of a self signed certificate was matched. Original patch by Michael Müller. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/chain.c | 53 ++++++++++++++++++------------------------ dlls/crypt32/crypt32_private.h | 2 +- 2 files changed, 24 insertions(+), 31 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 6e8076c..d7015d7 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -265,10 +265,10 @@ typedef struct _CertificateChain LONG ref; } CertificateChain; -BOOL CRYPT_IsCertificateSelfSigned(PCCERT_CONTEXT cert) +DWORD CRYPT_IsCertificateSelfSigned(const CERT_CONTEXT *cert) { + DWORD size, status = 0; PCERT_EXTENSION ext; - DWORD size; BOOL ret; if ((ext = CertFindExtension(szOID_AUTHORITY_KEY_IDENTIFIER2, @@ -296,10 +296,9 @@ BOOL CRYPT_IsCertificateSelfSigned(PCCERT_CONTEXT cert) &info->AuthorityCertIssuer.rgAltEntry[i]; if (directoryName) { - ret = CertCompareCertificateName(cert->dwCertEncodingType, - &directoryName->u.DirectoryName, &cert->pCertInfo->Issuer) - && CertCompareIntegerBlob(&info->AuthorityCertSerialNumber, - &cert->pCertInfo->SerialNumber); + if (CertCompareCertificateName(cert->dwCertEncodingType, &directoryName->u.DirectoryName, &cert->pCertInfo->Issuer) + && CertCompareIntegerBlob(&info->AuthorityCertSerialNumber, &cert->pCertInfo->SerialNumber)) + status = CERT_TRUST_HAS_NAME_MATCH_ISSUER; } else { @@ -317,16 +316,12 @@ BOOL CRYPT_IsCertificateSelfSigned(PCCERT_CONTEXT cert) if (buf) { - CertGetCertificateContextProperty(cert, - CERT_KEY_IDENTIFIER_PROP_ID, buf, &size); - ret = !memcmp(buf, info->KeyId.pbData, size); + CertGetCertificateContextProperty(cert, CERT_KEY_IDENTIFIER_PROP_ID, buf, &size); + if (!memcmp(buf, info->KeyId.pbData, size)) + status = CERT_TRUST_HAS_KEY_MATCH_ISSUER; CryptMemFree(buf); } - else - ret = FALSE; } - else - ret = FALSE; } LocalFree(info); } @@ -344,10 +339,9 @@ BOOL CRYPT_IsCertificateSelfSigned(PCCERT_CONTEXT cert) { if (info->CertIssuer.cbData && info->CertSerialNumber.cbData) { - ret = CertCompareCertificateName(cert->dwCertEncodingType, - &info->CertIssuer, &cert->pCertInfo->Issuer) && - CertCompareIntegerBlob(&info->CertSerialNumber, - &cert->pCertInfo->SerialNumber); + if (CertCompareCertificateName(cert->dwCertEncodingType, &info->CertIssuer, &cert->pCertInfo->Issuer) + && CertCompareIntegerBlob(&info->CertSerialNumber, &cert->pCertInfo->SerialNumber)) + status = CERT_TRUST_HAS_NAME_MATCH_ISSUER; } else if (info->KeyId.cbData) { @@ -361,24 +355,23 @@ BOOL CRYPT_IsCertificateSelfSigned(PCCERT_CONTEXT cert) { CertGetCertificateContextProperty(cert, CERT_KEY_IDENTIFIER_PROP_ID, buf, &size); - ret = !memcmp(buf, info->KeyId.pbData, size); + if (!memcmp(buf, info->KeyId.pbData, size)) + status = CERT_TRUST_HAS_KEY_MATCH_ISSUER; CryptMemFree(buf); } - else - ret = FALSE; } - else - ret = FALSE; } - else - ret = FALSE; LocalFree(info); } } else - ret = CertCompareCertificateName(cert->dwCertEncodingType, - &cert->pCertInfo->Subject, &cert->pCertInfo->Issuer); - return ret; + if (CertCompareCertificateName(cert->dwCertEncodingType, &cert->pCertInfo->Subject, &cert->pCertInfo->Issuer)) + status = CERT_TRUST_HAS_NAME_MATCH_ISSUER; + + if (status) + status |= CERT_TRUST_IS_SELF_SIGNED; + + return status; } static void CRYPT_FreeChainElement(PCERT_CHAIN_ELEMENT element) @@ -1890,6 +1883,7 @@ static void CRYPT_CheckSimpleChain(CertificateChainEngine *engine, int i; BOOL pathLengthConstraintViolated = FALSE; CERT_BASIC_CONSTRAINTS2_INFO constraints = { FALSE, FALSE, 0 }; + DWORD status; TRACE_(chain)("checking chain with %d elements for time %s\n", chain->cElement, filetime_to_str(time)); @@ -1977,10 +1971,9 @@ static void CRYPT_CheckSimpleChain(CertificateChainEngine *engine, } CRYPT_CheckChainNameConstraints(chain); CRYPT_CheckChainPolicies(chain); - if (CRYPT_IsCertificateSelfSigned(rootElement->pCertContext)) + if ((status = CRYPT_IsCertificateSelfSigned(rootElement->pCertContext))) { - rootElement->TrustStatus.dwInfoStatus |= - CERT_TRUST_IS_SELF_SIGNED | CERT_TRUST_HAS_NAME_MATCH_ISSUER; + rootElement->TrustStatus.dwInfoStatus |= status; CRYPT_CheckRootCert(engine->hRoot, rootElement); } CRYPT_CombineTrustStatus(&chain->TrustStatus, &rootElement->TrustStatus); diff --git a/dlls/crypt32/crypt32_private.h b/dlls/crypt32/crypt32_private.h index dbf6dca..95ee67c 100644 --- a/dlls/crypt32/crypt32_private.h +++ b/dlls/crypt32/crypt32_private.h @@ -343,7 +343,7 @@ void CRYPT_ImportSystemRootCertsToReg(void) DECLSPEC_HIDDEN; BOOL CRYPT_SerializeContextsToReg(HKEY key, DWORD flags, const WINE_CONTEXT_INTERFACE *contextInterface, HCERTSTORE memStore) DECLSPEC_HIDDEN; -BOOL CRYPT_IsCertificateSelfSigned(PCCERT_CONTEXT cert) DECLSPEC_HIDDEN; +DWORD CRYPT_IsCertificateSelfSigned(const CERT_CONTEXT *cert) DECLSPEC_HIDDEN; /* Allocates and initializes a certificate chain engine, but without creating * the root store. Instead, it uses root, and assumes the caller has done any

1 0

Dmitry Timoshkov : fonts: Add clock images to Wingdings font.
by Alexandre Julliard 25 Jun '18

25 Jun '18

Module: wine Branch: master Commit: 5e3081c82d432b0a4d5e2c13819d82059ef464aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e3081c82d432b0a4d5e2c13… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jun 25 19:27:51 2018 +0800 fonts: Add clock images to Wingdings font. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- fonts/wingding.sfd | 760 ++++++++++++++++++++++++++++++++++++++++++++++++++++- fonts/wingding.ttf | Bin 6720 -> 9524 bytes 2 files changed, 758 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5e3081c82d432b0a4d5e…

1 0

Marcus Meissner : hnetcfg: GetModuleFileNameW gets characters, not bytes ( Coverity).
by Alexandre Julliard 25 Jun '18

25 Jun '18

Module: wine Branch: master Commit: 46c5eb173fa3435f0f8bfe7573a1c134be23c107 URL: https://source.winehq.org/git/wine.git/?a=commit;h=46c5eb173fa3435f0f8bfe75… Author: Marcus Meissner <meissner(a)suse.de> Date: Mon Jun 25 15:28:33 2018 +0200 hnetcfg: GetModuleFileNameW gets characters, not bytes (Coverity). Signed-off-by: Marcus Meissner <meissner(a)suse.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hnetcfg/tests/policy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/hnetcfg/tests/policy.c b/dlls/hnetcfg/tests/policy.c index f2d1372..b28535d 100644 --- a/dlls/hnetcfg/tests/policy.c +++ b/dlls/hnetcfg/tests/policy.c @@ -117,7 +117,7 @@ static void test_NetFwAuthorizedApplication(void) &IID_INetFwAuthorizedApplication, (void**)&app); ok(hr == S_OK, "got: %08x\n", hr); - hr = GetModuleFileNameW(NULL, image, sizeof(image)); + hr = GetModuleFileNameW(NULL, image, ARRAY_SIZE(image)); ok(hr, "GetModuleFileName failed: %u\n", GetLastError()); hr = INetFwAuthorizedApplication_get_ProcessImageFileName(app, NULL);

1 0

Jason Edmeades : cmd: Add support for wildcards in if exist.
by Alexandre Julliard 25 Jun '18

25 Jun '18

Module: wine Branch: master Commit: f53d57c8549dc439eb73354bfd37acd1e4e86cfd URL: https://source.winehq.org/git/wine.git/?a=commit;h=f53d57c8549dc439eb73354b… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Sun Jun 24 21:44:10 2018 +0100 cmd: Add support for wildcards in if exist. Signed-off-by: Jason Edmeades <us(a)edmeades.me.uk> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/builtins.c | 7 ++++-- programs/cmd/tests/test_builtins.cmd | 43 ++++++++++++++++++++++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 8 ++++++ 3 files changed, 56 insertions(+), 2 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 04b098e..9fc7502 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -2804,8 +2804,11 @@ void WCMD_if (WCHAR *p, CMD_LIST **cmdList) WCMD_parameter(p, 2+negate, &command, FALSE, FALSE); } else if (!lstrcmpiW (condition, existW)) { - test = (GetFileAttributesW(WCMD_parameter(p, 1+negate, NULL, FALSE, FALSE)) - != INVALID_FILE_ATTRIBUTES); + WIN32_FIND_DATAW fd; + HANDLE hff = FindFirstFileW(WCMD_parameter(p, 1+negate, NULL, FALSE, FALSE), &fd); + test = (hff != INVALID_HANDLE_VALUE ); + if (!test) FindClose(hff); + WCMD_parameter(p, 2+negate, &command, FALSE, FALSE); } else if (!lstrcmpiW (condition, defdW)) { diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 63ec3ca..d6edc5f 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -979,6 +979,49 @@ for %%i in (%WINE_STR_PARMS%) do ( for %%i in (%WINE_STR_PARMS%) do ( for %%j in (%WINE_STR_PARMS%) do ( call :GTRtest %%i %%j)) + +echo ------------ Testing if/exist ------------ +mkdir subdir +echo something>subdir\bar +echo something else>foo +if exist foo ( + echo exist explicit works +) else ( + echo ERROR exist explicit broken +) +if exist bar ( + echo ERROR exist explicit unknown file broken +) else ( + echo exist explicit unknown file works +) +if exist subdir\bar ( + echo exist explicit in subdir works +) else ( + echo ERROR exist explicit in subdir broken +) +if exist fo* ( + echo exist simple wildcard works +) else ( + echo ERROR exist simple wildcard broken +) +if exist subdir\ba* ( + echo exist wildcard works +) else ( + echo ERROR exist wildcard broken +) +if not exist subdir\ba* ( + echo ERROR negate exist wildcard broken +) else ( + echo negate exist wildcard works +) +if exist idontexist\ba* ( + echo ERROR exist wildcard bad subdir broken +) else ( + echo exist wildcard bad subdir broken works +) +del foo subdir\bar +rd subdir + echo ------ for numbers if -1 LSS 1 (echo negative numbers handled) if not -1 LSS -10 (echo negative numbers handled) diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index dcc9629..22d83c3 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -768,6 +768,14 @@ BA GTR B BA GTR AB BA GTR AA AA GTR A +------------ Testing if/exist ------------ +exist explicit works +exist explicit unknown file works +exist explicit in subdir works +exist simple wildcard works +exist wildcard works +negate exist wildcard works +exist wildcard bad subdir broken works ------ for numbers negative numbers handled negative numbers handled

1 0

Jason Edmeades : cmd: Fix subdirectory prefix in for loops.
by Alexandre Julliard 25 Jun '18

25 Jun '18

Module: wine Branch: master Commit: 15215bd07193cc31b8372424f181a31aa9364777 URL: https://source.winehq.org/git/wine.git/?a=commit;h=15215bd07193cc31b8372424… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Sun Jun 24 21:44:11 2018 +0100 cmd: Fix subdirectory prefix in for loops. A for loop can be working through a wildcarded subdirectory, but when processing the first file in the subdirectory, it stores the prefix in a static variable which gets overwritten during the 'for' body processing. Signed-off-by: Jason Edmeades <us(a)edmeades.me.uk> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/builtins.c | 10 ++++++++-- programs/cmd/tests/test_builtins.cmd | 7 +++++++ programs/cmd/tests/test_builtins.cmd.exp | 4 ++++ 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 9fc7502..35b68bd 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -2261,19 +2261,25 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { thisSet->bracketDepth >= thisDepth) { /* Loop through all entries on the same line */ - WCHAR *item; + WCHAR *staticitem; WCHAR *itemStart; WCHAR buffer[MAXSTRING]; WINE_TRACE("Processing for set %p\n", thisSet); i = 0; - while (*(item = WCMD_parameter (thisSet->command, i, &itemStart, TRUE, FALSE))) { + while (*(staticitem = WCMD_parameter (thisSet->command, i, &itemStart, TRUE, FALSE))) { /* * If the parameter within the set has a wildcard then search for matching files * otherwise do a literal substitution. */ static const WCHAR wildcards[] = {'*','?','\0'}; + + /* Take a copy of the item returned from WCMD_parameter as it is held in a + static buffer which can be overwritten during parsing of the for body */ + WCHAR item[MAXSTRING]; + strcpyW(item, staticitem); + thisCmdStart = cmdStart; itemNum++; diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index d6edc5f..6f2ef4a 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -1155,9 +1155,16 @@ mkdir foobar & cd foobar mkdir foo mkdir bar mkdir baz +mkdir pop echo > bazbaz echo --- basic wildcards for %%i in (ba*) do echo %%i +echo --- wildcards in subdirs +echo something>pop\bar1 +echo something>pop\bar2.txt +echo something>pop\bar3 +for %%f in (pop\ba*) do ( call echo %%f ) +rmdir /s/q pop echo --- for /d for /d %%i in (baz foo bar) do echo %%i 2>&1 rem Confirm we don't match files: diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 22d83c3..0eb5b96 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -917,6 +917,10 @@ B C B D --- basic wildcards bazbaz +--- wildcards in subdirs +pop\bar1(a)space@ +pop\bar2.txt(a)space@ +pop\bar3(a)space@ --- for /d baz(a)space@ foo(a)space@

1 0

Fabian Maurer : user32: Always release menu item in EnableMenuItem.
by Alexandre Julliard 25 Jun '18

25 Jun '18

Module: wine Branch: master Commit: aee9fa0e55f9282c7fd6961ac0b32e1f2d33c76c URL: https://source.winehq.org/git/wine.git/?a=commit;h=aee9fa0e55f9282c7fd6961a… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Fri Jun 22 20:32:17 2018 +0200 user32: Always release menu item in EnableMenuItem. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/menu.c | 33 +++++++++++++++------------------ 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 8c541cc..ab1ae9b 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -3741,28 +3741,25 @@ BOOL WINAPI EnableMenuItem( HMENU hMenu, UINT id, UINT wFlags ) item->fState ^= (oldflags ^ wFlags) & (MF_GRAYED | MF_DISABLED); /* If the close item in the system menu change update the close button */ - if ((item->wID == SC_CLOSE) && (oldflags != wFlags)) + if ((item->wID == SC_CLOSE) && (oldflags != wFlags) && menu->hSysMenuOwner) { - if (menu->hSysMenuOwner) - { - RECT rc; - POPUPMENU* parentMenu; - HWND hwnd; + RECT rc; + POPUPMENU* parentMenu; + HWND hwnd; - /* Get the parent menu to access*/ - parentMenu = grab_menu_ptr(menu->hSysMenuOwner); - release_menu_ptr(menu); - if (!parentMenu) - return (UINT)-1; + /* Get the parent menu to access */ + parentMenu = grab_menu_ptr(menu->hSysMenuOwner); + release_menu_ptr(menu); + if (!parentMenu) + return (UINT)-1; - hwnd = parentMenu->hWnd; - release_menu_ptr(parentMenu); + hwnd = parentMenu->hWnd; + release_menu_ptr(parentMenu); - /* Refresh the frame to reflect the change */ - WIN_GetRectangles( hwnd, COORDS_CLIENT, &rc, NULL ); - rc.bottom = 0; - RedrawWindow(hwnd, &rc, 0, RDW_FRAME | RDW_INVALIDATE | RDW_NOCHILDREN); - } + /* Refresh the frame to reflect the change */ + WIN_GetRectangles(hwnd, COORDS_CLIENT, &rc, NULL); + rc.bottom = 0; + RedrawWindow(hwnd, &rc, 0, RDW_FRAME | RDW_INVALIDATE | RDW_NOCHILDREN); } else release_menu_ptr(menu);

1 0

Matteo Bruni : d3dx10: Turn some ERR() into WARN().
by Alexandre Julliard 25 Jun '18

25 Jun '18

Module: wine Branch: master Commit: 6d801377055911d914226a3c6af8d8637a63fa13 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d801377055911d914226a3c… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Jun 21 00:48:26 2018 +0200 d3dx10: Turn some ERR() into WARN(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_43/async.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx10_43/async.c b/dlls/d3dx10_43/async.c index 1555a3d..c7d80c9 100644 --- a/dlls/d3dx10_43/async.c +++ b/dlls/d3dx10_43/async.c @@ -115,7 +115,7 @@ static HRESULT WINAPI filedataloader_Load(ID3DX10DataLoader *iface) CloseHandle(file); if (!ret) { - ERR("Failed to read file contents.\n"); + WARN("Failed to read file contents.\n"); HeapFree(GetProcessHeap(), 0, data); return E_FAIL; } @@ -175,7 +175,7 @@ static HRESULT WINAPI resourcedataloader_Load(ID3DX10DataLoader *iface) hglobal = LoadResource(loader->u.resource.module, loader->u.resource.rsrc); if (!hglobal) { - ERR("Failed to load resource.\n"); + WARN("Failed to load resource.\n"); return E_FAIL; } @@ -349,7 +349,7 @@ HRESULT WINAPI D3DX10CreateAsyncResourceLoaderA(HMODULE module, const char *reso if (!(rsrc = FindResourceA(module, resource, (const char *)RT_RCDATA))) { - ERR("Failed to find resource.\n"); + WARN("Failed to find resource.\n"); HeapFree(GetProcessHeap(), 0, object); return D3DX10_ERR_INVALID_DATA; } @@ -381,7 +381,7 @@ HRESULT WINAPI D3DX10CreateAsyncResourceLoaderW(HMODULE module, const WCHAR *res if (!(rsrc = FindResourceW(module, resource, (const WCHAR *)RT_RCDATA))) { - ERR("Failed to find resource.\n"); + WARN("Failed to find resource.\n"); HeapFree(GetProcessHeap(), 0, object); return D3DX10_ERR_INVALID_DATA; }

1 0