October 2018 - Wine-commits

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

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

Jacek Caban : server: Use requested options for device pseudo fd.
by Alexandre Julliard 29 Oct '18

29 Oct '18

Module: wine Branch: master Commit: f003ac5e62d984db0507506d5c0dc059505c328b URL: https://source.winehq.org/git/wine.git/?a=commit;h=f003ac5e62d984db0507506d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 29 15:48:44 2018 +0100 server: Use requested options for device pseudo fd. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/file.c | 2 +- server/device.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 076d6bf..e84324c 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -3578,7 +3578,7 @@ static void test_file_mode(void) { &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 } + { &mountmgr_dev_name, FILE_SYNCHRONOUS_IO_ALERT, FILE_SYNCHRONOUS_IO_ALERT } }; static WCHAR pipe_devW[] = {'\\','?','?','\\','P','I','P','E','\\'}; diff --git a/server/device.c b/server/device.c index 081fd2d..ac7d88f 100644 --- a/server/device.c +++ b/server/device.c @@ -358,7 +358,7 @@ static struct object *device_open_file( struct object *obj, unsigned int access, &mode, access, sharing, options ); if (file->fd) set_fd_user( file->fd, &device_file_fd_ops, &file->obj ); } - else file->fd = alloc_pseudo_fd( &device_file_fd_ops, &file->obj, 0 ); + else file->fd = alloc_pseudo_fd( &device_file_fd_ops, &file->obj, options ); if (!file->fd) {

1 0

Jacek Caban : server: Use a separated object for each opened named pipe device file.
by Alexandre Julliard 29 Oct '18

29 Oct '18

Module: wine Branch: master Commit: 2600ecd4edfdb71097105c74312f83845305a4f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2600ecd4edfdb71097105c74… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 29 15:49:47 2018 +0100 server: Use a separated object for each opened named pipe device file. Allows using proper options for ioctl pseudo fd. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 16 +++--- dlls/ntdll/tests/file.c | 2 +- server/named_pipe.c | 118 ++++++++++++++++++++++++++++++----------- 3 files changed, 94 insertions(+), 42 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2600ecd4edfdb7109710…

1 0

Michael Stefaniuc : winecfg: Use the ARRAY_SIZE() macro.
by Alexandre Julliard 29 Oct '18

29 Oct '18

