December 2021 - Wine-Commits

Henri Verbeet : wined3d: Always map the whole OpenGL buffer.
by Alexandre Julliard Dec. 1, 2021

Dec. 1, 2021

Module: wine Branch: master Commit: 793ac83d5b7fc0bc440714b218d607ad464a4f05 URL: https://source.winehq.org/git/wine.git/?a=commit;h=793ac83d5b7fc0bc440714b2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 30 17:55:20 2021 -0600 wined3d: Always map the whole OpenGL buffer. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_gl.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 675c26ac6fe..700ccace2e5 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -2712,7 +2712,8 @@ map: if (gl_info->supported[ARB_MAP_BUFFER_RANGE]) { - map_ptr = GL_EXTCALL(glMapBufferRange(bo->binding, offset, size, wined3d_resource_gl_map_flags(bo, flags))); + if ((map_ptr = GL_EXTCALL(glMapBufferRange(bo->binding, 0, bo->size, wined3d_resource_gl_map_flags(bo, flags))))) + map_ptr += offset; } else { @@ -2757,11 +2758,12 @@ static void flush_bo_ranges(struct wined3d_context_gl *context_gl, const struct if (gl_info->supported[ARB_MAP_BUFFER_RANGE]) { + /* The offset passed to glFlushMappedBufferRange() is relative to the + * mapped range, but we map the whole buffer anyway. */ for (i = 0; i < range_count; ++i) { - /* The offset passed to glFlushMappedBufferRange() is relative to - * the mapped range, so don't add data->addr in this case. */ - GL_EXTCALL(glFlushMappedBufferRange(bo->binding, ranges[i].offset, ranges[i].size)); + GL_EXTCALL(glFlushMappedBufferRange(bo->binding, + bo->b.buffer_offset + (uintptr_t)data->addr + ranges[i].offset, ranges[i].size)); } } else if (gl_info->supported[APPLE_FLUSH_BUFFER_RANGE])

1 0

Mohamad Al-Jaf : uiautomationcore: Add UiaRaiseAutomationPropertyChangedEvent stub.
by Alexandre Julliard Dec. 1, 2021

Dec. 1, 2021

Module: wine Branch: master Commit: 84794b40dd5f9ec562d64b57213c8ef4016c9151 URL: https://source.winehq.org/git/wine.git/?a=commit;h=84794b40dd5f9ec562d64b57… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Mon Nov 29 23:32:57 2021 -0500 uiautomationcore: Add UiaRaiseAutomationPropertyChangedEvent stub. Enable Microsoft Edge to run in Windows 10 mode. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51437 Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uiautomationcore/uia_main.c | 9 +++++++++ dlls/uiautomationcore/uiautomationcore.spec | 2 +- include/uiautomationcoreapi.h | 1 + 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/uiautomationcore/uia_main.c b/dlls/uiautomationcore/uia_main.c index 44fd42742d9..f1cf06ed4f5 100644 --- a/dlls/uiautomationcore/uia_main.c +++ b/dlls/uiautomationcore/uia_main.c @@ -324,6 +324,15 @@ HRESULT WINAPI UiaRaiseAutomationEvent(IRawElementProviderSimple *provider, EVEN return S_OK; } +/*********************************************************************** + * UiaRaiseAutomationPropertyChangedEvent (uiautomationcore.@) + */ +HRESULT WINAPI UiaRaiseAutomationPropertyChangedEvent(IRawElementProviderSimple *provider, PROPERTYID id, VARIANT old, VARIANT new) +{ + FIXME("(%p, %d, %s, %s): stub\n", provider, id, debugstr_variant(&old), debugstr_variant(&new)); + return S_OK; +} + void WINAPI UiaRegisterProviderCallback(UiaProviderCallback *callback) { FIXME("(%p): stub\n", callback); diff --git a/dlls/uiautomationcore/uiautomationcore.spec b/dlls/uiautomationcore/uiautomationcore.spec index 656641c4bad..82071bd2317 100644 --- a/dlls/uiautomationcore/uiautomationcore.spec +++ b/dlls/uiautomationcore/uiautomationcore.spec @@ -86,7 +86,7 @@ #@ stub UiaProviderFromIAccessible @ stub UiaRaiseAsyncContentLoadedEvent @ stdcall UiaRaiseAutomationEvent(ptr long) -@ stub UiaRaiseAutomationPropertyChangedEvent +@ stdcall UiaRaiseAutomationPropertyChangedEvent(ptr long int128 int128) #@ stub UiaRaiseChangesEvent #@ stub UiaRaiseNotificationEvent @ stub UiaRaiseStructureChangedEvent diff --git a/include/uiautomationcoreapi.h b/include/uiautomationcoreapi.h index de486710158..563d5c602bd 100644 --- a/include/uiautomationcoreapi.h +++ b/include/uiautomationcoreapi.h @@ -66,6 +66,7 @@ HRESULT WINAPI UiaGetReservedNotSupportedValue(IUnknown **value); int WINAPI UiaLookupId(enum AutomationIdentifierType type, const GUID *guid); BOOL WINAPI UiaPatternRelease(HUIAPATTERNOBJECT hobj); HRESULT WINAPI UiaRaiseAutomationEvent(IRawElementProviderSimple *provider, EVENTID id); +HRESULT WINAPI UiaRaiseAutomationPropertyChangedEvent(IRawElementProviderSimple *provider, PROPERTYID id, VARIANT old, VARIANT new); void WINAPI UiaRegisterProviderCallback(UiaProviderCallback *pCallback); LRESULT WINAPI UiaReturnRawElementProvider(HWND hwnd, WPARAM wParam, LPARAM lParam, IRawElementProviderSimple *elprov); BOOL WINAPI UiaTextRangeRelease(HUIATEXTRANGE hobj);

