wine-commits November 2011

wine-commits@winehq.org

2 participants
852 discussions

Piotr Caban : msvcp90: Reorganize __ASM_EXCEPTION_VTABLE macro.
by Alexandre Julliard 25 Nov '11

25 Nov '11

Module: wine Branch: master Commit: 1c04cbfd336cc8867162468c8027f31492938a0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c04cbfd336cc8867162468c8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Nov 25 10:46:30 2011 +0100 msvcp90: Reorganize __ASM_EXCEPTION_VTABLE macro. --- dlls/msvcp90/exception.c | 26 +++++++++----------------- 1 files changed, 9 insertions(+), 17 deletions(-) diff --git a/dlls/msvcp90/exception.c b/dlls/msvcp90/exception.c index 00fb0f0..77e1e60 100644 --- a/dlls/msvcp90/exception.c +++ b/dlls/msvcp90/exception.c @@ -64,20 +64,12 @@ void WINAPI _CxxThrowException(exception*,const cxx_exception_type*); #ifdef _WIN64 -#define __ASM_EXCEPTION_VTABLE(name) \ - __ASM_VTABLE(name, "\t.quad " THISCALL_NAME(MSVCP_what_exception) ) - -#define __ASM_EXCEPTION_STRING_VTABLE(name) \ - __ASM_VTABLE(name, "\t.quad " THISCALL_NAME(MSVCP_logic_error_what) ) - +#define __ASM_EXCEPTION_VTABLE(name, what_func) \ + __ASM_VTABLE(name, "\t.quad " THISCALL_NAME(what_func) ) #else -#define __ASM_EXCEPTION_VTABLE(name) \ - __ASM_VTABLE(name, "\t.long " THISCALL_NAME(MSVCP_what_exception) ) - -#define __ASM_EXCEPTION_STRING_VTABLE(name) \ - __ASM_VTABLE(name, "\t.long " THISCALL_NAME(MSVCP_logic_error_what) ) - +#define __ASM_EXCEPTION_VTABLE(name, what_func) \ + __ASM_VTABLE(name, "\t.long " THISCALL_NAME(what_func) ) #endif /* _WIN64 */ extern const vtable_ptr MSVCP_bad_alloc_vtable; @@ -688,11 +680,11 @@ static const cxx_exception_type invalid_argument_cxx_type = { #ifndef __GNUC__ void __asm_dummy_vtables(void) { #endif - __ASM_EXCEPTION_VTABLE(bad_alloc); - __ASM_EXCEPTION_STRING_VTABLE(logic_error); - __ASM_EXCEPTION_STRING_VTABLE(length_error); - __ASM_EXCEPTION_STRING_VTABLE(out_of_range); - __ASM_EXCEPTION_STRING_VTABLE(invalid_argument); + __ASM_EXCEPTION_VTABLE(bad_alloc, MSVCP_what_exception); + __ASM_EXCEPTION_VTABLE(logic_error, MSVCP_logic_error_what); + __ASM_EXCEPTION_VTABLE(length_error, MSVCP_logic_error_what); + __ASM_EXCEPTION_VTABLE(out_of_range, MSVCP_logic_error_what); + __ASM_EXCEPTION_VTABLE(invalid_argument, MSVCP_logic_error_what); #ifndef __GNUC__ } #endif

1 0

Piotr Caban : msvcp90: Added _Timevec class implementation.
by Alexandre Julliard 25 Nov '11

25 Nov '11

