wine-commits January 2014

wine-commits@winehq.org

3 participants
814 discussions

Alexandre Julliard : makedep: Create target subdirectories at make depend time.
by Alexandre Julliard 15 Jan '14

15 Jan '14

Module: wine Branch: master Commit: 16286e45c4447d23067cd22840c51146e39f6bbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=16286e45c4447d23067cd2284… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 14 21:20:25 2014 +0100 makedep: Create target subdirectories at make depend time. --- Make.vars.in | 1 - configure | 50 -------------------------------------------------- configure.ac | 1 - tools/makedep.c | 37 +++++++++++++++++++++++++------------ 4 files changed, 25 insertions(+), 64 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=16286e45c4447d23067cd…

1 0

Alexandre Julliard : makedep: Make the makefile mode the default behavior and remove obsolete options.
by Alexandre Julliard 15 Jan '14

15 Jan '14

Module: wine Branch: master Commit: 2da6fc368f29071f7fb7f1eb2b9ffbe38be1a0d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2da6fc368f29071f7fb7f1eb2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 14 21:16:40 2014 +0100 makedep: Make the makefile mode the default behavior and remove obsolete options. --- aclocal.m4 | 4 +-- configure | 4 +-- tools/makedep.c | 89 ++++++++++--------------------------------------------- 3 files changed, 20 insertions(+), 77 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index bb48320..c582890 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -227,11 +227,11 @@ wine_fn_depend_rules () { wine_fn_append_rule \ "$ac_dir/Makefile: $srcdir/$ac_dir/Makefile.in $srcdir/Make.vars.in config.status \$(MAKEDEP) - @./config.status --file $ac_dir/Makefile:Make.vars.in:$ac_dir/Makefile.in && \$(MAKEDEP) -M $ac_dir + @./config.status --file $ac_dir/Makefile:Make.vars.in:$ac_dir/Makefile.in && \$(MAKEDEP) $ac_dir depend: $ac_dir/depend .PHONY: $ac_dir/depend $ac_dir/depend: \$(MAKEDEP) dummy - @./config.status --file $ac_dir/Makefile:Make.vars.in:$ac_dir/Makefile.in && \$(MAKEDEP) -M $ac_dir" + @./config.status --file $ac_dir/Makefile:Make.vars.in:$ac_dir/Makefile.in && \$(MAKEDEP) $ac_dir" } wine_fn_pot_rules () diff --git a/configure b/configure index 27251d0..2612bdc 100755 --- a/configure +++ b/configure @@ -7075,11 +7075,11 @@ wine_fn_depend_rules () { wine_fn_append_rule \ "$ac_dir/Makefile: $srcdir/$ac_dir/Makefile.in $srcdir/Make.vars.in config.status \$(MAKEDEP) - @./config.status --file $ac_dir/Makefile:Make.vars.in:$ac_dir/Makefile.in && \$(MAKEDEP) -M $ac_dir + @./config.status --file $ac_dir/Makefile:Make.vars.in:$ac_dir/Makefile.in && \$(MAKEDEP) $ac_dir depend: $ac_dir/depend .PHONY: $ac_dir/depend $ac_dir/depend: \$(MAKEDEP) dummy - @./config.status --file $ac_dir/Makefile:Make.vars.in:$ac_dir/Makefile.in && \$(MAKEDEP) -M $ac_dir" + @./config.status --file $ac_dir/Makefile:Make.vars.in:$ac_dir/Makefile.in && \$(MAKEDEP) $ac_dir" } wine_fn_pot_rules () diff --git a/tools/makedep.c b/tools/makedep.c index 108cdb0..3a656e5 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -111,24 +111,17 @@ static const char *Separator = "### Dependencies"; static const char *input_file_name; static const char *output_file_name; static const char *temp_file_name; -static int parse_makefile_mode; static int relative_dir_mode; static int input_line; static int output_column; static FILE *output_file; static const char Usage[] = - "Usage: makedep [options] [files]\n" + "Usage: makedep [options] directories\n" "Options:\n" - " -Idir Search for include files in directory 'dir'\n" - " -Cdir Search for source files in directory 'dir'\n" - " -Sdir Set the top source directory\n" - " -Tdir Set the top object directory\n" - " -Pdir Set the parent source directory\n" - " -M dirs Parse the makefiles from the specified directories\n" - " -R from to Compute the relative path between two directories\n" - " -fxxx Store output in file 'xxx' (default: Makefile)\n" - " -sxxx Use 'xxx' as separator (default: \"### Dependencies\")\n"; + " -R from to Compute the relative path between two directories\n" + " -fxxx Store output in file 'xxx' (default: Makefile)\n" + " -sxxx Use 'xxx' as separator (default: \"### Dependencies\")\n"; #ifndef __GNUC__ @@ -314,19 +307,6 @@ static void strarray_addall( struct strarray *array, struct strarray added ) /******************************************************************* - * strarray_insert - */ -static void strarray_insert( struct strarray *array, unsigned int pos, const char *str ) -{ - unsigned int i; - - strarray_add( array, NULL ); - for (i = array->count - 1; i > pos; i--) array->str[i] = array->str[i - 1]; - array->str[pos] = str; -} - - -/******************************************************************* * strarray_add_uniq */ static void strarray_add_uniq( struct strarray *array, const char *str ) @@ -521,20 +501,6 @@ static char *tools_path( const char *name ) /******************************************************************* - * init_paths - */ -static void init_paths(void) -{ - /* ignore redundant source paths */ - if (src_dir && !strcmp( src_dir, "." )) src_dir = NULL; - if (top_src_dir && top_obj_dir && !strcmp( top_src_dir, top_obj_dir )) top_src_dir = NULL; - if (tools_dir && top_obj_dir && !strcmp( tools_dir, top_obj_dir )) tools_dir = NULL; - - strarray_insert( &include_args, 0, strmake( "-I%s", top_dir_path( "include" ))); -} - - -/******************************************************************* * get_line */ static char *get_line( FILE *file ) @@ -2156,6 +2122,11 @@ static void update_makefile( const char *path ) tools_dir = get_expanded_make_variable( "TOOLSDIR" ); tools_ext = get_expanded_make_variable( "TOOLSEXT" ); + /* ignore redundant source paths */ + if (src_dir && !strcmp( src_dir, "." )) src_dir = NULL; + if (top_src_dir && top_obj_dir && !strcmp( top_src_dir, top_obj_dir )) top_src_dir = NULL; + if (tools_dir && top_obj_dir && !strcmp( tools_dir, top_obj_dir )) tools_dir = NULL; + appmode = get_expanded_make_var_array( "APPMODE" ); dllflags = get_expanded_make_var_array( "DLLFLAGS" ); imports = get_expanded_make_var_array( "IMPORTS" ); @@ -2168,6 +2139,7 @@ static void update_makefile( const char *path ) include_args = empty_strarray; define_args = empty_strarray; strarray_add( &define_args, "-D__WINESRC__" ); + strarray_add( &include_args, strmake( "-I%s", top_dir_path( "include" ))); if (!tools_ext) tools_ext = ""; @@ -2179,8 +2151,6 @@ static void update_makefile( const char *path ) strarray_add_uniq( &define_args, value.str[i] ); strarray_addall( &define_args, get_expanded_make_var_array( "EXTRADEFS" )); - init_paths(); - if (use_msvcrt) { strarray_add( &dllflags, get_expanded_make_variable( "MSVCRTFLAGS" )); @@ -2249,27 +2219,9 @@ static int parse_option( const char *opt ) } switch(opt[1]) { - case 'I': - if (opt[2]) strarray_add_uniq( &include_args, opt ); - break; - case 'C': - src_dir = opt + 2; - break; - case 'S': - top_src_dir = opt + 2; - break; - case 'T': - top_obj_dir = opt + 2; - break; - case 'P': - parent_dir = opt + 2; - break; case 'f': if (opt[2]) makefile_name = opt + 2; break; - case 'M': - parse_makefile_mode = 1; - break; case 'R': relative_dir_mode = 1; break; @@ -2277,8 +2229,6 @@ static int parse_option( const char *opt ) if (opt[2]) Separator = opt + 2; else Separator = NULL; break; - case 'x': - break; /* ignored */ default: fprintf( stderr, "Unknown option '%s'\n%s", opt, Usage ); exit(1); @@ -2293,7 +2243,6 @@ static int parse_option( const char *opt ) int main( int argc, char *argv[] ) { const char *makeflags = getenv( "MAKEFLAGS" ); - struct incl_file *pFile; int i, j; if (makeflags) parse_makeflags( makeflags ); @@ -2323,6 +2272,11 @@ int main( int argc, char *argv[] ) exit( 0 ); } + if (argc <= 1) + { + fprintf( stderr, "%s", Usage ); + exit( 1 ); + } atexit( cleanup_files ); signal( SIGTERM, exit_on_signal ); signal( SIGINT, exit_on_signal ); @@ -2330,17 +2284,6 @@ int main( int argc, char *argv[] ) signal( SIGHUP, exit_on_signal ); #endif - if (parse_makefile_mode) - { - for (i = 1; i < argc; i++) update_makefile( argv[i] ); - exit( 0 ); - } - - init_paths(); - for (i = 1; i < argc; i++) add_src_file( argv[i] ); - add_generated_sources(); - - LIST_FOR_EACH_ENTRY( pFile, &includes, struct incl_file, entry ) parse_file( pFile, 0 ); - output_dependencies( makefile_name ); + for (i = 1; i < argc; i++) update_makefile( argv[i] ); return 0; }

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

