wine-commits January 2017

wine-commits@winehq.org

2 participants
492 discussions

Nikolay Sivov : kernel32/nls: Added genitive month names for Polish.
by Alexandre Julliard 30 Jan '17

30 Jan '17

Module: wine Branch: master Commit: ceceda61fd0c658a28c4721e1297f4cd22b57979 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ceceda61fd0c658a28c4721e1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 30 17:37:54 2017 +0300 kernel32/nls: Added genitive month names for Polish. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/nls/plk.nls | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/kernel32/nls/plk.nls b/dlls/kernel32/nls/plk.nls index 41f77ff..f4b0db8 100644 --- a/dlls/kernel32/nls/plk.nls +++ b/dlls/kernel32/nls/plk.nls @@ -109,18 +109,18 @@ STRINGTABLE LANGUAGE LANG_POLISH, SUBLANG_DEFAULT LOCALE_SLONGDATE "d MMMM yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" - LOCALE_SMONTHNAME1 "styczeń" - LOCALE_SMONTHNAME2 "luty" - LOCALE_SMONTHNAME3 "marzec" - LOCALE_SMONTHNAME4 "kwiecień" - LOCALE_SMONTHNAME5 "maj" - LOCALE_SMONTHNAME6 "czerwiec" - LOCALE_SMONTHNAME7 "lipiec" - LOCALE_SMONTHNAME8 "sierpień" - LOCALE_SMONTHNAME9 "wrzesień" - LOCALE_SMONTHNAME10 "październik" - LOCALE_SMONTHNAME11 "listopad" - LOCALE_SMONTHNAME12 "grudzień" + LOCALE_SMONTHNAME1 "styczeń\0stycznia" + LOCALE_SMONTHNAME2 "luty\0lutego" + LOCALE_SMONTHNAME3 "marzec\0marca" + LOCALE_SMONTHNAME4 "kwiecień\0kwietnia" + LOCALE_SMONTHNAME5 "maj\0maja" + LOCALE_SMONTHNAME6 "czerwiec\0czerwca" + LOCALE_SMONTHNAME7 "lipiec\0lipca" + LOCALE_SMONTHNAME8 "sierpień\0sierpnia" + LOCALE_SMONTHNAME9 "wrzesień\0września" + LOCALE_SMONTHNAME10 "październik\0października" + LOCALE_SMONTHNAME11 "listopad\0listopada" + LOCALE_SMONTHNAME12 "grudzień\0grudnia" LOCALE_SMONTHNAME13 "" LOCALE_SMONTHOUSANDSEP " " LOCALE_SNAME "pl-PL"

1 0

Michael Stefaniuc : wordpad: Avoid a TRUE : FALSE conditional expression.
by Alexandre Julliard 30 Jan '17

30 Jan '17

Module: wine Branch: master Commit: a1a48e87a39e7f3d4c733a32f8ce024b2e07881e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1a48e87a39e7f3d4c733a32f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jan 30 14:16:03 2017 +0100 wordpad: Avoid a TRUE : FALSE conditional expression. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wordpad/wordpad.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index 89bcac1..0647a19 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -2012,7 +2012,7 @@ static LRESULT OnUser( HWND hWnd ) SendMessageW(hwndFormatBar, TB_CHECKBUTTON, ID_ALIGN_CENTER, (pf.wAlignment == PFA_CENTER)); SendMessageW(hwndFormatBar, TB_CHECKBUTTON, ID_ALIGN_RIGHT, (pf.wAlignment == PFA_RIGHT)); - SendMessageW(hwndFormatBar, TB_CHECKBUTTON, ID_BULLETONOFF, pf.wNumbering ? TRUE : FALSE); + SendMessageW(hwndFormatBar, TB_CHECKBUTTON, ID_BULLETONOFF, pf.wNumbering != 0); return 0; }

1 0

Alistair Leslie-Hughes : include: Add UnlockResource prototype.
by Alexandre Julliard 30 Jan '17

30 Jan '17