1 0

Zhiyi Zhang : uxtheme: Call DefDlgProc() if drawing tab body in a dialog fails.
by Alexandre Julliard Dec. 1, 2021

Dec. 1, 2021

Module: wine Branch: master Commit: 5cdbcb0f59241d903da00bd0bbd642e224f0bdde URL: https://source.winehq.org/git/wine.git/?a=commit;h=5cdbcb0f59241d903da00bd0… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Nov 30 14:50:40 2021 +0800 uxtheme: Call DefDlgProc() if drawing tab body in a dialog fails. Some third party themes have tab body part defined but with its ImageSelectType set to IST_NONE. In this case, DrawThemeBackground() will fail to draw the background. Fix track bar black background in winecfg when using VLT theme. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/dialog.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/uxtheme/dialog.c b/dlls/uxtheme/dialog.c index a949bfc6579..d0055e013a0 100644 --- a/dlls/uxtheme/dialog.c +++ b/dlls/uxtheme/dialog.c @@ -38,8 +38,9 @@ LRESULT WINAPI UXTHEME_DefDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPa static const WCHAR themeClass[] = L"Window"; BOOL themingActive = IsThemeDialogTextureEnabled (hWnd); BOOL doTheming = themingActive && (theme != NULL); + HRESULT hr = E_FAIL; LRESULT result; - + switch (msg) { case WM_CREATE: @@ -78,13 +79,11 @@ LRESULT WINAPI UXTHEME_DefDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPa NULL); #endif return user_api.pDefDlgProc(hWnd, msg, wParam, lParam, unicode); - else - /* We might have gotten a TAB theme class, so check if we can - * draw as a tab page. */ - if (IsThemePartDefined (theme, TABP_BODY, 0)) - DrawThemeBackground (theme, (HDC)wParam, TABP_BODY, 0, &rc, - NULL); - else + /* We might have gotten a TAB theme class, so check if we can draw as a tab page */ + else if (IsThemePartDefined(theme, TABP_BODY, 0)) + hr = DrawThemeBackground(theme, (HDC)wParam, TABP_BODY, 0, &rc, NULL); + + if (FAILED(hr)) return user_api.pDefDlgProc(hWnd, msg, wParam, lParam, unicode); } return 1;

1 0

Rémi Bernon : dinput: Improve GetForceFeedbackState / GetEffectStatus stubs.
by Alexandre Julliard Dec. 1, 2021

Dec. 1, 2021

Module: wine Branch: master Commit: 550511855b72f49a9e81c453708ef26bf2329aab URL: https://source.winehq.org/git/wine.git/?a=commit;h=550511855b72f49a9e81c453… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Dec 1 12:44:58 2021 +0100 dinput: Improve GetForceFeedbackState / GetEffectStatus stubs. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52062 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device.c | 12 ++++++++++-- dlls/dinput/device_private.h | 1 + dlls/dinput/joystick_hid.c | 22 ++++++++++++++++++++-- dlls/dinput8/tests/hid.c | 18 ------------------ 4 files changed, 31 insertions(+), 22 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=550511855b72f49a9e81…

1 0

Rémi Bernon : dinput8/tests: Add dwStartDelay / dwDuration GetEffectStatus tests.
by Alexandre Julliard Dec. 1, 2021

