March 2016 - Wine-Commits - list.winehq.org

Piotr Caban : msvcrt: Add __CxxRegisterExceptionObject implementation.
by Alexandre Julliard March 17, 2016

March 17, 2016

Module: wine Branch: master Commit: 11ccffea08f993aaf94aa1b2a36dd3594e5a9d43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11ccffea08f993aaf94aa1b2a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 16 21:02:04 2016 +0100 msvcrt: Add __CxxRegisterExceptionObject implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-private-l1-1-0.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/except.c | 23 ++++++++++++++++++++++ dlls/msvcrt/msvcrt.h | 7 +++++++ dlls/msvcrt/msvcrt.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 2 +- dlls/vcruntime140/vcruntime140.spec | 2 +- 14 files changed, 42 insertions(+), 12 deletions(-) diff --git a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec index f26b932..2fa639c 100644 --- a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec +++ b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec @@ -22,7 +22,7 @@ @ cdecl -arch=i386,x86_64,arm -norelay __CxxFrameHandler3(ptr ptr ptr ptr) ucrtbase.__CxxFrameHandler3 @ stdcall -arch=i386 __CxxLongjmpUnwind(ptr) ucrtbase.__CxxLongjmpUnwind @ cdecl -arch=i386,x86_64,arm __CxxQueryExceptionSize() ucrtbase.__CxxQueryExceptionSize -@ stub __CxxRegisterExceptionObject +@ cdecl __CxxRegisterExceptionObject(ptr ptr) ucrtbase.__CxxRegisterExceptionObject @ stub __CxxUnregisterExceptionObject @ stub __DestructExceptionObject @ stub __FrameUnwindFilter diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 33473b8..cfce956 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -554,7 +554,7 @@ @ cdecl -arch=i386,x86_64,arm -norelay __CxxFrameHandler3(ptr ptr ptr ptr) __CxxFrameHandler @ stdcall -arch=i386 __CxxLongjmpUnwind(ptr) @ cdecl -arch=i386,x86_64,arm __CxxQueryExceptionSize() -@ stub __CxxRegisterExceptionObject +@ cdecl __CxxRegisterExceptionObject(ptr ptr) @ stub __CxxUnregisterExceptionObject @ stub __DestructExceptionObject @ stub __FrameUnwindFilter diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 6299a4f..84b50e1 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -881,7 +881,7 @@ @ cdecl -arch=i386,x86_64,arm -norelay __CxxFrameHandler3(ptr ptr ptr ptr) __CxxFrameHandler @ stdcall -arch=i386 __CxxLongjmpUnwind(ptr) @ cdecl -arch=i386,x86_64,arm __CxxQueryExceptionSize() -@ stub __CxxRegisterExceptionObject +@ cdecl __CxxRegisterExceptionObject(ptr ptr) @ stub __CxxUnregisterExceptionObject @ stub __DestructExceptionObject @ stub __FrameUnwindFilter diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index bb1ae34..29c6965 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -865,7 +865,7 @@ @ cdecl -arch=i386,x86_64,arm -norelay __CxxFrameHandler3(ptr ptr ptr ptr) __CxxFrameHandler @ stdcall -arch=i386 __CxxLongjmpUnwind(ptr) @ cdecl -arch=i386,x86_64,arm __CxxQueryExceptionSize() -@ stub __CxxRegisterExceptionObject +@ cdecl __CxxRegisterExceptionObject(ptr ptr) @ stub __CxxUnregisterExceptionObject @ stub __DestructExceptionObject @ stub __FrameUnwindFilter diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 694230f..51d3ef0 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -859,7 +859,7 @@ @ cdecl -arch=i386,x86_64,arm -norelay __CxxFrameHandler3(ptr ptr ptr ptr) msvcr120.__CxxFrameHandler3 @ stdcall -arch=i386 __CxxLongjmpUnwind(ptr) msvcr120.__CxxLongjmpUnwind @ cdecl -arch=i386,x86_64,arm __CxxQueryExceptionSize() msvcr120.__CxxQueryExceptionSize -@ stub __CxxRegisterExceptionObject +@ cdecl __CxxRegisterExceptionObject(ptr ptr) msvcr120.__CxxRegisterExceptionObject @ stub __CxxUnregisterExceptionObject @ stub __DestructExceptionObject @ stub __FrameUnwindFilter diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index e1911d0..a4e0279 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -123,7 +123,7 @@ @ cdecl -arch=i386,x86_64,arm -norelay __CxxFrameHandler(ptr ptr ptr ptr) @ stdcall -arch=i386 __CxxLongjmpUnwind(ptr) @ cdecl -arch=i386,x86_64,arm __CxxQueryExceptionSize() -@ stub __CxxRegisterExceptionObject +@ cdecl __CxxRegisterExceptionObject(ptr ptr) @ stub __CxxUnregisterExceptionObject @ stub __DestructExceptionObject @ cdecl __RTCastToVoid(ptr) MSVCRT___RTCastToVoid diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index c3ed3a4..31d80b2 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -118,7 +118,7 @@ @ cdecl -arch=i386,x86_64,arm -norelay __CxxFrameHandler(ptr ptr ptr ptr) @ stdcall -arch=i386 __CxxLongjmpUnwind(ptr) @ cdecl -arch=i386,x86_64,arm __CxxQueryExceptionSize() -@ stub __CxxRegisterExceptionObject +@ cdecl __CxxRegisterExceptionObject(ptr ptr) @ stub __CxxUnregisterExceptionObject @ stub __DestructExceptionObject @ cdecl __RTCastToVoid(ptr) MSVCRT___RTCastToVoid diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index ccf7357..36d1058 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -188,7 +188,7 @@ @ cdecl -arch=i386,x86_64,arm -norelay __CxxFrameHandler3(ptr ptr ptr ptr) __CxxFrameHandler @ stdcall -arch=i386 __CxxLongjmpUnwind(ptr) @ cdecl -arch=i386,x86_64,arm __CxxQueryExceptionSize() -@ stub __CxxRegisterExceptionObject +@ cdecl __CxxRegisterExceptionObject(ptr ptr) @ stub __CxxUnregisterExceptionObject @ stub __DestructExceptionObject @ stub __FrameUnwindFilter diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 43de82a..56448bc 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -179,7 +179,7 @@ @ cdecl -arch=i386,x86_64,arm -norelay __CxxFrameHandler3(ptr ptr ptr ptr) __CxxFrameHandler @ stdcall -arch=i386 __CxxLongjmpUnwind(ptr) @ cdecl -arch=i386,x86_64,arm __CxxQueryExceptionSize() -@ stub __CxxRegisterExceptionObject +@ cdecl __CxxRegisterExceptionObject(ptr ptr) @ stub __CxxUnregisterExceptionObject @ stub __DestructExceptionObject @ stub __FrameUnwindFilter diff --git a/dlls/msvcrt/except.c b/dlls/msvcrt/except.c index ec923b1..a7ae0da 100644 --- a/dlls/msvcrt/except.c +++ b/dlls/msvcrt/except.c @@ -369,3 +369,26 @@ void CDECL _FindAndUnlinkFrame(frame_info *fi) ERR("frame not found, native crashes in this case\n"); } + +/********************************************************************* + * __CxxRegisterExceptionObject (MSVCRT.@) + */ +BOOL CDECL __CxxRegisterExceptionObject(EXCEPTION_RECORD **rec, cxx_frame_info *frame_info) +{ + thread_data_t *data = msvcrt_get_thread_data(); + + TRACE("(%p, %p)\n", rec, frame_info); + + if (!rec || !*rec) + { + frame_info->rec = (void*)-1; + frame_info->unk = (void*)-1; + return TRUE; + } + + frame_info->rec = data->exc_record; + frame_info->unk = 0; + data->exc_record = *rec; + _CreateFrameInfo(&frame_info->frame_info, (void*)(*rec)->ExceptionInformation[1]); + return TRUE; +} diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 64a7ab9..d0893fd 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -210,6 +210,13 @@ typedef struct _frame_info struct _frame_info *next; } frame_info; +typedef struct +{ + frame_info frame_info; + EXCEPTION_RECORD *rec; + void *unk; +} cxx_frame_info; + /* TLS data */ extern DWORD msvcrt_tls_index DECLSPEC_HIDDEN; diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 67b5c8c..a96ac35 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -184,7 +184,7 @@ @ cdecl -arch=i386,x86_64,arm -norelay __CxxFrameHandler3(ptr ptr ptr ptr) __CxxFrameHandler @ stdcall -arch=i386 __CxxLongjmpUnwind(ptr) @ cdecl -arch=i386,x86_64,arm __CxxQueryExceptionSize() -# stub __CxxRegisterExceptionObject +@ cdecl __CxxRegisterExceptionObject(ptr ptr) # stub __CxxUnregisterExceptionObject # stub __DestructExceptionObject @ cdecl __RTCastToVoid(ptr) MSVCRT___RTCastToVoid diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 44b62a7..d286bf3 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -56,7 +56,7 @@ @ cdecl -arch=i386,x86_64,arm -norelay __CxxFrameHandler3(ptr ptr ptr ptr) __CxxFrameHandler @ stdcall -arch=i386 __CxxLongjmpUnwind(ptr) @ cdecl -arch=i386,x86_64,arm __CxxQueryExceptionSize() -@ stub __CxxRegisterExceptionObject +@ cdecl __CxxRegisterExceptionObject(ptr ptr) @ stub __CxxUnregisterExceptionObject @ stub __DestructExceptionObject @ stub __FrameUnwindFilter diff --git a/dlls/vcruntime140/vcruntime140.spec b/dlls/vcruntime140/vcruntime140.spec index ea58694..2ba8f1e 100644 --- a/dlls/vcruntime140/vcruntime140.spec +++ b/dlls/vcruntime140/vcruntime140.spec @@ -19,7 +19,7 @@ @ cdecl -arch=i386,x86_64,arm -norelay __CxxFrameHandler3(ptr ptr ptr ptr) ucrtbase.__CxxFrameHandler3 @ stdcall -arch=i386 __CxxLongjmpUnwind(ptr) ucrtbase.__CxxLongjmpUnwind @ cdecl -arch=i386,x86_64,arm __CxxQueryExceptionSize() ucrtbase.__CxxQueryExceptionSize -@ stub __CxxRegisterExceptionObject +@ cdecl __CxxRegisterExceptionObject(ptr ptr) ucrtbase.__CxxRegisterExceptionObject @ stub __CxxUnregisterExceptionObject @ stub __DestructExceptionObject @ stub __FrameUnwindFilter

