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

Paul Chitescu : winex11.drv: Post a WM_SYSCOMMAND SC_CLOSE when the window manager asks to close a window .
by Alexandre Julliard 16 Jun '10

16 Jun '10

Module: wine Branch: master Commit: 02674b2b95a4a9125af44470c14ccbcef9608c8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=02674b2b95a4a9125af44470c… Author: Paul Chitescu <paulc(a)voip.null.ro> Date: Wed Jun 16 11:06:15 2010 +0300 winex11.drv: Post a WM_SYSCOMMAND SC_CLOSE when the window manager asks to close a window. --- dlls/winex11.drv/event.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 5bb1ecf..64d1992 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -553,11 +553,7 @@ static void handle_wm_protocols( HWND hwnd, XClientMessageEvent *event ) } } - /* Simulate pressing Alt+F4 */ - keybd_event(VK_MENU, 0, 0, 0); - keybd_event(VK_F4, 0, 0, 0); - keybd_event(VK_F4, 0, KEYEVENTF_KEYUP, 0); - keybd_event(VK_MENU, 0, KEYEVENTF_KEYUP, 0); + PostMessageW( hwnd, WM_SYSCOMMAND, SC_CLOSE, 0 ); } } else if (protocol == x11drv_atom(WM_TAKE_FOCUS))

1 0

Alexandre Julliard : wrc: Avoid use of toupper/isupper on signed chars.
by Alexandre Julliard 16 Jun '10

16 Jun '10

