wine-commits October 2018

wine-commits@winehq.org

1 participants
602 discussions

Nikolay Sivov : msvcrt: Implement __strncnt().
by Alexandre Julliard 30 Oct '18

30 Oct '18

Module: wine Branch: master Commit: 60c06980cfcb49c33ee6cc103ee2e8324f8ccc73 URL: https://source.winehq.org/git/wine.git/?a=commit;h=60c06980cfcb49c33ee6cc10… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 30 16:01:09 2018 +0300 msvcrt: Implement __strncnt(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-string-l1-1-0.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr100/tests/msvcr100.c | 32 +++++++++++++++++ dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr110/tests/msvcr110.c | 32 +++++++++++++++++ dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcr90/tests/msvcr90.c | 32 +++++++++++++++++ dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/string.c | 19 ++++++++++ dlls/msvcrt/tests/string.c | 38 ++++++++++++++++++++ dlls/ucrtbase/tests/string.c | 42 ++++++++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 15 files changed, 204 insertions(+), 9 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=60c06980cfcb49c33ee6…

1 0

Alexandre Julliard : loader: Don't add the AT_UID entries if they don' t already exist.
by Alexandre Julliard 30 Oct '18

30 Oct '18

Module: wine Branch: master Commit: a2d76cb43f1dbe0d58781c416e4cc166ac61e974 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a2d76cb43f1dbe0d58781c41… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 30 14:20:05 2018 +0100 loader: Don't add the AT_UID entries if they don't already exist. geteuid() etc. are broken on Android. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/preloader.c | 36 ++---------------------------------- 1 file changed, 2 insertions(+), 34 deletions(-) diff --git a/loader/preloader.c b/loader/preloader.c index 725926e..644244b 100644 --- a/loader/preloader.c +++ b/loader/preloader.c @@ -330,34 +330,6 @@ __ASM_GLOBAL_FUNC(wld_mmap, __ASM_CFI(".cfi_adjust_cfa_offset -4\n\t") "\tret\n" ) -static inline uid_t wld_getuid(void) -{ - uid_t ret; - __asm__( "int $0x80" : "=a" (ret) : "0" (24 /* SYS_getuid */) ); - return ret; -} - -static inline uid_t wld_geteuid(void) -{ - uid_t ret; - __asm__( "int $0x80" : "=a" (ret) : "0" (49 /* SYS_geteuid */) ); - return ret; -} - -static inline gid_t wld_getgid(void) -{ - gid_t ret; - __asm__( "int $0x80" : "=a" (ret) : "0" (47 /* SYS_getgid */) ); - return ret; -} - -static inline gid_t wld_getegid(void) -{ - gid_t ret; - __asm__( "int $0x80" : "=a" (ret) : "0" (50 /* SYS_getegid */) ); - return ret; -} - static inline int wld_prctl( int code, long arg ) { int ret; @@ -1282,7 +1254,7 @@ void* wld_start( void **stack ) long i, *pargc; char **argv, **p; char *interp, *reserve = NULL; - struct wld_auxv new_av[12], delete_av[3], *av; + struct wld_auxv new_av[8], delete_av[3], *av; struct wld_link_map main_binary_map, ld_so_map; struct wine_preload_info **wine_main_preload_info; @@ -1365,11 +1337,7 @@ void* wld_start( void **stack ) SET_NEW_AV( 4, AT_BASE, ld_so_map.l_addr ); SET_NEW_AV( 5, AT_FLAGS, get_auxiliary( av, AT_FLAGS, 0 ) ); SET_NEW_AV( 6, AT_ENTRY, main_binary_map.l_entry ); - SET_NEW_AV( 7, AT_UID, get_auxiliary( av, AT_UID, wld_getuid() ) ); - SET_NEW_AV( 8, AT_EUID, get_auxiliary( av, AT_EUID, wld_geteuid() ) ); - SET_NEW_AV( 9, AT_GID, get_auxiliary( av, AT_GID, wld_getgid() ) ); - SET_NEW_AV(10, AT_EGID, get_auxiliary( av, AT_EGID, wld_getegid() ) ); - SET_NEW_AV(11, AT_NULL, 0 ); + SET_NEW_AV( 7, AT_NULL, 0 ); #undef SET_NEW_AV i = 0;

1 0

Gabriel Ivăncescu : shell32/autocomplete: Use a helper function to show the listbox.
by Alexandre Julliard 30 Oct '18

30 Oct '18

Module: wine Branch: master Commit: 3d9da1a691de1124a154683cdeef91b9d2e6faf6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d9da1a691de1124a154683c… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Oct 25 21:04:51 2018 +0300 shell32/autocomplete: Use a helper function to show the listbox. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/autocomplete.c | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index 8cf0243..b3f86f3 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -109,6 +109,21 @@ static void hide_listbox(IAutoCompleteImpl *ac, HWND hwnd) SendMessageW(hwnd, LB_RESETCONTENT, 0, 0); } +static void show_listbox(IAutoCompleteImpl *ac, UINT cnt) +{ + RECT r; + UINT width, height; + + GetWindowRect(ac->hwndEdit, &r); + SendMessageW(ac->hwndListBox, LB_CARETOFF, 0, 0); + + /* Windows XP displays 7 lines at most, then it uses a scroll bar */ + height = SendMessageW(ac->hwndListBox, LB_GETITEMHEIGHT, 0, 0) * min(cnt + 1, 7); + width = r.right - r.left; + + SetWindowPos(ac->hwndListBox, HWND_TOP, r.left, r.bottom + 1, width, height, SWP_SHOWWINDOW); +} + static size_t format_quick_complete(WCHAR *dst, const WCHAR *qc, const WCHAR *str, size_t str_len) { /* Replace the first %s directly without using snprintf, to avoid @@ -339,15 +354,7 @@ static BOOL display_matching_strs(IAutoCompleteImpl *ac, WCHAR *text, UINT len, { if (cpt) { - RECT r; - UINT height = SendMessageW(ac->hwndListBox, LB_GETITEMHEIGHT, 0, 0); - SendMessageW(ac->hwndListBox, LB_CARETOFF, 0, 0); - GetWindowRect(hwnd, &r); - /* It seems that Windows XP displays 7 lines at most - and otherwise displays a vertical scroll bar */ - SetWindowPos(ac->hwndListBox, HWND_TOP, - r.left, r.bottom + 1, r.right - r.left, height * min(cpt + 1, 7), - SWP_SHOWWINDOW ); + show_listbox(ac, cpt); SendMessageW(ac->hwndListBox, WM_SETREDRAW, TRUE, 0); } else

