wine-commits January 2011

wine-commits@winehq.org

2 participants
879 discussions

Nikolay Sivov : oleaut32: Fix default parameter variant leak (Valgrind).
by Alexandre Julliard 31 Jan '11

31 Jan '11

Module: wine Branch: master Commit: d902249e54836aa1f7836a74d172ce5b75585a6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d902249e54836aa1f7836a74d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jan 29 02:12:56 2011 +0300 oleaut32: Fix default parameter variant leak (Valgrind). --- dlls/oleaut32/typelib2.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index 8260ef2..f87ed9f 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -3313,6 +3313,7 @@ static HRESULT WINAPI ITypeInfo2_fnGetFuncDesc( } (*ppFuncDesc)->lprgelemdescParam[i].u.paramdesc.pparamdescex->cBytes = sizeof(PARAMDESCEX); + VariantInit(&(*ppFuncDesc)->lprgelemdescParam[i].u.paramdesc.pparamdescex->varDefaultValue); hres = ctl2_decode_variant(This->typelib, typedata[hdr_len + i], &(*ppFuncDesc)->lprgelemdescParam[i].u.paramdesc.pparamdescex->varDefaultValue); if (FAILED(hres)) { @@ -3749,7 +3750,11 @@ static void WINAPI ITypeInfo2_fnReleaseFuncDesc( if (pFuncDesc->lprgelemdescParam[i].tdesc.vt != VT_USERDEFINED) release_typedesc(pFuncDesc->lprgelemdescParam[i].tdesc.u.lptdesc); - heap_free(pFuncDesc->lprgelemdescParam[i].u.paramdesc.pparamdescex); + if (pFuncDesc->lprgelemdescParam[i].u.paramdesc.pparamdescex) + { + VariantClear(&pFuncDesc->lprgelemdescParam[i].u.paramdesc.pparamdescex->varDefaultValue); + heap_free(pFuncDesc->lprgelemdescParam[i].u.paramdesc.pparamdescex); + } } heap_free(pFuncDesc->lprgelemdescParam); }

1 0

Henri Verbeet : wined3d: Get rid of the IWineD3DStateBlockImpl typedef.
by Alexandre Julliard 31 Jan '11

31 Jan '11

Module: wine Branch: master Commit: 96d225d4dd6459684989f3cf9a6b4dffa1516b4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=96d225d4dd6459684989f3cf9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 28 20:05:43 2011 +0100 wined3d: Get rid of the IWineD3DStateBlockImpl typedef. --- dlls/wined3d/arb_program_shader.c | 23 ++-- dlls/wined3d/ati_fragment_shader.c | 16 ++-- dlls/wined3d/device.c | 8 +- dlls/wined3d/glsl_shader.c | 2 +- dlls/wined3d/nvidia_texture_shader.c | 8 +- dlls/wined3d/state.c | 224 +++++++++++++++++----------------- dlls/wined3d/stateblock.c | 10 +- dlls/wined3d/swapchain_base.c | 8 +- dlls/wined3d/utils.c | 5 +- dlls/wined3d/wined3d_private.h | 38 +++---- 10 files changed, 168 insertions(+), 174 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=96d225d4dd6459684989f…

1 0

Henri Verbeet : wined3d: Get rid of the IWineD3DStateBlock typedef.
by Alexandre Julliard 31 Jan '11

31 Jan '11