Module: wine Branch: master Commit: cdf6947080695a288fec566506cb3dac99e915fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdf6947080695a288fec56650… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 16 12:02:34 2010 +0200 wrc: Avoid use of toupper/isupper on signed chars. --- tools/wrc/parser.l | 9 ++++++--- tools/wrc/parser.y | 10 +++++++--- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/tools/wrc/parser.l b/tools/wrc/parser.l index e048665..834c568 100644 --- a/tools/wrc/parser.l +++ b/tools/wrc/parser.l @@ -397,9 +397,12 @@ static unsigned long xstrtoul(const char *nptr, char **endptr, int base) \{ return tBEGIN; \} return tEND; -[0-9]+[lL]? { parser_lval.num = xstrtoul(yytext, 0, 10); return toupper(yytext[yyleng-1]) == 'L' ? tLNUMBER : tNUMBER; } -0[xX][0-9A-Fa-f]+[lL]? { parser_lval.num = xstrtoul(yytext, 0, 16); return toupper(yytext[yyleng-1]) == 'L' ? tLNUMBER : tNUMBER; } -0[oO][0-7]+[lL]? { parser_lval.num = xstrtoul(yytext+2, 0, 8); return toupper(yytext[yyleng-1]) == 'L' ? tLNUMBER : tNUMBER; } +[0-9]+[lL]? { parser_lval.num = xstrtoul(yytext, 0, 10); + return (yytext[yyleng-1] == 'L' || yytext[yyleng-1] == 'l') ? tLNUMBER : tNUMBER; } +0[xX][0-9A-Fa-f]+[lL]? { parser_lval.num = xstrtoul(yytext, 0, 16); + return (yytext[yyleng-1] == 'L' || yytext[yyleng-1] == 'l') ? tLNUMBER : tNUMBER; } +0[oO][0-7]+[lL]? { parser_lval.num = xstrtoul(yytext+2, 0, 8); + return (yytext[yyleng-1] == 'L' || yytext[yyleng-1] == 'l') ? tLNUMBER : tNUMBER; } /* * The next two rules scan identifiers and filenames. diff --git a/tools/wrc/parser.y b/tools/wrc/parser.y index a62bccf..cfc02f9 100644 --- a/tools/wrc/parser.y +++ b/tools/wrc/parser.y @@ -2172,7 +2172,9 @@ static event_t *add_string_event(string_t *key, int id, int flags, event_t *prev if(key->type == str_char) { - if((flags & WRC_AF_VIRTKEY) && (!isupper(key->str.cstr[0] & 0xff) && !isdigit(key->str.cstr[0] & 0xff))) + if((flags & WRC_AF_VIRTKEY) && + !((key->str.cstr[0] >= 'A' && key->str.cstr[0] <= 'Z') || + (key->str.cstr[0] >= '0' && key->str.cstr[0] <= '9'))) yyerror("VIRTKEY code is not equal to ascii value"); if(key->str.cstr[0] == '^' && (flags & WRC_AF_CONTROL) != 0) @@ -2181,7 +2183,7 @@ static event_t *add_string_event(string_t *key, int id, int flags, event_t *prev } else if(key->str.cstr[0] == '^') { - keycode = toupper(key->str.cstr[1]) - '@'; + keycode = toupper((unsigned char)key->str.cstr[1]) - '@'; if(keycode >= ' ') yyerror("Control-code out of range"); } @@ -2190,7 +2192,9 @@ static event_t *add_string_event(string_t *key, int id, int flags, event_t *prev } else { - if((flags & WRC_AF_VIRTKEY) && !isupperW(key->str.wstr[0]) && !isdigitW(key->str.wstr[0])) + if((flags & WRC_AF_VIRTKEY) && + !((key->str.wstr[0] >= 'A' && key->str.wstr[0] <= 'Z') || + (key->str.wstr[0] >= '0' && key->str.wstr[0] <= '9'))) yyerror("VIRTKEY code is not equal to ascii value"); if(key->str.wstr[0] == '^' && (flags & WRC_AF_CONTROL) != 0)

1 0

Alexandre Julliard : user32: Don' t try to alpha blend icons when drawing to a monochrome device.
by Alexandre Julliard 16 Jun '10

16 Jun '10

Module: wine Branch: master Commit: d87715c831de95cd4ba572db275ac2f0e856dfac URL: http://source.winehq.org/git/wine.git/?a=commit;h=d87715c831de95cd4ba572db2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 16 14:54:37 2010 +0200 user32: Don't try to alpha blend icons when drawing to a monochrome device. --- dlls/user32/cursoricon.c | 18 ++++++++++++++---- 1 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 0f8d7da..9a1810e 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -2054,11 +2054,21 @@ BOOL WINAPI DrawIconEx( HDC hdc, INT x0, INT y0, HICON hIcon, if (ptr->alpha && (flags & DI_IMAGE)) { - BLENDFUNCTION pixelblend = { AC_SRC_OVER, 0, 255, AC_SRC_ALPHA }; + BOOL is_mono = FALSE; - SelectObject( hMemDC, ptr->alpha ); - if (GdiAlphaBlend( hdc_dest, x, y, cxWidth, cyWidth, hMemDC, - 0, 0, ptr->width, ptr->height, pixelblend )) goto done; + if (GetObjectType( hdc_dest ) == OBJ_MEMDC) + { + BITMAP bm; + HBITMAP bmp = GetCurrentObject( hdc_dest, OBJ_BITMAP ); + is_mono = GetObjectW( bmp, sizeof(bm), &bm ) && bm.bmBitsPixel == 1; + } + if (!is_mono) + { + BLENDFUNCTION pixelblend = { AC_SRC_OVER, 0, 255, AC_SRC_ALPHA }; + SelectObject( hMemDC, ptr->alpha ); + if (GdiAlphaBlend( hdc_dest, x, y, cxWidth, cyWidth, hMemDC, + 0, 0, ptr->width, ptr->height, pixelblend )) goto done; + } } if (flags & DI_MASK)

1 0

Damjan Jovanovic : kernel32: Stop CopyFile from overwriting a file with itself.
by Alexandre Julliard 16 Jun '10

16 Jun '10

Module: wine Branch: master Commit: 06de0195d0ac02aabd03beaaffb29cb5b438791e URL: http://source.winehq.org/git/wine.git/?a=commit;h=06de0195d0ac02aabd03beaaf… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Wed Jun 16 12:00:59 2010 +0200 kernel32: Stop CopyFile from overwriting a file with itself. --- dlls/kernel32/path.c | 37 +++++++++++++++++++++++++++++++++++++ dlls/kernel32/tests/file.c | 2 +- 2 files changed, 38 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index c319cb5..f0da96c 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -869,6 +869,24 @@ DWORD WINAPI SearchPathA( LPCSTR path, LPCSTR name, LPCSTR ext, return ret; } +static BOOL is_same_file(HANDLE h1, HANDLE h2) +{ + int fd1; + BOOL ret = FALSE; + if (wine_server_handle_to_fd(h1, 0, &fd1, NULL) == STATUS_SUCCESS) + { + int fd2; + if (wine_server_handle_to_fd(h2, 0, &fd2, NULL) == STATUS_SUCCESS) + { + struct stat stat1, stat2; + if (fstat(fd1, &stat1) == 0 && fstat(fd2, &stat2) == 0) + ret = (stat1.st_dev == stat2.st_dev && stat1.st_ino == stat2.st_ino); + wine_server_release_fd(h2, fd2); + } + wine_server_release_fd(h1, fd1); + } + return ret; +} /************************************************************************** * CopyFileW (KERNEL32.@) @@ -911,6 +929,25 @@ BOOL WINAPI CopyFileW( LPCWSTR source, LPCWSTR dest, BOOL fail_if_exists ) return FALSE; } + if (!fail_if_exists) + { + BOOL same_file = FALSE; + h2 = CreateFileW( dest, 0, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, + OPEN_EXISTING, 0, 0); + if (h2 != INVALID_HANDLE_VALUE) + { + same_file = is_same_file( h1, h2 ); + CloseHandle( h2 ); + } + if (same_file) + { + HeapFree( GetProcessHeap(), 0, buffer ); + CloseHandle( h1 ); + SetLastError( ERROR_SHARING_VIOLATION ); + return FALSE; + } + } + if ((h2 = CreateFileW( dest, GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, fail_if_exists ? CREATE_NEW : CREATE_ALWAYS, info.dwFileAttributes, h1 )) == INVALID_HANDLE_VALUE) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 7e6b3de..c0a36c7 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -593,7 +593,7 @@ static void test_CopyFileA(void) /* copying a file to itself must fail */ retok = CopyFileA(source, source, FALSE); - todo_wine ok( !retok && (GetLastError() == ERROR_SHARING_VIOLATION || broken(GetLastError() == ERROR_FILE_EXISTS) /* Win 9x */), + ok( !retok && (GetLastError() == ERROR_SHARING_VIOLATION || broken(GetLastError() == ERROR_FILE_EXISTS) /* Win 9x */), "copying a file to itself didn't fail (ret=%d, err=%d)\n", retok, GetLastError()); /* make the source have not zero size */

1 0

Alexandre Julliard : ntdll: Print a warning when failing to set execute permissions on a section.
by Alexandre Julliard 16 Jun '10

16 Jun '10

Module: wine Branch: master Commit: b9a13d6d819ac265b1a75005045b42edfecfb704 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9a13d6d819ac265b1a750050… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 16 20:06:47 2010 +0200 ntdll: Print a warning when failing to set execute permissions on a section. --- dlls/ntdll/virtual.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 23a5d4c..84427fb 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1285,7 +1285,9 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz (nt->OptionalHeader.AddressOfEntryPoint < sec->VirtualAddress + size)) vprot |= VPROT_EXEC; - VIRTUAL_SetProt( view, ptr + sec->VirtualAddress, size, vprot ); + if (!VIRTUAL_SetProt( view, ptr + sec->VirtualAddress, size, vprot ) && (vprot & VPROT_EXEC)) + ERR( "failed to set %08x protection on section %.8s, noexec filesystem?\n", + sec->Characteristics, sec->Name ); } done:

