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

Damjan Jovanovic : configure: Detect mingw32 better on FreeBSD.
by Alexandre Julliard 15 Jun '12

15 Jun '12

Module: wine Branch: master Commit: 009ad8a4757672fa269752070407b1ae609930be URL: http://source.winehq.org/git/wine.git/?a=commit;h=009ad8a4757672fa269752070… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Thu Jun 14 08:20:58 2012 +0200 configure: Detect mingw32 better on FreeBSD. --- aclocal.m4 | 3 ++- configure | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index e7767ad..0062982 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -126,7 +126,8 @@ AC_DEFUN([WINE_CHECK_MINGW_PROG], [case "$host_cpu" in i[[3456789]]86*) ac_prefix_list="m4_foreach([ac_wine_prefix],[w64-mingw32, pc-mingw32, mingw32msvc, mingw32], - m4_foreach([ac_wine_cpu],[i686,i586,i486,i386],[ac_wine_cpu-ac_wine_prefix-$2 ]))" ;; + m4_foreach([ac_wine_cpu],[i686,i586,i486,i386],[ac_wine_cpu-ac_wine_prefix-$2 ])) + mingw32-$2" ;; x86_64) ac_prefix_list="m4_foreach([ac_wine_prefix],[pc-mingw32, w64-mingw32, mingw32msvc], m4_foreach([ac_wine_cpu],[x86_64,amd64],[ac_wine_cpu-ac_wine_prefix-$2 ]))" ;; diff --git a/configure b/configure index e5ccfa8..81d7390 100755 --- a/configure +++ b/configure @@ -7127,7 +7127,8 @@ if test "$cross_compiling" = "no" -a "x$enable_tests" != xno -a "$LIBEXT" != "dl then case "$host_cpu" in i[3456789]86*) - ac_prefix_list="i686-w64-mingw32-gcc i586-w64-mingw32-gcc i486-w64-mingw32-gcc i386-w64-mingw32-gcc i686-pc-mingw32-gcc i586-pc-mingw32-gcc i486-pc-mingw32-gcc i386-pc-mingw32-gcc i686-mingw32msvc-gcc i586-mingw32msvc-gcc i486-mingw32msvc-gcc i386-mingw32msvc-gcc i686-mingw32-gcc i586-mingw32-gcc i486-mingw32-gcc i386-mingw32-gcc " ;; + ac_prefix_list="i686-w64-mingw32-gcc i586-w64-mingw32-gcc i486-w64-mingw32-gcc i386-w64-mingw32-gcc i686-pc-mingw32-gcc i586-pc-mingw32-gcc i486-pc-mingw32-gcc i386-pc-mingw32-gcc i686-mingw32msvc-gcc i586-mingw32msvc-gcc i486-mingw32msvc-gcc i386-mingw32msvc-gcc i686-mingw32-gcc i586-mingw32-gcc i486-mingw32-gcc i386-mingw32-gcc + mingw32-gcc" ;; x86_64) ac_prefix_list="x86_64-pc-mingw32-gcc amd64-pc-mingw32-gcc x86_64-w64-mingw32-gcc amd64-w64-mingw32-gcc x86_64-mingw32msvc-gcc amd64-mingw32msvc-gcc " ;; *)

1 0

Damjan Jovanovic : winebuild: Support the mingw32 target without an i[3456] 86- prefix.
by Alexandre Julliard 15 Jun '12

15 Jun '12

