wine-commits April 2016

wine-commits@winehq.org

2 participants
750 discussions

Nikolay Sivov : t2embed: Implement TTIsEmbeddingEnabledForFacename().
by Alexandre Julliard 04 Apr '16

04 Apr '16

Module: wine Branch: master Commit: 847da79cf80b565a79933d92e0218b230b933a4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=847da79cf80b565a79933d92e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Apr 2 12:19:17 2016 +0300 t2embed: Implement TTIsEmbeddingEnabledForFacename(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/t2embed/Makefile.in | 2 +- dlls/t2embed/main.c | 46 ++++++++++++++++++++++++++++++++++++++++++++ dlls/t2embed/t2embed.spec | 4 ++-- dlls/t2embed/tests/t2embed.c | 23 ++++++++++++++++++++++ include/t2embapi.h | 3 +++ 5 files changed, 75 insertions(+), 3 deletions(-) diff --git a/dlls/t2embed/Makefile.in b/dlls/t2embed/Makefile.in index e585fe2..baa4757 100644 --- a/dlls/t2embed/Makefile.in +++ b/dlls/t2embed/Makefile.in @@ -1,6 +1,6 @@ MODULE = t2embed.dll IMPORTLIB = t2embed -IMPORTS = gdi32 +IMPORTS = gdi32 advapi32 C_SRCS = \ main.c diff --git a/dlls/t2embed/main.c b/dlls/t2embed/main.c index 2794f0f..9c807c7 100644 --- a/dlls/t2embed/main.c +++ b/dlls/t2embed/main.c @@ -25,6 +25,7 @@ #include "windef.h" #include "winbase.h" #include "wingdi.h" +#include "winreg.h" #include "t2embapi.h" #include "wine/debug.h" @@ -100,6 +101,51 @@ LONG WINAPI TTGetEmbeddingType(HDC hDC, ULONG *status) return E_NONE; } +LONG WINAPI TTIsEmbeddingEnabledForFacename(LPCSTR facename, BOOL *enabled) +{ + static const WCHAR exclusionlistW[] = {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', + 'S','h','a','r','e','d',' ','T','o','o','l','s','\\','t','2','e','m','b','e','d',0}; + DWORD index; + HKEY hkey; + LONG ret; + + TRACE("(%s %p)\n", debugstr_a(facename), enabled); + + if (!facename) + return E_FACENAMEINVALID; + + if (!enabled) + return E_PBENABLEDINVALID; + + *enabled = TRUE; + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, exclusionlistW, 0, GENERIC_READ, &hkey)) + return E_NONE; + + *enabled = TRUE; + ret = ERROR_SUCCESS; + index = 0; + while (ret != ERROR_NO_MORE_ITEMS) + { + DWORD name_len, value_len, value, type; + CHAR name[LF_FACESIZE]; + + name_len = sizeof(name)/sizeof(*name); + value_len = sizeof(value); + ret = RegEnumValueA(hkey, index++, name, &name_len, NULL, &type, (BYTE*)&value, &value_len); + if (ret || type != REG_DWORD) + continue; + + if (!lstrcmpiA(name, facename)) + { + *enabled = !!value; + break; + } + } + RegCloseKey(hkey); + + return E_NONE; +} + LONG WINAPI TTIsEmbeddingEnabled(HDC hDC, BOOL *enabled) { FIXME("(%p %p) stub\n", hDC, enabled); diff --git a/dlls/t2embed/t2embed.spec b/dlls/t2embed/t2embed.spec index e3be15c..5375fee 100644 --- a/dlls/t2embed/t2embed.spec +++ b/dlls/t2embed/t2embed.spec @@ -6,7 +6,7 @@ @ stub TTGetEmbeddedFontInfo @ stdcall TTGetEmbeddingType(long ptr) @ stdcall TTIsEmbeddingEnabled(long ptr) -@ stub TTIsEmbeddingEnabledForFacename +@ stdcall TTIsEmbeddingEnabledForFacename(str ptr) @ stdcall TTLoadEmbeddedFont(ptr long ptr long ptr ptr ptr wstr str ptr) @ stub TTRunValidationTests @ stub _TTCharToUnicode@24 @@ -17,7 +17,7 @@ @ stub _TTGetEmbeddedFontInfo@28 @ stdcall _TTGetEmbeddingType@8(long ptr) TTGetEmbeddingType @ stdcall _TTIsEmbeddingEnabled@8(long ptr) TTIsEmbeddingEnabled -@ stub _TTIsEmbeddingEnabledForFacename@8 +@ stdcall _TTIsEmbeddingEnabledForFacename@8(str ptr) TTIsEmbeddingEnabledForFacename @ stdcall _TTLoadEmbeddedFont@40(ptr long ptr long ptr ptr ptr wstr str ptr) TTLoadEmbeddedFont @ stub _TTRunValidationTests@8 @ stub TTEmbedFontEx diff --git a/dlls/t2embed/tests/t2embed.c b/dlls/t2embed/tests/t2embed.c index cdc2f49..6efb231 100644 --- a/dlls/t2embed/tests/t2embed.c +++ b/dlls/t2embed/tests/t2embed.c @@ -76,7 +76,30 @@ static void test_TTGetEmbeddingType(void) DeleteDC(hdc); } +static void test_TTIsEmbeddingEnabledForFacename(void) +{ + BOOL status; + LONG ret; + + ret = TTIsEmbeddingEnabledForFacename(NULL, NULL); + ok(ret == E_FACENAMEINVALID, "got %#x\n", ret); + + status = 123; + ret = TTIsEmbeddingEnabledForFacename(NULL, &status); + ok(ret == E_FACENAMEINVALID, "got %#x\n", ret); + ok(status == 123, "got %d\n", status); + + ret = TTIsEmbeddingEnabledForFacename("Arial", NULL); + ok(ret == E_PBENABLEDINVALID, "got %#x\n", ret); + + status = 123; + ret = TTIsEmbeddingEnabledForFacename("Arial", &status); + ok(ret == E_NONE, "got %#x\n", ret); + ok(status != 123, "got %d\n", status); +} + START_TEST(t2embed) { test_TTGetEmbeddingType(); + test_TTIsEmbeddingEnabledForFacename(); } diff --git a/include/t2embapi.h b/include/t2embapi.h index 60fda64..09067bd 100644 --- a/include/t2embapi.h +++ b/include/t2embapi.h @@ -42,7 +42,9 @@ extern "C" { #define E_HDCINVALID __MSABI_LONG(0x0006) #define E_NOTATRUETYPEFONT __MSABI_LONG(0x000a) #define E_ERRORACCESSINGFONTDATA __MSABI_LONG(0x000c) +#define E_FACENAMEINVALID __MSABI_LONG(0x0113) #define E_PERMISSIONSINVALID __MSABI_LONG(0x0117) +#define E_PBENABLEDINVALID __MSABI_LONG(0x0118) typedef ULONG (WINAPIV * READEMBEDPROC)(void*,void*,ULONG); typedef ULONG (WINAPIV * WRITEEMBEDPROC)(void*,void*,ULONG); @@ -72,6 +74,7 @@ LONG WINAPI TTDeleteEmbeddedFont(HANDLE,ULONG,ULONG*); #define EMBED_NOEMBEDDING 4 LONG WINAPI TTGetEmbeddingType(HDC, ULONG*); +LONG WINAPI TTIsEmbeddingEnabledForFacename(LPCSTR facename, BOOL *enabled); #ifdef __cplusplus }

1 0

Qian Hong : loader: Fix wld_prctl prototype.
by Alexandre Julliard 04 Apr '16

04 Apr '16

Module: wine Branch: master Commit: 33765285c535ea521961a6ee812db08c79abda6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=33765285c535ea521961a6ee8… Author: Qian Hong <qhong(a)codeweavers.com> Date: Mon Apr 4 01:42:06 2016 +0800 loader: Fix wld_prctl prototype. Spotted by Robert O'Callahan. Signed-off-by: Qian Hong <qhong(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/preloader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loader/preloader.c b/loader/preloader.c index 25aaacd..db0e998 100644 --- a/loader/preloader.c +++ b/loader/preloader.c @@ -423,7 +423,7 @@ SYSCALL_FUNC( wld_mmap, 9 /* SYS_mmap */ ); int wld_mprotect( const void *addr, size_t len, int prot ); SYSCALL_FUNC( wld_mprotect, 10 /* SYS_mprotect */ ); -int wld_prctl( int code, int arg ); +int wld_prctl( int code, long arg ); SYSCALL_FUNC( wld_prctl, 157 /* SYS_prctl */ ); uid_t wld_getuid(void);

1 0

Alistair Leslie-Hughes : wined3d: Add detection for NVIDIA GTX TITAN.
by Alexandre Julliard 04 Apr '16

04 Apr '16

Module: wine Branch: master Commit: 20478d9182e15bcbac5a19ff82ef89b423f7dac9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20478d9182e15bcbac5a19ff8… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat Apr 2 19:50:33 2016 +1100 wined3d: Add detection for NVIDIA GTX TITAN. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 3 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 0a299d3..02fb587 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1284,6 +1284,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX770, "NVIDIA GeForce GTX 770", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX780, "NVIDIA GeForce GTX 780", DRIVER_NVIDIA_GEFORCE8, 3072}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX780TI, "NVIDIA GeForce GTX 780 Ti", DRIVER_NVIDIA_GEFORCE8, 3072}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTXTITAN, "NVIDIA GeForce GTX TITAN Black", DRIVER_NVIDIA_GEFORCE8, 6144}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX860M, "NVIDIA GeForce GTX 860M", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX950, "NVIDIA GeForce GTX 950", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX950M, "NVIDIA GeForce GTX 950M", DRIVER_NVIDIA_GEFORCE8, 4096}, @@ -1749,6 +1750,7 @@ cards_nvidia_binary[] = {"GTX 950", CARD_NVIDIA_GEFORCE_GTX950}, /* GeForce 900 - midend */ {"GTX 860M", CARD_NVIDIA_GEFORCE_GTX860M}, /* GeForce 800 - mobile */ {"GTX 780 Ti", CARD_NVIDIA_GEFORCE_GTX780TI}, /* Geforce 700 - highend */ + {"GTX TITAN Black", CARD_NVIDIA_GEFORCE_GTXTITAN}, /* Geforce 700 - highend */ {"GTX 780", CARD_NVIDIA_GEFORCE_GTX780}, /* Geforce 700 - highend */ {"GTX 770M", CARD_NVIDIA_GEFORCE_GTX770M}, /* Geforce 700 - midend high mobile */ {"GTX 770", CARD_NVIDIA_GEFORCE_GTX770}, /* Geforce 700 - highend */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ada7fa5..26ef25b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1780,6 +1780,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX770 = 0x1184, CARD_NVIDIA_GEFORCE_GTX780 = 0x1004, CARD_NVIDIA_GEFORCE_GTX780TI = 0x100a, + CARD_NVIDIA_GEFORCE_GTXTITAN = 0x100c, CARD_NVIDIA_GEFORCE_GTX860M = 0x1392, /* Other PCI ID 0x119a */ CARD_NVIDIA_GEFORCE_GTX950 = 0x1402, CARD_NVIDIA_GEFORCE_GTX950M = 0x139a,