Module: wine Branch: master Commit: 913b075b079fd117d533a6e197a2c8b58ab37148 URL: http://source.winehq.org/git/wine.git/?a=commit;h=913b075b079fd117d533a6e19… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Nov 25 10:46:18 2011 +0100 msvcp90: Added _Timevec class implementation. --- dlls/msvcp90/locale.c | 32 ++++++++++++++++++++------------ 1 files changed, 20 insertions(+), 12 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 29069e7..e928d3e 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -653,11 +653,14 @@ basic_string_char __thiscall locale_name(const locale *this) /* ??0_Timevec@std@@QAE@ABV01@@Z */ /* ??0_Timevec@std@@QEAA@AEBV01@@Z */ +/* This copy constructor modifies copied object */ DEFINE_THISCALL_WRAPPER(_Timevec_copy_ctor, 8) -_Timevec* __thiscall _Timevec_copy_ctor(_Timevec *this, const _Timevec *copy) +_Timevec* __thiscall _Timevec_copy_ctor(_Timevec *this, _Timevec *copy) { - FIXME("(%p %p) stub\n", this, copy); - return NULL; + TRACE("(%p %p)\n", this, copy); + this->timeptr = copy->timeptr; + copy->timeptr = NULL; + return this; } /* ??0_Timevec@std@@QAE@PAX@Z */ @@ -665,8 +668,9 @@ _Timevec* __thiscall _Timevec_copy_ctor(_Timevec *this, const _Timevec *copy) DEFINE_THISCALL_WRAPPER(_Timevec_ctor_timeptr, 8) _Timevec* __thiscall _Timevec_ctor_timeptr(_Timevec *this, void *timeptr) { - FIXME("(%p %p) stub\n", this, timeptr); - return NULL; + TRACE("(%p %p)\n", this, timeptr); + this->timeptr = timeptr; + return this; } /* ??_F_Timevec@std@@QAEXXZ */ @@ -674,8 +678,9 @@ _Timevec* __thiscall _Timevec_ctor_timeptr(_Timevec *this, void *timeptr) DEFINE_THISCALL_WRAPPER(_Timevec_ctor, 4) _Timevec* __thiscall _Timevec_ctor(_Timevec *this) { - FIXME("(%p) stub\n", this); - return NULL; + TRACE("(%p)\n", this); + this->timeptr = NULL; + return this; } /* ??1_Timevec@std@@QAE@XZ */ @@ -683,7 +688,8 @@ _Timevec* __thiscall _Timevec_ctor(_Timevec *this) DEFINE_THISCALL_WRAPPER(_Timevec_dtor, 4) void __thiscall _Timevec_dtor(_Timevec *this) { - FIXME("(%p) stub\n", this); + TRACE("(%p)\n", this); + MSVCRT_operator_delete(this->timeptr); } /* ??4_Timevec@std@@QAEAAV01@ABV01@@Z */ @@ -691,8 +697,10 @@ void __thiscall _Timevec_dtor(_Timevec *this) DEFINE_THISCALL_WRAPPER(_Timevec_op_assign, 8) _Timevec* __thiscall _Timevec_op_assign(_Timevec *this, _Timevec *right) { - FIXME("(%p %p) stub\n", this, right); - return NULL; + TRACE("(%p %p)\n", this, right); + this->timeptr = right->timeptr; + right->timeptr = NULL; + return this; } /* ?_Getptr@_Timevec@std@@QBEPAXXZ */ @@ -700,8 +708,8 @@ _Timevec* __thiscall _Timevec_op_assign(_Timevec *this, _Timevec *right) DEFINE_THISCALL_WRAPPER(_Timevec__Getptr, 4) void* __thiscall _Timevec__Getptr(_Timevec *this) { - FIXME("(%p) stub\n", this); - return NULL; + TRACE("(%p)\n", this); + return this->timeptr; } /* ?_Locinfo_ctor@_Locinfo@std@@SAXPAV12@ABV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@2@@Z */

1 0

Piotr Caban : msvcp90: Added locale::name implementation.
by Alexandre Julliard 25 Nov '11

25 Nov '11

Module: wine Branch: master Commit: e10dcd0c328d7ed26e6d38f25bb87f9603938ccc URL: http://source.winehq.org/git/wine.git/?a=commit;h=e10dcd0c328d7ed26e6d38f25… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Nov 25 10:46:06 2011 +0100 msvcp90: Added locale::name implementation. --- dlls/msvcp90/locale.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index f985136..29069e7 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -647,9 +647,8 @@ const locale* __cdecl locale_classic(void) DEFINE_THISCALL_WRAPPER_RETPTR(locale_name, 4) basic_string_char __thiscall locale_name(const locale *this) { - basic_string_char ret = { 0 }; /* FIXME */ - FIXME( "(%p) stub\n", this); - return ret; + TRACE( "(%p)\n", this); + return this->ptr->name; } /* ??0_Timevec@std@@QAE@ABV01@@Z */

