March 2014 - Wine-commits - list.winehq.org

Hans Leidekker : user32/tests: Add more tests for PrivateExtractIcons.
by Alexandre Julliard 25 Mar '14

25 Mar '14

Module: wine Branch: master Commit: fb31e0fbe30f0d69058d3afa1b6f8f6af1d963f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb31e0fbe30f0d69058d3afa1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Mar 25 12:52:03 2014 +0100 user32/tests: Add more tests for PrivateExtractIcons. --- dlls/user32/tests/resource.c | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/resource.c b/dlls/user32/tests/resource.c index 2313595..9cb7380 100644 --- a/dlls/user32/tests/resource.c +++ b/dlls/user32/tests/resource.c @@ -333,11 +333,30 @@ static void test_accel2(void) static void test_PrivateExtractIcons(void) { const CHAR szShell32Dll[] = "shell32.dll"; HICON ahIcon[256]; - UINT aIconId[256]; - UINT cIcons, cIcons2; + UINT i, aIconId[256], cIcons, cIcons2; if (!pPrivateExtractIconsA) return; - + + cIcons = pPrivateExtractIconsA("", 0, 16, 16, ahIcon, aIconId, 1, 0); + ok(cIcons == ~0u, "got %u\n", cIcons); + + cIcons = pPrivateExtractIconsA("notepad.exe", 0, 16, 16, NULL, NULL, 1, 0); + ok(cIcons == 1 || broken(cIcons == 2) /* win2k */, "got %u\n", cIcons); + + ahIcon[0] = (HICON)0xdeadbeef; + cIcons = pPrivateExtractIconsA("notepad.exe", 0, 16, 16, ahIcon, NULL, 1, 0); + ok(cIcons == 1, "got %u\n", cIcons); + ok(ahIcon[0] != (HICON)0xdeadbeef, "icon not set\n"); + DestroyIcon(ahIcon[0]); + + ahIcon[0] = (HICON)0xdeadbeef; + aIconId[0] = 0xdeadbeef; + cIcons = pPrivateExtractIconsA("notepad.exe", 0, 16, 16, ahIcon, aIconId, 1, 0); + ok(cIcons == 1, "got %u\n", cIcons); + ok(ahIcon[0] != (HICON)0xdeadbeef, "icon not set\n"); + ok(aIconId[0] != 0xdeadbeef, "id not set\n"); + DestroyIcon(ahIcon[0]); + cIcons = pPrivateExtractIconsA(szShell32Dll, 0, 16, 16, NULL, NULL, 0, 0); cIcons2 = pPrivateExtractIconsA(szShell32Dll, 4, MAKELONG(32,16), MAKELONG(32,16), NULL, NULL, 256, 0); @@ -350,14 +369,18 @@ static void test_PrivateExtractIcons(void) { cIcons = pPrivateExtractIconsA(szShell32Dll, 0, 16, 16, ahIcon, aIconId, 3, 0); ok(cIcons == 3, "Three icons requested got cIcons=%d\n", cIcons); + for (i = 0; i < cIcons; i++) DestroyIcon(ahIcon[i]); /* count must be a multiple of two when getting two sizes */ cIcons = pPrivateExtractIconsA(szShell32Dll, 0, MAKELONG(16,32), MAKELONG(16,32), ahIcon, aIconId, 3, 0); ok(cIcons == 0 /* vista */ || cIcons == 4, "Three icons requested got cIcons=%d\n", cIcons); + for (i = 0; i < cIcons; i++) DestroyIcon(ahIcon[i]); + cIcons = pPrivateExtractIconsA(szShell32Dll, 0, MAKELONG(16,32), MAKELONG(16,32), ahIcon, aIconId, 4, 0); ok(cIcons == 4, "Four icons requested got cIcons=%d\n", cIcons); + for (i = 0; i < cIcons; i++) DestroyIcon(ahIcon[i]); } static void test_LoadImage(void)

1 0

Hans Leidekker : shell32: Forward ShExtractIconsW to user32.PrivateExtractIconsW.
by Alexandre Julliard 25 Mar '14

25 Mar '14

Module: wine Branch: master Commit: 86bd0603a26f74e3b16cd57da3904585ed7aec3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=86bd0603a26f74e3b16cd57da… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Mar 25 12:53:27 2014 +0100 shell32: Forward ShExtractIconsW to user32.PrivateExtractIconsW. --- dlls/shell32/shell32.spec | 2 +- dlls/shell32/tests/shelllink.c | 60 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index c5405d4..d73dcbb 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -347,7 +347,7 @@ @ stdcall SHCreateShellItemArrayFromShellItem(ptr ptr ptr) @ stdcall SHEmptyRecycleBinA(long str long) @ stdcall SHEmptyRecycleBinW(long wstr long) -@ stub SHExtractIconsW +@ stdcall SHExtractIconsW(wstr long long long ptr ptr long long) user32.PrivateExtractIconsW @ stdcall SHFileOperation(ptr) SHFileOperationA @ stdcall SHFileOperationA(ptr) @ stdcall SHFileOperationW(ptr) diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index c62f575..0b2b7be 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -42,6 +42,7 @@ static HRESULT (WINAPI *pSHDefExtractIconA)(LPCSTR, int, UINT, HICON*, HICON*, U static HRESULT (WINAPI *pSHGetStockIconInfo)(SHSTOCKICONID, UINT, SHSTOCKICONINFO *); static DWORD (WINAPI *pGetLongPathNameA)(LPCSTR, LPSTR, DWORD); static DWORD (WINAPI *pGetShortPathNameA)(LPCSTR, LPSTR, DWORD); +static UINT (WINAPI *pSHExtractIconsW)(LPCWSTR, int, int, int, HICON *, UINT *, UINT, UINT); static const GUID _IID_IShellLinkDataList = { 0x45e2b4ae, 0xb1c3, 0x11d0, @@ -1095,6 +1096,63 @@ static void test_SHGetStockIconInfo(void) ok(hr == E_INVALIDARG, "NULL: got 0x%x\n", hr); } +static void test_SHExtractIcons(void) +{ + static const WCHAR notepadW[] = {'n','o','t','e','p','a','d','.','e','x','e',0}; + static const WCHAR shell32W[] = {'s','h','e','l','l','3','2','.','d','l','l',0}; + static const WCHAR emptyW[] = {0}; + UINT ret, ret2; + HICON icons[256]; + UINT ids[256], i; + + if (!pSHExtractIconsW) + { + win_skip("SHExtractIconsW not available\n"); + return; + } + + ret = pSHExtractIconsW(emptyW, 0, 16, 16, icons, ids, 1, 0); + ok(ret == ~0u, "got %u\n", ret); + + ret = pSHExtractIconsW(notepadW, 0, 16, 16, NULL, NULL, 1, 0); + ok(ret == 1 || broken(ret == 2) /* win2k */, "got %u\n", ret); + + icons[0] = (HICON)0xdeadbeef; + ret = pSHExtractIconsW(notepadW, 0, 16, 16, icons, NULL, 1, 0); + ok(ret == 1, "got %u\n", ret); + ok(icons[0] != (HICON)0xdeadbeef, "icon not set\n"); + DestroyIcon(icons[0]); + + icons[0] = (HICON)0xdeadbeef; + ids[0] = 0xdeadbeef; + ret = pSHExtractIconsW(notepadW, 0, 16, 16, icons, ids, 1, 0); + ok(ret == 1, "got %u\n", ret); + ok(icons[0] != (HICON)0xdeadbeef, "icon not set\n"); + ok(ids[0] != 0xdeadbeef, "id not set\n"); + DestroyIcon(icons[0]); + + ret = pSHExtractIconsW(shell32W, 0, 16, 16, NULL, NULL, 0, 0); + ret2 = pSHExtractIconsW(shell32W, 4, MAKELONG(32,16), MAKELONG(32,16), NULL, NULL, 256, 0); + ok(ret && ret == ret2, + "icon count should be independent of requested icon sizes and base icon index\n"); + + ret = pSHExtractIconsW(shell32W, 0, 16, 16, icons, ids, 0, 0); + ok(ret == ~0u || !ret /* < vista */, "got %u\n", ret); + + ret = pSHExtractIconsW(shell32W, 0, 16, 16, icons, ids, 3, 0); + ok(ret == 3, "got %u\n", ret); + for (i = 0; i < ret; i++) DestroyIcon(icons[i]); + + /* count must be a multiple of two when getting two sizes */ + ret = pSHExtractIconsW(shell32W, 0, MAKELONG(16,32), MAKELONG(16,32), icons, ids, 3, 0); + ok(!ret /* vista */ || ret == 4, "got %u\n", ret); + for (i = 0; i < ret; i++) DestroyIcon(icons[i]); + + ret = pSHExtractIconsW(shell32W, 0, MAKELONG(16,32), MAKELONG(16,32), icons, ids, 4, 0); + ok(ret == 4, "got %u\n", ret); + for (i = 0; i < ret; i++) DestroyIcon(icons[i]); +} + START_TEST(shelllink) { HRESULT r; @@ -1108,6 +1166,7 @@ START_TEST(shelllink) pSHGetStockIconInfo = (void *)GetProcAddress(hmod, "SHGetStockIconInfo"); pGetLongPathNameA = (void *)GetProcAddress(hkernel32, "GetLongPathNameA"); pGetShortPathNameA = (void *)GetProcAddress(hkernel32, "GetShortPathNameA"); + pSHExtractIconsW = (void *)GetProcAddress(hmod, "SHExtractIconsW"); r = CoInitialize(NULL); ok(r == S_OK, "CoInitialize failed (0x%08x)\n", r); @@ -1120,6 +1179,7 @@ START_TEST(shelllink) test_shdefextracticon(); test_GetIconLocation(); test_SHGetStockIconInfo(); + test_SHExtractIcons(); CoUninitialize(); }

1 0

Ken Thomases : wined3d: Don't call GetPixelFormat() to set a flag that' s already set.
by Alexandre Julliard 24 Mar '14

24 Mar '14

Module: wine Branch: master Commit: ffb357b717680b52917f280b3716da7b387f4af2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffb357b717680b52917f280b3… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Mar 23 22:45:54 2014 -0500 wined3d: Don't call GetPixelFormat() to set a flag that's already set. --- dlls/wined3d/context.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index f90557e..3341ae2 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1116,7 +1116,7 @@ static void context_enter(struct wined3d_context *context) context->restore_dc = wglGetCurrentDC(); context->needs_set = 1; } - else if (context->pixel_format != GetPixelFormat(context->hdc)) + else if (!context->needs_set && context->pixel_format != GetPixelFormat(context->hdc)) context->needs_set = 1; } }