Module: wine Branch: master Commit: 4768b11c2454168bba62d710f5c66e466620aa66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4768b11c2454168bba62d710f… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Thu Jun 14 20:34:47 2012 +0200 winebuild: Support the mingw32 target without an i[3456]86- prefix. --- tools/winebuild/main.c | 21 +++++++++++++++------ 1 files changed, 15 insertions(+), 6 deletions(-) diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index 0eeeb04..28ecec8 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -191,12 +191,21 @@ static void set_target( const char *target ) /* get the CPU part */ - if (!(p = strchr( spec, '-' ))) fatal_error( "Invalid target specification '%s'\n", target ); - *p++ = 0; - if ((target_cpu = get_cpu_from_name( spec )) == -1) - fatal_error( "Unrecognized CPU '%s'\n", spec ); - platform = p; - if ((p = strrchr( p, '-' ))) platform = p + 1; + if ((p = strchr( spec, '-' ))) + { + *p++ = 0; + if ((target_cpu = get_cpu_from_name( spec )) == -1) + fatal_error( "Unrecognized CPU '%s'\n", spec ); + platform = p; + if ((p = strrchr( p, '-' ))) platform = p + 1; + } + else if (!strcmp( spec, "mingw32" )) + { + target_cpu = CPU_x86; + platform = spec; + } + else + fatal_error( "Invalid target specification '%s'\n", target ); /* get the OS part */

1 0

Damjan Jovanovic : winegcc: Support the mingw32 target without an i[3456] 86- prefix.
by Alexandre Julliard 15 Jun '12

15 Jun '12

Module: wine Branch: master Commit: d31f61414ccc0c0717f28ce5b6e82b5558a18c62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d31f61414ccc0c0717f28ce5b… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Thu Jun 14 20:36:02 2012 +0200 winegcc: Support the mingw32 target without an i[3456]86- prefix. --- tools/winegcc/winegcc.c | 29 +++++++++++++++++++---------- 1 files changed, 19 insertions(+), 10 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 318c86a..3550960 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -1184,20 +1184,29 @@ static void parse_target_option( struct options *opts, const char *target ) /* get the CPU part */ - if (!(p = strchr( spec, '-' ))) error( "Invalid target specification '%s'\n", target ); - *p++ = 0; - for (i = 0; i < sizeof(cpu_names)/sizeof(cpu_names[0]); i++) + if ((p = strchr( spec, '-' ))) { - if (!strcmp( cpu_names[i].name, spec )) + *p++ = 0; + for (i = 0; i < sizeof(cpu_names)/sizeof(cpu_names[0]); i++) { - opts->target_cpu = cpu_names[i].cpu; - break; + if (!strcmp( cpu_names[i].name, spec )) + { + opts->target_cpu = cpu_names[i].cpu; + break; + } } + if (i == sizeof(cpu_names)/sizeof(cpu_names[0])) + error( "Unrecognized CPU '%s'\n", spec ); + platform = p; + if ((p = strrchr( p, '-' ))) platform = p + 1; } - if (i == sizeof(cpu_names)/sizeof(cpu_names[0])) - error( "Unrecognized CPU '%s'\n", spec ); - platform = p; - if ((p = strrchr( p, '-' ))) platform = p + 1; + else if (!strcmp( spec, "mingw32" )) + { + opts->target_cpu = CPU_x86; + platform = spec; + } + else + error( "Invalid target specification '%s'\n", target ); /* get the OS part */

1 0

Huw Davies : winspool: Set the printer registry values before calling into the driver.
by Alexandre Julliard 15 Jun '12

15 Jun '12