1 0

Alexandre Julliard : ws2_32/tests: Reorder includes so that winsock. h is included before system headers.
by Alexandre Julliard 16 Jun '10

16 Jun '10

Module: wine Branch: master Commit: 76efc82860b4d2d53e81370e67207d0a842d5e75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76efc82860b4d2d53e81370e6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 15 22:55:48 2010 +0200 ws2_32/tests: Reorder includes so that winsock.h is included before system headers. --- dlls/ws2_32/tests/sock.c | 13 +++---------- 1 files changed, 3 insertions(+), 10 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 6356d9f..c405053 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -20,20 +20,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdio.h> -#include <stdarg.h> - -#include "ntstatus.h" +#include <ntstatus.h> #define WIN32_NO_STATUS -#include <windef.h> -#include <winbase.h> -#include <winsock2.h> +#include <windows.h> #include <ws2tcpip.h> #include <mswsock.h> +#include <stdio.h> #include "wine/test.h" -#include <winnt.h> -#include <winerror.h> -#include <winuser.h> #define MAX_CLIENTS 4 /* Max number of clients */ #define NUM_TESTS 4 /* Number of tests performed */

1 0

Juan Lang : crypt32: Add support for szCERT_STORE_PROV_PKCS7 to CertOpenStore.
by Alexandre Julliard 16 Jun '10

