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

Alexandre Julliard : include/msvcrt: Add explicit msvcrt_long types to replace long for 64-bit compatibility.
by Alexandre Julliard 25 May '09

25 May '09

Module: wine Branch: master Commit: 580e07e7ba22de1a86defeb560674eb367abfd71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=580e07e7ba22de1a86defeb56… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat May 23 11:38:59 2009 +0200 include/msvcrt: Add explicit msvcrt_long types to replace long for 64-bit compatibility. --- include/msvcrt/conio.h | 4 +- include/msvcrt/crtdbg.h | 10 ++++---- include/msvcrt/crtdefs.h | 9 +++++++- include/msvcrt/direct.h | 2 +- include/msvcrt/float.h | 2 +- include/msvcrt/io.h | 22 ++++++++++---------- include/msvcrt/stddef.h | 4 +- include/msvcrt/stdio.h | 4 +- include/msvcrt/stdlib.h | 48 ++++++++++++++++++++++---------------------- include/msvcrt/sys/types.h | 2 +- include/msvcrt/time.h | 10 ++++---- include/msvcrt/wchar.h | 20 +++++++++--------- 12 files changed, 72 insertions(+), 65 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=580e07e7ba22de1a86def…

1 0

Alexandre Julliard : msvcrt: Replace long by MSVCRT_long.
by Alexandre Julliard 25 May '09

25 May '09

Module: wine Branch: master Commit: 82f175e9b5ab98a9b3a59d7f65bf42f8d55e4b8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=82f175e9b5ab98a9b3a59d7f6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat May 23 11:49:09 2009 +0200 msvcrt: Replace long by MSVCRT_long. --- dlls/msvcrt/errno.c | 4 +- dlls/msvcrt/file.c | 22 ++++++++++---------- dlls/msvcrt/math.c | 14 ++++++------ dlls/msvcrt/misc.c | 4 +- dlls/msvcrt/msvcrt.h | 14 +++++++----- dlls/msvcrt/process.c | 4 +- dlls/msvcrt/tests/file.c | 48 +++++++++++++++++++++++----------------------- dlls/msvcrt/time.c | 6 ++-- dlls/msvcrt/undname.c | 4 +- 9 files changed, 61 insertions(+), 59 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=82f175e9b5ab98a9b3a59…

1 0

Huw Davies : ole32/tests: Fix tests on systems without IE installed.
by Alexandre Julliard 25 May '09

25 May '09

Module: wine Branch: master Commit: 628a8743d271403c208c9e9cd2732e5f18fd603c URL: http://source.winehq.org/git/wine.git/?a=commit;h=628a8743d271403c208c9e9cd… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri May 22 14:53:21 2009 +0100 ole32/tests: Fix tests on systems without IE installed. --- dlls/ole32/tests/compobj.c | 18 +++++++++++++++--- 1 files changed, 15 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 7363f30..d9d684d 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -253,6 +253,13 @@ static void test_CoCreateInstance(void) OleInitialize(NULL); hr = CoCreateInstance(rclsid, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&pUnk); + if(hr == REGDB_E_CLASSNOTREG) + { + skip("IE not installed so can't test CoCreateInstance\n"); + OleUninitialize(); + return; + } + ok_ole_success(hr, "CoCreateInstance"); if(pUnk) IUnknown_Release(pUnk); OleUninitialize(); @@ -325,8 +332,13 @@ static void test_CoGetClassObject(void) pUnk = (IUnknown *)0xdeadbeef; hr = CoGetClassObject(rclsid, CLSCTX_INPROC_SERVER, NULL, &IID_IUnknown, (void **)&pUnk); - ok(hr == S_OK, "CoGetClassObject should have returned S_OK instead of 0x%08x\n", hr); - if (pUnk) IUnknown_Release(pUnk); + if(hr == REGDB_E_CLASSNOTREG) + skip("IE not installed so can't test CoGetClassObject\n"); + else + { + ok(hr == S_OK, "CoGetClassObject should have returned S_OK instead of 0x%08x\n", hr); + if (pUnk) IUnknown_Release(pUnk); + } SetEvent(info.stop); WaitForSingleObject(thread, INFINITE); @@ -1030,7 +1042,7 @@ static void test_CoFreeUnusedLibraries(void) hr = CoCreateInstance(&CLSID_FileProtocol, NULL, CLSCTX_INPROC_SERVER, &IID_IInternetProtocol, (void **)&pUnk); if (hr == REGDB_E_CLASSNOTREG) { - trace("IE not installed so can't run CoFreeUnusedLibraries test\n"); + skip("IE not installed so can't run CoFreeUnusedLibraries test\n"); CoUninitialize(); return; }