1 0

Jarkko Korpi : wined3d: Add detection for NVIDIA GeForce 425M.
by Alexandre Julliard 04 Apr '16

04 Apr '16

Module: wine Branch: master Commit: ea4f91c7eacd5615898075f8629c9b7f7775ebc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea4f91c7eacd5615898075f86… Author: Jarkko Korpi <jarkko_korpi(a)hotmail.com> Date: Sat Apr 2 19:50:32 2016 +1100 wined3d: Add detection for NVIDIA GeForce 425M. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 3 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index d193897..0a299d3 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1245,6 +1245,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTS350M, "NVIDIA GeForce GTS 350M", DRIVER_NVIDIA_GEFORCE8, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_410M, "NVIDIA GeForce 410M", DRIVER_NVIDIA_GEFORCE8, 512}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT420, "NVIDIA GeForce GT 420", DRIVER_NVIDIA_GEFORCE8, 2048}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT425M, "NVIDIA GeForce GT 425M", DRIVER_NVIDIA_GEFORCE8, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT430, "NVIDIA GeForce GT 430", DRIVER_NVIDIA_GEFORCE8, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT440, "NVIDIA GeForce GT 440", DRIVER_NVIDIA_GEFORCE8, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTS450, "NVIDIA GeForce GTS 450", DRIVER_NVIDIA_GEFORCE8, 1024}, @@ -1786,6 +1787,7 @@ cards_nvidia_binary[] = {"GTS 450", CARD_NVIDIA_GEFORCE_GTS450}, /* Geforce 400 - midend low */ {"GT 440", CARD_NVIDIA_GEFORCE_GT440}, /* Geforce 400 - lowend */ {"GT 430", CARD_NVIDIA_GEFORCE_GT430}, /* Geforce 400 - lowend */ + {"GT 425M", CARD_NVIDIA_GEFORCE_GT425M}, /* Geforce 400 - lowend mobile */ {"GT 420", CARD_NVIDIA_GEFORCE_GT420}, /* Geforce 400 - lowend */ {"410M", CARD_NVIDIA_GEFORCE_410M}, /* Geforce 400 - lowend mobile */ {"GT 330", CARD_NVIDIA_GEFORCE_GT330}, /* Geforce 300 - highend */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8f6d09f..ada7fa5 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1741,6 +1741,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTS350M = 0x0cb0, CARD_NVIDIA_GEFORCE_410M = 0x1055, CARD_NVIDIA_GEFORCE_GT420 = 0x0de2, + CARD_NVIDIA_GEFORCE_GT425M = 0x0df0, CARD_NVIDIA_GEFORCE_GT430 = 0x0de1, CARD_NVIDIA_GEFORCE_GT440 = 0x0de0, CARD_NVIDIA_GEFORCE_GTS450 = 0x0dc4,