Dec. 1, 2021

Module: wine Branch: master Commit: 93bdf0d0989a940fe17cdce56dbba5e6492f140a URL: https://source.winehq.org/git/wine.git/?a=commit;h=93bdf0d0989a940fe17cdce5… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Dec 1 12:44:55 2021 +0100 dinput8/tests: Add dwStartDelay / dwDuration GetEffectStatus tests. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52062 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/hid.c | 129 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 129 insertions(+) diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index 57e5672bd92..d0ca3746e96 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -8637,6 +8637,82 @@ static void test_device_managed_effect(void) .report_buf = {3,0x01,0x03,0x08,0x01,0x00,0x06,0x00,0x01,0x55,0x00}, }, }; + struct hid_expect expect_create_delay[] = + { + /* create new effect */ + { + .code = IOCTL_HID_SET_FEATURE, + .report_id = 2, + .report_len = 2, + .report_buf = {2,0x03}, + }, + /* block load */ + { + .code = IOCTL_HID_GET_FEATURE, + .report_id = 3, + .report_len = 5, + .report_buf = {3,0x01,0x01,0x00,0x00}, + }, + /* set condition */ + { + .code = IOCTL_HID_WRITE_REPORT, + .report_id = 4, + .report_len = 8, + .report_buf = {4,0x00,0xf9,0x19,0xd9,0xff,0xff,0x99}, + }, + /* set condition */ + { + .code = IOCTL_HID_WRITE_REPORT, + .report_id = 4, + .report_len = 8, + .report_buf = {4,0x00,0x4c,0x3f,0xcc,0x4c,0x33,0x19}, + }, + /* update effect */ + { + .code = IOCTL_HID_WRITE_REPORT, + .report_id = 3, + .report_len = 11, + .report_buf = {3,0x01,0x03,0x08,0x01,0x00,0xff,0x7f,0x01,0x55,0x00}, + }, + }; + struct hid_expect expect_create_duration[] = + { + /* create new effect */ + { + .code = IOCTL_HID_SET_FEATURE, + .report_id = 2, + .report_len = 2, + .report_buf = {2,0x03}, + }, + /* block load */ + { + .code = IOCTL_HID_GET_FEATURE, + .report_id = 3, + .report_len = 5, + .report_buf = {3,0x01,0x01,0x00,0x00}, + }, + /* set condition */ + { + .code = IOCTL_HID_WRITE_REPORT, + .report_id = 4, + .report_len = 8, + .report_buf = {4,0x00,0xf9,0x19,0xd9,0xff,0xff,0x99}, + }, + /* set condition */ + { + .code = IOCTL_HID_WRITE_REPORT, + .report_id = 4, + .report_len = 8, + .report_buf = {4,0x00,0x4c,0x3f,0xcc,0x4c,0x33,0x19}, + }, + /* update effect */ + { + .code = IOCTL_HID_WRITE_REPORT, + .report_id = 3, + .report_len = 11, + .report_buf = {3,0x01,0x03,0x08,0x00,0x00,0x00,0x00,0x01,0x55,0x00}, + }, + }; struct hid_expect expect_start = { /* effect control */ @@ -8827,6 +8903,7 @@ static void test_device_managed_effect(void) IDirectInputEffect *effect; HANDLE file, event; ULONG res, ref; + DIEFFECT desc; DWORD flags; HRESULT hr; HWND hwnd; @@ -9060,6 +9137,58 @@ static void test_device_managed_effect(void) ref = IDirectInputEffect_Release( effect ); ok( ref == 0, "Release returned %d\n", ref ); + /* start delay has no direct effect on effect status */ + desc = expect_desc; + desc.dwStartDelay = 32767000; + set_hid_expect( file, expect_create_delay, sizeof(expect_create_delay) ); + hr = IDirectInputDevice8_CreateEffect( device, &GUID_Spring, &desc, &effect, NULL ); + ok( hr == DI_OK, "CreateEffect returned %#x\n", hr ); + set_hid_expect( file, NULL, 0 ); + res = 0xdeadbeef; + hr = IDirectInputEffect_GetEffectStatus( effect, &res ); + ok( hr == DI_OK, "GetEffectStatus returned %#x\n", hr ); + ok( res == 0, "got status %#x\n", res ); + set_hid_expect( file, &expect_start, sizeof(expect_start) ); + hr = IDirectInputEffect_Start( effect, 1, 0 ); + ok( hr == DI_OK, "Start returned %#x\n", hr ); + set_hid_expect( file, NULL, 0 ); + res = 0xdeadbeef; + hr = IDirectInputEffect_GetEffectStatus( effect, &res ); + ok( hr == DI_OK, "GetEffectStatus returned %#x\n", hr ); + todo_wine + ok( res == DIEGES_PLAYING, "got status %#x\n", res ); + set_hid_expect( file, expect_destroy, sizeof(expect_destroy) ); + ref = IDirectInputEffect_Release( effect ); + ok( ref == 0, "Release returned %d\n", ref ); + set_hid_expect( file, NULL, 0 ); + + /* duration has no direct effect on effect status */ + desc = expect_desc; + desc.dwDuration = 100; + desc.dwStartDelay = 0; + set_hid_expect( file, expect_create_duration, sizeof(expect_create_duration) ); + hr = IDirectInputDevice8_CreateEffect( device, &GUID_Spring, &desc, &effect, NULL ); + ok( hr == DI_OK, "CreateEffect returned %#x\n", hr ); + set_hid_expect( file, NULL, 0 ); + res = 0xdeadbeef; + hr = IDirectInputEffect_GetEffectStatus( effect, &res ); + ok( hr == DI_OK, "GetEffectStatus returned %#x\n", hr ); + ok( res == 0, "got status %#x\n", res ); + set_hid_expect( file, &expect_start, sizeof(expect_start) ); + hr = IDirectInputEffect_Start( effect, 1, 0 ); + ok( hr == DI_OK, "Start returned %#x\n", hr ); + set_hid_expect( file, NULL, 0 ); + Sleep( 100 ); + res = 0xdeadbeef; + hr = IDirectInputEffect_GetEffectStatus( effect, &res ); + ok( hr == DI_OK, "GetEffectStatus returned %#x\n", hr ); + todo_wine + ok( res == DIEGES_PLAYING, "got status %#x\n", res ); + set_hid_expect( file, expect_destroy, sizeof(expect_destroy) ); + ref = IDirectInputEffect_Release( effect ); + ok( ref == 0, "Release returned %d\n", ref ); + set_hid_expect( file, NULL, 0 ); + set_hid_expect( file, expect_reset, sizeof(struct hid_expect) ); hr = IDirectInputDevice8_Unacquire( device ); ok( hr == DI_OK, "Unacquire returned: %#x\n", hr );