1 0

Piotr Caban : msvcr80: Add _FindAndUnlinkFrame implementation.
by Alexandre Julliard March 17, 2016

March 17, 2016

Module: wine Branch: master Commit: 29f547d2ce03b4ffcccc2e4405d337a6d44cd3e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29f547d2ce03b4ffcccc2e440… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 16 21:01:55 2016 +0100 msvcr80: Add _FindAndUnlinkFrame implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-private-l1-1-0.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/except.c | 28 ++++++++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- dlls/vcruntime140/vcruntime140.spec | 2 +- 10 files changed, 37 insertions(+), 9 deletions(-) diff --git a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec index 619425f..f26b932 100644 --- a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec +++ b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec @@ -1,7 +1,7 @@ @ cdecl _CreateFrameInfo(ptr ptr) ucrtbase._CreateFrameInfo @ stdcall _CxxThrowException(long long) ucrtbase._CxxThrowException @ cdecl -arch=i386 -norelay _EH_prolog() ucrtbase._EH_prolog -@ stub _FindAndUnlinkFrame +@ cdecl _FindAndUnlinkFrame(ptr) ucrtbase._FindAndUnlinkFrame @ stub _GetImageBase @ stub _GetThrowImageBase @ cdecl -arch=i386,x86_64,arm _IsExceptionObjectToBeDestroyed(ptr) ucrtbase._IsExceptionObjectToBeDestroyed diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 7d6886a..33473b8 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -525,7 +525,7 @@ @ cdecl _CreateFrameInfo(ptr ptr) @ stdcall _CxxThrowException(long long) @ cdecl -arch=i386 -norelay _EH_prolog() -@ stub _FindAndUnlinkFrame +@ cdecl _FindAndUnlinkFrame(ptr) @ cdecl _Getdays() @ cdecl _Getmonths() @ cdecl _Gettnames() diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 73b84e7..6299a4f 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -846,7 +846,7 @@ @ stdcall _CxxThrowException(long long) @ cdecl -arch=i386 -norelay _EH_prolog() @ stub -arch=arm _FPE_Raise -@ stub _FindAndUnlinkFrame +@ cdecl _FindAndUnlinkFrame(ptr) @ stub -arch=win64 _GetImageBase @ stub -arch=win64 _GetThrowImageBase @ cdecl _Getdays() diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 7b274c9..bb1ae34 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -830,7 +830,7 @@ @ cdecl -arch=i386 -norelay _EH_prolog() @ stub -arch=arm _FPE_Raise @ stub _FCbuild -@ stub _FindAndUnlinkFrame +@ cdecl _FindAndUnlinkFrame(ptr) @ stub -arch=win64 _GetImageBase @ stub -arch=win64 _GetThrowImageBase @ cdecl _Getdays() diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index dffe875..694230f 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -824,7 +824,7 @@ @ cdecl -arch=i386 -norelay _EH_prolog() msvcr120._EH_prolog @ stub -arch=arm _FPE_Raise @ stub _FCbuild -@ stub _FindAndUnlinkFrame +@ cdecl _FindAndUnlinkFrame(ptr) msvcr120._FindAndUnlinkFrame @ stub -arch=win64 _GetImageBase @ stub -arch=win64 _GetThrowImageBase @ cdecl _Getdays() msvcr120._Getdays diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 1035b62..ccf7357 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -155,7 +155,7 @@ @ cdecl _CreateFrameInfo(ptr ptr) @ stdcall _CxxThrowException(long long) @ cdecl -arch=i386 -norelay _EH_prolog() -@ stub _FindAndUnlinkFrame +@ cdecl _FindAndUnlinkFrame(ptr) @ stub -arch=win64 _GetImageBase @ stub -arch=win64 _GetThrowImageBase @ cdecl _Getdays() diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index cac6775..43de82a 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -152,7 +152,7 @@ @ cdecl _CreateFrameInfo(ptr ptr) @ stdcall _CxxThrowException(long long) @ cdecl -arch=i386 -norelay _EH_prolog() -@ stub _FindAndUnlinkFrame +@ cdecl _FindAndUnlinkFrame(ptr) @ cdecl _Getdays() @ cdecl _Getmonths() @ cdecl _Gettnames() diff --git a/dlls/msvcrt/except.c b/dlls/msvcrt/except.c index a204d62..ec923b1 100644 --- a/dlls/msvcrt/except.c +++ b/dlls/msvcrt/except.c @@ -341,3 +341,31 @@ frame_info* CDECL _CreateFrameInfo(frame_info *fi, void *obj) fi->object = obj; return fi; } + +/********************************************************************* + * _FindAndUnlinkFrame (MSVCR80.@) + */ +void CDECL _FindAndUnlinkFrame(frame_info *fi) +{ + thread_data_t *data = msvcrt_get_thread_data(); + frame_info *cur = data->frame_info_head; + + TRACE("(%p)\n", fi); + + if (cur == fi) + { + data->frame_info_head = cur->next; + return; + } + + for (; cur->next; cur = cur->next) + { + if (cur->next == fi) + { + cur->next = fi->next; + return; + } + } + + ERR("frame not found, native crashes in this case\n"); +} diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index df7c02e..44b62a7 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -24,7 +24,7 @@ @ stub _FCbuild @ stub _FCmulcc @ stub _FCmulcr -@ stub _FindAndUnlinkFrame +@ cdecl _FindAndUnlinkFrame(ptr) @ stub _GetImageBase @ stub _GetThrowImageBase @ cdecl _Getdays() diff --git a/dlls/vcruntime140/vcruntime140.spec b/dlls/vcruntime140/vcruntime140.spec index c5e0c4f..ea58694 100644 --- a/dlls/vcruntime140/vcruntime140.spec +++ b/dlls/vcruntime140/vcruntime140.spec @@ -1,7 +1,7 @@ @ cdecl _CreateFrameInfo(ptr ptr) ucrtbase._CreateFrameInfo @ stdcall _CxxThrowException(long long) ucrtbase._CxxThrowException @ cdecl -arch=i386 -norelay _EH_prolog() ucrtbase._EH_prolog -@ stub _FindAndUnlinkFrame +@ cdecl _FindAndUnlinkFrame(ptr) ucrtbase._FindAndUnlinkFrame @ cdecl -arch=i386,x86_64,arm _IsExceptionObjectToBeDestroyed(ptr) ucrtbase._IsExceptionObjectToBeDestroyed @ stub _NLG_Dispatch2 @ stub _NLG_Return