Module: wine Branch: master Commit: f051aa6774194689b1ab6aaba3b9c22be902d6ab URL: https://source.winehq.org/git/wine.git/?a=commit;h=f051aa6774194689b1ab6aab… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Oct 29 20:10:42 2018 +0100 winecfg: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winecfg/driveui.c | 2 +- programs/winecfg/theme.c | 12 +++++------- programs/winecfg/winecfg.c | 2 +- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/programs/winecfg/driveui.c b/programs/winecfg/driveui.c index c25e71d..36ae88c 100644 --- a/programs/winecfg/driveui.c +++ b/programs/winecfg/driveui.c @@ -440,7 +440,7 @@ static void update_controls(HWND dialog) type = current_drive->type; SendDlgItemMessageW(dialog, IDC_COMBO_TYPE, CB_RESETCONTENT, 0, 0); - for (i = 0; i < sizeof(type_pairs) / sizeof(struct drive_typemap); i++) + for (i = 0; i < ARRAY_SIZE(type_pairs); i++) { WCHAR driveDesc[64]; LoadStringW(GetModuleHandleW(NULL), type_pairs[i].idDesc, driveDesc, ARRAY_SIZE(driveDesc)); diff --git a/programs/winecfg/theme.c b/programs/winecfg/theme.c index 5304f72..78d89a5 100644 --- a/programs/winecfg/theme.c +++ b/programs/winecfg/theme.c @@ -635,7 +635,7 @@ static void on_theme_install(HWND dialog) ofn.nFilterIndex = 0; ofn.lpstrFile = file; ofn.lpstrFile[0] = '\0'; - ofn.nMaxFile = sizeof(file)/sizeof(filetitle[0]); + ofn.nMaxFile = ARRAY_SIZE(file); ofn.lpstrFileTitle = filetitle; ofn.lpstrFileTitle[0] = '\0'; ofn.nMaxFileTitle = ARRAY_SIZE(filetitle); @@ -729,8 +729,6 @@ static struct ShellFolderInfo asfiInfo[] = { static struct ShellFolderInfo *psfiSelected = NULL; -#define NUM_ELEMS(x) (sizeof(x)/sizeof(*(x))) - static void init_shell_folder_listview_headers(HWND dialog) { LVCOLUMNW listColumn; RECT viewRect; @@ -763,8 +761,8 @@ static void read_shell_folder_link_targets(void) { WCHAR wszPath[MAX_PATH]; HRESULT hr; int i; - - for (i=0; i<NUM_ELEMS(asfiInfo); i++) { + + for (i=0; i<ARRAY_SIZE(asfiInfo); i++) { asfiInfo[i].szLinkTarget[0] = '\0'; hr = SHGetFolderPathW(NULL, asfiInfo[i].nFolder|CSIDL_FLAG_DONT_VERIFY, NULL, SHGFP_TYPE_CURRENT, wszPath); @@ -790,7 +788,7 @@ static void update_shell_folder_listview(HWND dialog) { SendDlgItemMessageW(dialog, IDC_LIST_SFPATHS, LVM_DELETEALLITEMS, 0, 0); - for (i=0; i<NUM_ELEMS(asfiInfo); i++) { + for (i=0; i<ARRAY_SIZE(asfiInfo); i++) { WCHAR buffer[MAX_PATH]; HRESULT hr; LPITEMIDLIST pidlCurrent; @@ -905,7 +903,7 @@ static void apply_shell_folder_changes(void) { struct stat statPath; HRESULT hr; - for (i=0; i<NUM_ELEMS(asfiInfo); i++) { + for (i=0; i<ARRAY_SIZE(asfiInfo); i++) { /* Ignore nonexistent link targets */ if (asfiInfo[i].szLinkTarget[0] && stat(asfiInfo[i].szLinkTarget, &statPath)) continue; diff --git a/programs/winecfg/winecfg.c b/programs/winecfg/winecfg.c index be04ba2..c4c05bd 100644 --- a/programs/winecfg/winecfg.c +++ b/programs/winecfg/winecfg.c @@ -623,7 +623,7 @@ static void process_setting(struct setting *s) static const WCHAR softwareW[] = {'S','o','f','t','w','a','r','e','\\'}; HKEY key; BOOL needs_wow64 = (is_win64 && s->root == HKEY_LOCAL_MACHINE && s->path && - !strncmpiW( s->path, softwareW, sizeof(softwareW)/sizeof(WCHAR) )); + !strncmpiW(s->path, softwareW, ARRAY_SIZE(softwareW))); if (s->value) {

1 0

Michael Stefaniuc : cmd: Use the ARRAY_SIZE() macro.
by Alexandre Julliard 29 Oct '18

29 Oct '18

Module: wine Branch: master Commit: a46f311f3fc23623f9141eac2f230b9b7adf333a URL: https://source.winehq.org/git/wine.git/?a=commit;h=a46f311f3fc23623f9141eac… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Oct 29 20:10:41 2018 +0100 cmd: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/wcmdmain.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 5ef4a2b..1c99661 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -2419,9 +2419,9 @@ int wmain (int argc, WCHAR *argvW[]) OSVERSIONINFOW osv; char osver[50]; - if (!GetEnvironmentVariableW(comspecW, comspec, sizeof(comspec)/sizeof(WCHAR))) + if (!GetEnvironmentVariableW(comspecW, comspec, ARRAY_SIZE(comspec))) { - GetSystemDirectoryW(comspec, (sizeof(comspec) - sizeof(cmdW))/sizeof(WCHAR)); + GetSystemDirectoryW(comspec, ARRAY_SIZE(comspec) - ARRAY_SIZE(cmdW)); strcatW(comspec, cmdW); SetEnvironmentVariableW(comspecW, comspec); }

