wine-commits March 2018

wine-commits@winehq.org

2 participants
785 discussions

Jacek Caban : vbscript/tests: Added named item ref count tests.
by Alexandre Julliard 20 Mar '18

20 Mar '18

Module: wine Branch: master Commit: a4824803da7b0e1dea7034003db62e1a6a2ff956 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a4824803da7b0e1dea703400… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 20 22:37:44 2018 +0100 vbscript/tests: Added named item ref count tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/tests/run.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 9172add..6b57540 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -974,6 +974,18 @@ static IDispatchExVtbl RefObjVtbl = { static IDispatchEx RefObj = { &RefObjVtbl }; +static ULONG global_ref; + +static ULONG WINAPI Global_AddRef(IDispatchEx *iface) +{ + return ++global_ref; +} + +static ULONG WINAPI Global_Release(IDispatchEx *iface) +{ + return --global_ref; +} + static HRESULT WINAPI Global_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD grfdex, DISPID *pid) { if(!strcmp_wa(bstrName, "ok")) { @@ -1476,8 +1488,8 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, static IDispatchExVtbl GlobalVtbl = { DispatchEx_QueryInterface, - DispatchEx_AddRef, - DispatchEx_Release, + Global_AddRef, + Global_Release, DispatchEx_GetTypeInfoCount, DispatchEx_GetTypeInfo, DispatchEx_GetIDsOfNames, @@ -1619,6 +1631,7 @@ static HRESULT WINAPI ActiveScriptSite_GetItemInfo(IActiveScriptSite *iface, LPC ok(0, "unexpected pstrName %s\n", wine_dbgstr_w(pstrName)); *ppiunkItem = (IUnknown*)&Global; + IUnknown_AddRef(*ppiunkItem); return S_OK; } @@ -1814,6 +1827,7 @@ static void test_parse_context(void) static const WCHAR xW[] = {'x',0}; static const WCHAR yW[] = {'y',0}; + global_ref = 1; engine = create_and_init_script(0); if(!engine) return; @@ -1855,6 +1869,7 @@ static void test_parse_context(void) IActiveScriptParse_Release(parser); close_script(engine); + ok(global_ref == 1, "global_ref = %u\n", global_ref); } static void parse_script_a(const char *src)

1 0

Piotr Caban : msvcp140: Add __uncaught_exceptions implementation.
by Alexandre Julliard 20 Mar '18

20 Mar '18

Module: wine Branch: master Commit: c07ade82ed1259d60758308b1df5358016cd3f28 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c07ade82ed1259d60758308b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 20 15:37:00 2018 +0100 msvcp140: Add __uncaught_exceptions implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140/msvcp140.spec | 2 +- dlls/msvcp90/exception.c | 7 +++++++ dlls/msvcp90/msvcp90.h | 4 ++++ dlls/msvcp90/msvcp_main.c | 5 +++++ 4 files changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index 4fc8e3c..ddf8ba7 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3513,7 +3513,7 @@ @ thiscall -arch=i386 ?uflow@?$basic_streambuf@_WU?$char_traits@_W@std@@@std@@MAEGXZ(ptr) basic_streambuf_wchar_uflow @ cdecl -arch=win64 ?uflow@?$basic_streambuf@_WU?$char_traits@_W@std@@@std@@MEAAGXZ(ptr) basic_streambuf_wchar_uflow @ cdecl ?uncaught_exception@std@@YA_NXZ() MSVCP__uncaught_exception -@ stub ?uncaught_exceptions@std@@YAHXZ +@ cdecl ?uncaught_exceptions@std@@YAHXZ() __uncaught_exceptions @ cdecl -arch=arm ?underflow@?$basic_streambuf@DU?$char_traits@D@std@@@std@@MAAHXZ(ptr) basic_streambuf_char_underflow @ thiscall -arch=i386 ?underflow@?$basic_streambuf@DU?$char_traits@D@std@@@std@@MAEHXZ(ptr) basic_streambuf_char_underflow @ cdecl -arch=win64 ?underflow@?$basic_streambuf@DU?$char_traits@D@std@@@std@@MEAAHXZ(ptr) basic_streambuf_char_underflow diff --git a/dlls/msvcp90/exception.c b/dlls/msvcp90/exception.c index 7d9ade8..e7ba3d7 100644 --- a/dlls/msvcp90/exception.c +++ b/dlls/msvcp90/exception.c @@ -944,6 +944,13 @@ MSVCP_bool __cdecl MSVCP__uncaught_exception(void) return __uncaught_exception(); } +#if _MSVCP_VER >= 140 +int __cdecl __uncaught_exceptions(void) +{ + return *UCRTBASE___processing_throw(); +} +#endif + #if _MSVCP_VER >= 70 || defined(_MSVCIRT) #define EXCEPTION_VTABLE(name,funcs) __ASM_VTABLE(name,funcs) #else diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index d751186..16eaa48 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -47,6 +47,10 @@ extern void* (__cdecl *MSVCRT_operator_new)(MSVCP_size_t); extern void (__cdecl *MSVCRT_operator_delete)(void*); extern void* (__cdecl *MSVCRT_set_new_handler)(void*); +#if _MSVCP_VER >= 140 +extern int* (__cdecl *UCRTBASE___processing_throw)(void); +#endif + #if _MSVCP_VER >= 110 /* keep in sync with msvcrt/lock.c */ typedef struct cs_queue diff --git a/dlls/msvcp90/msvcp_main.c b/dlls/msvcp90/msvcp_main.c index 22baeef..7aef4cd 100644 --- a/dlls/msvcp90/msvcp_main.c +++ b/dlls/msvcp90/msvcp_main.c @@ -60,6 +60,10 @@ void* (__cdecl *MSVCRT_operator_new)(MSVCP_size_t); void (__cdecl *MSVCRT_operator_delete)(void*); void* (__cdecl *MSVCRT_set_new_handler)(void*); +#if _MSVCP_VER >= 140 +int* (__cdecl *UCRTBASE___processing_throw)(void); +#endif + #if _MSVCP_VER >= 110 critical_section* (__thiscall *critical_section_ctor)(critical_section*); void (__thiscall *critical_section_dtor)(critical_section*); @@ -147,6 +151,7 @@ static void init_cxx_funcs(void) MSVCRT_operator_new = operator_new; MSVCRT_operator_delete = operator_delete; MSVCRT_set_new_handler = (void*)GetProcAddress(hmod, "_set_new_handler"); + UCRTBASE___processing_throw = (void*)GetProcAddress(hmod, "__processing_throw"); hcon = LoadLibraryA( CONCRT_NAME(_MSVCP_VER) ); if (!hcon) FIXME( "%s not loaded\n", CONCRT_NAME(_MSVCP_VER) );

1 0

Piotr Caban : msvcrt: Fix __uncaught_exception implementation.
by Alexandre Julliard 20 Mar '18

20 Mar '18

Module: wine Branch: master Commit: 36a88ac2e14a4bdcec1f855dc497dc9397283689 URL: https://source.winehq.org/git/wine.git/?a=commit;h=36a88ac2e14a4bdcec1f855d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 20 15:36:54 2018 +0100 msvcrt: Fix __uncaught_exception implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/except.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrt/except.c b/dlls/msvcrt/except.c index b99c98b..8fccd8e 100644 --- a/dlls/msvcrt/except.c +++ b/dlls/msvcrt/except.c @@ -293,7 +293,7 @@ int CDECL _abnormal_termination(void) */ BOOL CDECL MSVCRT___uncaught_exception(void) { - return FALSE; + return msvcrt_get_thread_data()->processing_throw != 0; } #if _MSVCR_VER>=70 && _MSVCR_VER<=71

1 0

Piotr Caban : ucrtbase: Add __processing_throw implementation.
by Alexandre Julliard 20 Mar '18

20 Mar '18

Module: wine Branch: master Commit: 9999c59c486b2e6d724a95a63fcfbfc1ce46df9a URL: https://source.winehq.org/git/wine.git/?a=commit;h=9999c59c486b2e6d724a95a6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 20 15:36:48 2018 +0100 ucrtbase: Add __processing_throw 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/msvcrt/except.c | 9 +++++++++ dlls/msvcrt/except_i386.c | 6 ++++-- dlls/msvcrt/except_x86_64.c | 4 ++++ dlls/msvcrt/msvcrt.h | 1 + dlls/ucrtbase/ucrtbase.spec | 2 +- dlls/vcruntime140/vcruntime140.spec | 2 +- 7 files changed, 21 insertions(+), 5 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 af23f8d..9ddb5dd 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 @@ -40,7 +40,7 @@ @ stub __intrinsic_abnormal_termination @ cdecl -arch=i386,x86_64,arm,arm64 -norelay __intrinsic_setjmp(ptr) ucrtbase.__intrinsic_setjmp @ cdecl -arch=x86_64,arm64 -norelay __intrinsic_setjmpex(ptr ptr) ucrtbase.__intrinsic_setjmpex -@ stub __processing_throw +@ cdecl __processing_throw() ucrtbase.__processing_throw @ stub __report_gsfailure @ cdecl __std_exception_copy(ptr ptr) ucrtbase.__std_exception_copy @ cdecl __std_exception_destroy(ptr) ucrtbase.__std_exception_destroy diff --git a/dlls/msvcrt/except.c b/dlls/msvcrt/except.c index 286c82f..b99c98b 100644 --- a/dlls/msvcrt/except.c +++ b/dlls/msvcrt/except.c @@ -528,4 +528,13 @@ void** CDECL __current_exception_context(void) return (void**)&msvcrt_get_thread_data()->ctx_record; } +/********************************************************************* + * __processing_throw (UCRTBASE.@) + */ +int* CDECL __processing_throw(void) +{ + TRACE("()\n"); + return &msvcrt_get_thread_data()->processing_throw; +} + #endif /* _MSVCR_VER>=140 */ diff --git a/dlls/msvcrt/except_i386.c b/dlls/msvcrt/except_i386.c index 09dec65..5121301 100644 --- a/dlls/msvcrt/except_i386.c +++ b/dlls/msvcrt/except_i386.c @@ -412,8 +412,9 @@ static inline void call_catch_block( PEXCEPTION_RECORD rec, CONTEXT *context, struct catch_func_nested_frame nested_frame; int trylevel = frame->trylevel; DWORD save_esp = ((DWORD*)frame)[-1]; - thread_data_t *data; + thread_data_t *data = msvcrt_get_thread_data(); + data->processing_throw++; for (i = 0; i < descr->tryblock_count; i++) { const tryblock_info *tryblock = &descr->tryblock[i]; @@ -456,11 +457,11 @@ static inline void call_catch_block( PEXCEPTION_RECORD rec, CONTEXT *context, cxx_local_unwind( frame, descr, tryblock->start_level ); frame->trylevel = tryblock->end_level + 1; - data = msvcrt_get_thread_data(); nested_frame.frame_info.rec = data->exc_record; nested_frame.frame_info.context = data->ctx_record; data->exc_record = rec; data->ctx_record = context; + data->processing_throw--; /* call the catch block */ TRACE( "calling catch block %p addr %p ebp %p\n", @@ -483,6 +484,7 @@ static inline void call_catch_block( PEXCEPTION_RECORD rec, CONTEXT *context, continue_after_catch( frame, addr ); } } + data->processing_throw--; } /********************************************************************* diff --git a/dlls/msvcrt/except_x86_64.c b/dlls/msvcrt/except_x86_64.c index 7859a63..77c519d 100644 --- a/dlls/msvcrt/except_x86_64.c +++ b/dlls/msvcrt/except_x86_64.c @@ -363,6 +363,7 @@ static void* WINAPI call_catch_block(EXCEPTION_RECORD *rec) ctx.rethrow = FALSE; __CxxRegisterExceptionObject(&ep, &ctx.frame_info); + msvcrt_get_thread_data()->processing_throw--; __TRY { __TRY @@ -410,12 +411,14 @@ static inline void find_catch_block(EXCEPTION_RECORD *rec, CONTEXT *context, ULONG64 exc_base = (rec->NumberParameters == 4 ? rec->ExceptionInformation[3] : 0); int trylevel = ip_to_state(rva_to_ptr(descr->ipmap, dispatch->ImageBase), descr->ipmap_count, dispatch->ControlPc-dispatch->ImageBase); + thread_data_t *data = msvcrt_get_thread_data(); const tryblock_info *in_catch; EXCEPTION_RECORD catch_record; CONTEXT ctx; UINT i, j; INT *unwind_help; + data->processing_throw++; for (i=descr->tryblock_count; i>0; i--) { in_catch = rva_to_ptr(descr->tryblock, dispatch->ImageBase); @@ -494,6 +497,7 @@ static inline void find_catch_block(EXCEPTION_RECORD *rec, CONTEXT *context, } TRACE("no matching catch block found\n"); + data->processing_throw--; } static LONG CALLBACK se_translation_filter(EXCEPTION_POINTERS *ep, void *c) diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 7c48917..6b0f425 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -260,6 +260,7 @@ struct __thread_data { int unk7; EXCEPTION_RECORD *exc_record; CONTEXT *ctx_record; + int processing_throw; frame_info *frame_info_head; void *unk8[6]; LCID cached_lcid; diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 2d4f798..ff33d86 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -135,7 +135,7 @@ @ cdecl __p__wenviron() MSVCRT___p__wenviron @ cdecl __p__wpgmptr() MSVCRT___p__wpgmptr @ cdecl __pctype_func() MSVCRT___pctype_func -@ stub __processing_throw +@ cdecl __processing_throw() @ stub __pwctype_func @ cdecl __pxcptinfoptrs() MSVCRT___pxcptinfoptrs @ stub __report_gsfailure diff --git a/dlls/vcruntime140/vcruntime140.spec b/dlls/vcruntime140/vcruntime140.spec index 252113c..d304de6 100644 --- a/dlls/vcruntime140/vcruntime140.spec +++ b/dlls/vcruntime140/vcruntime140.spec @@ -34,7 +34,7 @@ @ cdecl __current_exception_context() ucrtbase.__current_exception_context @ cdecl -arch=i386,x86_64,arm,arm64 -norelay __intrinsic_setjmp(ptr) ucrtbase.__intrinsic_setjmp @ cdecl -arch=x86_64,arm64 -norelay __intrinsic_setjmpex(ptr ptr) ucrtbase.__intrinsic_setjmpex -@ stub __processing_throw +@ cdecl __processing_throw() ucrtbase.__processing_throw @ stub __report_gsfailure @ cdecl __std_exception_copy(ptr ptr) ucrtbase.__std_exception_copy @ cdecl __std_exception_destroy(ptr) ucrtbase.__std_exception_destroy

1 0

Piotr Caban : ucrtbase: Add __current_exception_context() implementation.
by Alexandre Julliard 20 Mar '18

20 Mar '18

Module: wine Branch: master Commit: f82af4d2bbf9672580c70d904c7e67212839620c URL: https://source.winehq.org/git/wine.git/?a=commit;h=f82af4d2bbf9672580c70d90… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 20 15:36:43 2018 +0100 ucrtbase: Add __current_exception_context() 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/msvcrt/except.c | 25 ++++++++++++++++------ dlls/msvcrt/except_i386.c | 10 ++++++--- dlls/msvcrt/except_x86_64.c | 20 ++++++++++------- dlls/msvcrt/msvcrt.h | 5 +++-- dlls/ucrtbase/ucrtbase.spec | 2 +- dlls/vcruntime140/vcruntime140.spec | 2 +- 7 files changed, 43 insertions(+), 23 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f82af4d2bbf9672580c7…

1 0

Henri Verbeet : wined3d: Merge wined3d_surface_upload_data() into texture2d_upload_data().
by Alexandre Julliard 20 Mar '18

20 Mar '18

Module: wine Branch: master Commit: a9cf391bedf572dead08d3eea45eaed13c172f3a URL: https://source.winehq.org/git/wine.git/?a=commit;h=a9cf391bedf572dead08d3ee… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 20 15:29:58 2018 +0330 wined3d: Merge wined3d_surface_upload_data() into texture2d_upload_data(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 170 ++--------------------------------------- dlls/wined3d/texture.c | 149 +++++++++++++++++++++++++++++++++++- dlls/wined3d/wined3d_private.h | 5 -- 3 files changed, 154 insertions(+), 170 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a9cf391bedf572dead08…

1 0

Henri Verbeet : wined3d: Allow wined3d_texture_upload_data() to upload to WINED3D_LOCATION_TEXTURE_SRGB.
by Alexandre Julliard 20 Mar '18

20 Mar '18

Module: wine Branch: master Commit: 17c7f8e3c3e4e6ebe4b8b0b73e91c98f279491b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=17c7f8e3c3e4e6ebe4b8b0b7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 20 15:29:57 2018 +0330 wined3d: Allow wined3d_texture_upload_data() to upload to WINED3D_LOCATION_TEXTURE_SRGB. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 6 +++--- dlls/wined3d/texture.c | 24 ++++++++++++------------ dlls/wined3d/wined3d_private.h | 4 ++-- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index b08e91b..f7ae3be 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -2121,7 +2121,7 @@ static void wined3d_cs_exec_blt_sub_resource(struct wined3d_cs *cs, const void * wined3d_texture_bind_and_dirtify(dst_texture, context, FALSE); wined3d_texture_upload_data(dst_texture, op->dst_sub_resource_idx, context, dst_texture->resource.format, &op->src_box, wined3d_const_bo_address(&addr), - row_pitch, slice_pitch, op->dst_box.left, op->dst_box.top, op->dst_box.front); + row_pitch, slice_pitch, op->dst_box.left, op->dst_box.top, op->dst_box.front, FALSE); wined3d_texture_validate_location(dst_texture, op->dst_sub_resource_idx, WINED3D_LOCATION_TEXTURE_RGB); wined3d_texture_invalidate_location(dst_texture, op->dst_sub_resource_idx, ~WINED3D_LOCATION_TEXTURE_RGB); @@ -2216,8 +2216,8 @@ static void wined3d_cs_exec_update_sub_resource(struct wined3d_cs *cs, const voi wined3d_texture_bind_and_dirtify(texture, context, FALSE); wined3d_box_set(&src_box, 0, 0, box->right - box->left, box->bottom - box->top, 0, box->back - box->front); - wined3d_texture_upload_data(texture, op->sub_resource_idx, context, texture->resource.format, - &src_box, &addr, op->data.row_pitch, op->data.slice_pitch, box->left, box->top, box->front); + wined3d_texture_upload_data(texture, op->sub_resource_idx, context, texture->resource.format, &src_box, + &addr, op->data.row_pitch, op->data.slice_pitch, box->left, box->top, box->front, FALSE); wined3d_texture_validate_location(texture, op->sub_resource_idx, WINED3D_LOCATION_TEXTURE_RGB); wined3d_texture_invalidate_location(texture, op->sub_resource_idx, ~WINED3D_LOCATION_TEXTURE_RGB); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 551d9fd..29bcfb1 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1747,19 +1747,19 @@ HRESULT CDECL wined3d_texture_add_dirty_region(struct wined3d_texture *texture, void wined3d_texture_upload_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, const struct wined3d_context *context, const struct wined3d_format *format, const struct wined3d_box *src_box, const struct wined3d_const_bo_address *data, unsigned int row_pitch, unsigned int slice_pitch, - unsigned int dst_x, unsigned int dst_y, unsigned int dst_z) + unsigned int dst_x, unsigned int dst_y, unsigned int dst_z, BOOL srgb) { texture->texture_ops->texture_upload_data(texture, sub_resource_idx, context, - format, src_box, data, row_pitch, slice_pitch, dst_x, dst_y, dst_z); + format, src_box, data, row_pitch, slice_pitch, dst_x, dst_y, dst_z, srgb); } static void texture2d_upload_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, const struct wined3d_context *context, const struct wined3d_format *format, const struct wined3d_box *src_box, const struct wined3d_const_bo_address *data, unsigned int row_pitch, unsigned int slice_pitch, - unsigned int dst_x, unsigned int dst_y, unsigned int dst_z) + unsigned int dst_x, unsigned int dst_y, unsigned int dst_z, BOOL srgb) { wined3d_surface_upload_data(texture, sub_resource_idx, context->gl_info, - format, src_box, row_pitch, dst_x, dst_y, FALSE, data); + format, src_box, row_pitch, dst_x, dst_y, srgb, data); } /* Context activation is done by the caller. Context may be NULL in ddraw-only mode. */ @@ -2392,7 +2392,7 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc static void texture3d_upload_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, const struct wined3d_context *context, const struct wined3d_format *format, const struct wined3d_box *src_box, const struct wined3d_const_bo_address *data, unsigned int row_pitch, unsigned int slice_pitch, - unsigned int dst_x, unsigned int dst_y, unsigned int dst_z) + unsigned int dst_x, unsigned int dst_y, unsigned int dst_z, BOOL srgb) { unsigned int level = sub_resource_idx % texture->level_count; const struct wined3d_gl_info *gl_info = context->gl_info; @@ -2402,9 +2402,9 @@ static void texture3d_upload_data(struct wined3d_texture *texture, unsigned int void *converted_mem = NULL; TRACE("texture %p, sub_resource_idx %u, context %p, format %s, src_box %s, data {%#x:%p}, " - "row_pitch %#x, slice_pitch %#x, dst_x %u, dst_y %u, dst_z %u.\n", + "row_pitch %#x, slice_pitch %#x, dst_x %u, dst_y %u, dst_z %u, srgb %#x.\n", texture, sub_resource_idx, context, debug_d3dformat(format->id), debug_box(src_box), - data->buffer_object, data->addr, row_pitch, slice_pitch, dst_x, dst_y, dst_z); + data->buffer_object, data->addr, row_pitch, slice_pitch, dst_x, dst_y, dst_z, srgb); if (src_box) { @@ -2520,7 +2520,7 @@ static void texture3d_srgb_transfer(struct wined3d_texture *texture, unsigned in texture3d_download_data(texture, sub_resource_idx, context, &data); wined3d_texture_bind_and_dirtify(texture, context, dest_is_srgb); texture3d_upload_data(texture, sub_resource_idx, context, texture->resource.format, - NULL, wined3d_const_bo_address(&data), row_pitch, slice_pitch, 0, 0, 0); + NULL, wined3d_const_bo_address(&data), row_pitch, slice_pitch, 0, 0, 0, FALSE); heap_free(data.addr); } @@ -2546,8 +2546,8 @@ static BOOL texture3d_load_location(struct wined3d_texture *texture, unsigned in wined3d_texture_bind_and_dirtify(texture, context, location == WINED3D_LOCATION_TEXTURE_SRGB); wined3d_texture_get_pitch(texture, sub_resource_idx, &row_pitch, &slice_pitch); - texture3d_upload_data(texture, sub_resource_idx, context, - texture->resource.format, NULL, &data, row_pitch, slice_pitch, 0, 0, 0); + texture3d_upload_data(texture, sub_resource_idx, context, texture->resource.format, + NULL, &data, row_pitch, slice_pitch, 0, 0, 0, FALSE); } else if (sub_resource->locations & WINED3D_LOCATION_BUFFER) { @@ -2555,8 +2555,8 @@ static BOOL texture3d_load_location(struct wined3d_texture *texture, unsigned in wined3d_texture_bind_and_dirtify(texture, context, location == WINED3D_LOCATION_TEXTURE_SRGB); wined3d_texture_get_pitch(texture, sub_resource_idx, &row_pitch, &slice_pitch); - texture3d_upload_data(texture, sub_resource_idx, context, - texture->resource.format, NULL, &data, row_pitch, slice_pitch, 0, 0, 0); + texture3d_upload_data(texture, sub_resource_idx, context, texture->resource.format, + NULL, &data, row_pitch, slice_pitch, 0, 0, 0, FALSE); } else if (sub_resource->locations & WINED3D_LOCATION_TEXTURE_RGB) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e48f82a..580f35a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3086,7 +3086,7 @@ struct wined3d_texture_ops void (*texture_upload_data)(struct wined3d_texture *texture, unsigned int sub_resource_idx, const struct wined3d_context *context, const struct wined3d_format *format, const struct wined3d_box *src_box, const struct wined3d_const_bo_address *data, unsigned int row_pitch, - unsigned int slice_pitch, unsigned int dst_x, unsigned int dst_y, unsigned int dst_z); + unsigned int slice_pitch, unsigned int dst_x, unsigned int dst_y, unsigned int dst_z, BOOL srgb); BOOL (*texture_load_location)(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context, DWORD location); }; @@ -3287,7 +3287,7 @@ void wined3d_texture_translate_drawable_coords(const struct wined3d_texture *tex void wined3d_texture_upload_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, const struct wined3d_context *context, const struct wined3d_format *format, const struct wined3d_box *src_box, const struct wined3d_const_bo_address *data, unsigned int row_pitch, unsigned int slice_pitch, - unsigned int dst_x, unsigned int dst_y, unsigned int dst_z) DECLSPEC_HIDDEN; + unsigned int dst_x, unsigned int dst_y, unsigned int dst_z, BOOL srgb) DECLSPEC_HIDDEN; void wined3d_texture_validate_location(struct wined3d_texture *texture, unsigned int sub_resource_idx, DWORD location) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Pass independent source and destination coordinates to wined3d_texture_upload_data ().
by Alexandre Julliard 20 Mar '18

