wine-commits February 2016

wine-commits@winehq.org

2 participants
755 discussions

Piotr Caban : msvcp120/tests: Added _Pad class tests.
by Alexandre Julliard 24 Feb '16

24 Feb '16

Module: wine Branch: master Commit: 00210255acfe13df1c5d51f5a4dc15b962d57877 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00210255acfe13df1c5d51f5a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Feb 23 13:13:28 2016 +0100 msvcp120/tests: Added _Pad class tests. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp120/tests/msvcp120.c | 205 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 204 insertions(+), 1 deletion(-) diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index 682b4d1..c310b89 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -24,6 +24,54 @@ #include "wine/test.h" #include "winbase.h" +#undef __thiscall +#ifdef __i386__ +#define __thiscall __stdcall +#else +#define __thiscall __cdecl +#endif + +/* Emulate a __thiscall */ +#ifdef __i386__ + +#include "pshpack1.h" +struct thiscall_thunk +{ + BYTE pop_eax; /* popl %eax (ret addr) */ + BYTE pop_edx; /* popl %edx (func) */ + BYTE pop_ecx; /* popl %ecx (this) */ + BYTE push_eax; /* pushl %eax */ + WORD jmp_edx; /* jmp *%edx */ +}; +#include "poppack.h" + +static void * (WINAPI *call_thiscall_func1)( void *func, void *this ); +static void * (WINAPI *call_thiscall_func2)( void *func, void *this, const void *a ); + +static void init_thiscall_thunk(void) +{ + struct thiscall_thunk *thunk = VirtualAlloc( NULL, sizeof(*thunk), + MEM_COMMIT, PAGE_EXECUTE_READWRITE ); + thunk->pop_eax = 0x58; /* popl %eax */ + thunk->pop_edx = 0x5a; /* popl %edx */ + thunk->pop_ecx = 0x59; /* popl %ecx */ + thunk->push_eax = 0x50; /* pushl %eax */ + thunk->jmp_edx = 0xe2ff; /* jmp *%edx */ + call_thiscall_func1 = (void *)thunk; + call_thiscall_func2 = (void *)thunk; +} + +#define call_func1(func,_this) call_thiscall_func1(func,_this) +#define call_func2(func,_this,a) call_thiscall_func2(func,_this,(const void*)(a)) + +#else + +#define init_thiscall_thunk() +#define call_func1(func,_this) func(_this) +#define call_func2(func,_this,a) func(_this,a) + +#endif /* __i386__ */ + static inline float __port_infinity(void) { static const unsigned __inf_bytes = 0x7f800000; @@ -170,7 +218,30 @@ static _Thrd_t __cdecl i386_Thrd_current(void) #endif /* mtx */ -typedef void *_Mtx_t; +typedef struct cs_queue +{ + struct cs_queue *next; + BOOL free; + int unknown; +} cs_queue; + +typedef struct +{ + ULONG_PTR unk_thread_id; + cs_queue unk_active; + void *unknown[2]; + cs_queue *head; + void *tail; +} critical_section; + +typedef struct +{ + DWORD flags; + critical_section cs; + DWORD thread_id; + DWORD count; +} *_Mtx_t; + static int (__cdecl *p__Mtx_init)(_Mtx_t*, int); static void (__cdecl *p__Mtx_destroy)(_Mtx_t*); static int (__cdecl *p__Mtx_lock)(_Mtx_t*); @@ -186,6 +257,23 @@ static int (__cdecl *p__Cnd_timedwait)(_Cnd_t*, _Mtx_t*, const xtime*); static int (__cdecl *p__Cnd_broadcast)(_Cnd_t*); static int (__cdecl *p__Cnd_signal)(_Cnd_t*); +/* _Pad */ +typedef void (*vtable_ptr)(void); + +typedef struct +{ + const vtable_ptr *vtable; + _Cnd_t cnd; + _Mtx_t mtx; + MSVCP_bool launched; +} _Pad; + +static _Pad* (__thiscall *p__Pad_ctor)(_Pad*); +static _Pad* (__thiscall *p__Pad_copy_ctor)(_Pad*, const _Pad*); +static void (__thiscall *p__Pad_dtor)(_Pad*); +static _Pad* (__thiscall *p__Pad_op_assign)(_Pad*, const _Pad*); +static void (__thiscall *p__Pad__Launch)(_Pad*, _Thrd_t*); +static void (__thiscall *p__Pad__Release)(_Pad*); static HMODULE msvcp; #define SETNOFAIL(x,y) x = (void*)GetProcAddress(msvcp,y) @@ -282,6 +370,18 @@ static BOOL init(void) "?_Unlink@sys@tr2@std@@YAHPEBD@Z"); SET(p__Thrd_current, "_Thrd_current"); + SET(p__Pad_ctor, + "??0_Pad@std@@QEAA@XZ"); + SET(p__Pad_copy_ctor, + "??0_Pad@std@@QEAA@AEBV01@@Z"); + SET(p__Pad_dtor, + "??1_Pad@std@@QEAA@XZ"); + SET(p__Pad_op_assign, + "??4_Pad@std@@QEAAAEAV01@AEBV01@@Z"); + SET(p__Pad__Launch, + "?_Launch@_Pad@std@@QEAAXPEAU_Thrd_imp_t@@@Z"); + SET(p__Pad__Release, + "?_Release@_Pad@std@@QEAAXXZ"); } else { SET(p_tr2_sys__File_size, "?_File_size@sys@tr2@std@@YA_KPBD@Z"); @@ -347,9 +447,33 @@ static BOOL init(void) SET(p_i386_Thrd_current, "_Thrd_current"); p__Thrd_current = i386_Thrd_current; + SET(p__Pad_ctor, + "??0_Pad@std@@QAE@XZ"); + SET(p__Pad_copy_ctor, + "??0_Pad@std@@QAE@ABV01@@Z"); + SET(p__Pad_dtor, + "??1_Pad@std@@QAE@XZ"); + SET(p__Pad_op_assign, + "??4_Pad@std@@QAEAAV01@ABV01@@Z"); + SET(p__Pad__Launch, + "?_Launch@_Pad@std@@QAEXPAU_Thrd_imp_t@@@Z"); + SET(p__Pad__Release, + "?_Release@_Pad@std@@QAEXXZ"); #else SET(p__Thrd_current, "_Thrd_current"); + SET(p__Pad_ctor, + "??0_Pad@std@@QAA@XZ"); + SET(p__Pad_copy_ctor, + "??0_Pad@std@@QAA@ABV01@@Z"); + SET(p__Pad_dtor, + "??1_Pad@std@@QAA@XZ"); + SET(p__Pad_op_assign, + "??4_Pad@std@@QAAAAV01@ABV01@@Z"); + SET(p__Pad__Launch, + "?_Launch@_Pad@std@@QAAXPAU_Thrd_imp_t@@@Z"); + SET(p__Pad__Release, + "?_Release@_Pad@std@@QAAXXZ"); #endif } SET(p__Thrd_equal, @@ -389,6 +513,8 @@ static BOOL init(void) p_setlocale = (void*)GetProcAddress(msvcr, "setlocale"); p__setmbcp = (void*)GetProcAddress(msvcr, "_setmbcp"); p_isleadbyte = (void*)GetProcAddress(msvcr, "isleadbyte"); + + init_thiscall_thunk(); return TRUE; } @@ -1805,6 +1931,82 @@ static void test_vbtable_size_exports(void) } } +HANDLE _Pad__Launch_returned; +_Pad pad; +#ifdef __i386__ +/* TODO: this should be a __thiscall function */ +static unsigned int __stdcall vtbl_func__Go(void) +#else +static unsigned int __cdecl vtbl_func__Go(_Pad *this) +#endif +{ + DWORD ret; + + ret = WaitForSingleObject(_Pad__Launch_returned, 100); + ok(ret == WAIT_TIMEOUT, "WiatForSingleObject returned %x\n", ret); + ok(!pad.mtx->count, "pad.mtx.count = %d\n", pad.mtx->count); + ok(!pad.launched, "pad.launched = %x\n", pad.launched); + call_func1(p__Pad__Release, &pad); + ok(pad.launched, "pad.launched = %x\n", pad.launched); + ret = WaitForSingleObject(_Pad__Launch_returned, 100); + ok(ret == WAIT_OBJECT_0, "WiatForSingleObject returned %x\n", ret); + ok(pad.mtx->count == 1, "pad.mtx.count = %d\n", pad.mtx->count); + return 0; +} + +static void test__Pad(void) +{ + _Pad pad_copy; + _Thrd_t thrd; + vtable_ptr pfunc = (vtable_ptr)&vtbl_func__Go; + + _Pad__Launch_returned = CreateEventW(NULL, FALSE, FALSE, NULL); + + pad.vtable = (void*)1; + pad.cnd = (void*)2; + pad.mtx = (void*)3; + pad.launched = TRUE; + memset(&pad_copy, 0, sizeof(pad_copy)); + call_func2(p__Pad_copy_ctor, &pad_copy, &pad); + ok(pad_copy.vtable != (void*)1, "pad_copy.vtable was not set\n"); + ok(pad_copy.cnd == (void*)2, "pad_copy.cnd = %p\n", pad_copy.cnd); + ok(pad_copy.mtx == (void*)3, "pad_copy.mtx = %p\n", pad_copy.mtx); + ok(pad_copy.launched, "pad_copy.launched = %x\n", pad_copy.launched); + + memset(&pad_copy, 0xde, sizeof(pad_copy)); + pad_copy.vtable = (void*)4; + pad_copy.cnd = (void*)5; + pad_copy.mtx = (void*)6; + pad_copy.launched = FALSE; + call_func2(p__Pad_op_assign, &pad_copy, &pad); + ok(pad_copy.vtable == (void*)4, "pad_copy.vtable was set\n"); + ok(pad_copy.cnd == (void*)2, "pad_copy.cnd = %p\n", pad_copy.cnd); + ok(pad_copy.mtx == (void*)3, "pad_copy.mtx = %p\n", pad_copy.mtx); + ok(pad_copy.launched, "pad_copy.launched = %x\n", pad_copy.launched); + + call_func1(p__Pad_ctor, &pad); + call_func2(p__Pad_copy_ctor, &pad_copy, &pad); + ok(pad.vtable == pad_copy.vtable, "pad.vtable = %p, pad_copy.vtable = %p\n", pad.vtable, pad_copy.vtable); + ok(pad.cnd == pad_copy.cnd, "pad.cnd = %p, pad_copy.cnd = %p\n", pad.cnd, pad_copy.cnd); + ok(pad.mtx == pad_copy.mtx, "pad.mtx = %p, pad_copy.mtx = %p\n", pad.mtx, pad_copy.mtx); + ok(pad.launched == pad_copy.launched, "pad.launched = %x, pad_copy.launched = %x\n", pad.launched, pad_copy.launched); + call_func1(p__Pad_dtor, &pad); + /* call_func1(p__Pad_dtor, &pad_copy); - copy constructor is broken, this causes a crash */ + + memset(&pad, 0xfe, sizeof(pad)); + call_func1(p__Pad_ctor, &pad); + ok(!pad.launched, "pad.launched = %x\n", pad.launched); + ok(pad.mtx->count == 1, "pad.mtx.count = %d\n", pad.mtx->count); + + pad.vtable = &pfunc; + call_func2(p__Pad__Launch, &pad, &thrd); + SetEvent(_Pad__Launch_returned); + ok(!p__Thrd_join(thrd, NULL), "_Thrd_join failed\n"); + + call_func1(p__Pad_dtor, &pad); + CloseHandle(_Pad__Launch_returned); +} + START_TEST(msvcp120) { if(!init()) return; @@ -1835,6 +2037,7 @@ START_TEST(msvcp120) test_thrd(); test_cnd(); + test__Pad(); test_vbtable_size_exports();

