January 2014 - Wine-commits

Michael Stefaniuc : dmstyle/tests: Add COM tests for IDirectMusicStyle8.
by Alexandre Julliard 15 Jan '14

15 Jan '14

Module: wine Branch: master Commit: e5b4b69352aecbf29bbce0dbfc65148e2d40e7de URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5b4b69352aecbf29bbce0dbf… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jan 15 01:10:15 2014 +0100 dmstyle/tests: Add COM tests for IDirectMusicStyle8. --- configure | 1 + configure.ac | 1 + dlls/dmstyle/tests/Makefile.in | 5 ++ dlls/dmstyle/tests/dmstyle.c | 104 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 111 insertions(+) diff --git a/configure b/configure index 1ee19b2..48f12f1 100755 --- a/configure +++ b/configure @@ -16672,6 +16672,7 @@ wine_fn_config_test dlls/dmloader/tests dmloader_test wine_fn_config_dll dmscript enable_dmscript clean wine_fn_config_test dlls/dmscript/tests dmscript_test wine_fn_config_dll dmstyle enable_dmstyle clean +wine_fn_config_test dlls/dmstyle/tests dmstyle_test wine_fn_config_dll dmsynth enable_dmsynth clean wine_fn_config_test dlls/dmsynth/tests dmsynth_test wine_fn_config_dll dmusic enable_dmusic clean diff --git a/configure.ac b/configure.ac index da240bd..75faadf 100644 --- a/configure.ac +++ b/configure.ac @@ -2796,6 +2796,7 @@ WINE_CONFIG_TEST(dlls/dmloader/tests) WINE_CONFIG_DLL(dmscript,,[clean]) WINE_CONFIG_TEST(dlls/dmscript/tests) WINE_CONFIG_DLL(dmstyle,,[clean]) +WINE_CONFIG_TEST(dlls/dmstyle/tests) WINE_CONFIG_DLL(dmsynth,,[clean]) WINE_CONFIG_TEST(dlls/dmsynth/tests) WINE_CONFIG_DLL(dmusic,,[clean]) diff --git a/dlls/dmstyle/tests/Makefile.in b/dlls/dmstyle/tests/Makefile.in new file mode 100644 index 0000000..ec8b063 --- /dev/null +++ b/dlls/dmstyle/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = dmstyle.dll +IMPORTS = ole32 + +C_SRCS = \ + dmstyle.c diff --git a/dlls/dmstyle/tests/dmstyle.c b/dlls/dmstyle/tests/dmstyle.c new file mode 100644 index 0000000..bbc04bd --- /dev/null +++ b/dlls/dmstyle/tests/dmstyle.c @@ -0,0 +1,104 @@ +/* + * Copyright 2014 Michael Stefaniuc + * + * 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 + */ + +#define COBJMACROS + +#include <stdarg.h> +#include <windef.h> +#include <initguid.h> +#include <wine/test.h> +#include <dmusici.h> + + +static BOOL missing_dmstyle(void) +{ + IDirectMusicStyle *dms; + HRESULT hr = CoCreateInstance(&CLSID_DirectMusicStyle, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicStyle, (void**)&dms); + + if (hr == S_OK && dms) + { + IDirectMusicStyle_Release(dms); + return FALSE; + } + return TRUE; +} + +static void test_COM(void) +{ + IDirectMusicStyle8 *dms8 = (IDirectMusicStyle8*)0xdeadbeef; + IDirectMusicObject *dmo; + IPersistStream *ps; + IUnknown *unk; + ULONG refcount; + HRESULT hr; + + /* COM aggregation */ + hr = CoCreateInstance(&CLSID_DirectMusicStyle, (IUnknown*)&dms8, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (void**)&dms8); + ok(hr == CLASS_E_NOAGGREGATION, + "DirectMusicStyle8 create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr); + ok(!dms8, "dms8 = %p\n", dms8); + + /* Invalid RIID */ + hr = CoCreateInstance(&CLSID_DirectMusicStyle, NULL, CLSCTX_INPROC_SERVER, &IID_IClassFactory, + (void**)&dms8); + ok(hr == E_NOINTERFACE, "DirectMusicStyle8 create failed: %08x, expected E_NOINTERFACE\n", hr); + + /* Same refcount for all DirectMusicStyle8 interfaces */ + hr = CoCreateInstance(&CLSID_DirectMusicStyle, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicStyle8, (void**)&dms8); + ok(hr == S_OK, "DirectMusicStyle8 create failed: %08x, expected S_OK\n", hr); + refcount = IDirectMusicStyle8_AddRef(dms8); + ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + + hr = IDirectMusicStyle8_QueryInterface(dms8, &IID_IDirectMusicObject, (void**)&dmo); + ok(hr == S_OK, "QueryInterface for IID_IDirectMusicObject failed: %08x\n", hr); + refcount = IDirectMusicObject_AddRef(dmo); + ok(refcount == 4, "refcount == %u, expected 4\n", refcount); + refcount = IDirectMusicObject_Release(dmo); + + hr = IDirectMusicStyle8_QueryInterface(dms8, &IID_IPersistStream, (void**)&ps); + ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); + refcount = IPersistStream_AddRef(ps); + ok(refcount == 5, "refcount == %u, expected 5\n", refcount); + refcount = IPersistStream_Release(ps); + + hr = IDirectMusicStyle8_QueryInterface(dms8, &IID_IUnknown, (void**)&unk); + ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); + refcount = IUnknown_AddRef(unk); + ok(refcount == 6, "refcount == %u, expected 6\n", refcount); + refcount = IUnknown_Release(unk); + + while (IDirectMusicStyle8_Release(dms8)); +} + +START_TEST(dmstyle) +{ + CoInitialize(NULL); + + if (missing_dmstyle()) + { + skip("dmstyle not available\n"); + CoUninitialize(); + return; + } + test_COM(); + + CoUninitialize(); +}

