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

Aric Stewart : msctf: Starting implementation of ITfContext:: RequestEditSession and ITextStoreACPSink::OnLockGranted.
by Alexandre Julliard May 19, 2009

May 19, 2009

Module: wine Branch: master Commit: 4bb8e9959a0c3088c5de014dcf59b87edf7549cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bb8e9959a0c3088c5de014dc… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon May 18 08:58:43 2009 -0500 msctf: Starting implementation of ITfContext::RequestEditSession and ITextStoreACPSink::OnLockGranted. --- dlls/msctf/context.c | 68 ++++++++++++++++++++++++++++++++++-- dlls/msctf/tests/inputprocessor.c | 30 +++++++++++----- include/textstor.idl | 2 + 3 files changed, 87 insertions(+), 13 deletions(-) diff --git a/dlls/msctf/context.c b/dlls/msctf/context.c index 42ae71e..1f255c8 100644 --- a/dlls/msctf/context.c +++ b/dlls/msctf/context.c @@ -74,6 +74,7 @@ typedef struct tagContext { ITfContextOwnerCompositionSink *pITfContextOwnerCompositionSink; ITextStoreACPSink *pITextStoreACPSink; + ITfEditSession* currentEditSession; /* kept as separate lists to reduce unnecessary iterations */ struct list pContextKeyEventSink; @@ -206,9 +207,53 @@ static HRESULT WINAPI Context_RequestEditSession (ITfContext *iface, TfClientId tid, ITfEditSession *pes, DWORD dwFlags, HRESULT *phrSession) { + HRESULT hr; Context *This = (Context *)iface; - FIXME("STUB:(%p)\n",This); - return E_NOTIMPL; + DWORD dwLockFlags = 0x0; + TS_STATUS status; + + TRACE("(%p) %i %p %x %p\n",This, tid, pes, dwFlags, phrSession); + + if (!(dwFlags & TF_ES_READ) && !(dwFlags & TF_ES_READWRITE)) + { + *phrSession = E_FAIL; + return E_INVALIDARG; + } + + if (!This->pITextStoreACP) + { + FIXME("No ITextStoreACP avaliable\n"); + *phrSession = E_FAIL; + return E_FAIL; + } + + if (!(dwFlags & TF_ES_ASYNC)) + dwLockFlags &= TS_LF_SYNC; + + if (dwFlags & TF_ES_READ) + dwLockFlags &= TS_LF_READ; + else if ((dwFlags & TF_ES_READWRITE) == TF_ES_READWRITE) + dwLockFlags &= TS_LF_READWRITE; + + /* TODO: cache this */ + ITextStoreACP_GetStatus(This->pITextStoreACP, &status); + + if (((dwFlags & TF_ES_READWRITE) == TF_ES_READWRITE) && (status.dwDynamicFlags & TS_SD_READONLY)) + { + *phrSession = TS_E_READONLY; + return S_OK; + } + + if (FAILED (ITfEditSession_QueryInterface(pes, &IID_ITfEditSession, (LPVOID*)&This->currentEditSession))) + { + *phrSession = E_FAIL; + return E_INVALIDARG; + } + + + hr = ITextStoreACP_RequestLock(This->pITextStoreACP, dwLockFlags, phrSession); + + return hr; } static HRESULT WINAPI Context_InWriteSession (ITfContext *iface, @@ -597,8 +642,23 @@ static HRESULT WINAPI TextStoreACPSink_OnLockGranted(ITextStoreACPSink *iface, DWORD dwLockFlags) { TextStoreACPSink *This = (TextStoreACPSink *)iface; - FIXME("STUB:(%p)\n",This); - return E_NOTIMPL; + HRESULT hr; + + TRACE("(%p) %x\n",This, dwLockFlags); + + if (!This->pContext || !This->pContext->currentEditSession) + { + ERR("OnLockGranted called on a context without a current edit session\nZ"); + return E_FAIL; + } + + /* TODO: generate and use an edit cookie */ + hr = ITfEditSession_DoEditSession(This->pContext->currentEditSession, 0xdeadcafe); + + ITfEditSession_Release(This->pContext->currentEditSession); + This->pContext->currentEditSession = NULL; + + return hr; } static HRESULT WINAPI TextStoreACPSink_OnStartEditTransaction(ITextStoreACPSink *iface) diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index a4d9979..318149b 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -149,8 +149,15 @@ static HRESULT WINAPI TextStoreACP_RequestLock(ITextStoreACP *iface, static HRESULT WINAPI TextStoreACP_GetStatus(ITextStoreACP *iface, TS_STATUS *pdcs) { - ok(test_ACP_GetStatus == SINK_EXPECTED, "Unexpected TextStoreACP_GetStatus\n"); + static UINT count = 0; + count ++; + + if (count == 1) + ok(test_ACP_GetStatus == SINK_EXPECTED, "Unexpected TextStoreACP_GetStatus\n"); + else + todo_wine ok(count == 1,"GetStatus called too many times\n"); test_ACP_GetStatus = SINK_FIRED; + pdcs->dwDynamicFlags = TS_SD_READONLY; return S_OK; } static HRESULT WINAPI TextStoreACP_QueryInsert(ITextStoreACP *iface, @@ -1410,19 +1417,24 @@ static void test_TStoApplicationText(void) hrSession = 0xfeedface; /* Test no premissions flags */ hr = ITfContext_RequestEditSession(cxt, tid, es, TF_ES_SYNC, &hrSession); - todo_wine ok(hr == E_INVALIDARG,"RequestEditSession should have failed with %x not %x\n",E_INVALIDARG,hr); - todo_wine ok(hrSession == E_FAIL,"hrSession should be %x not %x\n",E_FAIL,hrSession); + ok(hr == E_INVALIDARG,"RequestEditSession should have failed with %x not %x\n",E_INVALIDARG,hr); + ok(hrSession == E_FAIL,"hrSession should be %x not %x\n",E_FAIL,hrSession); hrSession = 0xfeedface; test_ACP_GetStatus = SINK_EXPECTED; + hr = ITfContext_RequestEditSession(cxt, tid, es, TF_ES_SYNC|TF_ES_READWRITE, &hrSession); + ok(SUCCEEDED(hr),"ITfContext_RequestEditSession failed\n"); + ok(hrSession == TS_E_READONLY,"Unexpected hrSession (%x)\n",hrSession); + ok(test_ACP_GetStatus == SINK_FIRED," expected GetStatus not fired\n"); + + test_ACP_GetStatus = SINK_UNEXPECTED; test_ACP_RequestLock = SINK_EXPECTED; hrSession = 0xfeedface; - hr = ITfContext_RequestEditSession(cxt, tid, es, TF_ES_SYNC|TF_ES_READWRITE, &hrSession); - todo_wine ok(SUCCEEDED(hr),"ITfContext_RequestEditSession failed\n"); - todo_wine ok(test_ACP_GetStatus == SINK_FIRED," expected GetStatus not fired\n"); - todo_wine ok(test_ACP_RequestLock == SINK_FIRED," expected RequestLock not fired\n"); - todo_wine ok(test_DoEditSession == SINK_FIRED," expected DoEditSession not fired\n"); - todo_wine ok(hrSession == 0xdeadcafe,"Unexpected hrSession\n"); + hr = ITfContext_RequestEditSession(cxt, tid, es, TF_ES_SYNC|TF_ES_READ, &hrSession); + ok(SUCCEEDED(hr),"ITfContext_RequestEditSession failed\n"); + ok(test_ACP_RequestLock == SINK_FIRED," expected RequestLock not fired\n"); + ok(test_DoEditSession == SINK_FIRED," expected DoEditSession not fired\n"); + ok(hrSession == 0xdeadcafe,"Unexpected hrSession (%x)\n",hrSession); ITfContext_Release(cxt); ITfDocumentMgr_Release(dm); diff --git a/include/textstor.idl b/include/textstor.idl index b603198..90e30ca 100644 --- a/include/textstor.idl +++ b/include/textstor.idl @@ -20,6 +20,8 @@ import "oaidl.idl"; #endif +cpp_quote("#define TS_E_READONLY MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF, 0x0209)") + const ULONG TS_DEFAULT_SELECTION = ~0u; const DWORD TS_SD_READONLY = 0x001;

1 0

Paul Vriens : kernel32/tests: Fix some test failures on Win9x/WinME.
by Alexandre Julliard May 19, 2009

May 19, 2009

Module: wine Branch: master Commit: 37babfcece3abe4501a623b12308273544186bd8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37babfcece3abe4501a623b12… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon May 18 19:22:28 2009 +0200 kernel32/tests: Fix some test failures on Win9x/WinME. --- dlls/kernel32/tests/process.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 83b61ad..d54a4b8 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -943,6 +943,7 @@ static void test_CommandLine(void) 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_FILE_NOT_FOUND) /* Win9x/WinME */ || broken(GetLastError() == ERROR_ACCESS_DENIED) /* Win98 */, "Expected ERROR_PATH_NOT_FOUND, got %d\n", GetLastError()); @@ -953,6 +954,7 @@ static void test_CommandLine(void) 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_FILE_NOT_FOUND) /* Win9x/WinME */ || broken(GetLastError() == ERROR_ACCESS_DENIED) /* Win98 */, "Expected ERROR_PATH_NOT_FOUND, got %d\n", GetLastError());