1 0

Stefan Dösinger : wined3d: Remove the dead wined3d_volume_invalidate_location declaration.
by Alexandre Julliard 04 Apr '16

04 Apr '16

Module: wine Branch: master Commit: 7f9798de91be4b50c558d83fb51cacb66bdbb2d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f9798de91be4b50c558d83fb… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Fri Apr 1 20:45:40 2016 +0100 wined3d: Remove the dead wined3d_volume_invalidate_location declaration. Signed-off-by: Stefan Dösinger <stefandoesinger(a)gmx.at> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/wined3d_private.h | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 180add8..8f6d09f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2568,7 +2568,6 @@ static inline struct wined3d_volume *volume_from_resource(struct wined3d_resourc void wined3d_volume_cleanup(struct wined3d_volume *volume) DECLSPEC_HIDDEN; HRESULT wined3d_volume_init(struct wined3d_volume *volume, struct wined3d_texture *container, const struct wined3d_resource_desc *desc, UINT level) DECLSPEC_HIDDEN; -void wined3d_volume_invalidate_location(struct wined3d_volume *volume, DWORD location) DECLSPEC_HIDDEN; void wined3d_volume_load(struct wined3d_volume *volume, struct wined3d_context *context, BOOL srgb_mode) DECLSPEC_HIDDEN; BOOL wined3d_volume_load_location(struct wined3d_volume *volume,

1 0

Henri Verbeet : wined3d: Use the texture dimension helpers in surface_is_full_rect().
by Alexandre Julliard 04 Apr '16

04 Apr '16

Module: wine Branch: master Commit: 29421729ef520ab79d03198ef98a55aa40ed4606 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29421729ef520ab79d03198ef… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 3 15:30:57 2016 +0200 wined3d: Use the texture dimension helpers in surface_is_full_rect(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 922c43a..a7dfbf5 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -487,9 +487,13 @@ static void surface_evict_sysmem(struct wined3d_surface *surface) static BOOL surface_is_full_rect(const struct wined3d_surface *surface, const RECT *r) { - if ((r->left && r->right) || abs(r->right - r->left) != surface->resource.width) + unsigned int t; + + t = wined3d_texture_get_level_width(surface->container, surface->texture_level); + if ((r->left && r->right) || abs(r->right - r->left) != t) return FALSE; - if ((r->top && r->bottom) || abs(r->bottom - r->top) != surface->resource.height) + t = wined3d_texture_get_level_height(surface->container, surface->texture_level); + if ((r->top && r->bottom) || abs(r->bottom - r->top) != t) return FALSE; return TRUE; }

1 0

Henri Verbeet : wined3d: Use the texture dimension helpers in surface_create_dib_section().
by Alexandre Julliard 04 Apr '16

04 Apr '16

Module: wine Branch: master Commit: d496fbc1e495067a606c8746dd35831ba65e2cac URL: http://source.winehq.org/git/wine.git/?a=commit;h=d496fbc1e495067a606c8746d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 3 15:30:56 2016 +0200 wined3d: Use the texture dimension helpers in surface_create_dib_section(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 5a84564..922c43a 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -390,7 +390,7 @@ HRESULT surface_create_dib_section(struct wined3d_surface *surface) b_info->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); wined3d_texture_get_pitch(texture, surface->texture_level, &row_pitch, &slice_pitch); b_info->bmiHeader.biWidth = row_pitch / format->byte_count; - b_info->bmiHeader.biHeight = 0 - surface->resource.height; + b_info->bmiHeader.biHeight = 0 - wined3d_texture_get_level_height(texture, surface->texture_level); b_info->bmiHeader.biSizeImage = slice_pitch; b_info->bmiHeader.biPlanes = 1; b_info->bmiHeader.biBitCount = format->byte_count * 8;

1 0

Henri Verbeet : wined3d: Use the texture dimension helpers in surface_get_rect().
by Alexandre Julliard 04 Apr '16

04 Apr '16

Module: wine Branch: master Commit: a138460fc578c5b40b68f062acdd9a6a9a1b70a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a138460fc578c5b40b68f062a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 3 15:30:55 2016 +0200 wined3d: Use the texture dimension helpers in surface_get_rect(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 04f30c6..5a84564 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -277,10 +277,12 @@ static void surface_get_rect(const struct wined3d_surface *surface, const RECT * *rect_out = *rect_in; else { + const struct wined3d_texture *texture = surface->container; + rect_out->left = 0; rect_out->top = 0; - rect_out->right = surface->resource.width; - rect_out->bottom = surface->resource.height; + rect_out->right = wined3d_texture_get_level_width(texture, surface->texture_level); + rect_out->bottom = wined3d_texture_get_level_height(texture, surface->texture_level); } }

1 0

Henri Verbeet : wined3d: Use the texture dimension helpers in wined3d_device_set_cursor_properties ().
by Alexandre Julliard 04 Apr '16

04 Apr '16

Module: wine Branch: master Commit: c2900cd8bab57451497d3d6431c8600ca1701dad URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2900cd8bab57451497d3d643… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 3 15:30:54 2016 +0200 wined3d: Use the texture dimension helpers in wined3d_device_set_cursor_properties(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 35 ++++++++++++++++------------------- 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 4001e6c..62e5129 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4325,21 +4325,19 @@ static struct wined3d_texture *wined3d_device_create_cursor_texture(struct wined HRESULT CDECL wined3d_device_set_cursor_properties(struct wined3d_device *device, UINT x_hotspot, UINT y_hotspot, struct wined3d_texture *texture, unsigned int sub_resource_idx) { + unsigned int texture_level = sub_resource_idx % texture->level_count; + unsigned int cursor_width, cursor_height; struct wined3d_display_mode mode; struct wined3d_map_desc map_desc; - struct wined3d_resource *sub_resource; - struct wined3d_surface *cursor_image; HRESULT hr; TRACE("device %p, x_hotspot %u, y_hotspot %u, texture %p, sub_resource_idx %u.\n", device, x_hotspot, y_hotspot, texture, sub_resource_idx); - if (!(sub_resource = wined3d_texture_get_sub_resource(texture, sub_resource_idx)) - || sub_resource->type != WINED3D_RTYPE_SURFACE) + if (sub_resource_idx >= texture->level_count * texture->layer_count + || texture->resource.type != WINED3D_RTYPE_TEXTURE_2D) return WINED3DERR_INVALIDCALL; - cursor_image = surface_from_resource(sub_resource); - if (device->cursor_texture) { wined3d_texture_decref(device->cursor_texture); @@ -4359,11 +4357,12 @@ HRESULT CDECL wined3d_device_set_cursor_properties(struct wined3d_device *device return WINED3DERR_INVALIDCALL; } - if (cursor_image->resource.width > mode.width || cursor_image->resource.height > mode.height) + cursor_width = wined3d_texture_get_level_width(texture, texture_level); + cursor_height = wined3d_texture_get_level_height(texture, texture_level); + if (cursor_width > mode.width || cursor_height > mode.height) { - WARN("Surface %p dimensions are %ux%u, but screen dimensions are %ux%u.\n", - cursor_image, cursor_image->resource.width, cursor_image->resource.height, - mode.width, mode.height); + WARN("Texture %p, sub-resource %u dimensions are %ux%u, but screen dimensions are %ux%u.\n", + texture, sub_resource_idx, cursor_width, cursor_height, mode.width, mode.height); return WINED3DERR_INVALIDCALL; } @@ -4379,9 +4378,9 @@ HRESULT CDECL wined3d_device_set_cursor_properties(struct wined3d_device *device return WINED3DERR_INVALIDCALL; } - if (cursor_image->resource.width == 32 && cursor_image->resource.height == 32) + if (cursor_width == 32 && cursor_height == 32) { - UINT mask_size = cursor_image->resource.width * cursor_image->resource.height / 8; + UINT mask_size = cursor_width * cursor_height / 8; ICONINFO cursor_info; DWORD *mask_bits; HCURSOR cursor; @@ -4398,10 +4397,8 @@ HRESULT CDECL wined3d_device_set_cursor_properties(struct wined3d_device *device cursor_info.fIcon = FALSE; cursor_info.xHotspot = x_hotspot; cursor_info.yHotspot = y_hotspot; - cursor_info.hbmMask = CreateBitmap(cursor_image->resource.width, - cursor_image->resource.height, 1, 1, mask_bits); - cursor_info.hbmColor = CreateBitmap(cursor_image->resource.width, - cursor_image->resource.height, 1, 32, map_desc.data); + cursor_info.hbmMask = CreateBitmap(cursor_width, cursor_height, 1, 1, mask_bits); + cursor_info.hbmColor = CreateBitmap(cursor_width, cursor_height, 1, 32, map_desc.data); wined3d_resource_unmap(&texture->resource, sub_resource_idx); /* Create our cursor and clean up. */ @@ -4419,9 +4416,9 @@ HRESULT CDECL wined3d_device_set_cursor_properties(struct wined3d_device *device HeapFree(GetProcessHeap(), 0, mask_bits); } - TRACE("New cursor dimensions are %ux%u.\n", cursor_image->resource.width, cursor_image->resource.height); - device->cursorWidth = cursor_image->resource.width; - device->cursorHeight = cursor_image->resource.height; + TRACE("New cursor dimensions are %ux%u.\n", cursor_width, cursor_height); + device->cursorWidth = cursor_width; + device->cursorHeight = cursor_height; device->xHotSpot = x_hotspot; device->yHotSpot = y_hotspot;

1 0

Henri Verbeet : wined3d: Use the texture dimension helpers in wined3d_device_create_cursor_texture ().
by Alexandre Julliard 04 Apr '16

04 Apr '16

Module: wine Branch: master Commit: 3f5e1d1707c922e1ff24f2a452faf171f8fd5a01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f5e1d1707c922e1ff24f2a45… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 3 15:30:53 2016 +0200 wined3d: Use the texture dimension helpers in wined3d_device_create_cursor_texture(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 35bf521..4001e6c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4282,6 +4282,7 @@ void CDECL wined3d_device_set_depth_stencil_view(struct wined3d_device *device, static struct wined3d_texture *wined3d_device_create_cursor_texture(struct wined3d_device *device, struct wined3d_texture *cursor_image, unsigned int sub_resource_idx) { + unsigned int texture_level = sub_resource_idx % cursor_image->level_count; struct wined3d_sub_resource_data data; struct wined3d_resource_desc desc; struct wined3d_map_desc map_desc; @@ -4304,8 +4305,8 @@ static struct wined3d_texture *wined3d_device_create_cursor_texture(struct wined desc.multisample_quality = 0; desc.usage = WINED3DUSAGE_DYNAMIC; desc.pool = WINED3D_POOL_DEFAULT; - desc.width = cursor_image->sub_resources[sub_resource_idx].resource->width; - desc.height = cursor_image->sub_resources[sub_resource_idx].resource->height; + desc.width = wined3d_texture_get_level_width(cursor_image, texture_level); + desc.height = wined3d_texture_get_level_height(cursor_image, texture_level); desc.depth = 1; desc.size = 0;

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2016