wine-commits January 2014

wine-commits@winehq.org

3 participants
814 discussions

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

14 Jan '14

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

Piotr Caban : msvcp110: Fix _Ctypevec structure layout.
by Alexandre Julliard 14 Jan '14

14 Jan '14

Module: wine Branch: master Commit: d5b72bbcdc1484f16c73d489fabb32ddfa95beac URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5b72bbcdc1484f16c73d489f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jan 14 13:56:17 2014 +0100 msvcp110: Fix _Ctypevec structure layout. --- dlls/msvcp90/locale.c | 11 +++++++++++ dlls/msvcp90/msvcp90.h | 5 +++++ 2 files changed, 16 insertions(+) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 1b0c891..02ccb0e 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -631,7 +631,12 @@ _Ctypevec* __cdecl _Getctype(_Ctypevec *ret) TRACE("\n"); ret->page = ___lc_codepage_func(); +#if _MSVCP_VER < 110 ret->handle = ___lc_handle_func()[LC_COLLATE]; +#else + /* FIXME: use ___lc_locale_name_func() */ + ret->name = NULL; +#endif ret->delfl = TRUE; table = malloc(sizeof(short[256])); if(!table) throw_exception(EXCEPTION_BAD_ALLOC, NULL); @@ -1446,6 +1451,9 @@ void __thiscall ctype_char__Tidy(ctype_char *this) if(this->ctype.delfl) free((short*)this->ctype.table); +#if _MSVCP_VER >= 110 + free(this->ctype.name); +#endif } /* ?classic_table@?$ctype@D@std@@KAPBFXZ */ @@ -2142,6 +2150,9 @@ void __thiscall ctype_wchar_dtor(ctype_wchar *this) TRACE("(%p)\n", this); if(this->ctype.delfl) free((void*)this->ctype.table); +#if _MSVCP_VER >= 110 + free(this->ctype.name); +#endif } DEFINE_THISCALL_WRAPPER(ctype_wchar_vector_dtor, 8) diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index 67ea924..f5e79f5 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -123,10 +123,15 @@ typedef enum { } codecvt_base_result; typedef struct { +#if _MSVCP_VER < 110 LCID handle; +#endif unsigned page; const short *table; int delfl; +#if _MSVCP_VER >= 110 + wchar_t *name; +#endif } _Ctypevec; /* class codecvt_base */

1 0

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

14 Jan '14

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@DU?$char_traits@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@DU?$char_traits@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@_WU?$char_traits@_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@_WU?$char_traits@_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

Piotr Caban : msvcp110: Add _New_Locimp implementation.
by Alexandre Julliard 14 Jan '14

14 Jan '14

Module: wine Branch: master Commit: 1d1ea6ebf466c653eaaf72bb3aa35d3daf63a988 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d1ea6ebf466c653eaaf72bb3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jan 14 13:55:15 2014 +0100 msvcp110: Add _New_Locimp implementation. --- dlls/msvcp110/msvcp110.spec | 8 ++++---- dlls/msvcp90/locale.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index a12b20e..b9d520d 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -1637,10 +1637,10 @@ @ stub -arch=win64 ?_Mtx_new@threads@stdext@@YAXAEAPEAX@Z @ stub -arch=win32 ?_Mtx_unlock@threads@stdext@@YAXPAX@Z @ stub -arch=win64 ?_Mtx_unlock@threads@stdext@@YAXPEAX@Z -@ stub -arch=win32 ?_New_Locimp@_Locimp@locale@std@@CAPAV123@ABV123@@Z -@ stub -arch=win64 ?_New_Locimp@_Locimp@locale@std@@CAPEAV123@AEBV123@@Z -@ stub -arch=win32 ?_New_Locimp@_Locimp@locale@std@@CAPAV123@_N@Z -@ stub -arch=win64 ?_New_Locimp@_Locimp@locale@std@@CAPEAV123@_N@Z +@ cdecl -arch=win32 ?_New_Locimp@_Locimp@locale@std@@CAPAV123@ABV123@@Z(ptr) locale__Locimp__New_Locimp +@ cdecl -arch=win64 ?_New_Locimp@_Locimp@locale@std@@CAPEAV123@AEBV123@@Z(ptr) locale__Locimp__New_Locimp +@ cdecl -arch=win32 ?_New_Locimp@_Locimp@locale@std@@CAPAV123@_N@Z(long) locale__Locimp__New_Locimp_transparent +@ cdecl -arch=win64 ?_New_Locimp@_Locimp@locale@std@@CAPEAV123@_N@Z(long) locale__Locimp__New_Locimp_transparent @ stub -arch=win32 ?_Open_dir@sys@tr2@std@@YAPAXPADPBDAAHAAW4file_type@123@@Z @ stub -arch=win64 ?_Open_dir@sys@tr2@std@@YAPEAXPEADPEBDAEAHAEAW4file_type@123@@Z @ stub -arch=win32 ?_Open_dir@sys@tr2@std@@YAPAXPA_WPB_WAAHAAW4file_type@123@@Z diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index b35eaf5..1b0c891 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -9357,6 +9357,40 @@ locale__Locimp* __thiscall locale__Locimp_vector_dtor(locale__Locimp *this, unsi return this; } +/* ?_New_Locimp@_Locimp@locale@std@@CAPAV123@ABV123@@Z */ +/* ?_New_Locimp@_Locimp@locale@std@@CAPEAV123@AEBV123@@Z */ +locale__Locimp* __cdecl locale__Locimp__New_Locimp(const locale__Locimp *copy) +{ + locale__Locimp *ret; + + TRACE("(%p)\n", copy); + + ret = MSVCRT_operator_new(sizeof(locale__Locimp)); + if(!ret) { + ERR("Out of memory\n"); + throw_exception(EXCEPTION_BAD_ALLOC, NULL); + return NULL; + } + return locale__Locimp_copy_ctor(ret, copy); +} + +/* ?_New_Locimp@_Locimp@locale@std@@CAPAV123@_N@Z */ +/* ?_New_Locimp@_Locimp@locale@std@@CAPEAV123@_N@Z */ +locale__Locimp* __cdecl locale__Locimp__New_Locimp_transparent(MSVCP_bool transparent) +{ + locale__Locimp *ret; + + TRACE("(%x)\n", transparent); + + ret = MSVCRT_operator_new(sizeof(locale__Locimp)); + if(!ret) { + ERR("Out of memory\n"); + throw_exception(EXCEPTION_BAD_ALLOC, NULL); + return NULL; + } + return locale__Locimp_ctor_transparent(ret, transparent); +} + /* ?_Locimp_Addfac@_Locimp@locale@std@@CAXPAV123@PAVfacet@23@I@Z */ /* ?_Locimp_Addfac@_Locimp@locale@std@@CAXPEAV123@PEAVfacet@23@_K@Z */ void __cdecl locale__Locimp__Locimp_Addfac(locale__Locimp *locimp, locale_facet *facet, MSVCP_size_t id)

