May 2009 - Wine-commits - list.winehq.org

Jacek Caban : urlmon: Use internal IInternetProtocol protocol for communication with pluggable protocol in BindProtocol .
by Alexandre Julliard 19 May '09

19 May '09

Module: wine Branch: master Commit: e5f8427abf9867823e44a9aefcf24f36f88b7429 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5f8427abf9867823e44a9aef… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 18 18:29:24 2009 +0200 urlmon: Use internal IInternetProtocol protocol for communication with pluggable protocol in BindProtocol. --- dlls/urlmon/bindprot.c | 253 +++++++++++++++++++++++++++++++++++++----------- 1 files changed, 195 insertions(+), 58 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e5f8427abf9867823e44a…

1 0

Jacek Caban : urlmon: Fixed buffer size argument in Read call.
by Alexandre Julliard 19 May '09

19 May '09

Module: wine Branch: master Commit: 23c6cd4241a775d69b3691e6d0269572606ebdb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23c6cd4241a775d69b3691e6d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 18 18:29:54 2009 +0200 urlmon: Fixed buffer size argument in Read call. --- dlls/urlmon/bindprot.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/bindprot.c b/dlls/urlmon/bindprot.c index 8977cac..ec58436 100644 --- a/dlls/urlmon/bindprot.c +++ b/dlls/urlmon/bindprot.c @@ -615,7 +615,7 @@ static HRESULT WINAPI ProtocolHandler_Read(IInternetProtocol *iface, void *pv, if(read < cb) { ULONG cread = 0; - hres = IInternetProtocol_Read(This->protocol, (BYTE*)pv+read, cb, &cread); + hres = IInternetProtocol_Read(This->protocol, (BYTE*)pv+read, cb-read, &cread); read += cread; }

1 0

Jacek Caban : urlmon: Move MIME availability handling to separated function .
by Alexandre Julliard 19 May '09

19 May '09

Module: wine Branch: master Commit: 8ffd262d75c69b1ed2a07001d44e7464814b367e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ffd262d75c69b1ed2a07001d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 18 18:30:12 2009 +0200 urlmon: Move MIME availability handling to separated function. --- dlls/urlmon/bindprot.c | 38 +++++++++++++++++--------------------- 1 files changed, 17 insertions(+), 21 deletions(-) diff --git a/dlls/urlmon/bindprot.c b/dlls/urlmon/bindprot.c index ec58436..6da1557 100644 --- a/dlls/urlmon/bindprot.c +++ b/dlls/urlmon/bindprot.c @@ -220,6 +220,20 @@ static BOOL inline do_direct_notif(BindProtocol *This) return !(This->pi & PI_APARTMENTTHREADED) || (This->apartment_thread == GetCurrentThreadId() && !This->continue_call); } +static void mime_available(BindProtocol *This, LPCWSTR mime, BOOL verified) +{ + heap_free(This->mime); + This->mime = NULL; + This->mime = heap_strdupW(mime); + + if(verified || !(This->pi & PI_MIMEVERIFICATION)) { + This->reported_mime = TRUE; + + if(This->protocol_sink) + IInternetProtocolSink_ReportProgress(This->protocol_sink, BINDSTATUS_MIMETYPEAVAILABLE, mime); + } +} + #define PROTOCOL_THIS(iface) DEFINE_THIS(BindProtocol, InternetProtocol, iface) static HRESULT WINAPI BindProtocol_QueryInterface(IInternetProtocol *iface, REFIID riid, void **ppv) @@ -859,25 +873,11 @@ static void report_progress(BindProtocol *This, ULONG status_code, LPCWSTR statu break; case BINDSTATUS_MIMETYPEAVAILABLE: - if(!This->reported_mime) { - heap_free(This->mime); - This->mime = heap_strdupW(status_text); - } - - if(This->protocol_sink && !(This->pi & PI_MIMEVERIFICATION)) - IInternetProtocolSink_ReportProgress(This->protocol_sink, status_code, status_text); + mime_available(This, status_text, FALSE); break; case BINDSTATUS_VERIFIEDMIMETYPEAVAILABLE: - if(!This->reported_mime) { - heap_free(This->mime); - This->mime = heap_strdupW(status_text); - } - - if(This->protocol_sink) { - This->reported_mime = TRUE; - IInternetProtocolSink_ReportProgress(This->protocol_sink, BINDSTATUS_MIMETYPEAVAILABLE, status_text); - } + mime_available(This, status_text, TRUE); break; default: @@ -960,12 +960,8 @@ static HRESULT report_data(BindProtocol *This, DWORD bscf, ULONG progress, ULONG if(FAILED(hres)) return hres; - heap_free(This->mime); - This->mime = heap_strdupW(mime); + mime_available(This, mime, TRUE); CoTaskMemFree(mime); - - This->reported_mime = TRUE; - IInternetProtocolSink_ReportProgress(This->protocol_sink, BINDSTATUS_MIMETYPEAVAILABLE, This->mime); } return IInternetProtocolSink_ReportData(This->protocol_sink, bscf, progress, progress_max);