Module: wine Branch: master Commit: a294ad42e0cc16225974f1f6078187a542a46bfc URL: http://source.winehq.org/git/wine.git/?a=commit;h=a294ad42e0cc16225974f1f60… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jun 15 12:53:52 2012 +0100 winspool: Set the printer registry values before calling into the driver. --- dlls/winspool.drv/info.c | 45 +++++++++++++++++++-------------------------- 1 files changed, 19 insertions(+), 26 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 512e11f..362ff27 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -3029,21 +3029,31 @@ HANDLE WINAPI AddPrinterW(LPWSTR pName, DWORD Level, LPBYTE pPrinter) } set_devices_and_printerports(pi); + set_reg_DWORD(hkeyPrinter, AttributesW, pi->Attributes); set_reg_szW(hkeyPrinter, DatatypeW, pi->pDatatype); + set_reg_szW(hkeyPrinter, DescriptionW, pi->pComment); + set_reg_DWORD(hkeyPrinter, dnsTimeoutW, 0); + set_reg_szW(hkeyPrinter, LocationW, pi->pLocation); + set_reg_szW(hkeyPrinter, NameW, pi->pPrinterName); + set_reg_szW(hkeyPrinter, ParametersW, pi->pParameters); + set_reg_szW(hkeyPrinter, PortW, pi->pPortName); + set_reg_szW(hkeyPrinter, Print_ProcessorW, pi->pPrintProcessor); + set_reg_szW(hkeyPrinter, Printer_DriverW, pi->pDriverName); + set_reg_DWORD(hkeyPrinter, PriorityW, pi->Priority); + set_reg_szW(hkeyPrinter, Separator_FileW, pi->pSepFile); + set_reg_szW(hkeyPrinter, Share_NameW, pi->pShareName); + set_reg_DWORD(hkeyPrinter, StartTimeW, pi->StartTime); + set_reg_DWORD(hkeyPrinter, StatusW, pi->Status); + set_reg_DWORD(hkeyPrinter, txTimeoutW, 0); + set_reg_DWORD(hkeyPrinter, UntilTimeW, pi->UntilTime); - /* See if we can load the driver. We may need the devmode structure anyway - * - * FIXME: - * Note that DocumentPropertiesW will briefly try to open the printer we - * just create to find a DEVMODE struct (it will use the WINEPS default - * one in case it is not there, so we are ok). - */ size = DocumentPropertiesW(0, 0, pi->pPrinterName, NULL, NULL, 0); - if(size < 0) { + if (size < 0) + { FIXME("DocumentPropertiesW on printer %s fails\n", debugstr_w(pi->pPrinterName)); - size = sizeof(DEVMODEW); + size = sizeof(DEVMODEW); } if(pi->pDevMode) dm = pi->pDevMode; @@ -3067,23 +3077,6 @@ HANDLE WINAPI AddPrinterW(LPWSTR pName, DWORD Level, LPBYTE pPrinter) set_reg_devmode( hkeyPrinter, Default_DevModeW, dm ); if (!pi->pDevMode) HeapFree( GetProcessHeap(), 0, dm ); - set_reg_szW(hkeyPrinter, DescriptionW, pi->pComment); - set_reg_DWORD(hkeyPrinter, dnsTimeoutW, 0); - set_reg_szW(hkeyPrinter, LocationW, pi->pLocation); - set_reg_szW(hkeyPrinter, NameW, pi->pPrinterName); - set_reg_szW(hkeyPrinter, ParametersW, pi->pParameters); - - set_reg_szW(hkeyPrinter, PortW, pi->pPortName); - set_reg_szW(hkeyPrinter, Print_ProcessorW, pi->pPrintProcessor); - set_reg_szW(hkeyPrinter, Printer_DriverW, pi->pDriverName); - set_reg_DWORD(hkeyPrinter, PriorityW, pi->Priority); - set_reg_szW(hkeyPrinter, Separator_FileW, pi->pSepFile); - set_reg_szW(hkeyPrinter, Share_NameW, pi->pShareName); - set_reg_DWORD(hkeyPrinter, StartTimeW, pi->StartTime); - set_reg_DWORD(hkeyPrinter, StatusW, pi->Status); - set_reg_DWORD(hkeyPrinter, txTimeoutW, 0); - set_reg_DWORD(hkeyPrinter, UntilTimeW, pi->UntilTime); - RegCloseKey(hkeyPrinter); RegCloseKey(hkeyPrinters); if(!OpenPrinterW(pi->pPrinterName, &retval, NULL)) {

1 0

Vincent Povirk : kernel32: Add named pipe server test with ReadFileEx/ WriteFileEx.
by Alexandre Julliard 15 Jun '12

15 Jun '12

