wine-commits May 2009

wine-commits@winehq.org

4 participants
793 discussions

Chris Robinson : wined3d: Decrement fbo_entry_count when one is removed from the list.
by Alexandre Julliard 25 May '09

25 May '09

Module: wine Branch: master Commit: 12799db34926cbb32b190af56aa464e96cc2bc18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12799db34926cbb32b190af56… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Sun May 24 05:15:29 2009 -0700 wined3d: Decrement fbo_entry_count when one is removed from the list. --- dlls/wined3d/context.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 02215c8..8fb075d 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -259,13 +259,14 @@ static void context_reuse_fbo_entry(IWineD3DDevice *iface, struct fbo_entry *ent } /* GL locking is done by the caller */ -static void context_destroy_fbo_entry(IWineD3DDeviceImpl *This, struct fbo_entry *entry) +static void context_destroy_fbo_entry(IWineD3DDeviceImpl *This, WineD3DContext *context, struct fbo_entry *entry) { if (entry->id) { TRACE("Destroy FBO %d\n", entry->id); context_destroy_fbo(This, &entry->id); } + --context->fbo_entry_count; list_remove(&entry->entry); HeapFree(GetProcessHeap(), 0, entry->render_targets); HeapFree(GetProcessHeap(), 0, entry); @@ -381,11 +382,12 @@ void context_resource_released(IWineD3DDevice *iface, IWineD3DResource *resource { for (i = 0; i < This->numContexts; ++i) { + WineD3DContext *context = This->contexts[i]; struct fbo_entry *entry, *entry2; ENTER_GL(); - LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &This->contexts[i]->fbo_list, struct fbo_entry, entry) + LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &context->fbo_list, struct fbo_entry, entry) { BOOL destroyed = FALSE; UINT j; @@ -394,13 +396,13 @@ void context_resource_released(IWineD3DDevice *iface, IWineD3DResource *resource { if (entry->render_targets[j] == (IWineD3DSurface *)resource) { - context_destroy_fbo_entry(This, entry); + context_destroy_fbo_entry(This, context, entry); destroyed = TRUE; } } if (!destroyed && entry->depth_stencil == (IWineD3DSurface *)resource) - context_destroy_fbo_entry(This, entry); + context_destroy_fbo_entry(This, context, entry); } LEAVE_GL(); @@ -1053,7 +1055,7 @@ void DestroyContext(IWineD3DDeviceImpl *This, WineD3DContext *context) { ENTER_GL(); LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &context->fbo_list, struct fbo_entry, entry) { - context_destroy_fbo_entry(This, entry); + context_destroy_fbo_entry(This, context, entry); } if (context->src_fbo) { TRACE("Destroy src FBO %d\n", context->src_fbo);

1 0

Chris Robinson : wined3d: Prevent erroneous FIXMEs on newer cards.
by Alexandre Julliard 25 May '09

25 May '09

Module: wine Branch: master Commit: 1d757fd6da5e5cbd57396ad0c42de78e2d7c4820 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d757fd6da5e5cbd57396ad0c… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Sun May 10 14:17:43 2009 -0700 wined3d: Prevent erroneous FIXMEs on newer cards. Cards that have 12 or more combined samplers can trigger a fixme if they have the same amount of vertex samplers, even though it's plenty enough. --- dlls/wined3d/directx.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 46c1556..5ce84cd 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -901,7 +901,7 @@ static BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { * So this is just a check to check that our assumption holds true. If not, write a warning * and reduce the number of vertex samplers or probably disable vertex texture fetch. */ - if(gl_info->max_vertex_samplers && + if(gl_info->max_vertex_samplers && gl_info->max_combined_samplers < 12 && MAX_TEXTURES + gl_info->max_vertex_samplers > gl_info->max_combined_samplers) { FIXME("OpenGL implementation supports %u vertex samplers and %u total samplers\n", gl_info->max_vertex_samplers, gl_info->max_combined_samplers);

1 0

Gerald Pfeifer : dsound: Clarify statement in DSOUND_capture_callback.
by Alexandre Julliard 25 May '09

25 May '09

Module: wine Branch: master Commit: 13e14f3b8ee93ac94cfe82950f827349cf225cec URL: http://source.winehq.org/git/wine.git/?a=commit;h=13e14f3b8ee93ac94cfe82950… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat May 23 22:17:08 2009 +0200 dsound: Clarify statement in DSOUND_capture_callback. --- dlls/dsound/capture.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dsound/capture.c b/dlls/dsound/capture.c index 2a8252f..312c90f 100644 --- a/dlls/dsound/capture.c +++ b/dlls/dsound/capture.c @@ -428,7 +428,7 @@ DSOUND_capture_callback(HWAVEIN hwi, UINT msg, DWORD_PTR dwUser, DWORD_PTR dw1, if (This->state == STATE_STARTING) This->state = STATE_CAPTURING; capture_CheckNotify(Moi, (DWORD_PTR)This->pwave[index].lpData - (DWORD_PTR)This->buffer, This->pwave[index].dwBufferLength); - This->index = (++This->index) % This->nrofpwaves; + This->index = (This->index + 1) % This->nrofpwaves; if ( (This->index == 0) && !(This->capture_buffer->flags & DSCBSTART_LOOPING) ) { TRACE("end of buffer\n"); This->state = STATE_STOPPED;

1 0

Andrew Talbot : avifil32: Constify a variable.
by Alexandre Julliard 25 May '09

25 May '09

Module: wine Branch: master Commit: e281b0935bca915a9f3d876338a97f7ebc9397f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e281b0935bca915a9f3d87633… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat May 23 22:31:56 2009 +0100 avifil32: Constify a variable. --- dlls/avifil32/avifile.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/avifil32/avifile.c b/dlls/avifil32/avifile.c index 1719031..49e141f 100644 --- a/dlls/avifil32/avifile.c +++ b/dlls/avifil32/avifile.c @@ -226,7 +226,7 @@ static ULONG AVIFILE_SearchStream(const IAVIFileImpl *This, DWORD fccType, LONG lSkip); static void AVIFILE_UpdateInfo(IAVIFileImpl *This); static HRESULT AVIFILE_WriteBlock(IAVIStreamImpl *This, DWORD block, - FOURCC ckid, DWORD flags, LPVOID buffer, + FOURCC ckid, DWORD flags, LPCVOID buffer, LONG size); HRESULT AVIFILE_CreateAVIFile(REFIID riid, LPVOID *ppv) @@ -2543,7 +2543,7 @@ static void AVIFILE_UpdateInfo(IAVIFileImpl *This) } static HRESULT AVIFILE_WriteBlock(IAVIStreamImpl *This, DWORD block, - FOURCC ckid, DWORD flags, LPVOID buffer, + FOURCC ckid, DWORD flags, LPCVOID buffer, LONG size) { MMCKINFO ck;

1 0

Vladimir Pankratov : winedbg: Add Russian translation.
by Alexandre Julliard 25 May '09

25 May '09

Module: wine Branch: master Commit: c75f31e1b8e6cb3202fa5c4d89519d530636fdb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c75f31e1b8e6cb3202fa5c4d8… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Sat May 23 02:21:03 2009 +0500 winedbg: Add Russian translation. --- programs/winedbg/rsrc.rc | 1 + programs/winedbg/rsrc_Ru.rc | 53 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+), 0 deletions(-) diff --git a/programs/winedbg/rsrc.rc b/programs/winedbg/rsrc.rc index fbc07d7..9963bbf 100644 --- a/programs/winedbg/rsrc.rc +++ b/programs/winedbg/rsrc.rc @@ -26,3 +26,4 @@ #include "rsrc_En.rc" #include "rsrc_Ko.rc" #include "rsrc_Nl.rc" +#include "rsrc_Ru.rc" diff --git a/programs/winedbg/rsrc_Ru.rc b/programs/winedbg/rsrc_Ru.rc new file mode 100644 index 0000000..7fc05bb --- /dev/null +++ b/programs/winedbg/rsrc_Ru.rc @@ -0,0 +1,53 @@ +/* + * Russian Language Support + * + * Copyright 2009 Vladimir Pankratov + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +IDM_DEBUG_POPUP MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "&��", ID_DEBUG + END +END + +IDD_CRASH_DLG DIALOGEX 100, 100, 273, 175 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "�� " +FONT 8, "Tahoma" +BEGIN + LTEXT "",IDC_STATIC_BG,0,0,273,52,WS_BORDER,0 + LTEXT "� �� %s �� \ + ��. �� .", + IDC_STATIC_TXT1,27,10,224,30 + LTEXT "�� Wine. \ + �� http://appdb.winehq.org � �� \ + �� .\n\n\ + �� Windows � �� , \ + �� http://bugs.winehq.org.",IDC_STATIC_TXT2,27,60,224,100 + DEFPUSHBUTTON "��", IDOK, 205, 151, 60, 16, WS_TABSTOP +END + +STRINGTABLE +BEGIN + IDS_AUTO_CAPTION "�� Wine" + IDS_INVALID_PARAMS "�� - �� " + IDS_UNIDENTIFIED "(��)" +END

1 0

Frans Kool : cryptui: Added Dutch translations.
by Alexandre Julliard 25 May '09

25 May '09

Module: wine Branch: master Commit: 918935613f97a30fb9075b325dd3c9d2a32a9d46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=918935613f97a30fb9075b325… Author: Frans Kool <Frans.Kool(a)gmail.com> Date: Fri May 22 22:41:07 2009 +0200 cryptui: Added Dutch translations. --- dlls/cryptui/cryptui.rc | 1 + dlls/cryptui/cryptui_Nl.rc | 461 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 462 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=918935613f97a30fb9075…

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

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

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

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

← Newer
1
...
19
20
21
22
23
24
25
...
80
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2009