1 0

Piotr Caban : msvcp110: Add _Pad implementation.
by Alexandre Julliard 24 Feb '16

24 Feb '16

Module: wine Branch: master Commit: 289daa665d0cb5afae5f2ce1744fa8eae6db6e66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=289daa665d0cb5afae5f2ce17… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Feb 23 13:13:18 2016 +0100 msvcp110: Add _Pad implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/misc.c | 61 ++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 46 insertions(+), 15 deletions(-) diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index c911867..fa4ff7b 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -892,8 +892,14 @@ extern const vtable_ptr MSVCP__Pad_vtable; DEFINE_THISCALL_WRAPPER(_Pad_ctor, 4) _Pad* __thiscall _Pad_ctor(_Pad *this) { - FIXME("(%p) stub\n", this); - return NULL; + TRACE("(%p)\n", this); + + this->vtable = &MSVCP__Pad_vtable; + _Cnd_init(&this->cnd); + _Mtx_init(&this->mtx, 0); + this->launched = FALSE; + _Mtx_lock(&this->mtx); + return this; } /* ??4_Pad@std@@QAEAAV01@ABV01@@Z */ @@ -901,8 +907,12 @@ _Pad* __thiscall _Pad_ctor(_Pad *this) DEFINE_THISCALL_WRAPPER(_Pad_op_assign, 8) _Pad* __thiscall _Pad_op_assign(_Pad *this, const _Pad *copy) { - FIXME("(%p %p) stub\n", this, copy); - return NULL; + TRACE("(%p %p)\n", this, copy); + + this->cnd = copy->cnd; + this->mtx = copy->mtx; + this->launched = copy->launched; + return this; } /* ??0_Pad@std@@QAE@ABV01@@Z */ @@ -910,8 +920,10 @@ _Pad* __thiscall _Pad_op_assign(_Pad *this, const _Pad *copy) DEFINE_THISCALL_WRAPPER(_Pad_copy_ctor, 8) _Pad* __thiscall _Pad_copy_ctor(_Pad *this, const _Pad *copy) { - FIXME("(%p %p) stub\n", this, copy); - return NULL; + TRACE("(%p %p)\n", this, copy); + + this->vtable = &MSVCP__Pad_vtable; + return _Pad_op_assign(this, copy); } /* ??1_Pad@std@@QAE@XZ */ @@ -919,7 +931,25 @@ _Pad* __thiscall _Pad_copy_ctor(_Pad *this, const _Pad *copy) DEFINE_THISCALL_WRAPPER(_Pad_dtor, 4) void __thiscall _Pad_dtor(_Pad *this) { - FIXME("(%p) stub\n", this); + TRACE("(%p)\n", this); + + _Mtx_unlock(&this->mtx); + _Mtx_destroy(&this->mtx); + _Cnd_destroy(&this->cnd); +} + +DEFINE_THISCALL_WRAPPER(_Pad__Go, 4) +#define call__Pad__Go(this) CALL_VTBL_FUNC(this, 0, unsigned int, (_Pad*), (this)) +unsigned int __thiscall _Pad__Go(_Pad *this) +{ + ERR("(%p) should not be called\n", this); + return 0; +} + +static DWORD WINAPI launch_thread_proc(void *arg) +{ + _Pad *this = arg; + return call__Pad__Go(this); } /* ?_Launch@_Pad@std@@QAEXPAU_Thrd_imp_t@@@Z */ @@ -927,7 +957,10 @@ void __thiscall _Pad_dtor(_Pad *this) DEFINE_THISCALL_WRAPPER(_Pad__Launch, 8) void __thiscall _Pad__Launch(_Pad *this, _Thrd_t *thr) { - FIXME("(%p %p) stub\n", this, thr); + TRACE("(%p %p)\n", this, thr); + + _Thrd_start(thr, launch_thread_proc, this); + _Cnd_wait(&this->cnd, &this->mtx); } /* ?_Release@_Pad@std@@QAEXXZ */ @@ -935,14 +968,12 @@ void __thiscall _Pad__Launch(_Pad *this, _Thrd_t *thr) DEFINE_THISCALL_WRAPPER(_Pad__Release, 4) void __thiscall _Pad__Release(_Pad *this) { - FIXME("(%p) stub\n", this); -} + TRACE("(%p)\n", this); -DEFINE_THISCALL_WRAPPER(_Pad__Go, 4) -unsigned int __thiscall _Pad__Go(_Pad *this) -{ - ERR("(%p) should not be called\n", this); - return 0; + _Mtx_lock(&this->mtx); + this->launched = TRUE; + _Cnd_signal(&this->cnd); + _Mtx_unlock(&this->mtx); } #endif