Module: wine Branch: master Commit: 0a2d6e518326d2e3b1765346a610b327f4e9d81b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a2d6e518326d2e3b1765346a… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Jun 14 13:38:19 2012 -0500 kernel32: Add named pipe server test with ReadFileEx/WriteFileEx. --- dlls/kernel32/tests/pipe.c | 113 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 113 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 3484c62..7648f80 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -798,6 +798,113 @@ static DWORD CALLBACK serverThreadMain4(LPVOID arg) return 0; } +static int completion_called; +static DWORD completion_errorcode; +static DWORD completion_num_bytes; +static LPOVERLAPPED completion_lpoverlapped; + +static VOID WINAPI completion_routine(DWORD errorcode, DWORD num_bytes, LPOVERLAPPED lpoverlapped) +{ + completion_called++; + completion_errorcode = errorcode; + completion_num_bytes = num_bytes; + completion_lpoverlapped = lpoverlapped; + SetEvent(lpoverlapped->hEvent); +} + +/** Trivial byte echo server - uses ReadFileEx/WriteFileEx */ +static DWORD CALLBACK serverThreadMain5(LPVOID arg) +{ + int i; + HANDLE hEvent; + + trace("serverThreadMain5\n"); + /* Set up a simple echo server */ + hnp = CreateNamedPipe(PIPENAME "serverThreadMain5", PIPE_ACCESS_DUPLEX | FILE_FLAG_OVERLAPPED, + PIPE_TYPE_BYTE | PIPE_WAIT, + /* nMaxInstances */ 1, + /* nOutBufSize */ 1024, + /* nInBufSize */ 1024, + /* nDefaultWait */ NMPWAIT_USE_DEFAULT_WAIT, + /* lpSecurityAttrib */ NULL); + ok(hnp != INVALID_HANDLE_VALUE, "CreateNamedPipe failed\n"); + + hEvent = CreateEvent(NULL, /* security attribute */ + TRUE, /* manual reset event */ + FALSE, /* initial state */ + NULL); /* name */ + ok(hEvent != NULL, "CreateEvent\n"); + + for (i = 0; i < NB_SERVER_LOOPS; i++) { + char buf[512]; + DWORD readden; + DWORD success; + OVERLAPPED oOverlap; + DWORD err; + + memset(&oOverlap, 0, sizeof(oOverlap)); + oOverlap.hEvent = hEvent; + + /* Wait for client to connect */ + trace("Server calling ConnectNamedPipe...\n"); + success = ConnectNamedPipe(hnp, NULL); + err = GetLastError(); + ok(success || (err == ERROR_PIPE_CONNECTED), "ConnectNamedPipe failed: %d\n", err); + trace("ConnectNamedPipe operation complete.\n"); + + /* Echo bytes once */ + memset(buf, 0, sizeof(buf)); + + trace("Server reading...\n"); + completion_called = 0; + ResetEvent(hEvent); + success = ReadFileEx(hnp, buf, sizeof(buf), &oOverlap, completion_routine); + trace("Server ReadFileEx returned...\n"); + ok(success, "ReadFileEx failed, err=%i\n", GetLastError()); + ok(completion_called == 0, "completion routine called before ReadFileEx return\n"); + trace("ReadFileEx returned.\n"); + if (success) { + DWORD ret; + do { + ret = WaitForSingleObjectEx(hEvent, INFINITE, TRUE); + } while (ret == WAIT_IO_COMPLETION); + ok(ret == 0, "wait ReadFileEx returned %x\n", ret); + } + ok(completion_called == 1, "completion routine called %i times\n", completion_called); + ok(completion_errorcode == ERROR_SUCCESS, "completion routine got error %d\n", completion_errorcode); + ok(completion_num_bytes != 0, "read 0 bytes"); + ok(completion_lpoverlapped == &oOverlap, "got wrong overlapped pointer %p\n", completion_lpoverlapped); + readden = completion_num_bytes; + trace("Server done reading.\n"); + + trace("Server writing...\n"); + completion_called = 0; + ResetEvent(hEvent); + success = WriteFileEx(hnp, buf, readden, &oOverlap, completion_routine); + trace("Server WriteFileEx returned...\n"); + ok(success, "WriteFileEx failed, err=%i\n", GetLastError()); + ok(completion_called == 0, "completion routine called before ReadFileEx return\n"); + trace("overlapped WriteFile returned.\n"); + if (success) { + DWORD ret; + do { + ret = WaitForSingleObjectEx(hEvent, INFINITE, TRUE); + } while (ret == WAIT_IO_COMPLETION); + ok(ret == 0, "wait WriteFileEx returned %x\n", ret); + } + trace("Server done writing.\n"); + ok(completion_called == 1, "completion routine called %i times\n", completion_called); + ok(completion_errorcode == ERROR_SUCCESS, "completion routine got error %d\n", completion_errorcode); + ok(completion_num_bytes == readden, "read %i bytes wrote %i\n", readden, completion_num_bytes); + ok(completion_lpoverlapped == &oOverlap, "got wrong overlapped pointer %p\n", completion_lpoverlapped); + + /* finish this connection, wait for next one */ + ok(FlushFileBuffers(hnp), "FlushFileBuffers\n"); + ok(DisconnectNamedPipe(hnp), "DisconnectNamedPipe\n"); + } + return 0; +} + static void exercizeServer(const char *pipename, HANDLE serverThread) { int i; @@ -891,6 +998,12 @@ static void test_NamedPipe_2(void) ok(serverThread != NULL, "CreateThread failed: %d\n", GetLastError()); exercizeServer(PIPENAME "serverThreadMain4", serverThread); + /* Try server #5 */ + SetLastError(0xdeadbeef); + serverThread = CreateThread(NULL, 0, serverThreadMain5, 0, 0, &serverThreadId); + ok(serverThread != NULL, "CreateThread failed: %d\n", GetLastError()); + exercizeServer(PIPENAME "serverThreadMain5", serverThread); + ok(SetEvent( alarm_event ), "SetEvent\n"); CloseHandle( alarm_event ); trace("test_NamedPipe_2 returning\n");

1 0

Vincent Povirk : kernel32: Add test for pending ReadFileEx/ WriteFileEx calls.
by Alexandre Julliard 15 Jun '12

15 Jun '12

Module: wine Branch: master Commit: 982153605a0835993b3b6b10d826377fbe4e2b9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=982153605a0835993b3b6b10d… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Jun 14 14:35:27 2012 -0500 kernel32: Add test for pending ReadFileEx/WriteFileEx calls. --- dlls/kernel32/tests/pipe.c | 111 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 111 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 7648f80..64af60331 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -1750,6 +1750,116 @@ static void test_NamedPipeHandleState(void) CloseHandle(server); } +static void test_readfileex_pending(void) +{ + HANDLE server, client, event; + BOOL ret; + DWORD err, wait, num_bytes; + OVERLAPPED overlapped; + char read_buf[1024]; + char write_buf[1024]; + const char *test_string = "test"; + int i; + + server = CreateNamedPipe(PIPENAME, FILE_FLAG_OVERLAPPED | PIPE_ACCESS_DUPLEX, + /* dwOpenMode */ PIPE_TYPE_BYTE | PIPE_WAIT, + /* nMaxInstances */ 1, + /* nOutBufSize */ 1024, + /* nInBufSize */ 1024, + /* nDefaultWait */ NMPWAIT_USE_DEFAULT_WAIT, + /* lpSecurityAttrib */ NULL); + ok(server != INVALID_HANDLE_VALUE, "cf failed\n"); + + event = CreateEventA(NULL, TRUE, FALSE, NULL); + ok(event != NULL, "CreateEventA failed\n"); + + memset(&overlapped, 0, sizeof(overlapped)); + overlapped.hEvent = event; + + ret = ConnectNamedPipe(server, &overlapped); + err = GetLastError(); + ok(ret == FALSE, "ConnectNamedPipe succeeded\n"); + ok(err == ERROR_IO_PENDING, "ConnectNamedPipe set error %i\n", err); + + wait = WaitForSingleObject(event, 0); + ok(wait == WAIT_TIMEOUT, "WaitForSingleObject returned %x\n", wait); + + client = CreateFileA(PIPENAME, GENERIC_READ|GENERIC_WRITE, 0, NULL, + OPEN_EXISTING, 0, NULL); + ok(client != INVALID_HANDLE_VALUE, "cf failed\n"); + + wait = WaitForSingleObject(event, 0); + ok(wait == WAIT_OBJECT_0, "WaitForSingleObject returned %x\n", wait); + + /* Start a read that can't complete immediately. */ + completion_called = 0; + ResetEvent(event); + ret = ReadFileEx(server, read_buf, sizeof(read_buf), &overlapped, completion_routine); + todo_wine ok(ret == TRUE, "ReadFileEx failed, err=%i\n", GetLastError()); + ok(completion_called == 0, "completion routine called before ReadFileEx returned\n"); + + ret = WriteFile(client, test_string, sizeof(test_string), &num_bytes, NULL); + ok(ret == TRUE, "WriteFile failed\n"); + ok(num_bytes == sizeof(test_string), "only %i bytes written\n", num_bytes); + + ok(completion_called == 0, "completion routine called during WriteFile\n"); + + wait = WaitForSingleObjectEx(event, 0, TRUE); + ok(wait == WAIT_IO_COMPLETION || wait == WAIT_OBJECT_0, "WaitForSingleObjectEx returned %x\n", wait); + + ok(completion_called == 1, "completion not called after writing pipe\n"); + ok(completion_errorcode == 0, "completion called with error %x\n", completion_errorcode); + ok(completion_num_bytes == sizeof(test_string), "ReadFileEx returned only %d bytes\n", completion_num_bytes); + ok(completion_lpoverlapped == &overlapped, "completion called with wrong overlapped pointer\n"); + ok(!memcmp(test_string, read_buf, sizeof(test_string)), "ReadFileEx read wrong bytes\n"); + + /* Make writes until the pipe is full and the write fails */ + memset(write_buf, 0xaa, sizeof(write_buf)); + for (i=0; i<256; i++) + { + completion_called = 0; + ResetEvent(event); + ret = WriteFileEx(server, write_buf, sizeof(write_buf), &overlapped, completion_routine); + err = GetLastError(); + + ok(completion_called == 0, "completion routine called during WriteFileEx\n"); + + wait = WaitForSingleObjectEx(event, 0, TRUE); + + if (wait == WAIT_TIMEOUT) + /* write couldn't complete immediately, presumably the pipe is full */ + break; + + ok(wait == WAIT_IO_COMPLETION || wait == WAIT_OBJECT_0, "WaitForSingleObject returned %x\n", wait); + + ok(ret == TRUE, "WriteFileEx failed, err=%i\n", err); + ok(completion_errorcode == 0, "completion called with error %x\n", completion_errorcode); + ok(completion_lpoverlapped == &overlapped, "completion called with wrong overlapped pointer\n"); + } + + todo_wine ok(ret == TRUE, "WriteFileEx failed, err=%i\n", err); + ok(completion_called == 0, "completion routine called but wait timed out\n"); + ok(completion_errorcode == 0, "completion called with error %x\n", completion_errorcode); + ok(completion_lpoverlapped == &overlapped, "completion called with wrong overlapped pointer\n"); + + /* free up some space in the pipe */ + ret = ReadFile(client, read_buf, sizeof(read_buf), &num_bytes, NULL); + ok(ret == TRUE, "ReadFile failed\n"); + + ok(completion_called == 0, "completion routine called during ReadFile\n"); + + wait = WaitForSingleObjectEx(event, 0, TRUE); + ok(wait == WAIT_IO_COMPLETION || wait == WAIT_OBJECT_0, "WaitForSingleObject returned %x\n", wait); + + ok(completion_called == 1, "completion routine not called\n"); + ok(completion_errorcode == 0, "completion called with error %x\n", completion_errorcode); + ok(completion_lpoverlapped == &overlapped, "completion called with wrong overlapped pointer\n"); + + CloseHandle(client); + CloseHandle(server); + CloseHandle(event); +} + START_TEST(pipe) { HMODULE hmod; @@ -1769,4 +1879,5 @@ START_TEST(pipe) test_impersonation(); test_overlapped(); test_NamedPipeHandleState(); + test_readfileex_pending(); }

