wine-commits February 2017

wine-commits@winehq.org

2 participants
838 discussions

Alex Henrie : oledb32/tests: Fix a use-after-free in test_converttobyrefwstr.
by Alexandre Julliard 28 Feb '17

28 Feb '17

Module: wine Branch: master Commit: 89b75296128e8c2cadc77cb06ecd7faa1f80d012 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89b75296128e8c2cadc77cb06… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Feb 26 23:52:24 2017 -0700 oledb32/tests: Fix a use-after-free in test_converttobyrefwstr. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/tests/convert.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index 405e728..0e4a834 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -2097,7 +2097,7 @@ static void test_converttobyrefwstr(void) dst_len = 44; V_VT(&v) = VT_NULL; - hr = IDataConvert_DataConvert(convert, DBTYPE_VARIANT, DBTYPE_BYREF | DBTYPE_WSTR, 0, &dst_len, &v, dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + hr = IDataConvert_DataConvert(convert, DBTYPE_VARIANT, DBTYPE_BYREF | DBTYPE_WSTR, 0, &dst_len, &v, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); ok(hr == S_OK, "got %08x\n", hr); ok(dst_status == DBSTATUS_S_ISNULL, "got %08x\n", dst_status); ok(dst_len == 44, "got %ld\n", dst_len);

1 0

Piotr Caban : msvcr: Add _get_dstbias implementation.
by Alexandre Julliard 28 Feb '17

28 Feb '17

Module: wine Branch: master Commit: 17186413fe81ab8cb13692d2b34808d89df48f55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17186413fe81ab8cb13692d2b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Feb 28 18:23:38 2017 +0100 msvcr: Add _get_dstbias implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-time-l1-1-0/api-ms-win-crt-time-l1-1-0.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/time.c | 10 ++++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 9 files changed, 18 insertions(+), 8 deletions(-) diff --git a/dlls/api-ms-win-crt-time-l1-1-0/api-ms-win-crt-time-l1-1-0.spec b/dlls/api-ms-win-crt-time-l1-1-0/api-ms-win-crt-time-l1-1-0.spec index 5da3851..c0b507c 100644 --- a/dlls/api-ms-win-crt-time-l1-1-0/api-ms-win-crt-time-l1-1-0.spec +++ b/dlls/api-ms-win-crt-time-l1-1-0/api-ms-win-crt-time-l1-1-0.spec @@ -23,7 +23,7 @@ @ cdecl _futime32(long ptr) ucrtbase._futime32 @ cdecl _futime64(long ptr) ucrtbase._futime64 @ cdecl _get_daylight(ptr) ucrtbase._get_daylight -@ stub _get_dstbias +@ cdecl _get_dstbias(ptr) ucrtbase._get_dstbias @ cdecl _get_timezone(ptr) ucrtbase._get_timezone @ cdecl _get_tzname(ptr str long long) ucrtbase._get_tzname @ cdecl _getsystime(ptr) ucrtbase._getsystime diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 005e782..b636c48 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -874,7 +874,7 @@ @ cdecl _get_current_locale() MSVCRT__get_current_locale @ cdecl _get_daylight(ptr) @ cdecl _get_doserrno(ptr) -@ stub _get_dstbias +@ cdecl _get_dstbias(ptr) MSVCRT__get_dstbias @ cdecl _get_errno(ptr) @ cdecl _get_fmode(ptr) MSVCRT__get_fmode @ cdecl _get_heap_handle() diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 4897d79..da9b85e 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1221,7 +1221,7 @@ @ cdecl _get_current_locale() MSVCRT__get_current_locale @ cdecl _get_daylight(ptr) @ cdecl _get_doserrno(ptr) -@ stub _get_dstbias +@ cdecl _get_dstbias(ptr) MSVCRT__get_dstbias @ cdecl _get_errno(ptr) @ cdecl _get_fmode(ptr) MSVCRT__get_fmode @ cdecl _get_heap_handle() diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 4f95830..8b02a63 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1221,7 +1221,7 @@ @ cdecl _get_current_locale() MSVCRT__get_current_locale @ cdecl _get_daylight(ptr) @ cdecl _get_doserrno(ptr) -@ stub _get_dstbias +@ cdecl _get_dstbias(ptr) MSVCRT__get_dstbias @ cdecl _get_errno(ptr) @ cdecl _get_fmode(ptr) MSVCRT__get_fmode @ cdecl _get_heap_handle() diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 0f45138..d30ff5e 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1149,7 +1149,7 @@ @ cdecl _get_current_locale() msvcr120._get_current_locale @ cdecl _get_daylight(ptr) msvcr120._get_daylight @ cdecl _get_doserrno(ptr) msvcr120._get_doserrno -@ stub _get_dstbias +@ cdecl _get_dstbias(ptr) msvcr120._get_dstbias @ cdecl _get_errno(ptr) msvcr120._get_errno @ cdecl _get_fmode(ptr) msvcr120._get_fmode @ cdecl _get_heap_handle() msvcr120._get_heap_handle diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index d4821da..3133bcb 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -541,7 +541,7 @@ @ cdecl _get_current_locale() MSVCRT__get_current_locale @ cdecl _get_daylight(ptr) @ cdecl _get_doserrno(ptr) -@ stub _get_dstbias +@ cdecl _get_dstbias(ptr) MSVCRT__get_dstbias @ cdecl _get_errno(ptr) @ cdecl _get_fmode(ptr) MSVCRT__get_fmode @ cdecl _get_heap_handle() diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 0dc60df..c257bd3 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -524,7 +524,7 @@ @ cdecl _get_current_locale() MSVCRT__get_current_locale @ cdecl _get_daylight(ptr) @ cdecl _get_doserrno(ptr) -@ stub _get_dstbias +@ cdecl _get_dstbias(ptr) MSVCRT__get_dstbias @ cdecl _get_errno(ptr) @ cdecl _get_fmode(ptr) MSVCRT__get_fmode @ cdecl _get_heap_handle() diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index b0f5285..93dcabc 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -891,6 +891,16 @@ int * CDECL MSVCRT___p__dstbias(void) } /********************************************************************* + * _get_dstbias (MSVCR80.@) + */ +int CDECL MSVCRT__get_dstbias(int *seconds) +{ + if (!MSVCRT_CHECK_PMT(seconds != NULL)) return MSVCRT_EINVAL; + *seconds = MSVCRT__dstbias; + return 0; +} + +/********************************************************************* * __p__timezone (MSVCRT.@) */ MSVCRT_long * CDECL MSVCRT___p__timezone(void) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 6b349ee..643aaa6 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -361,7 +361,7 @@ @ cdecl _get_current_locale() MSVCRT__get_current_locale @ cdecl _get_daylight(ptr) @ cdecl _get_doserrno(ptr) -@ stub _get_dstbias +@ cdecl _get_dstbias(ptr) MSVCRT__get_dstbias @ cdecl _get_errno(ptr) @ cdecl _get_fmode(ptr) MSVCRT__get_fmode @ cdecl _get_heap_handle()

