wine-commits October 2018

wine-commits@winehq.org

1 participants
602 discussions

Jacek Caban : server: Add FileModeInformation implementation.
by Alexandre Julliard 29 Oct '18

29 Oct '18

Module: wine Branch: master Commit: 2adfa93a7f643341765d80af83ce99a9c6b23b72 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2adfa93a7f643341765d80af… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 29 15:48:30 2018 +0100 server: Add FileModeInformation implementation. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45749 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 2 +- dlls/ntdll/tests/file.c | 96 ++++++++++++++++++++++++++++++++++++++++++++++++- server/fd.c | 16 +++++++++ 3 files changed, 112 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 4b956d5..d3b3698 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -2244,7 +2244,7 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE hFile, PIO_STATUS_BLOCK io, sizeof(FILE_DISPOSITION_INFORMATION), /* FileDispositionInformation */ sizeof(FILE_POSITION_INFORMATION), /* FilePositionInformation */ sizeof(FILE_FULL_EA_INFORMATION), /* FileFullEaInformation */ - sizeof(FILE_MODE_INFORMATION), /* FileModeInformation */ + 0, /* FileModeInformation */ sizeof(FILE_ALIGNMENT_INFORMATION), /* FileAlignmentInformation */ sizeof(FILE_ALL_INFORMATION), /* FileAllInformation */ sizeof(FILE_ALLOCATION_INFORMATION), /* FileAllocationInformation */ diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index a4ae64f..076d6bf 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -85,6 +85,8 @@ static NTSTATUS (WINAPI *pNtQueryVolumeInformationFile)(HANDLE,PIO_STATUS_BLOCK, static NTSTATUS (WINAPI *pNtQueryFullAttributesFile)(const OBJECT_ATTRIBUTES*, FILE_NETWORK_OPEN_INFORMATION*); static NTSTATUS (WINAPI *pNtFlushBuffersFile)(HANDLE, IO_STATUS_BLOCK*); +static WCHAR fooW[] = {'f','o','o',0}; + static inline BOOL is_signaled( HANDLE obj ) { return WaitForSingleObject( obj, 0 ) == WAIT_OBJECT_0; @@ -331,7 +333,6 @@ static void open_file_test(void) { static const WCHAR testdirW[] = {'o','p','e','n','f','i','l','e','t','e','s','t',0}; static const char testdata[] = "Hello World"; - static WCHAR fooW[] = {'f','o','o',0}; NTSTATUS status; HANDLE dir, root, handle, file; WCHAR path[MAX_PATH], tmpfile[MAX_PATH]; @@ -3545,6 +3546,98 @@ static void test_file_access_information(void) CloseHandle( h ); } +static void test_file_mode(void) +{ + UNICODE_STRING file_name, pipe_dev_name, mountmgr_dev_name, mailslot_dev_name; + WCHAR tmp_path[MAX_PATH], dos_file_name[MAX_PATH]; + FILE_MODE_INFORMATION mode; + OBJECT_ATTRIBUTES attr; + IO_STATUS_BLOCK io; + HANDLE file; + unsigned i; + DWORD res, access; + NTSTATUS status; + + const struct { + UNICODE_STRING *file_name; + ULONG options; + ULONG mode; + BOOL todo; + } option_tests[] = { + { &file_name, 0, 0 }, + { &file_name, FILE_NON_DIRECTORY_FILE, 0 }, + { &file_name, FILE_NON_DIRECTORY_FILE | FILE_SEQUENTIAL_ONLY, FILE_SEQUENTIAL_ONLY }, + { &file_name, FILE_WRITE_THROUGH, FILE_WRITE_THROUGH }, + { &file_name, FILE_SYNCHRONOUS_IO_ALERT, FILE_SYNCHRONOUS_IO_ALERT }, + { &file_name, FILE_NO_INTERMEDIATE_BUFFERING, FILE_NO_INTERMEDIATE_BUFFERING }, + { &file_name, FILE_SYNCHRONOUS_IO_NONALERT | FILE_NON_DIRECTORY_FILE, FILE_SYNCHRONOUS_IO_NONALERT }, + { &file_name, FILE_DELETE_ON_CLOSE, 0 }, + { &file_name, FILE_RANDOM_ACCESS | FILE_NO_COMPRESSION, 0 }, + { &pipe_dev_name, 0, 0 }, + { &pipe_dev_name, FILE_SYNCHRONOUS_IO_ALERT, FILE_SYNCHRONOUS_IO_ALERT, TRUE }, + { &mailslot_dev_name, 0, 0 }, + { &mailslot_dev_name, FILE_SYNCHRONOUS_IO_ALERT, FILE_SYNCHRONOUS_IO_ALERT, TRUE }, + { &mountmgr_dev_name, 0, 0 }, + { &mountmgr_dev_name, FILE_SYNCHRONOUS_IO_ALERT, FILE_SYNCHRONOUS_IO_ALERT, TRUE } + }; + + static WCHAR pipe_devW[] = {'\\','?','?','\\','P','I','P','E','\\'}; + static WCHAR mailslot_devW[] = {'\\','?','?','\\','M','A','I','L','S','L','O','T','\\'}; + static WCHAR mountmgr_devW[] = + {'\\','?','?','\\','M','o','u','n','t','P','o','i','n','t','M','a','n','a','g','e','r'}; + + GetTempPathW(MAX_PATH, tmp_path); + res = GetTempFileNameW(tmp_path, fooW, 0, dos_file_name); + ok(res, "GetTempFileNameW failed: %u\n", GetLastError()); + pRtlDosPathNameToNtPathName_U( dos_file_name, &file_name, NULL, NULL ); + + pipe_dev_name.Buffer = pipe_devW; + pipe_dev_name.Length = sizeof(pipe_devW); + pipe_dev_name.MaximumLength = sizeof(pipe_devW); + + mailslot_dev_name.Buffer = mailslot_devW; + mailslot_dev_name.Length = sizeof(mailslot_devW); + mailslot_dev_name.MaximumLength = sizeof(mailslot_devW); + + mountmgr_dev_name.Buffer = mountmgr_devW; + mountmgr_dev_name.Length = sizeof(mountmgr_devW); + mountmgr_dev_name.MaximumLength = sizeof(mountmgr_devW); + + attr.Length = sizeof(attr); + attr.RootDirectory = 0; + attr.Attributes = OBJ_CASE_INSENSITIVE; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + + for (i = 0; i < ARRAY_SIZE(option_tests); i++) + { + attr.ObjectName = option_tests[i].file_name; + access = SYNCHRONIZE; + + if (option_tests[i].file_name == &file_name) + { + file = CreateFileW(dos_file_name, GENERIC_READ | GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); + ok(file != INVALID_HANDLE_VALUE, "CreateFile failed: %u\n", GetLastError()); + CloseHandle(file); + access |= GENERIC_WRITE | DELETE; + } + + status = pNtOpenFile(&file, access, &attr, &io, 0, option_tests[i].options); + ok(status == STATUS_SUCCESS, "[%u] NtOpenFile failed: %x\n", i, status); + + memset(&mode, 0xcc, sizeof(mode)); + status = pNtQueryInformationFile(file, &io, &mode, sizeof(mode), FileModeInformation); + ok(status == STATUS_SUCCESS, "[%u] can't get FileModeInformation: %x\n", i, status); + todo_wine_if(option_tests[i].todo) + ok(mode.Mode == option_tests[i].mode, "[%u] Mode = %x, expected %x\n", + i, mode.Mode, option_tests[i].mode); + + pNtClose(file); + if (option_tests[i].file_name == &file_name) + DeleteFileW(dos_file_name); + } +} + static void test_query_volume_information_file(void) { NTSTATUS status; @@ -4628,6 +4721,7 @@ START_TEST(file) test_file_completion_information(); test_file_id_information(); test_file_access_information(); + test_file_mode(); test_query_volume_information_file(); test_query_attribute_information_file(); test_ioctl(); diff --git a/server/fd.c b/server/fd.c index 117fad8..1459ad1 100644 --- a/server/fd.c +++ b/server/fd.c @@ -2195,6 +2195,22 @@ void default_fd_get_file_info( struct fd *fd, obj_handle_t handle, unsigned int set_reply_data( &info, sizeof(info) ); break; } + case FileModeInformation: + { + FILE_MODE_INFORMATION info; + if (get_reply_max_size() < sizeof(info)) + { + set_error( STATUS_INFO_LENGTH_MISMATCH ); + return; + } + info.Mode = fd->options & ( FILE_WRITE_THROUGH + | FILE_SEQUENTIAL_ONLY + | FILE_NO_INTERMEDIATE_BUFFERING + | FILE_SYNCHRONOUS_IO_ALERT + | FILE_SYNCHRONOUS_IO_NONALERT ); + set_reply_data( &info, sizeof(info) ); + break; + } case FileIoCompletionNotificationInformation: { FILE_IO_COMPLETION_NOTIFICATION_INFORMATION info;

1 0

Nikolay Sivov : d2d1/tests: Test command list resource reference.
by Alexandre Julliard 29 Oct '18

29 Oct '18

Module: wine Branch: master Commit: 8effa4da69e669bca2259b44e949711546a50362 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8effa4da69e669bca2259b44… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 29 11:47:57 2018 +0300 d2d1/tests: Test command list resource reference. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/tests/d2d1.c | 274 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 274 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8effa4da69e669bca225…

1 0

Byeongsik Jeon : po: Update Korean translation.
by Alexandre Julliard 29 Oct '18

29 Oct '18

Module: wine Branch: master Commit: 7b5160d4fe3ccd61291bc9ce68e3309b434aac94 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b5160d4fe3ccd61291bc9ce… Author: Byeongsik Jeon <bsjeon(a)hanmail.net> Date: Mon Oct 29 22:12:13 2018 +0900 po: Update Korean translation. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46050 Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ko.po | 2644 ++++++++++++++++++++++++++++---------------------------------- 1 file changed, 1207 insertions(+), 1437 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7b5160d4fe3ccd61291b…

1 0

Byeongsik Jeon : gdi32: Respect the FC_ANTIALIAS setting for the FC_RGBA_NONE case.
by Alexandre Julliard 29 Oct '18

29 Oct '18

Module: wine Branch: master Commit: 2b52474fdd192d466f3ccf24bf6ad623eff6a659 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2b52474fdd192d466f3ccf24… Author: Byeongsik Jeon <bsjeon(a)hanmail.net> Date: Mon Oct 29 21:50:21 2018 +0900 gdi32: Respect the FC_ANTIALIAS setting for the FC_RGBA_NONE case. Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index e37880a..b62288c 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -2772,7 +2772,7 @@ static UINT parse_aa_pattern( FcPattern *pattern ) case FC_RGBA_BGR: aa_flags = WINE_GGO_HBGR_BITMAP; break; case FC_RGBA_VRGB: aa_flags = WINE_GGO_VRGB_BITMAP; break; case FC_RGBA_VBGR: aa_flags = WINE_GGO_VBGR_BITMAP; break; - case FC_RGBA_NONE: aa_flags = GGO_GRAY4_BITMAP; break; + case FC_RGBA_NONE: aa_flags = aa_flags ? aa_flags : GGO_GRAY4_BITMAP; break; } } return aa_flags;

1 0

Byeongsik Jeon : gdi32: Remove the code that doesn' t work as intended around FcFontList().
by Alexandre Julliard 29 Oct '18

29 Oct '18

Module: wine Branch: master Commit: af90ab3259f6cd3c95b21dccdfd77c4db27db345 URL: https://source.winehq.org/git/wine.git/?a=commit;h=af90ab3259f6cd3c95b21dcc… Author: Byeongsik Jeon <bsjeon(a)hanmail.net> Date: Mon Oct 29 21:50:20 2018 +0900 gdi32: Remove the code that doesn't work as intended around FcFontList(). Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 7cc42b2..e37880a 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -176,9 +176,6 @@ MAKE_FUNCPTR(FcConfigSubstitute); MAKE_FUNCPTR(FcFontList); MAKE_FUNCPTR(FcFontSetDestroy); MAKE_FUNCPTR(FcInit); -MAKE_FUNCPTR(FcObjectSetAdd); -MAKE_FUNCPTR(FcObjectSetCreate); -MAKE_FUNCPTR(FcObjectSetDestroy); MAKE_FUNCPTR(FcPatternCreate); MAKE_FUNCPTR(FcPatternDestroy); MAKE_FUNCPTR(FcPatternGetBool); @@ -2796,9 +2793,6 @@ static void init_fontconfig(void) LOAD_FUNCPTR(FcFontList); LOAD_FUNCPTR(FcFontSetDestroy); LOAD_FUNCPTR(FcInit); - LOAD_FUNCPTR(FcObjectSetAdd); - LOAD_FUNCPTR(FcObjectSetCreate); - LOAD_FUNCPTR(FcObjectSetDestroy); LOAD_FUNCPTR(FcPatternCreate); LOAD_FUNCPTR(FcPatternDestroy); LOAD_FUNCPTR(FcPatternGetBool); @@ -2829,7 +2823,6 @@ static void init_fontconfig(void) static void load_fontconfig_fonts(void) { FcPattern *pat; - FcObjectSet *os; FcFontSet *fontset; int i, len; char *file; @@ -2838,13 +2831,15 @@ static void load_fontconfig_fonts(void) if (!fontconfig_enabled) return; pat = pFcPatternCreate(); - os = pFcObjectSetCreate(); - pFcObjectSetAdd(os, FC_FILE); - pFcObjectSetAdd(os, FC_SCALABLE); - pFcObjectSetAdd(os, FC_ANTIALIAS); - pFcObjectSetAdd(os, FC_RGBA); - fontset = pFcFontList(NULL, pat, os); - if(!fontset) return; + if (!pat) return; + + fontset = pFcFontList(NULL, pat, NULL); + if (!fontset) + { + pFcPatternDestroy(pat); + return; + } + for(i = 0; i < fontset->nfont; i++) { FcBool scalable; DWORD aa_flags; @@ -2875,7 +2870,6 @@ static void load_fontconfig_fonts(void) ADDFONT_EXTERNAL_FONT | ADDFONT_ADD_TO_CACHE | ADDFONT_AA_FLAGS(aa_flags) ); } pFcFontSetDestroy(fontset); - pFcObjectSetDestroy(os); pFcPatternDestroy(pat); }

1 0

Byeongsik Jeon : gdi32: Support other settings for obtaining the default_aa_flags value.
by Alexandre Julliard 29 Oct '18

29 Oct '18

Module: wine Branch: master Commit: 2fe859b8ef0344d216b585baade6070f574a3dcb URL: https://source.winehq.org/git/wine.git/?a=commit;h=2fe859b8ef0344d216b585ba… Author: Byeongsik Jeon <bsjeon(a)hanmail.net> Date: Wed Oct 24 01:07:11 2018 +0900 gdi32: Support other settings for obtaining the default_aa_flags value. Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 5b1a23b..7cc42b2 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -2812,6 +2812,15 @@ static void init_fontconfig(void) pFcConfigSubstitute( NULL, pattern, FcMatchFont ); default_aa_flags = parse_aa_pattern( pattern ); pFcPatternDestroy( pattern ); + + if (!default_aa_flags) + { + FcPattern *pattern = pFcPatternCreate(); + pFcConfigSubstitute( NULL, pattern, FcMatchPattern ); + default_aa_flags = parse_aa_pattern( pattern ); + pFcPatternDestroy( pattern ); + } + TRACE( "enabled, default flags = %x\n", default_aa_flags ); fontconfig_enabled = TRUE; }

1 0

Zhiyi Zhang : include: Fix wrong argument attribute for IFileDialog:: GetOptions.
by Alexandre Julliard 29 Oct '18

29 Oct '18

Module: wine Branch: master Commit: 4e90bddcdded52b3a4df52cd92edc987c8553959 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e90bddcdded52b3a4df52cd… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Oct 29 17:07:47 2018 +0800 include: Fix wrong argument attribute for IFileDialog::GetOptions. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/shobjidl.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/shobjidl.idl b/include/shobjidl.idl index 73278e4..d459272 100644 --- a/include/shobjidl.idl +++ b/include/shobjidl.idl @@ -2889,7 +2889,7 @@ interface IFileDialog : IModalWindow [in] FILEOPENDIALOGOPTIONS fos); HRESULT GetOptions( - [in] FILEOPENDIALOGOPTIONS *pfos); + [out] FILEOPENDIALOGOPTIONS *pfos); HRESULT SetDefaultFolder( [in] IShellItem *psi);

