January 2023 - Wine-Commits

Jactry Zeng : po: Update Simplified Chinese translation.
by Alexandre Julliard Jan. 16, 2023

Jan. 16, 2023

Module: wine Branch: master Commit: 08832c5a77b6835114bf654f33d402f010a9f5fb URL: https://gitlab.winehq.org/wine/wine/-/commit/08832c5a77b6835114bf654f33d402… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Sun Jan 15 22:38:53 2023 -0600 po: Update Simplified Chinese translation. --- po/zh_CN.po | 192 ++++++++++++++++-------------------------------------------- 1 file changed, 52 insertions(+), 140 deletions(-)

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard Jan. 16, 2023

Jan. 16, 2023

Module: wine Branch: master Commit: 87b4f800f7de23033197281e9370f1e5af34743c URL: https://gitlab.winehq.org/wine/wine/-/commit/87b4f800f7de23033197281e9370f1… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Sat Jan 14 18:18:30 2023 +0200 po: Update Finnish translation. --- po/fi.po | 38 ++++++++++++++++++-------------------- 1 file changed, 18 insertions(+), 20 deletions(-) diff --git a/po/fi.po b/po/fi.po index 793989e014a..aa5f747223d 100644 --- a/po/fi.po +++ b/po/fi.po @@ -3743,25 +3743,23 @@ msgstr "" #: dlls/joy.cpl/joy.rc:55 msgid "DInput" -msgstr "" +msgstr "DInput" #: dlls/joy.cpl/joy.rc:59 msgid "Axes" -msgstr "" +msgstr "Akselit" #: dlls/joy.cpl/joy.rc:60 msgid "POVs" -msgstr "" +msgstr "POV:t" #: dlls/joy.cpl/joy.rc:61 msgid "Buttons" msgstr "Painikkeet" #: dlls/joy.cpl/joy.rc:62 -#, fuzzy -#| msgid "Test Force Feedback" msgid "Force Feedback Effect" -msgstr "Testaa voimapalautetta" +msgstr "Voimapalautteen efekti" #: dlls/joy.cpl/joy.rc:64 msgid "" @@ -3773,60 +3771,60 @@ msgstr "" #: dlls/joy.cpl/joy.rc:70 msgid "XInput" -msgstr "" +msgstr "XInput" #: dlls/joy.cpl/joy.rc:73 -#, fuzzy -#| msgid "User" msgid "User #0" -msgstr "Käyttäjä" +msgstr "Käyttäjä #0" #: dlls/joy.cpl/joy.rc:74 -#, fuzzy -#| msgid "User" msgid "User #1" -msgstr "Käyttäjä" +msgstr "Käyttäjä #1" #: dlls/joy.cpl/joy.rc:75 -#, fuzzy -#| msgid "User" msgid "User #2" -msgstr "Käyttäjä" +msgstr "Käyttäjä #2" #: dlls/joy.cpl/joy.rc:76 -#, fuzzy -#| msgid "User" msgid "User #3" -msgstr "Käyttäjä" +msgstr "Käyttäjä #3" #: dlls/joy.cpl/joy.rc:78 msgid "" "No user detected on slot #0, make sure your gamepad is plugged in, and not " "overridden for DInput in the Joysticks tab." msgstr "" +"Ei käyttäjää paikalla #0. Varmista, että ohjain on kytketty ja ettei sitä " +"ole ohitettu DInput- tai Joystickit-välilehdellä." #: dlls/joy.cpl/joy.rc:82 msgid "" "No user detected on slot #1, make sure your gamepad is plugged in, and not " "overridden for DInput in the Joysticks tab." msgstr "" +"Ei käyttäjää paikalla #1. Varmista, että ohjain on kytketty ja ettei sitä " +"ole ohitettu DInput- tai Joystickit-välilehdellä." #: dlls/joy.cpl/joy.rc:86 msgid "" "No user detected on slot #2, make sure your gamepad is plugged in, and not " "overridden for DInput in the Joysticks tab." msgstr "" +"Ei käyttäjää paikalla #2. Varmista, että ohjain on kytketty ja ettei sitä " +"ole ohitettu DInput- tai Joystickit-välilehdellä." #: dlls/joy.cpl/joy.rc:90 msgid "" "No user detected on slot #3, make sure your gamepad is plugged in, and not " "overridden for DInput in the Joysticks tab." msgstr "" +"Ei käyttäjää paikalla #3. Varmista, että ohjain on kytketty ja ettei sitä " +"ole ohitettu DInput- tai Joystickit-välilehdellä." #: dlls/joy.cpl/joy.rc:95 dlls/joy.cpl/joy.rc:96 dlls/joy.cpl/joy.rc:97 #: dlls/joy.cpl/joy.rc:98 msgid "Rumble" -msgstr "" +msgstr "Tärinä" #: dlls/joy.cpl/joy.rc:31 msgid "Game Controllers"

