winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
May 2019
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
2 participants
1019 discussions
Start a n
N
ew thread
Zebediah Figura : setupapi: Add magic bytes to struct file_queue and validate them in SetupCloseFileQueue ().
by Alexandre Julliard
03 May '19
03 May '19
Module: wine Branch: master Commit: c65d98065c0038e0919f40bec4a9dc978fb2ade9 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=c65d98065c0038e0919f40be…
Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 2 23:10:04 2019 -0500 setupapi: Add magic bytes to struct file_queue and validate them in SetupCloseFileQueue(). Wine-Bug:
https://bugs.winehq.org/show_bug.cgi?id=12332
Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/queue.c | 11 +++++++++++ dlls/setupapi/tests/install.c | 16 ++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/dlls/setupapi/queue.c b/dlls/setupapi/queue.c index c065c6e..f267380 100644 --- a/dlls/setupapi/queue.c +++ b/dlls/setupapi/queue.c @@ -79,6 +79,7 @@ struct file_op_queue struct file_queue { + DWORD magic; struct file_op_queue copy_queue; struct file_op_queue delete_queue; struct file_op_queue rename_queue; @@ -87,6 +88,7 @@ struct file_queue unsigned int source_count; }; +#define FILE_QUEUE_MAGIC 0x21514653 /* append a file operation to a queue */ static inline void queue_file_op( struct file_op_queue *queue, struct file_op *op ) @@ -434,6 +436,7 @@ HSPFILEQ WINAPI SetupOpenFileQueue(void) if (!(queue = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*queue)))) return INVALID_HANDLE_VALUE; + queue->magic = FILE_QUEUE_MAGIC; return queue; } @@ -446,6 +449,14 @@ BOOL WINAPI SetupCloseFileQueue( HSPFILEQ handle ) struct file_queue *queue = handle; unsigned int i; + /* Windows XP DDK installer passes the handle returned from + * SetupInitDefaultQueueCallback() to this function. */ + if (queue->magic != FILE_QUEUE_MAGIC) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + free_file_op_queue( &queue->copy_queue ); free_file_op_queue( &queue->rename_queue ); free_file_op_queue( &queue->delete_queue ); diff --git a/dlls/setupapi/tests/install.c b/dlls/setupapi/tests/install.c index 15b789f..85f532a 100644 --- a/dlls/setupapi/tests/install.c +++ b/dlls/setupapi/tests/install.c @@ -1815,6 +1815,21 @@ static void test_need_media(void) ok(ret, "Failed to delete INF file, error %u.\n", GetLastError()); } +static void test_close_queue(void) +{ + void *context; + BOOL ret; + + context = SetupInitDefaultQueueCallback(NULL); + ok(!!context, "Failed to create callback context, error %#x.\n", GetLastError()); + + ret = SetupCloseFileQueue(context); + ok(!ret, "Expected failure.\n"); + ok(GetLastError() == ERROR_INVALID_HANDLE, "Got unexpected error %u.\n", GetLastError()); + + SetupTermDefaultQueueCallback(context); +} + START_TEST(install) { char temp_path[MAX_PATH], prev_path[MAX_PATH]; @@ -1841,6 +1856,7 @@ START_TEST(install) test_dirid(); test_install_files_queue(); test_need_media(); + test_close_queue(); UnhookWindowsHookEx(hhook);
1
0
0
0
Piotr Caban : winebus.sys: Add more traces on hidraw communication errors.
by Alexandre Julliard
03 May '19
03 May '19
Module: wine Branch: master Commit: 926797383536df797fb8f7e8643a5805559ab539 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=926797383536df797fb8f7e8…
Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri May 3 11:57:52 2019 +0200 winebus.sys: Add more traces on hidraw communication errors. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_udev.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 99753d6..e8e837a 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -765,7 +765,7 @@ static DWORD CALLBACK device_report_thread(void *args) break; size = read(plfds[0].fd, report_buffer, sizeof(report_buffer)); if (size == -1) - TRACE_(hid_report)("Read failed. Likely an unplugged device\n"); + TRACE_(hid_report)("Read failed. Likely an unplugged device %d %s\n", errno, strerror(errno)); else if (size == 0) TRACE_(hid_report)("Failed to read report\n"); else @@ -827,6 +827,7 @@ static NTSTATUS hidraw_set_output_report(DEVICE_OBJECT *device, UCHAR id, BYTE * } else { + TRACE("write failed: %d %d %s\n", rc, errno, strerror(errno)); *written = 0; return STATUS_UNSUCCESSFUL; } @@ -847,6 +848,7 @@ static NTSTATUS hidraw_get_feature_report(DEVICE_OBJECT *device, UCHAR id, BYTE } else { + TRACE_(hid_report)("ioctl(HIDIOCGFEATURE(%d)) failed: %d %s\n", length, errno, strerror(errno)); *read = 0; return STATUS_UNSUCCESSFUL; } @@ -887,6 +889,7 @@ static NTSTATUS hidraw_set_feature_report(DEVICE_OBJECT *device, UCHAR id, BYTE } else { + TRACE_(hid_report)("ioctl(HIDIOCSFEATURE(%d)) failed: %d %s\n", length, errno, strerror(errno)); *written = 0; return STATUS_UNSUCCESSFUL; }
1
0
0
0
Michael Stefaniuc : riched32/tests: Test the correct return value.
by Alexandre Julliard
03 May '19
03 May '19
Module: wine Branch: master Commit: 4b3b27a7f139471d8f479b5702c6a0a8993d8d57 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=4b3b27a7f139471d8f479b57…
Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri May 3 15:19:51 2019 +0200 riched32/tests: Test the correct return value. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched32/tests/editor.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/riched32/tests/editor.c b/dlls/riched32/tests/editor.c index 7394203..0d55b7c 100644 --- a/dlls/riched32/tests/editor.c +++ b/dlls/riched32/tests/editor.c @@ -1263,8 +1263,8 @@ static void test_enter(void) SendMessageW(hwndRichEdit, WM_CHAR, 'T', 0); SendMessageW(hwndRichEdit, WM_CHAR, '\r', 0); - SendMessageA(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM)buf); - ok(result == 1, "Got %d\n", (int)result); + result = SendMessageA(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM)buf); + ok(result == 3, "Got %ld\n", result); format_test_result(resultbuf, buf); format_test_result(expectedbuf, "T\r\n"); result = strcmp(resultbuf, expectedbuf);
1
0
0
0
Nikolay Sivov : wmvcore: Return success from OpenStream().
by Alexandre Julliard
03 May '19
03 May '19
Module: wine Branch: master Commit: 054f95e6599f93adf7bc45b65e74f2e24b5b96c8 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=054f95e6599f93adf7bc45b6…
Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 3 14:53:32 2019 +0300 wmvcore: Return success from OpenStream(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmvcore/reader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wmvcore/reader.c b/dlls/wmvcore/reader.c index d35f29d..6041c56 100644 --- a/dlls/wmvcore/reader.c +++ b/dlls/wmvcore/reader.c @@ -2222,7 +2222,7 @@ static HRESULT WINAPI WMSyncReader_OpenStream(IWMSyncReader *iface, IStream *str { WMSyncReader *This = impl_from_IWMSyncReader(iface); FIXME("(%p)->(%p): stub!\n", This, stream); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI WMSyncReader_SetOutputProps(IWMSyncReader *iface, DWORD output_num, IWMOutputMediaProps *output)
1
0
0
0
Nikolay Sivov : mf: Implement file scheme handler.
by Alexandre Julliard
03 May '19
03 May '19
Module: wine Branch: master Commit: 8c69a77032ff8d5f0a79c387646f40716d9393ad URL:
https://source.winehq.org/git/wine.git/?a=commit;h=8c69a77032ff8d5f0a79c387…
Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 3 14:53:00 2019 +0300 mf: Implement file scheme handler. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/Makefile.in | 2 +- dlls/mf/main.c | 381 ++++++++++++++++++++++++++++++++++++++++++++- dlls/mfplat/tests/mfplat.c | 27 ++-- 3 files changed, 385 insertions(+), 25 deletions(-) Diff:
https://source.winehq.org/git/wine.git/?a=commitdiff;h=8c69a77032ff8d5f0a79…
1
0
0
0
Henri Verbeet : wined3d: Allocate shader backend and fragment pipe context data in device_context_add ().
by Alexandre Julliard
03 May '19
03 May '19
Module: wine Branch: master Commit: ef3df93f465e302f841150b6382f5ff4e4870c04 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=ef3df93f465e302f841150b6…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 3 15:44:03 2019 +0430 wined3d: Allocate shader backend and fragment pipe context data in device_context_add(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 39 ++++++++------------------------------- dlls/wined3d/device.c | 17 +++++++++++++++++ 2 files changed, 25 insertions(+), 31 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 4a73cbb..7e7ab09 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1925,19 +1925,6 @@ static BOOL wined3d_context_init(struct wined3d_context *context, struct wined3d list_init(&context->fbo_list); list_init(&context->fbo_destroy_list); - if (!device->shader_backend->shader_allocate_context_data(context)) - { - ERR("Failed to allocate shader backend context data.\n"); - return FALSE; - } - - if (!device->adapter->fragment_pipe->allocate_context_data(context)) - { - ERR("Failed to allocate fragment pipeline context data.\n"); - device->shader_backend->shader_free_context_data(context); - return FALSE; - } - if (!(context->hdc = GetDCEx(swapchain->win_handle, 0, DCX_USESTYLE | DCX_CACHE))) { WARN("Failed to retrieve device context, trying swapchain backup.\n"); @@ -1945,8 +1932,6 @@ static BOOL wined3d_context_init(struct wined3d_context *context, struct wined3d if (!(context->hdc = swapchain_get_backup_dc(swapchain))) { ERR("Failed to retrieve a device context.\n"); - device->shader_backend->shader_free_context_data(context); - device->adapter->fragment_pipe->free_context_data(context); return FALSE; } context->hdc_is_private = TRUE; @@ -2001,31 +1986,23 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, heap_free(context_gl); return NULL; } - - if (!device_context_add(device, context)) + if (!(device->adapter->adapter_ops->adapter_create_context(context, target, ds_format))) { - ERR("Failed to add the newly created context to the context list\n"); - goto fail; + wined3d_release_dc(context->win_handle, context->hdc); + heap_free(context_gl); + return NULL; } - if (!(device->adapter->adapter_ops->adapter_create_context(context, target, ds_format))) + if (!device_context_add(device, context)) { - device_context_remove(device, context); - goto fail; + ERR("Failed to add the newly created context to the context list\n"); + wined3d_context_gl_destroy(context_gl); + return NULL; } - device->shader_backend->shader_init_context_state(context); - TRACE("Created context %p.\n", context); return context; - -fail: - wined3d_release_dc(context->win_handle, context->hdc); - device->shader_backend->shader_free_context_data(context); - device->adapter->fragment_pipe->free_context_data(context); - heap_free(context_gl); - return NULL; } BOOL wined3d_adapter_gl_create_context(struct wined3d_context *context, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index df491e1..a27251c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -149,14 +149,31 @@ BOOL device_context_add(struct wined3d_device *device, struct wined3d_context *c TRACE("Adding context %p.\n", context); + if (!device->shader_backend->shader_allocate_context_data(context)) + { + ERR("Failed to allocate shader backend context data.\n"); + return FALSE; + } + device->shader_backend->shader_init_context_state(context); + + if (!device->adapter->fragment_pipe->allocate_context_data(context)) + { + ERR("Failed to allocate fragment pipeline context data.\n"); + device->shader_backend->shader_free_context_data(context); + return FALSE; + } + if (!(new_array = heap_realloc(device->contexts, sizeof(*new_array) * (device->context_count + 1)))) { ERR("Failed to grow the context array.\n"); + device->adapter->fragment_pipe->free_context_data(context); + device->shader_backend->shader_free_context_data(context); return FALSE; } new_array[device->context_count++] = context; device->contexts = new_array; + return TRUE; }
1
0
0
0
Henri Verbeet : wined3d: Free shader backend and fragment pipe context data in device_context_remove ().
by Alexandre Julliard
03 May '19
03 May '19
Module: wine Branch: master Commit: a9dca944cb6f54afc1a5e7f9ee283cfab808816e URL:
https://source.winehq.org/git/wine.git/?a=commit;h=a9dca944cb6f54afc1a5e7f9…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 3 15:44:02 2019 +0430 wined3d: Free shader backend and fragment pipe context data in device_context_remove(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 2 -- dlls/wined3d/device.c | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index b239813..4a73cbb 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2347,8 +2347,6 @@ void wined3d_context_destroy(struct wined3d_context *context) return; } - device->shader_backend->shader_free_context_data(context); - device->adapter->fragment_pipe->free_context_data(context); device_context_remove(device, context); wined3d_context_gl_destroy(wined3d_context_gl(context)); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e25565d..df491e1 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -168,6 +168,9 @@ void device_context_remove(struct wined3d_device *device, struct wined3d_context TRACE("Removing context %p.\n", context); + device->adapter->fragment_pipe->free_context_data(context); + device->shader_backend->shader_free_context_data(context); + for (i = 0; i < device->context_count; ++i) { if (device->contexts[i] == context)
1
0
0
0
Henri Verbeet : wined3d: Introduce wined3d_context_gl_destroy().
by Alexandre Julliard
03 May '19
03 May '19
Module: wine Branch: master Commit: 6bb5724a8a7e347db7a4c05135bf01ba573b1563 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=6bb5724a8a7e347db7a4c051…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 3 15:44:01 2019 +0430 wined3d: Introduce wined3d_context_gl_destroy(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 46 +++++++++++++++++++++++++----------------- dlls/wined3d/wined3d_private.h | 5 +++++ 2 files changed, 33 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 148d69f..b239813 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1482,6 +1482,32 @@ static void wined3d_context_cleanup(struct wined3d_context *context) heap_free(context->texture_type); } +static void wined3d_context_gl_cleanup(struct wined3d_context_gl *context_gl) +{ + wined3d_context_cleanup(&context_gl->c); +} + +static void wined3d_context_gl_destroy(struct wined3d_context_gl *context_gl) +{ + if (context_gl->c.current && context_gl->c.tid != GetCurrentThreadId()) + { + struct wined3d_gl_info *gl_info; + + /* Make a copy of gl_info for wined3d_context_gl_cleanup() use, the + * one in wined3d_adapter may go away in the meantime. */ + gl_info = heap_alloc(sizeof(*gl_info)); + *gl_info = *context_gl->c.gl_info; + context_gl->c.gl_info = gl_info; + context_gl->c.destroyed = 1; + + return; + } + + wined3d_context_gl_cleanup(context_gl); + TlsSetValue(wined3d_context_tls_idx, NULL); + heap_free(context_gl); +} + DWORD context_get_tls_idx(void) { return wined3d_context_tls_idx; @@ -1512,7 +1538,7 @@ BOOL context_set_current(struct wined3d_context *ctx) if (old->destroyed) { TRACE("Switching away from destroyed context %p.\n", old); - wined3d_context_cleanup(old); + wined3d_context_gl_cleanup(wined3d_context_gl(old)); heap_free((void *)old->gl_info); heap_free(old); } @@ -2325,23 +2351,7 @@ void wined3d_context_destroy(struct wined3d_context *context) device->adapter->fragment_pipe->free_context_data(context); device_context_remove(device, context); - if (context->current && context->tid != GetCurrentThreadId()) - { - struct wined3d_gl_info *gl_info; - - /* Make a copy of gl_info for wined3d_context_cleanup() use, the - * one in wined3d_adapter may go away in the meantime. */ - gl_info = heap_alloc(sizeof(*gl_info)); - *gl_info = *context->gl_info; - context->gl_info = gl_info; - context->destroyed = 1; - - return; - } - - wined3d_context_cleanup(context); - TlsSetValue(wined3d_context_tls_idx, NULL); - heap_free(context); + wined3d_context_gl_destroy(wined3d_context_gl(context)); } const DWORD *context_get_tex_unit_mapping(const struct wined3d_context *context, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 138cefb..e698c79 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2034,6 +2034,11 @@ struct wined3d_context_gl struct wined3d_context c; }; +static inline struct wined3d_context_gl *wined3d_context_gl(struct wined3d_context *context) +{ + return CONTAINING_RECORD(context, struct wined3d_context_gl, c); +} + struct wined3d_fb_state { struct wined3d_rendertarget_view *render_targets[MAX_RENDER_TARGET_VIEWS];
1
0
0
0
Henri Verbeet : wined3d: Free the "texture_type" array in wined3d_context_cleanup().
by Alexandre Julliard
03 May '19
03 May '19
Module: wine Branch: master Commit: 166e75e8080bc1705627add506eef6928ebb4325 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=166e75e8080bc1705627add5…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 3 15:44:00 2019 +0430 wined3d: Free the "texture_type" array in wined3d_context_cleanup(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 3f9605c..148d69f 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1478,6 +1478,8 @@ static void wined3d_context_cleanup(struct wined3d_context *context) DWORD err = GetLastError(); ERR("wglDeleteContext(%p) failed, last error %#x.\n", context->glCtx, err); } + + heap_free(context->texture_type); } DWORD context_get_tls_idx(void) @@ -2321,7 +2323,6 @@ void wined3d_context_destroy(struct wined3d_context *context) device->shader_backend->shader_free_context_data(context); device->adapter->fragment_pipe->free_context_data(context); - heap_free(context->texture_type); device_context_remove(device, context); if (context->current && context->tid != GetCurrentThreadId())
1
0
0
0
Henri Verbeet : wined3d: Rename context_destroy_gl_resources() to wined3d_context_cleanup().
by Alexandre Julliard
03 May '19
03 May '19
Module: wine Branch: master Commit: 08b8801c3c0cf99665ad0120b3b127fa220336c5 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=08b8801c3c0cf99665ad0120…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 3 15:43:59 2019 +0430 wined3d: Rename context_destroy_gl_resources() to wined3d_context_cleanup(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 5978627..3f9605c 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1312,7 +1312,7 @@ static void context_update_window(struct wined3d_context *context) } } -static void context_destroy_gl_resources(struct wined3d_context *context) +static void wined3d_context_cleanup(struct wined3d_context *context) { struct wined3d_pipeline_statistics_query *pipeline_statistics_query; const struct wined3d_gl_info *gl_info = context->gl_info; @@ -1510,7 +1510,7 @@ BOOL context_set_current(struct wined3d_context *ctx) if (old->destroyed) { TRACE("Switching away from destroyed context %p.\n", old); - context_destroy_gl_resources(old); + wined3d_context_cleanup(old); heap_free((void *)old->gl_info); heap_free(old); } @@ -2328,7 +2328,7 @@ void wined3d_context_destroy(struct wined3d_context *context) { struct wined3d_gl_info *gl_info; - /* Make a copy of gl_info for context_destroy_gl_resources() use, the + /* Make a copy of gl_info for wined3d_context_cleanup() use, the * one in wined3d_adapter may go away in the meantime. */ gl_info = heap_alloc(sizeof(*gl_info)); *gl_info = *context->gl_info; @@ -2338,7 +2338,7 @@ void wined3d_context_destroy(struct wined3d_context *context) return; } - context_destroy_gl_resources(context); + wined3d_context_cleanup(context); TlsSetValue(wined3d_context_tls_idx, NULL); heap_free(context); }
1
0
0
0
← Newer
1
...
89
90
91
92
93
94
95
...
102
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
Results per page:
10
25
50
100
200