1 0

Vincent Povirk : kernel32: Return success from ReadFileEx/ WriteFileEx when I/O is pending.
by Alexandre Julliard 15 Jun '12

15 Jun '12

Module: wine Branch: master Commit: 14404713de18cc04e2f9b91603c4c68397a16820 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14404713de18cc04e2f9b9160… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Jun 14 14:42:47 2012 -0500 kernel32: Return success from ReadFileEx/WriteFileEx when I/O is pending. --- dlls/kernel32/file.c | 10 +++++++--- dlls/kernel32/tests/pipe.c | 4 ++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index 089f693..18ed188 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -352,7 +352,7 @@ BOOL WINAPI ReadFileEx(HANDLE hFile, LPVOID buffer, DWORD bytesToRead, status = NtReadFile(hFile, NULL, FILE_ReadWriteApc, lpCompletionRoutine, io_status, buffer, bytesToRead, &offset, NULL); - if (status) + if (status && status != STATUS_PENDING) { SetLastError( RtlNtStatusToDosError(status) ); return FALSE; @@ -484,8 +484,12 @@ BOOL WINAPI WriteFileEx(HANDLE hFile, LPCVOID buffer, DWORD bytesToWrite, status = NtWriteFile(hFile, NULL, FILE_ReadWriteApc, lpCompletionRoutine, io_status, buffer, bytesToWrite, &offset, NULL); - if (status) SetLastError( RtlNtStatusToDosError(status) ); - return !status; + if (status && status != STATUS_PENDING) + { + SetLastError( RtlNtStatusToDosError(status) ); + return FALSE; + } + return TRUE; } diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 64af60331..1a33e10 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -1795,7 +1795,7 @@ static void test_readfileex_pending(void) completion_called = 0; ResetEvent(event); ret = ReadFileEx(server, read_buf, sizeof(read_buf), &overlapped, completion_routine); - todo_wine ok(ret == TRUE, "ReadFileEx failed, err=%i\n", GetLastError()); + ok(ret == TRUE, "ReadFileEx failed, err=%i\n", GetLastError()); ok(completion_called == 0, "completion routine called before ReadFileEx returned\n"); ret = WriteFile(client, test_string, sizeof(test_string), &num_bytes, NULL); @@ -1837,7 +1837,7 @@ static void test_readfileex_pending(void) ok(completion_lpoverlapped == &overlapped, "completion called with wrong overlapped pointer\n"); } - todo_wine ok(ret == TRUE, "WriteFileEx failed, err=%i\n", err); + ok(ret == TRUE, "WriteFileEx failed, err=%i\n", err); ok(completion_called == 0, "completion routine called but wait timed out\n"); ok(completion_errorcode == 0, "completion called with error %x\n", completion_errorcode); ok(completion_lpoverlapped == &overlapped, "completion called with wrong overlapped pointer\n");

1 0

André Hentschel : ntdll: Check for NetBSD in CDROM_Verify.
by Alexandre Julliard 15 Jun '12

15 Jun '12

Module: wine Branch: master Commit: 4f08dc0a7b1697a92efb00fdcd3c500e92eb0588 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f08dc0a7b1697a92efb00fdc… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Jun 14 23:37:33 2012 +0200 ntdll: Check for NetBSD in CDROM_Verify. --- dlls/ntdll/cdrom.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c index 1188772..53854a8 100644 --- a/dlls/ntdll/cdrom.c +++ b/dlls/ntdll/cdrom.c @@ -1141,7 +1141,7 @@ static NTSTATUS CDROM_Verify(int dev, int fd) return STATUS_SUCCESS; else return STATUS_NO_MEDIA_IN_DEVICE; -#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) +#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__DragonFly__) int ret; ret = ioctl(fd, CDIOCSTART, NULL); if(ret == 0)

1 0

Dmitry Timoshkov : include: Fix WICPersistOptions definition.
by Alexandre Julliard 15 Jun '12

15 Jun '12

Module: wine Branch: master Commit: ce5ac728eca10b59d09eb566d5419bc4734cf8db URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce5ac728eca10b59d09eb566d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jun 15 12:42:24 2012 +0900 include: Fix WICPersistOptions definition. --- include/wincodecsdk.idl | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/include/wincodecsdk.idl b/include/wincodecsdk.idl index 0a8a531..e42be4d 100644 --- a/include/wincodecsdk.idl +++ b/include/wincodecsdk.idl @@ -21,10 +21,11 @@ import "wincodec.idl"; typedef enum WICPersistOptions { WICPersistOptionsDefault = 0x00000000, - WICPersistOptionsLittleEndian = 0x00000001, - WICPersistOptionsBigEndian = 0x00000002, - WICPersistOptionsStrictFormat = 0x00000004, - WICPersistOptionsNoCacheStream = 0x00000008, + WICPersistOptionsLittleEndian = 0x00000000, + WICPersistOptionsBigEndian = 0x00000001, + WICPersistOptionsStrictFormat = 0x00000002, + WICPersistOptionsNoCacheStream = 0x00000004, + WICPersistOptionPreferUTF8 = 0x00000008, WICPersistOptionsMask = 0x0000FFFF } WICPersistOptions;

1 0

Dmitry Timoshkov : windowscodecs: Check IFD structure when loading metadata .
by Alexandre Julliard 14 Jun '12

14 Jun '12

Module: wine Branch: master Commit: 7cf036a471e5a170a8a0d9f3ca4d718bf31c4d18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cf036a471e5a170a8a0d9f3c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jun 13 18:31:09 2012 +0900 windowscodecs: Check IFD structure when loading metadata. --- dlls/windowscodecs/metadatahandler.c | 33 +++++++++++++++++++++++++++++++++ include/wincodec.idl | 1 + 2 files changed, 34 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/metadatahandler.c b/dlls/windowscodecs/metadatahandler.c index d2eb8b3..6433136 100644 --- a/dlls/windowscodecs/metadatahandler.c +++ b/dlls/windowscodecs/metadatahandler.c @@ -733,6 +733,39 @@ static HRESULT LoadIfdMetadata(IStream *input, const GUID *preferred_vendor, return hr; } + /* limit number of IFDs to 4096 to avoid infinite loop */ + for (i = 0; i < 4096; i++) + { + ULONG next_ifd_offset; + LARGE_INTEGER pos; + USHORT next_ifd_count; + + hr = IStream_Read(input, &next_ifd_offset, sizeof(next_ifd_offset), NULL); + if (FAILED(hr)) break; + + SWAP_ULONG(next_ifd_offset); + if (!next_ifd_offset) break; + + pos.QuadPart = next_ifd_offset; + hr = IStream_Seek(input, pos, SEEK_SET, NULL); + if (FAILED(hr)) break; + + hr = IStream_Read(input, &next_ifd_count, sizeof(next_ifd_count), NULL); + if (FAILED(hr)) break; + + SWAP_USHORT(next_ifd_count); + + pos.QuadPart = next_ifd_count * sizeof(*entry); + hr = IStream_Seek(input, pos, SEEK_CUR, NULL); + if (FAILED(hr)) break; + } + + if (FAILED(hr) || i == 4096) + { + HeapFree(GetProcessHeap(), 0, entry); + return WINCODEC_ERR_BADMETADATAHEADER; + } + result = HeapAlloc(GetProcessHeap(), 0, count * sizeof(*result)); if (!result) { diff --git a/include/wincodec.idl b/include/wincodec.idl index c587ff4..82f419c 100644 --- a/include/wincodec.idl +++ b/include/wincodec.idl @@ -206,6 +206,7 @@ cpp_quote("#define WINCODEC_ERR_CODECNOTHUMBNAIL 0x88982f44") cpp_quote("#define WINCODEC_ERR_PALETTEUNAVAILABLE 0x88982f45") cpp_quote("#define WINCODEC_ERR_COMPONENTNOTFOUND 0x88982f50") cpp_quote("#define WINCODEC_ERR_FRAMEMISSING 0x88982f62") +cpp_quote("#define WINCODEC_ERR_BADMETADATAHEADER 0x88982f63") cpp_quote("#define WINCODEC_ERR_UNSUPPORTEDPIXELFORMAT 0x88982f80") cpp_quote("#define WINCODEC_ERR_UNSUPPORTEDOPERATION 0x88982f81") cpp_quote("#define WINCODEC_ERR_INSUFFICIENTBUFFER 0x88982f8c")

1 0