Sebastian Lackner : kernel32/tests: Add a SRWLock test to simulate a typical use case.
by Alexandre Julliard 14 Jan '14

14 Jan '14

Module: wine Branch: master Commit: 0c77f89f61bda08e70ba9bd87beba6f7f9c990dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c77f89f61bda08e70ba9bd87… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat Jan 11 02:23:12 2014 +0100 kernel32/tests: Add a SRWLock test to simulate a typical use case. --- dlls/kernel32/tests/sync.c | 85 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 85 insertions(+) diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index 94ee200..6431df0 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -1919,6 +1919,90 @@ static void test_srwlock_base(void) } } +static SRWLOCK srwlock_example; +static LONG srwlock_protected_value = 0; +static LONG srwlock_example_errors = 0, srwlock_inside = 0, srwlock_cnt = 0; +static BOOL srwlock_stop = FALSE; + +static DWORD WINAPI srwlock_example_thread(LPVOID x) { + DWORD *cnt = x; + LONG old; + + while (!srwlock_stop) + { + + /* periodically request exclusive access */ + if (InterlockedIncrement(&srwlock_cnt) % 13 == 0) + { + pAcquireSRWLockExclusive(&srwlock_example); + if (InterlockedIncrement(&srwlock_inside) != 1) + InterlockedIncrement(&srwlock_example_errors); + + InterlockedIncrement(&srwlock_protected_value); + Sleep(1); + + if (InterlockedDecrement(&srwlock_inside) != 0) + InterlockedIncrement(&srwlock_example_errors); + pReleaseSRWLockExclusive(&srwlock_example); + } + + /* request shared access */ + pAcquireSRWLockShared(&srwlock_example); + InterlockedIncrement(&srwlock_inside); + old = srwlock_protected_value; + + (*cnt)++; + Sleep(1); + + if (old != srwlock_protected_value) + InterlockedIncrement(&srwlock_example_errors); + InterlockedDecrement(&srwlock_inside); + pReleaseSRWLockShared(&srwlock_example); + } + + return 0; +} + +static void test_srwlock_example(void) +{ + HANDLE h1, h2, h3; + DWORD dummy; + DWORD cnt1, cnt2, cnt3; + + if (!pInitializeSRWLock) { + /* function is not yet in XP, only in newer Windows */ + win_skip("no srw lock support.\n"); + return; + } + + pInitializeSRWLock(&srwlock_example); + + cnt1 = cnt2 = cnt3 = 0; + + h1 = CreateThread(NULL, 0, srwlock_example_thread, &cnt1, 0, &dummy); + h2 = CreateThread(NULL, 0, srwlock_example_thread, &cnt2, 0, &dummy); + h3 = CreateThread(NULL, 0, srwlock_example_thread, &cnt3, 0, &dummy); + + /* limit run to 1 second. */ + Sleep(1000); + + /* tear down start */ + srwlock_stop = TRUE; + + WaitForSingleObject(h1, 1000); + WaitForSingleObject(h2, 1000); + WaitForSingleObject(h3, 1000); + + ok(!srwlock_inside, "threads didn't terminate properly, srwlock_inside is %d.\n", srwlock_inside); + + todo_wine + ok(!srwlock_example_errors, "errors occured while running SRWLock example test (number of errors: %d)\n", + srwlock_example_errors); + + trace("number of shared accesses per thread are c1 %d, c2 %d, c3 %d\n", cnt1, cnt2, cnt3); + trace("number of total exclusive accesses is %d\n", srwlock_protected_value); +} + START_TEST(sync) { HMODULE hdll = GetModuleHandleA("kernel32.dll"); @@ -1959,4 +2043,5 @@ START_TEST(sync) test_condvars_base(); test_condvars_consumer_producer(); test_srwlock_base(); + test_srwlock_example(); }

