January 2014 - Wine-Commits

Nikolay Sivov : oleaut32/tests: Test Invoke() arguments in *FromDisp() tests.
by Alexandre Julliard Jan. 14, 2014

Jan. 14, 2014

Module: wine Branch: master Commit: bb711b6133a46839e5ee94af4a2a4d119ae87e98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb711b6133a46839e5ee94af4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 14 13:25:06 2014 +0400 oleaut32/tests: Test Invoke() arguments in *FromDisp() tests. --- dlls/oleaut32/tests/vartype.c | 161 ++++++++++++++++++++++++++++++----------- 1 file changed, 119 insertions(+), 42 deletions(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index d100ad1..bc74e2e 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -19,10 +19,12 @@ */ #define CONST_VTABLE +#define COBJMACROS #include "wine/test.h" #include "oleauto.h" #include <math.h> +#include <stdio.h> /* Some Visual C++ versions choke on __uint64 to float conversions. * To fix this you need either VC++ 6.0 plus the processor pack @@ -245,6 +247,32 @@ static BOOL has_locales; BADVAR(VT_CLSID); \ BADVAR(VT_BSTR_BLOB) +#define DEFINE_EXPECT(func) \ + static BOOL expect_ ## func = FALSE, called_ ## func = FALSE + +#define SET_EXPECT(func) \ + do { called_ ## func = FALSE; expect_ ## func = TRUE; } while(0) + +#define CHECK_EXPECT2(func) \ + do { \ + ok(expect_ ##func, "unexpected call " #func "\n"); \ + called_ ## func = TRUE; \ + }while(0) + +#define CHECK_EXPECT(func) \ + do { \ + CHECK_EXPECT2(func); \ + expect_ ## func = FALSE; \ + }while(0) + +#define CHECK_CALLED(func) \ + do { \ + ok(called_ ## func, "expected " #func "\n"); \ + expect_ ## func = called_ ## func = FALSE; \ + }while(0) + +DEFINE_EXPECT(dispatch_invoke); + /* Early versions of oleaut32 are missing many functions */ static HRESULT (WINAPI *pVarI1FromUI1)(BYTE,signed char*); static HRESULT (WINAPI *pVarI1FromI2)(SHORT,signed char*); @@ -482,6 +510,18 @@ static HRESULT (WINAPI *pVarBstrCat)(BSTR,BSTR,BSTR*); static INT (WINAPI *pSystemTimeToVariantTime)(LPSYSTEMTIME,double*); static void (WINAPI *pClearCustData)(LPCUSTDATA); +static const char *debugstr_guid(REFIID riid) +{ + static char buf[50]; + + sprintf(buf, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", + riid->Data1, riid->Data2, riid->Data3, riid->Data4[0], + riid->Data4[1], riid->Data4[2], riid->Data4[3], riid->Data4[4], + riid->Data4[5], riid->Data4[6], riid->Data4[7]); + + return buf; +} + /* Internal representation of a BSTR */ typedef struct tagINTERNAL_BSTR { @@ -504,66 +544,85 @@ static inline DummyDispatch *impl_from_IDispatch(IDispatch *iface) return CONTAINING_RECORD(iface, DummyDispatch, IDispatch_iface); } -static ULONG WINAPI DummyDispatch_AddRef(LPDISPATCH iface) +static ULONG WINAPI DummyDispatch_AddRef(IDispatch *iface) { DummyDispatch *This = impl_from_IDispatch(iface); - - trace("AddRef(%p)\n", iface); return InterlockedIncrement(&This->ref); } -static ULONG WINAPI DummyDispatch_Release(LPDISPATCH iface) +static ULONG WINAPI DummyDispatch_Release(IDispatch *iface) { DummyDispatch *This = impl_from_IDispatch(iface); - - trace("Release(%p)\n", iface); return InterlockedDecrement(&This->ref); } -static HRESULT WINAPI DummyDispatch_QueryInterface(LPDISPATCH iface, +static HRESULT WINAPI DummyDispatch_QueryInterface(IDispatch *iface, REFIID riid, void** ppvObject) { - trace("QueryInterface(%p)\n", iface); - if (ppvObject) + *ppvObject = NULL; + + if (IsEqualIID(riid, &IID_IDispatch) || + IsEqualIID(riid, &IID_IUnknown)) { - *ppvObject = NULL; - if (IsEqualIID(riid, &IID_IDispatch)) - { - trace("Asked for IID_IDispatch\n"); *ppvObject = iface; - } - else if (IsEqualIID(riid, &IID_IUnknown)) - { - trace("Asked for IID_IUnknown\n"); - *ppvObject = iface; - } - if (*ppvObject) - { - DummyDispatch_AddRef(*ppvObject); - return S_OK; - } + IDispatch_AddRef(iface); } - return E_NOINTERFACE; + + return *ppvObject ? S_OK : E_NOINTERFACE; +} + +static HRESULT WINAPI DummyDispatch_GetTypeInfoCount(IDispatch *iface, UINT *pctinfo) +{ + ok(0, "Unexpected call\n"); + return E_NOTIMPL; } -static HRESULT WINAPI DummyDispatch_Invoke(LPDISPATCH iface, - DISPID dispIdMember, REFIID riid, +static HRESULT WINAPI DummyDispatch_GetTypeInfo(IDispatch *iface, UINT tinfo, LCID lcid, ITypeInfo **ti) +{ + ok(0, "Unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI DummyDispatch_GetIDsOfNames(IDispatch *iface, REFIID riid, LPOLESTR *names, + UINT cnames, LCID lcid, DISPID *dispid) +{ + ok(0, "Unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI DummyDispatch_Invoke(IDispatch *iface, + DISPID dispid, REFIID riid, LCID lcid, WORD wFlags, - DISPPARAMS *pDispParams, - VARIANT *pVarResult, - EXCEPINFO *pExcepInfo, - UINT *puArgErr) + DISPPARAMS *params, + VARIANT *res, + EXCEPINFO *ei, + UINT *arg_err) { - trace("Invoke(%p)\n", iface); + CHECK_EXPECT(dispatch_invoke); + + ok(dispid == DISPID_VALUE, "got dispid %d\n", dispid); + ok(IsEqualIID(riid, &IID_NULL), "go riid %s\n", debugstr_guid(riid)); ok(wFlags == DISPATCH_PROPERTYGET, "Flags wrong\n"); - ok(pDispParams->cArgs == 0, "Property get has args\n"); + + ok(params->rgvarg == NULL, "got %p\n", params->rgvarg); + ok(params->rgdispidNamedArgs == NULL, "got %p\n", params->rgdispidNamedArgs); + ok(params->cArgs == 0, "got %d\n", params->cArgs); + ok(params->cNamedArgs == 0, "got %d\n", params->cNamedArgs); + + ok(res != NULL, "got %p\n", res); + ok(ei == NULL, "got %p\n", ei); + ok(arg_err == NULL, "got %p\n", arg_err); if (dispatch.bFailInvoke) return E_OUTOFMEMORY; - memset(pVarResult, 0, sizeof(*pVarResult)); - V_VT(pVarResult) = dispatch.vt; + V_VT(res) = dispatch.vt; + if (dispatch.vt == VT_UI1) + V_UI1(res) = 1; + else + memset(res, 0, sizeof(*res)); + return S_OK; } @@ -572,9 +631,9 @@ static const IDispatchVtbl DummyDispatch_VTable = DummyDispatch_QueryInterface, DummyDispatch_AddRef, DummyDispatch_Release, - NULL, - NULL, - NULL, + DummyDispatch_GetTypeInfoCount, + DummyDispatch_GetTypeInfo, + DummyDispatch_GetIDsOfNames, DummyDispatch_Invoke }; @@ -1079,19 +1138,37 @@ static void test_VarUI1FromDisp(void) dispatch.vt = VT_UI1; dispatch.bFailInvoke = FALSE; + SET_EXPECT(dispatch_invoke); + out = 10; hres = pVarUI1FromDisp(&dispatch.IDispatch_iface, in, &out); - trace("0x%08x\n", hres); + ok(broken(hres == DISP_E_BADVARTYPE) || hres == S_OK, "got 0x%08x\n", hres); + ok(broken(out == 10) || out == 1, "got %d\n", out); + CHECK_CALLED(dispatch_invoke); + SET_EXPECT(dispatch_invoke); + V_VT(&vDst) = VT_EMPTY; + V_UI1(&vDst) = 0; hres = VariantChangeTypeEx(&vDst, &vSrc, in, 0, VT_UI1); - trace("0x%08x\n", hres); + ok(hres == S_OK, "got 0x%08x\n", hres); + ok(V_VT(&vDst) == VT_UI1, "got %d\n", V_VT(&vDst)); + ok(V_UI1(&vDst) == 1, "got %d\n", V_UI1(&vDst)); + CHECK_CALLED(dispatch_invoke); dispatch.bFailInvoke = TRUE; + SET_EXPECT(dispatch_invoke); + out = 10; hres = pVarUI1FromDisp(&dispatch.IDispatch_iface, in, &out); - trace("0x%08x\n", hres); + ok(hres == DISP_E_TYPEMISMATCH, "got 0x%08x\n", hres); + ok(out == 10, "got %d\n", out); + CHECK_CALLED(dispatch_invoke); + SET_EXPECT(dispatch_invoke); + V_VT(&vDst) = VT_EMPTY; hres = VariantChangeTypeEx(&vDst, &vSrc, in, 0, VT_UI1); - trace("0x%08x\n", hres); + ok(hres == DISP_E_TYPEMISMATCH, "got 0x%08x\n", hres); + ok(V_VT(&vDst) == VT_EMPTY, "got %d\n", V_VT(&vDst)); + CHECK_CALLED(dispatch_invoke); } static void test_VarUI1Copy(void)

1 0

Sebastian Lackner : kernel32/tests: Add basic tests for SRWLock commands.
by Alexandre Julliard Jan. 14, 2014

Jan. 14, 2014

Module: wine Branch: master Commit: d7ff42a09199fa9e752b0573e3e8e30d44783371 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7ff42a09199fa9e752b0573e… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Jan 10 23:02:52 2014 +0100 kernel32/tests: Add basic tests for SRWLock commands. --- dlls/kernel32/tests/sync.c | 260 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 260 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d7ff42a09199fa9e752b0…

1 0

Piotr Caban : msvcp110: Fix basic_streambuf structure layout.
by Alexandre Julliard Jan. 14, 2014

Jan. 14, 2014

Module: wine Branch: master Commit: 08e851f3c63190c62e94c49b8f87e0de7a6434ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=08e851f3c63190c62e94c49b8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jan 14 13:55:56 2014 +0100 msvcp110: Fix basic_streambuf structure layout. --- dlls/msvcp90/ios.c | 20 ++++++++++++++++++++ dlls/msvcp90/msvcp90.h | 4 ++++ 2 files changed, 24 insertions(+) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index c44a7a5..a89352e 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -1003,7 +1003,9 @@ basic_streambuf_char* __thiscall basic_streambuf_char_ctor_uninitialized(basic_s { TRACE("(%p %d)\n", this, uninitialized); this->vtable = &MSVCP_basic_streambuf_char_vtable; +#if _MSVCP_VER <= 100 mutex_ctor(&this->lock); +#endif return this; } @@ -1015,7 +1017,9 @@ basic_streambuf_char* __thiscall basic_streambuf_char_ctor(basic_streambuf_char TRACE("(%p)\n", this); this->vtable = &MSVCP_basic_streambuf_char_vtable; +#if _MSVCP_VER <= 100 mutex_ctor(&this->lock); +#endif this->loc = MSVCRT_operator_new(sizeof(locale)); locale_ctor(this->loc); basic_streambuf_char__Init_empty(this); @@ -1030,7 +1034,9 @@ void __thiscall basic_streambuf_char_dtor(basic_streambuf_char *this) { TRACE("(%p)\n", this); +#if _MSVCP_VER <= 100 mutex_dtor(&this->lock); +#endif locale_dtor(this->loc); MSVCRT_operator_delete(this->loc); } @@ -1122,7 +1128,9 @@ DEFINE_THISCALL_WRAPPER(basic_streambuf_char__Lock, 4) void __thiscall basic_streambuf_char__Lock(basic_streambuf_char *this) { TRACE("(%p)\n", this); +#if _MSVCP_VER <= 100 mutex_lock(&this->lock); +#endif } /* ?_Pnavail@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@IBEHXZ */ @@ -1248,7 +1256,9 @@ DEFINE_THISCALL_WRAPPER(basic_streambuf_char__Unlock, 4) void __thiscall basic_streambuf_char__Unlock(basic_streambuf_char *this) { TRACE("(%p)\n", this); +#if _MSVCP_VER <= 100 mutex_unlock(&this->lock); +#endif } /* ?eback@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@IBEPADXZ */ @@ -1801,7 +1811,9 @@ basic_streambuf_wchar* __thiscall basic_streambuf_wchar_ctor_uninitialized(basic { TRACE("(%p %d)\n", this, uninitialized); this->vtable = &MSVCP_basic_streambuf_wchar_vtable; +#if _MSVCP_VER <= 100 mutex_ctor(&this->lock); +#endif return this; } @@ -1824,7 +1836,9 @@ basic_streambuf_wchar* __thiscall basic_streambuf_wchar_ctor(basic_streambuf_wch TRACE("(%p)\n", this); this->vtable = &MSVCP_basic_streambuf_wchar_vtable; +#if _MSVCP_VER <= 100 mutex_ctor(&this->lock); +#endif this->loc = MSVCRT_operator_new(sizeof(locale)); locale_ctor(this->loc); basic_streambuf_wchar__Init_empty(this); @@ -1852,7 +1866,9 @@ void __thiscall basic_streambuf_wchar_dtor(basic_streambuf_wchar *this) { TRACE("(%p)\n", this); +#if _MSVCP_VER <= 100 mutex_dtor(&this->lock); +#endif locale_dtor(this->loc); MSVCRT_operator_delete(this->loc); } @@ -1951,7 +1967,9 @@ DEFINE_THISCALL_WRAPPER(basic_streambuf_wchar__Lock, 4) void __thiscall basic_streambuf_wchar__Lock(basic_streambuf_wchar *this) { TRACE("(%p)\n", this); +#if _MSVCP_VER <= 100 mutex_lock(&this->lock); +#endif } /* ?_Pnavail@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@IBEHXZ */ @@ -2086,7 +2104,9 @@ DEFINE_THISCALL_WRAPPER(basic_streambuf_wchar__Unlock, 4) void __thiscall basic_streambuf_wchar__Unlock(basic_streambuf_wchar *this) { TRACE("(%p)\n", this); +#if _MSVCP_VER <= 100 mutex_unlock(&this->lock); +#endif } /* ?eback@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@IBEPA_WXZ */ diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index 026a04d..67ea924 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -328,7 +328,9 @@ typedef struct _ios_base { /* class basic_streambuf<char> */ typedef struct { const vtable_ptr *vtable; +#if _MSVCP_VER <= 100 mutex lock; +#endif char *rbuf; char *wbuf; char **prbuf; @@ -365,7 +367,9 @@ int __thiscall basic_streambuf_char_sputc(basic_streambuf_char*, char); /* class basic_streambuf<wchar> */ typedef struct { const vtable_ptr *vtable; +#if _MSVCP_VER <= 100 mutex lock; +#endif wchar_t *rbuf; wchar_t *wbuf; wchar_t **prbuf;

1 0

Stefan Dösinger : wined3d: Don' t lock directly into the DIB.
by Alexandre Julliard Jan. 14, 2014

Jan. 14, 2014

Module: wine Branch: master Commit: 353b3ba6d352f80ee18bd7de26fb9462ce876210 URL: http://source.winehq.org/git/wine.git/?a=commit;h=353b3ba6d352f80ee18bd7de2… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jan 14 13:59:21 2014 +0100 wined3d: Don't lock directly into the DIB. --- dlls/wined3d/surface.c | 64 +++++++--------------------------------- dlls/wined3d/swapchain.c | 2 ++ dlls/wined3d/wined3d_private.h | 2 -- 3 files changed, 13 insertions(+), 55 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 0c83a0e..a434bda 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -85,7 +85,6 @@ static void surface_cleanup(struct wined3d_surface *surface) DeleteDC(surface->hDC); DeleteObject(surface->dib.DIBsection); surface->dib.bitmap_data = NULL; - surface->resource.allocatedMemory = NULL; } if (surface->overlay_dest) @@ -488,17 +487,6 @@ static HRESULT surface_create_dib_section(struct wined3d_surface *surface) } TRACE("DIBSection at %p.\n", surface->dib.bitmap_data); - /* Copy the existing surface to the dib section. */ - if (surface->resource.allocatedMemory) - { - memcpy(surface->dib.bitmap_data, surface->resource.allocatedMemory, - surface->resource.height * wined3d_surface_get_pitch(surface)); - } - else if (!surface->user_memory) - { - /* This is to make maps read the GL texture although memory is allocated. */ - surface->flags &= ~SFLAG_INSYSMEM; - } surface->dib.bitmap_size = b_info->bmiHeader.biSizeImage; HeapFree(GetProcessHeap(), 0, b_info); @@ -1302,20 +1290,13 @@ HRESULT CDECL wined3d_surface_get_render_target_data(struct wined3d_surface *sur /* Context activation is done by the caller. */ static void surface_remove_pbo(struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info) { - if (surface->flags & SFLAG_DIBSECTION) - { - surface->resource.allocatedMemory = surface->dib.bitmap_data; - } - else - { - if (!surface->resource.heap_memory) - wined3d_resource_allocate_sysmem(&surface->resource); - else if (!(surface->flags & SFLAG_CLIENT)) - ERR("Surface %p has heap_memory %p and flags %#x.\n", - surface, surface->resource.heap_memory, surface->flags); + if (!surface->resource.heap_memory) + wined3d_resource_allocate_sysmem(&surface->resource); + else if (!(surface->flags & SFLAG_CLIENT)) + ERR("Surface %p has heap_memory %p and flags %#x.\n", + surface, surface->resource.heap_memory, surface->flags); - surface->resource.allocatedMemory = surface->resource.heap_memory; - } + surface->resource.allocatedMemory = surface->resource.heap_memory; GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, surface->pbo)); checkGLcall("glBindBufferARB(GL_PIXEL_UNPACK_BUFFER, surface->pbo)"); @@ -1477,11 +1458,8 @@ static HRESULT gdi_surface_private_setup(struct wined3d_surface *surface) /* Sysmem textures have memory already allocated - release it, * this avoids an unnecessary memcpy. */ hr = surface_create_dib_section(surface); - if (SUCCEEDED(hr)) - { - wined3d_resource_free_sysmem(&surface->resource); - surface->resource.allocatedMemory = surface->dib.bitmap_data; - } + if (FAILED(hr)) + return hr; /* We don't mind the nonpow2 stuff in GDI. */ surface->pow2Width = surface->resource.width; @@ -2801,9 +2779,8 @@ HRESULT CDECL wined3d_surface_update_desc(struct wined3d_surface *surface, ERR("Failed to create dib section, hr %#x.\n", hr); return hr; } - surface->resource.allocatedMemory = surface->dib.bitmap_data; } - else if (!surface_init_sysmem(surface)) + if (!surface_init_sysmem(surface)) return E_OUTOFMEMORY; surface_validate_location(surface, surface->map_binding); @@ -3276,13 +3253,6 @@ HRESULT CDECL wined3d_surface_getdc(struct wined3d_surface *surface, HDC *dc) hr = surface_create_dib_section(surface); if (FAILED(hr)) return WINED3DERR_INVALIDCALL; - - /* Use the DIB section from now on if we are not using a PBO or user memory. */ - if (!(surface->flags & (SFLAG_PBO | SFLAG_PIN_SYSMEM) || surface->user_memory)) - { - wined3d_resource_free_sysmem(&surface->resource); - surface->resource.allocatedMemory = surface->dib.bitmap_data; - } } /* Map the surface. */ @@ -3294,8 +3264,7 @@ HRESULT CDECL wined3d_surface_getdc(struct wined3d_surface *surface, HDC *dc) } surface->getdc_map_mem = map.data; - if (surface->dib.bitmap_data != surface->getdc_map_mem) - memcpy(surface->dib.bitmap_data, surface->getdc_map_mem, surface->resource.size); + memcpy(surface->dib.bitmap_data, surface->getdc_map_mem, surface->resource.size); if (surface->resource.format->id == WINED3DFMT_P8_UINT || surface->resource.format->id == WINED3DFMT_P8_UINT_A8_UNORM) @@ -3356,8 +3325,7 @@ HRESULT CDECL wined3d_surface_releasedc(struct wined3d_surface *surface, HDC dc) return WINEDDERR_NODC; } - if (surface->dib.bitmap_data != surface->getdc_map_mem) - memcpy(surface->getdc_map_mem, surface->dib.bitmap_data, surface->resource.size); + memcpy(surface->getdc_map_mem, surface->dib.bitmap_data, surface->resource.size); /* We locked first, so unlock now. */ surface->getdc_map_mem = NULL; @@ -6450,16 +6418,6 @@ static HRESULT surface_init(struct wined3d_surface *surface, struct wined3d_text return hr; } - /* Similar to lockable rendertargets above, creating the DIB section - * during surface initialization prevents the sysmem pointer from changing - * after a wined3d_surface_getdc() call. */ - if ((desc->usage & WINED3DUSAGE_OWNDC) && !surface->hDC - && SUCCEEDED(surface_create_dib_section(surface))) - { - wined3d_resource_free_sysmem(&surface->resource); - surface->resource.allocatedMemory = surface->dib.bitmap_data; - } - surface->map_binding = SFLAG_INSYSMEM; return hr; diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 0e7d79f..74acb6c 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -623,6 +623,8 @@ void x11_copy_to_screen(const struct wined3d_swapchain *swapchain, const RECT *r TRACE("Copying surface %p to screen.\n", front); + memcpy(front->dib.bitmap_data, front->resource.heap_memory, front->resource.size); + src_dc = front->hDC; window = swapchain->win_handle; dst_dc = GetDCEx(window, 0, DCX_CLIPSIBLINGS | DCX_CACHE); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 985f86f..d4f0739 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2309,7 +2309,6 @@ void flip_surface(struct wined3d_surface *front, struct wined3d_surface *back) D /* In some conditions the surface memory must not be freed: * SFLAG_CONVERTED: Converting the data back would take too long - * SFLAG_DIBSECTION: The dib code manages the memory * SFLAG_DYNLOCK: Avoid freeing the data for performance * SFLAG_PBO: PBOs don't use 'normal' memory. It is either allocated by the driver or must be NULL. * SFLAG_CLIENT: OpenGL uses our memory as backup @@ -2317,7 +2316,6 @@ void flip_surface(struct wined3d_surface *front, struct wined3d_surface *back) D #define SFLAG_DONOTFREE (SFLAG_CONVERTED | \ SFLAG_DYNLOCK | \ SFLAG_CLIENT | \ - SFLAG_DIBSECTION | \ SFLAG_PBO | \ SFLAG_PIN_SYSMEM)

1 0

Alexandre Julliard : shell32: Avoid a duplicate const.
by Alexandre Julliard Jan. 14, 2014

Jan. 14, 2014

Module: wine Branch: master Commit: 26f8ac8fae3ad60afd979e18ae71315209108ebc URL: http://source.winehq.org/git/wine.git/?a=commit;h=26f8ac8fae3ad60afd979e18a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 14 13:49:42 2014 +0100 shell32: Avoid a duplicate const. --- dlls/shell32/shelldispatch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/shelldispatch.c b/dlls/shell32/shelldispatch.c index 52a365b..7b5de8b 100644 --- a/dlls/shell32/shelldispatch.c +++ b/dlls/shell32/shelldispatch.c @@ -49,7 +49,7 @@ enum tid_t { }; static ITypeLib *typelib; -static const REFIID tid_ids[] = +static const IID * const tid_ids[] = { &IID_NULL, &IID_IShellDispatch5,

1 0

Piotr Caban : msvcp110: Add locale::_Init implementation.
by Alexandre Julliard Jan. 14, 2014

Jan. 14, 2014

Module: wine Branch: master Commit: f3abe0bd7f70ade54fc63a206327180878078308 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3abe0bd7f70ade54fc63a206… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jan 14 13:54:52 2014 +0100 msvcp110: Add locale::_Init implementation. --- dlls/msvcp110/msvcp110.spec | 4 ++-- dlls/msvcp90/locale.c | 21 +++++++++++++++++++++ 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index 0fbb08e..a12b20e 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -1467,8 +1467,8 @@ @ cdecl -arch=arm ?_Init(a)ios_base@std@@IAAXXZ(ptr) ios_base__Init @ thiscall -arch=i386 ?_Init(a)ios_base@std@@IAEXXZ(ptr) ios_base__Init @ cdecl -arch=win64 ?_Init(a)ios_base@std@@IEAAXXZ(ptr) ios_base__Init -@ stub -arch=win32 ?_Init(a)locale@std@@CAPAV_Locimp(a)12@_N(a)Z -@ stub -arch=win64 ?_Init(a)locale@std@@CAPEAV_Locimp(a)12@_N(a)Z +@ cdecl -arch=win32 ?_Init(a)locale@std@@CAPAV_Locimp(a)12@_N(a)Z(long) locale__Init_ref +@ cdecl -arch=win64 ?_Init(a)locale@std@@CAPEAV_Locimp(a)12@_N(a)Z(long) locale__Init_ref @ extern ?_Init_cnt(a)Init@ios_base(a)std@@0HA ios_base_Init__Init_cnt # extern ?_Init_cnt(a)_UShinit@std@@0HA @ extern ?_Init_cnt(a)_Winit@std@@0HA _Winit__Init_cnt diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index c58862f..b35eaf5 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -9845,6 +9845,27 @@ locale__Locimp* __cdecl locale__Init(void) return global_locale; } +/* ?_Init(a)locale@std@@CAPAV_Locimp(a)12@_N(a)Z */ +/* ?_Init(a)locale@std@@CAPEAV_Locimp(a)12@_N(a)Z */ +locale__Locimp* __cdecl locale__Init_ref(MSVCP_bool inc_ref) +{ + locale__Locimp *ret; + _Lockit lock; + + TRACE("(%x)\n", inc_ref); + + _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); + if(inc_ref && global_locale) { + call_locale_facet__Incref(&global_locale->facet); + _Lockit_dtor(&lock); + return global_locale; + } + + ret = locale__Init(); + _Lockit_dtor(&lock); + return ret; +} + /* ??0locale(a)std@@QAE(a)ABV01@0H(a)Z */ /* ??0locale(a)std@@QEAA(a)AEBV01@0H(a)Z */ DEFINE_THISCALL_WRAPPER(locale_ctor_locale_locale, 16)

1 0

Dmitry Timoshkov : taskschd: Implement ITaskService::get_Connected.
by Alexandre Julliard Jan. 14, 2014

Jan. 14, 2014

Module: wine Branch: master Commit: 189bfa96436774fc97c716c8b08999da04bb52cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=189bfa96436774fc97c716c8b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jan 14 17:18:03 2014 +0900 taskschd: Implement ITaskService::get_Connected. --- dlls/taskschd/task.c | 13 +++++++++++-- dlls/taskschd/tests/scheduler.c | 4 ---- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 87d9273..76c0e9b 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -35,6 +35,7 @@ typedef struct { ITaskService ITaskService_iface; LONG ref; + BOOL connected; } TaskService; static inline TaskService *impl_from_ITaskService(ITaskService *iface) @@ -135,8 +136,15 @@ static HRESULT WINAPI TaskService_Connect(ITaskService *iface, VARIANT server, V static HRESULT WINAPI TaskService_get_Connected(ITaskService *iface, VARIANT_BOOL *connected) { - FIXME("%p,%p: stub\n", iface, connected); - return E_NOTIMPL; + TaskService *task_svc = impl_from_ITaskService(iface); + + TRACE("%p,%p\n", iface, connected); + + if (!connected) return E_POINTER; + + *connected = task_svc->connected ? VARIANT_TRUE : VARIANT_FALSE; + + return S_OK; } static HRESULT WINAPI TaskService_get_TargetServer(ITaskService *iface, BSTR *server) @@ -192,6 +200,7 @@ HRESULT TaskService_create(void **obj) task_svc->ITaskService_iface.lpVtbl = &TaskService_vtbl; task_svc->ref = 1; + task_svc->connected = FALSE; *obj = &task_svc->ITaskService_iface; TRACE("created %p\n", *obj); diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 9b99258..adb7487 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -48,9 +48,7 @@ static void test_Connect(void) vbool = 0xdead; hr = ITaskService_get_Connected(service, &vbool); -todo_wine ok(hr == S_OK, "get_Connected error %#x\n", hr); -todo_wine ok(vbool == VARIANT_FALSE, "expected VARIANT_FALSE, got %d\n", vbool); hr = ITaskService_get_TargetServer(service, &bstr); @@ -81,7 +79,6 @@ todo_wine vbool = 0xdead; hr = ITaskService_get_Connected(service, &vbool); -todo_wine ok(hr == S_OK, "get_Connected error %#x\n", hr); todo_wine ok(vbool == VARIANT_TRUE, "expected VARIANT_TRUE, got %d\n", vbool); @@ -92,7 +89,6 @@ todo_wine vbool = 0xdead; hr = ITaskService_get_Connected(service, &vbool); -todo_wine ok(hr == S_OK, "get_Connected error %#x\n", hr); todo_wine ok(vbool == VARIANT_TRUE, "expected VARIANT_TRUE, got %d\n", vbool);

1 0

Ken Thomases : winemac: Make WineOpenGLContext hold a strong reference to its view.
by Alexandre Julliard Jan. 14, 2014

Jan. 14, 2014

Module: wine Branch: master Commit: e21192469dbd3c234e1051504b6429bd9cfb0dcf URL: http://source.winehq.org/git/wine.git/?a=commit;h=e21192469dbd3c234e1051504… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue Jan 14 01:25:08 2014 -0600 winemac: Make WineOpenGLContext hold a strong reference to its view. Its superclass, NSOpenGLContext, only holds a weak reference. The view was sometimes being deallocated before the context was disposed of, resulting in crashes. --- dlls/winemac.drv/cocoa_opengl.m | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dlls/winemac.drv/cocoa_opengl.m b/dlls/winemac.drv/cocoa_opengl.m index 5ec5688..32d182f 100644 --- a/dlls/winemac.drv/cocoa_opengl.m +++ b/dlls/winemac.drv/cocoa_opengl.m @@ -35,10 +35,26 @@ - (void) dealloc { + [[self view] release]; [latentView release]; [super dealloc]; } + - (void) setView:(NSView*)newView + { + NSView* oldView = [self view]; + [super setView:newView]; + [newView retain]; + [oldView release]; + } + + - (void) clearDrawable + { + NSView* oldView = [self view]; + [super clearDrawable]; + [oldView release]; + } + /* On at least some versions of Mac OS X, -[NSOpenGLContext clearDrawable] has the undesirable side effect of ordering the view's GL surface off-screen. This isn't done when just changing the context's view to a different view (which I would

1 0

Ken Thomases : winemac: Consolidate code paths for clearing the OpenGL context.
by Alexandre Julliard Jan. 14, 2014

Jan. 14, 2014

Module: wine Branch: master Commit: 2cc53379404bfb499461add373ddb42c77d224b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cc53379404bfb499461add37… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue Jan 14 01:25:03 2014 -0600 winemac: Consolidate code paths for clearing the OpenGL context. We clear it if the context or the view is NULL. If the context is non-NULL, we want to disassociate the views of both the current and passed-in contexts, if they differ. --- dlls/winemac.drv/cocoa_opengl.m | 44 ++++++++++++++++++--------------------- 1 file changed, 20 insertions(+), 24 deletions(-) diff --git a/dlls/winemac.drv/cocoa_opengl.m b/dlls/winemac.drv/cocoa_opengl.m index 752fb77..196da46 100644 --- a/dlls/winemac.drv/cocoa_opengl.m +++ b/dlls/winemac.drv/cocoa_opengl.m @@ -154,36 +154,28 @@ void macdrv_make_context_current(macdrv_opengl_context c, macdrv_view v) WineOpenGLContext *context = (WineOpenGLContext*)c; NSView* view = (NSView*)v; - if (context) + if (context && view) { [context removeFromViews:NO]; - if (view) - { - macdrv_add_view_opengl_context(v, c); - - if (context.needsUpdate) - { - context.needsUpdate = FALSE; - [context setView:view]; - [context setLatentView:nil]; - } - else - { - if ([context view]) - [context clearDrawableLeavingSurfaceOnScreen]; - [context setLatentView:view]; - } + macdrv_add_view_opengl_context(v, c); - [context makeCurrentContext]; - - if ([context view]) - [context clearToBlackIfNeeded]; + if (context.needsUpdate) + { + context.needsUpdate = FALSE; + [context setView:view]; + [context setLatentView:nil]; } else { - [WineOpenGLContext clearCurrentContext]; - [context removeFromViews:YES]; + if ([context view]) + [context clearDrawableLeavingSurfaceOnScreen]; + [context setLatentView:view]; } + + [context makeCurrentContext]; + + if ([context view]) + [context clearToBlackIfNeeded]; } else { @@ -192,8 +184,12 @@ void macdrv_make_context_current(macdrv_opengl_context c, macdrv_view v) if ([currentContext isKindOfClass:[WineOpenGLContext class]]) { [WineOpenGLContext clearCurrentContext]; - [currentContext removeFromViews:YES]; + if (currentContext != context) + [currentContext removeFromViews:YES]; } + + if (context) + [context removeFromViews:YES]; } [pool release];

1 0

Frédéric Delanoy : winedump: Use BOOL type where appropriate.
by Alexandre Julliard Jan. 14, 2014

Jan. 14, 2014

Module: wine Branch: master Commit: 1bd7405193ca841a940cbf80386cd4fbe74f0b27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bd7405193ca841a940cbf803… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Jan 13 21:44:00 2014 +0100 winedump: Use BOOL type where appropriate. --- tools/winedump/dump.c | 2 +- tools/winedump/main.c | 9 +++------ tools/winedump/msmangle.c | 34 +++++++++++++++++----------------- tools/winedump/winedump.h | 2 +- 4 files changed, 22 insertions(+), 25 deletions(-) diff --git a/tools/winedump/dump.c b/tools/winedump/dump.c index f263390..7ca4dc0 100644 --- a/tools/winedump/dump.c +++ b/tools/winedump/dump.c @@ -154,7 +154,7 @@ const char* get_symbol_str(const char* symname) parsed_symbol symbol; symbol_init(&symbol, symname); - if (symbol_demangle(&symbol) == -1) + if (!symbol_demangle(&symbol)) ret = symname; else if (symbol.flags & SYM_DATA) { diff --git a/tools/winedump/main.c b/tools/winedump/main.c index ca2047b..dfd15b0 100644 --- a/tools/winedump/main.c +++ b/tools/winedump/main.c @@ -444,17 +444,14 @@ int main (int argc, char *argv[]) if (globals.do_code && symbol_searched(count, symbol.symbol)) { /* Attempt to get information about the symbol */ - int result = symbol_demangle (&symbol); + BOOL result = symbol_demangle (&symbol) || symbol_search(&symbol); - if (result) - result = !symbol_search (&symbol); - - if (!result && symbol.function_name) + if (result && symbol.function_name) /* Clean up the prototype */ symbol_clean_string (symbol.function_name); if (NORMAL) - puts (result ? "[Not Found]" : "[OK]"); + puts (result ? "[OK]" : "[Not Found]"); } else if (NORMAL) puts ("[Ignoring]"); diff --git a/tools/winedump/msmangle.c b/tools/winedump/msmangle.c index a0d9f92..39e4f3a 100644 --- a/tools/winedump/msmangle.c +++ b/tools/winedump/msmangle.c @@ -63,7 +63,7 @@ static char *get_pointer_type_string (compound_type *ct, * * Demangle a C++ linker symbol into a C prototype */ -int symbol_demangle (parsed_symbol *sym) +BOOL symbol_demangle (parsed_symbol *sym) { compound_type ct; BOOL is_static = FALSE; @@ -83,7 +83,7 @@ int symbol_demangle (parsed_symbol *sym) /* MS mangled names always begin with '?' */ name = sym->symbol; if (*name++ != '?') - return -1; + return FALSE; if (VERBOSE) puts ("Attempting to demangle symbol"); @@ -162,12 +162,12 @@ int symbol_demangle (parsed_symbol *sym) case 'X': function_name = strdup ("placement_new_closure"); break; case 'Y': function_name = strdup ("placement_delete_closure"); break; default: - return -1; + return FALSE; } break; default: /* FIXME: Other operators */ - return -1; + return FALSE; } name++; } @@ -177,7 +177,7 @@ int symbol_demangle (parsed_symbol *sym) function_name = name; while (*name && *name++ != '@') ; if (!*name) - return -1; + return FALSE; function_name = str_substring (function_name, name - 1); } @@ -194,7 +194,7 @@ int symbol_demangle (parsed_symbol *sym) while (*name && *name++ != '@') ; if (*name++ != '@') { free (function_name); - return -1; + return FALSE; } class_name = str_substring (class_name, name - 2); /* Allocates a new string */ } @@ -220,7 +220,7 @@ int symbol_demangle (parsed_symbol *sym) printf ("/*FIXME: %s: unknown data*/\n", sym->symbol); free (function_name); free (class_name); - return -1; + return FALSE; } sym->flags |= SYM_DATA; sym->argc = 1; @@ -230,7 +230,7 @@ int symbol_demangle (parsed_symbol *sym) FREE_CT (ct); free (function_name); free (class_name); - return 0; + return TRUE; case '6' : /* compiler generated static */ case '7' : /* compiler generated static */ @@ -246,11 +246,11 @@ int symbol_demangle (parsed_symbol *sym) puts ("Demangled symbol OK [vtable]"); free (function_name); free (class_name); - return 0; + return TRUE; } free (function_name); free (class_name); - return -1; + return FALSE; /* Functions */ @@ -295,7 +295,7 @@ int symbol_demangle (parsed_symbol *sym) default: free (function_name); free (class_name); - return -1; + return FALSE; } /* If there is an implicit this pointer, const status follows */ @@ -310,7 +310,7 @@ int symbol_demangle (parsed_symbol *sym) default: free (function_name); free (class_name); - return -1; + return FALSE; } } @@ -342,7 +342,7 @@ int symbol_demangle (parsed_symbol *sym) default: free (function_name); free (class_name); - return -1; + return FALSE; } /* Return type, or @ if 'void' */ @@ -358,7 +358,7 @@ int symbol_demangle (parsed_symbol *sym) if (!demangle_datatype (&name, &ct, sym)) { free (function_name); free (class_name); - return -1; + return FALSE; } sym->return_text = ct.expression; sym->return_type = get_type_constant(ct.dest_type, ct.flags); @@ -376,7 +376,7 @@ int symbol_demangle (parsed_symbol *sym) if (!demangle_datatype(&name, &ct, sym)) { free (function_name); free (class_name); - return -1; + return FALSE; } if (strcmp (ct.expression, "void")) @@ -405,7 +405,7 @@ int symbol_demangle (parsed_symbol *sym) if (*name != 'Z') { free (function_name); free (class_name); - return -1; + return FALSE; } /* Note: '()' after 'Z' means 'throws', but we don't care here */ @@ -433,7 +433,7 @@ int symbol_demangle (parsed_symbol *sym) if (VERBOSE) puts ("Demangled symbol OK"); - return 0; + return TRUE; } diff --git a/tools/winedump/winedump.h b/tools/winedump/winedump.h index 754a7d2..88fa0e7 100644 --- a/tools/winedump/winedump.h +++ b/tools/winedump/winedump.h @@ -164,7 +164,7 @@ BOOL dll_next_symbol (parsed_symbol * sym); /* Symbol functions */ void symbol_init(parsed_symbol* symbol, const char* name); -int symbol_demangle (parsed_symbol *symbol); +BOOL symbol_demangle (parsed_symbol *symbol); BOOL symbol_search (parsed_symbol *symbol);

1 0