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

Henri Verbeet : wined3d: Pass a texture and sub-resource index to wined3d_surface_blt().
by Alexandre Julliard March 13, 2018

March 13, 2018

Module: wine Branch: master Commit: 991b1b77c84d4e85f51bb43f79917c55765741cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=991b1b77c84d4e85f51bb43f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 13 14:11:02 2018 +0330 wined3d: Pass a texture and sub-resource index to wined3d_surface_blt(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 11 ++--------- dlls/wined3d/surface.c | 18 ++++++++---------- dlls/wined3d/wined3d_private.h | 7 ++++--- 3 files changed, 14 insertions(+), 22 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 6e0ecd1..480717c 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -2048,15 +2048,8 @@ static void wined3d_cs_exec_blt_sub_resource(struct wined3d_cs *cs, const void * } else if (op->dst_resource->type == WINED3D_RTYPE_TEXTURE_2D) { - struct wined3d_surface *dst_surface, *src_surface; - struct wined3d_texture *dst_texture, *src_texture; - - dst_texture = texture_from_resource(op->dst_resource); - src_texture = texture_from_resource(op->src_resource); - dst_surface = dst_texture->sub_resources[op->dst_sub_resource_idx].u.surface; - src_surface = src_texture->sub_resources[op->src_sub_resource_idx].u.surface; - - if (FAILED(wined3d_surface_blt(dst_surface, &op->dst_box, src_surface, + if (FAILED(texture2d_blt(texture_from_resource(op->dst_resource), op->dst_sub_resource_idx, + &op->dst_box, texture_from_resource(op->src_resource), op->src_sub_resource_idx, &op->src_box, op->flags, &op->fx, op->filter))) FIXME("Blit failed.\n"); } diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 7b01cfe..93a9f09 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3681,15 +3681,12 @@ struct wined3d_blitter *wined3d_cpu_blitter_create(void) return blitter; } -HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const struct wined3d_box *dst_box, - struct wined3d_surface *src_surface, const struct wined3d_box *src_box, DWORD flags, - const struct wined3d_blt_fx *fx, enum wined3d_texture_filter_type filter) +HRESULT texture2d_blt(struct wined3d_texture *dst_texture, unsigned int dst_sub_resource_idx, + const struct wined3d_box *dst_box, struct wined3d_texture *src_texture, unsigned int src_sub_resource_idx, + const struct wined3d_box *src_box, DWORD flags, const struct wined3d_blt_fx *fx, + enum wined3d_texture_filter_type filter) { - unsigned int dst_sub_resource_idx = surface_get_sub_resource_idx(dst_surface); - unsigned int src_sub_resource_idx = surface_get_sub_resource_idx(src_surface); struct wined3d_texture_sub_resource *src_sub_resource, *dst_sub_resource; - struct wined3d_texture *dst_texture = dst_surface->container; - struct wined3d_texture *src_texture = src_surface->container; struct wined3d_device *device = dst_texture->resource.device; struct wined3d_swapchain *src_swapchain, *dst_swapchain; const struct wined3d_color_key *colour_key = NULL; @@ -3705,9 +3702,10 @@ HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const struct wi | WINED3D_BLT_ALPHA_TEST | WINED3D_BLT_RAW; - TRACE("dst_surface %p, dst_box %s, src_surface %p, src_box %s, flags %#x, fx %p, filter %s.\n", - dst_surface, debug_box(dst_box), src_surface, debug_box(src_box), - flags, fx, debug_d3dtexturefiltertype(filter)); + TRACE("dst_texture %p, dst_sub_resource_idx %u, dst_box %s, src_texture %p, " + "src_sub_resource_idx %u, src_box %s, flags %#x, fx %p, filter %s.\n", + dst_texture, dst_sub_resource_idx, debug_box(dst_box), src_texture, src_sub_resource_idx, + debug_box(src_box), flags, fx, debug_d3dtexturefiltertype(filter)); TRACE("Usage is %s.\n", debug_d3dusage(dst_texture->resource.usage)); if (fx) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ad37e5d..247e712 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3238,6 +3238,10 @@ static inline unsigned int wined3d_texture_get_level_pow2_height(const struct wi return max(1, texture->pow2_height >> level); } +HRESULT texture2d_blt(struct wined3d_texture *dst_texture, unsigned int dst_sub_resource_idx, + const struct wined3d_box *dst_box, struct wined3d_texture *src_texture, + unsigned int src_sub_resource_idx, const struct wined3d_box *src_box, DWORD flags, + const struct wined3d_blt_fx *blt_fx, enum wined3d_texture_filter_type filter) DECLSPEC_HIDDEN; BOOL texture2d_load_drawable(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context) DECLSPEC_HIDDEN; void texture2d_load_fb_texture(struct wined3d_texture *texture, unsigned int sub_resource_idx, @@ -3344,9 +3348,6 @@ static inline unsigned int surface_get_sub_resource_idx(const struct wined3d_sur return surface->texture_layer * surface->container->level_count + surface->texture_level; } -HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const struct wined3d_box *dst_box, - struct wined3d_surface *src_surface, const struct wined3d_box *src_box, DWORD flags, - const struct wined3d_blt_fx *blt_fx, enum wined3d_texture_filter_type filter) DECLSPEC_HIDDEN; void wined3d_surface_upload_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, const struct wined3d_gl_info *gl_info, const struct wined3d_format *format, const RECT *src_rect, unsigned int src_pitch, const POINT *dst_point, BOOL srgb,

1 0

Henri Verbeet : usp10: Use heap_calloc() in _ItemizeInternal().
by Alexandre Julliard March 13, 2018

March 13, 2018

Module: wine Branch: master Commit: 7a5a63de994c9613a0106950351f15bca837b94e URL: https://source.winehq.org/git/wine.git/?a=commit;h=7a5a63de994c9613a0106950… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 12 12:54:50 2018 +0330 usp10: Use heap_calloc() in _ItemizeInternal(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/usp10.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 5442830..032d074 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -1373,7 +1373,7 @@ static HRESULT _ItemizeInternal(const WCHAR *pwcInChars, int cInChars, if (!pwcInChars || !cInChars || !pItems || cMaxItems < 2) return E_INVALIDARG; - if (!(scripts = heap_alloc(cInChars * sizeof(*scripts)))) + if (!(scripts = heap_calloc(cInChars, sizeof(*scripts)))) return E_OUTOFMEMORY; for (i = 0; i < cInChars; i++) @@ -1464,16 +1464,13 @@ static HRESULT _ItemizeInternal(const WCHAR *pwcInChars, int cInChars, if (psState && psControl) { - levels = heap_alloc_zero(cInChars * sizeof(WORD)); - if (!levels) + if (!(levels = heap_calloc(cInChars, sizeof(*levels)))) goto nomemory; - overrides = heap_alloc_zero(cInChars * sizeof(WORD)); - if (!overrides) + if (!(overrides = heap_calloc(cInChars, sizeof(*overrides)))) goto nomemory; - layout_levels = heap_alloc_zero(cInChars * sizeof(WORD)); - if (!layout_levels) + if (!(layout_levels = heap_calloc(cInChars, sizeof(*layout_levels)))) goto nomemory; if (psState->fOverrideDirection) @@ -1519,8 +1516,7 @@ static HRESULT _ItemizeInternal(const WCHAR *pwcInChars, int cInChars, static const WCHAR math_punc[] = {'#','$','%','+',',','-','.','/',':',0x2212, 0x2044, 0x00a0,0}; static const WCHAR repeatable_math_punc[] = {'#','$','%','+','-','/',0x2212, 0x2044,0}; - strength = heap_alloc_zero(cInChars * sizeof(WORD)); - if (!strength) + if (!(strength = heap_calloc(cInChars, sizeof(*strength)))) goto nomemory; BIDI_GetStrengths(pwcInChars, cInChars, psControl, strength);

1 0

Louis Lenders : xinput1_3: Quiet a noisy fixme.
by Alexandre Julliard March 13, 2018

March 13, 2018

Module: wine Branch: master Commit: 2a4fb48583c66197cd3843fdcd7acb82d06afcd5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a4fb48583c66197cd3843fd… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Sat Mar 10 09:09:23 2018 +0100 xinput1_3: Quiet a noisy fixme. Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput1_3/xinput_main.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/xinput1_3/xinput_main.c b/dlls/xinput1_3/xinput_main.c index 46d9918..56bb36a 100644 --- a/dlls/xinput1_3/xinput_main.c +++ b/dlls/xinput1_3/xinput_main.c @@ -165,7 +165,10 @@ DWORD WINAPI XInputGetDSoundAudioDeviceGuids(DWORD index, GUID* render_guid, GUI DWORD WINAPI XInputGetBatteryInformation(DWORD index, BYTE type, XINPUT_BATTERY_INFORMATION* battery) { - FIXME("(index %u, type %u, battery %p) Stub!\n", index, type, battery); + static int once; + + if (!once++) + FIXME("(index %u, type %u, battery %p) Stub!\n", index, type, battery); if (index >= XUSER_MAX_COUNT) return ERROR_BAD_ARGUMENTS;

1 0

Akihiro Sagawa : ucrtbase: Asctime() uses space-padding for day of month as seen in C89.
by Alexandre Julliard March 13, 2018

March 13, 2018

Module: wine Branch: master Commit: f4ddd3190adb2b9a30d51693cce7262091ad3d66 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f4ddd3190adb2b9a30d51693… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun Mar 11 22:14:24 2018 +0900 ucrtbase: Asctime() uses space-padding for day of month as seen in C89. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/time.c | 7 +++++++ dlls/ucrtbase/tests/misc.c | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index b7b76af..a2500c4 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -1349,9 +1349,16 @@ static char* asctime_buf(char *buf, const struct MSVCRT_tm *mstm) return NULL; } +#if _MSVCR_VER>=140 + /* C89 (4.12.3.1) uses space-padding for day of month. */ + MSVCRT__snprintf(buf, 26, "%s %s %2d %02d:%02d:%02d %c%03d\n", wday[mstm->tm_wday], + month[mstm->tm_mon], mstm->tm_mday, mstm->tm_hour, mstm->tm_min, + mstm->tm_sec, '1'+(mstm->tm_year+900)/1000, (900+mstm->tm_year)%1000); +#else MSVCRT__snprintf(buf, 26, "%s %s %02d %02d:%02d:%02d %c%03d\n", wday[mstm->tm_wday], month[mstm->tm_mon], mstm->tm_mday, mstm->tm_hour, mstm->tm_min, mstm->tm_sec, '1'+(mstm->tm_year+900)/1000, (900+mstm->tm_year)%1000); +#endif return buf; } diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index 4a95910..2bb221b 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -762,7 +762,7 @@ static void test_asctime(void) } ret = p_asctime(&epoch); - todo_wine ok(!strcmp(ret, "Thu Jan 1 00:00:00 1970\n"), "asctime returned %s\n", ret); + ok(!strcmp(ret, "Thu Jan 1 00:00:00 1970\n"), "asctime returned %s\n", ret); } START_TEST(misc)

1 0

Akihiro Sagawa : ucrtbase: Add a test that shows asctime() uses space-padding for day of month.
by Alexandre Julliard March 13, 2018

March 13, 2018

Module: wine Branch: master Commit: 8b10fb8758c5b9b07b0f0cabbd57c10d11b1d2ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b10fb8758c5b9b07b0f0cab… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun Mar 11 22:14:22 2018 +0900 ucrtbase: Add a test that shows asctime() uses space-padding for day of month. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ucrtbase/tests/misc.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index d17f2d0..4a95910 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -26,6 +26,7 @@ #include <sys/stat.h> #include <share.h> #include <fcntl.h> +#include <time.h> #include <windef.h> #include <winbase.h> @@ -123,6 +124,7 @@ static int (CDECL *p__iswblank_l)(wint_t,_locale_t); static int (CDECL *p_fesetround)(int); static void (CDECL *p___setusermatherr)(MSVCRT_matherr_func); static int* (CDECL *p_errno)(void); +static char* (CDECL *p_asctime)(const struct tm *); static void test__initialize_onexit_table(void) { @@ -426,6 +428,7 @@ static BOOL init(void) p_fesetround = (void*)GetProcAddress(module, "fesetround"); p___setusermatherr = (void*)GetProcAddress(module, "__setusermatherr"); p_errno = (void*)GetProcAddress(module, "_errno"); + p_asctime = (void*)GetProcAddress(module, "asctime"); return TRUE; } @@ -747,6 +750,21 @@ static void test_math_errors(void) } } +static void test_asctime(void) +{ + const struct tm epoch = { 0, 0, 0, 1, 0, 70, 4, 0, 0 }; + char *ret; + + if(!p_asctime) + { + win_skip("asctime is not available\n"); + return; + } + + ret = p_asctime(&epoch); + todo_wine ok(!strcmp(ret, "Thu Jan 1 00:00:00 1970\n"), "asctime returned %s\n", ret); +} + START_TEST(misc) { int arg_c; @@ -772,4 +790,5 @@ START_TEST(misc) test_lldiv(); test_isblank(); test_math_errors(); + test_asctime(); }

1 0

Henri Verbeet : wined3d: Pass a texture and sub-resource index to wined3d_blitter_ops.blitter_blit ().
by Alexandre Julliard March 13, 2018

March 13, 2018

Module: wine Branch: master Commit: 70a68144c1f31d26206d67b668438b7093d834f0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=70a68144c1f31d26206d67b6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 13 14:11:01 2018 +0330 wined3d: Pass a texture and sub-resource index to wined3d_blitter_ops.blitter_blit(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 20 ++++----- dlls/wined3d/surface.c | 89 ++++++++++++++++++--------------------- dlls/wined3d/swapchain.c | 5 +-- dlls/wined3d/wined3d_private.h | 12 ++---- 4 files changed, 55 insertions(+), 71 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=70a68144c1f31d26206d…

1 0

Henri Verbeet : wined3d: Pass a texture and sub-resource index to texture2d_create_dc().
by Alexandre Julliard March 13, 2018

March 13, 2018

Module: wine Branch: master Commit: a7c0904a10eb30c0fdb59cc67b756cc86bcafe66 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a7c0904a10eb30c0fdb59cc6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 13 14:11:03 2018 +0330 wined3d: Pass a texture and sub-resource index to texture2d_create_dc(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 0abf5ad..07c08d8 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1334,23 +1334,30 @@ void wined3d_texture_set_compatible_renderbuffer(struct wined3d_texture *texture checkGLcall("set_compatible_renderbuffer"); } +struct wined3d_texture_idx +{ + struct wined3d_texture *texture; + unsigned int sub_resource_idx; +}; + static void texture2d_create_dc(void *object) { - struct wined3d_surface *surface = object; + const struct wined3d_texture_idx *idx = object; struct wined3d_context *context = NULL; unsigned int sub_resource_idx, level; const struct wined3d_format *format; unsigned int row_pitch, slice_pitch; struct wined3d_texture *texture; + struct wined3d_surface *surface; struct wined3d_bo_address data; D3DKMT_CREATEDCFROMMEMORY desc; struct wined3d_device *device; NTSTATUS status; - TRACE("surface %p.\n", surface); + TRACE("texture %p, sub_resource_idx %u.\n", idx->texture, idx->sub_resource_idx); - texture = surface->container; - sub_resource_idx = surface_get_sub_resource_idx(surface); + texture = idx->texture; + sub_resource_idx = idx->sub_resource_idx; level = sub_resource_idx % texture->level_count; device = texture->resource.device; @@ -1390,10 +1397,11 @@ static void texture2d_create_dc(void *object) return; } + surface = texture->sub_resources[sub_resource_idx].u.surface; surface->dc = desc.hDc; surface->bitmap = desc.hBitmap; - TRACE("Created DC %p, bitmap %p for surface %p.\n", surface->dc, surface->bitmap, surface); + TRACE("Created DC %p, bitmap %p for texture %p, %u.\n", surface->dc, surface->bitmap, texture, sub_resource_idx); } static void texture2d_destroy_dc(void *object) @@ -1563,7 +1571,9 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT if (create_dib) { - wined3d_cs_init_object(device->cs, texture2d_create_dc, surface); + struct wined3d_texture_idx texture_idx = {texture, 0}; + + wined3d_cs_init_object(device->cs, texture2d_create_dc, &texture_idx); device->cs->ops->finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); } @@ -2377,7 +2387,9 @@ static HRESULT texture_init(struct wined3d_texture *texture, const struct wined3 if ((desc->usage & WINED3DUSAGE_OWNDC) || (device->wined3d->flags & WINED3D_NO3D)) { - wined3d_cs_init_object(device->cs, texture2d_create_dc, surface); + struct wined3d_texture_idx texture_idx = {texture, idx}; + + wined3d_cs_init_object(device->cs, texture2d_create_dc, &texture_idx); device->cs->ops->finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); if (!surface->dc) { @@ -3163,7 +3175,9 @@ HRESULT CDECL wined3d_texture_get_dc(struct wined3d_texture *texture, unsigned i if (!surface->dc) { - wined3d_cs_init_object(device->cs, texture2d_create_dc, surface); + struct wined3d_texture_idx texture_idx = {texture, sub_resource_idx}; + + wined3d_cs_init_object(device->cs, texture2d_create_dc, &texture_idx); device->cs->ops->finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); } if (!surface->dc)

1 0

Henri Verbeet : usp10: Use heap_calloc() in SHAPE_does_GSUB_feature_apply_to_chars().
by Alexandre Julliard March 13, 2018

March 13, 2018

Module: wine Branch: master Commit: f09c498e46a1a6a24593d0b8c8d9eb7c302c25be URL: https://source.winehq.org/git/wine.git/?a=commit;h=f09c498e46a1a6a24593d0b8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 13 14:11:05 2018 +0330 usp10: Use heap_calloc() in SHAPE_does_GSUB_feature_apply_to_chars(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/shape.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index ca084e7..4031386 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -712,13 +712,14 @@ static VOID load_ot_tables(HDC hdc, ScriptCache *psc) psc->GDEF_Table = load_gdef_table(hdc); } -INT SHAPE_does_GSUB_feature_apply_to_chars(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, const WCHAR *chars, INT write_dir, INT count, const char* feature) +int SHAPE_does_GSUB_feature_apply_to_chars(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache *psc, + const WCHAR *chars, int write_dir, int count, const char *feature) { WORD *glyphs; INT glyph_count = count; INT rc; - glyphs = heap_alloc(2 * count * sizeof(*glyphs)); + glyphs = heap_calloc(count, 2 * sizeof(*glyphs)); GetGlyphIndicesW(hdc, chars, count, glyphs, 0); rc = apply_GSUB_feature_to_glyph(hdc, psa, psc, glyphs, 0, write_dir, &glyph_count, feature); if (rc > GSUB_E_NOGLYPH)

1 0

Henri Verbeet : wined3d: Pass a texture and sub-resource index to texture2d_destroy_dc().
by Alexandre Julliard March 13, 2018

March 13, 2018

Module: wine Branch: master Commit: 56464f5e074897a607b7b3f98c591537adca55cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=56464f5e074897a607b7b3f9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 13 14:11:04 2018 +0330 wined3d: Pass a texture and sub-resource index to texture2d_destroy_dc(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 28 +++++++++++++++++----------- dlls/wined3d/wined3d_private.h | 8 -------- 2 files changed, 17 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 07c08d8..6abc7e7 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1406,18 +1406,20 @@ static void texture2d_create_dc(void *object) static void texture2d_destroy_dc(void *object) { - struct wined3d_surface *surface = object; + const struct wined3d_texture_idx *idx = object; D3DKMT_DESTROYDCFROMMEMORY destroy_desc; struct wined3d_context *context = NULL; struct wined3d_texture *texture; + struct wined3d_surface *surface; struct wined3d_bo_address data; unsigned int sub_resource_idx; struct wined3d_device *device; NTSTATUS status; - texture = surface->container; - sub_resource_idx = surface_get_sub_resource_idx(surface); + texture = idx->texture; + sub_resource_idx = idx->sub_resource_idx; device = texture->resource.device; + surface = texture->sub_resources[sub_resource_idx].u.surface; if (!surface->dc) { @@ -1453,7 +1455,6 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT const struct wined3d_format *format = wined3d_get_format(gl_info, format_id, texture->resource.usage); UINT resource_size = wined3d_format_calculate_size(format, device->surface_alignment, width, height, 1); struct wined3d_texture_sub_resource *sub_resource; - struct wined3d_surface *surface; DWORD valid_location = 0; BOOL create_dib = FALSE; @@ -1500,10 +1501,11 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT wined3d_resource_wait_idle(&texture->resource); sub_resource = &texture->sub_resources[0]; - surface = sub_resource->u.surface; - if (surface->dc) + if (sub_resource->u.surface->dc) { - wined3d_cs_destroy_object(device->cs, texture2d_destroy_dc, surface); + struct wined3d_texture_idx texture_idx = {texture, 0}; + + wined3d_cs_destroy_object(device->cs, texture2d_destroy_dc, &texture_idx); device->cs->ops->finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); create_dib = TRUE; } @@ -1889,7 +1891,11 @@ static void texture2d_cleanup_sub_resources(struct wined3d_texture *texture) TRACE("surface %p.\n", surface); if (surface->dc) - texture2d_destroy_dc(surface); + { + struct wined3d_texture_idx texture_idx = {texture, i}; + + texture2d_destroy_dc(&texture_idx); + } } if (context) context_release(context); @@ -2360,8 +2366,6 @@ static HRESULT texture_init(struct wined3d_texture *texture, const struct wined3 surface = &surfaces[idx]; surface->container = texture; - surface->texture_level = i; - surface->texture_layer = j; sub_resource = &texture->sub_resources[idx]; sub_resource->locations = WINED3D_LOCATION_DISCARDED; @@ -3224,7 +3228,9 @@ HRESULT CDECL wined3d_texture_release_dc(struct wined3d_texture *texture, unsign if (!(texture->resource.usage & WINED3DUSAGE_OWNDC) && !(device->wined3d->flags & WINED3D_NO3D)) { - wined3d_cs_destroy_object(device->cs, texture2d_destroy_dc, surface); + struct wined3d_texture_idx texture_idx = {texture, sub_resource_idx}; + + wined3d_cs_destroy_object(device->cs, texture2d_destroy_dc, &texture_idx); device->cs->ops->finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 247e712..9dc193a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3335,19 +3335,11 @@ struct wined3d_surface { struct wined3d_texture *container; - unsigned int texture_level; - unsigned int texture_layer; - /* For GetDC */ HBITMAP bitmap; HDC dc; }; -static inline unsigned int surface_get_sub_resource_idx(const struct wined3d_surface *surface) -{ - return surface->texture_layer * surface->container->level_count + surface->texture_level; -} - void wined3d_surface_upload_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, const struct wined3d_gl_info *gl_info, const struct wined3d_format *format, const RECT *src_rect, unsigned int src_pitch, const POINT *dst_point, BOOL srgb,

1 0

Zebediah Figura : devenum: Register DirectSound devices as codec devices.
by Alexandre Julliard March 12, 2018

March 12, 2018

1 0