1 0

Sebastian Lackner : wined3d: Clear device state in wined3d_device_reset.
by Alexandre Julliard 28 Feb '17

28 Feb '17

Module: wine Branch: master Commit: fca25446efae3ae70642e2709e17052886c88451 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fca25446efae3ae70642e2709… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Feb 28 15:22:31 2017 +0100 wined3d: Clear device state in wined3d_device_reset. Spotted by Henri Verbeet. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index c3703a5..07f2f0a 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4681,6 +4681,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, if (device->d3d_initialized) wined3d_device_delete_opengl_contexts(device); + memset(&device->state, 0, sizeof(device->state)); state_init(&device->state, &device->fb, &device->adapter->gl_info, &device->adapter->d3d_info, WINED3D_STATE_INIT_DEFAULT); device->update_state = &device->state;

1 0

Bruno Jesus : wined3d: Recognize Geforce GT 525M.
by Alexandre Julliard 28 Feb '17

28 Feb '17

Module: wine Branch: master Commit: 3a81311870648c341b8bd76ea653c6f95e4867e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a81311870648c341b8bd76ea… Author: Bruno Jesus <bjesus(a)codeweavers.com> Date: Tue Feb 28 12:02:19 2017 -0300 wined3d: Recognize Geforce GT 525M. Signed-off-by: Bruno Jesus <bjesus(a)codeweavers.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 dbcd12a..02df3f0 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1321,6 +1321,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX470, "NVIDIA GeForce GTX 470", DRIVER_NVIDIA_GEFORCE8, 1280}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX480, "NVIDIA GeForce GTX 480", DRIVER_NVIDIA_GEFORCE8, 1536}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT520, "NVIDIA GeForce GT 520", DRIVER_NVIDIA_GEFORCE8, 1024}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT525M, "NVIDIA GeForce GT 525M", DRIVER_NVIDIA_GEFORCE8, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT540M, "NVIDIA GeForce GT 540M", DRIVER_NVIDIA_GEFORCE8, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX550, "NVIDIA GeForce GTX 550 Ti", DRIVER_NVIDIA_GEFORCE8, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT555M, "NVIDIA GeForce GT 555M", DRIVER_NVIDIA_GEFORCE8, 1024}, @@ -1923,6 +1924,7 @@ cards_nvidia_binary[] = {"GT 555M", CARD_NVIDIA_GEFORCE_GT555M}, /* Geforce 500 - midend mobile */ {"GTX 550 Ti", CARD_NVIDIA_GEFORCE_GTX550}, /* Geforce 500 - midend */ {"GT 540M", CARD_NVIDIA_GEFORCE_GT540M}, /* Geforce 500 - midend mobile */ + {"GT 525M", CARD_NVIDIA_GEFORCE_GT525M}, /* Geforce 500 - lowend mobile */ {"GT 520", CARD_NVIDIA_GEFORCE_GT520}, /* Geforce 500 - lowend */ {"GTX 480", CARD_NVIDIA_GEFORCE_GTX480}, /* Geforce 400 - highend */ {"GTX 470", CARD_NVIDIA_GEFORCE_GTX470}, /* Geforce 400 - midend high */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1164cf8..79b0d1a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2030,6 +2030,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX470 = 0x06cd, CARD_NVIDIA_GEFORCE_GTX480 = 0x06c0, CARD_NVIDIA_GEFORCE_GT520 = 0x1040, + CARD_NVIDIA_GEFORCE_GT525M = 0x0dec, CARD_NVIDIA_GEFORCE_GT540M = 0x0df4, CARD_NVIDIA_GEFORCE_GTX550 = 0x1244, CARD_NVIDIA_GEFORCE_GT555M = 0x04b8,