1 0

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

14 Jan '14

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@ios_base@std@@IAAXXZ(ptr) ios_base__Init @ thiscall -arch=i386 ?_Init@ios_base@std@@IAEXXZ(ptr) ios_base__Init @ cdecl -arch=win64 ?_Init@ios_base@std@@IEAAXXZ(ptr) ios_base__Init -@ stub -arch=win32 ?_Init@locale@std@@CAPAV_Locimp@12@_N@Z -@ stub -arch=win64 ?_Init@locale@std@@CAPEAV_Locimp@12@_N@Z +@ cdecl -arch=win32 ?_Init@locale@std@@CAPAV_Locimp@12@_N@Z(long) locale__Init_ref +@ cdecl -arch=win64 ?_Init@locale@std@@CAPEAV_Locimp@12@_N@Z(long) locale__Init_ref @ extern ?_Init_cnt@Init@ios_base@std@@0HA ios_base_Init__Init_cnt # extern ?_Init_cnt@_UShinit@std@@0HA @ extern ?_Init_cnt@_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@locale@std@@CAPAV_Locimp@12@_N@Z */ +/* ?_Init@locale@std@@CAPEAV_Locimp@12@_N@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@std@@QAE@ABV01@0H@Z */ /* ??0locale@std@@QEAA@AEBV01@0H@Z */ DEFINE_THISCALL_WRAPPER(locale_ctor_locale_locale, 16)

1 0

Piotr Caban : msvcp110: Make locale::facet::Incref and Decref virtual.
by Alexandre Julliard 14 Jan '14

14 Jan '14

Module: wine Branch: master Commit: 866b616d1b296642f0db484b1131b4ee4bdeb49c URL: http://source.winehq.org/git/wine.git/?a=commit;h=866b616d1b296642f0db484b1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jan 14 13:54:09 2014 +0100 msvcp110: Make locale::facet::Incref and Decref virtual. --- dlls/msvcp110/msvcp110.spec | 12 +- dlls/msvcp90/locale.c | 655 ++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 623 insertions(+), 44 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=866b616d1b296642f0db4…

1 0

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

14 Jan '14

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

Alexandre Julliard : gdi32/tests: Update a few more failing DIB cases.
by Alexandre Julliard 14 Jan '14

14 Jan '14

Module: wine Branch: master Commit: 36301db4d3b7dcb544e32d9da3f69288ecc74f25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36301db4d3b7dcb544e32d9da… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 14 20:10:41 2014 +0100 gdi32/tests: Update a few more failing DIB cases. --- dlls/gdi32/tests/dib.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/tests/dib.c b/dlls/gdi32/tests/dib.c index d23fba5..6e0fccd 100644 --- a/dlls/gdi32/tests/dib.c +++ b/dlls/gdi32/tests/dib.c @@ -1127,12 +1127,12 @@ static const char *sha1_graphics_1[] = "4842a30dd7fdf38ddc3ddec85c08efe13a0e2e0b", "cc76db6da5ba1776f20240a5ad97a26a9cdf96b0", "014f477664a7f4ce4a948d6359a2707119afc8e2", - "1ee4e951743efc8764249fbc7adecefbfec0428e", + "74d01690e344bc22e7a0478e7a09ccd92354c486", "9ab50a663b74577b656e9849484a909d7ac52eeb", "128eefd2ee043d59dc37918065f687e378e5ca95", - "c642abc651f525332d9d635049646d309e877839", + "d7e2daab98ce1f698c4bfedfc01c0d79fcb76b8e", "8d34215487088b5d4ef63062270ce25c2862643d", - "3dc3075b0c87fdcaabbbae8928303fb2358c15c2", + "826562eb11a0d0bba77fa21245f7406a194e9225", "bbae6f0659e095a42b420082079663f937065813", "bbabe686a6955402c90530e7c67f1428868369b3", NULL