1 0

Jacek Caban : urlmon: Use protocol_handler in Switch implementation.
by Alexandre Julliard 19 May '09

19 May '09

Module: wine Branch: master Commit: 638c7ac802d48ccff902375bb32447a70fd676b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=638c7ac802d48ccff902375bb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 18 18:30:29 2009 +0200 urlmon: Use protocol_handler in Switch implementation. --- dlls/urlmon/bindprot.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/bindprot.c b/dlls/urlmon/bindprot.c index 6da1557..0001fcc 100644 --- a/dlls/urlmon/bindprot.c +++ b/dlls/urlmon/bindprot.c @@ -822,7 +822,7 @@ static void switch_proc(BindProtocol *bind, task_header_t *t) { switch_task_t *task = (switch_task_t*)t; - IInternetProtocol_Continue(bind->protocol, &task->data); + IInternetProtocol_Continue(bind->protocol_handler, &task->data); heap_free(task); } @@ -851,7 +851,7 @@ static HRESULT WINAPI BPInternetProtocolSink_Switch(IInternetProtocolSink *iface } if(!This->protocol_sink) { - IInternetProtocol_Continue(This->protocol, pProtocolData); + IInternetProtocol_Continue(This->protocol_handler, pProtocolData); return S_OK; }

1 0

Jacek Caban : urlmon: Use common name for IInternetProtocol and IInternetProtocolSink vtbls.
by Alexandre Julliard 19 May '09

19 May '09

Module: wine Branch: master Commit: e16af65971fefaf419517ecf9a5502da62e8cb23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e16af65971fefaf419517ecf9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 18 18:31:03 2009 +0200 urlmon: Use common name for IInternetProtocol and IInternetProtocolSink vtbls. --- dlls/urlmon/binding.c | 7 +++---- dlls/urlmon/bindprot.c | 26 ++++++++++++-------------- dlls/urlmon/file.c | 7 +++---- dlls/urlmon/ftp.c | 11 +++++------ dlls/urlmon/gopher.c | 9 ++++----- dlls/urlmon/http.c | 11 +++++------ dlls/urlmon/mk.c | 8 +++----- dlls/urlmon/urlmon_main.h | 3 +++ 8 files changed, 38 insertions(+), 44 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e16af65971fefaf419517…

1 0

Jacek Caban : urlmon: Added support for MIME filters.
by Alexandre Julliard 19 May '09

19 May '09

Module: wine Branch: master Commit: 9edd40fdc205b2034d9a7afa3b3b05c9cbe3816a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9edd40fdc205b2034d9a7afa3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 18 18:35:32 2009 +0200 urlmon: Added support for MIME filters. --- dlls/urlmon/Makefile.in | 1 + dlls/urlmon/bindprot.c | 73 +++++++++++- dlls/urlmon/protproxy.c | 290 +++++++++++++++++++++++++++++++++++++++++++++ dlls/urlmon/session.c | 30 +++++ dlls/urlmon/urlmon_main.h | 13 ++ 5 files changed, 401 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9edd40fdc205b2034d9a7…

1 0