1 0

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

14 Jan '14

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

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

14 Jan '14

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

Stefan Dösinger : wined3d: Re-enable mapping into the DIB.
by Alexandre Julliard 14 Jan '14

14 Jan '14

Module: wine Branch: master Commit: d0823eb4f0a2dca9cc54843dd9d5e0ba128f5899 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0823eb4f0a2dca9cc54843dd… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jan 14 13:59:25 2014 +0100 wined3d: Re-enable mapping into the DIB. --- dlls/wined3d/surface.c | 59 ++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 52 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index f59efb2..d70f605 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -579,6 +579,7 @@ static void surface_create_pbo(struct wined3d_surface *surface, const struct win if (!(surface->flags & SFLAG_CLIENT)) wined3d_resource_free_sysmem(&surface->resource); surface->flags |= SFLAG_PBO; + surface->map_binding = SFLAG_INSYSMEM; context_release(context); } @@ -820,6 +821,9 @@ static BYTE *surface_map(struct wined3d_surface *surface, const RECT *rect, DWOR case SFLAG_INUSERMEM: return surface->user_memory; + case SFLAG_INDIB: + return surface->dib.bitmap_data; + case SFLAG_INSYSMEM: if (surface->flags & SFLAG_PBO) { @@ -866,6 +870,9 @@ static void surface_unmap(struct wined3d_surface *surface) case SFLAG_INUSERMEM: break; + case SFLAG_INDIB: + break; + case SFLAG_INSYSMEM: if (surface->flags & SFLAG_PBO) { @@ -1297,16 +1304,33 @@ 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->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); + void *dst; + + if (surface->flags & SFLAG_DIBSECTION) + { + surface->map_binding = SFLAG_INDIB; + dst = surface->dib.bitmap_data; + if (surface->flags & SFLAG_INSYSMEM) + { + surface_invalidate_location(surface, SFLAG_INSYSMEM); + surface_validate_location(surface, SFLAG_INDIB); + } + } + 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); + + dst = 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.heap_memory)); + surface->resource.size, dst)); checkGLcall("glGetBufferSubDataARB"); GL_EXTCALL(glDeleteBuffersARB(1, &surface->pbo)); checkGLcall("glDeleteBuffersARB"); @@ -1455,6 +1479,7 @@ static HRESULT gdi_surface_private_setup(struct wined3d_surface *surface) hr = surface_create_dib_section(surface); if (FAILED(hr)) return hr; + surface->map_binding = SFLAG_INDIB; /* We don't mind the nonpow2 stuff in GDI. */ surface->pow2Width = surface->resource.width; @@ -1505,6 +1530,9 @@ static BYTE *gdi_surface_map(struct wined3d_surface *surface, const RECT *rect, case SFLAG_INUSERMEM: return surface->user_memory; + case SFLAG_INDIB: + return surface->dib.bitmap_data; + case SFLAG_INSYSMEM: return surface->resource.heap_memory; @@ -3242,6 +3270,9 @@ HRESULT CDECL wined3d_surface_getdc(struct wined3d_surface *surface, HDC *dc) hr = surface_create_dib_section(surface); if (FAILED(hr)) return WINED3DERR_INVALIDCALL; + if (!(surface->map_binding == SFLAG_INUSERMEM + || surface->flags & (SFLAG_PBO | SFLAG_PIN_SYSMEM))) + surface->map_binding = SFLAG_INDIB; } surface_load_location(surface, SFLAG_INDIB); @@ -6427,6 +6458,8 @@ static HRESULT surface_init(struct wined3d_surface *surface, struct wined3d_text if (lockable && (desc->usage & WINED3DUSAGE_RENDERTARGET)) surface->flags |= SFLAG_DYNLOCK; + surface->map_binding = SFLAG_INSYSMEM; + /* Call the private setup routine */ hr = surface->surface_ops->surface_private_setup(surface); if (FAILED(hr)) @@ -6437,7 +6470,19 @@ static HRESULT surface_init(struct wined3d_surface *surface, struct wined3d_text return hr; } - surface->map_binding = SFLAG_INSYSMEM; + /* 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))) + surface->map_binding = SFLAG_INDIB; + + if (surface->map_binding == SFLAG_INDIB) + { + wined3d_resource_free_sysmem(&surface->resource); + surface_validate_location(surface, SFLAG_INDIB); + surface_invalidate_location(surface, SFLAG_INSYSMEM); + } return hr; }

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

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

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