1 0

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

May 19, 2009

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: Added support for MIME filters.
by Alexandre Julliard May 19, 2009

May 19, 2009

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

Paul Vriens : ntdll: Fix a typo.
by Alexandre Julliard May 19, 2009

May 19, 2009

Module: wine Branch: master Commit: 756eea7bdd29ab76d22d342a146596f3905bb4fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=756eea7bdd29ab76d22d342a1… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon May 18 17:05:10 2009 +0200 ntdll: Fix a typo. --- dlls/ntdll/version.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/version.c b/dlls/ntdll/version.c index bf9db4d..d43a5b6 100644 --- a/dlls/ntdll/version.c +++ b/dlls/ntdll/version.c @@ -519,7 +519,7 @@ done: user_shared_data->MinorNtVersion = current_version->dwMinorVersion; user_shared_data->SuiteMask = current_version->wSuiteMask; - TRACE( "got %d.%d plaform %d build %x name %s service pack %d.%d product %d\n", + TRACE( "got %d.%d platform %d build %x name %s service pack %d.%d product %d\n", current_version->dwMajorVersion, current_version->dwMinorVersion, current_version->dwPlatformId, current_version->dwBuildNumber, debugstr_w(current_version->szCSDVersion),

1 0

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

May 19, 2009

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

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

May 18, 2009

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: Correct the last error of CreateProcessW with an empty command line string .
by Alexandre Julliard May 18, 2009

May 18, 2009

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

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

May 18, 2009

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/tests: Use named constants for a drive test.
by Alexandre Julliard May 18, 2009

May 18, 2009

Module: wine Branch: master Commit: 94945af5566c73fa3832f7fe70ebc6dede54861d URL: http://source.winehq.org/git/wine.git/?a=commit;h=94945af5566c73fa3832f7fe7… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Mon May 18 05:07:22 2009 -0500 kernel32/tests: Use named constants for a drive test. --- dlls/kernel32/tests/drive.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/drive.c b/dlls/kernel32/tests/drive.c index 6bee4a7..af1cf7f 100644 --- a/dlls/kernel32/tests/drive.c +++ b/dlls/kernel32/tests/drive.c @@ -39,7 +39,8 @@ static void test_GetDriveTypeA(void) for (drive[0] = 'A'; drive[0] <= 'Z'; drive[0]++) { type = GetDriveTypeA(drive); - ok(type > 0 && type <= 6, "not a valid drive %c: type %u\n", drive[0], type); + ok(type > DRIVE_UNKNOWN && type <= DRIVE_RAMDISK, + "not a valid drive %c: type %u\n", drive[0], type); if (!(logical_drives & 1)) ok(type == DRIVE_NO_ROOT_DIR, @@ -67,7 +68,8 @@ static void test_GetDriveTypeW(void) win_skip("GetDriveTypeW is not available on Win9x\n"); return; } - ok(type > 0 && type <= 6, "not a valid drive %c: type %u\n", drive[0], type); + ok(type > DRIVE_UNKNOWN && type <= DRIVE_RAMDISK, + "not a valid drive %c: type %u\n", drive[0], type); if (!(logical_drives & 1)) ok(type == DRIVE_NO_ROOT_DIR,

1 0