Andrew Nguyen : kernel32/tests: Correctly skip when Unicode thread functions are not available.
by Alexandre Julliard 18 May '09

18 May '09

Module: wine Branch: master Commit: b0abafe70fd7a5f031ac4780dc315b13ff65df49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0abafe70fd7a5f031ac4780d… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Mon May 18 04:24:45 2009 -0500 kernel32/tests: Correctly skip when Unicode thread functions are not available. --- dlls/kernel32/tests/thread.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index c1d65c1..2c699b4 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -693,7 +693,10 @@ static VOID test_thread_priority(void) SetLastError(0xdeadbeef); rc=pGetThreadPriorityBoost(curthread,&disabled); if (rc==0 && GetLastError()==ERROR_CALL_NOT_IMPLEMENTED) - return; /* WinME */ + { + win_skip("GetThreadPriorityBoost is not implemented on WinME\n"); + return; + } todo_wine ok(rc!=0,"error=%d\n",GetLastError()); @@ -755,7 +758,10 @@ static VOID test_GetThreadTimes(void) /* GetThreadTimes should set all of the parameters passed to it */ error=GetThreadTimes(thread,&creationTime,&exitTime, &kernelTime,&userTime); - if (error!=0 || GetLastError()!=ERROR_CALL_NOT_IMPLEMENTED) { + + if (error == 0 && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + win_skip("GetThreadTimes is not implemented\n"); + else { ok(error!=0,"GetThreadTimes failed\n"); ok(creationTime.dwLowDateTime!=99 || creationTime.dwHighDateTime!=99, "creationTime was invalid\n");

1 0

Andrew Nguyen : kernel32: Don' t validate the command line parameter of CreateProcessW.
by Alexandre Julliard 18 May '09

18 May '09

Module: wine Branch: master Commit: 6c27fa103896779169c4c8d5d4a6c1f344c651d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c27fa103896779169c4c8d5d… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Mon May 18 05:07:04 2009 -0500 kernel32: Don't validate the command line parameter of CreateProcessW. --- dlls/kernel32/process.c | 6 ------ dlls/kernel32/tests/process.c | 10 ++++++++++ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index b10d08a..8f486e0 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -1787,12 +1787,6 @@ static LPWSTR get_file_name( LPCWSTR appname, LPWSTR cmdline, LPWSTR buffer, return ret; } - if (!cmdline) - { - SetLastError( ERROR_INVALID_PARAMETER ); - return NULL; - } - /* first check for a quoted file name */ if ((cmdline[0] == '"') && ((p = strchrW( cmdline + 1, '"' )))) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 7cc5841..6aac615 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -925,6 +925,16 @@ static void test_CommandLine(void) okChildStringWA("Arguments", "CommandLineW", buffer2); release_memory(); assert(DeleteFileA(resfile) != 0); + + if (0) /* Test crashes on NT-based Windows. */ + { + /* Test NULL application name and command line parameters. */ + SetLastError(0xdeadbeef); + ret = CreateProcessA(NULL, NULL, NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info); + ok(!ret, "CreateProcessA unexpectedly succeeded\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + } } static void test_Directory(void)

1 0

Andrew Nguyen : kernel32: Correct the last error of CreateProcessW with an empty application name string .
by Alexandre Julliard 18 May '09

18 May '09

Module: wine Branch: master Commit: 645e59c490bcbd57a4a97a076295e171c44a80c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=645e59c490bcbd57a4a97a076… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Mon May 18 05:07:10 2009 -0500 kernel32: Correct the last error of CreateProcessW with an empty application name string. --- dlls/kernel32/process.c | 9 ++------- dlls/kernel32/tests/process.c | 20 ++++++++++++++++++++ 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 8f486e0..9e6aeaa 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -210,15 +210,10 @@ static HANDLE open_exe_file( const WCHAR *name ) { WCHAR buffer[MAX_PATH]; /* file doesn't exist, check for builtin */ - if (!contains_path( name )) goto error; - if (!get_builtin_path( name, NULL, buffer, sizeof(buffer) )) goto error; - handle = 0; + if (contains_path( name ) && get_builtin_path( name, NULL, buffer, sizeof(buffer) )) + handle = 0; } return handle; - - error: - SetLastError( ERROR_FILE_NOT_FOUND ); - return INVALID_HANDLE_VALUE; } diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 6aac615..479a376 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -935,6 +935,26 @@ static void test_CommandLine(void) ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); } + + buffer[0] = '\0'; + + /* Test empty application name parameter. */ + SetLastError(0xdeadbeef); + ret = CreateProcessA(buffer, NULL, NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info); + ok(!ret, "CreateProcessA unexpectedly succeeded\n"); + ok(GetLastError() == ERROR_PATH_NOT_FOUND || + broken(GetLastError() == ERROR_ACCESS_DENIED) /* Win98 */, + "Expected ERROR_PATH_NOT_FOUND, got %d\n", GetLastError()); + + buffer2[0] = '\0'; + + /* Test empty application name and command line parameters. */ + SetLastError(0xdeadbeef); + ret = CreateProcessA(buffer, buffer2, NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info); + ok(!ret, "CreateProcessA unexpectedly succeeded\n"); + ok(GetLastError() == ERROR_PATH_NOT_FOUND || + broken(GetLastError() == ERROR_ACCESS_DENIED) /* Win98 */, + "Expected ERROR_PATH_NOT_FOUND, got %d\n", GetLastError()); } static void test_Directory(void)