1 0

Huw Davies : comdlg32/tests: PrintDlgExW returns E_NOTIMPL on some versions of winME.
by Alexandre Julliard 25 May '09

25 May '09

Module: wine Branch: master Commit: 7ac3fe280f8f22ba0dc3fe4315bded6fbdc2d7ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ac3fe280f8f22ba0dc3fe431… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri May 22 15:13:15 2009 +0100 comdlg32/tests: PrintDlgExW returns E_NOTIMPL on some versions of winME. --- dlls/comdlg32/tests/printdlg.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/comdlg32/tests/printdlg.c b/dlls/comdlg32/tests/printdlg.c index ec63da9..4e189ee 100644 --- a/dlls/comdlg32/tests/printdlg.c +++ b/dlls/comdlg32/tests/printdlg.c @@ -246,6 +246,11 @@ static void test_PrintDlgExW(void) PrintDlg(NULL); SetLastError(0xdeadbeef); res = pPrintDlgExW(NULL); + if(res == E_NOTIMPL) + { + win_skip("PrintDlgExW returns not implemented\n"); + return; + } ok( (res == E_INVALIDARG), "got 0x%x with %u and %u (expected 'E_INVALIDARG')\n", res, GetLastError(), CommDlgExtendedError());

1 0

Aric Stewart : msctf: Implement ITextStoreACPSink::OnStatusChange.
by Alexandre Julliard 25 May '09

25 May '09