1 0

Michael Stefaniuc : dmstyle/tests: COM tests for the different DirectMusic*Tracks.
by Alexandre Julliard 15 Jan '14

15 Jan '14

Module: wine Branch: master Commit: 31c9881f603ba7cad8adb6d08aec08977c0e8389 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31c9881f603ba7cad8adb6d08… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jan 15 01:11:24 2014 +0100 dmstyle/tests: COM tests for the different DirectMusic*Tracks. --- dlls/dmstyle/tests/dmstyle.c | 70 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) diff --git a/dlls/dmstyle/tests/dmstyle.c b/dlls/dmstyle/tests/dmstyle.c index bbc04bd..18f2a6b 100644 --- a/dlls/dmstyle/tests/dmstyle.c +++ b/dlls/dmstyle/tests/dmstyle.c @@ -24,6 +24,7 @@ #include <wine/test.h> #include <dmusici.h> +#define ARRAY_SIZE(a) (sizeof(a)/sizeof((a)[0])) static BOOL missing_dmstyle(void) { @@ -88,6 +89,74 @@ static void test_COM(void) while (IDirectMusicStyle8_Release(dms8)); } +static void test_COM_track(void) +{ + IDirectMusicTrack8 *dmt8; + IPersistStream *ps; + IUnknown *unk; + ULONG refcount; + HRESULT hr; +#define X(class) &CLSID_ ## class, #class + const struct { + REFCLSID clsid; + const char *name; + } class[] = { + { X(DirectMusicAuditionTrack) }, + { X(DirectMusicChordTrack) }, + { X(DirectMusicCommandTrack) }, + { X(DirectMusicMotifTrack) }, + { X(DirectMusicMuteTrack) }, + { X(DirectMusicStyleTrack) }, + }; +#undef X + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(class); i++) { + /* COM aggregation */ + dmt8 = (IDirectMusicTrack8*)0xdeadbeef; + hr = CoCreateInstance(class[i].clsid, (IUnknown*)&dmt8, CLSCTX_INPROC_SERVER, &IID_IUnknown, + (void**)&dmt8); + if (hr == REGDB_E_CLASSNOTREG) { + win_skip("%s not registered\n", class[i].name); + continue; + } + ok(hr == CLASS_E_NOAGGREGATION, + "%s create failed: %08x, expected CLASS_E_NOAGGREGATION\n", class[i].name, hr); + ok(!dmt8, "dmt8 = %p\n", dmt8); + + /* Invalid RIID */ + hr = CoCreateInstance(class[i].clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicObject, + (void**)&dmt8); + ok(hr == E_NOINTERFACE, "%s create failed: %08x, expected E_NOINTERFACE\n", + class[i].name, hr); + + /* Same refcount for all DirectMusicTrack interfaces */ + hr = CoCreateInstance(class[i].clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicTrack8, + (void**)&dmt8); + if (hr == E_NOINTERFACE && !dmt8) { + skip("%s not created with CoCreateInstance()\n", class[i].name); + continue; + } + ok(hr == S_OK, "%s create failed: %08x, expected S_OK\n", class[i].name, hr); + refcount = IDirectMusicTrack8_AddRef(dmt8); + ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + + hr = IDirectMusicTrack8_QueryInterface(dmt8, &IID_IPersistStream, (void**)&ps); + ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); + refcount = IPersistStream_AddRef(ps); + ok(refcount == 4, "refcount == %u, expected 4\n", refcount); + refcount = IPersistStream_Release(ps); + + hr = IDirectMusicTrack8_QueryInterface(dmt8, &IID_IUnknown, (void**)&unk); + ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); + refcount = IUnknown_AddRef(unk); + ok(refcount == 5, "refcount == %u, expected 5\n", refcount); + refcount = IUnknown_Release(unk); + + while (IDirectMusicTrack8_Release(dmt8)); + } +} + START_TEST(dmstyle) { CoInitialize(NULL); @@ -99,6 +168,7 @@ START_TEST(dmstyle) return; } test_COM(); + test_COM_track(); CoUninitialize(); }