1 0

Alexandre Julliard : tools: Always fall back to argv[0] to find the tools directory.
by Alexandre Julliard Jan. 16, 2023

Jan. 16, 2023

Module: wine Branch: master Commit: 6f123e84244245f63524b817fa193a40bf3e83a8 URL: https://gitlab.winehq.org/wine/wine/-/commit/6f123e84244245f63524b817fa193a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 16 20:41:52 2023 +0100 tools: Always fall back to argv[0] to find the tools directory. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54319 --- tools/widl/widl.c | 6 ++---- tools/winegcc/winegcc.c | 6 ++---- tools/wmc/wmc.c | 8 ++------ tools/wrc/wrc.c | 8 ++------ 4 files changed, 8 insertions(+), 20 deletions(-) diff --git a/tools/widl/widl.c b/tools/widl/widl.c index 79d895b52bf..8d07bf61dba 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -483,7 +483,7 @@ void write_id_data(const statement_list_t *stmts) static void init_argv0_dir( const char *argv0 ) { #ifndef _WIN32 - char *dir; + char *dir = NULL; #if defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) dir = realpath( "/proc/self/exe", NULL ); @@ -494,10 +494,8 @@ static void init_argv0_dir( const char *argv0 ) if (!sysctl( pathname, ARRAY_SIZE(pathname), path, &path_size, NULL, 0 )) dir = realpath( path, NULL ); free( path ); -#else - dir = realpath( argv0, NULL ); #endif - if (!dir) return; + if (!dir && !(dir = realpath( argv0, NULL ))) return; includedir = strmake( "%s/%s", get_dirname( dir ), BIN_TO_INCLUDEDIR ); dlldir = strmake( "%s/%s", get_dirname( dir ), BIN_TO_DLLDIR ); #endif diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 2e656f7ea83..3891974c6c1 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -647,7 +647,7 @@ static char *get_lib_dir( struct options *opts ) static void init_argv0_dir( const char *argv0 ) { #ifndef _WIN32 - char *dir; + char *dir = NULL; #if defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) dir = realpath( "/proc/self/exe", NULL ); @@ -658,10 +658,8 @@ static void init_argv0_dir( const char *argv0 ) if (!sysctl( pathname, ARRAY_SIZE(pathname), path, &path_size, NULL, 0 )) dir = realpath( path, NULL ); free( path ); -#else - dir = realpath( argv0, NULL ); #endif - if (!dir) return; + if (!dir && !(dir = realpath( argv0, NULL ))) return; bindir = get_dirname( dir ); includedir = strmake( "%s/%s", bindir, BIN_TO_INCLUDEDIR ); libdir = strmake( "%s/%s", bindir, BIN_TO_LIBDIR ); diff --git a/tools/wmc/wmc.c b/tools/wmc/wmc.c index 145acb5d718..76251637a4b 100644 --- a/tools/wmc/wmc.c +++ b/tools/wmc/wmc.c @@ -150,7 +150,7 @@ static void exit_on_signal( int sig ) static void init_argv0_dir( const char *argv0 ) { #ifndef _WIN32 - char *dir; + char *dir = NULL; #if defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) dir = realpath( "/proc/self/exe", NULL ); @@ -160,13 +160,9 @@ static void init_argv0_dir( const char *argv0 ) char *path = xmalloc( path_size ); if (!sysctl( pathname, ARRAY_SIZE(pathname), path, &path_size, NULL, 0 )) dir = realpath( path, NULL ); - else - dir = NULL; free( path ); -#else - dir = realpath( argv0, NULL ); #endif - if (!dir) return; + if (!dir && !(dir = realpath( argv0, NULL ))) return; dir = get_dirname( dir ); if (strendswith( dir, "/tools/wmc" )) nlsdirs[0] = strmake( "%s/../../nls", dir ); else nlsdirs[0] = strmake( "%s/%s", dir, BIN_TO_NLSDIR ); diff --git a/tools/wrc/wrc.c b/tools/wrc/wrc.c index 9f231603ad4..fc217afec6c 100644 --- a/tools/wrc/wrc.c +++ b/tools/wrc/wrc.c @@ -295,7 +295,7 @@ static int load_file( const char *input_name, const char *output_name ) static void init_argv0_dir( const char *argv0 ) { #ifndef _WIN32 - char *dir; + char *dir = NULL; #if defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) dir = realpath( "/proc/self/exe", NULL ); @@ -305,13 +305,9 @@ static void init_argv0_dir( const char *argv0 ) char *path = xmalloc( path_size ); if (!sysctl( pathname, ARRAY_SIZE(pathname), path, &path_size, NULL, 0 )) dir = realpath( path, NULL ); - else - dir = NULL; free( path ); -#else - dir = realpath( argv0, NULL ); #endif - if (!dir) return; + if (!dir && !(dir = realpath( argv0, NULL ))) return; dir = get_dirname( dir ); includedir = strmake( "%s/%s", dir, BIN_TO_INCLUDEDIR ); if (strendswith( dir, "/tools/wrc" )) nlsdirs[0] = strmake( "%s/../../nls", dir );