1 0

Ken Thomases : wined3d: When restoring pixel format in context_release(), mark the context as needing to be set on the next context_acquire().
by Alexandre Julliard 24 Mar '14

24 Mar '14

Module: wine Branch: master Commit: 57c51710e0a4474872125cc54be7562ea8db6ccd URL: http://source.winehq.org/git/wine.git/?a=commit;h=57c51710e0a4474872125cc54… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Mar 23 22:46:04 2014 -0500 wined3d: When restoring pixel format in context_release(), mark the context as needing to be set on the next context_acquire(). If we had to restore the pixel format then we know it won't be what we need when the app calls into wined3d again. This helps avoid the GetPixelFormat() in context_acquire(). --- dlls/wined3d/context.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 3341ae2..8dbe001 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -719,9 +719,10 @@ void context_surface_update(struct wined3d_context *context, const struct wined3 } } -static void context_restore_pixel_format(struct wined3d_context *ctx) +static BOOL context_restore_pixel_format(struct wined3d_context *ctx) { const struct wined3d_gl_info *gl_info = ctx->gl_info; + BOOL ret = FALSE; if (ctx->restore_pf && IsWindow(ctx->restore_pf_win)) { @@ -730,7 +731,7 @@ static void context_restore_pixel_format(struct wined3d_context *ctx) HDC dc = GetDC(ctx->restore_pf_win); if (dc) { - if (!GL_EXTCALL(wglSetPixelFormatWINE(dc, ctx->restore_pf))) + if (!(ret = GL_EXTCALL(wglSetPixelFormatWINE(dc, ctx->restore_pf)))) { ERR("wglSetPixelFormatWINE failed to restore pixel format %d on window %p.\n", ctx->restore_pf, ctx->restore_pf_win); @@ -746,6 +747,7 @@ static void context_restore_pixel_format(struct wined3d_context *ctx) ctx->restore_pf = 0; ctx->restore_pf_win = NULL; + return ret; } static BOOL context_set_pixel_format(struct wined3d_context *context, HDC dc, int format) @@ -1088,7 +1090,8 @@ void context_release(struct wined3d_context *context) if (!--context->level) { - context_restore_pixel_format(context); + if (context_restore_pixel_format(context)) + context->needs_set = 1; if (context->restore_ctx) { TRACE("Restoring GL context %p on device context %p.\n", context->restore_ctx, context->restore_dc);