1 0

Henri Verbeet : wined3d: Get resource info from the texture in surface_load().
by Alexandre Julliard March 17, 2016

March 17, 2016

Module: wine Branch: master Commit: ab1ae265201a0620297e5d6afb0d98a30c31a20b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab1ae265201a0620297e5d6af… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 16 18:17:00 2016 +0100 wined3d: Get resource info from the texture in surface_load(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index ae89aef..3aeabed 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1606,7 +1606,7 @@ void surface_load(struct wined3d_surface *surface, struct wined3d_context *conte TRACE("surface %p, srgb %#x.\n", surface, srgb); - if (surface->resource.pool == WINED3D_POOL_SCRATCH) + if (surface->container->resource.pool == WINED3D_POOL_SCRATCH) ERR("Not supported on scratch surfaces.\n"); if (surface->locations & location)

1 0

Henri Verbeet : wined3d: Get resource info from the texture in surface_set_compatible_renderbuffer ().
by Alexandre Julliard March 17, 2016

March 17, 2016

Module: wine Branch: master Commit: 2b40957a1a895ec9508b5b0a9ea37977384cae9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b40957a1a895ec9508b5b0a9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 16 18:16:59 2016 +0100 wined3d: Get resource info from the texture in surface_set_compatible_renderbuffer(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 4423f99..ae89aef 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1506,13 +1506,13 @@ HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const P /* Context activation is done by the caller. */ void surface_set_compatible_renderbuffer(struct wined3d_surface *surface, const struct wined3d_surface *rt) { - const struct wined3d_gl_info *gl_info = &surface->resource.device->adapter->gl_info; + const struct wined3d_gl_info *gl_info = &surface->container->resource.device->adapter->gl_info; struct wined3d_renderbuffer_entry *entry; GLuint renderbuffer = 0; unsigned int src_width, src_height; unsigned int width, height; - if (rt && rt->resource.format->id != WINED3DFMT_NULL) + if (rt && rt->container->resource.format->id != WINED3DFMT_NULL) { width = rt->pow2Width; height = rt->pow2Height; @@ -1553,7 +1553,7 @@ void surface_set_compatible_renderbuffer(struct wined3d_surface *surface, const gl_info->fbo_ops.glGenRenderbuffers(1, &renderbuffer); gl_info->fbo_ops.glBindRenderbuffer(GL_RENDERBUFFER, renderbuffer); gl_info->fbo_ops.glRenderbufferStorage(GL_RENDERBUFFER, - surface->resource.format->glInternal, width, height); + surface->container->resource.format->glInternal, width, height); entry = HeapAlloc(GetProcessHeap(), 0, sizeof(*entry)); entry->width = width;

1 0

Miklós Máté : winex11: Don' t create a temporary context each time X11DRV_wglBindTexImageARB is called.
by Alexandre Julliard March 17, 2016

March 17, 2016

Module: wine Branch: master Commit: f9696eea8b1541506069e6f5a9d5fd67bb620a75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9696eea8b1541506069e6f5a… Author: Miklós Máté <mtmkls(a)gmail.com> Date: Tue Mar 15 18:58:26 2016 +0100 winex11: Don't create a temporary context each time X11DRV_wglBindTexImageARB is called. Signed-off-by: Miklós Máté <mtmkls(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/opengl.c | 36 ++++++++++++++++++++++++++++++------ 1 file changed, 30 insertions(+), 6 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 8177b00..ab29ce4 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -237,6 +237,9 @@ struct wgl_pbuffer GLenum texture_type; GLuint texture; int texture_level; + GLXContext tmp_context; + GLXContext prev_context; + struct list entry; }; enum dc_gl_type @@ -275,6 +278,7 @@ static XContext gl_hwnd_context; static XContext gl_pbuffer_context; static struct list context_list = LIST_INIT( context_list ); +static struct list pbuffer_list = LIST_INIT( pbuffer_list ); static struct WineGLInfo WineGLInfo = { 0 }; static struct wgl_pixel_format *pixel_formats; static int nb_pixel_formats, nb_onscreen_formats; @@ -1812,10 +1816,19 @@ static struct wgl_context *glxdrv_wglCreateContext( HDC hdc ) */ static void glxdrv_wglDeleteContext(struct wgl_context *ctx) { + struct wgl_pbuffer *pb; + TRACE("(%p)\n", ctx); EnterCriticalSection( &context_section ); list_remove( &ctx->entry ); + LIST_FOR_EACH_ENTRY( pb, &pbuffer_list, struct wgl_pbuffer, entry ) + { + if (pb->prev_context == ctx->ctx) { + pglXDestroyContext(gdi_display, pb->tmp_context); + pb->prev_context = pb->tmp_context = NULL; + } + } LeaveCriticalSection( &context_section ); if (ctx->ctx) pglXDestroyContext( gdi_display, ctx->ctx ); @@ -2301,6 +2314,9 @@ static struct wgl_pbuffer *X11DRV_wglCreatePbufferARB( HDC hdc, int iPixelFormat SetLastError(ERROR_NO_SYSTEM_RESOURCES); goto create_failed; /* unexpected error */ } + EnterCriticalSection( &context_section ); + list_add_head( &pbuffer_list, &object->entry ); + LeaveCriticalSection( &context_section ); TRACE("->(%p)\n", object); return object; @@ -2319,7 +2335,12 @@ static BOOL X11DRV_wglDestroyPbufferARB( struct wgl_pbuffer *object ) { TRACE("(%p)\n", object); + EnterCriticalSection( &context_section ); + list_remove( &object->entry ); + LeaveCriticalSection( &context_section ); pglXDestroyPbuffer(gdi_display, object->drawable); + if (object->tmp_context) + pglXDestroyContext(gdi_display, object->tmp_context); HeapFree(GetProcessHeap(), 0, object); return GL_TRUE; } @@ -2925,7 +2946,6 @@ static BOOL X11DRV_wglBindTexImageARB( struct wgl_pbuffer *object, int iBuffer ) int prev_binded_texture = 0; GLXContext prev_context; Drawable prev_drawable; - GLXContext tmp_context; prev_context = pglXGetCurrentContext(); prev_drawable = pglXGetCurrentDrawable(); @@ -2940,21 +2960,25 @@ static BOOL X11DRV_wglBindTexImageARB( struct wgl_pbuffer *object, int iBuffer ) } TRACE("drawable=%lx, context=%p\n", object->drawable, prev_context); - tmp_context = pglXCreateNewContext(gdi_display, object->fmt->fbconfig, object->fmt->render_type, prev_context, True); + if (!object->tmp_context || object->prev_context != prev_context) { + if (object->tmp_context) + pglXDestroyContext(gdi_display, object->tmp_context); + object->tmp_context = pglXCreateNewContext(gdi_display, object->fmt->fbconfig, object->fmt->render_type, prev_context, True); + object->prev_context = prev_context; + } opengl_funcs.gl.p_glGetIntegerv(object->texture_bind_target, &prev_binded_texture); /* Switch to our pbuffer */ - pglXMakeCurrent(gdi_display, object->drawable, tmp_context); + pglXMakeCurrent(gdi_display, object->drawable, object->tmp_context); /* Make sure that the prev_binded_texture is set as the current texture state isn't shared between contexts. - * After that upload the pbuffer texture data. */ + * After that copy the pbuffer texture data. */ opengl_funcs.gl.p_glBindTexture(object->texture_target, prev_binded_texture); opengl_funcs.gl.p_glCopyTexImage2D(object->texture_target, 0, object->use_render_texture, 0, 0, object->width, object->height, 0); - /* Switch back to the original drawable and upload the pbuffer-texture */ + /* Switch back to the original drawable and context */ pglXMakeCurrent(gdi_display, prev_drawable, prev_context); - pglXDestroyContext(gdi_display, tmp_context); return GL_TRUE; }

1 0

Henri Verbeet : wined3d: Get resource info from the texture in wined3d_surface_depth_fill().
by Alexandre Julliard March 17, 2016

March 17, 2016

Module: wine Branch: master Commit: d9ebc2e21586a20337aaf9a4056d9ff8afc8bd1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9ebc2e21586a20337aaf9a40… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 16 18:16:55 2016 +0100 wined3d: Get resource info from the texture in wined3d_surface_depth_fill(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index dcc946c..f59dee9 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -936,11 +936,13 @@ static HRESULT wined3d_surface_depth_fill(struct wined3d_surface *surface, const static HRESULT wined3d_surface_depth_blt(struct wined3d_surface *src_surface, DWORD src_location, const RECT *src_rect, struct wined3d_surface *dst_surface, DWORD dst_location, const RECT *dst_rect) { - struct wined3d_device *device = src_surface->resource.device; + struct wined3d_texture *src_texture = src_surface->container; + struct wined3d_texture *dst_texture = dst_surface->container; + struct wined3d_device *device = src_texture->resource.device; if (!fbo_blit_supported(&device->adapter->gl_info, WINED3D_BLIT_OP_DEPTH_BLIT, - src_rect, src_surface->resource.usage, src_surface->resource.pool, src_surface->resource.format, - dst_rect, dst_surface->resource.usage, dst_surface->resource.pool, dst_surface->resource.format)) + src_rect, src_texture->resource.usage, src_texture->resource.pool, src_texture->resource.format, + dst_rect, dst_texture->resource.usage, dst_texture->resource.pool, dst_texture->resource.format)) return WINED3DERR_INVALIDCALL; surface_depth_blt_fbo(device, src_surface, src_location, src_rect, dst_surface, dst_location, dst_rect);

1 0

Stefan Dösinger : wined3d: Get rid of state access in shader_generate_glsl_declarations().
by Alexandre Julliard March 17, 2016

March 17, 2016

Module: wine Branch: master Commit: f08896aa738fcf99fd03292002bffdf3adad9311 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f08896aa738fcf99fd0329200… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Mar 16 18:17:01 2016 +0100 wined3d: Get rid of state access in shader_generate_glsl_declarations(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 33 ++++++--------------------------- 1 file changed, 6 insertions(+), 27 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 92a5b1c..d9311b9 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1646,11 +1646,9 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont const struct wined3d_shader_reg_maps *reg_maps, const struct shader_glsl_ctx_priv *ctx_priv) { const struct wined3d_shader_version *version = &reg_maps->shader_version; - const struct wined3d_state *state = &shader->device->state; const struct vs_compile_args *vs_args = ctx_priv->cur_vs_args; const struct ps_compile_args *ps_args = ctx_priv->cur_ps_args; const struct wined3d_gl_info *gl_info = context->gl_info; - const struct wined3d_fb_state *fb = &shader->device->fb; unsigned int i, extra_constants_needed = 0; const struct wined3d_shader_lconst *lconst; const char *prefix; @@ -1953,7 +1951,7 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont { UINT in_count = min(vec4_varyings(version->major, gl_info), shader->limits->packed_input); - if (use_vs(state)) + if (ps_args->vp_mode == vertexshader) declare_in_varying(gl_info, buffer, FALSE, "vec4 %s_link[%u];\n", prefix, in_count); shader_addline(buffer, "vec4 %s_in[%u];\n", prefix, in_count); } @@ -1986,32 +1984,13 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont } if (reg_maps->vpos || reg_maps->usesdsy) { - if (shader->limits->constant_float + extra_constants_needed - + 1 < gl_info->limits.glsl_ps_float_constants) - { - shader_addline(buffer, "uniform vec4 ycorrection;\n"); - extra_constants_needed++; - } - else - { - float ycorrection[] = - { - context->render_offscreen ? 0.0f : fb->render_targets[0]->height, - context->render_offscreen ? 1.0f : -1.0f, - 0.0f, - 0.0f, - }; - - /* This happens because we do not have proper tracking of the - * constant registers that are actually used, only the max - * limit of the shader version. */ - FIXME("Cannot find a free uniform for vpos correction params\n"); - shader_addline(buffer, "const vec4 ycorrection = "); - shader_glsl_append_imm_vec4(buffer, ycorrection); - shader_addline(buffer, ";\n"); - } + ++extra_constants_needed; + shader_addline(buffer, "uniform vec4 ycorrection;\n"); shader_addline(buffer, "vec4 vpos;\n"); } + + if (shader->limits->constant_float + extra_constants_needed >= gl_info->limits.glsl_ps_float_constants) + FIXME("Insufficient uniforms to run this shader.\n"); } /* Declare output register temporaries */

1 0

Henri Verbeet : wined3d: Get resource info from the texture in surface_download_data().
by Alexandre Julliard March 17, 2016

March 17, 2016

Module: wine Branch: master Commit: aa1fe8cfb1abf87d4ba11734727c82830c8934fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa1fe8cfb1abf87d4ba117347… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 16 18:16:56 2016 +0100 wined3d: Get resource info from the texture in surface_download_data(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index f59dee9..a1a2782 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1125,11 +1125,12 @@ static const struct wined3d_surface_ops gdi_surface_ops = static void surface_download_data(struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info, DWORD dst_location) { - const struct wined3d_format *format = surface->resource.format; + struct wined3d_texture *texture = surface->container; + const struct wined3d_format *format = texture->resource.format; struct wined3d_bo_address data; /* Only support read back of converted P8 surfaces. */ - if (surface->container->flags & WINED3D_TEXTURE_CONVERTED && format->id != WINED3DFMT_P8_UINT) + if (texture->flags & WINED3D_TEXTURE_CONVERTED && format->id != WINED3DFMT_P8_UINT) { ERR("Trying to read back converted surface %p with format %s.\n", surface, debug_d3dformat(format->id)); return; @@ -1137,7 +1138,7 @@ static void surface_download_data(struct wined3d_surface *surface, const struct surface_get_memory(surface, &data, dst_location); - if (surface->container->resource.format_flags & WINED3DFMT_FLAG_COMPRESSED) + if (texture->resource.format_flags & WINED3DFMT_FLAG_COMPRESSED) { TRACE("(%p) : Calling glGetCompressedTexImage level %d, format %#x, type %#x, data %p.\n", surface, surface->texture_level, format->glFormat, format->glType, data.addr); @@ -1166,10 +1167,10 @@ static void surface_download_data(struct wined3d_surface *surface, const struct GLenum gl_type = format->glType; void *mem; - if (surface->container->flags & WINED3D_TEXTURE_COND_NP2_EMULATED) + if (texture->flags & WINED3D_TEXTURE_COND_NP2_EMULATED) { - wined3d_texture_get_pitch(surface->container, surface->texture_level, &dst_row_pitch, &dst_slice_pitch); - wined3d_format_calculate_pitch(format, surface->resource.device->surface_alignment, + wined3d_texture_get_pitch(texture, surface->texture_level, &dst_row_pitch, &dst_slice_pitch); + wined3d_format_calculate_pitch(format, texture->resource.device->surface_alignment, surface->pow2Width, surface->pow2Height, &src_row_pitch, &src_slice_pitch); mem = HeapAlloc(GetProcessHeap(), 0, src_slice_pitch); } @@ -1200,7 +1201,7 @@ static void surface_download_data(struct wined3d_surface *surface, const struct checkGLcall("glGetTexImage"); } - if (surface->container->flags & WINED3D_TEXTURE_COND_NP2_EMULATED) + if (texture->flags & WINED3D_TEXTURE_COND_NP2_EMULATED) { const BYTE *src_data; BYTE *dst_data;

1 0

Jeremy Newman : no longer need to excape the single quote
by Jeremy Newman March 17, 2016

March 17, 2016

Module: website Branch: master Commit: 8924166fb91b61b5ff061bafdbb1581727bbe6ca URL: http://source.winehq.org/git/website.git/?a=commit;h=8924166fb91b61b5ff061b… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Mar 17 06:23:45 2016 -0500 no longer need to excape the single quote --- include/htaccess.sample | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/htaccess.sample b/include/htaccess.sample index 9478290..39f329b 100644 --- a/include/htaccess.sample +++ b/include/htaccess.sample @@ -71,9 +71,9 @@ RedirectMatch ^/site/wineconf/?$ https://wiki.winehq.org/WineConf RedirectMatch ^/wineconf/?$ https://wiki.winehq.org/WineConf # fix documentation links -RedirectMatch ^/docs/wineusr-guide$ https://wiki.winehq.org/Wine_User%27s_Guide -RedirectMatch ^/docs/winelib-guide$ https://wiki.winehq.org/Winelib_User%27s_Guide -RedirectMatch ^/docs/winedev-guide$ https://wiki.winehq.org/Wine_Developer%27s_Guide +RedirectMatch ^/docs/wineusr-guide$ https://wiki.winehq.org/Wine_User's_Guide +RedirectMatch ^/docs/winelib-guide$ https://wiki.winehq.org/Winelib_User's_Guide +RedirectMatch ^/docs/winedev-guide$ https://wiki.winehq.org/Wine_Developer's_Guide RedirectMatch ^/site/docs$ https://www.winehq.org/documentation RedirectMatch ^/docs$ https://www.winehq.org/documentation RedirectMatch ^/Docs/(\w+-\w+)/$ https://www.winehq.org/docs/$1/index

1 0

Józef Kucia : d3d11/tests: Test values of unused fields in D3D11_DEPTH_STENCIL_DESC.
by Alexandre Julliard March 16, 2016

March 16, 2016

Module: wine Branch: master Commit: bf88464c98bc30fa7635b7579ab700be3a541b00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf88464c98bc30fa7635b7579… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Mar 16 10:02:37 2016 +0100 d3d11/tests: Test values of unused fields in D3D11_DEPTH_STENCIL_DESC. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 81cb87f..89f9c5b 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -2737,6 +2737,51 @@ static void test_create_depthstencil_state(void) refcount = ID3D11DepthStencilState_Release(ds_state1); ok(!refcount, "Got unexpected refcount %u.\n", refcount); + ds_desc.DepthEnable = FALSE; + ds_desc.DepthWriteMask = D3D11_DEPTH_WRITE_MASK_ZERO; + ds_desc.DepthFunc = D3D11_COMPARISON_NEVER; + ds_desc.StencilEnable = FALSE; + ds_desc.StencilReadMask = 0; + ds_desc.StencilWriteMask = 0; + ds_desc.FrontFace.StencilFailOp = D3D11_STENCIL_OP_ZERO; + ds_desc.FrontFace.StencilDepthFailOp = D3D11_STENCIL_OP_ZERO; + ds_desc.FrontFace.StencilPassOp = D3D11_STENCIL_OP_ZERO; + ds_desc.FrontFace.StencilFunc = D3D11_COMPARISON_NEVER; + ds_desc.BackFace = ds_desc.FrontFace; + + hr = ID3D11Device_CreateDepthStencilState(device, &ds_desc, &ds_state1); + ok(SUCCEEDED(hr), "Failed to create depthstencil state, hr %#x.\n", hr); + + memset(&ds_desc, 0, sizeof(ds_desc)); + ID3D11DepthStencilState_GetDesc(ds_state1, &ds_desc); + ok(!ds_desc.DepthEnable, "Got unexpected depth enable %#x.\n", ds_desc.DepthEnable); + ok(ds_desc.DepthWriteMask == D3D11_DEPTH_WRITE_MASK_ALL, + "Got unexpected depth write mask %#x.\n", ds_desc.DepthWriteMask); + ok(ds_desc.DepthFunc == D3D11_COMPARISON_LESS, "Got unexpected depth func %#x.\n", ds_desc.DepthFunc); + ok(!ds_desc.StencilEnable, "Got unexpected stencil enable %#x.\n", ds_desc.StencilEnable); + ok(ds_desc.StencilReadMask == D3D11_DEFAULT_STENCIL_READ_MASK, + "Got unexpected stencil read mask %#x.\n", ds_desc.StencilReadMask); + ok(ds_desc.StencilWriteMask == D3D11_DEFAULT_STENCIL_WRITE_MASK, + "Got unexpected stencil write mask %#x.\n", ds_desc.StencilWriteMask); + ok(ds_desc.FrontFace.StencilDepthFailOp == D3D11_STENCIL_OP_KEEP, + "Got unexpected front face stencil depth fail op %#x.\n", ds_desc.FrontFace.StencilDepthFailOp); + ok(ds_desc.FrontFace.StencilPassOp == D3D11_STENCIL_OP_KEEP, + "Got unexpected front face stencil pass op %#x.\n", ds_desc.FrontFace.StencilPassOp); + ok(ds_desc.FrontFace.StencilFailOp == D3D11_STENCIL_OP_KEEP, + "Got unexpected front face stencil fail op %#x.\n", ds_desc.FrontFace.StencilFailOp); + ok(ds_desc.FrontFace.StencilFunc == D3D11_COMPARISON_ALWAYS, + "Got unexpected front face stencil func %#x.\n", ds_desc.FrontFace.StencilFunc); + ok(ds_desc.BackFace.StencilDepthFailOp == D3D11_STENCIL_OP_KEEP, + "Got unexpected back face stencil depth fail op %#x.\n", ds_desc.BackFace.StencilDepthFailOp); + ok(ds_desc.BackFace.StencilPassOp == D3D11_STENCIL_OP_KEEP, + "Got unexpected back face stencil pass op %#x.\n", ds_desc.BackFace.StencilPassOp); + ok(ds_desc.BackFace.StencilFailOp == D3D11_STENCIL_OP_KEEP, + "Got unexpected back face stencil fail op %#x.\n", ds_desc.BackFace.StencilFailOp); + ok(ds_desc.BackFace.StencilFunc == D3D11_COMPARISON_ALWAYS, + "Got unexpected back face stencil func %#x.\n", ds_desc.BackFace.StencilFunc); + + ID3D11DepthStencilState_Release(ds_state1); + refcount = ID3D11Device_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); }

1 0