1 0

Tim Clem : win32u: Correct GetRawInputBuffer alignment under WoW64.
by Alexandre Julliard Jan. 16, 2023

Jan. 16, 2023

Module: wine Branch: master Commit: 5ca22f551d8d6094d0dc0344a633378be6cf10e6 URL: https://gitlab.winehq.org/wine/wine/-/commit/5ca22f551d8d6094d0dc0344a63337… Author: Tim Clem <tclem(a)codeweavers.com> Date: Fri Jan 13 10:20:55 2023 -0800 win32u: Correct GetRawInputBuffer alignment under WoW64. Patch originally by Rémi Bernon. --- dlls/user32/tests/input.c | 1 - dlls/win32u/rawinput.c | 12 +++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index c2b2e4ded80..95abdbb601b 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -2454,7 +2454,6 @@ static void test_GetRawInputBuffer(void) ok(size == sizeof(buffer), "GetRawInputBuffer returned unexpected size: %u\n", size); ok(HEADER_FIELD(dwType) == RIM_TYPEKEYBOARD, "Unexpected rawinput dwType: %ld\n", HEADER_FIELD(dwType)); - todo_wine_if(is_wow64) ok(HEADER_FIELD(wParam) == 0 || HEADER_FIELD(wParam) == 1, "Expected wparam 0 or 1, got %Iu\n", (WPARAM)HEADER_FIELD(wParam)); scan_code = is_wow64 ? ((RAWINPUT64 *)buffer)->data.keyboard.MakeCode : ((RAWINPUT *)buffer)->data.keyboard.MakeCode; ok(scan_code == 0x2d, "Unexpected rawinput keyboard scan code: %x\n", scan_code); diff --git a/dlls/win32u/rawinput.c b/dlls/win32u/rawinput.c index ab1252ccea6..1ddbca0896a 100644 --- a/dlls/win32u/rawinput.c +++ b/dlls/win32u/rawinput.c @@ -671,10 +671,20 @@ UINT WINAPI NtUserGetRawInputBuffer( RAWINPUT *data, UINT *data_size, UINT heade if (!rawinput_from_hardware_message( data, msg_data )) break; if (overhead) { + /* Under WoW64, GetRawInputBuffer always gives 64-bit RAWINPUT structs. */ + RAWINPUT64 *ri64 = (RAWINPUT64 *)data; memmove( (char *)&data->data + overhead, &data->data, data->header.dwSize - sizeof(RAWINPUTHEADER) ); + ri64->header.dwSize += overhead; + + /* Need to copy wParam before hDevice so it's not overwritten. */ + ri64->header.wParam = data->header.wParam; +#ifdef _WIN64 + ri64->header.hDevice = data->header.hDevice; +#else + ri64->header.hDevice = HandleToULong(data->header.hDevice); +#endif } - data->header.dwSize += overhead; remaining -= data->header.dwSize; data = NEXTRAWINPUTBLOCK(data); msg_data = (struct hardware_msg_data *)((char *)msg_data + msg_data->size);