20 Mar '18

Module: wine Branch: master Commit: 8647966e9f73a39a35e842db683025cc0802da11 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8647966e9f73a39a35e842db… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 20 15:29:56 2018 +0330 wined3d: Pass independent source and destination coordinates to wined3d_texture_upload_data(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 16 +++---- dlls/wined3d/texture.c | 97 ++++++++++++++++-------------------------- dlls/wined3d/wined3d_private.h | 10 +++-- 3 files changed, 48 insertions(+), 75 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8647966e9f73a39a35e8…

1 0

Henri Verbeet : wined3d: Pass a format to wined3d_texture_upload_data().
by Alexandre Julliard 20 Mar '18

20 Mar '18

Module: wine Branch: master Commit: 37c516c95799d5d16e90866b4ebc0bc88748aec3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=37c516c95799d5d16e90866b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 20 15:29:55 2018 +0330 wined3d: Pass a format to wined3d_texture_upload_data(). The goal here is to eventually get rid of wined3d_surface_upload_data(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 6 +++--- dlls/wined3d/texture.c | 26 ++++++++++++++------------ dlls/wined3d/wined3d_private.h | 4 ++-- 3 files changed, 19 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 0db2daa..5581791 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -2126,8 +2126,8 @@ static void wined3d_cs_exec_blt_sub_resource(struct wined3d_cs *cs, const void * &row_pitch, &slice_pitch); wined3d_texture_bind_and_dirtify(dst_texture, context, FALSE); - wined3d_texture_upload_data(dst_texture, op->dst_sub_resource_idx, context, &op->dst_box, - wined3d_const_bo_address(&addr), row_pitch, slice_pitch); + wined3d_texture_upload_data(dst_texture, op->dst_sub_resource_idx, context, dst_texture->resource.format, + &op->dst_box, wined3d_const_bo_address(&addr), row_pitch, slice_pitch); wined3d_texture_validate_location(dst_texture, op->dst_sub_resource_idx, WINED3D_LOCATION_TEXTURE_RGB); wined3d_texture_invalidate_location(dst_texture, op->dst_sub_resource_idx, ~WINED3D_LOCATION_TEXTURE_RGB); @@ -2220,7 +2220,7 @@ static void wined3d_cs_exec_update_sub_resource(struct wined3d_cs *cs, const voi wined3d_texture_load_location(texture, op->sub_resource_idx, context, WINED3D_LOCATION_TEXTURE_RGB); wined3d_texture_bind_and_dirtify(texture, context, FALSE); - wined3d_texture_upload_data(texture, op->sub_resource_idx, context, + wined3d_texture_upload_data(texture, op->sub_resource_idx, context, texture->resource.format, box, &addr, op->data.row_pitch, op->data.slice_pitch); wined3d_texture_validate_location(texture, op->sub_resource_idx, WINED3D_LOCATION_TEXTURE_RGB); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 83c7a41..75f4cee 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1745,15 +1745,15 @@ HRESULT CDECL wined3d_texture_add_dirty_region(struct wined3d_texture *texture, } void wined3d_texture_upload_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, - const struct wined3d_context *context, const struct wined3d_box *box, + const struct wined3d_context *context, const struct wined3d_format *format, const struct wined3d_box *box, const struct wined3d_const_bo_address *data, unsigned int row_pitch, unsigned int slice_pitch) { texture->texture_ops->texture_upload_data(texture, sub_resource_idx, - context, box, data, row_pitch, slice_pitch); + context, format, box, data, row_pitch, slice_pitch); } static void texture2d_upload_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, - const struct wined3d_context *context, const struct wined3d_box *box, + const struct wined3d_context *context, const struct wined3d_format *format, const struct wined3d_box *box, const struct wined3d_const_bo_address *data, unsigned int row_pitch, unsigned int slice_pitch) { struct wined3d_box src_box; @@ -1780,7 +1780,7 @@ static void texture2d_upload_data(struct wined3d_texture *texture, unsigned int } wined3d_surface_upload_data(texture, sub_resource_idx, context->gl_info, - texture->resource.format, &src_box, row_pitch, dst_x, dst_y, FALSE, data); + format, &src_box, row_pitch, dst_x, dst_y, FALSE, data); } /* Context activation is done by the caller. Context may be NULL in ddraw-only mode. */ @@ -2411,10 +2411,9 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc * correct texture. */ /* Context activation is done by the caller. */ static void texture3d_upload_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, - const struct wined3d_context *context, const struct wined3d_box *box, + const struct wined3d_context *context, const struct wined3d_format *format, const struct wined3d_box *box, const struct wined3d_const_bo_address *data, unsigned int row_pitch, unsigned int slice_pitch) { - const struct wined3d_format *format = texture->resource.format; unsigned int level = sub_resource_idx % texture->level_count; const struct wined3d_gl_info *gl_info = context->gl_info; unsigned int x, y, z, update_w, update_h, update_d; @@ -2423,9 +2422,10 @@ static void texture3d_upload_data(struct wined3d_texture *texture, unsigned int const void *mem = data->addr; void *converted_mem = NULL; - TRACE("texture %p, sub_resource_idx %u, context %p, box %s, data {%#x:%p}, row_pitch %#x, slice_pitch %#x.\n", - texture, sub_resource_idx, context, debug_box(box), - data->buffer_object, data->addr, row_pitch, slice_pitch); + TRACE("texture %p, sub_resource_idx %u, context %p, format %s, " + "box %s, data {%#x:%p}, row_pitch %#x, slice_pitch %#x.\n", + texture, sub_resource_idx, context, debug_d3dformat(format->id), + debug_box(box), data->buffer_object, data->addr, row_pitch, slice_pitch); width = wined3d_texture_get_level_width(texture, level); height = wined3d_texture_get_level_height(texture, level); @@ -2544,7 +2544,7 @@ static void texture3d_srgb_transfer(struct wined3d_texture *texture, unsigned in wined3d_texture_bind_and_dirtify(texture, context, !dest_is_srgb); texture3d_download_data(texture, sub_resource_idx, context, &data); wined3d_texture_bind_and_dirtify(texture, context, dest_is_srgb); - texture3d_upload_data(texture, sub_resource_idx, context, + texture3d_upload_data(texture, sub_resource_idx, context, texture->resource.format, NULL, wined3d_const_bo_address(&data), row_pitch, slice_pitch); heap_free(data.addr); @@ -2571,7 +2571,8 @@ static BOOL texture3d_load_location(struct wined3d_texture *texture, unsigned in wined3d_texture_bind_and_dirtify(texture, context, location == WINED3D_LOCATION_TEXTURE_SRGB); wined3d_texture_get_pitch(texture, sub_resource_idx, &row_pitch, &slice_pitch); - texture3d_upload_data(texture, sub_resource_idx, context, NULL, &data, row_pitch, slice_pitch); + texture3d_upload_data(texture, sub_resource_idx, context, + texture->resource.format, NULL, &data, row_pitch, slice_pitch); } else if (sub_resource->locations & WINED3D_LOCATION_BUFFER) { @@ -2579,7 +2580,8 @@ static BOOL texture3d_load_location(struct wined3d_texture *texture, unsigned in wined3d_texture_bind_and_dirtify(texture, context, location == WINED3D_LOCATION_TEXTURE_SRGB); wined3d_texture_get_pitch(texture, sub_resource_idx, &row_pitch, &slice_pitch); - texture3d_upload_data(texture, sub_resource_idx, context, NULL, &data, row_pitch, slice_pitch); + texture3d_upload_data(texture, sub_resource_idx, context, + texture->resource.format, NULL, &data, row_pitch, slice_pitch); } else if (sub_resource->locations & WINED3D_LOCATION_TEXTURE_RGB) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4c655c4..8de352b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3084,7 +3084,7 @@ struct gl_texture struct wined3d_texture_ops { void (*texture_upload_data)(struct wined3d_texture *texture, unsigned int sub_resource_idx, - const struct wined3d_context *context, const struct wined3d_box *box, + const struct wined3d_context *context, const struct wined3d_format *format, const struct wined3d_box *box, const struct wined3d_const_bo_address *data, unsigned int row_pitch, unsigned int slice_pitch); BOOL (*texture_load_location)(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context, DWORD location); @@ -3284,7 +3284,7 @@ void wined3d_texture_set_swapchain(struct wined3d_texture *texture, void wined3d_texture_translate_drawable_coords(const struct wined3d_texture *texture, HWND window, RECT *rect) DECLSPEC_HIDDEN; void wined3d_texture_upload_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, - const struct wined3d_context *context, const struct wined3d_box *box, + const struct wined3d_context *context, const struct wined3d_format *format, const struct wined3d_box *box, const struct wined3d_const_bo_address *data, unsigned int row_pitch, unsigned int slice_pitch) DECLSPEC_HIDDEN; void wined3d_texture_validate_location(struct wined3d_texture *texture, unsigned int sub_resource_idx, DWORD location) DECLSPEC_HIDDEN;

1 0

Austin English : kernel32: Add GetNumaNodeProcessorMaskEx stub.
by Alexandre Julliard 20 Mar '18

20 Mar '18

Module: wine Branch: master Commit: 252752f8d99497ae6b1a5ca227fb56e69743a299 URL: https://source.winehq.org/git/wine.git/?a=commit;h=252752f8d99497ae6b1a5ca2… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Mar 19 14:15:59 2018 -0500 kernel32: Add GetNumaNodeProcessorMaskEx stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/process.c | 10 ++++++++++ dlls/kernelbase/kernelbase.spec | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 3a0bef9..aae22eb 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -746,7 +746,7 @@ @ stdcall GetNumaHighestNodeNumber(ptr) # @ stub GetNumaNodeNumberFromHandle @ stdcall GetNumaNodeProcessorMask(long ptr) -# @ stub GetNumaNodeProcessorMaskEx +@ stdcall GetNumaNodeProcessorMaskEx(long ptr) # @ stub GetNumaProcessorMap @ stdcall GetNumaProcessorNode(long ptr) # @ stub GetNumaProcessorNodeEx diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 4798100..47f1cfb 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -4019,6 +4019,16 @@ BOOL WINAPI GetNumaNodeProcessorMask(UCHAR node, PULONGLONG mask) } /********************************************************************** + * GetNumaNodeProcessorMaskEx (KERNEL32.@) + */ +BOOL WINAPI GetNumaNodeProcessorMaskEx(USHORT node, PGROUP_AFFINITY mask) +{ + FIXME("(%hu %p): stub\n", node, mask); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/********************************************************************** * GetNumaAvailableMemoryNode (KERNEL32.@) */ BOOL WINAPI GetNumaAvailableMemoryNode(UCHAR node, PULONGLONG available_bytes) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index e152c88..fd4e8d4 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -575,7 +575,7 @@ @ stdcall GetNativeSystemInfo(ptr) kernel32.GetNativeSystemInfo # @ stub GetNextFgPolicyRefreshInfoInternal @ stdcall GetNumaHighestNodeNumber(ptr) kernel32.GetNumaHighestNodeNumber -# @ stub GetNumaNodeProcessorMaskEx +@ stdcall GetNumaNodeProcessorMaskEx(long ptr) kernel32.GetNumaNodeProcessorMaskEx # @ stub GetNumaProximityNodeEx @ stdcall GetNumberFormatEx(wstr long wstr ptr ptr long) kernel32.GetNumberFormatEx @ stdcall GetNumberFormatW(long long wstr ptr ptr long) kernel32.GetNumberFormatW

1 0

← Newer
1
...
24
25
26
27
28
29
30
...
79
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 March 2018