Module: wine Branch: master Commit: b98cd5d982be5094be585e83daeb8bea7d301fda URL: http://source.winehq.org/git/wine.git/?a=commit;h=b98cd5d982be5094be585e83d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 28 20:05:42 2011 +0100 wined3d: Get rid of the IWineD3DStateBlock typedef. --- dlls/wined3d/device.c | 28 +++++++++++++++++----------- dlls/wined3d/wined3d_private.h | 1 - 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 0d45b8b..5de080f 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1007,7 +1007,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateIndexBuffer(IWineD3DDevice *iface } static HRESULT WINAPI IWineD3DDeviceImpl_CreateStateBlock(IWineD3DDevice *iface, - WINED3DSTATEBLOCKTYPE type, IWineD3DStateBlock **stateblock) + WINED3DSTATEBLOCKTYPE type, struct wined3d_stateblock **stateblock) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; IWineD3DStateBlockImpl *object; @@ -1029,7 +1029,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateStateBlock(IWineD3DDevice *iface, } TRACE("Created stateblock %p.\n", object); - *stateblock = (IWineD3DStateBlock *)object; + *stateblock = object; return WINED3D_OK; } @@ -1886,7 +1886,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Init3D(IWineD3DDevice *iface, if(!This->adapter->opengl) return WINED3DERR_INVALIDCALL; TRACE("(%p) : Creating stateblock\n", This); - hr = IWineD3DDevice_CreateStateBlock(iface, WINED3DSBT_INIT, (IWineD3DStateBlock **)&This->stateBlock); + hr = IWineD3DDevice_CreateStateBlock(iface, WINED3DSBT_INIT, &This->stateBlock); if (FAILED(hr)) { WARN("Failed to create stateblock\n"); @@ -4637,9 +4637,10 @@ static HRESULT WINAPI IWineD3DDeviceImpl_GetDisplayMode(IWineD3DDevice *iface, U * Stateblock related functions *****/ -static HRESULT WINAPI IWineD3DDeviceImpl_BeginStateBlock(IWineD3DDevice *iface) { +static HRESULT WINAPI IWineD3DDeviceImpl_BeginStateBlock(IWineD3DDevice *iface) +{ IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - IWineD3DStateBlock *stateblock; + struct wined3d_stateblock *stateblock; HRESULT hr; TRACE("(%p)\n", This); @@ -4658,24 +4659,29 @@ static HRESULT WINAPI IWineD3DDeviceImpl_BeginStateBlock(IWineD3DDevice *iface) return WINED3D_OK; } -static HRESULT WINAPI IWineD3DDeviceImpl_EndStateBlock(IWineD3DDevice *iface, IWineD3DStateBlock** ppStateBlock) { +static HRESULT WINAPI IWineD3DDeviceImpl_EndStateBlock(IWineD3DDevice *iface, + struct wined3d_stateblock **stateblock) +{ IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; IWineD3DStateBlockImpl *object = This->updateStateBlock; + TRACE("iface %p, stateblock %p.\n", iface, stateblock); + if (!This->isRecordingState) { WARN("(%p) not recording! returning error\n", This); - *ppStateBlock = NULL; + *stateblock = NULL; return WINED3DERR_INVALIDCALL; } stateblock_init_contained_states(object); - *ppStateBlock = (IWineD3DStateBlock*) object; + *stateblock = object; This->isRecordingState = FALSE; This->updateStateBlock = This->stateBlock; wined3d_stateblock_incref(This->updateStateBlock); - /* IWineD3DStateBlock_AddRef(*ppStateBlock); don't need to do this, since we should really just release UpdateStateBlock first */ - TRACE("(%p) returning token (ptr to stateblock) of %p\n", This, *ppStateBlock); + + TRACE("Returning stateblock %p.\n", *stateblock); + return WINED3D_OK; } @@ -6521,7 +6527,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Reset(IWineD3DDevice *iface, } /* Note: No parent needed for initial internal stateblock */ - hr = IWineD3DDevice_CreateStateBlock(iface, WINED3DSBT_INIT, (IWineD3DStateBlock **)&This->stateBlock); + hr = IWineD3DDevice_CreateStateBlock(iface, WINED3DSBT_INIT, &This->stateBlock); if (FAILED(hr)) ERR("Resetting the stateblock failed with error 0x%08x\n", hr); else TRACE("Created stateblock %p\n", This->stateBlock); This->updateStateBlock = This->stateBlock; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 2693031..7fc57b9 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -53,7 +53,6 @@ #define WINED3D_QUIRK_FBO_TEX_UPDATE 0x00000020 typedef struct wined3d_stateblock IWineD3DStateBlockImpl; -typedef struct wined3d_stateblock IWineD3DStateBlock; typedef struct IWineD3DSurfaceImpl IWineD3DSurfaceImpl; typedef struct IWineD3DPaletteImpl IWineD3DPaletteImpl; typedef struct IWineD3DDeviceImpl IWineD3DDeviceImpl;