1 0

Tim Clem : user32/tests: Test GetRawInputBuffer header fields more thoroughly.
by Alexandre Julliard Jan. 16, 2023

Jan. 16, 2023

Module: wine Branch: master Commit: fb0f8fe54712541790944f24ad61f662ddb92155 URL: https://gitlab.winehq.org/wine/wine/-/commit/fb0f8fe54712541790944f24ad61f6… Author: Tim Clem <tclem(a)codeweavers.com> Date: Thu Jan 12 11:30:23 2023 -0800 user32/tests: Test GetRawInputBuffer header fields more thoroughly. Exposes an alignment issue under WoW64. --- dlls/user32/tests/input.c | 43 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 42 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index bf913b8e6a6..c2b2e4ded80 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -2296,13 +2296,15 @@ static LRESULT CALLBACK rawinputbuffer_wndproc(HWND hwnd, UINT msg, WPARAM wpara static void test_GetRawInputBuffer(void) { - unsigned int size, count, rawinput_size, header_size; + unsigned int size, count, rawinput_size, header_size, scan_code; RAWINPUTDEVICE raw_devices[1]; char buffer[16 * sizeof(RAWINPUT64)]; HWND hwnd; BOOL ret; POINT pt; +#define HEADER_FIELD(field) (is_wow64 ? ((RAWINPUT64 *)buffer)->header.field : ((RAWINPUT *)buffer)->header.field) + if (is_wow64) rawinput_size = sizeof(RAWINPUT64); else rawinput_size = sizeof(RAWINPUT); @@ -2392,6 +2394,8 @@ static void test_GetRawInputBuffer(void) count = GetRawInputBuffer((RAWINPUT*)buffer, &size, sizeof(RAWINPUTHEADER)); ok(count == 1U, "GetRawInputBuffer returned %u\n", count); ok(size == sizeof(buffer), "GetRawInputBuffer returned unexpected size: %u\n", size); + ok(HEADER_FIELD(dwType) == RIM_TYPEMOUSE, "Unexpected rawinput dwType: %ld\n", HEADER_FIELD(dwType)); + ok(HEADER_FIELD(wParam) == 0 || HEADER_FIELD(wParam) == 1, "Expected wparam 0 or 1, got %Iu\n", (WPARAM)HEADER_FIELD(wParam)); ok(rawinput_buffer_mouse_x(buffer, 0) == 5, "Unexpected rawinput data: %d\n", rawinput_buffer_mouse_x(buffer, 0)); @@ -2428,7 +2432,44 @@ static void test_GetRawInputBuffer(void) ok(ret, "RegisterRawInputDevices failed\n"); ok(GetLastError() == 0xdeadbeef, "RegisterRawInputDevices returned %08lx\n", GetLastError()); + + /* some keyboard tests to better check fields under wow64 */ + raw_devices[0].usUsagePage = 0x01; + raw_devices[0].usUsage = 0x06; + raw_devices[0].dwFlags = RIDEV_INPUTSINK; + raw_devices[0].hwndTarget = hwnd; + + SetLastError(0xdeadbeef); + ret = RegisterRawInputDevices(raw_devices, ARRAY_SIZE(raw_devices), sizeof(RAWINPUTDEVICE)); + ok(ret, "RegisterRawInputDevices failed\n"); + ok(GetLastError() == 0xdeadbeef, "RegisterRawInputDevices returned %08lx\n", GetLastError()); + + keybd_event('X', 0x2d, 0, 0); + keybd_event('X', 0x2d, KEYEVENTF_KEYUP, 0); + + size = sizeof(buffer); + memset(buffer, 0, sizeof(buffer)); + count = GetRawInputBuffer((RAWINPUT*)buffer, &size, sizeof(RAWINPUTHEADER)); + ok(count == 2U, "GetRawInputBuffer returned %u\n", count); + ok(size == sizeof(buffer), "GetRawInputBuffer returned unexpected size: %u\n", size); + + ok(HEADER_FIELD(dwType) == RIM_TYPEKEYBOARD, "Unexpected rawinput dwType: %ld\n", HEADER_FIELD(dwType)); + todo_wine_if(is_wow64) + ok(HEADER_FIELD(wParam) == 0 || HEADER_FIELD(wParam) == 1, "Expected wparam 0 or 1, got %Iu\n", (WPARAM)HEADER_FIELD(wParam)); + scan_code = is_wow64 ? ((RAWINPUT64 *)buffer)->data.keyboard.MakeCode : ((RAWINPUT *)buffer)->data.keyboard.MakeCode; + ok(scan_code == 0x2d, "Unexpected rawinput keyboard scan code: %x\n", scan_code); + + raw_devices[0].dwFlags = RIDEV_REMOVE; + raw_devices[0].hwndTarget = 0; + + SetLastError(0xdeadbeef); + ret = RegisterRawInputDevices(raw_devices, ARRAY_SIZE(raw_devices), sizeof(RAWINPUTDEVICE)); + ok(ret, "RegisterRawInputDevices failed\n"); + ok(GetLastError() == 0xdeadbeef, "RegisterRawInputDevices returned %08lx\n", GetLastError()); + DestroyWindow(hwnd); + +#undef HEADER_FIELD } static BOOL rawinput_test_received_legacy;