Module: wine Branch: master Commit: a9e50da352e32d4c1bc8d0a686efa1e1bb7a84da URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9e50da352e32d4c1bc8d0a68… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Jan 30 07:05:03 2017 +0000 include: Add UnlockResource prototype. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winbase.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/winbase.h b/include/winbase.h index eff5972..bf14d79 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2600,6 +2600,7 @@ WINBASEAPI BOOL WINAPI TzSpecificLocalTimeToSystemTime(const TIME_ZONE_IN WINBASEAPI LONG WINAPI UnhandledExceptionFilter(PEXCEPTION_POINTERS); WINBASEAPI BOOL WINAPI UnlockFile(HANDLE,DWORD,DWORD,DWORD,DWORD); WINBASEAPI BOOL WINAPI UnlockFileEx(HANDLE,DWORD,DWORD,DWORD,LPOVERLAPPED); +#define UnlockResource(handle) ((handle), 0) #define UnlockSegment(handle) GlobalUnfix((HANDLE)(handle)) WINBASEAPI BOOL WINAPI UnmapViewOfFile(LPCVOID); WINBASEAPI HRESULT WINAPI UnregisterApplicationRestart(void);

1 0

Alex Henrie : include: Add constants for CryptProtectMemory/ CryptUnprotectMemory.
by Alexandre Julliard 30 Jan '17

30 Jan '17

Module: wine Branch: master Commit: e0f7d17507b6b8c9b0aacdbf6034dd5873d61d01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0f7d17507b6b8c9b0aacdbf6… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Jan 29 21:38:16 2017 -0700 include: Add constants for CryptProtectMemory/CryptUnprotectMemory. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wincrypt.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/wincrypt.h b/include/wincrypt.h index 88b4b65..d8b116e 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -2046,6 +2046,12 @@ static const WCHAR MS_ENH_RSA_AES_PROV_XP_W[] = { 'M','i','c','r','o','s','o','f #define CRYPTPROTECT_AUDIT 0x0010 #define CRYPTPROTECT_VERIFY_PROTECTION 0x0040 +/* Crypt{Protect,Unprotect}Memory */ +#define CRYPTPROTECTMEMORY_BLOCK_SIZE 16 +#define CRYPTPROTECTMEMORY_SAME_PROCESS 0x0000 +#define CRYPTPROTECTMEMORY_CROSS_PROCESS 0x0001 +#define CRYPTPROTECTMEMORY_SAME_LOGON 0x0002 + /* Blob Types */ #define SIMPLEBLOB 0x1 #define PUBLICKEYBLOB 0x6

1 0

Zebediah Figura : regedit/tests: Add tests for importing Win 3.1 registry files.
by Alexandre Julliard 30 Jan '17

30 Jan '17

Module: wine Branch: master Commit: da5b7704533f1b7cbfae4eb011a2da9a4cf9491a URL: http://source.winehq.org/git/wine.git/?a=commit;h=da5b7704533f1b7cbfae4eb01… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jan 29 22:09:28 2017 -0600 regedit/tests: Add tests for importing Win 3.1 registry files. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 56 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index dc49cad..f369b59 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -314,6 +314,61 @@ static void test_basic_import(void) ok(lr == ERROR_SUCCESS, "RegDeleteKeyA failed: %d\n", lr); } +static void test_basic_import_31(void) +{ + HKEY hkey; + LONG lr; + + lr = RegDeleteKeyA(HKEY_CLASSES_ROOT, KEY_BASE); + ok(lr == ERROR_SUCCESS || lr == ERROR_FILE_NOT_FOUND, + "RegDeleteKeyA failed: %d\n", lr); + + /* Test simple value */ + exec_import_str("REGEDIT\r\n" + "HKEY_CLASSES_ROOT\\" KEY_BASE " = Value0\r\n"); + lr = RegOpenKeyExA(HKEY_CLASSES_ROOT, KEY_BASE, 0, KEY_READ, &hkey); + ok(lr == ERROR_SUCCESS, "RegOpenKeyExA failed: %d\n", lr); + verify_reg(hkey, "", REG_SZ, "Value0", 7, 0); + + /* Test proper handling of spaces and equals signs */ + exec_import_str("REGEDIT\r\n" + "HKEY_CLASSES_ROOT\\" KEY_BASE " =Value1\r\n"); + verify_reg(hkey, "", REG_SZ, "Value1", 7, 0); + + exec_import_str("REGEDIT\r\n" + "HKEY_CLASSES_ROOT\\" KEY_BASE " = Value2\r\n"); + verify_reg(hkey, "", REG_SZ, " Value2", 8, 0); + + exec_import_str("REGEDIT\r\n" + "HKEY_CLASSES_ROOT\\" KEY_BASE " = Value3 \r\n"); + verify_reg(hkey, "", REG_SZ, "Value3 ", 8, 0); + + exec_import_str("REGEDIT\r\n" + "HKEY_CLASSES_ROOT\\" KEY_BASE " Value4\r\n"); + verify_reg(hkey, "", REG_SZ, "Value4", 7, 0); + + exec_import_str("REGEDIT\r\n" + "HKEY_CLASSES_ROOT\\" KEY_BASE " Value5\r\n"); + verify_reg(hkey, "", REG_SZ, "Value5", 7, 0); + + exec_import_str("REGEDIT\r\n" + "HKEY_CLASSES_ROOT\\" KEY_BASE "\r\n"); + verify_reg(hkey, "", REG_SZ, "", 1, 0); + + exec_import_str("REGEDIT\r\n" + "HKEY_CLASSES_ROOT\\" KEY_BASE " \r\n"); + verify_reg(hkey, "", REG_SZ, "", 1, 0); + + exec_import_str("REGEDIT\r\n" + "HKEY_CLASSES_ROOT\\" KEY_BASE " = No newline"); + verify_reg(hkey, "", REG_SZ, "No newline", 11, TODO_REG_SIZE | TODO_REG_DATA); + + RegCloseKey(hkey); + + lr = RegDeleteKeyA(HKEY_CLASSES_ROOT, KEY_BASE); + ok(lr == ERROR_SUCCESS, "RegDeleteKeyA failed: %d\n", lr); +} + static void test_invalid_import(void) { LONG lr; @@ -493,6 +548,7 @@ START_TEST(regedit) supports_wchar = exec_import_wstr(wchar_test); test_basic_import(); + test_basic_import_31(); test_invalid_import(); test_comments(); }

1 0

Zebediah Figura : regedit: Add support for importing Win 3.1 registry files.
by Alexandre Julliard 30 Jan '17

30 Jan '17

Module: wine Branch: master Commit: b0d475b8582710c320c470aaa327dcfa32166493 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0d475b8582710c320c470aaa… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jan 29 22:09:27 2017 -0600 regedit: Add support for importing Win 3.1 registry files. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 67 +++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 64 insertions(+), 3 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 5e4c2d2..c055c10 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -608,6 +608,49 @@ static void processRegEntry(WCHAR* stdInput, BOOL isUnicode) } } +/* version for Windows 3.1 */ +static void processRegEntry31(WCHAR *line) +{ + int key_end = 0; + WCHAR *value; + int res; + + static WCHAR empty[] = {0}; + + if (line[0] == '\0') return; + + /* get key name */ + while (line[key_end] && !isspaceW(line[key_end])) key_end++; + + value = line + key_end; + while (isspaceW(value[0])) value++; + + if (value[0] == '=') value++; + if (value[0] == ' ') value++; /* at most one space is skipped */ + + line[key_end] = '\0'; + if (openKeyW(line) != ERROR_SUCCESS) + output_message(STRING_OPEN_KEY_FAILED, line); + + res = RegSetValueExW( + currentKeyHandle, + empty, + 0, /* Reserved */ + REG_SZ, + (BYTE *)value, + (strlenW(value) + 1) * sizeof(WCHAR)); + if (res != ERROR_SUCCESS) + output_message(STRING_SETVALUE_FAILED, empty, currentKeyName); + + closeKey(); +} + +/* version constants */ + +#define REG_VERSION_31 3 +#define REG_VERSION_40 4 +#define REG_VERSION_50 5 + /****************************************************************************** * Processes a registry file. * Correctly processes comments (in # and ; form), line continuation. @@ -624,6 +667,11 @@ static void processRegLinesA(FILE *in, char* first_chars) char *s; /* A pointer to buf for fread */ char *line; /* The start of the current line */ WCHAR *lineW; + unsigned long version = 0; + + static const char header_31[] = "REGEDIT"; + static const char header_40[] = "REGEDIT4"; + static const char header_50[] = "Windows Registry Editor Version 5.00"; buf = HeapAlloc(GetProcessHeap(), 0, line_size); CHECK_ENOUGH_MEMORY(buf); @@ -720,9 +768,22 @@ static void processRegLinesA(FILE *in, char* first_chars) *s_eol++ = '\0'; *s_eol = '\0'; - lineW = GetWideString(line); - processRegEntry(lineW, FALSE); - HeapFree(GetProcessHeap(), 0, lineW); + /* Check if the line is a header string */ + if (!memcmp(line, header_31, sizeof(header_31))) { + version = REG_VERSION_31; + } else if (!memcmp(line, header_40, sizeof(header_40))) { + version = REG_VERSION_40; + } else if (!memcmp(line, header_50, sizeof(header_50))) { + version = REG_VERSION_50; + } else { + lineW = GetWideString(line); + if (version == REG_VERSION_31) { + processRegEntry31(lineW); + } else if(version == REG_VERSION_40 || version == REG_VERSION_50) { + processRegEntry(lineW, FALSE); + } + HeapFree(GetProcessHeap(), 0, lineW); + } line = s_eol + 1; } }

