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

Hans Leidekker : kernel32: Add support for %ws and %wc format specifiers to FormatMessageA/W.
by Alexandre Julliard 19 May '09

19 May '09

Module: wine Branch: master Commit: 0f1ecf2819b3de7a6f1f5667466d4100e3ea1b71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f1ecf2819b3de7a6f1f56674… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 19 09:20:06 2009 +0200 kernel32: Add support for %ws and %wc format specifiers to FormatMessageA/W. --- dlls/kernel32/format_msg.c | 23 +++++++++++++++++++---- 1 files changed, 19 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/format_msg.c b/dlls/kernel32/format_msg.c index c251514..1fca102 100644 --- a/dlls/kernel32/format_msg.c +++ b/dlls/kernel32/format_msg.c @@ -257,11 +257,20 @@ DWORD WINAPI FormatMessageA( argliststart=(*(DWORD**)args)+insertnr-1; /* FIXME: precision and width components are not handled correctly */ - if ( (strcmp(fmtstr, "%ls") == 0) || (strcmp(fmtstr,"%S") == 0) ) { - sz = WideCharToMultiByte( CP_ACP, 0, *(WCHAR**)argliststart, -1, NULL, 0, NULL, NULL); + if (strcmp(fmtstr, "%ls") == 0 || strcmp(fmtstr,"%S") == 0 || strcmp(fmtstr,"%ws") == 0) + { + sz = WideCharToMultiByte(CP_ACP, 0, *(WCHAR**)argliststart, -1, NULL, 0, NULL, NULL); b = HeapAlloc(GetProcessHeap(), 0, sz); - WideCharToMultiByte( CP_ACP, 0, *(WCHAR**)argliststart, -1, b, sz, NULL, NULL); - } else { + WideCharToMultiByte(CP_ACP, 0, *(WCHAR**)argliststart, -1, b, sz, NULL, NULL); + } + else if (strcmp(fmtstr, "%wc") == 0) + { + sz = WideCharToMultiByte(CP_ACP, 0, (WCHAR *)argliststart, 1, NULL, 0, NULL, NULL); + b = HeapAlloc(GetProcessHeap(), 0, sz); + WideCharToMultiByte(CP_ACP, 0, (WCHAR *)argliststart, 1, b, sz, NULL, NULL); + } + else + { b = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sz = 1000); /* CMF - This makes a BIG assumption about va_list */ TRACE("A BIG assumption\n"); @@ -367,6 +376,7 @@ DWORD WINAPI FormatMessageW( DWORD width = dwFlags & FORMAT_MESSAGE_MAX_WIDTH_MASK; BOOL eos = FALSE; WCHAR ch; + static const WCHAR fmt_wc[] = {'%','w','c',0}; TRACE("(0x%x,%p,%d,0x%x,%p,%d,%p)\n", dwFlags,lpSource,dwMessageId,dwLanguageId,lpBuffer,nSize,args); @@ -483,6 +493,11 @@ DWORD WINAPI FormatMessageW( /* CMF - This makes a BIG assumption about va_list */ vsprintfW(sprintfbuf, fmtstr, (va_list) xarr); + } + else if (strcmpW(fmtstr, fmt_wc) == 0) { + sprintfbuf = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR) * 2); + sprintfbuf[0] = *(WCHAR *)argliststart; + sprintfbuf[1] = 0; } else { sprintfbuf=HeapAlloc(GetProcessHeap(),0,100);

1 0

Hans Leidekker : kernel32: Add tests for FormatMessageA/W.
by Alexandre Julliard 19 May '09

19 May '09

Module: wine Branch: master Commit: 0eb5893ea6a34b00700de95c70f2c0d03fe3f648 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0eb5893ea6a34b00700de95c7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 19 09:20:34 2009 +0200 kernel32: Add tests for FormatMessageA/W. --- dlls/kernel32/tests/format_msg.c | 334 +++++++++++++++++++++++++++++++++++++- 1 files changed, 329 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0eb5893ea6a34b00700de…

1 0

Michael Stefaniuc : urlmon: Move 'inline' right after the storage specifier .
by Alexandre Julliard 19 May '09

19 May '09

Module: wine Branch: master Commit: 441bc63538340d3b15d00939eb420a8cde30ad6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=441bc63538340d3b15d00939e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon May 18 21:07:41 2009 +0200 urlmon: Move 'inline' right after the storage specifier. --- 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 74788c1..eceb7e3 100644 --- a/dlls/urlmon/bindprot.c +++ b/dlls/urlmon/bindprot.c @@ -214,7 +214,7 @@ static void push_task(BindProtocol *This, task_header_t *task, task_proc_t proc) } } -static BOOL inline do_direct_notif(BindProtocol *This) +static inline BOOL do_direct_notif(BindProtocol *This) { return !(This->pi & PI_APARTMENTTHREADED) || (This->apartment_thread == GetCurrentThreadId() && !This->continue_call); }