1 0

Ken Thomases : wined3d: Track if a context' s hdc is private so we never need to restore its pixel format.
by Alexandre Julliard 24 Mar '14

24 Mar '14

Module: wine Branch: master Commit: 272873823e9beff91ea1a62845fc7e5f94a9636f URL: http://source.winehq.org/git/wine.git/?a=commit;h=272873823e9beff91ea1a6284… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Mar 23 22:46:18 2014 -0500 wined3d: Track if a context's hdc is private so we never need to restore its pixel format. This currently only applies to the swapchain backup DC, but it will soon be used for surfaces created using the WGL_WINE_surface extension. Also, there are a couple of cases where ddraw creates private windows and passes them in. It could be extended to those. --- dlls/wined3d/context.c | 21 +++++++++++++-------- dlls/wined3d/wined3d_private.h | 3 ++- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 8dbe001..34c0637 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -750,7 +750,7 @@ static BOOL context_restore_pixel_format(struct wined3d_context *ctx) return ret; } -static BOOL context_set_pixel_format(struct wined3d_context *context, HDC dc, int format) +static BOOL context_set_pixel_format(struct wined3d_context *context, HDC dc, BOOL private, int format) { const struct wined3d_gl_info *gl_info = context->gl_info; int current = GetPixelFormat(dc); @@ -768,7 +768,7 @@ static BOOL context_set_pixel_format(struct wined3d_context *context, HDC dc, in } context->restore_pf = 0; - context->restore_pf_win = WindowFromDC(dc); + context->restore_pf_win = private ? NULL : WindowFromDC(dc); return TRUE; } @@ -787,12 +787,12 @@ static BOOL context_set_pixel_format(struct wined3d_context *context, HDC dc, in return FALSE; } - win = WindowFromDC(dc); + win = private ? NULL : WindowFromDC(dc); if (win != context->restore_pf_win) { context_restore_pixel_format(context); - context->restore_pf = current; + context->restore_pf = private ? 0 : current; context->restore_pf_win = win; } @@ -813,7 +813,7 @@ static BOOL context_set_gl_context(struct wined3d_context *ctx) struct wined3d_swapchain *swapchain = ctx->swapchain; BOOL backup = FALSE; - if (!context_set_pixel_format(ctx, ctx->hdc, ctx->pixel_format)) + if (!context_set_pixel_format(ctx, ctx->hdc, ctx->hdc_is_private, ctx->pixel_format)) { WARN("Failed to set pixel format %d on device context %p.\n", ctx->pixel_format, ctx->hdc); @@ -846,7 +846,7 @@ static BOOL context_set_gl_context(struct wined3d_context *ctx) return FALSE; } - if (!context_set_pixel_format(ctx, dc, ctx->pixel_format)) + if (!context_set_pixel_format(ctx, dc, TRUE, ctx->pixel_format)) { ERR("Failed to set pixel format %d on device context %p.\n", ctx->pixel_format, dc); @@ -890,6 +890,7 @@ static void context_update_window(struct wined3d_context *context) wined3d_release_dc(context->win_handle, context->hdc); context->win_handle = context->swapchain->win_handle; + context->hdc_is_private = FALSE; context->needs_set = 1; context->valid = 1; @@ -1328,6 +1329,7 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, int swap_interval; DWORD state; HDC hdc; + BOOL hdc_is_private = FALSE; TRACE("swapchain %p, target %p, window %p.\n", swapchain, target, swapchain->win_handle); @@ -1388,7 +1390,9 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, { WARN("Failed to retireve device context, trying swapchain backup.\n"); - if (!(hdc = swapchain_get_backup_dc(swapchain))) + if ((hdc = swapchain_get_backup_dc(swapchain))) + hdc_is_private = TRUE; + else { ERR("Failed to retrieve a device context.\n"); goto out; @@ -1439,7 +1443,7 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, ret->gl_info = gl_info; - if (!context_set_pixel_format(ret, hdc, pixel_format)) + if (!context_set_pixel_format(ret, hdc, hdc_is_private, pixel_format)) { ERR("Failed to set pixel format %d on device context %p.\n", pixel_format, hdc); context_release(ret); @@ -1516,6 +1520,7 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, ret->glCtx = ctx; ret->win_handle = swapchain->win_handle; ret->hdc = hdc; + ret->hdc_is_private = hdc_is_private; ret->pixel_format = pixel_format; ret->needs_set = 1; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0199ef8..69630b1 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1086,7 +1086,8 @@ struct wined3d_context DWORD lowest_disabled_stage : 4; /* Max MAX_TEXTURES, 8 */ DWORD rebind_fbo : 1; DWORD needs_set : 1; - DWORD padding : 18; + DWORD hdc_is_private : 1; + DWORD padding : 17; DWORD shader_update_mask; DWORD constant_update_mask; DWORD numbered_array_mask;