1 0

Piotr Caban : msvcp110: Add _Pad class stub.
by Alexandre Julliard 24 Feb '16

24 Feb '16

Module: wine Branch: master Commit: c97cb06f895d7792dd4cab585a5b3b2d7e6145a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c97cb06f895d7792dd4cab585… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Feb 23 13:13:13 2016 +0100 msvcp110: Add _Pad class stub. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp110/msvcp110.spec | 38 ++++----- dlls/msvcp120/msvcp120.spec | 38 ++++----- dlls/msvcp120_app/msvcp120_app.spec | 38 ++++----- dlls/msvcp90/misc.c | 152 +++++++++++++++++++++++++++--------- 4 files changed, 173 insertions(+), 93 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c97cb06f895d7792dd4ca…

1 0

Piotr Caban : msvcp120: Add _Thrd_start implementation.
by Alexandre Julliard 24 Feb '16

24 Feb '16

Module: wine Branch: master Commit: fb7af057a16ce9d01a358dc0adaf9935d581b9aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb7af057a16ce9d01a358dc0a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Feb 23 13:13:07 2016 +0100 msvcp120: Add _Thrd_start implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp110/msvcp110.spec | 2 +- dlls/msvcp120/msvcp120.spec | 2 +- dlls/msvcp120_app/msvcp120_app.spec | 2 +- dlls/msvcp90/misc.c | 35 +++++++++++++++++++++++++++++++++-- 4 files changed, 36 insertions(+), 5 deletions(-) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index ae11097..52d292c 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -3864,7 +3864,7 @@ @ cdecl _Thrd_join(ptr long) @ cdecl _Thrd_lt(ptr ptr) @ cdecl _Thrd_sleep(ptr) -@ stub _Thrd_start +@ cdecl _Thrd_start(ptr ptr ptr) @ cdecl _Thrd_yield() @ cdecl _Tolower(long ptr) @ cdecl _Toupper(long ptr) diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index e78d5ea..c70939b 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -3811,7 +3811,7 @@ @ cdecl _Thrd_join(ptr long) @ cdecl _Thrd_lt(ptr ptr) @ cdecl _Thrd_sleep(ptr) -@ stub _Thrd_start +@ cdecl _Thrd_start(ptr ptr ptr) @ cdecl _Thrd_yield() @ cdecl _Tolower(long ptr) @ cdecl _Toupper(long ptr) diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index 0330d53..6b6e24c 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -3811,7 +3811,7 @@ @ cdecl _Thrd_join(ptr long) msvcp120._Thrd_join @ cdecl _Thrd_lt(ptr ptr) msvcp120._Thrd_lt @ cdecl _Thrd_sleep(ptr) msvcp120._Thrd_sleep -@ stub _Thrd_start +@ cdecl _Thrd_start(ptr ptr ptr) msvcp120._Thrd_start @ cdecl _Thrd_yield() msvcp120._Thrd_yield @ cdecl _Tolower(long ptr) msvcp120._Tolower @ cdecl _Toupper(long ptr) msvcp120._Toupper diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index b2adc72..a9efe0a 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -872,10 +872,41 @@ int __cdecl _Thrd_join(_Thrd_t thr, int *code) return 0; } +int __cdecl _Thrd_start(_Thrd_t *thr, LPTHREAD_START_ROUTINE proc, void *arg) +{ + TRACE("(%p %p %p)\n", thr, proc, arg); + thr->hnd = CreateThread(NULL, 0, proc, arg, 0, &thr->id); + return thr->hnd ? 0 : _THRD_ERROR; +} + +typedef struct +{ + _Thrd_start_t proc; + void *arg; +} thread_proc_arg; + +static DWORD WINAPI thread_proc_wrapper(void *arg) +{ + thread_proc_arg wrapped_arg = *((thread_proc_arg*)arg); + free(arg); + return wrapped_arg.proc(wrapped_arg.arg); +} + int __cdecl _Thrd_create(_Thrd_t *thr, _Thrd_start_t proc, void *arg) { + thread_proc_arg *wrapped_arg; + int ret; + TRACE("(%p %p %p)\n", thr, proc, arg); - thr->hnd = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE)proc, arg, 0, &thr->id); - return !thr->hnd; + + wrapped_arg = malloc(sizeof(*wrapped_arg)); + if(!wrapped_arg) + return _THRD_ERROR; /* TODO: probably different error should be returned here */ + + wrapped_arg->proc = proc; + wrapped_arg->arg = arg; + ret = _Thrd_start(thr, thread_proc_wrapper, wrapped_arg); + if(ret) free(wrapped_arg); + return ret; } #endif