1 0

Alexandre Julliard : Wine release 8.0-rc4
by Alexandre Julliard Jan. 13, 2023

Jan. 13, 2023

Module: website Branch: master Commit: 524dc64a25e2b107cde1ce69bbb5b42d821feb24 URL: https://gitlab.winehq.org/winehq/winehq/-/commit/524dc64a25e2b107cde1ce69bb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 13 22:29:54 2023 +0100 Wine release 8.0-rc4 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2023011301.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/news/en/2023011301.xml b/news/en/2023011301.xml new file mode 100644 index 00000000..de54bb3f --- /dev/null +++ b/news/en/2023011301.xml @@ -0,0 +1,13 @@ +<news> +<date>January 13, 2023</date> +<title>Wine 8.0-rc4 Released</title> +<body> + The Wine development release 8.0-rc4 is now available. + <a href="{$root}/announce/8.0-rc4">What's new</a> in this release: +<ul> + <li>Bug fixes only, we are in code freeze.</li> +</ul> + +The source is <a href="//dl.winehq.org/wine/source/8.0/wine-8.0-rc4.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-8.0-rc4 : Alexandre Julliard : Release 8.0-rc4
by Alexandre Julliard Jan. 13, 2023

Jan. 13, 2023

Module: wine Branch: refs/tags/wine-8.0-rc4 Tag: aa2d8781b0ac94381aa2b95d0677b3f5799a9a38 URL: https://gitlab.winehq.org/wine/wine/-/tags/aa2d8781b0ac94381aa2b95d0677b3f5… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 13 22:27:26 2023 +0100 Release 8.0-rc4

1 0

Alexandre Julliard : Release 8.0-rc4.
by Alexandre Julliard Jan. 13, 2023

Jan. 13, 2023