Module: wine Branch: master Commit: 6117ea47b32b77a488e3fbbd89ba310218e6cc51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6117ea47b32b77a488e3fbbd8… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri May 22 14:49:30 2009 -0500 msctf: Implement ITextStoreACPSink::OnStatusChange. Requires changes in the way document locking is implemented and tested. --- dlls/msctf/context.c | 43 +++++++++++++++++++++++++++++------- dlls/msctf/tests/inputprocessor.c | 37 +++++++++++++++---------------- 2 files changed, 52 insertions(+), 28 deletions(-) diff --git a/dlls/msctf/context.c b/dlls/msctf/context.c index 8e14a72..35838c9 100644 --- a/dlls/msctf/context.c +++ b/dlls/msctf/context.c @@ -70,6 +70,7 @@ typedef struct tagContext { TfClientId tidOwner; TfEditCookie defaultCookie; + TS_STATUS documentStatus; ITextStoreACP *pITextStoreACP; ITfContextOwnerCompositionSink *pITfContextOwnerCompositionSink; @@ -223,7 +224,6 @@ static HRESULT WINAPI Context_RequestEditSession (ITfContext *iface, HRESULT hr; Context *This = (Context *)iface; DWORD dwLockFlags = 0x0; - TS_STATUS status; TRACE("(%p) %i %p %x %p\n",This, tid, pes, dwFlags, phrSession); @@ -248,10 +248,10 @@ static HRESULT WINAPI Context_RequestEditSession (ITfContext *iface, else if (dwFlags & TF_ES_READ) dwLockFlags |= TS_LF_READ; - /* TODO: cache this */ - ITextStoreACP_GetStatus(This->pITextStoreACP, &status); + if (!This->documentStatus.dwDynamicFlags) + ITextStoreACP_GetStatus(This->pITextStoreACP, &This->documentStatus); - if (((dwFlags & TF_ES_READWRITE) == TF_ES_READWRITE) && (status.dwDynamicFlags & TS_SD_READONLY)) + if (((dwFlags & TF_ES_READWRITE) == TF_ES_READWRITE) && (This->documentStatus.dwDynamicFlags & TS_SD_READONLY)) { *phrSession = TS_E_READONLY; return S_OK; @@ -263,7 +263,6 @@ static HRESULT WINAPI Context_RequestEditSession (ITfContext *iface, return E_INVALIDARG; } - hr = ITextStoreACP_RequestLock(This->pITextStoreACP, dwLockFlags, phrSession); return hr; @@ -739,8 +738,28 @@ static HRESULT WINAPI TextStoreACPSink_OnStatusChange(ITextStoreACPSink *iface, DWORD dwFlags) { TextStoreACPSink *This = (TextStoreACPSink *)iface; - FIXME("STUB:(%p)\n",This); - return E_NOTIMPL; + HRESULT hr, hrSession; + + TRACE("(%p) %x\n",This, dwFlags); + + if (!This->pContext) + { + ERR("No context?\n"); + return E_FAIL; + } + + if (!This->pContext->pITextStoreACP) + { + FIXME("Context does not have a ITextStoreACP\n"); + return E_NOTIMPL; + } + + hr = ITextStoreACP_RequestLock(This->pContext->pITextStoreACP, TS_LF_READ, &hrSession); + + if(SUCCEEDED(hr) && SUCCEEDED(hrSession)) + This->pContext->documentStatus.dwDynamicFlags = dwFlags; + + return S_OK; } static HRESULT WINAPI TextStoreACPSink_OnAttrsChange(ITextStoreACPSink *iface, @@ -761,12 +780,18 @@ static HRESULT WINAPI TextStoreACPSink_OnLockGranted(ITextStoreACPSink *iface, TRACE("(%p) %x\n",This, dwLockFlags); - if (!This->pContext || !This->pContext->currentEditSession) + if (!This->pContext) { - ERR("OnLockGranted called on a context without a current edit session\n"); + ERR("OnLockGranted called without a context\n"); return E_FAIL; } + if (!This->pContext->currentEditSession) + { + FIXME("OnLockGranted called for something other than an EditSession\n"); + return S_OK; + } + cookie = HeapAlloc(GetProcessHeap(),0,sizeof(EditCookie)); if (!cookie) return E_OUTOFMEMORY; diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index 5884a30..bdb9a62 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -38,6 +38,8 @@ static ITfDocumentMgr *g_dm = NULL; static TfClientId cid = 0; static TfClientId tid = 0; +static ITextStoreACPSink *ACPSink; + #define SINK_UNEXPECTED 0 #define SINK_EXPECTED 1 #define SINK_FIRED 2 @@ -47,6 +49,7 @@ static BOOL test_ShouldDeactivate = FALSE; static DWORD tmSinkCookie; static DWORD tmSinkRefCount; +static DWORD documentStatus; static ITfDocumentMgr *test_CurrentFocus = NULL; static ITfDocumentMgr *test_PrevFocus = NULL; static INT test_OnSetFocus = SINK_UNEXPECTED; @@ -70,7 +73,6 @@ typedef struct tagTextStoreACP const ITextStoreACPVtbl *TextStoreACPVtbl; LONG refCount; - ITextStoreACPSink *sink; } TextStoreACP; static void TextStoreACP_Destructor(TextStoreACP *This) @@ -117,13 +119,12 @@ static ULONG WINAPI TextStoreACP_Release(ITextStoreACP *iface) static HRESULT WINAPI TextStoreACP_AdviseSink(ITextStoreACP *iface, REFIID riid, IUnknown *punk, DWORD dwMask) { - TextStoreACP *This = (TextStoreACP *)iface; HRESULT hr; ok(test_ACP_AdviseSink == SINK_EXPECTED, "Unexpected TextStoreACP_AdviseSink sink\n"); test_ACP_AdviseSink = SINK_FIRED; - hr = IUnknown_QueryInterface(punk, &IID_ITextStoreACPSink,(LPVOID*)(&This->sink)); + hr = IUnknown_QueryInterface(punk, &IID_ITextStoreACPSink,(LPVOID*)(&ACPSink)); ok(SUCCEEDED(hr),"Unable to QueryInterface on sink\n"); return S_OK; } @@ -138,28 +139,17 @@ static HRESULT WINAPI TextStoreACP_UnadviseSink(ITextStoreACP *iface, static HRESULT WINAPI TextStoreACP_RequestLock(ITextStoreACP *iface, DWORD dwLockFlags, HRESULT *phrSession) { - TextStoreACP *This = (TextStoreACP *)iface; - ok(test_ACP_RequestLock == SINK_EXPECTED,"Unexpected TextStoreACP_RequestLock\n"); test_ACP_RequestLock = SINK_FIRED; - test_DoEditSession = SINK_EXPECTED; - *phrSession = ITextStoreACPSink_OnLockGranted(This->sink, TS_LF_READWRITE); - ok(test_DoEditSession = SINK_FIRED,"expected DoEditSession not fired\n"); - ok(*phrSession == 0xdeadcafe,"Unexpected return from ITextStoreACPSink_OnLockGranted\n"); + *phrSession = ITextStoreACPSink_OnLockGranted(ACPSink, dwLockFlags); return S_OK; } static HRESULT WINAPI TextStoreACP_GetStatus(ITextStoreACP *iface, TS_STATUS *pdcs) { - 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"); + ok(test_ACP_GetStatus == SINK_EXPECTED, "Unexpected TextStoreACP_GetStatus\n"); test_ACP_GetStatus = SINK_FIRED; - pdcs->dwDynamicFlags = TS_SD_READONLY; + pdcs->dwDynamicFlags = documentStatus; return S_OK; } static HRESULT WINAPI TextStoreACP_QueryInsert(ITextStoreACP *iface, @@ -1483,6 +1473,7 @@ static void test_TStoApplicationText(void) 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); + documentStatus = TS_SD_READONLY; hrSession = 0xfeedface; test_ACP_GetStatus = SINK_EXPECTED; hr = ITfContext_RequestEditSession(cxt, tid, es, TF_ES_SYNC|TF_ES_READWRITE, &hrSession); @@ -1490,13 +1481,21 @@ static void test_TStoApplicationText(void) 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; + /* signal a change to allow readwrite sessions */ + documentStatus = 0; test_ACP_RequestLock = SINK_EXPECTED; + ITextStoreACPSink_OnStatusChange(ACPSink,documentStatus); + ok(test_ACP_RequestLock == SINK_FIRED," expected RequestLock not fired\n"); + + test_ACP_GetStatus = SINK_EXPECTED; + test_ACP_RequestLock = SINK_EXPECTED; + test_DoEditSession = SINK_EXPECTED; hrSession = 0xfeedface; - hr = ITfContext_RequestEditSession(cxt, tid, es, TF_ES_SYNC|TF_ES_READ, &hrSession); + hr = ITfContext_RequestEditSession(cxt, tid, es, TF_ES_SYNC|TF_ES_READWRITE, &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(test_ACP_GetStatus == SINK_FIRED," expected GetStatus not fired\n"); ok(hrSession == 0xdeadcafe,"Unexpected hrSession (%x)\n",hrSession); ITfContext_Release(cxt);

1 0

Michael Stefaniuc : imm32: Use a simpler comparison of a pointer with NULL.
by Alexandre Julliard 25 May '09

25 May '09

Module: wine Branch: master Commit: f8c545fa97268574ec15fecc7d13f8ee089269b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8c545fa97268574ec15fecc7… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri May 22 22:23:17 2009 +0200 imm32: Use a simpler comparison of a pointer with NULL. --- dlls/imm32/imm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index c7d170c..cb97ecd 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -528,7 +528,7 @@ BOOL WINAPI ImmAssociateContextEx(HWND hWnd, HIMC hIMC, DWORD dwFlags) } else if (dwFlags == IACE_IGNORENOCONTEXT) { - if (GetPropW(hWnd,szwWineIMCProperty) > 0) + if (GetPropW(hWnd,szwWineIMCProperty)) ImmAssociateContext(hWnd,hIMC); return TRUE; }

1 0

Maik Schulz : website: german translation of release 1.1.22 news item
by Maik Schulz 23 May '09

23 May '09

Module: website Branch: master Commit: 81a0877541b107e3fda5fba11adf98ee5f7ff07e URL: http://source.winehq.org/git/website.git/?a=commit;h=81a0877541b107e3fda5fb… Author: Maik Schulz <maik.schulz(a)gmail.com> Date: Sat May 23 13:59:42 2009 +0200 website: german translation of release 1.1.22 news item --- news/de/2009052201.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/de/2009052201.xml b/news/de/2009052201.xml new file mode 100644 index 0000000..ca7784b --- /dev/null +++ b/news/de/2009052201.xml @@ -0,0 +1,17 @@ +<news> +<date>22. Mai 2009</date> +<title>Wine 1.1.22 Freigegeben</title> +<body> + Die Entwicklungsversion 1.1.22 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.1.22">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Weitere Verbesserungen am OLE Kopieren/Einfügen.</li> + <li>Erste Behandlung von x86_64 Exceptions.</li> + <li>Korrekturen am Direct3D Locking.</li> + <li>Verbesserungen an ARB Shadern.</li> + <li>Bessere Unterstützung des OpenGL Pixel Formats.</li> + <li>Verschiedenste Fehlerbehebungen.</li> +</ul> +Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.1.22.tar.bz2">verfügbar</a>. +Binär-Downloads werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Download-Seiten</a> zur Verfügung. +</body></news>

1 0

Alexandre Julliard : Wine release 1.1.22
by Alexandre Julliard 22 May '09

22 May '09

Module: website Branch: master Commit: 64947efc104df3c1a7ff89e76954f2baf7fba6dd URL: http://source.winehq.org/git/website.git/?a=commit;h=64947efc104df3c1a7ff89… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 22 18:04:46 2009 +0200 Wine release 1.1.22 --- news/en/2009052201.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/en/2009052201.xml b/news/en/2009052201.xml new file mode 100644 index 0000000..932d60a --- /dev/null +++ b/news/en/2009052201.xml @@ -0,0 +1,17 @@ +<news> +<date>May 22, 2009</date> +<title>Wine 1.1.22 Released</title> +<body> + The Wine development release 1.1.22 is now available. + <a href="{$root}/announce/1.1.22">What's new</a> in this release: +<ul> + <li>More improvements to OLE copy/paste.</li> + <li>Beginnings of x86_64 exception handling.</li> + <li>Direct3D locking fixes.</li> + <li>ARB shaders improvements.</li> + <li>Better OpenGL pixel format support.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.1.22.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Alexandre Julliard : Release 1.1.22.
by Alexandre Julliard 22 May '09

22 May '09

Module: wine Branch: master Commit: b175a43fb8439a33a686512935597d4c43c19733 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b175a43fb8439a33a68651293… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 22 17:58:14 2009 +0200 Release 1.1.22. --- ANNOUNCE | 950 ++++++++++++++++++++++++++++++++---------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 517 insertions(+), 453 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b175a43fb8439a33a6865…

1 0

Tag wine-1.1.22 : Alexandre Julliard : Release 1.1.22
by Alexandre Julliard 22 May '09

22 May '09

Module: wine Branch: refs/tags/wine-1.1.22 Tag: 0639eb72b6aa4ae2cce3be392f301a553a7e777e URL: http://source.winehq.org/git/wine.git/?a=tag;h=0639eb72b6aa4ae2cce3be392f30… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 22 17:58:15 2009 +0200 Release 1.1.22

1 0