wine-commits May 2018

wine-commits@winehq.org

2 participants
716 discussions

Zebediah Figura : msi: Handle the remote case directly in MsiGetTargetPathA().
by Alexandre Julliard 18 May '18

18 May '18

Module: wine Branch: master Commit: c9fc3510218f3426b9b448b4569ff4fd275044f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c9fc3510218f3426b9b448b4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 17 10:48:16 2018 -0500 msi: Handle the remote case directly in MsiGetTargetPathA(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/install.c | 48 ++++++++++++++++++++++++++++++++++++------------ dlls/msi/tests/custom.c | 8 ++++---- 2 files changed, 40 insertions(+), 16 deletions(-) diff --git a/dlls/msi/install.c b/dlls/msi/install.c index b54daff..93f9cce 100644 --- a/dlls/msi/install.c +++ b/dlls/msi/install.c @@ -271,26 +271,50 @@ static UINT MSI_GetTargetPath( MSIHANDLE hInstall, LPCWSTR szFolder, /*********************************************************************** * MsiGetTargetPathA (MSI.@) */ -UINT WINAPI MsiGetTargetPathA( MSIHANDLE hInstall, LPCSTR szFolder, - LPSTR szPathBuf, LPDWORD pcchPathBuf ) +UINT WINAPI MsiGetTargetPathA(MSIHANDLE hinst, const char *folder, char *buf, DWORD *sz) { - LPWSTR szwFolder; - awstring path; + MSIPACKAGE *package; + const WCHAR *path; + WCHAR *folderW; UINT r; - TRACE("%s %p %p\n", debugstr_a(szFolder), szPathBuf, pcchPathBuf); + TRACE("%s %p %p\n", debugstr_a(folder), buf, sz); - szwFolder = strdupAtoW(szFolder); - if (szFolder && !szwFolder) - return ERROR_FUNCTION_FAILED; + if (!folder) + return ERROR_INVALID_PARAMETER; + + if (!(folderW = strdupAtoW(folder))) + return ERROR_OUTOFMEMORY; + + package = msihandle2msiinfo(hinst, MSIHANDLETYPE_PACKAGE); + if (!package) + { + WCHAR *path = NULL; + MSIHANDLE remote; - path.unicode = FALSE; - path.str.a = szPathBuf; + if (!(remote = msi_get_remote(hinst))) + { + heap_free(folderW); + return ERROR_INVALID_HANDLE; + } - r = MSI_GetTargetPath( hInstall, szwFolder, &path, pcchPathBuf ); + r = remote_GetTargetPath(remote, folderW, &path); + if (!r) + r = msi_strncpyWtoA(path, -1, buf, sz, TRUE); - msi_free( szwFolder ); + midl_user_free(path); + heap_free(folderW); + return r; + } + path = msi_get_target_folder(package, folderW); + if (path) + r = msi_strncpyWtoA(path, -1, buf, sz, FALSE); + else + r = ERROR_DIRECTORY; + + heap_free(folderW); + msiobj_release(&package->hdr); return r; } diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index d240964..4e42eed 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -485,28 +485,28 @@ static void test_targetpath(MSIHANDLE hinst) sz = 0; r = MsiGetTargetPathA(hinst, "TARGETDIR", NULL, &sz); ok(hinst, !r, "got %u\n", r); - todo_wine_ok(hinst, sz == 6, "got size %u\n", sz); + ok(hinst, sz == 6, "got size %u\n", sz); sz = 0; strcpy(buffer,"q"); r = MsiGetTargetPathA(hinst, "TARGETDIR", buffer, &sz); ok(hinst, r == ERROR_MORE_DATA, "got %u\n", r); ok(hinst, !strcmp(buffer, "q"), "got \"%s\"\n", buffer); - todo_wine_ok(hinst, sz == 6, "got size %u\n", sz); + ok(hinst, sz == 6, "got size %u\n", sz); sz = 1; strcpy(buffer,"x"); r = MsiGetTargetPathA(hinst, "TARGETDIR", buffer, &sz); ok(hinst, r == ERROR_MORE_DATA, "got %u\n", r); ok(hinst, !buffer[0], "got \"%s\"\n", buffer); - todo_wine_ok(hinst, sz == 6, "got size %u\n", sz); + ok(hinst, sz == 6, "got size %u\n", sz); sz = 3; strcpy(buffer,"x"); r = MsiGetTargetPathA(hinst, "TARGETDIR", buffer, &sz); ok(hinst, r == ERROR_MORE_DATA, "got %u\n", r); ok(hinst, !strcmp(buffer, "C:"), "got \"%s\"\n", buffer); - todo_wine_ok(hinst, sz == 6, "got size %u\n", sz); + ok(hinst, sz == 6, "got size %u\n", sz); sz = 4; strcpy(buffer,"x");

1 0

Zebediah Figura : msi: Avoid leaking memory on failure paths in MsiGetPropertyA().
by Alexandre Julliard 18 May '18

18 May '18

Module: wine Branch: master Commit: 2e2934e455318c2753741a051876bc0a3c2399fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e2934e455318c2753741a05… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 17 10:48:15 2018 -0500 msi: Avoid leaking memory on failure paths in MsiGetPropertyA(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/package.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index ab6c3dd..2801efa 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -2368,9 +2368,14 @@ UINT WINAPI MsiGetPropertyA(MSIHANDLE hinst, const char *name, char *buf, DWORD DWORD len; if (!(remote = msi_get_remote(hinst))) + { + heap_free(nameW); return ERROR_INVALID_HANDLE; + } r = remote_GetProperty(remote, nameW, &value, &len); + heap_free(nameW); + if (!r) { /* String might contain embedded nulls. @@ -2388,7 +2393,6 @@ UINT WINAPI MsiGetPropertyA(MSIHANDLE hinst, const char *name, char *buf, DWORD heap_free(tmp); } midl_user_free(value); - heap_free(nameW); return r; }

1 0

Jacek Caban : mshtml: Implement supported IHTMLWindow7 event properties.
by Alexandre Julliard 18 May '18

18 May '18

Module: wine Branch: master Commit: b86825acf72e1dc8ee4df9901ba531c8bae031d4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b86825acf72e1dc8ee4df990… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 17 16:22:18 2018 +0200 mshtml: Implement supported IHTMLWindow7 event properties. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlwindow.c | 50 +++++++++++++++++++++++++++++++----------------- 1 file changed, 32 insertions(+), 18 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 9206a32..e198ed1 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -2383,7 +2383,21 @@ static HRESULT WINAPI HTMLWindow7_get_outerHeight(IHTMLWindow7 *iface, LONG *p) return E_NOTIMPL; } -#define HTMLWINDOW7_ONEVENT_PROPERTY_STUB(name) \ +#define HTMLWINDOW7_ONEVENT_PROPERTY_IMPL(name, event_id) \ + static HRESULT WINAPI HTMLWindow7_put_on##name(IHTMLWindow7 *iface, VARIANT v) \ + { \ + HTMLWindow *This = impl_from_IHTMLWindow7(iface); \ + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); \ + return set_window_event(This, event_id, &v); \ + } \ + static HRESULT WINAPI HTMLWindow7_get_on##name(IHTMLWindow7 *iface, VARIANT *p) \ + { \ + HTMLWindow *This = impl_from_IHTMLWindow7(iface); \ + TRACE("(%p)->(%p)\n", This, p); \ + return get_window_event(This, event_id, p); \ + } + +#define HTMLWINDOW7_ONEVENT_PROPERTY_STUB(name) \ static HRESULT WINAPI HTMLWindow7_put_on##name(IHTMLWindow7 *iface, VARIANT v) \ { \ HTMLWindow *This = impl_from_IHTMLWindow7(iface); \ @@ -2397,52 +2411,52 @@ static HRESULT WINAPI HTMLWindow7_get_outerHeight(IHTMLWindow7 *iface, LONG *p) return E_NOTIMPL; \ } -HTMLWINDOW7_ONEVENT_PROPERTY_STUB(abort) +HTMLWINDOW7_ONEVENT_PROPERTY_IMPL(abort, EVENTID_ABORT) HTMLWINDOW7_ONEVENT_PROPERTY_STUB(canplay) HTMLWINDOW7_ONEVENT_PROPERTY_STUB(canplaythrough) HTMLWINDOW7_ONEVENT_PROPERTY_STUB(change) HTMLWINDOW7_ONEVENT_PROPERTY_STUB(click) -HTMLWINDOW7_ONEVENT_PROPERTY_STUB(contextmenu) -HTMLWINDOW7_ONEVENT_PROPERTY_STUB(dblclick) -HTMLWINDOW7_ONEVENT_PROPERTY_STUB(drag) +HTMLWINDOW7_ONEVENT_PROPERTY_IMPL(contextmenu, EVENTID_CONTEXTMENU) +HTMLWINDOW7_ONEVENT_PROPERTY_IMPL(dblclick, EVENTID_DBLCLICK) +HTMLWINDOW7_ONEVENT_PROPERTY_IMPL(drag, EVENTID_DRAG) HTMLWINDOW7_ONEVENT_PROPERTY_STUB(dragend) HTMLWINDOW7_ONEVENT_PROPERTY_STUB(dragenter) HTMLWINDOW7_ONEVENT_PROPERTY_STUB(dragleave) HTMLWINDOW7_ONEVENT_PROPERTY_STUB(dragover) -HTMLWINDOW7_ONEVENT_PROPERTY_STUB(dragstart) +HTMLWINDOW7_ONEVENT_PROPERTY_IMPL(dragstart, EVENTID_DRAGSTART) HTMLWINDOW7_ONEVENT_PROPERTY_STUB(drop) HTMLWINDOW7_ONEVENT_PROPERTY_STUB(durationchange) -HTMLWINDOW7_ONEVENT_PROPERTY_STUB(focusin) -HTMLWINDOW7_ONEVENT_PROPERTY_STUB(focusout) +HTMLWINDOW7_ONEVENT_PROPERTY_IMPL(focusin, EVENTID_FOCUSIN) +HTMLWINDOW7_ONEVENT_PROPERTY_IMPL(focusout, EVENTID_FOCUSOUT) HTMLWINDOW7_ONEVENT_PROPERTY_STUB(input) HTMLWINDOW7_ONEVENT_PROPERTY_STUB(emptied) HTMLWINDOW7_ONEVENT_PROPERTY_STUB(ended) -HTMLWINDOW7_ONEVENT_PROPERTY_STUB(keydown) -HTMLWINDOW7_ONEVENT_PROPERTY_STUB(keypress) +HTMLWINDOW7_ONEVENT_PROPERTY_IMPL(keydown, EVENTID_KEYDOWN) +HTMLWINDOW7_ONEVENT_PROPERTY_IMPL(keypress, EVENTID_KEYPRESS) HTMLWINDOW7_ONEVENT_PROPERTY_STUB(keyup) HTMLWINDOW7_ONEVENT_PROPERTY_STUB(loadeddata) HTMLWINDOW7_ONEVENT_PROPERTY_STUB(loadedmetadata) HTMLWINDOW7_ONEVENT_PROPERTY_STUB(loadstart) -HTMLWINDOW7_ONEVENT_PROPERTY_STUB(mousedown) +HTMLWINDOW7_ONEVENT_PROPERTY_IMPL(mousedown, EVENTID_MOUSEDOWN) HTMLWINDOW7_ONEVENT_PROPERTY_STUB(mouseenter) HTMLWINDOW7_ONEVENT_PROPERTY_STUB(mouseleave) -HTMLWINDOW7_ONEVENT_PROPERTY_STUB(mousemove) -HTMLWINDOW7_ONEVENT_PROPERTY_STUB(mouseout) -HTMLWINDOW7_ONEVENT_PROPERTY_STUB(mouseover) -HTMLWINDOW7_ONEVENT_PROPERTY_STUB(mouseup) -HTMLWINDOW7_ONEVENT_PROPERTY_STUB(mousewheel) +HTMLWINDOW7_ONEVENT_PROPERTY_IMPL(mousemove, EVENTID_MOUSEMOVE) +HTMLWINDOW7_ONEVENT_PROPERTY_IMPL(mouseout, EVENTID_MOUSEOUT) +HTMLWINDOW7_ONEVENT_PROPERTY_IMPL(mouseover, EVENTID_MOUSEOVER) +HTMLWINDOW7_ONEVENT_PROPERTY_IMPL(mouseup, EVENTID_MOUSEUP) +HTMLWINDOW7_ONEVENT_PROPERTY_IMPL(mousewheel, EVENTID_MOUSEWHEEL) HTMLWINDOW7_ONEVENT_PROPERTY_STUB(offline) HTMLWINDOW7_ONEVENT_PROPERTY_STUB(online) HTMLWINDOW7_ONEVENT_PROPERTY_STUB(progress) HTMLWINDOW7_ONEVENT_PROPERTY_STUB(ratechange) -HTMLWINDOW7_ONEVENT_PROPERTY_STUB(readystatechange) +HTMLWINDOW7_ONEVENT_PROPERTY_IMPL(readystatechange, EVENTID_READYSTATECHANGE) HTMLWINDOW7_ONEVENT_PROPERTY_STUB(reset) HTMLWINDOW7_ONEVENT_PROPERTY_STUB(seeked) HTMLWINDOW7_ONEVENT_PROPERTY_STUB(seeking) HTMLWINDOW7_ONEVENT_PROPERTY_STUB(select) HTMLWINDOW7_ONEVENT_PROPERTY_STUB(stalled) HTMLWINDOW7_ONEVENT_PROPERTY_STUB(storage) -HTMLWINDOW7_ONEVENT_PROPERTY_STUB(submit) +HTMLWINDOW7_ONEVENT_PROPERTY_IMPL(submit, EVENTID_SUBMIT) HTMLWINDOW7_ONEVENT_PROPERTY_STUB(suspend) HTMLWINDOW7_ONEVENT_PROPERTY_STUB(timeupdate) HTMLWINDOW7_ONEVENT_PROPERTY_STUB(pause)

1 0

Jacek Caban : mshtml: Added IHTMLWindow7 stub implementation.
by Alexandre Julliard 18 May '18

18 May '18

Module: wine Branch: master Commit: a30a4452145698841d27e35b744c1c463ab49125 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a30a4452145698841d27e35b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 17 16:22:09 2018 +0200 mshtml: Added IHTMLWindow7 stub implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlwindow.c | 347 +++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 2 + 2 files changed, 349 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a30a4452145698841d27…

1 0

Jacek Caban : mshtml.idl: Added IHTMLWindow7 declaration.
by Alexandre Julliard 18 May '18

18 May '18

Module: wine Branch: master Commit: a0dfc95f452f89b854ac6e177e24f78a240e6f18 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a0dfc95f452f89b854ac6e17… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 17 16:21:52 2018 +0200 mshtml.idl: Added IHTMLWindow7 declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mshtmdid.h | 71 ++++ include/mshtml.idl | 1170 ++++++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 1211 insertions(+), 30 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a0dfc95f452f89b854ac…

1 0

Józef Kucia : dxgi/tests: Add test for creating swapchains for windows with empty client rect.
by Alexandre Julliard 18 May '18

18 May '18

Module: wine Branch: master Commit: 9f96ada78abd7c9d28d482127d48e23931ca2672 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f96ada78abd7c9d28d48212… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu May 17 15:46:55 2018 +0200 dxgi/tests: Add test for creating swapchains for windows with empty client rect. 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/dxgi/tests/device.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index 3ad9683..b18ee59 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -1385,6 +1385,29 @@ static void test_create_swapchain(void) expected_width = expected_client_rect->right; expected_height = expected_client_rect->bottom; + creation_desc.BufferDesc.Width = 0; + creation_desc.BufferDesc.Height = 0; + hr = IDXGIFactory_CreateSwapChain(factory, obj, &creation_desc, &swapchain); + ok(SUCCEEDED(hr), "CreateSwapChain failed, hr %#x.\n", hr); + hr = IDXGISwapChain_GetDesc(swapchain, &result_desc); + ok(SUCCEEDED(hr), "GetDesc failed, hr %#x.\n", hr); + ok(result_desc.BufferDesc.Width == expected_width, "Got width %u, expected %u.\n", + result_desc.BufferDesc.Width, expected_width); + ok(result_desc.BufferDesc.Height == expected_height, "Got height %u, expected %u.\n", + result_desc.BufferDesc.Height, expected_height); + check_swapchain_fullscreen_state(swapchain, &expected_state); + IDXGISwapChain_Release(swapchain); + + DestroyWindow(creation_desc.OutputWindow); + creation_desc.OutputWindow = CreateWindowA("static", "dxgi_test", + WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN, + 1, 1, 0, 0, 0, 0, 0, 0); + SetRect(&expected_state.fullscreen_state.window_rect, 1, 1, 1, 1); + SetRectEmpty(expected_client_rect); + expected_width = expected_height = 8; + + creation_desc.BufferDesc.Width = 0; + creation_desc.BufferDesc.Height = 0; hr = IDXGIFactory_CreateSwapChain(factory, obj, &creation_desc, &swapchain); ok(SUCCEEDED(hr), "CreateSwapChain failed, hr %#x.\n", hr); hr = IDXGISwapChain_GetDesc(swapchain, &result_desc);

1 0

Józef Kucia : wined3d: Allow creating swapchains for windows with empty client rect.
by Alexandre Julliard 18 May '18

18 May '18

Module: wine Branch: master Commit: 1cc74ea21582f3ad6a50183b261b494b86312135 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1cc74ea21582f3ad6a50183b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu May 17 15:46:54 2018 +0200 wined3d: Allow creating swapchains for windows with empty client rect. 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/swapchain.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index ea93212..7a3f1ff 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -796,15 +796,16 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3 GetClientRect(window, &client_rect); if (desc->windowed) { + TRACE("Client rect %s.\n", wine_dbgstr_rect(&client_rect)); + if (!desc->backbuffer_width) { - desc->backbuffer_width = client_rect.right; + desc->backbuffer_width = client_rect.right ? client_rect.right : 8; TRACE("Updating width to %u.\n", desc->backbuffer_width); } - if (!desc->backbuffer_height) { - desc->backbuffer_height = client_rect.bottom; + desc->backbuffer_height = client_rect.bottom ? client_rect.bottom : 8; TRACE("Updating height to %u.\n", desc->backbuffer_height); }

1 0

Józef Kucia : d3d11/tests: Add test for sample shading.
by Alexandre Julliard 18 May '18

18 May '18

Module: wine Branch: master Commit: e9488b0490e694c71ac076c02f18ad9b83a9377c URL: https://source.winehq.org/git/wine.git/?a=commit;h=e9488b0490e694c71ac076c0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu May 17 13:17:41 2018 +0200 d3d11/tests: Add test for sample shading. Verifies if pixel shader is executed per sample or per pixel. 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/d3d11/tests/d3d11.c | 450 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 450 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e9488b0490e694c71ac0…

1 0

Józef Kucia : wined3d: Get rid of MAX_MULTISAMPLE_TYPES.
by Alexandre Julliard 18 May '18

18 May '18

Module: wine Branch: master Commit: 087730c057315c44f3abbea6885b278692cabb62 URL: https://source.winehq.org/git/wine.git/?a=commit;h=087730c057315c44f3abbea6… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu May 17 13:17:40 2018 +0200 wined3d: Get rid of MAX_MULTISAMPLE_TYPES. 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/utils.c | 6 ++++-- dlls/wined3d/wined3d_private.h | 1 - 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 49b08bf..655fdb1 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -2756,7 +2756,7 @@ static void query_internal_format(struct wined3d_adapter *adapter, struct wined3d_format *format, const struct wined3d_format_texture_info *texture_info, struct wined3d_gl_info *gl_info, BOOL srgb_write_supported, BOOL srgb_format) { - GLint count, multisample_types[MAX_MULTISAMPLE_TYPES]; + GLint count, multisample_types[8]; unsigned int i, max_log2; GLenum target; @@ -2835,7 +2835,9 @@ static void query_internal_format(struct wined3d_adapter *adapter, count = 0; GL_EXTCALL(glGetInternalformativ(target, format->glInternal, GL_NUM_SAMPLE_COUNTS, 1, &count)); - count = min(count, MAX_MULTISAMPLE_TYPES); + if (count > ARRAY_SIZE(multisample_types)) + FIXME("Unexpectedly high number of multisample types %d.\n", count); + count = min(count, ARRAY_SIZE(multisample_types)); GL_EXTCALL(glGetInternalformativ(target, format->glInternal, GL_SAMPLES, count, multisample_types)); checkGLcall("query sample counts"); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f40d163..3e344a5 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -275,7 +275,6 @@ static inline enum complex_fixup get_complex_fixup(struct color_fixup_desc fixup #define MAX_UNORDERED_ACCESS_VIEWS 8 #define MAX_TGSM_REGISTERS 8192 #define MAX_VERTEX_BLENDS 4 -#define MAX_MULTISAMPLE_TYPES 8 struct min_lookup {

1 0

Matteo Bruni : wined3d: Map glMinSampleShadingARB() to glMinSampleShading( ).
by Alexandre Julliard 18 May '18

18 May '18

Module: wine Branch: master Commit: 2bd87c4d2b4f9088a5e86803b030ba51d91bfb91 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2bd87c4d2b4f9088a5e86803… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu May 17 13:17:39 2018 +0200 wined3d: Map glMinSampleShadingARB() to glMinSampleShading(). 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/directx.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index e125c5f..32c2552 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3407,6 +3407,7 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) MAP_GL_FUNCTION(glIsEnabledi, glIsEnabledIndexedEXT); MAP_GL_FUNCTION(glLinkProgram, glLinkProgramARB); MAP_GL_FUNCTION(glMapBuffer, glMapBufferARB); + MAP_GL_FUNCTION(glMinSampleShading, glMinSampleShadingARB); MAP_GL_FUNCTION_CAST(glShaderSource, glShaderSourceARB); MAP_GL_FUNCTION(glTexBuffer, glTexBufferARB); MAP_GL_FUNCTION_CAST(glTexImage3D, glTexImage3DEXT);

1 0

← Newer
1
...
28
29
30
31
32
33
34
...
72
Older →

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 May 2018