16 Jun '10

Module: wine Branch: master Commit: 1cff4f5229104d91cc87b84b415587c9c400014a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cff4f5229104d91cc87b84b4… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Jun 15 10:37:45 2010 -0700 crypt32: Add support for szCERT_STORE_PROV_PKCS7 to CertOpenStore. --- dlls/crypt32/store.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c index da3de56..dc18786 100644 --- a/dlls/crypt32/store.c +++ b/dlls/crypt32/store.c @@ -799,6 +799,8 @@ HCERTSTORE WINAPI CertOpenStore(LPCSTR lpszStoreProvider, openFunc = CRYPT_FileOpenStore; else if (!strcasecmp(lpszStoreProvider, sz_CERT_STORE_PROV_SYSTEM)) openFunc = CRYPT_SysOpenStoreW; + else if (!strcasecmp(lpszStoreProvider, sz_CERT_STORE_PROV_PKCS7)) + openFunc = CRYPT_PKCSOpenStore; else if (!strcasecmp(lpszStoreProvider, sz_CERT_STORE_PROV_COLLECTION)) openFunc = CRYPT_CollectionOpenStore; else if (!strcasecmp(lpszStoreProvider, sz_CERT_STORE_PROV_SYSTEM_REGISTRY))

1 0

Juan Lang : crypt32/tests: Test opening serialized stores.
by Alexandre Julliard 16 Jun '10

16 Jun '10

Module: wine Branch: master Commit: ecbb3c3f18f261aa4a1e5532af9267dbed6cef3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecbb3c3f18f261aa4a1e5532a… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Jun 15 11:23:35 2010 -0700 crypt32/tests: Test opening serialized stores. --- dlls/crypt32/tests/store.c | 67 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 67 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/store.c b/dlls/crypt32/tests/store.c index de5a9d4..652eac9 100644 --- a/dlls/crypt32/tests/store.c +++ b/dlls/crypt32/tests/store.c @@ -1764,6 +1764,72 @@ static void testMessageStore(void) "Expected CRYPT_E_ASN1_BADTAG, got %08x\n", GetLastError()); } +static void testSerializedStore(void) +{ + HCERTSTORE store; + CRYPT_DATA_BLOB blob; + + if (0) + { + /* Crash */ + store = CertOpenStore(CERT_STORE_PROV_SERIALIZED, 0, 0, 0, NULL); + store = CertOpenStore(CERT_STORE_PROV_SERIALIZED, 0, 0, + CERT_STORE_DELETE_FLAG, NULL); + } + blob.cbData = sizeof(serializedStoreWithCert); + blob.pbData = (BYTE *)serializedStoreWithCert; + store = CertOpenStore(CERT_STORE_PROV_SERIALIZED, 0, 0, + CERT_STORE_DELETE_FLAG, &blob); + todo_wine + ok(!store && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED, + "Expected ERROR_CALL_NOT_IMPLEMENTED, got %08x\n", GetLastError()); + store = CertOpenStore(CERT_STORE_PROV_SERIALIZED, 0, 0, 0, &blob); + todo_wine + ok(store != NULL, "CertOpenStore failed: %08x\n", GetLastError()); + if (store) + { + PCCERT_CONTEXT cert; + PCCRL_CONTEXT crl; + + cert = CertEnumCertificatesInStore(store, NULL); + ok(cert != NULL, "CertEnumCertificatesInStore failed: %08x\n", + GetLastError()); + cert = CertEnumCertificatesInStore(store, cert); + ok(!cert, "Expected only one cert\n"); + if (pCertEnumCRLsInStore) + { + crl = pCertEnumCRLsInStore(store, NULL); + ok(!crl, "Expected no CRLs\n"); + } + CertCloseStore(store, 0); + } + blob.cbData = sizeof(serializedStoreWithCertAndCRL); + blob.pbData = (BYTE *)serializedStoreWithCertAndCRL; + store = CertOpenStore(CERT_STORE_PROV_SERIALIZED, 0, 0, 0, &blob); + todo_wine + ok(store != NULL, "CertOpenStore failed: %08x\n", GetLastError()); + if (store) + { + PCCERT_CONTEXT cert; + PCCRL_CONTEXT crl; + + cert = CertEnumCertificatesInStore(store, NULL); + ok(cert != NULL, "CertEnumCertificatesInStore failed: %08x\n", + GetLastError()); + cert = CertEnumCertificatesInStore(store, cert); + ok(!cert, "Expected only one cert\n"); + if (pCertEnumCRLsInStore) + { + crl = pCertEnumCRLsInStore(store, NULL); + ok(crl != NULL, "CertEnumCRLsInStore failed: %08x\n", + GetLastError()); + crl = pCertEnumCRLsInStore(store, crl); + ok(!crl, "Expected only one CRL\n"); + } + CertCloseStore(store, 0); + } +} + static void testCertOpenSystemStore(void) { HCERTSTORE store; @@ -2520,6 +2586,7 @@ START_TEST(store) testFileStore(); testFileNameStore(); testMessageStore(); + testSerializedStore(); testCertOpenSystemStore(); testCertEnumSystemStore();

1 0

Juan Lang : crypt32: Terminate reading a serialized store upon reading an empty property.
by Alexandre Julliard 16 Jun '10

16 Jun '10

Module: wine Branch: master Commit: 02b9e3198aa5a62c4f5b9b885365b699088d8e60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02b9e3198aa5a62c4f5b9b885… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Jun 15 12:17:30 2010 -0700 crypt32: Terminate reading a serialized store upon reading an empty property. --- dlls/crypt32/serialize.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/serialize.c b/dlls/crypt32/serialize.c index 0c366bf..095a492 100644 --- a/dlls/crypt32/serialize.c +++ b/dlls/crypt32/serialize.c @@ -472,7 +472,9 @@ static BOOL CRYPT_ReadSerializedStore(void *handle, buf = CryptMemAlloc(propHdr.cb); bufSize = propHdr.cb; } - if (buf) + if (!propHdr.cb) + ; /* Property is empty, nothing to do */ + else if (buf) { ret = read_func(handle, buf, propHdr.cb, &read); if (ret && read == propHdr.cb) @@ -516,7 +518,7 @@ static BOOL CRYPT_ReadSerializedStore(void *handle, else ret = FALSE; } - } while (ret && read > 0); + } while (ret && read > 0 && propHdr.cb); if (contextInterface && context) { /* Free the last context added */

1 0

Juan Lang : crypt32: Increment current pointer on successful reads from memory.
by Alexandre Julliard 16 Jun '10

16 Jun '10

Module: wine Branch: master Commit: 06a3cea1cd5dd122b66f6a77feef4c62d5cb91f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06a3cea1cd5dd122b66f6a77f… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Jun 15 11:53:22 2010 -0700 crypt32: Increment current pointer on successful reads from memory. --- dlls/crypt32/serialize.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/serialize.c b/dlls/crypt32/serialize.c index 095a492..ab4c48a 100644 --- a/dlls/crypt32/serialize.c +++ b/dlls/crypt32/serialize.c @@ -562,6 +562,12 @@ static BOOL read_blob_wrapper(void *handle, void *buffer, DWORD bytesToRead, { *bytesRead = min(bytesToRead, reader->blob->cbData - reader->current); memcpy(buffer, reader->blob->pbData + reader->current, *bytesRead); + reader->current += *bytesRead; + ret = TRUE; + } + else if (reader->current == reader->blob->cbData) + { + *bytesRead = 0; ret = TRUE; } else

1 0