1 0

Alexandre Julliard : user32/tests: Protect the global message sequence with a critical section.
by Alexandre Julliard 14 Jan '14

14 Jan '14

Module: wine Branch: master Commit: 70009d053c803ecdc7a3d54d14003b68a5d1fb28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70009d053c803ecdc7a3d54d1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 14 13:31:10 2014 +0100 user32/tests: Protect the global message sequence with a critical section. --- dlls/user32/tests/msg.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index f9398ee..dffaa8d 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -1723,6 +1723,7 @@ static BOOL after_end_dialog, test_def_id, paint_loop_done; static int sequence_cnt, sequence_size; static struct recvd_message* sequence; static int log_all_parent_messages; +static CRITICAL_SECTION sequence_cs; /* user32 functions */ static HWND (WINAPI *pGetAncestor)(HWND,UINT); @@ -1813,7 +1814,8 @@ static void add_message_(int line, const struct recvd_message *msg) { struct recvd_message *seq; - if (!sequence) + EnterCriticalSection( &sequence_cs ); + if (!sequence) { sequence_size = 10; sequence = HeapAlloc( GetProcessHeap(), 0, sequence_size * sizeof(*sequence) ); @@ -1825,7 +1827,7 @@ static void add_message_(int line, const struct recvd_message *msg) } assert(sequence); - seq = &sequence[sequence_cnt]; + seq = &sequence[sequence_cnt++]; seq->hwnd = msg->hwnd; seq->message = msg->message; seq->flags = msg->flags; @@ -1834,6 +1836,7 @@ static void add_message_(int line, const struct recvd_message *msg) seq->line = line; seq->descr = msg->descr; seq->output[0] = 0; + LeaveCriticalSection( &sequence_cs ); if (msg->descr) { @@ -1918,8 +1921,6 @@ static void add_message_(int line, const struct recvd_message *msg) sprintf( seq->output + strlen(seq->output), " (flags %x)", msg->flags ); } } - - sequence_cnt++; } /* try to make sure pending X events have been processed before continuing */ @@ -1940,9 +1941,11 @@ static void flush_events(void) static void flush_sequence(void) { + EnterCriticalSection( &sequence_cs ); HeapFree(GetProcessHeap(), 0, sequence); sequence = 0; sequence_cnt = sequence_size = 0; + LeaveCriticalSection( &sequence_cs ); } static void dump_sequence(const struct message *expected, const char *context, const char *file, int line) @@ -14290,6 +14293,7 @@ START_TEST(msg) return; } + InitializeCriticalSection( &sequence_cs ); init_procs(); hModuleImm32 = LoadLibraryA("imm32.dll"); @@ -14402,4 +14406,5 @@ START_TEST(msg) GetLastError() == 0xdeadbeef, /* Win9x */ "unexpected error %d\n", GetLastError()); } + DeleteCriticalSection( &sequence_cs ); }

1 0

Dmitry Timoshkov : windowscodecs: Move the aggregation check from object constructors to class factory.
by Alexandre Julliard 14 Jan '14

14 Jan '14

Module: wine Branch: master Commit: d03f65a51fd4977f7875d87a6dffe5769caa8e00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d03f65a51fd4977f7875d87a6… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jan 14 20:18:11 2014 +0900 windowscodecs: Move the aggregation check from object constructors to class factory. --- dlls/windowscodecs/bmpdecode.c | 14 ++++----- dlls/windowscodecs/bmpencode.c | 6 ++-- dlls/windowscodecs/clsfactory.c | 8 ++++-- dlls/windowscodecs/converter.c | 6 ++-- dlls/windowscodecs/gifformat.c | 26 ++++++++--------- dlls/windowscodecs/icnsformat.c | 8 ++---- dlls/windowscodecs/icoformat.c | 8 ++---- dlls/windowscodecs/imgfactory.c | 8 ++---- dlls/windowscodecs/jpegformat.c | 16 ++++------- dlls/windowscodecs/metadatahandler.c | 12 ++++---- dlls/windowscodecs/pngformat.c | 20 ++++++------- dlls/windowscodecs/proxy.c | 2 +- dlls/windowscodecs/tgaformat.c | 6 ++-- dlls/windowscodecs/tiffformat.c | 16 ++++------- dlls/windowscodecs/wincodecs_private.h | 49 ++++++++++++++++---------------- 15 files changed, 89 insertions(+), 116 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d03f65a51fd4977f7875d…

1 0

← Newer
1
...
27
28
29
30
31
32
33
...
82
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 2014