1 0

Zebediah Figura : wined3d: Always set GL_PIXEL_UNPACK_BUFFER binding in glsl_blitter_upload_palette().
by Alexandre Julliard Dec. 1, 2021

Dec. 1, 2021

Module: wine Branch: master Commit: 669360152ebb2d0e0b9a0c0fa6f4bf044363b40a URL: https://source.winehq.org/git/wine.git/?a=commit;h=669360152ebb2d0e0b9a0c0f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Nov 30 17:55:18 2021 -0600 wined3d: Always set GL_PIXEL_UNPACK_BUFFER binding in glsl_blitter_upload_palette(). Signed-off-by: Zebediah Figura <zfigura(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 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 4e51402f1cf..327e73796c8 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -12956,6 +12956,9 @@ static void glsl_blitter_upload_palette(struct wined3d_glsl_blitter *blitter, gl_info->gl_ops.gl.p_glTexParameteri(GL_TEXTURE_1D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); gl_info->gl_ops.gl.p_glTexParameteri(GL_TEXTURE_1D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); + GL_EXTCALL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0)); + checkGLcall("glBindBuffer"); + if (palette) { gl_info->gl_ops.gl.p_glTexImage1D(GL_TEXTURE_1D, 0, GL_RGB, 256, 0, GL_BGRA,

1 0

Zebediah Figura : wined3d: Always set GL_PIXEL_UNPACK_BUFFER binding in wined3d_texture_gl_allocate_mutable_storage().
by Alexandre Julliard Dec. 1, 2021

Dec. 1, 2021