1 0

Henri Verbeet : wined3d: Move the multisample renderbuffers from struct wined3d_texture to struct wined3d_texture_gl.
by Alexandre Julliard 29 Oct '18

29 Oct '18

Module: wine Branch: master Commit: e12d97e50d9378e62e2e0d3af970f84b2fc5d9ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=e12d97e50d9378e62e2e0d3a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 29 11:05:11 2018 +0330 wined3d: Move the multisample renderbuffers from struct wined3d_texture to struct wined3d_texture_gl. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 4 +-- dlls/wined3d/swapchain.c | 30 ++++++++--------- dlls/wined3d/texture.c | 74 +++++++++++++++++++++--------------------- dlls/wined3d/wined3d_private.h | 6 ++-- 4 files changed, 57 insertions(+), 57 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e12d97e50d9378e62e2e…

1 0

Henri Verbeet : wined3d: Move the depth renderbuffers from struct wined3d_texture to struct wined3d_texture_gl.
by Alexandre Julliard 29 Oct '18

29 Oct '18

Module: wine Branch: master Commit: 0649adc31f67318f833f3a8b866e3fd43055d7cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=0649adc31f67318f833f3a8b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 29 11:05:10 2018 +0330 wined3d: Move the depth renderbuffers from struct wined3d_texture to struct wined3d_texture_gl. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 25 +++---- dlls/wined3d/texture.c | 157 ++++++++++++++++++++++++----------------- dlls/wined3d/wined3d_private.h | 12 ++-- 3 files changed, 111 insertions(+), 83 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0649adc31f67318f833f…