1 0

Francois Gouget : mstask/tests: Replace realloc() with HeapReAlloc().
by Alexandre Julliard 19 May '09

19 May '09

Module: wine Branch: master Commit: 419ecb35e113d163d449cf128ce3d144854efef0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=419ecb35e113d163d449cf128… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue May 19 11:20:57 2009 +0200 mstask/tests: Replace realloc() with HeapReAlloc(). --- dlls/mstask/tests/task.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/mstask/tests/task.c b/dlls/mstask/tests/task.c index 328dd76..a0a851a 100644 --- a/dlls/mstask/tests/task.c +++ b/dlls/mstask/tests/task.c @@ -38,7 +38,11 @@ static char *get_tmp_space(int size) int idx; idx = ++pos % (sizeof(list)/sizeof(list[0])); - if ((ret = realloc(list[idx], size))) + if (list[idx]) + ret = HeapReAlloc( GetProcessHeap(), 0, list[idx], size ); + else + ret = HeapAlloc( GetProcessHeap(), 0, size ); + if (ret) list[idx] = ret; return ret; }

1 0

Francois Gouget : oleaut32/tests: Replace realloc() with HeapReAlloc().
by Alexandre Julliard 19 May '09

19 May '09

Module: wine Branch: master Commit: 1ef2f3844fd257e22a161fc5e354e5a0b0fbb5d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ef2f3844fd257e22a161fc5e… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue May 19 11:21:07 2009 +0200 oleaut32/tests: Replace realloc() with HeapReAlloc(). --- dlls/oleaut32/tests/tmarshal.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index a9392c5..b8cc57d 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -56,7 +56,11 @@ static char *get_tmp_space( int size ) int idx; idx = ++pos % (sizeof(list)/sizeof(list[0])); - if ((ret = realloc( list[idx], size ))) list[idx] = ret; + if (list[idx]) + ret = HeapReAlloc( GetProcessHeap(), 0, list[idx], size ); + else + ret = HeapAlloc( GetProcessHeap(), 0, size ); + if (ret) list[idx] = ret; return ret; }

1 0

Francois Gouget : userenv/tests: Replace realloc() with HeapReAlloc().
by Alexandre Julliard 19 May '09

19 May '09

Module: wine Branch: master Commit: 4d8cf750ff4942ea6aa12aa4a905e17a2988d6ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d8cf750ff4942ea6aa12aa4a… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue May 19 11:21:12 2009 +0200 userenv/tests: Replace realloc() with HeapReAlloc(). --- dlls/userenv/tests/userenv.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/userenv/tests/userenv.c b/dlls/userenv/tests/userenv.c index d782d2f..83bfda0 100644 --- a/dlls/userenv/tests/userenv.c +++ b/dlls/userenv/tests/userenv.c @@ -51,7 +51,11 @@ static char *get_tmp_space( int size ) int idx; idx = ++pos % (sizeof(list)/sizeof(list[0])); - if ((ret = realloc( list[idx], size ))) list[idx] = ret; + if (list[idx]) + ret = HeapReAlloc( GetProcessHeap(), 0, list[idx], size ); + else + ret = HeapAlloc( GetProcessHeap(), 0, size ); + if (ret) list[idx] = ret; return ret; }

1 0

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

19 May '09

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 : wine.inf: Set the correct initial service pack information.
by Alexandre Julliard 19 May '09

19 May '09

Module: wine Branch: master Commit: 4626308a2b063b6d8bdd531dd95626e38962ebaf URL: http://source.winehq.org/git/wine.git/?a=commit;h=4626308a2b063b6d8bdd531dd… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon May 18 16:48:16 2009 +0200 wine.inf: Set the correct initial service pack information. --- tools/wine.inf.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index f42dea8..25cec58 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -2933,5 +2933,5 @@ HKLM,%CurrentVersionNT%,"CSDVersion",2,"Service Pack 2" HKLM,%CurrentVersionNT%,"CurrentBuildNumber",2,"2600" HKLM,%CurrentVersionNT%,"CurrentType",2,"Uniprocessor Free" HKLM,%Control%\ProductOptions,"ProductType",2,"WinNT" -HKLM,%Control%\Windows,"CSDVersion",0x10003,0x400 +HKLM,%Control%\Windows,"CSDVersion",0x10003,0x200 HKLM,%Control%\Session Manager\Environment,"OS",2,"Windows_NT"

1 0

Paul Vriens : ntdll: Fix a typo.
by Alexandre Julliard 19 May '09

19 May '09

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

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

19 May '09

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