1 0

Józef Kucia : wined3d: Introduce helper function to reserve memory for arrays.
by Alexandre Julliard 28 Feb '17

28 Feb '17

Module: wine Branch: master Commit: 36b9bc946b9cb73142af28cef36f9fb598c7e7fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=36b9bc946b9cb73142af28cef… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Feb 28 14:42:36 2017 +0100 wined3d: Introduce helper function to reserve memory for arrays. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 15 ++++-------- dlls/wined3d/context.c | 54 ++++++++++++------------------------------ dlls/wined3d/utils.c | 30 +++++++++++++++++++++++ dlls/wined3d/wined3d_main.c | 25 +++++-------------- dlls/wined3d/wined3d_private.h | 16 +++++++------ 5 files changed, 64 insertions(+), 76 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 5ea7eff..c584147 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -64,18 +64,11 @@ static void buffer_invalidate_bo_range(struct wined3d_buffer *buffer, unsigned i goto invalidate_all; } - if (buffer->modified_areas >= buffer->maps_size) + if (!wined3d_array_reserve((void **)&buffer->maps, &buffer->maps_size, + buffer->modified_areas + 1, sizeof(*buffer->maps))) { - struct wined3d_map_range *new; - - if (!(new = HeapReAlloc(GetProcessHeap(), 0, buffer->maps, 2 * buffer->maps_size * sizeof(*buffer->maps)))) - { - ERR("Failed to allocate maps array, invalidating entire buffer.\n"); - goto invalidate_all; - } - - buffer->maps = new; - buffer->maps_size *= 2; + ERR("Failed to allocate maps array, invalidating entire buffer.\n"); + goto invalidate_all; } buffer->maps[buffer->modified_areas].offset = offset; diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 076ebee..10a7222 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -719,20 +719,12 @@ void context_free_occlusion_query(struct wined3d_occlusion_query *query) list_remove(&query->entry); query->context = NULL; - if (context->free_occlusion_query_count >= context->free_occlusion_query_size - 1) + if (!wined3d_array_reserve((void **)&context->free_occlusion_queries, + &context->free_occlusion_query_size, context->free_occlusion_query_count + 1, + sizeof(*context->free_occlusion_queries))) { - UINT new_size = context->free_occlusion_query_size << 1; - GLuint *new_data = HeapReAlloc(GetProcessHeap(), 0, context->free_occlusion_queries, - new_size * sizeof(*context->free_occlusion_queries)); - - if (!new_data) - { - ERR("Failed to grow free list, leaking query %u in context %p.\n", query->id, context); - return; - } - - context->free_occlusion_query_size = new_size; - context->free_occlusion_queries = new_data; + ERR("Failed to grow free list, leaking query %u in context %p.\n", query->id, context); + return; } context->free_occlusion_queries[context->free_occlusion_query_count++] = query->id; @@ -787,20 +779,12 @@ void context_free_event_query(struct wined3d_event_query *query) list_remove(&query->entry); query->context = NULL; - if (context->free_event_query_count >= context->free_event_query_size - 1) + if (!wined3d_array_reserve((void **)&context->free_event_queries, + &context->free_event_query_size, context->free_event_query_count + 1, + sizeof(*context->free_event_queries))) { - UINT new_size = context->free_event_query_size << 1; - union wined3d_gl_query_object *new_data = HeapReAlloc(GetProcessHeap(), 0, context->free_event_queries, - new_size * sizeof(*context->free_event_queries)); - - if (!new_data) - { - ERR("Failed to grow free list, leaking query %u in context %p.\n", query->object.id, context); - return; - } - - context->free_event_query_size = new_size; - context->free_event_queries = new_data; + ERR("Failed to grow free list, leaking query %u in context %p.\n", query->object.id, context); + return; } context->free_event_queries[context->free_event_query_count++] = query->object; @@ -834,20 +818,12 @@ void context_free_timestamp_query(struct wined3d_timestamp_query *query) list_remove(&query->entry); query->context = NULL; - if (context->free_timestamp_query_count >= context->free_timestamp_query_size - 1) + if (!wined3d_array_reserve((void **)&context->free_timestamp_queries, + &context->free_timestamp_query_size, context->free_timestamp_query_count + 1, + sizeof(*context->free_timestamp_queries))) { - UINT new_size = context->free_timestamp_query_size << 1; - GLuint *new_data = HeapReAlloc(GetProcessHeap(), 0, context->free_timestamp_queries, - new_size * sizeof(*context->free_timestamp_queries)); - - if (!new_data) - { - ERR("Failed to grow free list, leaking query %u in context %p.\n", query->id, context); - return; - } - - context->free_timestamp_query_size = new_size; - context->free_timestamp_queries = new_data; + ERR("Failed to grow free list, leaking query %u in context %p.\n", query->id, context); + return; } context->free_timestamp_queries[context->free_timestamp_query_count++] = query->id; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index c392388..04317f1 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -6007,3 +6007,33 @@ void wined3d_gl_limits_get_texture_unit_range(const struct wined3d_gl_limits *gl *base = gl_limits->graphics_samplers - 1; *count = gl_limits->compute_samplers; } + +BOOL wined3d_array_reserve(void **elements, SIZE_T *capacity, SIZE_T count, SIZE_T size) +{ + SIZE_T max_capacity, new_capacity; + void *new_elements; + + if (count <= *capacity) + return TRUE; + + max_capacity = ~(SIZE_T)0 / size; + if (count > max_capacity) + return FALSE; + + new_capacity = max(1, *capacity); + while (new_capacity < count && new_capacity <= max_capacity / 2) + new_capacity *= 2; + if (new_capacity < count) + new_capacity = count; + + if (!*elements) + new_elements = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, new_capacity * size); + else + new_elements = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, *elements, new_capacity * size); + if (!new_elements) + return FALSE; + + *elements = new_elements; + *capacity = new_capacity; + return TRUE; +} diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 442a970..c59a956 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -43,7 +43,7 @@ struct wined3d_wndproc_table { struct wined3d_wndproc *entries; unsigned int count; - unsigned int size; + SIZE_T size; }; static struct wined3d_wndproc_table wndproc_table; @@ -443,25 +443,12 @@ BOOL wined3d_register_window(HWND window, struct wined3d_device *device) return TRUE; } - if (wndproc_table.size == wndproc_table.count) + if (!wined3d_array_reserve((void **)&wndproc_table.entries, &wndproc_table.size, + wndproc_table.count + 1, sizeof(*entry))) { - unsigned int new_size = max(1, wndproc_table.size * 2); - struct wined3d_wndproc *new_entries; - - if (!wndproc_table.entries) - new_entries = wined3d_calloc(new_size, sizeof(*new_entries)); - else - new_entries = HeapReAlloc(GetProcessHeap(), 0, wndproc_table.entries, new_size * sizeof(*new_entries)); - - if (!new_entries) - { - wined3d_wndproc_mutex_unlock(); - ERR("Failed to grow table.\n"); - return FALSE; - } - - wndproc_table.entries = new_entries; - wndproc_table.size = new_size; + wined3d_wndproc_mutex_unlock(); + ERR("Failed to grow table.\n"); + return FALSE; } entry = &wndproc_table.entries[wndproc_table.count++]; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 613d1c9..1164cf8 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1660,18 +1660,18 @@ struct wined3d_context /* Queries */ GLuint *free_occlusion_queries; - UINT free_occlusion_query_size; - UINT free_occlusion_query_count; + SIZE_T free_occlusion_query_size; + unsigned int free_occlusion_query_count; struct list occlusion_queries; union wined3d_gl_query_object *free_event_queries; - UINT free_event_query_size; - UINT free_event_query_count; + SIZE_T free_event_query_size; + unsigned int free_event_query_count; struct list event_queries; GLuint *free_timestamp_queries; - UINT free_timestamp_query_size; - UINT free_timestamp_query_count; + SIZE_T free_timestamp_query_size; + unsigned int free_timestamp_query_count; struct list timestamp_queries; struct wined3d_stream_info stream_info; @@ -3296,7 +3296,7 @@ struct wined3d_buffer void *map_ptr; struct wined3d_map_range *maps; - ULONG maps_size, modified_areas; + SIZE_T maps_size, modified_areas; DWORD locations; struct wined3d_event_query *query; @@ -3879,6 +3879,8 @@ void wined3d_format_get_float_color_key(const struct wined3d_format *format, const struct wined3d_color_key_conversion * wined3d_format_get_color_key_conversion( const struct wined3d_texture *texture, BOOL need_alpha_ck) DECLSPEC_HIDDEN; +BOOL wined3d_array_reserve(void **elements, SIZE_T *capacity, SIZE_T count, SIZE_T size) DECLSPEC_HIDDEN; + static inline BOOL wined3d_format_is_typeless(const struct wined3d_format *format) { return format->id == format->typeless_id && format->id != WINED3DFMT_UNKNOWN;

1 0

Józef Kucia : wined3d: Implement atomic instructions on structured buffer memory.
by Alexandre Julliard 28 Feb '17

28 Feb '17

Module: wine Branch: master Commit: 0b1b7d7b11b84a197b5c208610026588e74bb8a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b1b7d7b11b84a197b5c20861… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Feb 28 14:42:35 2017 +0100 wined3d: Implement atomic instructions on structured buffer memory. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 47 ++++++++++++++++++++++++++++++---------------- 1 file changed, 31 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 025ba1d..0fd463d 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4965,10 +4965,13 @@ static void shader_glsl_atomic(const struct wined3d_shader_instruction *ins) && ins->handler_idx <= WINED3DSIH_IMM_ATOMIC_XOR; const struct wined3d_shader_reg_maps *reg_maps = ins->ctx->reg_maps; const struct wined3d_shader_version *version = &reg_maps->shader_version; - struct glsl_src_param coord_param, data_param, data_param2; + struct shader_glsl_ctx_priv *priv = ins->ctx->backend_data; + struct glsl_src_param structure_idx, offset, data, data2; + struct wined3d_string_buffer *buffer = ins->ctx->buffer; enum wined3d_shader_resource_type resource_type; + struct wined3d_string_buffer *address; enum wined3d_data_type data_type; - unsigned int uav_idx; + unsigned int uav_idx, stride; DWORD coord_mask; const char *op; @@ -4981,6 +4984,7 @@ static void shader_glsl_atomic(const struct wined3d_shader_instruction *ins) } data_type = reg_maps->uav_resource_info[uav_idx].data_type; coord_mask = (1u << resource_type_info[resource_type].coord_size) - 1; + stride = reg_maps->uav_resource_info[uav_idx].stride; switch (ins->handler_idx) { @@ -5048,29 +5052,40 @@ static void shader_glsl_atomic(const struct wined3d_shader_instruction *ins) return; } + address = string_buffer_get(priv->string_buffers); + if (stride) + { + shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_0, &structure_idx); + shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_1, &offset); + string_buffer_sprintf(address, "%s * %u + %s / 4", structure_idx.param_str, stride, offset.param_str); + } + else + { + shader_glsl_add_src_param(ins, &ins->src[0], coord_mask, &offset); + string_buffer_sprintf(address, "%s", offset.param_str); + if (reg_maps->uav_resource_info[uav_idx].flags & WINED3D_VIEW_BUFFER_RAW) + shader_addline(address, "/ 4"); + } + if (is_imm_instruction) shader_glsl_append_dst_ext(ins->ctx->buffer, ins, &ins->dst[0], data_type); - shader_glsl_add_src_param(ins, &ins->src[0], coord_mask, &coord_param); - - if (reg_maps->uav_resource_info[uav_idx].flags & WINED3D_VIEW_BUFFER_RAW) - shader_addline(ins->ctx->buffer, "%s(%s_image%u, %s / 4, ", - op, shader_glsl_get_prefix(version->type), uav_idx, coord_param.param_str); - else - shader_addline(ins->ctx->buffer, "%s(%s_image%u, %s, ", - op, shader_glsl_get_prefix(version->type), uav_idx, coord_param.param_str); + shader_addline(buffer, "%s(%s_image%u, %s, ", + op, shader_glsl_get_prefix(version->type), uav_idx, address->buffer); - shader_glsl_add_src_param_ext(ins, &ins->src[1], WINED3DSP_WRITEMASK_0, &data_param, data_type); - shader_addline(ins->ctx->buffer, "%s", data_param.param_str); + shader_glsl_add_src_param_ext(ins, &ins->src[1], WINED3DSP_WRITEMASK_0, &data, data_type); + shader_addline(buffer, "%s", data.param_str); if (ins->src_count >= 3) { - shader_glsl_add_src_param_ext(ins, &ins->src[2], WINED3DSP_WRITEMASK_0, &data_param2, data_type); - shader_addline(ins->ctx->buffer, ", %s", data_param2.param_str); + shader_glsl_add_src_param_ext(ins, &ins->src[2], WINED3DSP_WRITEMASK_0, &data2, data_type); + shader_addline(buffer, ", %s", data2.param_str); } if (is_imm_instruction) - shader_addline(ins->ctx->buffer, ")"); - shader_addline(ins->ctx->buffer, ");\n"); + shader_addline(buffer, ")"); + shader_addline(buffer, ");\n"); + + string_buffer_release(priv->string_buffers, address); } static void shader_glsl_ld_uav(const struct wined3d_shader_instruction *ins)