Module: wine Branch: master Commit: 21481acaf3ee902705f2a5210d22e73566b77bc9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=21481acaf3ee902705f2a521… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Nov 30 17:55:17 2021 -0600 wined3d: Always set GL_PIXEL_UNPACK_BUFFER binding in wined3d_texture_gl_allocate_mutable_storage(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index d4c7082912b..f0ef42065d3 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -930,6 +930,9 @@ static void wined3d_texture_gl_allocate_mutable_storage(struct wined3d_texture_g else layer_count = texture_gl->t.layer_count; + GL_EXTCALL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0)); + checkGLcall("glBindBuffer"); + for (layer = 0; layer < layer_count; ++layer) { target = wined3d_texture_gl_get_sub_resource_target(texture_gl, layer * level_count);

1 0

Ivo Ivanov : dinput8/tests: Add some more GetForceFeedbackState / GetEffectStatus tests.
by Alexandre Julliard Dec. 1, 2021

Dec. 1, 2021

Module: wine Branch: master Commit: 332456935fb483efe060c15d29554c1f4434a49f URL: https://source.winehq.org/git/wine.git/?a=commit;h=332456935fb483efe060c15d… Author: Ivo Ivanov <logos128(a)gmail.com> Date: Wed Dec 1 12:44:56 2021 +0100 dinput8/tests: Add some more GetForceFeedbackState / GetEffectStatus tests. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52062 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/hid.c | 403 +++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 375 insertions(+), 28 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=332456935fb483efe060…

1 0

Henri Verbeet : wined3d: Do not pass an offset and size to wined3d_bo_gl_map().
by Alexandre Julliard Dec. 1, 2021

Dec. 1, 2021

Module: wine Branch: master Commit: 45fc3cbf1263ac705f752601a30b07237ab230dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=45fc3cbf1263ac705f752601… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 30 17:55:21 2021 -0600 wined3d: Do not pass an offset and size to wined3d_bo_gl_map(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_gl.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 700ccace2e5..0c8ee0f605b 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -2669,8 +2669,7 @@ void wined3d_context_gl_submit_command_fence(struct wined3d_context_gl *context_ wined3d_context_gl_poll_fences(context_gl); } -static void *wined3d_bo_gl_map(struct wined3d_bo_gl *bo, - struct wined3d_context_gl *context_gl, size_t offset, size_t size, uint32_t flags) +static void *wined3d_bo_gl_map(struct wined3d_bo_gl *bo, struct wined3d_context_gl *context_gl, uint32_t flags) { struct wined3d_device_gl *device_gl = wined3d_device_gl(context_gl->c.device); const struct wined3d_gl_info *gl_info; @@ -2712,13 +2711,11 @@ map: if (gl_info->supported[ARB_MAP_BUFFER_RANGE]) { - if ((map_ptr = GL_EXTCALL(glMapBufferRange(bo->binding, 0, bo->size, wined3d_resource_gl_map_flags(bo, flags))))) - map_ptr += offset; + map_ptr = GL_EXTCALL(glMapBufferRange(bo->binding, 0, bo->size, wined3d_resource_gl_map_flags(bo, flags))); } else { - if ((map_ptr = GL_EXTCALL(glMapBuffer(bo->binding, wined3d_resource_gl_legacy_map_flags(flags))))) - map_ptr += offset; + map_ptr = GL_EXTCALL(glMapBuffer(bo->binding, wined3d_resource_gl_legacy_map_flags(flags))); } wined3d_context_gl_bind_bo(context_gl, bo->binding, 0); @@ -2736,10 +2733,13 @@ void *wined3d_context_gl_map_bo_address(struct wined3d_context_gl *context_gl, if (!(bo = data->buffer_object)) return data->addr; - if (!(map_ptr = wined3d_bo_gl_map(wined3d_bo_gl(bo), context_gl, (uintptr_t)data->addr, size, flags))) + if (!(map_ptr = wined3d_bo_gl_map(wined3d_bo_gl(bo), context_gl, flags))) + { ERR("Failed to map bo.\n"); + return NULL; + } - return map_ptr; + return (uint8_t *)map_ptr + (uintptr_t)data->addr; } static void flush_bo_ranges(struct wined3d_context_gl *context_gl, const struct wined3d_const_bo_address *data,

1 0

Henri Verbeet : wined3d: Don't return the BO address offset if glMapBuffer() fails.
by Alexandre Julliard Dec. 1, 2021

Dec. 1, 2021

Module: wine Branch: master Commit: 4ff480b2a2c838b968abf8e2d4f07e63988b8437 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ff480b2a2c838b968abf8e2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 30 17:55:19 2021 -0600 wined3d: Don't return the BO address offset if glMapBuffer() fails. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_gl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 0b0d594b4b1..675c26ac6fe 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -2716,8 +2716,8 @@ map: } else { - map_ptr = GL_EXTCALL(glMapBuffer(bo->binding, wined3d_resource_gl_legacy_map_flags(flags))); - map_ptr += offset; + if ((map_ptr = GL_EXTCALL(glMapBuffer(bo->binding, wined3d_resource_gl_legacy_map_flags(flags))))) + map_ptr += offset; } wined3d_context_gl_bind_bo(context_gl, bo->binding, 0);

1 0