1 0

Henri Verbeet : d3d9: Use wined3d_texture_get_sub_resource_parent in d3d9_texture_cube_LockRect ().
by Alexandre Julliard 24 Feb '16

24 Feb '16

Module: wine Branch: master Commit: a020fe383e1051546b5b10e792b73c0d4741ca0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a020fe383e1051546b5b10e79… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 23 18:22:02 2016 +0100 d3d9: Use wined3d_texture_get_sub_resource_parent in d3d9_texture_cube_LockRect(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/texture.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index 8856538..523ad92 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -754,7 +754,6 @@ static HRESULT WINAPI d3d9_texture_cube_LockRect(IDirect3DCubeTexture9 *iface, DWORD flags) { struct d3d9_texture *texture = impl_from_IDirect3DCubeTexture9(iface); - struct wined3d_resource *sub_resource; struct d3d9_surface *surface_impl; UINT sub_resource_idx; HRESULT hr; @@ -764,13 +763,10 @@ static HRESULT WINAPI d3d9_texture_cube_LockRect(IDirect3DCubeTexture9 *iface, wined3d_mutex_lock(); sub_resource_idx = wined3d_texture_get_level_count(texture->wined3d_texture) * face + level; - if (!(sub_resource = wined3d_texture_get_sub_resource(texture->wined3d_texture, sub_resource_idx))) + if (!(surface_impl = wined3d_texture_get_sub_resource_parent(texture->wined3d_texture, sub_resource_idx))) hr = D3DERR_INVALIDCALL; else - { - surface_impl = wined3d_resource_get_parent(sub_resource); hr = IDirect3DSurface9_LockRect(&surface_impl->IDirect3DSurface9_iface, locked_rect, rect, flags); - } wined3d_mutex_unlock(); return hr;

1 0

Henri Verbeet : d3d9: Use wined3d_texture_get_sub_resource_parent() in d3d9_texture_2d_GetSurfaceLevel().
by Alexandre Julliard 24 Feb '16

24 Feb '16

Module: wine Branch: master Commit: 92f1afc0453b51a6305b13724106caa1761994eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=92f1afc0453b51a6305b13724… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 23 18:22:01 2016 +0100 d3d9: Use wined3d_texture_get_sub_resource_parent() in d3d9_texture_2d_GetSurfaceLevel(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/texture.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index 762dcba..8856538 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -316,19 +316,17 @@ static HRESULT WINAPI d3d9_texture_2d_GetSurfaceLevel(IDirect3DTexture9 *iface, UINT level, IDirect3DSurface9 **surface) { struct d3d9_texture *texture = impl_from_IDirect3DTexture9(iface); - struct wined3d_resource *sub_resource; struct d3d9_surface *surface_impl; TRACE("iface %p, level %u, surface %p.\n", iface, level, surface); wined3d_mutex_lock(); - if (!(sub_resource = wined3d_texture_get_sub_resource(texture->wined3d_texture, level))) + if (!(surface_impl = wined3d_texture_get_sub_resource_parent(texture->wined3d_texture, level))) { wined3d_mutex_unlock(); return D3DERR_INVALIDCALL; } - surface_impl = wined3d_resource_get_parent(sub_resource); *surface = &surface_impl->IDirect3DSurface9_iface; IDirect3DSurface9_AddRef(*surface); wined3d_mutex_unlock();

1 0

Henri Verbeet : d3d9: Use wined3d_texture_get_sub_resource_parent() in d3d9_texture_2d_UnlockRect().
by Alexandre Julliard 24 Feb '16

24 Feb '16

Module: wine Branch: master Commit: 75c3a08eb2684d3466a28bee7faf40a9ac9249e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75c3a08eb2684d3466a28bee7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 23 18:22:00 2016 +0100 d3d9: Use wined3d_texture_get_sub_resource_parent() in d3d9_texture_2d_UnlockRect(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/texture.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index ccf85f1..762dcba 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -359,20 +359,16 @@ static HRESULT WINAPI d3d9_texture_2d_LockRect(IDirect3DTexture9 *iface, static HRESULT WINAPI d3d9_texture_2d_UnlockRect(IDirect3DTexture9 *iface, UINT level) { struct d3d9_texture *texture = impl_from_IDirect3DTexture9(iface); - struct wined3d_resource *sub_resource; struct d3d9_surface *surface_impl; HRESULT hr; TRACE("iface %p, level %u.\n", iface, level); wined3d_mutex_lock(); - if (!(sub_resource = wined3d_texture_get_sub_resource(texture->wined3d_texture, level))) + if (!(surface_impl = wined3d_texture_get_sub_resource_parent(texture->wined3d_texture, level))) hr = D3DERR_INVALIDCALL; else - { - surface_impl = wined3d_resource_get_parent(sub_resource); hr = IDirect3DSurface9_UnlockRect(&surface_impl->IDirect3DSurface9_iface); - } wined3d_mutex_unlock(); return hr;

1 0

Henri Verbeet : d3d9: Use wined3d_texture_get_sub_resource_parent() in d3d9_texture_2d_LockRect().
by Alexandre Julliard 24 Feb '16

24 Feb '16

Module: wine Branch: master Commit: 8e2efc65e7aea2afb84304b2c629b55d60f633cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e2efc65e7aea2afb84304b2c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 23 18:21:59 2016 +0100 d3d9: Use wined3d_texture_get_sub_resource_parent() in d3d9_texture_2d_LockRect(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/texture.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index be6fd9f..ccf85f1 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -340,7 +340,6 @@ static HRESULT WINAPI d3d9_texture_2d_LockRect(IDirect3DTexture9 *iface, UINT level, D3DLOCKED_RECT *locked_rect, const RECT *rect, DWORD flags) { struct d3d9_texture *texture = impl_from_IDirect3DTexture9(iface); - struct wined3d_resource *sub_resource; struct d3d9_surface *surface_impl; HRESULT hr; @@ -348,13 +347,10 @@ static HRESULT WINAPI d3d9_texture_2d_LockRect(IDirect3DTexture9 *iface, iface, level, locked_rect, rect, flags); wined3d_mutex_lock(); - if (!(sub_resource = wined3d_texture_get_sub_resource(texture->wined3d_texture, level))) + if (!(surface_impl = wined3d_texture_get_sub_resource_parent(texture->wined3d_texture, level))) hr = D3DERR_INVALIDCALL; else - { - surface_impl = wined3d_resource_get_parent(sub_resource); hr = IDirect3DSurface9_LockRect(&surface_impl->IDirect3DSurface9_iface, locked_rect, rect, flags); - } wined3d_mutex_unlock(); return hr;

1 0

Henri Verbeet : d3d9: Use wined3d_texture_get_sub_resource_parent() in d3d9_swapchain_GetBackBuffer().
by Alexandre Julliard 24 Feb '16

24 Feb '16

Module: wine Branch: master Commit: a81152df36d96754dd3ce81c6860079d1a90e489 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a81152df36d96754dd3ce81c6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 23 18:21:58 2016 +0100 d3d9: Use wined3d_texture_get_sub_resource_parent() in d3d9_swapchain_GetBackBuffer(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/swapchain.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/d3d9/swapchain.c b/dlls/d3d9/swapchain.c index 91a22a3..b9343aa 100644 --- a/dlls/d3d9/swapchain.c +++ b/dlls/d3d9/swapchain.c @@ -152,7 +152,6 @@ static HRESULT WINAPI d3d9_swapchain_GetBackBuffer(IDirect3DSwapChain9Ex *iface, UINT backbuffer_idx, D3DBACKBUFFER_TYPE backbuffer_type, IDirect3DSurface9 **backbuffer) { struct d3d9_swapchain *swapchain = impl_from_IDirect3DSwapChain9Ex(iface); - struct wined3d_resource *wined3d_resource; struct wined3d_texture *wined3d_texture; struct d3d9_surface *surface_impl; HRESULT hr = D3D_OK; @@ -171,8 +170,7 @@ static HRESULT WINAPI d3d9_swapchain_GetBackBuffer(IDirect3DSwapChain9Ex *iface, wined3d_mutex_lock(); if ((wined3d_texture = wined3d_swapchain_get_back_buffer(swapchain->wined3d_swapchain, backbuffer_idx))) { - wined3d_resource = wined3d_texture_get_sub_resource(wined3d_texture, 0); - surface_impl = wined3d_resource_get_parent(wined3d_resource); + surface_impl = wined3d_texture_get_sub_resource_parent(wined3d_texture, 0); *backbuffer = &surface_impl->IDirect3DSurface9_iface; IDirect3DSurface9_AddRef(*backbuffer); }

1 0

Stefan Dösinger : wined3d: Remove fbo_entry-> d3d_depth_stencil.
by Alexandre Julliard 24 Feb '16

24 Feb '16

Module: wine Branch: master Commit: 928cb58aa85080bfb652e84ef18615d972e39cc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=928cb58aa85080bfb652e84ef… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Sun Feb 21 21:30:01 2016 +0000 wined3d: Remove fbo_entry->d3d_depth_stencil. Signed-off-by: Stefan Dösinger <stefandoesinger(a)gmx.at> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 56 ++++++++++++++++++++++-------------------- dlls/wined3d/wined3d_private.h | 7 ++++-- 2 files changed, 34 insertions(+), 29 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index d04a246..b7b8648 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -103,15 +103,15 @@ static void context_destroy_fbo(struct wined3d_context *context, GLuint fbo) } static void context_attach_depth_stencil_rb(const struct wined3d_gl_info *gl_info, - GLenum fbo_target, DWORD format_flags, GLuint rb) + GLenum fbo_target, DWORD flags, GLuint rb) { - if (format_flags & WINED3DFMT_FLAG_DEPTH) + if (flags & WINED3D_FBO_ENTRY_FLAG_DEPTH) { gl_info->fbo_ops.glFramebufferRenderbuffer(fbo_target, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER, rb); checkGLcall("glFramebufferRenderbuffer()"); } - if (format_flags & WINED3DFMT_FLAG_STENCIL) + if (flags & WINED3D_FBO_ENTRY_FLAG_STENCIL) { gl_info->fbo_ops.glFramebufferRenderbuffer(fbo_target, GL_STENCIL_ATTACHMENT, GL_RENDERBUFFER, rb); checkGLcall("glFramebufferRenderbuffer()"); @@ -121,7 +121,7 @@ static void context_attach_depth_stencil_rb(const struct wined3d_gl_info *gl_inf /* Context activation is done by the caller. */ static void context_attach_depth_stencil_fbo(struct wined3d_context *context, GLenum fbo_target, const struct wined3d_fbo_resource *resource, BOOL rb_namespace, - DWORD format_flags) + DWORD flags) { const struct wined3d_gl_info *gl_info = context->gl_info; @@ -132,18 +132,18 @@ static void context_attach_depth_stencil_fbo(struct wined3d_context *context, if (rb_namespace) { context_attach_depth_stencil_rb(gl_info, fbo_target, - format_flags, resource->object); + flags, resource->object); } else { - if (format_flags & WINED3DFMT_FLAG_DEPTH) + if (flags & WINED3D_FBO_ENTRY_FLAG_DEPTH) { gl_info->fbo_ops.glFramebufferTexture2D(fbo_target, GL_DEPTH_ATTACHMENT, resource->target, resource->object, resource->level); checkGLcall("glFramebufferTexture2D()"); } - if (format_flags & WINED3DFMT_FLAG_STENCIL) + if (flags & WINED3D_FBO_ENTRY_FLAG_STENCIL) { gl_info->fbo_ops.glFramebufferTexture2D(fbo_target, GL_STENCIL_ATTACHMENT, resource->target, resource->object, resource->level); @@ -151,13 +151,13 @@ static void context_attach_depth_stencil_fbo(struct wined3d_context *context, } } - if (!(format_flags & WINED3DFMT_FLAG_DEPTH)) + if (!(flags & WINED3D_FBO_ENTRY_FLAG_DEPTH)) { gl_info->fbo_ops.glFramebufferTexture2D(fbo_target, GL_DEPTH_ATTACHMENT, GL_TEXTURE_2D, 0, 0); checkGLcall("glFramebufferTexture2D()"); } - if (!(format_flags & WINED3DFMT_FLAG_STENCIL)) + if (!(flags & WINED3D_FBO_ENTRY_FLAG_STENCIL)) { gl_info->fbo_ops.glFramebufferTexture2D(fbo_target, GL_STENCIL_ATTACHMENT, GL_TEXTURE_2D, 0, 0); checkGLcall("glFramebufferTexture2D()"); @@ -412,9 +412,15 @@ static struct fbo_entry *context_create_fbo_entry(const struct wined3d_context * FIELD_OFFSET(struct fbo_entry, key.objects[object_count])); memset(&entry->key, 0, FIELD_OFFSET(struct wined3d_fbo_entry_key, objects[object_count])); context_generate_fbo_key(context, &entry->key, render_targets, depth_stencil, color_location, ds_location); - entry->d3d_depth_stencil = depth_stencil; + entry->flags = 0; + if (depth_stencil) + { + if (depth_stencil->container->resource.format_flags & WINED3DFMT_FLAG_DEPTH) + entry->flags |= WINED3D_FBO_ENTRY_FLAG_DEPTH; + if (depth_stencil->container->resource.format_flags & WINED3DFMT_FLAG_STENCIL) + entry->flags |= WINED3D_FBO_ENTRY_FLAG_STENCIL; + } entry->rt_mask = context_generate_rt_mask(GL_COLOR_ATTACHMENT0); - entry->attached = FALSE; gl_info->fbo_ops.glGenFramebuffers(1, &entry->id); checkGLcall("glGenFramebuffers()"); TRACE("Created FBO %u.\n", entry->id); @@ -433,8 +439,14 @@ static void context_reuse_fbo_entry(struct wined3d_context *context, GLenum targ context_clean_fbo_attachments(gl_info, target); context_generate_fbo_key(context, &entry->key, render_targets, depth_stencil, color_location, ds_location); - entry->d3d_depth_stencil = depth_stencil; - entry->attached = FALSE; + entry->flags = 0; + if (depth_stencil) + { + if (depth_stencil->container->resource.format_flags & WINED3DFMT_FLAG_DEPTH) + entry->flags |= WINED3D_FBO_ENTRY_FLAG_DEPTH; + if (depth_stencil->container->resource.format_flags & WINED3DFMT_FLAG_STENCIL) + entry->flags |= WINED3D_FBO_ENTRY_FLAG_STENCIL; + } } /* Context activation is done by the caller. */ @@ -544,9 +556,8 @@ static void context_apply_fbo_entry(struct wined3d_context *context, GLenum targ const struct wined3d_gl_info *gl_info = context->gl_info; unsigned int i; GLuint read_binding, draw_binding; - struct wined3d_surface *depth_stencil = entry->d3d_depth_stencil; - if (entry->attached) + if (entry->flags & WINED3D_FBO_ENTRY_FLAG_ATTACHED) { context_bind_fbo(context, target, entry->id); return; @@ -563,17 +574,8 @@ static void context_apply_fbo_entry(struct wined3d_context *context, GLenum targ entry->key.rb_namespace & (1 << (i + 1))); } - if (depth_stencil) - { - DWORD format_flags = depth_stencil->container->resource.format_flags; - context_attach_depth_stencil_fbo(context, target, &entry->key.objects[0], - entry->key.rb_namespace & 0x1, format_flags); - } - else - { - static const struct wined3d_fbo_resource resource = {0}; - context_attach_depth_stencil_fbo(context, target, &resource, FALSE, 0); - } + context_attach_depth_stencil_fbo(context, target, &entry->key.objects[0], + entry->key.rb_namespace & 0x1, entry->flags); /* Set valid read and draw buffer bindings to satisfy pedantic pre-ES2_compatibility * GL contexts requirements. */ @@ -587,7 +589,7 @@ static void context_apply_fbo_entry(struct wined3d_context *context, GLenum targ context_bind_fbo(context, GL_READ_FRAMEBUFFER, read_binding); } - entry->attached = TRUE; + entry->flags |= WINED3D_FBO_ENTRY_FLAG_ATTACHED; } /* Context activation is done by the caller. */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d7ea23d..eef58a3 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2482,12 +2482,15 @@ struct wined3d_fbo_resource GLuint level, target; }; +#define WINED3D_FBO_ENTRY_FLAG_ATTACHED 0x1 +#define WINED3D_FBO_ENTRY_FLAG_DEPTH 0x2 +#define WINED3D_FBO_ENTRY_FLAG_STENCIL 0x4 + struct fbo_entry { struct list entry; - struct wined3d_surface *d3d_depth_stencil; + DWORD flags; DWORD rt_mask; - BOOL attached; GLuint id; struct wined3d_fbo_entry_key {

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
76
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 February 2016