wine-commits August 2016

wine-commits@winehq.org

2 participants
777 discussions

Sebastian Lackner : services/tests: Add test for passing arguments to a service.
by Alexandre Julliard 31 Aug '16

31 Aug '16

Module: wine Branch: master Commit: 328fbb68803c061d62a882fa7d37105dc3663085 URL: http://source.winehq.org/git/wine.git/?a=commit;h=328fbb68803c061d62a882fa7… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Aug 31 08:45:26 2016 +0200 services/tests: Add test for passing arguments to a service. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/tests/service.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/programs/services/tests/service.c b/programs/services/tests/service.c index b184bda..66b273c 100644 --- a/programs/services/tests/service.c +++ b/programs/services/tests/service.c @@ -98,9 +98,10 @@ static void WINAPI service_main(DWORD argc, char **argv) SERVICE_STATUS status; BOOL res; - service_ok(argc == 1, "argc = %d\n", argc); - if(argc) - service_ok(!strcmp(argv[0], service_name), "argv[0] = %s, expected %s\n", argv[0], service_name); + service_ok(argc == 3, "argc = %u, expected 3\n", argc); + service_ok(!strcmp(argv[0], service_name), "argv[0] = '%s', expected '%s'\n", argv[0], service_name); + service_ok(!strcmp(argv[1], "param1"), "argv[1] = '%s', expected 'param1'\n", argv[1]); + service_ok(!strcmp(argv[2], "param2"), "argv[2] = '%s', expected 'param2'\n", argv[2]); service_handle = pRegisterServiceCtrlHandlerExA(service_name, service_handler, NULL); service_ok(service_handle != NULL, "RegisterServiceCtrlHandlerEx failed: %u\n", GetLastError()); @@ -194,9 +195,8 @@ static void WINAPI no_stop_main(DWORD argc, char **argv) SERVICE_STATUS status; BOOL res; - service_ok(argc == 1, "argc = %d\n", argc); - if(argc) - service_ok(!strcmp(argv[0], service_name), "argv[0] = %s, expected %s\n", argv[0], service_name); + service_ok(argc == 1, "argc = %u, expected 1\n", argc); + service_ok(!strcmp(argv[0], service_name), "argv[0] = '%s', expected '%s'\n", argv[0], service_name); service_handle = pRegisterServiceCtrlHandlerExA(service_name, no_stop_handler, NULL); service_ok(service_handle != NULL, "RegisterServiceCtrlHandlerEx failed: %u\n", GetLastError()); @@ -278,7 +278,7 @@ static void expect_event(const char *event_name) static DWORD WINAPI pipe_thread(void *arg) { - char buf[257], *ptr; + char buf[512], *ptr; DWORD read; BOOL res; @@ -320,6 +320,7 @@ static DWORD WINAPI pipe_thread(void *arg) static void test_service(void) { + static const char *argv[2] = {"param1", "param2"}; SC_HANDLE service_handle = register_service("simple_service"); SERVICE_STATUS_PROCESS status2; SERVICE_STATUS status; @@ -330,7 +331,7 @@ static void test_service(void) return; trace("starting...\n"); - res = StartServiceA(service_handle, 0, NULL); + res = StartServiceA(service_handle, 2, argv); ok(res, "StartService failed: %u\n", GetLastError()); if(!res) { DeleteService(service_handle);

1 0

Jacek Caban : winhttp: Don' t perform buffer size tests for components that don' t pass buffer in WinHttpCrackUrl.
by Alexandre Julliard 31 Aug '16

31 Aug '16

Module: wine Branch: master Commit: 985443ed87a2dcb0bfbe8ba87ea85165391ad3af URL: http://source.winehq.org/git/wine.git/?a=commit;h=985443ed87a2dcb0bfbe8ba87… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 30 20:52:21 2016 +0200 winhttp: Don't perform buffer size tests for components that don't pass buffer in WinHttpCrackUrl. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/tests/url.c | 4 ++- dlls/winhttp/url.c | 93 ++++++++++++++---------------------------------- 2 files changed, 30 insertions(+), 67 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=985443ed87a2dcb0bfbe8…

1 0

Jacek Caban : winedevice: Use static initializer for wine_drivers.
by Alexandre Julliard 31 Aug '16

31 Aug '16