1 0

Henri Verbeet : wined3d: Remove COM from the stateblock.
by Alexandre Julliard 31 Jan '11

31 Jan '11

Module: wine Branch: master Commit: 4b109ff1f8566b7a78f820c7b037cbfb8c2b04da URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b109ff1f8566b7a78f820c7b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 28 20:05:41 2011 +0100 wined3d: Remove COM from the stateblock. --- dlls/d3d8/device.c | 22 +- dlls/d3d9/d3d9_private.h | 4 +- dlls/d3d9/device.c | 6 +- dlls/d3d9/stateblock.c | 12 +- dlls/ddraw/device.c | 20 +- dlls/wined3d/device.c | 35 ++-- dlls/wined3d/stateblock.c | 473 +++++++++++++++++++--------------------- dlls/wined3d/wined3d.spec | 5 + dlls/wined3d/wined3d_private.h | 6 +- include/wine/wined3d.idl | 23 +-- 10 files changed, 289 insertions(+), 317 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4b109ff1f8566b7a78f82…

1 0

Henri Verbeet : wined3d: Set color / depth / stencil surfaces to NULL before releasing them in IWineD3DDeviceImpl_Uninit3D ().
by Alexandre Julliard 31 Jan '11

31 Jan '11

Module: wine Branch: master Commit: a538d28f28308b08d700c1c4d1c84b08d3ee4861 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a538d28f28308b08d700c1c4d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 28 20:05:40 2011 +0100 wined3d: Set color / depth / stencil surfaces to NULL before releasing them in IWineD3DDeviceImpl_Uninit3D(). --- dlls/wined3d/device.c | 41 ++++++++++++++++++++++------------------- 1 files changed, 22 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 676eafc..d5ae431 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2112,6 +2112,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Uninit3D(IWineD3DDevice *iface, { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface; const struct wined3d_gl_info *gl_info; + struct IWineD3DSurfaceImpl *surface; struct wined3d_context *context; int sampler; UINT i; @@ -2200,44 +2201,46 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Uninit3D(IWineD3DDevice *iface, /* Release the buffers (with sanity checks)*/ if (This->onscreen_depth_stencil) { - IWineD3DSurface_Release((IWineD3DSurface *)This->onscreen_depth_stencil); + surface = This->onscreen_depth_stencil; This->onscreen_depth_stencil = NULL; + IWineD3DSurface_Release((IWineD3DSurface *)surface); } if (This->depth_stencil) { - IWineD3DSurfaceImpl *ds = This->depth_stencil; + surface = This->depth_stencil; - TRACE("Releasing depth/stencil buffer %p.\n", ds); + TRACE("Releasing depth/stencil buffer %p.\n", surface); This->depth_stencil = NULL; - if (IWineD3DSurface_Release((IWineD3DSurface *)ds) - && ds != This->auto_depth_stencil) + if (IWineD3DSurface_Release((IWineD3DSurface *)surface) + && surface != This->auto_depth_stencil) { - ERR("Something is still holding a reference to depth/stencil buffer %p.\n", ds); + ERR("Something is still holding a reference to depth/stencil buffer %p.\n", surface); } } - for (i = 1; i < gl_info->limits.buffers; ++i) - { - IWineD3DDevice_SetRenderTarget(iface, i, NULL, FALSE); - } - - TRACE("Releasing the render target at %p\n", This->render_targets[0]); - IWineD3DSurface_Release((IWineD3DSurface *)This->render_targets[0]); - - TRACE("Setting rendertarget to NULL\n"); - This->render_targets[0] = NULL; - if (This->auto_depth_stencil) { - if (IWineD3DSurface_Release((IWineD3DSurface *)This->auto_depth_stencil)) + surface = This->auto_depth_stencil; + This->auto_depth_stencil = NULL; + if (IWineD3DSurface_Release((IWineD3DSurface *)surface)) { FIXME("(%p) Something's still holding the auto depth stencil buffer\n", This); } - This->auto_depth_stencil = NULL; } + for (i = 1; i < gl_info->limits.buffers; ++i) + { + IWineD3DDevice_SetRenderTarget(iface, i, NULL, FALSE); + } + + surface = This->render_targets[0]; + TRACE("Setting rendertarget 0 to NULL\n"); + This->render_targets[0] = NULL; + TRACE("Releasing the render target at %p\n", surface); + IWineD3DSurface_Release((IWineD3DSurface *)surface); + context_release(context); for (i = 0; i < This->NumberOfSwapChains; ++i)

1 0

Detlef Riekenberg : msvcrt: Add private define and header tests for _set_error_mode options.
by Alexandre Julliard 28 Jan '11

28 Jan '11

Module: wine Branch: master Commit: 58786dc8ea237cf646e62edb865dc260684eb784 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58786dc8ea237cf646e62edb8… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Jan 28 15:49:27 2011 +0100 msvcrt: Add private define and header tests for _set_error_mode options. --- dlls/msvcrt/msvcrt.h | 2 ++ dlls/msvcrt/tests/headers.c | 2 ++ 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 5176802..5544722 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -568,6 +568,8 @@ struct MSVCRT__stat64 { #define MSVCRT__USEDENTRY 1 #define MSVCRT__OUT_TO_DEFAULT 0 +#define MSVCRT__OUT_TO_STDERR 1 +#define MSVCRT__OUT_TO_MSGBOX 2 #define MSVCRT__REPORT_ERRMODE 3 /* ASCII char classification table - binary compatible */ diff --git a/dlls/msvcrt/tests/headers.c b/dlls/msvcrt/tests/headers.c index f02b61f..25e2277 100644 --- a/dlls/msvcrt/tests/headers.c +++ b/dlls/msvcrt/tests/headers.c @@ -340,6 +340,8 @@ static void test_defines(void) CHECK_DEF(_FREEENTRY); CHECK_DEF(_USEDENTRY); CHECK_DEF(_OUT_TO_DEFAULT); + CHECK_DEF(_OUT_TO_STDERR); + CHECK_DEF(_OUT_TO_MSGBOX); CHECK_DEF(_REPORT_ERRMODE); CHECK_DEF(_UPPER); CHECK_DEF(_LOWER);

1 0

Alexander Scott-Johns : winex11.drv: Implement synthesizing the CF_ENHMETAFILE clipboard format from CF_METAFILEPICT .
by Alexandre Julliard 28 Jan '11

28 Jan '11

Module: wine Branch: master Commit: 42fc3b64302699ed5a4a27d7fee5b55c0eb54e74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42fc3b64302699ed5a4a27d7f… Author: Alexander Scott-Johns <alexander.scott.johns(a)googlemail.com> Date: Tue Jan 25 17:54:21 2011 +0000 winex11.drv: Implement synthesizing the CF_ENHMETAFILE clipboard format from CF_METAFILEPICT. --- dlls/winex11.drv/clipboard.c | 55 ++++++++++++++++++++++++++++++++++++++++- 1 files changed, 53 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index fcec86b..c3f1b55 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -179,6 +179,7 @@ static BOOL X11DRV_CLIPBOARD_SynthesizeData(UINT wFormatID); static BOOL X11DRV_CLIPBOARD_RenderSynthesizedFormat(Display *display, LPWINE_CLIPDATA lpData); static BOOL X11DRV_CLIPBOARD_RenderSynthesizedDIB(Display *display); static BOOL X11DRV_CLIPBOARD_RenderSynthesizedBitmap(Display *display); +static BOOL X11DRV_CLIPBOARD_RenderSynthesizedEnhMetaFile(Display *display); static void X11DRV_HandleSelectionRequest( HWND hWnd, XSelectionRequestEvent *event, BOOL bIsMultiple ); /* Clipboard formats @@ -887,12 +888,15 @@ static BOOL X11DRV_CLIPBOARD_RenderSynthesizedFormat(Display *display, LPWINE_CL break; case CF_ENHMETAFILE: + bret = X11DRV_CLIPBOARD_RenderSynthesizedEnhMetaFile( display ); + break; + case CF_METAFILEPICT: - FIXME("Synthesizing wFormatID(0x%08x) not implemented\n", wFormatID); + FIXME("Synthesizing CF_METAFILEPICT not implemented\n"); break; default: - FIXME("Called to synthesize unknown format\n"); + FIXME("Called to synthesize unknown format 0x%08x\n", wFormatID); break; } } @@ -1088,6 +1092,53 @@ static BOOL X11DRV_CLIPBOARD_RenderSynthesizedBitmap(Display *display) /************************************************************************** + * X11DRV_CLIPBOARD_RenderSynthesizedEnhMetaFile + */ +static BOOL X11DRV_CLIPBOARD_RenderSynthesizedEnhMetaFile(Display *display) +{ + LPWINE_CLIPDATA lpSource = NULL; + + TRACE("\n"); + + if ((lpSource = X11DRV_CLIPBOARD_LookupData(CF_ENHMETAFILE)) && lpSource->hData) + return TRUE; + /* If we have a MF pict and it's not synthesized or it has been rendered */ + else if ((lpSource = X11DRV_CLIPBOARD_LookupData(CF_METAFILEPICT)) && + (!(lpSource->wFlags & CF_FLAG_SYNTHESIZED) || lpSource->hData)) + { + /* Render source if required */ + if (lpSource->hData || X11DRV_CLIPBOARD_RenderFormat(display, lpSource)) + { + METAFILEPICT *pmfp; + HENHMETAFILE hData = NULL; + + pmfp = GlobalLock(lpSource->hData); + if (pmfp) + { + UINT size_mf_bits = GetMetaFileBitsEx(pmfp->hMF, 0, NULL); + void *mf_bits = HeapAlloc(GetProcessHeap(), 0, size_mf_bits); + if (mf_bits) + { + GetMetaFileBitsEx(pmfp->hMF, size_mf_bits, mf_bits); + hData = SetWinMetaFileBits(size_mf_bits, mf_bits, NULL, pmfp); + HeapFree(GetProcessHeap(), 0, mf_bits); + } + GlobalUnlock(lpSource->hData); + } + + if (hData) + { + X11DRV_CLIPBOARD_InsertClipboardData(CF_ENHMETAFILE, hData, 0, NULL, TRUE); + return TRUE; + } + } + } + + return FALSE; +} + + +/************************************************************************** * X11DRV_CLIPBOARD_ImportXAString * * Import XA_STRING, converting the string to CF_TEXT.

1 0

Alexander Scott-Johns : user32/tests: Test getting the data from synthesized clipboard formats.
by Alexandre Julliard 28 Jan '11

28 Jan '11

Module: wine Branch: master Commit: 198a55bd6e7969f611b1f6ff1a077c1e56bb146a URL: http://source.winehq.org/git/wine.git/?a=commit;h=198a55bd6e7969f611b1f6ff1… Author: Alexander Scott-Johns <alexander.scott.johns(a)googlemail.com> Date: Fri Jan 28 13:05:29 2011 +0000 user32/tests: Test getting the data from synthesized clipboard formats. --- dlls/user32/tests/clipboard.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index 5b0f17e..781334e 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -216,6 +216,7 @@ static void test_synthesized(void) HENHMETAFILE emf; BOOL r; UINT cf; + HANDLE data; htext = create_text(); emf = create_emf(); @@ -235,15 +236,21 @@ static void test_synthesized(void) ok(r, "gle %d\n", GetLastError()); cf = EnumClipboardFormats(0); ok(cf == CF_TEXT, "cf %08x\n", cf); + data = GetClipboardData(cf); + ok(data != NULL, "couldn't get data, cf %08x\n", cf); cf = EnumClipboardFormats(cf); ok(cf == CF_ENHMETAFILE, "cf %08x\n", cf); + data = GetClipboardData(cf); + ok(data != NULL, "couldn't get data, cf %08x\n", cf); cf = EnumClipboardFormats(cf); todo_wine ok(cf == CF_LOCALE, "cf %08x\n", cf); if(cf == CF_LOCALE) cf = EnumClipboardFormats(cf); ok(cf == CF_OEMTEXT, "cf %08x\n", cf); + data = GetClipboardData(cf); + ok(data != NULL, "couldn't get data, cf %08x\n", cf); cf = EnumClipboardFormats(cf); ok(cf == CF_UNICODETEXT || @@ -253,6 +260,8 @@ static void test_synthesized(void) if(cf == CF_UNICODETEXT) cf = EnumClipboardFormats(cf); ok(cf == CF_METAFILEPICT, "cf %08x\n", cf); + data = GetClipboardData(cf); + todo_wine ok(data != NULL, "couldn't get data, cf %08x\n", cf); cf = EnumClipboardFormats(cf); ok(cf == 0, "cf %08x\n", cf);

1 0

Greg Geldorp : winmm/tests: Skip some tests on VMware.
by Alexandre Julliard 28 Jan '11

28 Jan '11

Module: wine Branch: master Commit: e45caf5d6b89599fb13e906492c50aa9d1ed945d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e45caf5d6b89599fb13e90649… Author: Greg Geldorp <ggeldorp(a)vmware.com> Date: Fri Jan 28 13:30:21 2011 +0100 winmm/tests: Skip some tests on VMware. --- dlls/winmm/tests/Makefile.in | 2 +- dlls/winmm/tests/midi.c | 82 +++++++++++++++++++++++++++++++++++++++--- 2 files changed, 78 insertions(+), 6 deletions(-) diff --git a/dlls/winmm/tests/Makefile.in b/dlls/winmm/tests/Makefile.in index 4a74bdf..fcd8ece 100644 --- a/dlls/winmm/tests/Makefile.in +++ b/dlls/winmm/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = winmm.dll -IMPORTS = winmm user32 +IMPORTS = winmm user32 advapi32 C_SRCS = \ capture.c \ diff --git a/dlls/winmm/tests/midi.c b/dlls/winmm/tests/midi.c index 01055e3..e40e1d7 100644 --- a/dlls/winmm/tests/midi.c +++ b/dlls/winmm/tests/midi.c @@ -625,6 +625,72 @@ static void test_midiStream(UINT udev, HWND hwnd) } } +static BOOL scan_subkeys(HKEY parent, const LPCSTR *sub_keys) +{ + char name[64]; + DWORD index = 0; + DWORD name_len = sizeof(name); + BOOL found_vmware = FALSE; + + if (sub_keys[0] == NULL) + { + /* We're at the deepest level, check "Identifier" value now */ + char *test; + if (RegQueryValueExA(parent, "Identifier", NULL, NULL, (LPBYTE) name, &name_len) != ERROR_SUCCESS) + return FALSE; + for (test = name; test < name + lstrlenA(name) - 6 && ! found_vmware; test++) + { + char c = test[6]; + test[6] = '\0'; + found_vmware = (lstrcmpiA(test, "VMware") == 0); + test[6] = c; + } + return found_vmware; + } + + while (RegEnumKeyExA(parent, index, name, &name_len, NULL, NULL, NULL, NULL) == ERROR_SUCCESS && + ! found_vmware) { + char c = name[lstrlenA(sub_keys[0])]; + name[lstrlenA(sub_keys[0])] = '\0'; + if (lstrcmpiA(name, sub_keys[0]) == 0) { + HKEY sub_key; + name[lstrlenA(sub_keys[0])] = c; + if (RegOpenKeyExA(parent, name, 0, KEY_ENUMERATE_SUB_KEYS | KEY_QUERY_VALUE, &sub_key) == ERROR_SUCCESS) { + found_vmware = scan_subkeys(sub_key, sub_keys + 1); + RegCloseKey(sub_key); + } + } + + name_len = sizeof(name); + index++; + } + + return found_vmware; +} + +/* + * Usual method to detect whether running inside a VMware virtual machine involves direct port I/O requiring + * some assembly and an exception handler. Can't do that in Wine tests. Alternative method of querying WMI + * is not available on NT4. So instead we look at the device map and check the Identifier value in the + * registry keys HKLM\HARDWARE\DEVICEMAP\SCSI\Scsi Port x\Scsi Bus x\Target Id x\Logical Unit Id x (where + * x is some number). If the Identifier value contains the string "VMware" we assume running in a VMware VM. + */ +static BOOL on_vmware(void) +{ + static const LPCSTR sub_keys[] = { "Scsi Port ", "Scsi Bus ", "Target Id ", "Logical Unit Id ", NULL }; + HKEY scsi; + BOOL found_vmware = FALSE; + + if (RegOpenKeyExA(HKEY_LOCAL_MACHINE, "HARDWARE\\DEVICEMAP\\Scsi", 0, KEY_ENUMERATE_SUB_KEYS, &scsi) != ERROR_SUCCESS) + return FALSE; + + found_vmware = scan_subkeys(scsi, sub_keys); + + RegCloseKey(scsi); + + return found_vmware; +} + static void test_midi_outfns(HWND hwnd) { HMIDIOUT hm; @@ -662,11 +728,17 @@ static void test_midi_outfns(HWND hwnd) test_midi_mci(hwnd); for (udev=0; udev < ndevs; udev++) { - trace("** Testing device %d\n", udev); - test_midiOut_device(udev, hwnd); - Sleep(800); /* Let the synth rest */ - test_midiStream(udev, hwnd); - Sleep(800); + MIDIOUTCAPSA capsA; + rc = midiOutGetDevCapsA(udev, &capsA, sizeof(capsA)); + if (rc || strcmp(capsA.szPname, "Creative Sound Blaster MPU-401") != 0 || ! on_vmware()) { + trace("** Testing device %d\n", udev); + test_midiOut_device(udev, hwnd); + Sleep(800); /* Let the synth rest */ + test_midiStream(udev, hwnd); + Sleep(800); + } + else + win_skip("Skipping this device on VMware, driver problem\n"); } trace("** Testing MIDI mapper\n"); test_midiOut_device(MIDIMAPPER, hwnd);

1 0

Alexander Morozov : shell32: Partially implement Folder::get_Title.
by Alexandre Julliard 28 Jan '11

28 Jan '11

Module: wine Branch: master Commit: 6fb10a6e9196d6f9025f5391cab577336d78c79e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fb10a6e9196d6f9025f5391c… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Tue Jan 18 21:37:39 2011 +0300 shell32: Partially implement Folder::get_Title. --- dlls/shell32/shelldispatch.c | 17 +++++++++++++++-- dlls/shell32/tests/shelldispatch.c | 4 ---- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/dlls/shell32/shelldispatch.c b/dlls/shell32/shelldispatch.c index 3ec5347..67501ae 100644 --- a/dlls/shell32/shelldispatch.c +++ b/dlls/shell32/shelldispatch.c @@ -180,10 +180,23 @@ static HRESULT WINAPI FolderImpl_Invoke(Folder3 *iface, DISPID dispIdMember, static HRESULT WINAPI FolderImpl_get_Title(Folder3 *iface, BSTR *pbs) { - FIXME("(%p,%p)\n", iface, pbs); + FolderImpl *This = impl_from_Folder(iface); + WCHAR *p; + int len; + + TRACE("(%p,%p)\n", iface, pbs); *pbs = NULL; - return E_NOTIMPL; + + if (V_VT(&This->dir) == VT_I4) + { + FIXME("special folder constants are not supported\n"); + return E_NOTIMPL; + } + p = PathFindFileNameW(V_BSTR(&This->dir)); + len = lstrlenW(p); + *pbs = SysAllocStringLen(p, p[len - 1] == '\\' ? len - 1 : len); + return *pbs ? S_OK : E_OUTOFMEMORY; } static HRESULT WINAPI FolderImpl_get_Application(Folder3 *iface, diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index a34ec39..f253627 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -148,11 +148,9 @@ static void test_namespace(void) if (r == S_OK) { r = Folder_get_Title(folder, &title); - todo_wine ok(r == S_OK, "Folder::get_Title failed: %08x\n", r); if (r == S_OK) { - todo_wine ok(!lstrcmpW(title, winetestW), "bad title: %s\n", wine_dbgstr_w(title)); SysFreeString(title); @@ -172,11 +170,9 @@ static void test_namespace(void) if (r == S_OK) { r = Folder_get_Title(folder, &title); - todo_wine ok(r == S_OK, "Folder::get_Title failed: %08x\n", r); if (r == S_OK) { - todo_wine ok(!lstrcmpW(title, winetestW), "bad title: %s\n", wine_dbgstr_w(title)); SysFreeString(title);

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
88
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 January 2011