1 0

Ken Thomases : wined3d: Track if a context' s private hdc has had its pixel format set, so we don't need to check it.
by Alexandre Julliard 24 Mar '14

24 Mar '14

Module: wine Branch: master Commit: f3aa4812382caa459b9b612f66998c6ea8257594 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3aa4812382caa459b9b612f6… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Mar 23 22:46:25 2014 -0500 wined3d: Track if a context's private hdc has had its pixel format set, so we don't need to check it. --- dlls/wined3d/context.c | 22 +++++++++++++++++----- dlls/wined3d/wined3d_private.h | 3 ++- 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 34c0637..00ab25f 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -753,9 +753,13 @@ static BOOL context_restore_pixel_format(struct wined3d_context *ctx) static BOOL context_set_pixel_format(struct wined3d_context *context, HDC dc, BOOL private, int format) { const struct wined3d_gl_info *gl_info = context->gl_info; - int current = GetPixelFormat(dc); + int current; - if (current == format) return TRUE; + if (dc == context->hdc && context->hdc_is_private && context->hdc_has_format) + return TRUE; + + current = GetPixelFormat(dc); + if (current == format) goto success; if (!current) { @@ -769,7 +773,7 @@ static BOOL context_set_pixel_format(struct wined3d_context *context, HDC dc, BO context->restore_pf = 0; context->restore_pf_win = private ? NULL : WindowFromDC(dc); - return TRUE; + goto success; } /* By default WGL doesn't allow pixel format adjustments but we need it @@ -796,7 +800,7 @@ static BOOL context_set_pixel_format(struct wined3d_context *context, HDC dc, BO context->restore_pf_win = win; } - return TRUE; + goto success; } /* OpenGL doesn't allow pixel format adjustments. Print an error and @@ -806,6 +810,11 @@ static BOOL context_set_pixel_format(struct wined3d_context *context, HDC dc, BO ERR("Unable to set pixel format %d on device context %p. Already using format %d.\n", format, dc, current); return TRUE; + +success: + if (dc == context->hdc && context->hdc_is_private) + context->hdc_has_format = TRUE; + return TRUE; } static BOOL context_set_gl_context(struct wined3d_context *ctx) @@ -891,6 +900,7 @@ static void context_update_window(struct wined3d_context *context) context->win_handle = context->swapchain->win_handle; context->hdc_is_private = FALSE; + context->hdc_has_format = FALSE; context->needs_set = 1; context->valid = 1; @@ -1120,7 +1130,8 @@ static void context_enter(struct wined3d_context *context) context->restore_dc = wglGetCurrentDC(); context->needs_set = 1; } - else if (!context->needs_set && context->pixel_format != GetPixelFormat(context->hdc)) + else if (!context->needs_set && !(context->hdc_is_private && context->hdc_has_format) + && context->pixel_format != GetPixelFormat(context->hdc)) context->needs_set = 1; } } @@ -1521,6 +1532,7 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, ret->win_handle = swapchain->win_handle; ret->hdc = hdc; ret->hdc_is_private = hdc_is_private; + ret->hdc_has_format = TRUE; ret->pixel_format = pixel_format; ret->needs_set = 1; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 69630b1..7abcc8a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1087,7 +1087,8 @@ struct wined3d_context DWORD rebind_fbo : 1; DWORD needs_set : 1; DWORD hdc_is_private : 1; - DWORD padding : 17; + DWORD hdc_has_format : 1; /* only meaningful if hdc_is_private */ + DWORD padding : 16; DWORD shader_update_mask; DWORD constant_update_mask; DWORD numbered_array_mask;

1 0

Stefan Dösinger : d3d9: Introduce a resource structure.
by Alexandre Julliard 24 Mar '14

24 Mar '14

Module: wine Branch: master Commit: 96a74e0cf7330f815f7dca00f848d4d2c39855b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96a74e0cf7330f815f7dca00f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Mar 24 12:17:14 2014 +0100 d3d9: Introduce a resource structure. --- dlls/d3d9/buffer.c | 20 ++++++++++++-------- dlls/d3d9/d3d9_main.c | 9 +++++++++ dlls/d3d9/d3d9_private.h | 18 +++++++++++++----- dlls/d3d9/device.c | 2 +- dlls/d3d9/surface.c | 10 ++++++---- dlls/d3d9/texture.c | 22 ++++++++++++---------- dlls/d3d9/volume.c | 10 ++++++---- 7 files changed, 59 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=96a74e0cf7330f815f7dc…

1 0

Stefan Dösinger : d3d9: Use the private store api for buffers.
by Alexandre Julliard 24 Mar '14

24 Mar '14

Module: wine Branch: master Commit: f2b5bf26b766a51ae24537aa14092768d7e9d930 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2b5bf26b766a51ae24537aa1… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Mar 24 12:17:15 2014 +0100 d3d9: Use the private store api for buffers. --- dlls/d3d9/buffer.c | 60 ++++------------------------------------ dlls/d3d9/d3d9_main.c | 69 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/d3d9/d3d9_private.h | 6 ++++ 3 files changed, 81 insertions(+), 54 deletions(-) diff --git a/dlls/d3d9/buffer.c b/dlls/d3d9/buffer.c index d0ad890..cc93b18 100644 --- a/dlls/d3d9/buffer.c +++ b/dlls/d3d9/buffer.c @@ -105,52 +105,28 @@ static HRESULT WINAPI d3d9_vertexbuffer_SetPrivateData(IDirect3DVertexBuffer9 *i REFGUID guid, const void *data, DWORD data_size, DWORD flags) { struct d3d9_vertexbuffer *buffer = impl_from_IDirect3DVertexBuffer9(iface); - struct wined3d_resource *resource; - HRESULT hr; - TRACE("iface %p, guid %s, data %p, data_size %u, flags %#x.\n", iface, debugstr_guid(guid), data, data_size, flags); - wined3d_mutex_lock(); - resource = wined3d_buffer_get_resource(buffer->wined3d_buffer); - hr = wined3d_resource_set_private_data(resource, guid, data, data_size, flags); - wined3d_mutex_unlock(); - - return hr; + return d3d9_resource_set_private_data(&buffer->resource, guid, data, data_size, flags); } static HRESULT WINAPI d3d9_vertexbuffer_GetPrivateData(IDirect3DVertexBuffer9 *iface, REFGUID guid, void *data, DWORD *data_size) { struct d3d9_vertexbuffer *buffer = impl_from_IDirect3DVertexBuffer9(iface); - struct wined3d_resource *resource; - HRESULT hr; - TRACE("iface %p, guid %s, data %p, data_size %p.\n", iface, debugstr_guid(guid), data, data_size); - wined3d_mutex_lock(); - resource = wined3d_buffer_get_resource(buffer->wined3d_buffer); - hr = wined3d_resource_get_private_data(resource, guid, data, data_size); - wined3d_mutex_unlock(); - - return hr; + return d3d9_resource_get_private_data(&buffer->resource, guid, data, data_size); } static HRESULT WINAPI d3d9_vertexbuffer_FreePrivateData(IDirect3DVertexBuffer9 *iface, REFGUID guid) { struct d3d9_vertexbuffer *buffer = impl_from_IDirect3DVertexBuffer9(iface); - struct wined3d_resource *resource; - HRESULT hr; - TRACE("iface %p, guid %s.\n", iface, debugstr_guid(guid)); - wined3d_mutex_lock(); - resource = wined3d_buffer_get_resource(buffer->wined3d_buffer); - hr = wined3d_resource_free_private_data(resource, guid); - wined3d_mutex_unlock(); - - return hr; + return d3d9_resource_free_private_data(&buffer->resource, guid); } static DWORD WINAPI d3d9_vertexbuffer_SetPriority(IDirect3DVertexBuffer9 *iface, DWORD priority) @@ -401,52 +377,28 @@ static HRESULT WINAPI d3d9_indexbuffer_SetPrivateData(IDirect3DIndexBuffer9 *ifa REFGUID guid, const void *data, DWORD data_size, DWORD flags) { struct d3d9_indexbuffer *buffer = impl_from_IDirect3DIndexBuffer9(iface); - struct wined3d_resource *resource; - HRESULT hr; - TRACE("iface %p, guid %s, data %p, data_size %u, flags %#x.\n", iface, debugstr_guid(guid), data, data_size, flags); - wined3d_mutex_lock(); - resource = wined3d_buffer_get_resource(buffer->wined3d_buffer); - hr = wined3d_resource_set_private_data(resource, guid, data, data_size, flags); - wined3d_mutex_unlock(); - - return hr; + return d3d9_resource_set_private_data(&buffer->resource, guid, data, data_size, flags); } static HRESULT WINAPI d3d9_indexbuffer_GetPrivateData(IDirect3DIndexBuffer9 *iface, REFGUID guid, void *data, DWORD *data_size) { struct d3d9_indexbuffer *buffer = impl_from_IDirect3DIndexBuffer9(iface); - struct wined3d_resource *resource; - HRESULT hr; - TRACE("iface %p, guid %s, data %p, data_size %p.\n", iface, debugstr_guid(guid), data, data_size); - wined3d_mutex_lock(); - resource = wined3d_buffer_get_resource(buffer->wined3d_buffer); - hr = wined3d_resource_get_private_data(resource, guid, data, data_size); - wined3d_mutex_unlock(); - - return hr; + return d3d9_resource_get_private_data(&buffer->resource, guid, data, data_size); } static HRESULT WINAPI d3d9_indexbuffer_FreePrivateData(IDirect3DIndexBuffer9 *iface, REFGUID guid) { struct d3d9_indexbuffer *buffer = impl_from_IDirect3DIndexBuffer9(iface); - struct wined3d_resource *resource; - HRESULT hr; - TRACE("iface %p, guid %s.\n", iface, debugstr_guid(guid)); - wined3d_mutex_lock(); - resource = wined3d_buffer_get_resource(buffer->wined3d_buffer); - hr = wined3d_resource_free_private_data(resource, guid); - wined3d_mutex_unlock(); - - return hr; + return d3d9_resource_free_private_data(&buffer->resource, guid); } static DWORD WINAPI d3d9_indexbuffer_SetPriority(IDirect3DIndexBuffer9 *iface, DWORD priority) diff --git a/dlls/d3d9/d3d9_main.c b/dlls/d3d9/d3d9_main.c index c8dd901..8796733 100644 --- a/dlls/d3d9/d3d9_main.c +++ b/dlls/d3d9/d3d9_main.c @@ -165,9 +165,78 @@ void WINAPI D3DPERF_SetRegion(D3DCOLOR color, const WCHAR *name) void d3d9_resource_cleanup(struct d3d9_resource *resource) { + wined3d_private_store_cleanup(&resource->private_store); +} + +HRESULT d3d9_resource_free_private_data(struct d3d9_resource *resource, const GUID *guid) +{ + struct wined3d_private_data *entry; + + wined3d_mutex_lock(); + entry = wined3d_private_store_get_private_data(&resource->private_store, guid); + if (!entry) + { + wined3d_mutex_unlock(); + return D3DERR_NOTFOUND; + } + + wined3d_private_store_free_private_data(&resource->private_store, entry); + wined3d_mutex_unlock(); + + return D3D_OK; +} + +HRESULT d3d9_resource_get_private_data(struct d3d9_resource *resource, const GUID *guid, + void *data, DWORD *data_size) +{ + const struct wined3d_private_data *stored_data; + DWORD size_in; + HRESULT hr; + + wined3d_mutex_lock(); + stored_data = wined3d_private_store_get_private_data(&resource->private_store, guid); + if (!stored_data) + { + hr = D3DERR_NOTFOUND; + goto done; + } + + size_in = *data_size; + *data_size = stored_data->size; + if (!data) + { + hr = D3D_OK; + goto done; + } + if (size_in < stored_data->size) + { + hr = D3DERR_MOREDATA; + goto done; + } + + if (stored_data->flags & WINED3DSPD_IUNKNOWN) + IUnknown_AddRef(stored_data->content.object); + memcpy(data, stored_data->content.data, stored_data->size); + hr = D3D_OK; + +done: + wined3d_mutex_unlock(); + return hr; } void d3d9_resource_init(struct d3d9_resource *resource) { resource->refcount = 1; + wined3d_private_store_init(&resource->private_store); +} + +HRESULT d3d9_resource_set_private_data(struct d3d9_resource *resource, const GUID *guid, + const void *data, DWORD data_size, DWORD flags) +{ + HRESULT hr; + + wined3d_mutex_lock(); + hr = wined3d_private_store_set_private_data(&resource->private_store, guid, data, data_size, flags); + wined3d_mutex_unlock(); + return hr; } diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index 40be940..8d75f62 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -169,10 +169,16 @@ HRESULT device_init(struct d3d9_device *device, struct d3d9 *parent, struct wine struct d3d9_resource { LONG refcount; + struct wined3d_private_store private_store; }; void d3d9_resource_cleanup(struct d3d9_resource *resource) DECLSPEC_HIDDEN; +HRESULT d3d9_resource_free_private_data(struct d3d9_resource *resource, const GUID *guid) DECLSPEC_HIDDEN; +HRESULT d3d9_resource_get_private_data(struct d3d9_resource *resource, const GUID *guid, + void *data, DWORD *data_size) DECLSPEC_HIDDEN; void d3d9_resource_init(struct d3d9_resource *resource) DECLSPEC_HIDDEN; +HRESULT d3d9_resource_set_private_data(struct d3d9_resource *resource, const GUID *guid, + const void *data, DWORD data_size, DWORD flags) DECLSPEC_HIDDEN; struct d3d9_volume {

1 0

Stefan Dösinger : d3d9: Use the private store api for textures.
by Alexandre Julliard 24 Mar '14

24 Mar '14

Module: wine Branch: master Commit: 6121393d0a286b8c4dbc3f0ac5fea3b2e9d6df5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6121393d0a286b8c4dbc3f0ac… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Mar 24 12:17:16 2014 +0100 d3d9: Use the private store api for textures. --- dlls/d3d9/texture.c | 90 ++++++--------------------------------------------- 1 file changed, 9 insertions(+), 81 deletions(-) diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index 47ccb30..3c2107a 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -115,52 +115,28 @@ static HRESULT WINAPI d3d9_texture_2d_SetPrivateData(IDirect3DTexture9 *iface, REFGUID guid, const void *data, DWORD data_size, DWORD flags) { struct d3d9_texture *texture = impl_from_IDirect3DTexture9(iface); - struct wined3d_resource *resource; - HRESULT hr; - TRACE("iface %p, guid %s, data %p, data_size %u, flags %#x.\n", iface, debugstr_guid(guid), data, data_size, flags); - wined3d_mutex_lock(); - resource = wined3d_texture_get_resource(texture->wined3d_texture); - hr = wined3d_resource_set_private_data(resource, guid, data, data_size, flags); - wined3d_mutex_unlock(); - - return hr; + return d3d9_resource_set_private_data(&texture->resource, guid, data, data_size, flags); } static HRESULT WINAPI d3d9_texture_2d_GetPrivateData(IDirect3DTexture9 *iface, REFGUID guid, void *data, DWORD *data_size) { struct d3d9_texture *texture = impl_from_IDirect3DTexture9(iface); - struct wined3d_resource *resource; - HRESULT hr; - TRACE("iface %p, guid %s, data %p, data_size %p.\n", iface, debugstr_guid(guid), data, data_size); - wined3d_mutex_lock(); - resource = wined3d_texture_get_resource(texture->wined3d_texture); - hr = wined3d_resource_get_private_data(resource, guid, data, data_size); - wined3d_mutex_unlock(); - - return hr; + return d3d9_resource_get_private_data(&texture->resource, guid, data, data_size); } static HRESULT WINAPI d3d9_texture_2d_FreePrivateData(IDirect3DTexture9 *iface, REFGUID guid) { struct d3d9_texture *texture = impl_from_IDirect3DTexture9(iface); - struct wined3d_resource *resource; - HRESULT hr; - TRACE("iface %p, guid %s.\n", iface, debugstr_guid(guid)); - wined3d_mutex_lock(); - resource = wined3d_texture_get_resource(texture->wined3d_texture); - hr = wined3d_resource_free_private_data(resource, guid); - wined3d_mutex_unlock(); - - return hr; + return d3d9_resource_free_private_data(&texture->resource, guid); } static DWORD WINAPI d3d9_texture_2d_SetPriority(IDirect3DTexture9 *iface, DWORD priority) @@ -528,52 +504,28 @@ static HRESULT WINAPI d3d9_texture_cube_SetPrivateData(IDirect3DCubeTexture9 *if REFGUID guid, const void *data, DWORD data_size, DWORD flags) { struct d3d9_texture *texture = impl_from_IDirect3DCubeTexture9(iface); - struct wined3d_resource *resource; - HRESULT hr; - TRACE("iface %p, guid %s, data %p, data_size %u, flags %#x.\n", iface, debugstr_guid(guid), data, data_size, flags); - wined3d_mutex_lock(); - resource = wined3d_texture_get_resource(texture->wined3d_texture); - hr = wined3d_resource_set_private_data(resource, guid, data, data_size, flags); - wined3d_mutex_unlock(); - - return hr; + return d3d9_resource_set_private_data(&texture->resource, guid, data, data_size, flags); } static HRESULT WINAPI d3d9_texture_cube_GetPrivateData(IDirect3DCubeTexture9 *iface, REFGUID guid, void *data, DWORD *data_size) { struct d3d9_texture *texture = impl_from_IDirect3DCubeTexture9(iface); - struct wined3d_resource *resource; - HRESULT hr; - TRACE("iface %p, guid %s, data %p, data_size %p.\n", iface, debugstr_guid(guid), data, data_size); - wined3d_mutex_lock(); - resource = wined3d_texture_get_resource(texture->wined3d_texture); - hr = wined3d_resource_get_private_data(resource, guid, data, data_size); - wined3d_mutex_unlock(); - - return hr; + return d3d9_resource_get_private_data(&texture->resource, guid, data, data_size); } static HRESULT WINAPI d3d9_texture_cube_FreePrivateData(IDirect3DCubeTexture9 *iface, REFGUID guid) { struct d3d9_texture *texture = impl_from_IDirect3DCubeTexture9(iface); - struct wined3d_resource *resource; - HRESULT hr; - TRACE("iface %p, guid %s.\n", iface, debugstr_guid(guid)); - wined3d_mutex_lock(); - resource = wined3d_texture_get_resource(texture->wined3d_texture); - hr = wined3d_resource_free_private_data(resource, guid); - wined3d_mutex_unlock(); - - return hr; + return d3d9_resource_free_private_data(&texture->resource, guid); } static DWORD WINAPI d3d9_texture_cube_SetPriority(IDirect3DCubeTexture9 *iface, DWORD priority) @@ -965,52 +917,28 @@ static HRESULT WINAPI d3d9_texture_3d_SetPrivateData(IDirect3DVolumeTexture9 *if REFGUID guid, const void *data, DWORD data_size, DWORD flags) { struct d3d9_texture *texture = impl_from_IDirect3DVolumeTexture9(iface); - struct wined3d_resource *resource; - HRESULT hr; - TRACE("iface %p, guid %s, data %p, data_size %u, flags %#x.\n", iface, debugstr_guid(guid), data, data_size, flags); - wined3d_mutex_lock(); - resource = wined3d_texture_get_resource(texture->wined3d_texture); - hr = wined3d_resource_set_private_data(resource, guid, data, data_size, flags); - wined3d_mutex_unlock(); - - return hr; + return d3d9_resource_set_private_data(&texture->resource, guid, data, data_size, flags); } static HRESULT WINAPI d3d9_texture_3d_GetPrivateData(IDirect3DVolumeTexture9 *iface, REFGUID guid, void *data, DWORD *data_size) { struct d3d9_texture *texture = impl_from_IDirect3DVolumeTexture9(iface); - struct wined3d_resource *resource; - HRESULT hr; - TRACE("iface %p, guid %s, data %p, data_size %p.\n", iface, debugstr_guid(guid), data, data_size); - wined3d_mutex_lock(); - resource = wined3d_texture_get_resource(texture->wined3d_texture); - hr = wined3d_resource_get_private_data(resource, guid, data, data_size); - wined3d_mutex_unlock(); - - return hr; + return d3d9_resource_get_private_data(&texture->resource, guid, data, data_size); } static HRESULT WINAPI d3d9_texture_3d_FreePrivateData(IDirect3DVolumeTexture9 *iface, REFGUID guid) { struct d3d9_texture *texture = impl_from_IDirect3DVolumeTexture9(iface); - struct wined3d_resource *resource; - HRESULT hr; - TRACE("iface %p, guid %s.\n", iface, debugstr_guid(guid)); - wined3d_mutex_lock(); - resource = wined3d_texture_get_resource(texture->wined3d_texture); - hr = wined3d_resource_free_private_data(resource, guid); - wined3d_mutex_unlock(); - - return hr; + return d3d9_resource_free_private_data(&texture->resource, guid); } static DWORD WINAPI d3d9_texture_3d_SetPriority(IDirect3DVolumeTexture9 *iface, DWORD priority)

1 0

Stefan Dösinger : d3d9: Use the private store api for surfaces.
by Alexandre Julliard 24 Mar '14

24 Mar '14

Module: wine Branch: master Commit: 50de4cda8ff6742ff18221ecd6d30dcecb3de7ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=50de4cda8ff6742ff18221ecd… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Mar 24 12:17:17 2014 +0100 d3d9: Use the private store api for surfaces. --- dlls/d3d9/surface.c | 30 +++--------------------------- 1 file changed, 3 insertions(+), 27 deletions(-) diff --git a/dlls/d3d9/surface.c b/dlls/d3d9/surface.c index 0595039..bf8b41a 100644 --- a/dlls/d3d9/surface.c +++ b/dlls/d3d9/surface.c @@ -143,52 +143,28 @@ static HRESULT WINAPI d3d9_surface_SetPrivateData(IDirect3DSurface9 *iface, REFG const void *data, DWORD data_size, DWORD flags) { struct d3d9_surface *surface = impl_from_IDirect3DSurface9(iface); - struct wined3d_resource *resource; - HRESULT hr; - TRACE("iface %p, guid %s, data %p, data_size %u, flags %#x.\n", iface, debugstr_guid(guid), data, data_size, flags); - wined3d_mutex_lock(); - resource = wined3d_surface_get_resource(surface->wined3d_surface); - hr = wined3d_resource_set_private_data(resource, guid, data, data_size, flags); - wined3d_mutex_unlock(); - - return hr; + return d3d9_resource_set_private_data(&surface->resource, guid, data, data_size, flags); } static HRESULT WINAPI d3d9_surface_GetPrivateData(IDirect3DSurface9 *iface, REFGUID guid, void *data, DWORD *data_size) { struct d3d9_surface *surface = impl_from_IDirect3DSurface9(iface); - struct wined3d_resource *resource; - HRESULT hr; - TRACE("iface %p, guid %s, data %p, data_size %p.\n", iface, debugstr_guid(guid), data, data_size); - wined3d_mutex_lock(); - resource = wined3d_surface_get_resource(surface->wined3d_surface); - hr = wined3d_resource_get_private_data(resource, guid, data, data_size); - wined3d_mutex_unlock(); - - return hr; + return d3d9_resource_get_private_data(&surface->resource, guid, data, data_size); } static HRESULT WINAPI d3d9_surface_FreePrivateData(IDirect3DSurface9 *iface, REFGUID guid) { struct d3d9_surface *surface = impl_from_IDirect3DSurface9(iface); - struct wined3d_resource *resource; - HRESULT hr; - TRACE("iface %p, guid %s.\n", iface, debugstr_guid(guid)); - wined3d_mutex_lock(); - resource = wined3d_surface_get_resource(surface->wined3d_surface); - hr = wined3d_resource_free_private_data(resource, guid); - wined3d_mutex_unlock(); - - return hr; + return d3d9_resource_free_private_data(&surface->resource, guid); } static DWORD WINAPI d3d9_surface_SetPriority(IDirect3DSurface9 *iface, DWORD priority)

1 0