1 0

Zebediah Figura : winmm/tests: Test for avivideo driver version.
by Alexandre Julliard 28 Feb '17

28 Feb '17

Module: wine Branch: master Commit: 587098891e7f2d6254703963e406a28ed59a9d08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=587098891e7f2d6254703963e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Feb 25 10:46:31 2017 -0600 winmm/tests: Test for avivideo driver version. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/tests/mci.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index 0cbe57e..9ff6c58 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -365,6 +365,10 @@ static void test_mciParser(HWND hwnd) ok(!err,"capability device type: %s\n", dbg_mcierr(err)); if(!err) ok(!strcmp(buf, "waveaudio"), "capability device type is %s\n", buf); + err = mciSendStringA("info a version", buf, sizeof(buf), hwnd); + ok(!err,"info version: %s\n", dbg_mcierr(err)); + if(!err) ok(!strcmp(buf, "1.1"), "info version is %s\n", buf); + err = mciSendCommandA(wDeviceID, MCI_CLOSE, 0, 0); ok(!err,"mciCommand close returned %s\n", dbg_mcierr(err));

1 0

Zebediah Figura : mciavi32: Report version as 1.1.
by Alexandre Julliard 28 Feb '17

28 Feb '17

Module: wine Branch: master Commit: 1b57f07a61f0b777fb558a74539041bc3ac8d3e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b57f07a61f0b777fb558a745… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Feb 25 10:46:30 2017 -0600 mciavi32: Report version as 1.1. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mciavi32/info.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/mciavi32/info.c b/dlls/mciavi32/info.c index f679778..3d138b1 100644 --- a/dlls/mciavi32/info.c +++ b/dlls/mciavi32/info.c @@ -192,6 +192,7 @@ DWORD MCIAVI_mciInfo(UINT wDevID, DWORD dwFlags, LPMCI_DGV_INFO_PARMSW lpParms) WINE_MCIAVI* wma = MCIAVI_mciGetOpenDev(wDevID); DWORD ret = 0; static const WCHAR wszAviPlayer[] = {'W','i','n','e','\'','s',' ','A','V','I',' ','p','l','a','y','e','r',0}; + static const WCHAR wszVersion[] = {'1','.','1',0}; if (lpParms == NULL || lpParms->lpstrReturn == NULL) return MCIERR_NULL_PARAMETER_BLOCK; @@ -204,6 +205,8 @@ DWORD MCIAVI_mciInfo(UINT wDevID, DWORD dwFlags, LPMCI_DGV_INFO_PARMSW lpParms) if (dwFlags & MCI_INFO_PRODUCT) str = wszAviPlayer; + else if (dwFlags & MCI_INFO_VERSION) + str = wszVersion; else if (dwFlags & MCI_INFO_FILE) str = wma->lpFileName; else {

1 0

Bruno Jesus : ws2_32: Make it clear that bit flags are in hex when tracing.
by Alexandre Julliard 28 Feb '17

28 Feb '17

Module: wine Branch: master Commit: b2c809a3d95ca8965e6da0ce89efb2ad4a5beb9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2c809a3d95ca8965e6da0ce8… Author: Bruno Jesus <bjesus(a)codeweavers.com> Date: Tue Feb 28 14:55:25 2017 -0300 ws2_32: Make it clear that bit flags are in hex when tracing. Signed-off-by: Bruno Jesus <bjesus(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 97cb7db..32f187a 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -6540,7 +6540,7 @@ static int convert_aiflag_w2u(int winflags) { winflags &= ~ws_aiflag_map[i][0]; } if (winflags) - FIXME("Unhandled windows AI_xxx flags %x\n", winflags); + FIXME("Unhandled windows AI_xxx flags 0x%x\n", winflags); return unixflags; } @@ -6554,7 +6554,7 @@ static int convert_niflag_w2u(int winflags) { winflags &= ~ws_niflag_map[i][0]; } if (winflags) - FIXME("Unhandled windows NI_xxx flags %x\n", winflags); + FIXME("Unhandled windows NI_xxx flags 0x%x\n", winflags); return unixflags; } @@ -6567,8 +6567,8 @@ static int convert_aiflag_u2w(int unixflags) { winflags |= ws_aiflag_map[i][0]; unixflags &= ~ws_aiflag_map[i][1]; } - if (unixflags) /* will warn usually */ - WARN("Unhandled UNIX AI_xxx flags %x\n", unixflags); + if (unixflags) + WARN("Unhandled UNIX AI_xxx flags 0x%x\n", unixflags); return winflags; }

1 0

Andreas Damm : odbc32: Made ODBC function signatures 64-bit compliant.
by Alexandre Julliard 28 Feb '17

28 Feb '17

Module: wine Branch: master Commit: 0dd43e9b765de5a952ac77895f362d1ad04bec9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0dd43e9b765de5a952ac77895… Author: Andreas Damm <andreas(a)insightsoftware.com> Date: Tue Feb 28 10:42:55 2017 -0700 odbc32: Made ODBC function signatures 64-bit compliant. Signed-off-by: Andreas Damm <andreas.damm(a)insightsoftware.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/odbc32/proxyodbc.c | 108 ++++++++++++++++++++++++------------------------ include/sql.h | 36 ++++++++-------- include/sqlext.h | 22 +++++----- 3 files changed, 83 insertions(+), 83 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0dd43e9b765de5a952ac7…

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 February 2017