1 0

Andrew Nguyen : kernel32: Correct the last error of CreateProcessW with an empty command line string .
by Alexandre Julliard 18 May '09

18 May '09

Module: wine Branch: master Commit: 7c2c6a575c74190864f2659f188d609eaab73d05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c2c6a575c74190864f2659f1… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Mon May 18 05:07:18 2009 -0500 kernel32: Correct the last error of CreateProcessW with an empty command line string. --- dlls/kernel32/process.c | 1 + dlls/kernel32/tests/process.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 9e6aeaa..f00d972 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -1824,6 +1824,7 @@ static LPWSTR get_file_name( LPCWSTR appname, LPWSTR cmdline, LPWSTR buffer, sprintfW( ret, quotesW, name ); strcatW( ret, p ); } + else if (!ret) SetLastError( ERROR_FILE_NOT_FOUND ); done: HeapFree( GetProcessHeap(), 0, name ); diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 479a376..83b61ad 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -955,6 +955,40 @@ static void test_CommandLine(void) ok(GetLastError() == ERROR_PATH_NOT_FOUND || broken(GetLastError() == ERROR_ACCESS_DENIED) /* Win98 */, "Expected ERROR_PATH_NOT_FOUND, got %d\n", GetLastError()); + + /* Test empty command line parameter. */ + SetLastError(0xdeadbeef); + ret = CreateProcessA(NULL, buffer2, NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info); + ok(!ret, "CreateProcessA unexpectedly succeeded\n"); + ok(GetLastError() == ERROR_FILE_NOT_FOUND || + GetLastError() == ERROR_PATH_NOT_FOUND /* NT4 */ || + GetLastError() == ERROR_BAD_PATHNAME /* Win98 */, + "Expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); + + strcpy(buffer, "doesnotexist.exe"); + strcpy(buffer2, "does not exist.exe"); + + /* Test nonexistent application name. */ + SetLastError(0xdeadbeef); + ret = CreateProcessA(buffer, NULL, NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info); + ok(!ret, "CreateProcessA unexpectedly succeeded\n"); + ok(GetLastError() == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = CreateProcessA(buffer2, NULL, NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info); + ok(!ret, "CreateProcessA unexpectedly succeeded\n"); + ok(GetLastError() == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); + + /* Test nonexistent command line parameter. */ + SetLastError(0xdeadbeef); + ret = CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info); + ok(!ret, "CreateProcessA unexpectedly succeeded\n"); + ok(GetLastError() == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = CreateProcessA(NULL, buffer2, NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info); + ok(!ret, "CreateProcessA unexpectedly succeeded\n"); + ok(GetLastError() == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); } static void test_Directory(void)

1 0