Module: wine Branch: master Commit: f40a9d61727914504bdfbc387e997614d35bda43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f40a9d61727914504bdfbc387… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 30 21:30:48 2016 +0200 winedevice: Use static initializer for wine_drivers. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedevice/device.c | 39 +++++++-------------------------------- 1 file changed, 7 insertions(+), 32 deletions(-) diff --git a/programs/winedevice/device.c b/programs/winedevice/device.c index 5011e4f..79d56ec 100644 --- a/programs/winedevice/device.c +++ b/programs/winedevice/device.c @@ -58,7 +58,13 @@ struct wine_driver WCHAR name[1]; }; -static struct wine_rb_tree wine_drivers; +static int wine_drivers_rb_compare( const void *key, const struct wine_rb_entry *entry ) +{ + const struct wine_driver *driver = WINE_RB_ENTRY_VALUE( entry, const struct wine_driver, entry ); + return strcmpW( (const WCHAR *)key, driver->name ); +} + +static struct wine_rb_tree wine_drivers = { wine_drivers_rb_compare }; static CRITICAL_SECTION drivers_cs; static CRITICAL_SECTION_DEBUG critsect_debug = @@ -69,35 +75,6 @@ static CRITICAL_SECTION_DEBUG critsect_debug = }; static CRITICAL_SECTION drivers_cs = { &critsect_debug, -1, 0, 0, 0, 0 }; -static void *wine_drivers_rb_alloc( size_t size ) -{ - return HeapAlloc( GetProcessHeap(), 0, size ); -} - -static void *wine_drivers_rb_realloc( void *ptr, size_t size ) -{ - return HeapReAlloc( GetProcessHeap(), 0, ptr, size ); -} - -static void wine_drivers_rb_free( void *ptr ) -{ - HeapFree( GetProcessHeap(), 0, ptr ); -} - -static int wine_drivers_rb_compare( const void *key, const struct wine_rb_entry *entry ) -{ - const struct wine_driver *driver = WINE_RB_ENTRY_VALUE( entry, const struct wine_driver, entry ); - return strcmpW( (const WCHAR *)key, driver->name ); -} - -static const struct wine_rb_functions wine_drivers_rb_functions = -{ - wine_drivers_rb_alloc, - wine_drivers_rb_realloc, - wine_drivers_rb_free, - wine_drivers_rb_compare, -}; - /* find the LDR_MODULE corresponding to the driver module */ static LDR_MODULE *find_ldr_module( HMODULE module ) { @@ -534,8 +511,6 @@ static void WINAPI ServiceMain( DWORD argc, LPWSTR *argv ) const WCHAR *driver_name = argv[0]; NTSTATUS status; - if (wine_rb_init( &wine_drivers, &wine_drivers_rb_functions )) - return; if (!(stop_event = CreateEventW( NULL, TRUE, FALSE, NULL ))) return; if (!(cleanup_group = CreateThreadpoolCleanupGroup()))

1 0

Jacek Caban : winemenubuilder: Use static initalizer for mimeProgidTree and nativeMimeTypes.
by Alexandre Julliard 31 Aug '16

31 Aug '16

Module: wine Branch: master Commit: fe6a1d89919a86f2c1fcc1088f75d8486ffbdba6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe6a1d89919a86f2c1fcc1088… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 30 21:30:41 2016 +0200 winemenubuilder: Use static initalizer for mimeProgidTree and nativeMimeTypes. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winemenubuilder/winemenubuilder.c | 34 ++---------------------------- 1 file changed, 2 insertions(+), 32 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index e0c6ba2..154b575 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -262,21 +262,6 @@ static int winemenubuilder_rb_string_compare(const void *key, const struct wine_ return strcmp((char*)key, t->string); } -static void *winemenubuilder_rb_alloc(size_t size) -{ - return HeapAlloc(GetProcessHeap(), 0, size); -} - -static void *winemenubuilder_rb_realloc(void *ptr, size_t size) -{ - return HeapReAlloc(GetProcessHeap(), 0, ptr, size); -} - -static void winemenubuilder_rb_free(void *ptr) -{ - HeapFree(GetProcessHeap(), 0, ptr); -} - static void winemenubuilder_rb_destroy(struct wine_rb_entry *entry, void *context) { struct rb_string_entry *t = WINE_RB_ENTRY_VALUE(entry, struct rb_string_entry, entry); @@ -284,14 +269,6 @@ static void winemenubuilder_rb_destroy(struct wine_rb_entry *entry, void *contex HeapFree(GetProcessHeap(), 0, t); } -static const struct wine_rb_functions winemenubuilder_rb_functions = -{ - winemenubuilder_rb_alloc, - winemenubuilder_rb_realloc, - winemenubuilder_rb_free, - winemenubuilder_rb_string_compare, -}; - static void write_xml_text(FILE *file, const char *text) { int i; @@ -2538,19 +2515,12 @@ static BOOL write_freedesktop_association_entry(const char *desktopPath, const c static BOOL generate_associations(const char *xdg_data_home, const char *packages_dir, const char *applications_dir) { static const WCHAR openW[] = {'o','p','e','n',0}; - struct wine_rb_tree mimeProgidTree; - struct list nativeMimeTypes; + struct wine_rb_tree mimeProgidTree = { winemenubuilder_rb_string_compare }; + struct list nativeMimeTypes = LIST_INIT(nativeMimeTypes); LSTATUS ret = 0; int i; BOOL hasChanged = FALSE; - if (wine_rb_init(&mimeProgidTree, &winemenubuilder_rb_functions)) - { - WINE_ERR("wine_rb_init failed\n"); - return FALSE; - } - - list_init(&nativeMimeTypes); if (!build_native_mime_types(xdg_data_home, &nativeMimeTypes)) { WINE_ERR("could not build native MIME types\n");

1 0

Jacek Caban : ntoskrnl.exe: Use static initializer for device_drivers.
by Alexandre Julliard 31 Aug '16

31 Aug '16

Module: wine Branch: master Commit: ccdbc176c0b131afad05395d152d78c6468da511 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccdbc176c0b131afad05395d1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 30 21:30:33 2016 +0200 ntoskrnl.exe: Use static initializer for device_drivers. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 40 ++++++++-------------------------------- 1 file changed, 8 insertions(+), 32 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 7c35d14..a2cbb74 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -90,32 +90,6 @@ struct wine_driver DRIVER_EXTENSION driver_extension; }; -static struct wine_rb_tree wine_drivers; - -static CRITICAL_SECTION drivers_cs; -static CRITICAL_SECTION_DEBUG critsect_debug = -{ - 0, 0, &drivers_cs, - { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": drivers_cs") } -}; -static CRITICAL_SECTION drivers_cs = { &critsect_debug, -1, 0, 0, 0, 0 }; - -static void *wine_drivers_rb_alloc( size_t size ) -{ - return HeapAlloc( GetProcessHeap(), 0, size ); -} - -static void *wine_drivers_rb_realloc( void *ptr, size_t size ) -{ - return HeapReAlloc( GetProcessHeap(), 0, ptr, size ); -} - -static void wine_drivers_rb_free( void *ptr ) -{ - HeapFree( GetProcessHeap(), 0, ptr ); -} - static int wine_drivers_rb_compare( const void *key, const struct wine_rb_entry *entry ) { const struct wine_driver *driver = WINE_RB_ENTRY_VALUE( entry, const struct wine_driver, entry ); @@ -124,13 +98,16 @@ static int wine_drivers_rb_compare( const void *key, const struct wine_rb_entry return RtlCompareUnicodeString( k, &driver->driver_obj.DriverName, FALSE ); } -static const struct wine_rb_functions wine_drivers_rb_functions = +static struct wine_rb_tree wine_drivers = { wine_drivers_rb_compare }; + +static CRITICAL_SECTION drivers_cs; +static CRITICAL_SECTION_DEBUG critsect_debug = { - wine_drivers_rb_alloc, - wine_drivers_rb_realloc, - wine_drivers_rb_free, - wine_drivers_rb_compare, + 0, 0, &drivers_cs, + { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": drivers_cs") } }; +static CRITICAL_SECTION drivers_cs = { &critsect_debug, -1, 0, 0, 0, 0 }; #ifdef __i386__ #define DEFINE_FASTCALL1_ENTRYPOINT( name ) \ @@ -2447,7 +2424,6 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) { case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls( inst ); - if (wine_rb_init( &wine_drivers, &wine_drivers_rb_functions )) return FALSE; #if defined(__i386__) || defined(__x86_64__) handler = RtlAddVectoredExceptionHandler( TRUE, vectored_handler ); #endif

1 0

Jacek Caban : rbtree.h: Store compare function instead of wine_rb_functions in wine_rb_tree.
by Alexandre Julliard 31 Aug '16

31 Aug '16

Module: wine Branch: master Commit: f5d7ee1a57f689311bcdea7679cc4c50a26657d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5d7ee1a57f689311bcdea767… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 30 21:30:25 2016 +0200 rbtree.h: Store compare function instead of wine_rb_functions in wine_rb_tree. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/rbtree.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/wine/rbtree.h b/include/wine/rbtree.h index f13592e..528a494 100644 --- a/include/wine/rbtree.h +++ b/include/wine/rbtree.h @@ -44,7 +44,7 @@ struct wine_rb_functions struct wine_rb_tree { - const struct wine_rb_functions *functions; + int (*compare)(const void *key, const struct wine_rb_entry *entry); struct wine_rb_entry *root; }; @@ -131,7 +131,7 @@ static inline void wine_rb_postorder(struct wine_rb_tree *tree, wine_rb_traverse static inline int wine_rb_init(struct wine_rb_tree *tree, const struct wine_rb_functions *functions) { - tree->functions = functions; + tree->compare = functions->compare; tree->root = NULL; return 0; @@ -159,7 +159,7 @@ static inline struct wine_rb_entry *wine_rb_get(const struct wine_rb_tree *tree, struct wine_rb_entry *entry = tree->root; while (entry) { - int c = tree->functions->compare(key, entry); + int c = tree->compare(key, entry); if (!c) return entry; entry = c < 0 ? entry->left : entry->right; } @@ -175,7 +175,7 @@ static inline int wine_rb_put(struct wine_rb_tree *tree, const void *key, struct int c; parent = *iter; - c = tree->functions->compare(key, parent); + c = tree->compare(key, parent); if (!c) return -1; else if (c < 0) iter = &parent->left; else iter = &parent->right;

1 0

Alistair Leslie-Hughes : inetcomm/tests: Add Attachment tests.
by Alexandre Julliard 30 Aug '16

30 Aug '16

Module: wine Branch: master Commit: 002af352fac43d170aad216bf15098b27555539a URL: http://source.winehq.org/git/wine.git/?a=commit;h=002af352fac43d170aad216bf… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Aug 18 11:13:02 2016 +0000 inetcomm/tests: Add Attachment tests. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcomm/tests/mimeole.c | 53 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/dlls/inetcomm/tests/mimeole.c b/dlls/inetcomm/tests/mimeole.c index 011c19f..ce1e4af 100644 --- a/dlls/inetcomm/tests/mimeole.c +++ b/dlls/inetcomm/tests/mimeole.c @@ -338,6 +338,59 @@ static void test_CreateMessage(void) hr = IMimeMessage_GetAttachments(msg, &count, &body_list); ok(hr == S_OK, "ret %08x\n", hr); ok(count == 2, "got %d\n", count); + if(count == 2) + { + ENCODINGTYPE encoding; + IMimeBody *attachment; + PROPVARIANT prop; + + PropVariantInit(&prop); + + hr = IMimeMessage_BindToObject(msg, body_list[0], &IID_IMimeBody, (void**)&attachment); + ok(hr == S_OK, "ret %08x\n", hr); + + hr = IMimeBody_IsContentType(attachment, "multipart", NULL); + ok(hr == S_FALSE, "ret %08x\n", hr); + + hr = IMimeBody_GetCurrentEncoding(attachment, &encoding); + ok(hr == S_OK, "ret %08x\n", hr); + todo_wine ok(encoding == IET_8BIT, "ret %d\n", encoding); + + prop.vt = VT_LPSTR; + hr = IMimeBody_GetProp(attachment, "Content-Transfer-Encoding", 0, &prop); + ok(hr == S_OK, "ret %08x\n", hr); + + ok(prop.vt == VT_LPSTR, "type %d\n", prop.vt); + ok(!strcmp(prop.u.pszVal, "8bit"), "got %s\n", prop.u.pszVal); + PropVariantClear(&prop); + + hr = IMimeBody_IsType(attachment, IBT_ATTACHMENT); + todo_wine ok(hr == S_FALSE, "ret %08x\n", hr); + + IMimeBody_Release(attachment); + + hr = IMimeMessage_BindToObject(msg, body_list[1], &IID_IMimeBody, (void**)&attachment); + ok(hr == S_OK, "ret %08x\n", hr); + + hr = IMimeBody_IsContentType(attachment, "multipart", NULL); + ok(hr == S_FALSE, "ret %08x\n", hr); + + hr = IMimeBody_GetCurrentEncoding(attachment, &encoding); + ok(hr == S_OK, "ret %08x\n", hr); + todo_wine ok(encoding == IET_7BIT, "ret %d\n", encoding); + + prop.vt = VT_LPSTR; + hr = IMimeBody_GetProp(attachment, "Content-Transfer-Encoding", 0, &prop); + ok(hr == S_OK, "ret %08x\n", hr); + ok(prop.vt == VT_LPSTR, "type %d\n", prop.vt); + ok(!strcmp(prop.u.pszVal, "7bit"), "got %s\n", prop.u.pszVal); + PropVariantClear(&prop); + + hr = IMimeBody_IsType(attachment, IBT_ATTACHMENT); + ok(hr == S_OK, "ret %08x\n", hr); + + IMimeBody_Release(attachment); + } CoTaskMemFree(body_list); hr = IMimeBody_GetCharset(body, &hcs);

1 0

Hugh McMaster : reg/tests: Fix copy/paste error in 'import' tests.
by Alexandre Julliard 30 Aug '16

30 Aug '16

Module: wine Branch: master Commit: 0cea0605cf7cf4cb013d49b9bee2afc2a662add9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cea0605cf7cf4cb013d49b9b… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Aug 30 11:07:45 2016 +0000 reg/tests: Fix copy/paste error in 'import' tests. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 1dab72b..715cdbd 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -928,12 +928,10 @@ static void test_import(void) todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); test_import_wstr("\xef\xbb\xbf REGEDIT4\n", &r); - ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, - "got exit code %d, expected 1\n", r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); test_import_wstr("\xef\xbb\xbf\tREGEDIT4\n", &r); - ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, - "got exit code %d, expected 1\n", r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); test_import_wstr("\xef\xbb\xbf\nREGEDIT4\n", &r); ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */,

1 0

Henri Verbeet : d3d9: Use wined3d_resource_unmap() in d3d9_indexbuffer_Unlock().
by Alexandre Julliard 30 Aug '16

30 Aug '16

Module: wine Branch: master Commit: a6e17d11089d774d19877e1266f47e89baab7d0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6e17d11089d774d19877e126… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 30 11:48:22 2016 +0200 d3d9: Use wined3d_resource_unmap() in d3d9_indexbuffer_Unlock(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/buffer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d9/buffer.c b/dlls/d3d9/buffer.c index d66c31d..dc52d93 100644 --- a/dlls/d3d9/buffer.c +++ b/dlls/d3d9/buffer.c @@ -490,7 +490,7 @@ static HRESULT WINAPI d3d9_indexbuffer_Unlock(IDirect3DIndexBuffer9 *iface) TRACE("iface %p.\n", iface); wined3d_mutex_lock(); - wined3d_buffer_unmap(buffer->wined3d_buffer); + wined3d_resource_unmap(wined3d_buffer_get_resource(buffer->wined3d_buffer), 0); wined3d_mutex_unlock(); return D3D_OK;

1 0

Henri Verbeet : d3d9: Use wined3d_resource_map() in d3d9_indexbuffer_Lock( ).
by Alexandre Julliard 30 Aug '16

30 Aug '16

Module: wine Branch: master Commit: 4d638863fb111794ee1de241da2489ff9be196de URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d638863fb111794ee1de241d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 30 11:48:21 2016 +0200 d3d9: Use wined3d_resource_map() in d3d9_indexbuffer_Lock(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/buffer.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/d3d9/buffer.c b/dlls/d3d9/buffer.c index de77d5a..d66c31d 100644 --- a/dlls/d3d9/buffer.c +++ b/dlls/d3d9/buffer.c @@ -465,14 +465,20 @@ static HRESULT WINAPI d3d9_indexbuffer_Lock(IDirect3DIndexBuffer9 *iface, UINT offset, UINT size, void **data, DWORD flags) { struct d3d9_indexbuffer *buffer = impl_from_IDirect3DIndexBuffer9(iface); + struct wined3d_map_desc wined3d_map_desc; + struct wined3d_box wined3d_box = {0}; HRESULT hr; TRACE("iface %p, offset %u, size %u, data %p, flags %#x.\n", iface, offset, size, data, flags); + wined3d_box.left = offset; + wined3d_box.right = offset + size; wined3d_mutex_lock(); - hr = wined3d_buffer_map(buffer->wined3d_buffer, offset, size, (BYTE **)data, flags); + hr = wined3d_resource_map(wined3d_buffer_get_resource(buffer->wined3d_buffer), + 0, &wined3d_map_desc, &wined3d_box, flags); wined3d_mutex_unlock(); + *data = wined3d_map_desc.data; return hr; }

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 August 2016