1 0

Jacek Caban : ntdll: Check output buffer before server_write_file call.
by Alexandre Julliard 30 Jan '17

30 Jan '17

Module: wine Branch: master Commit: 0d23bfd3982fb0140f7319425e782f67a9e571a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d23bfd3982fb0140f7319425… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 26 00:51:35 2017 +0100 ntdll: Check output buffer before server_write_file call. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 8 ++++---- dlls/ntdll/tests/file.c | 17 +++++++++++++++++ 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 93374c8..907c2aa 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -1227,16 +1227,13 @@ NTSTATUS WINAPI NtWriteFile(HANDLE hFile, HANDLE hEvent, status = server_get_unix_fd( hFile, FILE_WRITE_DATA, &unix_handle, &needs_close, &type, &options ); - if (status == STATUS_BAD_DEVICE_TYPE) - return server_write_file( hFile, hEvent, apc, apc_user, io_status, buffer, length, offset, key ); - if (status == STATUS_ACCESS_DENIED) { status = server_get_unix_fd( hFile, FILE_APPEND_DATA, &unix_handle, &needs_close, &type, &options ); append_write = TRUE; } - if (status) return status; + if (status && status != STATUS_BAD_DEVICE_TYPE) return status; if (!virtual_check_buffer_for_read( buffer, length )) { @@ -1244,6 +1241,9 @@ NTSTATUS WINAPI NtWriteFile(HANDLE hFile, HANDLE hEvent, goto done; } + if (status == STATUS_BAD_DEVICE_TYPE) + return server_write_file( hFile, hEvent, apc, apc_user, io_status, buffer, length, offset, key ); + async_write = !(options & (FILE_SYNCHRONOUS_IO_ALERT | FILE_SYNCHRONOUS_IO_NONALERT)); if (type == FD_TYPE_FILE) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index d56843d..57d7df9 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -3484,6 +3484,14 @@ static void test_read_write(void) ok(U(iob).Status == -1, "expected -1, got %#x\n", U(iob).Status); ok(iob.Information == -1, "expected -1, got %lu\n", iob.Information); + U(iob).Status = -1; + iob.Information = -1; + offset.QuadPart = 0; + status = pNtWriteFile(INVALID_HANDLE_VALUE, 0, NULL, NULL, &iob, buf, sizeof(buf), &offset, NULL); + ok(status == STATUS_OBJECT_TYPE_MISMATCH || status == STATUS_INVALID_HANDLE, "expected STATUS_OBJECT_TYPE_MISMATCH, got %#x\n", status); + ok(U(iob).Status == -1, "expected -1, got %#x\n", U(iob).Status); + ok(iob.Information == -1, "expected -1, got %lu\n", iob.Information); + hfile = create_temp_file(0); if (!hfile) return; @@ -3496,6 +3504,15 @@ static void test_read_write(void) U(iob).Status = -1; iob.Information = -1; + SetEvent(event); + status = pNtWriteFile(hfile, event, NULL, NULL, &iob, NULL, sizeof(contents), NULL, NULL); + ok(status == STATUS_INVALID_USER_BUFFER, "expected STATUS_INVALID_USER_BUFFER, got %#x\n", status); + ok(U(iob).Status == -1, "expected -1, got %#x\n", U(iob).Status); + ok(iob.Information == -1, "expected -1, got %lu\n", iob.Information); + ok(!is_signaled(event), "event is not signaled\n"); + + U(iob).Status = -1; + iob.Information = -1; status = pNtReadFile(hfile, 0, NULL, NULL, &iob, NULL, sizeof(contents), NULL, NULL); ok(status == STATUS_ACCESS_VIOLATION, "expected STATUS_ACCESS_VIOLATION, got %#x\n", status); ok(U(iob).Status == -1, "expected -1, got %#x\n", U(iob).Status);

1 0

Jacek Caban : ntdll: Check input buffer before server_read_file call and don' t touch event on error.
by Alexandre Julliard 30 Jan '17

30 Jan '17

Module: wine Branch: master Commit: a240bfcf9b614bc52036bf241177b1856ebb4a65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a240bfcf9b614bc52036bf241… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 26 00:51:24 2017 +0100 ntdll: Check input buffer before server_read_file call and don't touch event on error. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 12 ++++-------- dlls/ntdll/tests/file.c | 31 ++++++++++++++++++++++++++++++- 2 files changed, 34 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index e1583da..93374c8 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -853,19 +853,15 @@ NTSTATUS WINAPI NtReadFile(HANDLE hFile, HANDLE hEvent, status = server_get_unix_fd( hFile, FILE_READ_DATA, &unix_handle, &needs_close, &type, &options ); + if (status && status != STATUS_BAD_DEVICE_TYPE) return status; + + if (!virtual_check_buffer_for_write( buffer, length )) return STATUS_ACCESS_VIOLATION; + if (status == STATUS_BAD_DEVICE_TYPE) return server_read_file( hFile, hEvent, apc, apc_user, io_status, buffer, length, offset, key ); - if (status) return status; - async_read = !(options & (FILE_SYNCHRONOUS_IO_ALERT | FILE_SYNCHRONOUS_IO_NONALERT)); - if (!virtual_check_buffer_for_write( buffer, length )) - { - status = STATUS_ACCESS_VIOLATION; - goto done; - } - if (type == FD_TYPE_FILE) { if (async_read && (!offset || offset->QuadPart < 0)) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 586b2c9..d56843d 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -3451,13 +3451,15 @@ static void test_read_write(void) { static const char contents[14] = "1234567890abcd"; char buf[256]; - HANDLE hfile; + HANDLE hfile, event; OVERLAPPED ovl; IO_STATUS_BLOCK iob; DWORD ret, bytes, status, off; LARGE_INTEGER offset; LONG i; + event = CreateEventA( NULL, TRUE, FALSE, NULL ); + U(iob).Status = -1; iob.Information = -1; offset.QuadPart = 0; @@ -3469,6 +3471,14 @@ static void test_read_write(void) U(iob).Status = -1; iob.Information = -1; offset.QuadPart = 0; + status = pNtReadFile(INVALID_HANDLE_VALUE, 0, NULL, NULL, &iob, NULL, sizeof(buf), &offset, NULL); + ok(status == STATUS_OBJECT_TYPE_MISMATCH || status == STATUS_INVALID_HANDLE, "expected STATUS_OBJECT_TYPE_MISMATCH, got %#x\n", status); + ok(U(iob).Status == -1, "expected -1, got %#x\n", U(iob).Status); + ok(iob.Information == -1, "expected -1, got %lu\n", iob.Information); + + U(iob).Status = -1; + iob.Information = -1; + offset.QuadPart = 0; status = pNtWriteFile(INVALID_HANDLE_VALUE, 0, NULL, NULL, &iob, buf, sizeof(buf), &offset, NULL); ok(status == STATUS_OBJECT_TYPE_MISMATCH || status == STATUS_INVALID_HANDLE, "expected STATUS_OBJECT_TYPE_MISMATCH, got %#x\n", status); ok(U(iob).Status == -1, "expected -1, got %#x\n", U(iob).Status); @@ -3493,6 +3503,24 @@ static void test_read_write(void) U(iob).Status = -1; iob.Information = -1; + SetEvent(event); + status = pNtReadFile(hfile, event, NULL, NULL, &iob, NULL, sizeof(contents), NULL, NULL); + ok(status == STATUS_ACCESS_VIOLATION, "expected STATUS_ACCESS_VIOLATION, got %#x\n", status); + ok(U(iob).Status == -1, "expected -1, got %#x\n", U(iob).Status); + ok(iob.Information == -1, "expected -1, got %lu\n", iob.Information); + ok(is_signaled(event), "event is not signaled\n"); + + U(iob).Status = -1; + iob.Information = -1; + SetEvent(event); + status = pNtReadFile(hfile, event, NULL, NULL, &iob, (void*)0xdeadbeef, sizeof(contents), NULL, NULL); + ok(status == STATUS_ACCESS_VIOLATION, "expected STATUS_ACCESS_VIOLATION, got %#x\n", status); + ok(U(iob).Status == -1, "expected -1, got %#x\n", U(iob).Status); + ok(iob.Information == -1, "expected -1, got %lu\n", iob.Information); + ok(is_signaled(event), "event is not signaled\n"); + + U(iob).Status = -1; + iob.Information = -1; status = pNtWriteFile(hfile, 0, NULL, NULL, &iob, contents, 7, NULL, NULL); ok(status == STATUS_SUCCESS, "NtWriteFile error %#x\n", status); ok(U(iob).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", U(iob).Status); @@ -4156,6 +4184,7 @@ static void test_read_write(void) off = SetFilePointer(hfile, 0, NULL, FILE_CURRENT); ok(off == 0, "expected 0, got %u\n", off); + CloseHandle(event); CloseHandle(hfile); }

1 0

Jacek Caban : kernel32/tests: Don't mark win8+ result as broken.
by Alexandre Julliard 30 Jan '17

30 Jan '17

Module: wine Branch: master Commit: f608a4130c39c7b8dfaf2bb77c4647eb91ac1d49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f608a4130c39c7b8dfaf2bb77… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 26 00:51:09 2017 +0100 kernel32/tests: Don't mark win8+ result as broken. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/pipe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 33440bf..45c6fd9 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -1522,7 +1522,7 @@ static void test_CloseHandle(void) numbytes = 0xdeadbeef; memset(buffer, 0, sizeof(buffer)); ret = ReadFile(hpipe, buffer, 0, &numbytes, NULL); - todo_wine ok(ret || broken(GetLastError() == ERROR_MORE_DATA) /* >= Win 8 */, + todo_wine ok(ret || GetLastError() == ERROR_MORE_DATA /* >= Win 8 */, "ReadFile failed with %u\n", GetLastError()); ok(numbytes == 0, "expected 0, got %u\n", numbytes);

1 0

Henri Verbeet : wined3d: Return success in wined3d_buffer_load_location() when the location is already current.
by Alexandre Julliard 30 Jan '17

30 Jan '17

Module: wine Branch: master Commit: ca6014b19aad2b826c276daea14755e915b40d09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca6014b19aad2b826c276daea… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 30 13:04:41 2017 +0100 wined3d: Return success in wined3d_buffer_load_location() when the location is already current. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index abf3f7f..6b48d98 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -574,7 +574,7 @@ BOOL wined3d_buffer_load_location(struct wined3d_buffer *buffer, if (buffer->locations & location) { TRACE("Location (%#x) is already up to date.\n", location); - return WINED3D_OK; + return TRUE; } if (!buffer->locations)

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
50
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2017