1 0

Gabriel Ivăncescu : shell32/autocomplete: Fill and display the auto-suggest listbox in a separate function.
by Alexandre Julliard 30 Oct '18

30 Oct '18

Module: wine Branch: master Commit: ec3b39fa221eb659cf5834ae07ef8514e1536be5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec3b39fa221eb659cf5834ae… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Oct 25 21:04:50 2018 +0300 shell32/autocomplete: Fill and display the auto-suggest listbox in a separate function. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/autocomplete.c | 77 ++++++++++++++++++++++++++------------------- 1 file changed, 44 insertions(+), 33 deletions(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index dfe7638..8cf0243 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -293,40 +293,11 @@ static void autoappend_str(IAutoCompleteImpl *ac, WCHAR *text, UINT len, WCHAR * heap_free(tmp); } -static void autocomplete_text(IAutoCompleteImpl *ac, HWND hwnd, enum autoappend_flag flag) +static BOOL display_matching_strs(IAutoCompleteImpl *ac, WCHAR *text, UINT len, + HWND hwnd, enum autoappend_flag flag) { - HRESULT hr; - WCHAR *text; - UINT cpt, size, len = SendMessageW(hwnd, WM_GETTEXTLENGTH, 0, 0); - - if (flag != autoappend_flag_displayempty && len == 0) - { - if (ac->options & ACO_AUTOSUGGEST) - hide_listbox(ac, ac->hwndListBox); - return; - } - - size = len + 1; - if (!(text = heap_alloc(size * sizeof(WCHAR)))) - return; - len = SendMessageW(hwnd, WM_GETTEXT, size, (LPARAM)text); - if (len + 1 != size) - text = heap_realloc(text, (len + 1) * sizeof(WCHAR)); - - /* Reset it here to simplify the logic in aclist_expand for - empty strings, since it tracks changes using txtbackup, - and Reset needs to be called before IACList::Expand */ - IEnumString_Reset(ac->enumstr); - if (ac->aclist) - { - aclist_expand(ac, text); - if (text[len - 1] == '\\' || text[len - 1] == '/') - flag = autoappend_flag_no; - } - - /* Set txtbackup to point to text itself (which must not be released) */ - heap_free(ac->txtbackup); - ac->txtbackup = text; + /* Return FALSE if we need to hide the listbox */ + UINT cpt; if (ac->options & ACO_AUTOSUGGEST) { @@ -335,6 +306,7 @@ static void autocomplete_text(IAutoCompleteImpl *ac, HWND hwnd, enum autoappend_ } for (cpt = 0;;) { + HRESULT hr; LPOLESTR strs = NULL; ULONG fetched; @@ -379,8 +351,47 @@ static void autocomplete_text(IAutoCompleteImpl *ac, HWND hwnd, enum autoappend_ SendMessageW(ac->hwndListBox, WM_SETREDRAW, TRUE, 0); } else + return FALSE; + } + return TRUE; +} + +static void autocomplete_text(IAutoCompleteImpl *ac, HWND hwnd, enum autoappend_flag flag) +{ + WCHAR *text; + UINT size, len = SendMessageW(hwnd, WM_GETTEXTLENGTH, 0, 0); + + if (flag != autoappend_flag_displayempty && len == 0) + { + if (ac->options & ACO_AUTOSUGGEST) hide_listbox(ac, ac->hwndListBox); + return; } + + size = len + 1; + if (!(text = heap_alloc(size * sizeof(WCHAR)))) + return; + len = SendMessageW(hwnd, WM_GETTEXT, size, (LPARAM)text); + if (len + 1 != size) + text = heap_realloc(text, (len + 1) * sizeof(WCHAR)); + + /* Reset it here to simplify the logic in aclist_expand for + empty strings, since it tracks changes using txtbackup, + and Reset needs to be called before IACList::Expand */ + IEnumString_Reset(ac->enumstr); + if (ac->aclist) + { + aclist_expand(ac, text); + if (text[len - 1] == '\\' || text[len - 1] == '/') + flag = autoappend_flag_no; + } + + /* Set txtbackup to point to text itself (which must not be released) */ + heap_free(ac->txtbackup); + ac->txtbackup = text; + + if (!display_matching_strs(ac, text, len, hwnd, flag)) + hide_listbox(ac, ac->hwndListBox); } static void destroy_autocomplete_object(IAutoCompleteImpl *ac)

1 0

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

30 Oct '18

Module: wine Branch: master Commit: eb7e3f88683e738108c19994f5296811aa93be5e URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb7e3f88683e738108c19994… Author: Byeongsik Jeon <bsjeon(a)hanmail.net> Date: Tue Oct 30 20:26:27 2018 +0900 po: Update Korean translation. Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ko.po | 2007 +++++++++++++++++++++++++++++++------------------------------- 1 file changed, 994 insertions(+), 1013 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=eb7e3f88683e738108c1…

1 0

Henri Verbeet : wined3d: Store resource bind flags in the wined3d_resource structure.
by Alexandre Julliard 30 Oct '18

30 Oct '18

Module: wine Branch: master Commit: 45bf95278d669779e6ca3cde9215556a043a8cf8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=45bf95278d669779e6ca3cde… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 30 13:36:47 2018 +0330 wined3d: Store resource bind flags in the wined3d_resource structure. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 13 ++++++------- dlls/wined3d/resource.c | 5 +++-- dlls/wined3d/texture.c | 2 +- dlls/wined3d/wined3d_private.h | 6 +++--- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 8c7a23f..4c90d82 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -155,11 +155,11 @@ static void wined3d_buffer_gl_destroy_buffer_object(struct wined3d_buffer_gl *bu * rarely. */ if (resource->bind_count) { - if (buffer_gl->b.bind_flags & WINED3D_BIND_VERTEX_BUFFER) + if (resource->bind_flags & WINED3D_BIND_VERTEX_BUFFER) device_invalidate_state(resource->device, STATE_STREAMSRC); - if (buffer_gl->b.bind_flags & WINED3D_BIND_INDEX_BUFFER) + if (resource->bind_flags & WINED3D_BIND_INDEX_BUFFER) device_invalidate_state(resource->device, STATE_INDEXBUFFER); - if (buffer_gl->b.bind_flags & WINED3D_BIND_CONSTANT_BUFFER) + if (resource->bind_flags & WINED3D_BIND_CONSTANT_BUFFER) { device_invalidate_state(resource->device, STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_VERTEX)); device_invalidate_state(resource->device, STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_HULL)); @@ -168,7 +168,7 @@ static void wined3d_buffer_gl_destroy_buffer_object(struct wined3d_buffer_gl *bu device_invalidate_state(resource->device, STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_PIXEL)); device_invalidate_state(resource->device, STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_COMPUTE)); } - if (buffer_gl->b.bind_flags & WINED3D_BIND_STREAM_OUTPUT) + if (resource->bind_flags & WINED3D_BIND_STREAM_OUTPUT) { device_invalidate_state(resource->device, STATE_STREAM_OUTPUT); if (context->transform_feedback_active) @@ -1379,13 +1379,12 @@ static HRESULT wined3d_buffer_init(struct wined3d_buffer *buffer, struct wined3d } if (FAILED(hr = resource_init(resource, device, WINED3D_RTYPE_BUFFER, format, - WINED3D_MULTISAMPLE_NONE, 0, desc->usage, desc->access, desc->byte_width, 1, 1, - desc->byte_width, parent, parent_ops, &buffer_resource_ops))) + WINED3D_MULTISAMPLE_NONE, 0, desc->usage, desc->bind_flags, desc->access, + desc->byte_width, 1, 1, desc->byte_width, parent, parent_ops, &buffer_resource_ops))) { WARN("Failed to initialize resource, hr %#x.\n", hr); return hr; } - buffer->bind_flags = desc->bind_flags; buffer->structure_byte_stride = desc->structure_byte_stride; buffer->locations = data ? WINED3D_LOCATION_DISCARDED : WINED3D_LOCATION_SYSMEM; diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 9df0a09..a1b2cbd 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -56,8 +56,8 @@ static void resource_check_usage(DWORD usage) HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device *device, enum wined3d_resource_type type, const struct wined3d_format *format, - enum wined3d_multisample_type multisample_type, unsigned int multisample_quality, - unsigned int usage, unsigned int access, unsigned int width, unsigned int height, unsigned int depth, + enum wined3d_multisample_type multisample_type, unsigned int multisample_quality, unsigned int usage, + unsigned int bind_flags, unsigned int access, unsigned int width, unsigned int height, unsigned int depth, unsigned int size, void *parent, const struct wined3d_parent_ops *parent_ops, const struct wined3d_resource_ops *resource_ops) { @@ -183,6 +183,7 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * resource->multisample_type = multisample_type; resource->multisample_quality = multisample_quality; resource->usage = usage; + resource->bind_flags = bind_flags; resource->access = access; resource->width = width; resource->height = height; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 907ede7..87998d5 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -2996,7 +2996,7 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc return WINED3DERR_INVALIDCALL; if (FAILED(hr = resource_init(&texture->resource, device, desc->resource_type, format, - desc->multisample_type, desc->multisample_quality, desc->usage, desc->access, + desc->multisample_type, desc->multisample_quality, desc->usage, 0, desc->access, desc->width, desc->height, desc->depth, offset, parent, parent_ops, &texture_resource_ops))) { static unsigned int once; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 87541aa..9a01ed2 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3113,6 +3113,7 @@ struct wined3d_resource enum wined3d_multisample_type multisample_type; UINT multisample_quality; DWORD usage; + unsigned int bind_flags; unsigned int access; WORD draw_binding; WORD map_binding; @@ -3153,8 +3154,8 @@ static inline void wined3d_resource_release(struct wined3d_resource *resource) void resource_cleanup(struct wined3d_resource *resource) DECLSPEC_HIDDEN; HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device *device, enum wined3d_resource_type type, const struct wined3d_format *format, - enum wined3d_multisample_type multisample_type, unsigned int multisample_quality, - unsigned int usage, unsigned int access, unsigned int width, unsigned int height, unsigned int depth, + enum wined3d_multisample_type multisample_type, unsigned int multisample_quality, unsigned int usage, + unsigned int bind_flags, unsigned int access, unsigned int width, unsigned int height, unsigned int depth, unsigned int size, void *parent, const struct wined3d_parent_ops *parent_ops, const struct wined3d_resource_ops *resource_ops) DECLSPEC_HIDDEN; void resource_unload(struct wined3d_resource *resource) DECLSPEC_HIDDEN; @@ -3772,7 +3773,6 @@ struct wined3d_buffer { struct wined3d_resource resource; - unsigned int bind_flags; unsigned int structure_byte_stride; DWORD flags; DWORD locations;

1 0

Henri Verbeet : wined3d: Get rid of the "desc" field in struct wined3d_buffer.
by Alexandre Julliard 30 Oct '18

30 Oct '18

Module: wine Branch: master Commit: 22b3a4f044036e62104a6994828d18d3536b3d78 URL: https://source.winehq.org/git/wine.git/?a=commit;h=22b3a4f044036e62104a6994… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 30 13:36:46 2018 +0330 wined3d: Get rid of the "desc" field in struct wined3d_buffer. Most of the information in "desc" is already stored in the wined3d_resource structure. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 4 ++-- dlls/wined3d/view.c | 8 ++++---- dlls/wined3d/wined3d_private.h | 3 +-- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 58e5685..8c7a23f 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1302,7 +1302,7 @@ static HRESULT buffer_resource_sub_resource_map(struct wined3d_resource *resourc offset = size = 0; } - map_desc->row_pitch = map_desc->slice_pitch = buffer_gl->b.desc.byte_width; + map_desc->row_pitch = map_desc->slice_pitch = resource->size; return wined3d_buffer_gl_map(buffer_gl, offset, size, (BYTE **)&map_desc->data, flags); } @@ -1385,8 +1385,8 @@ static HRESULT wined3d_buffer_init(struct wined3d_buffer *buffer, struct wined3d WARN("Failed to initialize resource, hr %#x.\n", hr); return hr; } - buffer->desc = *desc; buffer->bind_flags = desc->bind_flags; + buffer->structure_byte_stride = desc->structure_byte_stride; buffer->locations = data ? WINED3D_LOCATION_DISCARDED : WINED3D_LOCATION_SYSMEM; TRACE("buffer %p, size %#x, usage %#x, format %s, memory @ %p.\n", diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 004611e..59a30ea 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -110,7 +110,7 @@ static const struct wined3d_format *validate_resource_view(const struct wined3d_ struct wined3d_buffer *buffer = buffer_from_resource(resource); unsigned int buffer_size, element_size; - if (buffer->desc.structure_byte_stride) + if (buffer->structure_byte_stride) { if (desc->format_id != WINED3DFMT_UNKNOWN) { @@ -119,7 +119,7 @@ static const struct wined3d_format *validate_resource_view(const struct wined3d_ } format = wined3d_get_format(adapter, WINED3DFMT_R32_UINT, resource->usage); - element_size = buffer->desc.structure_byte_stride; + element_size = buffer->structure_byte_stride; } else { @@ -293,8 +293,8 @@ static void get_buffer_view_range(const struct wined3d_buffer *buffer, { if (desc->format_id == WINED3DFMT_UNKNOWN) { - *offset = desc->u.buffer.start_idx * buffer->desc.structure_byte_stride; - *size = desc->u.buffer.count * buffer->desc.structure_byte_stride; + *offset = desc->u.buffer.start_idx * buffer->structure_byte_stride; + *size = desc->u.buffer.count * buffer->structure_byte_stride; } else { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 84bf14d..87541aa 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3772,9 +3772,8 @@ struct wined3d_buffer { struct wined3d_resource resource; - struct wined3d_buffer_desc desc; - unsigned int bind_flags; + unsigned int structure_byte_stride; DWORD flags; DWORD locations; void *map_ptr;

1 0

Henri Verbeet : wined3d: Validate required OpenGL extensions in wined3d_texture_gl_init() instead of wined3d_texture_init().
by Alexandre Julliard 30 Oct '18

30 Oct '18

Module: wine Branch: master Commit: f8ba91ac7553165fdded7ba3d3f8d6883dc047b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f8ba91ac7553165fdded7ba3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 30 13:36:45 2018 +0330 wined3d: Validate required OpenGL extensions in wined3d_texture_gl_init() instead of wined3d_texture_init(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 34 +++++++++++++++------------------- 1 file changed, 15 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 9b9e825..907ede7 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -2881,26 +2881,10 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc if (!desc->width || !desc->height || !desc->depth) return WINED3DERR_INVALIDCALL; - if (desc->resource_type == WINED3D_RTYPE_TEXTURE_3D) + if (desc->resource_type == WINED3D_RTYPE_TEXTURE_3D && layer_count != 1) { - if (layer_count != 1) - { - ERR("Invalid layer count for volume texture.\n"); - return E_INVALIDARG; - } - - if (!gl_info->supported[EXT_TEXTURE3D]) - { - WARN("OpenGL implementation does not support 3D textures.\n"); - return WINED3DERR_INVALIDCALL; - } - } - - if (!(desc->usage & WINED3DUSAGE_LEGACY_CUBEMAP) && layer_count > 1 - && !gl_info->supported[EXT_TEXTURE_ARRAY]) - { - WARN("OpenGL implementation does not support array textures.\n"); - return WINED3DERR_INVALIDCALL; + ERR("Invalid layer count for volume texture.\n"); + return E_INVALIDARG; } texture->sub_resources = sub_resources; @@ -3562,6 +3546,13 @@ static HRESULT wined3d_texture_gl_init(struct wined3d_texture_gl *texture_gl, st texture_gl, device, desc, layer_count, level_count, flags, parent, parent_ops, sub_resources); + if (!(desc->usage & WINED3DUSAGE_LEGACY_CUBEMAP) && layer_count > 1 + && !gl_info->supported[EXT_TEXTURE_ARRAY]) + { + WARN("OpenGL implementation does not support array textures.\n"); + return WINED3DERR_INVALIDCALL; + } + switch (desc->resource_type) { case WINED3D_RTYPE_TEXTURE_1D: @@ -3595,6 +3586,11 @@ static HRESULT wined3d_texture_gl_init(struct wined3d_texture_gl *texture_gl, st break; case WINED3D_RTYPE_TEXTURE_3D: + if (!gl_info->supported[EXT_TEXTURE3D]) + { + WARN("OpenGL implementation does not support 3D textures.\n"); + return WINED3DERR_INVALIDCALL; + } texture_ops = &texture3d_ops; texture_gl->target = GL_TEXTURE_3D; break;

1 0

Henri Verbeet : wined3d: Move the "target" field from struct wined3d_texture to struct wined3d_texture_gl.
by Alexandre Julliard 30 Oct '18

30 Oct '18

Module: wine Branch: master Commit: 961a94ac046644004718c56bfeeb81740cb73793 URL: https://source.winehq.org/git/wine.git/?a=commit;h=961a94ac046644004718c56b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 30 13:36:44 2018 +0330 wined3d: Move the "target" field 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/arb_program_shader.c | 29 +++--- dlls/wined3d/context.c | 6 +- dlls/wined3d/cs.c | 2 +- dlls/wined3d/glsl_shader.c | 25 +++--- dlls/wined3d/nvidia_texture_shader.c | 7 +- dlls/wined3d/sampler.c | 2 +- dlls/wined3d/shader.c | 8 +- dlls/wined3d/state.c | 30 ++++--- dlls/wined3d/surface.c | 64 +++++++------ dlls/wined3d/texture.c | 169 +++++++++++++++++------------------ dlls/wined3d/utils.c | 10 +-- dlls/wined3d/view.c | 28 +++--- dlls/wined3d/wined3d_private.h | 43 ++++----- 13 files changed, 213 insertions(+), 210 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=961a94ac046644004718…

1 0

Henri Verbeet : wined3d: Move the OpenGL textures from struct wined3d_texture to struct wined3d_texture_gl.
by Alexandre Julliard 30 Oct '18

30 Oct '18

Module: wine Branch: master Commit: 5f9740762a389fb4686da624cdc4c6a2663d0c76 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5f9740762a389fb4686da624… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 30 13:36:43 2018 +0330 wined3d: Move the OpenGL textures 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/arb_program_shader.c | 3 +- dlls/wined3d/context.c | 48 ++++++++--------- dlls/wined3d/cs.c | 4 +- dlls/wined3d/glsl_shader.c | 3 +- dlls/wined3d/sampler.c | 22 ++++---- dlls/wined3d/state.c | 10 ++-- dlls/wined3d/surface.c | 93 +++++++++++++++++---------------- dlls/wined3d/swapchain.c | 6 +-- dlls/wined3d/texture.c | 106 +++++++++++++++++++------------------- dlls/wined3d/view.c | 80 ++++++++++++++-------------- dlls/wined3d/wined3d_private.h | 67 ++++++++++++------------ 11 files changed, 227 insertions(+), 215 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5f9740762a389fb4686d…

1 0

← Newer
1
2
3
4
5
6
7
8
...
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