1 0

Henri Verbeet : wined3d: Introduce a separate structure for OpenGL texture information.
by Alexandre Julliard 29 Oct '18

29 Oct '18

Module: wine Branch: master Commit: 81f577e119e7578a8410d2c29da1b6aa1dad6e97 URL: https://source.winehq.org/git/wine.git/?a=commit;h=81f577e119e7578a8410d2c2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 29 11:05:09 2018 +0330 wined3d: Introduce a separate structure for OpenGL texture information. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 45 ++++++++++++++++++++++++++++-------------- dlls/wined3d/wined3d_private.h | 12 ++++++++++- 2 files changed, 41 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index a3d834e..fb6c07e 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1220,8 +1220,10 @@ static void wined3d_texture_cleanup_sync(struct wined3d_texture *texture) static void wined3d_texture_destroy_object(void *object) { - wined3d_texture_cleanup(object); - heap_free(object); + struct wined3d_texture *texture = object; + + wined3d_texture_cleanup(texture); + heap_free(wined3d_texture_gl(texture)); } ULONG CDECL wined3d_texture_decref(struct wined3d_texture *texture) @@ -2844,7 +2846,8 @@ static const struct wined3d_texture_ops texture1d_ops = static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struct wined3d_resource_desc *desc, unsigned int layer_count, unsigned int level_count, DWORD flags, struct wined3d_device *device, - void *parent, const struct wined3d_parent_ops *parent_ops, const struct wined3d_texture_ops *texture_ops) + void *parent, const struct wined3d_parent_ops *parent_ops, void *sub_resources, + const struct wined3d_texture_ops *texture_ops) { const struct wined3d_d3d_info *d3d_info = &device->adapter->d3d_info; struct wined3d_device_parent *device_parent = device->device_parent; @@ -2856,11 +2859,11 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc TRACE("texture %p, resource_type %s, format %s, multisample_type %#x, multisample_quality %#x, " "usage %s, access %s, width %u, height %u, depth %u, layer_count %u, level_count %u, " - "flags %#x, device %p, parent %p, parent_ops %p, texture_ops %p.\n", + "flags %#x, device %p, parent %p, parent_ops %p, sub_resources %p, texture_ops %p.\n", texture, debug_d3dresourcetype(desc->resource_type), debug_d3dformat(desc->format), desc->multisample_type, desc->multisample_quality, debug_d3dusage(desc->usage), wined3d_debug_resource_access(desc->access), desc->width, desc->height, desc->depth, - layer_count, level_count, flags, device, parent, parent_ops, texture_ops); + layer_count, level_count, flags, device, parent, parent_ops, sub_resources, texture_ops); if (!desc->width || !desc->height || !desc->depth) return WINED3DERR_INVALIDCALL; @@ -2887,6 +2890,8 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc return WINED3DERR_INVALIDCALL; } + texture->sub_resources = sub_resources; + /* TODO: It should only be possible to create textures for formats * that are reported as supported. */ if (WINED3DFMT_UNKNOWN >= desc->format) @@ -3564,13 +3569,23 @@ HRESULT CDECL wined3d_texture_get_sub_resource_desc(const struct wined3d_texture return WINED3D_OK; } +static void *wined3d_texture_allocate_object_memory(SIZE_T s, SIZE_T level_count, SIZE_T layer_count) +{ + struct wined3d_texture *t; + + if (level_count > ((~(SIZE_T)0 - s) / sizeof(*t->sub_resources)) / layer_count) + return NULL; + + return heap_alloc_zero(s + level_count * layer_count * sizeof(*t->sub_resources)); +} + HRESULT CDECL wined3d_texture_create(struct wined3d_device *device, const struct wined3d_resource_desc *desc, UINT layer_count, UINT level_count, DWORD flags, const struct wined3d_sub_resource_data *data, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_texture **texture) { unsigned int sub_count = level_count * layer_count; const struct wined3d_texture_ops *texture_ops; - struct wined3d_texture *object; + struct wined3d_texture_gl *object; unsigned int i; HRESULT hr; @@ -3644,11 +3659,11 @@ HRESULT CDECL wined3d_texture_create(struct wined3d_device *device, const struct } } - if (!(object = heap_alloc_zero(FIELD_OFFSET(struct wined3d_texture, sub_resources[sub_count])))) + if (!(object = wined3d_texture_allocate_object_memory(sizeof(*object), level_count, layer_count))) return E_OUTOFMEMORY; - if (FAILED(hr = wined3d_texture_init(object, desc, layer_count, - level_count, flags, device, parent, parent_ops, texture_ops))) + if (FAILED(hr = wined3d_texture_init(&object->t, desc, layer_count, + level_count, flags, device, parent, parent_ops, &object[1], texture_ops))) { WARN("Failed to initialize texture, returning %#x.\n", hr); heap_free(object); @@ -3664,19 +3679,19 @@ HRESULT CDECL wined3d_texture_create(struct wined3d_device *device, const struct for (i = 0; i < sub_count; ++i) { - level = i % object->level_count; - width = wined3d_texture_get_level_width(object, level); - height = wined3d_texture_get_level_height(object, level); - depth = wined3d_texture_get_level_depth(object, level); + level = i % object->t.level_count; + width = wined3d_texture_get_level_width(&object->t, level); + height = wined3d_texture_get_level_height(&object->t, level); + depth = wined3d_texture_get_level_depth(&object->t, level); wined3d_box_set(&box, 0, 0, width, height, 0, depth); - wined3d_cs_emit_update_sub_resource(device->cs, &object->resource, + wined3d_cs_emit_update_sub_resource(device->cs, &object->t.resource, i, &box, data[i].data, data[i].row_pitch, data[i].slice_pitch); } } TRACE("Created texture %p.\n", object); - *texture = object; + *texture = &object->t; return WINED3D_OK; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 2594049..2c21976 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3277,7 +3277,7 @@ struct wined3d_texture unsigned int map_count; DWORD locations; GLuint buffer_object; - } sub_resources[1]; + } *sub_resources; }; static inline struct wined3d_texture *texture_from_resource(struct wined3d_resource *resource) @@ -3408,6 +3408,16 @@ void wined3d_texture_validate_location(struct wined3d_texture *texture, void wined3d_gl_texture_swizzle_from_color_fixup(GLint swizzle[4], struct color_fixup_desc fixup) DECLSPEC_HIDDEN; +struct wined3d_texture_gl +{ + struct wined3d_texture t; +}; + +static inline struct wined3d_texture_gl *wined3d_texture_gl(struct wined3d_texture *texture) +{ + return CONTAINING_RECORD(texture, struct wined3d_texture_gl, t); +} + #define WINED3D_LOCATION_DISCARDED 0x00000001 #define WINED3D_LOCATION_SYSMEM 0x00000002 #define WINED3D_LOCATION_USER_MEMORY 0x00000004

1 0

← Newer
1
...
6
7
8
9
10
11
12
...
61
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2018