1 0

Piotr Caban : msvcp90: Added locale::_Addfac implementation.
by Alexandre Julliard 25 Nov '11

25 Nov '11

Module: wine Branch: master Commit: 2e449eba0851bef828039dd129bbeb1ca2deae36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e449eba0851bef828039dd12… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Nov 25 10:45:55 2011 +0100 msvcp90: Added locale::_Addfac implementation. --- dlls/msvcp90/locale.c | 23 +++++++++++++++++++++-- 1 files changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 61a3353..f985136 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -579,8 +579,27 @@ MSVCP_bool __thiscall locale_operator_not_equal(const locale *this, locale const DEFINE_THISCALL_WRAPPER(locale__Addfac, 16) locale* __thiscall locale__Addfac(locale *this, locale_facet *facet, MSVCP_size_t id, MSVCP_size_t catmask) { - FIXME("(%p %p %lu %lu) stub\n", this, facet, id, catmask); - return NULL; + TRACE("(%p %p %lu %lu)\n", this, facet, id, catmask); + + if(this->ptr->facet.refs > 1) { + locale__Locimp *new_ptr = MSVCRT_operator_new(sizeof(locale__Locimp)); + if(!new_ptr) { + ERR("Out of memory\n"); + throw_exception(EXCEPTION_BAD_ALLOC, NULL); + return NULL; + } + locale__Locimp_copy_ctor(new_ptr, this->ptr); + locale_facet__Decref(&this->ptr->facet); + this->ptr = new_ptr; + } + + locale__Locimp__Addfac(this->ptr, facet, id); + + if(catmask) { + MSVCP_basic_string_char_dtor(&this->ptr->name); + MSVCP_basic_string_char_ctor_cstr(&this->ptr->name, "*"); + } + return this; } /* ?_Getfacet@locale@std@@QBEPBVfacet@12@I@Z */

1 0

Piotr Caban : msvcp90: Added locale copy based constructors implementation.
by Alexandre Julliard 25 Nov '11

25 Nov '11

Module: wine Branch: master Commit: 1263b618d7945e817b70a85560c69850e5a881e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1263b618d7945e817b70a8556… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Nov 25 10:45:41 2011 +0100 msvcp90: Added locale copy based constructors implementation. --- dlls/msvcp90/locale.c | 29 ++++++++++++++++++++++------- 1 files changed, 22 insertions(+), 7 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index f05cc79..61a3353 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -274,15 +274,18 @@ locale__Locimp* __thiscall locale__Locimp_ctor(locale__Locimp *this) DEFINE_THISCALL_WRAPPER(locale__Locimp_copy_ctor, 8) locale__Locimp* __thiscall locale__Locimp_copy_ctor(locale__Locimp *this, const locale__Locimp *copy) { + _Lockit lock; MSVCP_size_t i; TRACE("(%p %p)\n", this, copy); + _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); memcpy(this, copy, sizeof(locale__Locimp)); locale_facet_ctor_refs(&this->facet, 1); if(copy->facetvec) { this->facetvec = MSVCRT_operator_new(copy->facet_cnt*sizeof(locale_facet*)); if(!this->facetvec) { + _Lockit_dtor(&lock); ERR("Out of memory\n"); throw_exception(EXCEPTION_BAD_ALLOC, NULL); return NULL; @@ -292,6 +295,7 @@ locale__Locimp* __thiscall locale__Locimp_copy_ctor(locale__Locimp *this, const locale_facet__Incref(this->facetvec[i]); } MSVCP_basic_string_char_copy_ctor(&this->name, &copy->name); + _Lockit_dtor(&lock); return this; } @@ -351,8 +355,11 @@ locale__Locimp* __thiscall MSVCP_locale__Locimp_vector_dtor(locale__Locimp *this /* ?_Locimp_Addfac@_Locimp@locale@std@@CAXPEAV123@PEAVfacet@23@_K@Z */ void __cdecl locale__Locimp__Locimp_Addfac(locale__Locimp *locimp, locale_facet *facet, MSVCP_size_t id) { + _Lockit lock; + TRACE("(%p %p %lu)\n", locimp, facet, id); + _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); if(id >= locimp->facet_cnt) { MSVCP_size_t new_size = id+1; locale_facet **new_facetvec; @@ -362,6 +369,7 @@ void __cdecl locale__Locimp__Locimp_Addfac(locale__Locimp *locimp, locale_facet new_facetvec = MSVCRT_operator_new(sizeof(locale_facet*)*new_size); if(!new_facetvec) { + _Lockit_dtor(&lock); ERR("Out of memory\n"); throw_exception(EXCEPTION_BAD_ALLOC, NULL); return; @@ -380,6 +388,7 @@ void __cdecl locale__Locimp__Locimp_Addfac(locale__Locimp *locimp, locale_facet locimp->facetvec[id] = facet; if(facet) locale_facet__Incref(facet); + _Lockit_dtor(&lock); } /* ?_Addfac@_Locimp@locale@std@@AAEXPAVfacet@23@I@Z */ @@ -437,8 +446,10 @@ const vtable_ptr MSVCP_locale__Locimp_vtable[] = { DEFINE_THISCALL_WRAPPER(locale_ctor_locimp, 8) locale* __thiscall locale_ctor_locimp(locale *this, locale__Locimp *locimp) { - FIXME("(%p %p) stub\n", this, locimp); - return NULL; + TRACE("(%p %p)\n", this, locimp); + /* Don't change locimp reference counter */ + this->ptr = locimp; + return this; } /* ??0locale@std@@QAE@ABV01@0H@Z */ @@ -455,8 +466,10 @@ locale* __thiscall locale_ctor_locale_locale(locale *this, const locale *loc, co DEFINE_THISCALL_WRAPPER(locale_copy_ctor, 8) locale* __thiscall locale_copy_ctor(locale *this, const locale *copy) { - FIXME("(%p %p) stub\n", this, copy); - return NULL; + TRACE("(%p %p)\n", this, copy); + this->ptr = copy->ptr; + locale_facet__Incref(&this->ptr->facet); + return this; } /* ??0locale@std@@QAE@ABV01@PBDH@Z */ @@ -482,8 +495,9 @@ locale* __thiscall locale_ctor_cstr(locale *this, const char *locname, category DEFINE_THISCALL_WRAPPER(locale_ctor_uninitialized, 8) locale* __thiscall locale_ctor_uninitialized(locale *this, int uninitialized) { - FIXME("(%p %d) stub\n", this, uninitialized); - return NULL; + TRACE("(%p)\n", this); + this->ptr = NULL; + return this; } /* ??0locale@std@@QAE@XZ */ @@ -509,7 +523,8 @@ DEFINE_THISCALL_WRAPPER(locale_dtor, 4) void __thiscall locale_dtor(locale *this) { TRACE("(%p)\n", this); - locale__Locimp_dtor(this->ptr); + if(this->ptr) + locale__Locimp_dtor(this->ptr); } DEFINE_THISCALL_WRAPPER(MSVCP_locale_vector_dtor, 8)

1 0

Henri Verbeet : wined3d: Get rid of the WINED3DVERTEXELEMENT typedef.
by Alexandre Julliard 25 Nov '11

25 Nov '11

Module: wine Branch: master Commit: 6a529e58471deb15be72eb248c8a69dfcde78419 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a529e58471deb15be72eb248… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 24 22:52:36 2011 +0100 wined3d: Get rid of the WINED3DVERTEXELEMENT typedef. --- dlls/d3d10core/inputlayout.c | 6 +++--- dlls/d3d8/vertexdeclaration.c | 8 ++++---- dlls/d3d9/vertexdeclaration.c | 8 ++++---- dlls/wined3d/vertexdeclaration.c | 19 ++++++++++--------- include/wine/wined3d.h | 6 +++--- 5 files changed, 24 insertions(+), 23 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6a529e58471deb15be72e…

1 0

Henri Verbeet : wined3d: Get rid of the WINED3DCLIPSTATUS typedef.
by Alexandre Julliard 25 Nov '11

25 Nov '11

Module: wine Branch: master Commit: 1c74172a28586e408d6224638cc1311f28f9238f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c74172a28586e408d6224638… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 24 22:52:35 2011 +0100 wined3d: Get rid of the WINED3DCLIPSTATUS typedef. --- dlls/d3d8/device.c | 6 +++--- dlls/d3d9/device.c | 4 ++-- dlls/wined3d/device.c | 6 ++++-- include/wine/wined3d.h | 14 ++++++++------ 4 files changed, 17 insertions(+), 13 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index eb398ab..c003993 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1648,10 +1648,10 @@ static HRESULT WINAPI IDirect3DDevice8Impl_SetClipStatus(IDirect3DDevice8 *iface HRESULT hr; TRACE("iface %p, clip_status %p.\n", iface, pClipStatus); -/* FIXME: Verify that D3DCLIPSTATUS8 ~= WINED3DCLIPSTATUS */ + /* FIXME: Verify that D3DCLIPSTATUS8 ~= struct wined3d_clip_status. */ wined3d_mutex_lock(); - hr = wined3d_device_set_clip_status(This->wined3d_device, (const WINED3DCLIPSTATUS *)pClipStatus); + hr = wined3d_device_set_clip_status(This->wined3d_device, (const struct wined3d_clip_status *)pClipStatus); wined3d_mutex_unlock(); return hr; @@ -1666,7 +1666,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetClipStatus(IDirect3DDevice8 *iface TRACE("iface %p, clip_status %p.\n", iface, pClipStatus); wined3d_mutex_lock(); - hr = wined3d_device_get_clip_status(This->wined3d_device, (WINED3DCLIPSTATUS *)pClipStatus); + hr = wined3d_device_get_clip_status(This->wined3d_device, (struct wined3d_clip_status *)pClipStatus); wined3d_mutex_unlock(); return hr; diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 32215c5..49a3215 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1580,7 +1580,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_SetClipStatus(IDirect3DDevice9Ex *ifa TRACE("iface %p, clip_status %p.\n", iface, pClipStatus); wined3d_mutex_lock(); - hr = wined3d_device_set_clip_status(This->wined3d_device, (const WINED3DCLIPSTATUS *)pClipStatus); + hr = wined3d_device_set_clip_status(This->wined3d_device, (const struct wined3d_clip_status *)pClipStatus); wined3d_mutex_unlock(); return hr; @@ -1595,7 +1595,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetClipStatus(IDirect3DDevice9Ex *ifa TRACE("iface %p, clip_status %p.\n", iface, pClipStatus); wined3d_mutex_lock(); - hr = wined3d_device_get_clip_status(This->wined3d_device, (WINED3DCLIPSTATUS *)pClipStatus); + hr = wined3d_device_get_clip_status(This->wined3d_device, (struct wined3d_clip_status *)pClipStatus); wined3d_mutex_unlock(); return hr; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e12f48a..6e35c0a 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2260,7 +2260,8 @@ HRESULT CDECL wined3d_device_get_clip_plane(const struct wined3d_device *device, return WINED3D_OK; } -HRESULT CDECL wined3d_device_set_clip_status(struct wined3d_device *device, const WINED3DCLIPSTATUS *clip_status) +HRESULT CDECL wined3d_device_set_clip_status(struct wined3d_device *device, + const struct wined3d_clip_status *clip_status) { FIXME("device %p, clip_status %p stub!\n", device, clip_status); @@ -2270,7 +2271,8 @@ HRESULT CDECL wined3d_device_set_clip_status(struct wined3d_device *device, cons return WINED3D_OK; } -HRESULT CDECL wined3d_device_get_clip_status(const struct wined3d_device *device, WINED3DCLIPSTATUS *clip_status) +HRESULT CDECL wined3d_device_get_clip_status(const struct wined3d_device *device, + struct wined3d_clip_status *clip_status) { FIXME("device %p, clip_status %p stub!\n", device, clip_status); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 5bcc35b..a68e0d3 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1667,11 +1667,11 @@ struct wined3d_resource_desc UINT size; }; -typedef struct _WINED3DCLIPSTATUS +struct wined3d_clip_status { - DWORD ClipUnion; - DWORD ClipIntersection; -} WINED3DCLIPSTATUS; + DWORD clip_union; + DWORD clip_intersection; +}; typedef struct _WINED3DVERTEXELEMENT { @@ -2200,7 +2200,8 @@ HRESULT __cdecl wined3d_device_get_back_buffer(const struct wined3d_device *devi UINT backbuffer_idx, WINED3DBACKBUFFER_TYPE backbuffer_type, struct wined3d_surface **backbuffer); INT __cdecl wined3d_device_get_base_vertex_index(const struct wined3d_device *device); HRESULT __cdecl wined3d_device_get_clip_plane(const struct wined3d_device *device, UINT plane_idx, float *plane); -HRESULT __cdecl wined3d_device_get_clip_status(const struct wined3d_device *device, WINED3DCLIPSTATUS *clip_status); +HRESULT __cdecl wined3d_device_get_clip_status(const struct wined3d_device *device, + struct wined3d_clip_status *clip_status); HRESULT __cdecl wined3d_device_get_creation_parameters(const struct wined3d_device *device, WINED3DDEVICE_CREATION_PARAMETERS *creation_parameters); HRESULT __cdecl wined3d_device_get_depth_stencil(const struct wined3d_device *device, @@ -2280,7 +2281,8 @@ HRESULT __cdecl wined3d_device_reset(struct wined3d_device *device, void __cdecl wined3d_device_restore_fullscreen_window(struct wined3d_device *device, HWND window); HRESULT __cdecl wined3d_device_set_base_vertex_index(struct wined3d_device *device, INT base_index); HRESULT __cdecl wined3d_device_set_clip_plane(struct wined3d_device *device, UINT plane_idx, const float *plane); -HRESULT __cdecl wined3d_device_set_clip_status(struct wined3d_device *device, const WINED3DCLIPSTATUS *clip_status); +HRESULT __cdecl wined3d_device_set_clip_status(struct wined3d_device *device, + const struct wined3d_clip_status *clip_status); void __cdecl wined3d_device_set_cursor_position(struct wined3d_device *device, int x_screen_space, int y_screen_space, DWORD flags); HRESULT __cdecl wined3d_device_set_cursor_properties(struct wined3d_device *device,

1 0

Henri Verbeet : wined3d: Handle changing the backbuffer format in wined3d_device_reset().
by Alexandre Julliard 25 Nov '11

25 Nov '11

Module: wine Branch: master Commit: 094f64c823ed65629ebbec78a4b1f5e4583c0142 URL: http://source.winehq.org/git/wine.git/?a=commit;h=094f64c823ed65629ebbec78a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 24 22:52:34 2011 +0100 wined3d: Handle changing the backbuffer format in wined3d_device_reset(). --- dlls/wined3d/device.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d165806..e12f48a 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5241,6 +5241,8 @@ static HRESULT updateSurfaceDesc(struct wined3d_surface *surface, while (surface->pow2Height < pPresentationParameters->BackBufferHeight) surface->pow2Height <<= 1; } + if (!(surface->resource.usage & WINED3DUSAGE_DEPTHSTENCIL)) + surface->resource.format = wined3d_get_format(gl_info, pPresentationParameters->BackBufferFormat); surface->resource.multisample_type = pPresentationParameters->MultiSampleType; surface->resource.multisample_quality = pPresentationParameters->MultiSampleQuality; @@ -5498,10 +5500,6 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, && present_parameters->BackBufferCount != swapchain->presentParms.BackBufferCount) FIXME("Cannot change the back buffer count yet.\n"); - if (present_parameters->BackBufferFormat != WINED3DFMT_UNKNOWN - && present_parameters->BackBufferFormat != swapchain->presentParms.BackBufferFormat) - FIXME("Cannot change the back buffer format yet.\n"); - if (present_parameters->hDeviceWindow && present_parameters->hDeviceWindow != swapchain->presentParms.hDeviceWindow) FIXME("Cannot change the device window yet.\n"); @@ -5572,6 +5570,13 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, update_desc = TRUE; } + if (present_parameters->BackBufferFormat != WINED3DFMT_UNKNOWN + && present_parameters->BackBufferFormat != swapchain->presentParms.BackBufferFormat) + { + swapchain->presentParms.BackBufferFormat = present_parameters->BackBufferFormat; + update_desc = TRUE; + } + if (present_parameters->MultiSampleType != swapchain->presentParms.MultiSampleType || present_parameters->MultiSampleQuality != swapchain->presentParms.MultiSampleQuality) {

1 0

Henri Verbeet : wined3d: Use the correct backbuffer format in wined3d_device_reset().
by Alexandre Julliard 25 Nov '11

25 Nov '11

Module: wine Branch: master Commit: f51bf61d2fa3fc1ba6a9f9da9a365a9c7415b850 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f51bf61d2fa3fc1ba6a9f9da9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 24 22:52:33 2011 +0100 wined3d: Use the correct backbuffer format in wined3d_device_reset(). --- dlls/wined3d/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 3737abb..d165806 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5556,7 +5556,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, mode.width = present_parameters->BackBufferWidth; mode.height = present_parameters->BackBufferHeight; mode.refresh_rate = present_parameters->FullScreen_RefreshRateInHz; - mode.format_id = swapchain->presentParms.BackBufferFormat; + mode.format_id = present_parameters->BackBufferFormat; } /* Should Width == 800 && Height == 0 set 800x600? */

1 0

Henri Verbeet : wined3d: Don't apply fixups to converted surfaces.
by Alexandre Julliard 25 Nov '11

25 Nov '11

Module: wine Branch: master Commit: 24775459c8892b8e92f42ac9a66946f50b0b1190 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24775459c8892b8e92f42ac9a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 24 22:52:32 2011 +0100 wined3d: Don't apply fixups to converted surfaces. --- dlls/wined3d/arb_program_shader.c | 9 +++++++++ dlls/wined3d/surface.c | 3 ++- 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 451d34a..b2fa29c 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7137,6 +7137,15 @@ static HRESULT arbfp_blit_set(void *blit_priv, struct wined3d_context *context, GLenum textype = surface->texture_target; const struct wined3d_gl_info *gl_info = context->gl_info; + if (surface->flags & SFLAG_CONVERTED) + { + ENTER_GL(); + glEnable(textype); + checkGLcall("glEnable(textype)"); + LEAVE_GL(); + return WINED3D_OK; + } + if (!is_complex_fixup(surface->resource.format->color_fixup)) { TRACE("Fixup:\n"); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 865f83e..4c9cc84 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -6229,7 +6229,8 @@ static HRESULT ffp_blit_set(void *blit_priv, struct wined3d_context *context, co /* When EXT_PALETTED_TEXTURE is around, palette conversion is done by the GPU * else the surface is converted in software at upload time in LoadLocation. */ - if(fixup == COMPLEX_FIXUP_P8 && context->gl_info->supported[EXT_PALETTED_TEXTURE]) + if (!(surface->flags & SFLAG_CONVERTED) && fixup == COMPLEX_FIXUP_P8 + && context->gl_info->supported[EXT_PALETTED_TEXTURE]) ffp_blit_p8_upload_palette(surface, context->gl_info); ENTER_GL();

1 0

← Newer
1
...
11
12
13
14
15
16
17
...
86
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 November 2011