1 0

Alistair Leslie-Hughes : setupapi: Fix broken control definition.
by Alexandre Julliard 29 Oct '18

29 Oct '18

Module: wine Branch: master Commit: 853351698842c92db62bddedd2f531b7c5e745d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=853351698842c92db62bdded… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Oct 29 21:49:53 2018 +0000 setupapi: Fix broken control definition. Based on a patch by Mark Jansen. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/setupapi.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/setupapi/setupapi.rc b/dlls/setupapi/setupapi.rc index c03f01f..f5da61f 100644 --- a/dlls/setupapi/setupapi.rc +++ b/dlls/setupapi/setupapi.rc @@ -43,7 +43,7 @@ BEGIN LTEXT "", SOURCESTRORD, 7, 18, 194, 11, WS_CHILD | WS_VISIBLE | WS_GROUP LTEXT "Destination:", -1, 7, 30, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP LTEXT "", DESTSTRORD, 7, 41, 194, 22, WS_CHILD | WS_VISIBLE | WS_GROUP - CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP + CONTROL "", PROGRESSORD, "setupx_progress", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 63, 194, 13 END IDPROMPTFORDISK DIALOG 0, 0, 260, 120

1 0

Henri Verbeet : wined3d: Don' t bother trying to blit from discarded textures.
by Alexandre Julliard 29 Oct '18

29 Oct '18

Module: wine Branch: master Commit: c130a028fcf61b57a63ded6ce0cdbed47df1e5bb URL: https://source.winehq.org/git/wine.git/?a=commit;h=c130a028fcf61b57a63ded6c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 29 11:05:07 2018 +0330 wined3d: Don't bother trying to blit from discarded textures. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 71693ad..746599e 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3121,6 +3121,15 @@ HRESULT texture2d_blt(struct wined3d_texture *dst_texture, unsigned int dst_sub_ fx->src_color_key.color_space_high_value); } + dst_sub_resource = &dst_texture->sub_resources[dst_sub_resource_idx]; + src_sub_resource = &src_texture->sub_resources[src_sub_resource_idx]; + + if (src_sub_resource->locations & WINED3D_LOCATION_DISCARDED) + { + WARN("Source sub-resource is discarded, nothing to do.\n"); + return WINED3D_OK; + } + SetRect(&src_rect, src_box->left, src_box->top, src_box->right, src_box->bottom); SetRect(&dst_rect, dst_box->left, dst_box->top, dst_box->right, dst_box->bottom); @@ -3202,9 +3211,6 @@ HRESULT texture2d_blt(struct wined3d_texture *dst_texture, unsigned int dst_sub_ TRACE("Colour blit.\n"); - dst_sub_resource = &dst_texture->sub_resources[dst_sub_resource_idx]; - src_sub_resource = &src_texture->sub_resources[src_sub_resource_idx]; - /* In principle this would apply to depth blits as well, but we don't * implement those in the CPU blitter at the moment. */ if ((dst_sub_resource->locations & dst_texture->resource.map_binding)

1 0

Henri Verbeet : wined3d: Move the "buffer_object" field from struct wined3d_buffer to struct wined3d_buffer_gl.
by Alexandre Julliard 29 Oct '18

29 Oct '18

Module: wine Branch: master Commit: b579afd30ae48fef03c9333e31c1349d54ed681a URL: https://source.winehq.org/git/wine.git/?a=commit;h=b579afd30ae48fef03c9333e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 29 11:05:08 2018 +0330 wined3d: Move the "buffer_object" field from struct wined3d_buffer to struct wined3d_buffer_gl. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 66 ++++++++++++++++++++++-------------------- dlls/wined3d/context.c | 6 ++-- dlls/wined3d/state.c | 7 +++-- dlls/wined3d/view.c | 7 +++-- dlls/wined3d/wined3d_private.h | 2 +- 5 files changed, 46 insertions(+), 42 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b579afd30ae48fef03c9…

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