1 0

Łukasz Wojniłowicz : Polish translation for release 1.6.2
by Jeremy Newman 15 Jan '14

15 Jan '14

Module: website Branch: master Commit: e499ab6a15a8ae59e9af88f129d2da7f5ea916a1 URL: http://source.winehq.org/git/website.git/?a=commit;h=e499ab6a15a8ae59e9af88… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Tue Jan 14 17:37:05 2014 +0100 Polish translation for release 1.6.2 --- news/pl/2014011001.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/news/pl/2014011001.xml b/news/pl/2014011001.xml new file mode 100644 index 0000000..9f4b281 --- /dev/null +++ b/news/pl/2014011001.xml @@ -0,0 +1,13 @@ +<news> +<date>Styczeń 10, 2014</date> +<title>Wydano Wine 1.6.2</title> +<body> + Poprawione wydanie Wine 1.6.2 jest już dostępne. + <a href="{$root}/announce/1.6.2">Co nowego</a> w tym wydaniu: +<ul> + <li>Obsługa zarządzania barwą uaktualniona do liblcms w wersji 2-giej.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.6.2.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

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(a)threads@stdext@@YAXAEAPEAX(a)Z @ stub -arch=win32 ?_Mtx_unlock(a)threads@stdext@@YAXPAX(a)Z @ stub -arch=win64 ?_Mtx_unlock(a)threads@stdext@@YAXPEAX(a)Z -@ stub -arch=win32 ?_New_Locimp(a)_Locimp@locale(a)std@@CAPAV123(a)ABV123@@Z -@ stub -arch=win64 ?_New_Locimp(a)_Locimp@locale(a)std@@CAPEAV123(a)AEBV123@@Z -@ stub -arch=win32 ?_New_Locimp(a)_Locimp@locale(a)std@@CAPAV123(a)_N@Z -@ stub -arch=win64 ?_New_Locimp(a)_Locimp@locale(a)std@@CAPEAV123(a)_N@Z +@ cdecl -arch=win32 ?_New_Locimp(a)_Locimp@locale(a)std@@CAPAV123(a)ABV123@@Z(ptr) locale__Locimp__New_Locimp +@ cdecl -arch=win64 ?_New_Locimp(a)_Locimp@locale(a)std@@CAPEAV123(a)AEBV123@@Z(ptr) locale__Locimp__New_Locimp +@ cdecl -arch=win32 ?_New_Locimp(a)_Locimp@locale(a)std@@CAPAV123(a)_N@Z(long) locale__Locimp__New_Locimp_transparent +@ cdecl -arch=win64 ?_New_Locimp(a)_Locimp@locale(a)std@@CAPEAV123(a)_N@Z(long) locale__Locimp__New_Locimp_transparent @ stub -arch=win32 ?_Open_dir(a)sys@tr2(a)std@@YAPAXPADPBDAAHAAW4file_type(a)123@@Z @ stub -arch=win64 ?_Open_dir(a)sys@tr2(a)std@@YAPEAXPEADPEBDAEAHAEAW4file_type(a)123@@Z @ stub -arch=win32 ?_Open_dir(a)sys@tr2(a)std@@YAPAXPA_WPB_WAAHAAW4file_type(a)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(a)_Locimp@locale(a)std@@CAPAV123(a)ABV123@@Z */ +/* ?_New_Locimp(a)_Locimp@locale(a)std@@CAPEAV123(a)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(a)_Locimp@locale(a)std@@CAPAV123(a)_N@Z */ +/* ?_New_Locimp(a)_Locimp@locale(a)std@@CAPEAV123(a)_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(a)_Locimp@locale(a)std@@CAXPAV123(a)PAVfacet@23(a)I@Z */ /* ?_Locimp_Addfac(a)_Locimp@locale(a)std@@CAXPEAV123(a)PEAVfacet@23(a)_K@Z */ void __cdecl locale__Locimp__Locimp_Addfac(locale__Locimp *locimp, locale_facet *facet, MSVCP_size_t id)

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(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

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(a)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

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

Stefan Dösinger : wined3d: Do not use surface-> resource.allocatedMemory.
by Alexandre Julliard 14 Jan '14

14 Jan '14

Module: wine Branch: master Commit: f6403b4ac0ad822b3c1b4e9134b4d5cd2dfce6c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6403b4ac0ad822b3c1b4e913… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jan 14 13:59:22 2014 +0100 wined3d: Do not use surface->resource.allocatedMemory. --- dlls/wined3d/surface.c | 59 +++++++++++++--------------------------------- dlls/wined3d/swapchain.c | 4 ---- 2 files changed, 16 insertions(+), 47 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index a434bda..61f322e 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -519,7 +519,7 @@ static void surface_get_memory(const struct wined3d_surface *surface, struct win data->buffer_object = surface->pbo; return; } - data->addr = surface->resource.allocatedMemory; + data->addr = surface->resource.heap_memory; data->buffer_object = 0; return; } @@ -572,7 +572,6 @@ static void surface_create_pbo(struct wined3d_surface *surface, const struct win /* We don't need the system memory anymore and we can't even use it for PBOs. */ if (!(surface->flags & SFLAG_CLIENT)) wined3d_resource_free_sysmem(&surface->resource); - surface->resource.allocatedMemory = NULL; surface->flags |= SFLAG_PBO; context_release(context); } @@ -585,13 +584,12 @@ static void surface_prepare_system_memory(struct wined3d_surface *surface) if (!(surface->flags & SFLAG_PBO) && surface_need_pbo(surface, gl_info)) surface_create_pbo(surface, gl_info); - else if (!(surface->resource.allocatedMemory || surface->flags & SFLAG_PBO)) + else if (!(surface->resource.heap_memory || surface->flags & SFLAG_PBO)) { /* Whatever surface we have, make sure that there is memory allocated * for the downloaded copy, or a PBO to map. */ - if (!surface->resource.heap_memory && !wined3d_resource_allocate_sysmem(&surface->resource)) + if (!wined3d_resource_allocate_sysmem(&surface->resource)) ERR("Failed to allocate system memory.\n"); - surface->resource.allocatedMemory = surface->resource.heap_memory; if (surface->flags & SFLAG_INSYSMEM) ERR("Surface without memory or PBO has SFLAG_INSYSMEM set.\n"); @@ -623,7 +621,6 @@ static void surface_evict_sysmem(struct wined3d_surface *surface) return; wined3d_resource_free_sysmem(&surface->resource); - surface->resource.allocatedMemory = NULL; surface_invalidate_location(surface, SFLAG_INSYSMEM); } @@ -838,7 +835,7 @@ static BYTE *surface_map(struct wined3d_surface *surface, const RECT *rect, DWOR return ret; } - return surface->resource.allocatedMemory; + return surface->resource.heap_memory; default: ERR("Unexpected map binding %s.\n", debug_surflocation(surface->map_binding)); @@ -1296,12 +1293,10 @@ static void surface_remove_pbo(struct wined3d_surface *surface, const struct win 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; - GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, surface->pbo)); checkGLcall("glBindBufferARB(GL_PIXEL_UNPACK_BUFFER, surface->pbo)"); GL_EXTCALL(glGetBufferSubDataARB(GL_PIXEL_UNPACK_BUFFER_ARB, 0, - surface->resource.size, surface->resource.allocatedMemory)); + surface->resource.size, surface->resource.heap_memory)); checkGLcall("glGetBufferSubDataARB"); GL_EXTCALL(glDeleteBuffersARB(1, &surface->pbo)); checkGLcall("glDeleteBuffersARB"); @@ -1312,27 +1307,17 @@ static void surface_remove_pbo(struct wined3d_surface *surface, const struct win static BOOL surface_init_sysmem(struct wined3d_surface *surface) { - if (surface->resource.allocatedMemory) + if (surface->user_memory) + return TRUE; + + if (surface->resource.heap_memory) { - memset(surface->resource.allocatedMemory, 0, surface->resource.size); + memset(surface->resource.heap_memory, 0, surface->resource.size); } - else if (!surface->user_memory) + else if (!wined3d_resource_allocate_sysmem(&surface->resource)) { - if (!surface->resource.heap_memory) - { - if (!wined3d_resource_allocate_sysmem(&surface->resource)) - { - ERR("Failed to allocate system memory.\n"); - return FALSE; - } - } - 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; + ERR("Failed to allocate system memory.\n"); + return FALSE; } return TRUE; @@ -1511,7 +1496,7 @@ static BYTE *gdi_surface_map(struct wined3d_surface *surface, const RECT *rect, return surface->user_memory; case SFLAG_INSYSMEM: - return surface->resource.allocatedMemory; + return surface->resource.heap_memory; default: ERR("Unexpected map binding %s.\n", debug_surflocation(surface->map_binding)); @@ -2133,23 +2118,19 @@ static void surface_allocate_surface(struct wined3d_surface *surface, const stru if (gl_info->supported[APPLE_CLIENT_STORAGE]) { if (surface->flags & (SFLAG_NONPOW2 | SFLAG_DIBSECTION | SFLAG_CONVERTED) - || !surface->resource.allocatedMemory) + || !surface->resource.heap_memory) { /* In some cases we want to disable client storage. * SFLAG_NONPOW2 has a bigger opengl texture than the client memory, and different pitches * SFLAG_DIBSECTION: Dibsections may have read / write protections on the memory. Avoid issues... * SFLAG_CONVERTED: The conversion destination memory is freed after loading the surface - * allocatedMemory == NULL: Not defined in the extension. Seems to disable client storage effectively + * heap_memory == NULL: Not defined in the extension. Seems to disable client storage effectively */ surface->flags &= ~SFLAG_CLIENT; } else { surface->flags |= SFLAG_CLIENT; - - /* Point OpenGL to our allocated texture memory. Do not use - * resource.allocatedMemory here because it might point into a - * PBO. Instead use heap_memory. */ mem = surface->resource.heap_memory; gl_info->gl_ops.gl.p_glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_TRUE); @@ -2735,7 +2716,6 @@ HRESULT CDECL wined3d_surface_update_desc(struct wined3d_surface *surface, } surface->flags &= ~SFLAG_LOCATIONS; - surface->resource.allocatedMemory = NULL; wined3d_resource_free_sysmem(&surface->resource); surface->resource.width = width; @@ -3891,10 +3871,6 @@ void flip_surface(struct wined3d_surface *front, struct wined3d_surface *back) front->dib.bitmap_data = back->dib.bitmap_data; back->dib.bitmap_data = tmp; - tmp = front->resource.allocatedMemory; - front->resource.allocatedMemory = back->resource.allocatedMemory; - back->resource.allocatedMemory = tmp; - tmp = front->resource.heap_memory; front->resource.heap_memory = back->resource.heap_memory; back->resource.heap_memory = tmp; @@ -6405,9 +6381,6 @@ static HRESULT surface_init(struct wined3d_surface *surface, struct wined3d_text if (lockable && (desc->usage & WINED3DUSAGE_RENDERTARGET)) surface->flags |= SFLAG_DYNLOCK; - TRACE("surface %p, memory %p, size %u\n", - surface, surface->resource.allocatedMemory, surface->resource.size); - /* Call the private setup routine */ hr = surface->surface_ops->surface_private_setup(surface); if (FAILED(hr)) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 74acb6c..045ead6 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -682,10 +682,6 @@ static void swapchain_gdi_present(struct wined3d_swapchain *swapchain, const REC front->dib.bitmap_data = back->dib.bitmap_data; back->dib.bitmap_data = tmp; - tmp = front->resource.allocatedMemory; - front->resource.allocatedMemory = back->resource.allocatedMemory; - back->resource.allocatedMemory = tmp; - if (front->resource.heap_memory) ERR("GDI Surface %p has heap memory allocated.\n", front);

1 0

Stefan Dösinger : wined3d: Give the DIB section its own location.
by Alexandre Julliard 14 Jan '14

14 Jan '14

Module: wine Branch: master Commit: adf0ab2ad889c7c6bcda484edfde9a431f829b08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=adf0ab2ad889c7c6bcda484ed… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jan 14 13:59:23 2014 +0100 wined3d: Give the DIB section its own location. --- dlls/wined3d/surface.c | 67 ++++++++++++++++++++++++++++++++++++---- dlls/wined3d/swapchain.c | 4 +-- dlls/wined3d/utils.c | 3 +- dlls/wined3d/wined3d_private.h | 15 ++++----- 4 files changed, 73 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 61f322e..ef91ebc 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -511,6 +511,12 @@ static void surface_get_memory(const struct wined3d_surface *surface, struct win data->buffer_object = 0; return; } + if (location & SFLAG_INDIB) + { + data->addr = surface->dib.bitmap_data; + data->buffer_object = 0; + return; + } if (location & SFLAG_INSYSMEM) { if (surface->flags & SFLAG_PBO) @@ -605,6 +611,10 @@ void surface_prepare_map_memory(struct wined3d_surface *surface) ERR("Map binding is set to SFLAG_INUSERMEM but surface->user_memory is NULL.\n"); break; + case SFLAG_INDIB: + if (!surface->dib.bitmap_data) + ERR("Map binding is set to SFLAG_INDIB but surface->dib.bitmap_data is NULL.\n"); + case SFLAG_INSYSMEM: surface_prepare_system_memory(surface); break; @@ -3242,9 +3252,9 @@ HRESULT CDECL wined3d_surface_getdc(struct wined3d_surface *surface, HDC *dc) ERR("Map failed, hr %#x.\n", hr); return hr; } - surface->getdc_map_mem = map.data; - memcpy(surface->dib.bitmap_data, surface->getdc_map_mem, surface->resource.size); + surface_load_location(surface, SFLAG_INDIB); + surface_invalidate_location(surface, ~SFLAG_INDIB); if (surface->resource.format->id == WINED3DFMT_P8_UINT || surface->resource.format->id == WINED3DFMT_P8_UINT_A8_UNORM) @@ -3305,14 +3315,13 @@ HRESULT CDECL wined3d_surface_releasedc(struct wined3d_surface *surface, HDC dc) return WINEDDERR_NODC; } - memcpy(surface->getdc_map_mem, surface->dib.bitmap_data, surface->resource.size); - - /* We locked first, so unlock now. */ - surface->getdc_map_mem = NULL; wined3d_surface_unmap(surface); surface->flags &= ~SFLAG_DCINUSE; + if (surface->map_binding == SFLAG_INUSERMEM) + surface_load_location(surface, SFLAG_INUSERMEM); + return WINED3D_OK; } @@ -4869,9 +4878,54 @@ static DWORD resource_access_from_location(DWORD location) } } +static void surface_copy_simple_location(struct wined3d_surface *surface, DWORD location) +{ + struct wined3d_device *device = surface->resource.device; + struct wined3d_context *context; + const struct wined3d_gl_info *gl_info; + struct wined3d_bo_address dst, src; + UINT size = surface->resource.size; + + surface_get_memory(surface, &dst, location); + surface_get_memory(surface, &src, surface->flags); + + if (dst.buffer_object) + { + context = context_acquire(device, NULL); + gl_info = context->gl_info; + GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, dst.buffer_object)); + GL_EXTCALL(glBufferSubDataARB(GL_PIXEL_UNPACK_BUFFER_ARB, 0, size, src.addr)); + GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, 0)); + checkGLcall("Upload PBO"); + context_release(context); + return; + } + if (src.buffer_object) + { + context = context_acquire(device, NULL); + gl_info = context->gl_info; + GL_EXTCALL(glBindBufferARB(GL_PIXEL_PACK_BUFFER_ARB, src.buffer_object)); + GL_EXTCALL(glGetBufferSubDataARB(GL_PIXEL_PACK_BUFFER_ARB, 0, size, dst.addr)); + GL_EXTCALL(glBindBufferARB(GL_PIXEL_PACK_BUFFER_ARB, 0)); + checkGLcall("Download PBO"); + context_release(context); + return; + } + memcpy(dst.addr, src.addr, size); +} + static void surface_load_sysmem(struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info, DWORD dst_location) { + static const DWORD simple_locations = + SFLAG_INDIB | SFLAG_INUSERMEM | SFLAG_INSYSMEM; + + if (surface->flags & simple_locations) + { + surface_copy_simple_location(surface, dst_location); + return; + } + if (surface->flags & (SFLAG_INRB_MULTISAMPLE | SFLAG_INRB_RESOLVED)) surface_load_location(surface, SFLAG_INTEXTURE); @@ -5156,6 +5210,7 @@ HRESULT surface_load_location(struct wined3d_surface *surface, DWORD location) switch (location) { + case SFLAG_INDIB: case SFLAG_INUSERMEM: case SFLAG_INSYSMEM: surface_load_sysmem(surface, gl_info, location); diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 045ead6..d65de1f 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -609,7 +609,7 @@ static const struct wined3d_swapchain_ops swapchain_gl_ops = /* Helper function that blits the front buffer contents to the target window. */ void x11_copy_to_screen(const struct wined3d_swapchain *swapchain, const RECT *rect) { - const struct wined3d_surface *front; + struct wined3d_surface *front; POINT offset = {0, 0}; HDC src_dc, dst_dc; RECT draw_rect; @@ -623,7 +623,7 @@ 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); + surface_load_location(front, SFLAG_INDIB); src_dc = front->hDC; window = swapchain->win_handle; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index fa72a07..eb62455 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -2795,7 +2795,7 @@ void dump_color_fixup_desc(struct color_fixup_desc fixup) } const char *debug_surflocation(DWORD flag) { - char buf[140]; + char buf[152]; buf[0] = 0; if (flag & SFLAG_INSYSMEM) strcat(buf, " | SFLAG_INSYSMEM"); /* 17 */ @@ -2805,6 +2805,7 @@ const char *debug_surflocation(DWORD flag) { if (flag & SFLAG_INRB_MULTISAMPLE) strcat(buf, " | SFLAG_INRB_MULTISAMPLE"); /* 25 */ if (flag & SFLAG_INRB_RESOLVED) strcat(buf, " | SFLAG_INRB_RESOLVED"); /* 22 */ if (flag & SFLAG_INUSERMEM) strcat(buf, " | SFLAG_INUSERMEM"); /* 18 */ + if (flag & SFLAG_INDIB) strcat(buf, " | SFLAG_INDIB"); /* 14 */ return wine_dbg_sprintf("%s", buf[0] ? buf + 3 : "0"); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d4f0739..e795623 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2217,7 +2217,6 @@ struct wined3d_surface /* For GetDC */ struct wined3d_surface_dib dib; HDC hDC; - void *getdc_map_mem; struct wined3d_color_key gl_color_key; @@ -2300,12 +2299,13 @@ void flip_surface(struct wined3d_surface *front, struct wined3d_surface *back) D #define SFLAG_PBO 0x00002000 /* The surface has a PBO. */ #define SFLAG_INSYSMEM 0x00004000 /* The system memory copy is current. */ #define SFLAG_INUSERMEM 0x00008000 /* The user memory copy is current. */ -#define SFLAG_INTEXTURE 0x00010000 /* The GL texture is current. */ -#define SFLAG_INSRGBTEX 0x00020000 /* The GL sRGB texture is current. */ -#define SFLAG_INDRAWABLE 0x00040000 /* The GL drawable is current. */ -#define SFLAG_INRB_MULTISAMPLE 0x00080000 /* The multisample renderbuffer is current. */ -#define SFLAG_INRB_RESOLVED 0x00100000 /* The resolved renderbuffer is current. */ -#define SFLAG_DISCARDED 0x00200000 /* Surface was discarded, allocating new location is enough. */ +#define SFLAG_INDIB 0x00010000 /* The DIB copy is current. */ +#define SFLAG_INTEXTURE 0x00020000 /* The GL texture is current. */ +#define SFLAG_INSRGBTEX 0x00040000 /* The GL sRGB texture is current. */ +#define SFLAG_INDRAWABLE 0x00080000 /* The GL drawable is current. */ +#define SFLAG_INRB_MULTISAMPLE 0x00100000 /* The multisample renderbuffer is current. */ +#define SFLAG_INRB_RESOLVED 0x00200000 /* The resolved renderbuffer is current. */ +#define SFLAG_DISCARDED 0x00400000 /* Surface was discarded, allocating new location is enough. */ /* In some conditions the surface memory must not be freed: * SFLAG_CONVERTED: Converting the data back would take too long @@ -2321,6 +2321,7 @@ void flip_surface(struct wined3d_surface *front, struct wined3d_surface *back) D #define SFLAG_LOCATIONS (SFLAG_INSYSMEM | \ SFLAG_INUSERMEM | \ + SFLAG_INDIB | \ SFLAG_INTEXTURE | \ SFLAG_INSRGBTEX | \ SFLAG_INDRAWABLE | \

1 0

Stefan Dösinger : wined3d: Don' t map the surface in getdc.
by Alexandre Julliard 14 Jan '14

14 Jan '14

Module: wine Branch: master Commit: 96658847664ba76789ae811c24ca31b883b1d5fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=96658847664ba76789ae811c2… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jan 14 13:59:24 2014 +0100 wined3d: Don't map the surface in getdc. This avoids bouncing the content between the map binding and DIB. --- dlls/wined3d/surface.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index ef91ebc..f59efb2 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3219,7 +3219,6 @@ HRESULT CDECL wined3d_surface_map(struct wined3d_surface *surface, HRESULT CDECL wined3d_surface_getdc(struct wined3d_surface *surface, HDC *dc) { - struct wined3d_map_desc map; HRESULT hr; TRACE("surface %p, dc %p.\n", surface, dc); @@ -3245,14 +3244,6 @@ HRESULT CDECL wined3d_surface_getdc(struct wined3d_surface *surface, HDC *dc) return WINED3DERR_INVALIDCALL; } - /* Map the surface. */ - hr = wined3d_surface_map(surface, &map, NULL, 0); - if (FAILED(hr)) - { - ERR("Map failed, hr %#x.\n", hr); - return hr; - } - surface_load_location(surface, SFLAG_INDIB); surface_invalidate_location(surface, ~SFLAG_INDIB); @@ -3294,6 +3285,7 @@ HRESULT CDECL wined3d_surface_getdc(struct wined3d_surface *surface, HDC *dc) } surface->flags |= SFLAG_DCINUSE; + surface->resource.map_count++; *dc = surface->hDC; TRACE("Returning dc %p.\n", *dc); @@ -3315,8 +3307,7 @@ HRESULT CDECL wined3d_surface_releasedc(struct wined3d_surface *surface, HDC dc) return WINEDDERR_NODC; } - wined3d_surface_unmap(surface); - + surface->resource.map_count--; surface->flags &= ~SFLAG_DCINUSE; if (surface->map_binding == SFLAG_INUSERMEM)

1 0