Module: wine Branch: master Commit: 3e266800c40fb67c4406901196e3247910cae1c7 URL: https://gitlab.winehq.org/wine/wine/-/commit/3e266800c40fb67c4406901196e324… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 13 22:22:36 2023 +0100 Release 8.0-rc4. --- ANNOUNCE | 216 +++++++++++++++++++++++++++++++------------------------------- VERSION | 2 +- configure | 18 +++--- 3 files changed, 119 insertions(+), 117 deletions(-)

1 0

Rémi Bernon : comctl32: Avoid mismatching heap in ProgressWindowProc.
by Alexandre Julliard Jan. 13, 2023

Jan. 13, 2023

Module: wine Branch: master Commit: 0bb029eb597f3502b2960b05c01688bfd5b8dcbf URL: https://gitlab.winehq.org/wine/wine/-/commit/0bb029eb597f3502b2960b05c01688… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jan 12 20:27:31 2023 +0100 comctl32: Avoid mismatching heap in ProgressWindowProc. When free-ing an Alloc-ed pointer. --- dlls/comctl32/progress.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/progress.c b/dlls/comctl32/progress.c index a329995a40e..6d556f10094 100644 --- a/dlls/comctl32/progress.c +++ b/dlls/comctl32/progress.c @@ -576,7 +576,7 @@ static LRESULT WINAPI ProgressWindowProc(HWND hwnd, UINT message, case WM_DESTROY: TRACE("Progress Ctrl destruction, hwnd=%p\n", hwnd); - free (infoPtr); + Free (infoPtr); SetWindowLongPtrW(hwnd, 0, 0); theme = GetWindowTheme (hwnd); CloseThemeData (theme);

1 0

Zebediah Figura : wined3d: Write into a mapped BO when replacing the entire destination in wined3d_context_gl_copy_bo_address().
by Alexandre Julliard Jan. 13, 2023

Jan. 13, 2023

Module: wine Branch: master Commit: 69a730090abe81c5829c6504aac373babbe9e8a8 URL: https://gitlab.winehq.org/wine/wine/-/commit/69a730090abe81c5829c6504aac373… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jan 11 14:19:21 2023 -0600 wined3d: Write into a mapped BO when replacing the entire destination in wined3d_context_gl_copy_bo_address(). Instead of using glBufferSubData(). In practice, this means that we will either discard and rename the BO (if it's still in use) or write directly into it (if not). This improves performance drastically on NVidia GL drivers. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53408 --- dlls/wined3d/context_gl.c | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 8c27b661617..0217e12d903 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -3118,14 +3118,23 @@ void wined3d_context_gl_copy_bo_address(struct wined3d_context_gl *context_gl, } else if (dst_bo && !src_bo) { - wined3d_context_gl_bind_bo(context_gl, dst_bo->binding, dst_bo->id); - for (i = 0; i < range_count; ++i) - GL_EXTCALL(glBufferSubData(dst_bo->binding, - dst_bo->b.buffer_offset + (GLintptr)dst->addr + ranges[i].offset, - ranges[i].size, src->addr + ranges[i].offset)); - checkGLcall("buffer upload"); + if ((map_flags & WINED3D_MAP_DISCARD) && (dst_bo->flags & GL_MAP_WRITE_BIT)) + { + dst_ptr = wined3d_context_gl_map_bo_address(context_gl, dst, dst_bo->size, map_flags); + memcpy(dst_ptr, src->addr, dst_bo->size); + wined3d_context_gl_unmap_bo_address(context_gl, dst, range_count, ranges); + } + else + { + wined3d_context_gl_bind_bo(context_gl, dst_bo->binding, dst_bo->id); + for (i = 0; i < range_count; ++i) + GL_EXTCALL(glBufferSubData(dst_bo->binding, + dst_bo->b.buffer_offset + (GLintptr)dst->addr + ranges[i].offset, + ranges[i].size, src->addr + ranges[i].offset)); + checkGLcall("buffer upload"); - wined3d_context_gl_reference_bo(context_gl, dst_bo); + wined3d_context_gl_reference_bo(context_gl, dst_bo); + } } else {

1 0