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

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard March 23, 2017

March 23, 2017

Module: wine Branch: master Commit: 5e4eaa3264e02a2791e67fecf193ea5b58a1ef98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e4eaa3264e02a2791e67fecf… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Wed Mar 22 23:05:55 2017 +0200 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/lt.po b/po/lt.po index 19dd4a0..296660b 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2017-02-18 08:33+0300\n" +"PO-Revision-Date: 2017-03-22 23:05+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -3704,7 +3704,7 @@ msgstr "Tikėtasi masyvo objekto" #: ../../include/wine/wine_common_ver.rc:129 msgid "Wine kernel DLL" -msgstr "" +msgstr "Wine branduolio DLL" #: ../../include/wine/wine_common_ver.rc:134 winemac.rc:32 wineboot.rc:42 msgid "Wine"

1 0

Nikolay Sivov : dwrite: Handle allocation failure for main run bitmap.
by Alexandre Julliard March 23, 2017

March 23, 2017

Module: wine Branch: master Commit: 82509d7c15c54931d1f450dcd5759df986bb33a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82509d7c15c54931d1f450dcd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 23 17:04:18 2017 +0300 dwrite: Handle allocation failure for main run bitmap. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index de8b80a..b3e2286 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -4899,7 +4899,7 @@ static inline BYTE *get_pixel_ptr(BYTE *ptr, DWRITE_TEXTURE_TYPE type, const REC runbounds->left - bounds->left; } -static void glyphrunanalysis_render(struct dwrite_glyphrunanalysis *analysis, DWRITE_TEXTURE_TYPE type) +static HRESULT glyphrunanalysis_render(struct dwrite_glyphrunanalysis *analysis, DWRITE_TEXTURE_TYPE type) { static const BYTE masks[8] = {0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01}; struct dwrite_glyphbitmap glyph_bitmap; @@ -4913,13 +4913,18 @@ static void glyphrunanalysis_render(struct dwrite_glyphrunanalysis *analysis, DW hr = IDWriteFontFace_QueryInterface(analysis->run.fontFace, &IID_IDWriteFontFace4, (void **)&fontface); if (FAILED(hr)) { WARN("failed to get IDWriteFontFace4, 0x%08x\n", hr); - return; + return hr; } size = (analysis->bounds.right - analysis->bounds.left)*(analysis->bounds.bottom - analysis->bounds.top); if (type == DWRITE_TEXTURE_CLEARTYPE_3x1) size *= 3; - analysis->bitmap = heap_alloc_zero(size); + if (!(analysis->bitmap = heap_alloc_zero(size))) { + WARN("Failed to allocate run bitmap, %s, type %s.\n", wine_dbgstr_rect(&analysis->bounds), + type == DWRITE_TEXTURE_CLEARTYPE_3x1 ? "3x1" : "1x1"); + IDWriteFontFace4_Release(fontface); + return E_OUTOFMEMORY; + } origin.x = origin.y = 0.0f; is_rtl = analysis->run.bidiLevel & 1; @@ -5030,6 +5035,8 @@ static void glyphrunanalysis_render(struct dwrite_glyphrunanalysis *analysis, DW analysis->ascenderoffsets = NULL; analysis->run.glyphIndices = NULL; analysis->run.fontFace = NULL; + + return S_OK; } static HRESULT WINAPI glyphrunanalysis_CreateAlphaTexture(IDWriteGlyphRunAnalysis *iface, DWRITE_TEXTURE_TYPE type, @@ -5081,8 +5088,12 @@ static HRESULT WINAPI glyphrunanalysis_CreateAlphaTexture(IDWriteGlyphRunAnalysi BYTE *src, *dst; int y; - if (!(This->flags & RUNANALYSIS_BITMAP_READY)) - glyphrunanalysis_render(This, type); + if (!(This->flags & RUNANALYSIS_BITMAP_READY)) { + HRESULT hr; + + if (FAILED(hr = glyphrunanalysis_render(This, type))) + return hr; + } src = get_pixel_ptr(This->bitmap, type, &runbounds, &This->bounds); dst = get_pixel_ptr(bitmap, type, &runbounds, bounds);

1 0

Józef Kucia : d3d11: Use ARRAY_SIZE() macro.
by Alexandre Julliard March 23, 2017

March 23, 2017

Module: wine Branch: master Commit: 45aaffd142b56780975a33fbd3d37913a79415a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45aaffd142b56780975a33fbd… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 23 12:15:51 2017 +0100 d3d11: Use ARRAY_SIZE() macro. 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/async.c | 2 +- dlls/d3d11/d3d11_main.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3d11/async.c b/dlls/d3d11/async.c index 2270023..69cc00b 100644 --- a/dlls/d3d11/async.c +++ b/dlls/d3d11/async.c @@ -386,7 +386,7 @@ static HRESULT d3d_query_init(struct d3d_query *query, struct d3d_device *device /* D3D11_QUERY_SO_OVERFLOW_PREDICATE */ WINED3D_QUERY_TYPE_SO_OVERFLOW, }; - if (desc->Query >= sizeof(query_type_map) / sizeof(*query_type_map)) + if (desc->Query >= ARRAY_SIZE(query_type_map)) { FIXME("Unhandled query type %#x.\n", desc->Query); return E_INVALIDARG; diff --git a/dlls/d3d11/d3d11_main.c b/dlls/d3d11/d3d11_main.c index ef2c40c..154a376 100644 --- a/dlls/d3d11/d3d11_main.c +++ b/dlls/d3d11/d3d11_main.c @@ -118,7 +118,7 @@ HRESULT WINAPI D3D11CoreRegisterLayers(void) {DXGI_DEVICE_LAYER_D3D10_DEVICE, layer_init, layer_get_size, layer_create, layer_set_feature_level}, }; - DXGID3D10RegisterLayers(layers, sizeof(layers)/sizeof(*layers)); + DXGID3D10RegisterLayers(layers, ARRAY_SIZE(layers)); return S_OK; } @@ -265,7 +265,7 @@ HRESULT WINAPI D3D11CreateDevice(IDXGIAdapter *adapter, D3D_DRIVER_TYPE driver_t if (!feature_levels) { feature_levels = default_feature_levels; - levels = sizeof(default_feature_levels) / sizeof(default_feature_levels[0]); + levels = ARRAY_SIZE(default_feature_levels); } hr = D3D11CoreCreateDevice(factory, adapter, flags, feature_levels, levels, &device); IDXGIAdapter_Release(adapter);

1 0

Józef Kucia : d3d11: Implement d3d11_device_CreateGeometryShaderWithStreamOutput().
by Alexandre Julliard March 23, 2017

March 23, 2017

Module: wine Branch: master Commit: acd7d2e09ab22d8bb185a1623fa78067fd555ef8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=acd7d2e09ab22d8bb185a1623… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 23 12:15:50 2017 +0100 d3d11: Implement d3d11_device_CreateGeometryShaderWithStreamOutput(). 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/d3d11_private.h | 6 +++ dlls/d3d11/device.c | 29 ++++++++++--- dlls/d3d11/shader.c | 105 +++++++++++++++++++++++++++++++++++++++------ dlls/d3d11/tests/d3d11.c | 5 +-- 4 files changed, 123 insertions(+), 22 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=acd7d2e09ab22d8bb185a…

1 0

Józef Kucia : wined3d: Introduce wined3d_stream_output_desc.
by Alexandre Julliard March 23, 2017

March 23, 2017

Module: wine Branch: master Commit: 5bf5655bfddd26c0f596cf59e61121fa8777a5db URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bf5655bfddd26c0f596cf59e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 23 12:15:48 2017 +0100 wined3d: Introduce wined3d_stream_output_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/shader.c | 2 +- dlls/wined3d/device.c | 4 ++-- dlls/wined3d/shader.c | 13 ++++++++----- dlls/wined3d/stateblock.c | 2 +- dlls/wined3d/wined3d.spec | 2 +- dlls/wined3d/wined3d_private.h | 3 +-- include/wine/wined3d.h | 24 +++++++++++++++++++++++- 7 files changed, 37 insertions(+), 13 deletions(-) diff --git a/dlls/d3d11/shader.c b/dlls/d3d11/shader.c index 547181e..a22a0c3 100644 --- a/dlls/d3d11/shader.c +++ b/dlls/d3d11/shader.c @@ -1194,7 +1194,7 @@ static HRESULT d3d_geometry_shader_init(struct d3d_geometry_shader *shader, stru } desc.max_version = d3d_sm_from_feature_level(device->feature_level); - hr = wined3d_shader_create_gs(device->wined3d_device, &desc, shader, + hr = wined3d_shader_create_gs(device->wined3d_device, &desc, NULL, shader, &d3d_geometry_shader_wined3d_parent_ops, &shader->wined3d_shader); shader_free_signature(&desc.input_signature); shader_free_signature(&desc.output_signature); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 9b0fcfb..556d555 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1300,7 +1300,7 @@ void CDECL wined3d_device_set_stream_output(struct wined3d_device *device, UINT TRACE("device %p, idx %u, buffer %p, offset %u.\n", device, idx, buffer, offset); - if (idx >= MAX_STREAM_OUT) + if (idx >= WINED3D_MAX_STREAM_OUTPUT_BUFFERS) { WARN("Invalid stream output %u.\n", idx); return; @@ -1324,7 +1324,7 @@ struct wined3d_buffer * CDECL wined3d_device_get_stream_output(struct wined3d_de { TRACE("device %p, idx %u, offset %p.\n", device, idx, offset); - if (idx >= MAX_STREAM_OUT) + if (idx >= WINED3D_MAX_STREAM_OUTPUT_BUFFERS) { WARN("Invalid stream output %u.\n", idx); return NULL; diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 2c9976d..020e943 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -3781,16 +3781,19 @@ HRESULT CDECL wined3d_shader_create_ds(struct wined3d_device *device, const stru } HRESULT CDECL wined3d_shader_create_gs(struct wined3d_device *device, const struct wined3d_shader_desc *desc, - void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_shader **shader) + const struct wined3d_stream_output_desc *so_desc, void *parent, + const struct wined3d_parent_ops *parent_ops, struct wined3d_shader **shader) { struct wined3d_shader *object; HRESULT hr; - TRACE("device %p, desc %p, parent %p, parent_ops %p, shader %p.\n", - device, desc, parent, parent_ops, shader); + TRACE("device %p, desc %p, so_desc %p, parent %p, parent_ops %p, shader %p.\n", + device, desc, so_desc, parent, parent_ops, shader); - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); - if (!object) + if (so_desc) + FIXME("Stream output not supported.\n"); + + if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) return E_OUTOFMEMORY; if (FAILED(hr = geometry_shader_init(object, device, desc, parent, parent_ops))) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 8b91353..b197052 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -447,7 +447,7 @@ void state_unbind_resources(struct wined3d_state *state) } } - for (i = 0; i < MAX_STREAM_OUT; ++i) + for (i = 0; i < WINED3D_MAX_STREAM_OUTPUT_BUFFERS; ++i) { if ((buffer = state->stream_output[i].buffer)) { diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 817deca..ad02eeb 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -218,7 +218,7 @@ @ cdecl wined3d_shader_create_cs(ptr ptr ptr ptr ptr) @ cdecl wined3d_shader_create_ds(ptr ptr ptr ptr ptr) -@ cdecl wined3d_shader_create_gs(ptr ptr ptr ptr ptr) +@ cdecl wined3d_shader_create_gs(ptr ptr ptr ptr ptr ptr) @ cdecl wined3d_shader_create_hs(ptr ptr ptr ptr ptr) @ cdecl wined3d_shader_create_ps(ptr ptr ptr ptr ptr) @ cdecl wined3d_shader_create_vs(ptr ptr ptr ptr ptr) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b58da36..cb8823d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -257,7 +257,6 @@ static inline enum complex_fixup get_complex_fixup(struct color_fixup_desc fixup } /* Device caps */ -#define MAX_STREAM_OUT 4 #define MAX_STREAMS 16 #define MAX_TEXTURES 8 #define MAX_FRAGMENT_SAMPLERS 16 @@ -2557,7 +2556,7 @@ struct wined3d_state const struct wined3d_fb_state *fb; struct wined3d_vertex_declaration *vertex_declaration; - struct wined3d_stream_output stream_output[MAX_STREAM_OUT]; + struct wined3d_stream_output stream_output[WINED3D_MAX_STREAM_OUTPUT_BUFFERS]; struct wined3d_stream_state streams[MAX_STREAMS + 1 /* tesselated pseudo-stream */]; struct wined3d_buffer *index_buffer; enum wined3d_format_id index_format; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 3b0f6db..bb405fe 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1518,6 +1518,9 @@ enum wined3d_shader_byte_code_format #define WINED3D_OUTPUT_SLOT_SEMANTIC 0xffffffff #define WINED3D_OUTPUT_SLOT_UNUSED 0xfffffffe +#define WINED3D_MAX_STREAM_OUTPUT_BUFFERS 4 +#define WINED3D_STREAM_OUTPUT_GAP 0xffffffff + #define WINED3D_VIEW_BUFFER_RAW 0x00000001 #define WINED3D_VIEW_BUFFER_APPEND 0x00000002 #define WINED3D_VIEW_BUFFER_COUNTER 0x00000004 @@ -1975,6 +1978,24 @@ struct wined3d_shader_desc unsigned int max_version; }; +struct wined3d_stream_output_element +{ + unsigned int stream_idx; + unsigned int register_idx; + BYTE component_idx; + BYTE component_count; + BYTE output_slot; +}; + +struct wined3d_stream_output_desc +{ + struct wined3d_stream_output_element *elements; + unsigned int element_count; + unsigned int buffer_strides[WINED3D_MAX_STREAM_OUTPUT_BUFFERS]; + unsigned int buffer_stride_count; + unsigned int rasterizer_stream_idx; +}; + struct wined3d_view_desc { enum wined3d_format_id format_id; @@ -2486,7 +2507,8 @@ HRESULT __cdecl wined3d_shader_create_cs(struct wined3d_device *device, const st HRESULT __cdecl wined3d_shader_create_ds(struct wined3d_device *device, const struct wined3d_shader_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_shader **shader); HRESULT __cdecl wined3d_shader_create_gs(struct wined3d_device *device, const struct wined3d_shader_desc *desc, - void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_shader **shader); + const struct wined3d_stream_output_desc *so_desc, void *parent, const struct wined3d_parent_ops *parent_ops, + struct wined3d_shader **shader); HRESULT __cdecl wined3d_shader_create_hs(struct wined3d_device *device, const struct wined3d_shader_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_shader **shader); HRESULT __cdecl wined3d_shader_create_ps(struct wined3d_device *device, const struct wined3d_shader_desc *desc,

1 0

Piotr Caban : msvcrt: Add Context class static functions stubs.
by Alexandre Julliard March 23, 2017

March 23, 2017

Module: wine Branch: master Commit: e70265feb6cb1c964907edb3f93d978d24388980 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e70265feb6cb1c964907edb3f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 23 11:40:58 2017 +0100 msvcrt: Add Context class static functions stubs. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/concrt140/concrt140.spec | 20 ++++---- dlls/msvcr100/Makefile.in | 1 + dlls/msvcr100/msvcr100.spec | 20 ++++---- dlls/msvcr110/Makefile.in | 1 + dlls/msvcr110/msvcr110.spec | 20 ++++---- dlls/msvcr120/Makefile.in | 1 + dlls/msvcr120/msvcr120.spec | 20 ++++---- dlls/msvcr120_app/msvcr120_app.spec | 20 ++++---- dlls/msvcrt/Makefile.in | 1 + dlls/msvcrt/scheduler.c | 98 +++++++++++++++++++++++++++++++++++++ 10 files changed, 152 insertions(+), 50 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e70265feb6cb1c964907e…

1 0

Piotr Caban : msvcrt: Add ExternalContextBase class stub.
by Alexandre Julliard March 23, 2017

March 23, 2017

Module: wine Branch: master Commit: 3dff8b8213e2f37992aedd2bafa69c1a68707fe8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3dff8b8213e2f37992aedd2ba… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 23 11:41:05 2017 +0100 msvcrt: Add ExternalContextBase class stub. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/cppexcept.h | 2 +- dlls/msvcrt/cxx.h | 15 ++++ dlls/msvcrt/main.c | 10 +++ dlls/msvcrt/msvcrt.h | 6 ++ dlls/msvcrt/scheduler.c | 187 ++++++++++++++++++++++++++++++++++++++++++++++-- 5 files changed, 213 insertions(+), 7 deletions(-) diff --git a/dlls/msvcrt/cppexcept.h b/dlls/msvcrt/cppexcept.h index 16a6e16..6ea5818 100644 --- a/dlls/msvcrt/cppexcept.h +++ b/dlls/msvcrt/cppexcept.h @@ -33,7 +33,7 @@ typedef struct __type_info { const vtable_ptr *vtable; char *name; /* Unmangled name, allocated lazily */ - char mangled[32]; /* Variable length, but we declare it large enough for static RTTI */ + char mangled[64]; /* Variable length, but we declare it large enough for static RTTI */ } type_info; /* exception object */ diff --git a/dlls/msvcrt/cxx.h b/dlls/msvcrt/cxx.h index 8f31f24..baf519f 100644 --- a/dlls/msvcrt/cxx.h +++ b/dlls/msvcrt/cxx.h @@ -259,3 +259,18 @@ typedef struct } rtti_object_locator; #endif + +#ifdef __i386__ + +#define CALL_VTBL_FUNC(this, off, ret, type, args) ((ret (WINAPI*)type)&vtbl_wrapper_##off)args + +extern void *vtbl_wrapper_0; +extern void *vtbl_wrapper_4; +extern void *vtbl_wrapper_8; +extern void *vtbl_wrapper_20; + +#else + +#define CALL_VTBL_FUNC(this, off, ret, type, args) ((ret (__cdecl***)type)this)[0][off/4]args + +#endif diff --git a/dlls/msvcrt/main.c b/dlls/msvcrt/main.c index a930a32..0be8dd3 100644 --- a/dlls/msvcrt/main.c +++ b/dlls/msvcrt/main.c @@ -115,6 +115,9 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) msvcrt_init_console(); msvcrt_init_args(); msvcrt_init_signals(); +#if _MSVCR_VER >= 100 && _MSVCR_VER <= 120 + msvcrt_init_scheduler(hinstDLL); +#endif #if _MSVCR_VER == 0 /* don't allow unloading msvcrt, we can't setup file handles twice */ LdrAddRefDll( LDR_ADDREF_DLL_PIN, hinstDLL ); @@ -137,11 +140,18 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) if (!msvcrt_free_tls()) return FALSE; MSVCRT__free_locale(MSVCRT_locale); +#if _MSVCR_VER >= 100 && _MSVCR_VER <= 120 + msvcrt_free_scheduler_thread(); + msvcrt_free_scheduler(); +#endif msvcrt_destroy_heap(); TRACE("finished process free\n"); break; case DLL_THREAD_DETACH: msvcrt_free_tls_mem(); +#if _MSVCR_VER >= 100 && _MSVCR_VER <= 120 + msvcrt_free_scheduler_thread(); +#endif TRACE("finished thread free\n"); break; } diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index cee8113..659a3dc 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -329,6 +329,12 @@ extern void msvcrt_free_popen_data(void) DECLSPEC_HIDDEN; extern BOOL msvcrt_init_heap(void) DECLSPEC_HIDDEN; extern void msvcrt_destroy_heap(void) DECLSPEC_HIDDEN; +#if _MSVCR_VER >= 100 +extern void msvcrt_init_scheduler(void*) DECLSPEC_HIDDEN; +extern void msvcrt_free_scheduler(void) DECLSPEC_HIDDEN; +extern void msvcrt_free_scheduler_thread(void) DECLSPEC_HIDDEN; +#endif + extern unsigned msvcrt_create_io_inherit_block(WORD*, BYTE**) DECLSPEC_HIDDEN; extern unsigned int __cdecl _control87(unsigned int, unsigned int); diff --git a/dlls/msvcrt/scheduler.c b/dlls/msvcrt/scheduler.c index 4c64859..257637e 100644 --- a/dlls/msvcrt/scheduler.c +++ b/dlls/msvcrt/scheduler.c @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "config.h" + #include <stdarg.h> #include "windef.h" @@ -31,23 +33,89 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); +#ifdef __i386__ + +#define DEFINE_VTBL_WRAPPER(off) \ + __ASM_GLOBAL_FUNC(vtbl_wrapper_ ## off, \ + "popl %eax\n\t" \ + "popl %ecx\n\t" \ + "pushl %eax\n\t" \ + "movl 0(%ecx), %eax\n\t" \ + "jmp *" #off "(%eax)\n\t") + +DEFINE_VTBL_WRAPPER(0); +DEFINE_VTBL_WRAPPER(4); +DEFINE_VTBL_WRAPPER(8); +DEFINE_VTBL_WRAPPER(20); + +#endif + typedef struct { const vtable_ptr *vtable; } Context; +#define call_Context_GetId(this) CALL_VTBL_FUNC(this, 0, \ + unsigned int, (const Context*), (this)) +#define call_Context_GetVirtualProcessorId(this) CALL_VTBL_FUNC(this, 4, \ + unsigned int, (const Context*), (this)) +#define call_Context_GetScheduleGroupId(this) CALL_VTBL_FUNC(this, 8, \ + unsigned int, (const Context*), (this)) +#define call_Context_dtor(this, flags) CALL_VTBL_FUNC(this, 20, \ + Context*, (Context*, unsigned int), (this, flags)) + +typedef struct { + Context context; +} ExternalContextBase; +extern const vtable_ptr MSVCRT_ExternalContextBase_vtable; +static void ExternalContextBase_ctor(ExternalContextBase*); + +static int context_tls_index = TLS_OUT_OF_INDEXES; + +static Context* try_get_current_context(void) +{ + if (context_tls_index == TLS_OUT_OF_INDEXES) + return NULL; + return TlsGetValue(context_tls_index); +} + +static Context* get_current_context(void) +{ + Context *ret; + + if (context_tls_index == TLS_OUT_OF_INDEXES) { + int tls_index = TlsAlloc(); + if (tls_index == TLS_OUT_OF_INDEXES) { + /* throw scheduler_resource_allocation_error */ + return NULL; + } + + if(InterlockedCompareExchange(&context_tls_index, tls_index, TLS_OUT_OF_INDEXES) != TLS_OUT_OF_INDEXES) + TlsFree(tls_index); + } + + ret = TlsGetValue(context_tls_index); + if (!ret) { + ExternalContextBase *context = MSVCRT_operator_new(sizeof(ExternalContextBase)); + ExternalContextBase_ctor(context); + TlsSetValue(context_tls_index, context); + ret = &context->context; + } + return ret; +} /* ?CurrentContext(a)Context@Concurrency@@SAPAV12(a)XZ */ /* ?CurrentContext(a)Context@Concurrency@@SAPEAV12(a)XZ */ Context* __cdecl Context_CurrentContext(void) { - FIXME("()\n"); - return NULL; + TRACE("()\n"); + return get_current_context(); } /* ?Id(a)Context@Concurrency@@SAIXZ */ unsigned int __cdecl Context_Id(void) { - FIXME("()\n"); - return -1; + Context *ctx = try_get_current_context(); + TRACE("()\n"); + return ctx ? call_Context_GetId(ctx) : -1; } /* ?Block(a)Context@Concurrency@@SAXXZ */ @@ -84,15 +152,122 @@ void __cdecl Context_Oversubscribe(MSVCRT_bool begin) /* ?ScheduleGroupId(a)Context@Concurrency@@SAIXZ */ unsigned int __cdecl Context_ScheduleGroupId(void) { - FIXME("()\n"); - return -1; + Context *ctx = try_get_current_context(); + TRACE("()\n"); + return ctx ? call_Context_GetScheduleGroupId(ctx) : -1; } /* ?VirtualProcessorId(a)Context@Concurrency@@SAIXZ */ unsigned int __cdecl Context_VirtualProcessorId(void) { + Context *ctx = try_get_current_context(); FIXME("()\n"); + return ctx ? call_Context_GetVirtualProcessorId(ctx) : -1; +} + +DEFINE_THISCALL_WRAPPER(ExternalContextBase_GetId, 4) +unsigned int __thiscall ExternalContextBase_GetId(const ExternalContextBase *this) +{ + FIXME("(%p)->() stub\n", this); + return -1; +} + +DEFINE_THISCALL_WRAPPER(ExternalContextBase_GetVirtualProcessorId, 4) +unsigned int __thiscall ExternalContextBase_GetVirtualProcessorId(const ExternalContextBase *this) +{ + FIXME("(%p)->() stub\n", this); return -1; } +DEFINE_THISCALL_WRAPPER(ExternalContextBase_GetScheduleGroupId, 4) +unsigned int __thiscall ExternalContextBase_GetScheduleGroupId(const ExternalContextBase *this) +{ + FIXME("(%p)->() stub\n", this); + return -1; +} + +DEFINE_THISCALL_WRAPPER(ExternalContextBase_Unblock, 4) +void __thiscall ExternalContextBase_Unblock(ExternalContextBase *this) +{ + FIXME("(%p)->() stub\n", this); +} + +DEFINE_THISCALL_WRAPPER(ExternalContextBase_IsSynchronouslyBlocked, 4) +MSVCRT_bool __thiscall ExternalContextBase_IsSynchronouslyBlocked(const ExternalContextBase *this) +{ + FIXME("(%p)->() stub\n", this); + return FALSE; +} + +static void ExternalContextBase_dtor(ExternalContextBase *this) +{ +} + +DEFINE_THISCALL_WRAPPER(ExternalContextBase_vector_dtor, 8) +Context* __thiscall ExternalContextBase_vector_dtor(ExternalContextBase *this, unsigned int flags) +{ + TRACE("(%p %x)\n", this, flags); + if(flags & 2) { + /* we have an array, with the number of elements stored before the first object */ + INT_PTR i, *ptr = (INT_PTR *)this-1; + + for(i=*ptr-1; i>=0; i--) + ExternalContextBase_dtor(this+i); + MSVCRT_operator_delete(ptr); + } else { + ExternalContextBase_dtor(this); + if(flags & 1) + MSVCRT_operator_delete(this); + } + + return &this->context; +} + +static void ExternalContextBase_ctor(ExternalContextBase *this) +{ + this->context.vtable = &MSVCRT_ExternalContextBase_vtable; +} + +extern const vtable_ptr MSVCRT_type_info_vtable; +DEFINE_RTTI_DATA0(Context, 0, ".?AVContext(a)Concurrency@@") +DEFINE_RTTI_DATA1(ContextBase, 0, &Context_rtti_base_descriptor, ".?AVContextBase(a)details@Concurrency@@") +DEFINE_RTTI_DATA2(ExternalContextBase, 0, &ContextBase_rtti_base_descriptor, + &Context_rtti_base_descriptor, ".?AVExternalContextBase(a)details@Concurrency@@") + +#ifndef __GNUC__ +void __asm_dummy_vtables(void) { +#endif + __ASM_VTABLE(ExternalContextBase, + VTABLE_ADD_FUNC(ExternalContextBase_GetId) + VTABLE_ADD_FUNC(ExternalContextBase_GetVirtualProcessorId) + VTABLE_ADD_FUNC(ExternalContextBase_GetScheduleGroupId) + VTABLE_ADD_FUNC(ExternalContextBase_Unblock) + VTABLE_ADD_FUNC(ExternalContextBase_IsSynchronouslyBlocked) + VTABLE_ADD_FUNC(ExternalContextBase_vector_dtor)); +#ifndef __GNUC__ +} +#endif + +void msvcrt_init_scheduler(void *base) +{ +#ifdef __x86_64__ + init_Context_rtti(base); + init_ContextBase_rtti(base); + init_ExternalContextBase_rtti(base); +#endif +} + +void msvcrt_free_scheduler(void) +{ + if (context_tls_index != TLS_OUT_OF_INDEXES) + TlsFree(context_tls_index); +} + +void msvcrt_free_scheduler_thread(void) +{ + Context *context = try_get_current_context(); + if (!context) return; + call_Context_dtor(context, 1); +} + #endif /* _MSVCR_VER >= 100 */

1 0

Józef Kucia : d3d11: Factor out shader_find_signature_element() function.
by Alexandre Julliard March 23, 2017

March 23, 2017

Module: wine Branch: master Commit: 7583bcfc22976c6633190c4fd9698171b406ada3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7583bcfc22976c6633190c4fd… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 23 12:15:49 2017 +0100 d3d11: Factor out shader_find_signature_element() function. 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/d3d11_private.h | 2 ++ dlls/d3d11/inputlayout.c | 16 ++++------------ dlls/d3d11/shader.c | 15 +++++++++++++++ 3 files changed, 21 insertions(+), 12 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 53be0f8..62f46ea 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -353,6 +353,8 @@ HRESULT d3d11_compute_shader_create(struct d3d_device *device, const void *byte_ struct d3d11_compute_shader *unsafe_impl_from_ID3D11ComputeShader(ID3D11ComputeShader *iface) DECLSPEC_HIDDEN; HRESULT shader_parse_signature(const char *data, DWORD data_size, struct wined3d_shader_signature *s) DECLSPEC_HIDDEN; +struct wined3d_shader_signature_element *shader_find_signature_element(const struct wined3d_shader_signature *s, + const char *semantic_name, unsigned int semantic_idx) DECLSPEC_HIDDEN; void shader_free_signature(struct wined3d_shader_signature *s) DECLSPEC_HIDDEN; /* ID3D11ClassLinkage */ diff --git a/dlls/d3d11/inputlayout.c b/dlls/d3d11/inputlayout.c index 3d7135a..1fdb2c3 100644 --- a/dlls/d3d11/inputlayout.c +++ b/dlls/d3d11/inputlayout.c @@ -65,7 +65,7 @@ static HRESULT d3d11_input_layout_to_wined3d_declaration(const D3D11_INPUT_ELEME { struct wined3d_vertex_element *e = &(*wined3d_elements)[i]; const D3D11_INPUT_ELEMENT_DESC *f = &element_descs[i]; - unsigned int j; + struct wined3d_shader_signature_element *element; e->format = wined3dformat_from_dxgi_format(f->Format); e->input_slot = f->InputSlot; @@ -77,17 +77,9 @@ static HRESULT d3d11_input_layout_to_wined3d_declaration(const D3D11_INPUT_ELEME e->usage = 0; e->usage_idx = 0; - for (j = 0; j < is.element_count; ++j) - { - if (!strcasecmp(element_descs[i].SemanticName, is.elements[j].semantic_name) - && element_descs[i].SemanticIndex == is.elements[j].semantic_idx) - { - e->output_slot = is.elements[j].register_idx; - break; - } - } - - if (e->output_slot == WINED3D_OUTPUT_SLOT_UNUSED) + if ((element = shader_find_signature_element(&is, f->SemanticName, f->SemanticIndex))) + e->output_slot = element->register_idx; + else WARN("Unused input element %u.\n", i); } diff --git a/dlls/d3d11/shader.c b/dlls/d3d11/shader.c index a22a0c3..87312c3 100644 --- a/dlls/d3d11/shader.c +++ b/dlls/d3d11/shader.c @@ -226,6 +226,21 @@ HRESULT shader_parse_signature(const char *data, DWORD data_size, struct wined3d return S_OK; } +struct wined3d_shader_signature_element *shader_find_signature_element(const struct wined3d_shader_signature *s, + const char *semantic_name, unsigned int semantic_idx) +{ + struct wined3d_shader_signature_element *e = s->elements; + unsigned int i; + + for (i = 0; i < s->element_count; ++i) + { + if (!strcasecmp(e[i].semantic_name, semantic_name) && e[i].semantic_idx == semantic_idx) + return &e[i]; + } + + return NULL; +} + void shader_free_signature(struct wined3d_shader_signature *s) { HeapFree(GetProcessHeap(), 0, s->elements);

1 0

Piotr Caban : msvcrt: Move bad_alloc vtable definition into __asm_dummy_vtables function.
by Alexandre Julliard March 23, 2017

March 23, 2017

Module: wine Branch: master Commit: 27185abe633ab37d4c0c62396a9736326a8a8401 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27185abe633ab37d4c0c62396… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 23 11:41:28 2017 +0100 msvcrt: Move bad_alloc vtable definition into __asm_dummy_vtables function. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/cpp.c | 84 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 43 insertions(+), 41 deletions(-) diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index a3037c8..2cde8b2 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -649,6 +649,34 @@ void * __thiscall MSVCRT_type_info_vector_dtor(type_info * _this, unsigned int f return _this; } +#if _MSVCR_VER >= 80 +typedef exception bad_alloc; +extern const vtable_ptr MSVCRT_bad_alloc_vtable; + +static void bad_alloc_ctor(bad_alloc *this, const char **name) +{ + MSVCRT_exception_ctor(this, name); + this->vtable = &MSVCRT_bad_alloc_vtable; +} + +/* bad_alloc class implementation */ +DEFINE_THISCALL_WRAPPER(MSVCRT_bad_alloc_copy_ctor,8) +bad_alloc * __thiscall MSVCRT_bad_alloc_copy_ctor(bad_alloc * _this, const bad_alloc * rhs) +{ + TRACE("(%p %p)\n", _this, rhs); + MSVCRT_exception_copy_ctor(_this, rhs); + _this->vtable = &MSVCRT_bad_alloc_vtable; + return _this; +} + +DEFINE_THISCALL_WRAPPER(MSVCRT_bad_alloc_dtor,4) +void __thiscall MSVCRT_bad_alloc_dtor(bad_alloc * _this) +{ + TRACE("(%p)\n", _this); + MSVCRT_exception_dtor(_this); +} +#endif + #if _MSVCR_VER >= 100 typedef struct { exception e; @@ -724,6 +752,9 @@ __ASM_VTABLE(exception, __ASM_VTABLE(exception_old, VTABLE_ADD_FUNC(MSVCRT_exception_vector_dtor) VTABLE_ADD_FUNC(MSVCRT_what_exception)); +__ASM_VTABLE(bad_alloc, + VTABLE_ADD_FUNC(MSVCRT_exception_vector_dtor) + VTABLE_ADD_FUNC(MSVCRT_what_exception)); #endif __ASM_VTABLE(bad_typeid, VTABLE_ADD_FUNC(MSVCRT_bad_typeid_vector_dtor) @@ -751,6 +782,7 @@ DEFINE_RTTI_DATA0( exception_old, 0, ".?AVexception@@" ) DEFINE_RTTI_DATA1( bad_typeid, 0, &exception_rtti_base_descriptor, ".?AVbad_typeid(a)std@@" ) DEFINE_RTTI_DATA1( bad_cast, 0, &exception_rtti_base_descriptor, ".?AVbad_cast(a)std@@" ) DEFINE_RTTI_DATA2( __non_rtti_object, 0, &bad_typeid_rtti_base_descriptor, &exception_rtti_base_descriptor, ".?AV__non_rtti_object(a)std@@" ) +DEFINE_RTTI_DATA1( bad_alloc, 0, &exception_rtti_base_descriptor, ".?AVbad_alloc(a)std@@" ) #else DEFINE_RTTI_DATA0( exception, 0, ".?AVexception@@" ) DEFINE_RTTI_DATA1( bad_typeid, 0, &exception_rtti_base_descriptor, ".?AVbad_typeid@@" ) @@ -766,49 +798,11 @@ DEFINE_EXCEPTION_TYPE_INFO( exception, 0, NULL, NULL ) DEFINE_EXCEPTION_TYPE_INFO( bad_typeid, 1, &exception_cxx_type_info, NULL ) DEFINE_EXCEPTION_TYPE_INFO( bad_cast, 1, &exception_cxx_type_info, NULL ) DEFINE_EXCEPTION_TYPE_INFO( __non_rtti_object, 2, &bad_typeid_cxx_type_info, &exception_cxx_type_info ) -#if _MSVCR_VER >= 100 -DEFINE_EXCEPTION_TYPE_INFO(scheduler_resource_allocation_error, 1, &exception_cxx_type_info, NULL) -#endif - #if _MSVCR_VER >= 80 -typedef exception bad_alloc; -extern const vtable_ptr MSVCRT_bad_alloc_vtable; - -static void bad_alloc_ctor(bad_alloc *this, const char **name) -{ - MSVCRT_exception_ctor(this, name); - this->vtable = &MSVCRT_bad_alloc_vtable; -} - -/* bad_alloc class implementation */ -DEFINE_THISCALL_WRAPPER(MSVCRT_bad_alloc_copy_ctor,8) -bad_alloc * __thiscall MSVCRT_bad_alloc_copy_ctor(bad_alloc * _this, const bad_alloc * rhs) -{ - TRACE("(%p %p)\n", _this, rhs); - MSVCRT_exception_copy_ctor(_this, rhs); - _this->vtable = &MSVCRT_bad_alloc_vtable; - return _this; -} - -DEFINE_THISCALL_WRAPPER(MSVCRT_bad_alloc_dtor,4) -void __thiscall MSVCRT_bad_alloc_dtor(bad_alloc * _this) -{ - TRACE("(%p)\n", _this); - MSVCRT_exception_dtor(_this); -} - -__ASM_VTABLE(bad_alloc, - VTABLE_ADD_FUNC(MSVCRT_exception_vector_dtor) - VTABLE_ADD_FUNC(MSVCRT_what_exception)); -DEFINE_RTTI_DATA1( bad_alloc, 0, &exception_rtti_base_descriptor, ".?AVbad_alloc(a)std@@" ) DEFINE_EXCEPTION_TYPE_INFO( bad_alloc, 1, &exception_cxx_type_info, NULL ) - -void throw_bad_alloc(const char *str) -{ - bad_alloc e; - bad_alloc_ctor(&e, &str); - _CxxThrowException(&e, &bad_alloc_exception_type); -} +#endif +#if _MSVCR_VER >= 100 +DEFINE_EXCEPTION_TYPE_INFO(scheduler_resource_allocation_error, 1, &exception_cxx_type_info, NULL) #endif void msvcrt_init_exception(void *base) @@ -840,6 +834,14 @@ void msvcrt_init_exception(void *base) #endif } +#if _MSVCR_VER >= 80 +void throw_bad_alloc(const char *str) +{ + bad_alloc e; + bad_alloc_ctor(&e, &str); + _CxxThrowException(&e, &bad_alloc_exception_type); +} +#endif /****************************************************************** * ?set_terminate@@YAP6AXXZP6AXXZ(a)Z (MSVCRT.@)

1 0

Piotr Caban : msvcrt: Throw throw_scheduler_resource_allocation_error on Context tls index allocation error.
by Alexandre Julliard March 23, 2017

March 23, 2017

Module: wine Branch: master Commit: 2458f06380bf2ac6c2d51170b96adc6854d57d23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2458f06380bf2ac6c2d51170b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 23 11:41:36 2017 +0100 msvcrt: Throw throw_scheduler_resource_allocation_error on Context tls index allocation error. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/cpp.c | 9 +++++++++ dlls/msvcrt/msvcrt.h | 3 +++ dlls/msvcrt/scheduler.c | 3 ++- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index 2cde8b2..e86df53 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -843,6 +843,15 @@ void throw_bad_alloc(const char *str) } #endif +#if _MSVCR_VER >= 100 +void throw_scheduler_resource_allocation_error(const char *str, HRESULT hr) +{ + scheduler_resource_allocation_error e; + scheduler_resource_allocation_error_ctor_name(&e, str, hr); + _CxxThrowException(&e.e, &scheduler_resource_allocation_error_exception_type); +} +#endif + /****************************************************************** * ?set_terminate@@YAP6AXXZP6AXXZ(a)Z (MSVCRT.@) * diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 659a3dc..dd957ef 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -285,6 +285,9 @@ void msvcrt_set_errno(int) DECLSPEC_HIDDEN; #if _MSVCR_VER >= 80 void throw_bad_alloc(const char*) DECLSPEC_HIDDEN; #endif +#if _MSVCR_VER >= 100 +void throw_scheduler_resource_allocation_error(const char*, HRESULT) DECLSPEC_HIDDEN; +#endif void __cdecl _purecall(void); void __cdecl _amsg_exit(int errnum); diff --git a/dlls/msvcrt/scheduler.c b/dlls/msvcrt/scheduler.c index 470d141..1ab7906 100644 --- a/dlls/msvcrt/scheduler.c +++ b/dlls/msvcrt/scheduler.c @@ -87,7 +87,8 @@ static Context* get_current_context(void) if (context_tls_index == TLS_OUT_OF_INDEXES) { int tls_index = TlsAlloc(); if (tls_index == TLS_OUT_OF_INDEXES) { - /* throw scheduler_resource_allocation_error */ + throw_scheduler_resource_allocation_error(NULL, + HRESULT_FROM_WIN32(GetLastError())); return NULL; }

1 0