June 2018 - Wine-Commits - list.winehq.org

Alistair Leslie-Hughes : pidgen: Add PIDGenSimpA stub.
by Alexandre Julliard June 26, 2018

June 26, 2018

Module: wine Branch: stable Commit: 83718a7b4a0782402553b87352bee0fe38b043a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=83718a7b4a0782402553b873… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat Mar 17 10:19:17 2018 +0000 pidgen: Add PIDGenSimpA stub. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit df408ba3abd75c10af35d647728087cf447d29b0) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/pidgen/main.c | 7 +++++++ dlls/pidgen/pidgen.spec | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/pidgen/main.c b/dlls/pidgen/main.c index 3aa3e84..cf165ea 100644 --- a/dlls/pidgen/main.c +++ b/dlls/pidgen/main.c @@ -43,3 +43,10 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) } return TRUE; } + +int WINAPI PIDGenSimpA(LPCSTR str, int p1, int p2, int p3, int p4, int p5, int p6, int p7, int p8) +{ + FIXME("%s,%d,%d,%d,%d,%d,%d,%d,%d\n", debugstr_a(str), p1, p2, p3, p4, p5, p6, p7, p8); + + return 0; +} diff --git a/dlls/pidgen/pidgen.spec b/dlls/pidgen/pidgen.spec index ad5c369..8b7e778 100644 --- a/dlls/pidgen/pidgen.spec +++ b/dlls/pidgen/pidgen.spec @@ -1,6 +1,6 @@ @ stub PIDGenA @ stub PIDGenW -@ stub PIDGenSimpA +@ stdcall PIDGenSimpA(str long long long long long long long long) @ stub PIDGenSimpW @ stub SetupPIDGenA @ stub SetupPIDGenW

1 0

Alexandre Julliard : wininet/tests: Update the winehq.org certificate data.
by Alexandre Julliard June 26, 2018

June 26, 2018

Module: wine Branch: stable Commit: 130cb57bf9e498983d3e7cfe472792894ae64d97 URL: https://source.winehq.org/git/wine.git/?a=commit;h=130cb57bf9e498983d3e7cfe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 6 15:27:49 2018 -0600 wininet/tests: Update the winehq.org certificate data. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 105b3dc8169db038b30abb653add0689dff2b89e) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wininet/tests/http.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index af78704..72121d8 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -5526,11 +5526,22 @@ typedef struct { } cert_struct_test_t; static const cert_struct_test_t test_winehq_org_cert = { + "US\r\n" + "55114\r\n" + "MN\r\n" + "Saint Paul\r\n" + "Ste 120\r\n" + "700 Raymond Ave\r\n" + "CodeWeavers\r\n" + "IT\r\n" + "Secure Link SSL Wildcard\r\n" "*.winehq.org", "US\r\n" - "GeoTrust Inc.\r\n" - "RapidSSL SHA256 CA" + "VA\r\n" + "Herndon\r\n" + "Network Solutions L.L.C.\r\n" + "Network Solutions OV Server CA 2" }; static const cert_struct_test_t test_winehq_com_cert = {

1 0

Matteo Bruni : d3dx9: Implement FindNextValidTechnique().
by Alexandre Julliard June 26, 2018

June 26, 2018

Module: wine Branch: stable Commit: 4175d27291c00e54b462824a229526fb3b28d4c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4175d27291c00e54b462824a… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Mar 22 21:43:06 2018 +0100 d3dx9: Implement FindNextValidTechnique(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit c3342644e418358e63273580f46cce2d05de9e35) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 40 ++++++++++++++++++++++++++++++++++++---- 1 file changed, 36 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index bd1a9e1..22ba691 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -3984,13 +3984,45 @@ done: return ret; } -static HRESULT WINAPI ID3DXEffectImpl_FindNextValidTechnique(ID3DXEffect* iface, D3DXHANDLE technique, D3DXHANDLE* next_technique) +static HRESULT WINAPI ID3DXEffectImpl_FindNextValidTechnique(ID3DXEffect *iface, + D3DXHANDLE technique, D3DXHANDLE *next_technique) { - struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); + struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_base_effect *base = &effect->base_effect; + struct d3dx_technique *prev_tech, *tech; + unsigned int i; - FIXME("(%p)->(%p, %p): stub\n", This, technique, next_technique); + TRACE("iface %p, technique %p, next_technique %p.\n", iface, technique, next_technique); - return E_NOTIMPL; + if (technique) + { + if (!(prev_tech = get_valid_technique(base, technique))) + return D3DERR_INVALIDCALL; + + for (i = 0; i < base->technique_count; ++i) + { + tech = &base->techniques[i]; + if (tech == prev_tech) + break; + } + } + else + { + i = 0; + } + + for (++i; i < base->technique_count; ++i) + { + tech = &base->techniques[i]; + if (SUCCEEDED(ID3DXEffectImpl_ValidateTechnique(iface, get_technique_handle(tech)))) + { + *next_technique = get_technique_handle(tech); + return D3D_OK; + } + } + + *next_technique = get_technique_handle(&base->techniques[0]); + return S_FALSE; } static BOOL walk_parameter_dep(struct d3dx_parameter *param, walk_parameter_dep_func param_func,

1 0

Johann Frei : dinput: Implement X/Y axis granularity and add test.
by Alexandre Julliard June 26, 2018

June 26, 2018

Module: wine Branch: stable Commit: 18f498f4b5e42483c08506d703312a846e461816 URL: https://source.winehq.org/git/wine.git/?a=commit;h=18f498f4b5e42483c08506d7… Author: Johann Frei <johann_frei(a)yahoo.de> Date: Tue Mar 6 20:03:41 2018 +0100 dinput: Implement X/Y axis granularity and add test. Signed-off-by: Johann Frei <johann_frei(a)yahoo.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 4bc1e172ecba43dd8a5eb341cdd8e705a314b44d) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dinput/mouse.c | 17 +++++++++++++++-- dlls/dinput/tests/mouse.c | 23 ++++++++++++++++++++++- 2 files changed, 37 insertions(+), 3 deletions(-) diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index eaec6b1..6d3eff5 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -616,8 +616,21 @@ static HRESULT WINAPI SysMouseWImpl_GetProperty(LPDIRECTINPUTDEVICE8W iface, REF case (DWORD_PTR) DIPROP_GRANULARITY: { LPDIPROPDWORD pr = (LPDIPROPDWORD) pdiph; - /* We'll just assume that the app asks about the Z axis */ - pr->dwData = WHEEL_DELTA; + if ( + ((pdiph->dwHow == DIPH_BYOFFSET) && + ((pdiph->dwObj == DIMOFS_X) || + (pdiph->dwObj == DIMOFS_Y))) + || + ((pdiph->dwHow == DIPH_BYID) && + ((pdiph->dwObj == (DIDFT_MAKEINSTANCE(WINE_MOUSE_X_AXIS_INSTANCE) | DIDFT_RELAXIS)) || + (pdiph->dwObj == (DIDFT_MAKEINSTANCE(WINE_MOUSE_Y_AXIS_INSTANCE) | DIDFT_RELAXIS)))) + ){ + /* Set granularity of X/Y Axis to 1. See MSDN on DIPROP_GRANULARITY */ + pr->dwData = 1; + } else { + /* We'll just assume that the app asks about the Z axis */ + pr->dwData = WHEEL_DELTA; + } break; } diff --git a/dlls/dinput/tests/mouse.c b/dlls/dinput/tests/mouse.c index dac7d8d..c2d0226 100644 --- a/dlls/dinput/tests/mouse.c +++ b/dlls/dinput/tests/mouse.c @@ -161,7 +161,7 @@ static void test_acquire(IDirectInputA *pDI, HWND hwnd) hr = IDirectInputDevice_GetDeviceData(pMouse, sizeof(mouse_state), &mouse_state, &cnt, 0); ok(hr == S_OK && cnt > 0, "GetDeviceData() failed: %08x cnt:%d\n", hr, cnt); - /* Check for buffer owerflow */ + /* Check for buffer overflow */ for (i = 0; i < 6; i++) mouse_event(MOUSEEVENTF_MOVE, 10 + i, 10 + i, 0, 0); @@ -172,6 +172,27 @@ static void test_acquire(IDirectInputA *pDI, HWND hwnd) hr = IDirectInputDevice_GetDeviceData(pMouse, sizeof(mouse_state), &mouse_state, &cnt, 0); ok(hr == DI_OK && cnt == 1, "GetDeviceData() failed: %08x cnt:%d\n", hr, cnt); + /* Check for granularity property using BYOFFSET */ + memset(&di_op, 0, sizeof(di_op)); + di_op.diph.dwHow = DIPH_BYOFFSET; + di_op.diph.dwObj = DIMOFS_Y; + di_op.diph.dwSize = sizeof(DIPROPDWORD); + di_op.diph.dwHeaderSize = sizeof(DIPROPHEADER); + hr = IDirectInputDevice_GetProperty(pMouse, DIPROP_GRANULARITY, &di_op.diph); + /* Granularity of Y axis should be 1! */ + ok(hr == S_OK && di_op.dwData == 1, "GetProperty(): %08x, dwData: %i but should be 1.\n", hr, di_op.dwData); + + /* Check for granularity property using BYID */ + memset(&di_op, 0, sizeof(di_op)); + di_op.diph.dwHow = DIPH_BYID; + /* WINE_MOUSE_Y_AXIS_INSTANCE := 1 */ + di_op.diph.dwObj = (DIDFT_MAKEINSTANCE(1) | DIDFT_RELAXIS); + di_op.diph.dwSize = sizeof(DIPROPDWORD); + di_op.diph.dwHeaderSize = sizeof(DIPROPHEADER); + hr = IDirectInputDevice_GetProperty(pMouse, DIPROP_GRANULARITY, &di_op.diph); + /* Granularity of Y axis should be 1! */ + ok(hr == S_OK && di_op.dwData == 1, "GetProperty(): %08x, dwData: %i but should be 1.\n", hr, di_op.dwData); + if (pMouse) IUnknown_Release(pMouse); DestroyWindow( hwnd2 );

1 0

Michael Müller : ieframe: Return S_OK in IViewObject: :Draw stub.
by Alexandre Julliard June 26, 2018

June 26, 2018

Module: wine Branch: stable Commit: 1ccaed20fa86e63e8dfabc166e55dd6e92548bd0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ccaed20fa86e63e8dfabc16… Author: Michael Müller <michael(a)fds-team.de> Date: Wed Mar 28 10:41:07 2018 -0500 ieframe: Return S_OK in IViewObject::Draw stub. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 6545037efba8f3ee48f2a48747c1528f9afeb914) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ieframe/view.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ieframe/view.c b/dlls/ieframe/view.c index 3e44991..546e251 100644 --- a/dlls/ieframe/view.c +++ b/dlls/ieframe/view.c @@ -60,7 +60,7 @@ static HRESULT WINAPI ViewObject_Draw(IViewObject2 *iface, DWORD dwDrawAspect, FIXME("(%p)->(%d %d %p %p %p %p %p %p %p %08lx)\n", This, dwDrawAspect, lindex, pvAspect, ptd, hdcTargetDev, hdcDraw, lprcBounds, lprcWBounds, pfnContinue, dwContinue); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI ViewObject_GetColorSet(IViewObject2 *iface, DWORD dwAspect,

1 0

Nikolay Sivov : comdlg32: Hide Read-only checkbox for Save dialogs.
by Alexandre Julliard June 26, 2018

June 26, 2018

Module: wine Branch: stable Commit: 8165802f43b40ab258ef634b1d5966224bcf8c5f URL: https://source.winehq.org/git/wine.git/?a=commit;h=8165802f43b40ab258ef634b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 25 18:51:17 2018 +0300 comdlg32: Hide Read-only checkbox for Save dialogs. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 1b04429965cdc04ddd97124ced2b5df8d439ee2e) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comdlg32/filedlg.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index b0b40e1..74b188a 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -182,6 +182,11 @@ static BOOL is_dialog_hooked(const FileOpenDlgInfos *info) return (info->ofnInfos->Flags & OFN_ENABLEHOOK) && info->ofnInfos->lpfnHook; } +static BOOL filedialog_is_readonly_hidden(const FileOpenDlgInfos *info) +{ + return (info->ofnInfos->Flags & OFN_HIDEREADONLY) || (info->DlgInfos.dwDlgProp & FODPROP_SAVEDLG); +} + /*********************************************************************** * Prototypes */ @@ -1688,7 +1693,7 @@ static LRESULT FILEDLG95_InitControls(HWND hwnd) } /* Must the open as read only check box be hidden? */ - if(fodInfos->ofnInfos->Flags & OFN_HIDEREADONLY) + if (filedialog_is_readonly_hidden(fodInfos)) { ShowWindow(GetDlgItem(hwnd,IDC_OPENREADONLY),SW_HIDE); EnableWindow(GetDlgItem(hwnd, IDC_OPENREADONLY), FALSE); @@ -1732,7 +1737,7 @@ static LRESULT FILEDLG95_ResizeControls(HWND hwnd, WPARAM wParam, LPARAM lParam) UINT flags = SWP_NOACTIVATE; ArrangeCtrlPositions(fodInfos->DlgInfos.hwndCustomDlg, hwnd, - (fodInfos->ofnInfos->Flags & (OFN_HIDEREADONLY | OFN_SHOWHELP)) == OFN_HIDEREADONLY); + filedialog_is_readonly_hidden(fodInfos) && !(fodInfos->ofnInfos->Flags & OFN_SHOWHELP)); /* resize the custom dialog to the parent size */ if (fodInfos->ofnInfos->Flags & (OFN_ENABLETEMPLATE | OFN_ENABLETEMPLATEHANDLE)) @@ -1753,7 +1758,7 @@ static LRESULT FILEDLG95_ResizeControls(HWND hwnd, WPARAM wParam, LPARAM lParam) /* Resize the height; if opened as read-only, checkbox and help button are * hidden and we are not using a custom template nor a customDialog */ - if ( (fodInfos->ofnInfos->Flags & OFN_HIDEREADONLY) && + if (filedialog_is_readonly_hidden(fodInfos) && (!(fodInfos->ofnInfos->Flags & (OFN_SHOWHELP|OFN_ENABLETEMPLATE|OFN_ENABLETEMPLATEHANDLE)))) {

1 0

Piotr Caban : msvcp140: Add __uncaught_exceptions implementation.
by Alexandre Julliard June 26, 2018

June 26, 2018

Module: wine Branch: stable Commit: 2485d2f1192d7137e9633b37634fa4801c0fb1fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=2485d2f1192d7137e9633b37… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 20 15:37:00 2018 +0100 msvcp140: Add __uncaught_exceptions implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit c07ade82ed1259d60758308b1df5358016cd3f28) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcp140/msvcp140.spec | 2 +- dlls/msvcp90/exception.c | 7 +++++++ dlls/msvcp90/msvcp90.h | 4 ++++ dlls/msvcp90/msvcp_main.c | 5 +++++ 4 files changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index 4fc8e3c..ddf8ba7 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3513,7 +3513,7 @@ @ thiscall -arch=i386 ?uflow@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@MAEGXZ(ptr) basic_streambuf_wchar_uflow @ cdecl -arch=win64 ?uflow@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@MEAAGXZ(ptr) basic_streambuf_wchar_uflow @ cdecl ?uncaught_exception(a)std@@YA_NXZ() MSVCP__uncaught_exception -@ stub ?uncaught_exceptions(a)std@@YAHXZ +@ cdecl ?uncaught_exceptions(a)std@@YAHXZ() __uncaught_exceptions @ cdecl -arch=arm ?underflow@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@MAAHXZ(ptr) basic_streambuf_char_underflow @ thiscall -arch=i386 ?underflow@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@MAEHXZ(ptr) basic_streambuf_char_underflow @ cdecl -arch=win64 ?underflow@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@MEAAHXZ(ptr) basic_streambuf_char_underflow diff --git a/dlls/msvcp90/exception.c b/dlls/msvcp90/exception.c index 7d9ade8..e7ba3d7 100644 --- a/dlls/msvcp90/exception.c +++ b/dlls/msvcp90/exception.c @@ -944,6 +944,13 @@ MSVCP_bool __cdecl MSVCP__uncaught_exception(void) return __uncaught_exception(); } +#if _MSVCP_VER >= 140 +int __cdecl __uncaught_exceptions(void) +{ + return *UCRTBASE___processing_throw(); +} +#endif + #if _MSVCP_VER >= 70 || defined(_MSVCIRT) #define EXCEPTION_VTABLE(name,funcs) __ASM_VTABLE(name,funcs) #else diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index d751186..16eaa48 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -47,6 +47,10 @@ extern void* (__cdecl *MSVCRT_operator_new)(MSVCP_size_t); extern void (__cdecl *MSVCRT_operator_delete)(void*); extern void* (__cdecl *MSVCRT_set_new_handler)(void*); +#if _MSVCP_VER >= 140 +extern int* (__cdecl *UCRTBASE___processing_throw)(void); +#endif + #if _MSVCP_VER >= 110 /* keep in sync with msvcrt/lock.c */ typedef struct cs_queue diff --git a/dlls/msvcp90/msvcp_main.c b/dlls/msvcp90/msvcp_main.c index 22baeef..7aef4cd 100644 --- a/dlls/msvcp90/msvcp_main.c +++ b/dlls/msvcp90/msvcp_main.c @@ -60,6 +60,10 @@ void* (__cdecl *MSVCRT_operator_new)(MSVCP_size_t); void (__cdecl *MSVCRT_operator_delete)(void*); void* (__cdecl *MSVCRT_set_new_handler)(void*); +#if _MSVCP_VER >= 140 +int* (__cdecl *UCRTBASE___processing_throw)(void); +#endif + #if _MSVCP_VER >= 110 critical_section* (__thiscall *critical_section_ctor)(critical_section*); void (__thiscall *critical_section_dtor)(critical_section*); @@ -147,6 +151,7 @@ static void init_cxx_funcs(void) MSVCRT_operator_new = operator_new; MSVCRT_operator_delete = operator_delete; MSVCRT_set_new_handler = (void*)GetProcAddress(hmod, "_set_new_handler"); + UCRTBASE___processing_throw = (void*)GetProcAddress(hmod, "__processing_throw"); hcon = LoadLibraryA( CONCRT_NAME(_MSVCP_VER) ); if (!hcon) FIXME( "%s not loaded\n", CONCRT_NAME(_MSVCP_VER) );

1 0

Alexandre Julliard : winex11: Hold a reference to the drawable from the GL context.
by Alexandre Julliard June 26, 2018

June 26, 2018

Module: wine Branch: stable Commit: f06906b3557e6ed9b60dfb846477f152534d2d72 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f06906b3557e6ed9b60dfb84… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 12 15:41:45 2018 +0100 winex11: Hold a reference to the drawable from the GL context. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit ac4f2ac36f1b06f7bfe7647753dacbc4ce8522b3) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winex11.drv/opengl.c | 76 ++++++++++++++++++++++++++++++++++++----------- dlls/winex11.drv/window.c | 59 ++++++++++++++++++++++++++++-------- 2 files changed, 106 insertions(+), 29 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f06906b3557e6ed9b60d…

1 0

Alexandre Julliard : winex11: Store the visual info in the OpenGL pixel format.
by Alexandre Julliard June 26, 2018

June 26, 2018

Module: wine Branch: stable Commit: 0451588bfe01f0e10f0c43c76dd175d0570eef86 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0451588bfe01f0e10f0c43c7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 9 09:42:53 2018 +0100 winex11: Store the visual info in the OpenGL pixel format. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 9efcd61d010488f8ab34075ac55ce5acc8b4d38f) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winex11.drv/opengl.c | 46 +++++++++++++++++++--------------------------- 1 file changed, 19 insertions(+), 27 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 27ff670..32df651 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -199,6 +199,7 @@ struct WineGLInfo { struct wgl_pixel_format { GLXFBConfig fbconfig; + XVisualInfo *visual; int fmt_id; int render_type; DWORD dwFlags; /* We store some PFD_* flags in here for emulated bitmap formats */ @@ -210,7 +211,6 @@ struct wgl_context BOOL has_been_current; BOOL sharing; BOOL gl3_context; - XVisualInfo *vis; const struct wgl_pixel_format *fmt; int numAttribs; /* This is needed for delaying wglCreateContextAttribsARB */ int attribList[16]; /* This is needed for delaying wglCreateContextAttribsARB */ @@ -257,7 +257,6 @@ struct gl_drawable Pixmap pixmap; /* base pixmap if drawable is a GLXPixmap */ Colormap colormap; /* colormap used for the drawable */ const struct wgl_pixel_format *format; /* pixel format for the drawable */ - XVisualInfo *visual; /* information about the GL visual */ RECT rect; /* drawable rect, relative to whole window drawable */ int swap_interval; BOOL refresh_swap_interval; @@ -1127,6 +1126,7 @@ static void init_pixel_formats( Display *display ) TRACE("Found onscreen format FBCONFIG_ID 0x%x corresponding to iPixelFormat %d at GLX index %d\n", fmt_id, size+1, i); list[size].fbconfig = cfgs[i]; + list[size].visual = visinfo; list[size].fmt_id = fmt_id; list[size].render_type = get_render_type_from_fbconfig(display, cfgs[i]); list[size].dwFlags = 0; @@ -1138,6 +1138,7 @@ static void init_pixel_formats( Display *display ) { TRACE("Found bitmap capable format FBCONFIG_ID 0x%x corresponding to iPixelFormat %d at GLX index %d\n", fmt_id, size+1, i); list[size].fbconfig = cfgs[i]; + list[size].visual = visinfo; list[size].fmt_id = fmt_id; list[size].render_type = get_render_type_from_fbconfig(display, cfgs[i]); list[size].dwFlags = PFD_DRAW_TO_BITMAP | PFD_SUPPORT_GDI | PFD_GENERIC_FORMAT; @@ -1167,8 +1168,7 @@ static void init_pixel_formats( Display *display ) list[size].dwFlags = 0; size++; } - - if (visinfo) XFree(visinfo); + else if (visinfo) XFree(visinfo); } } @@ -1308,8 +1308,8 @@ static GLXContext create_glxcontext(Display *display, struct wgl_context *contex else ctx = pglXCreateContextAttribsARB(gdi_display, context->fmt->fbconfig, shareList, GL_TRUE, NULL); } - else if(context->vis) - ctx = pglXCreateContext(gdi_display, context->vis, shareList, GL_TRUE); + else if(context->fmt->visual) + ctx = pglXCreateContext(gdi_display, context->fmt->visual, shareList, GL_TRUE); else /* Create a GLX Context for a pbuffer */ ctx = pglXCreateNewContext(gdi_display, context->fmt->fbconfig, context->fmt->render_type, shareList, TRUE); @@ -1336,7 +1336,6 @@ static void free_gl_drawable( struct gl_drawable *gl ) default: break; } - if (gl->visual) XFree( gl->visual ); HeapFree( GetProcessHeap(), 0, gl ); } @@ -1346,6 +1345,8 @@ static void free_gl_drawable( struct gl_drawable *gl ) */ static BOOL create_gl_drawable( HWND hwnd, struct gl_drawable *gl ) { + XVisualInfo *visual = gl->format->visual; + gl->drawable = 0; if (GetAncestor( hwnd, GA_PARENT ) == GetDesktopWindow()) /* top-level window */ @@ -1355,7 +1356,7 @@ static BOOL create_gl_drawable( HWND hwnd, struct gl_drawable *gl ) if (data) { gl->type = DC_GL_WINDOW; - gl->window = create_client_window( data, gl->visual ); + gl->window = create_client_window( data, visual ); if (gl->window) gl->drawable = pglXCreateWindow( gdi_display, gl->format->fbconfig, gl->window, NULL ); release_win_data( data ); @@ -1377,10 +1378,10 @@ static BOOL create_gl_drawable( HWND hwnd, struct gl_drawable *gl ) CWColormap | CWBorderPixel | CWOverrideRedirect, &attrib ); XMapWindow( gdi_display, dummy_parent ); } - gl->colormap = XCreateColormap(gdi_display, dummy_parent, gl->visual->visual, - (gl->visual->class == PseudoColor || - gl->visual->class == GrayScale || - gl->visual->class == DirectColor) ? + gl->colormap = XCreateColormap(gdi_display, dummy_parent, visual->visual, + (visual->class == PseudoColor || + visual->class == GrayScale || + visual->class == DirectColor) ? AllocAll : AllocNone); attrib.colormap = gl->colormap; XInstallColormap(gdi_display, attrib.colormap); @@ -1388,7 +1389,7 @@ static BOOL create_gl_drawable( HWND hwnd, struct gl_drawable *gl ) gl->type = DC_GL_CHILD_WIN; gl->window = XCreateWindow( gdi_display, dummy_parent, 0, 0, gl->rect.right - gl->rect.left, gl->rect.bottom - gl->rect.top, - 0, gl->visual->depth, InputOutput, gl->visual->visual, + 0, visual->depth, InputOutput, visual->visual, CWColormap | CWBorderPixel | CWOverrideRedirect, &attrib ); if (gl->window) { @@ -1409,7 +1410,7 @@ static BOOL create_gl_drawable( HWND hwnd, struct gl_drawable *gl ) gl->type = DC_GL_PIXMAP_WIN; gl->pixmap = XCreatePixmap( gdi_display, root_window, gl->rect.right - gl->rect.left, gl->rect.bottom - gl->rect.top, - gl->visual->depth ); + visual->depth ); if (gl->pixmap) { gl->drawable = pglXCreatePixmap( gdi_display, gl->format->fbconfig, gl->pixmap, NULL ); @@ -1430,6 +1431,8 @@ static BOOL set_win_format( HWND hwnd, const struct wgl_pixel_format *format ) { struct gl_drawable *gl, *prev; + if (!format->visual) return FALSE; + gl = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*gl) ); /* Default GLX and WGL swap interval is 1, but in case of glXSwapIntervalSGI * there is no way to query it, so we have to store it here. @@ -1437,20 +1440,12 @@ static BOOL set_win_format( HWND hwnd, const struct wgl_pixel_format *format ) gl->swap_interval = 1; gl->refresh_swap_interval = TRUE; gl->format = format; - gl->visual = pglXGetVisualFromFBConfig( gdi_display, format->fbconfig ); - if (!gl->visual) - { - HeapFree( GetProcessHeap(), 0, gl ); - return FALSE; - } - GetClientRect( hwnd, &gl->rect ); gl->rect.right = min( max( 1, gl->rect.right ), 65535 ); gl->rect.bottom = min( max( 1, gl->rect.bottom ), 65535 ); if (!create_gl_drawable( hwnd, gl )) { - XFree( gl->visual ); HeapFree( GetProcessHeap(), 0, gl ); return FALSE; } @@ -1545,7 +1540,8 @@ void sync_gl_drawable( HWND hwnd, const RECT *visible_rect, const RECT *client_r break; case DC_GL_PIXMAP_WIN: if (!mask) break; - pix = XCreatePixmap(gdi_display, root_window, changes.width, changes.height, gl->visual->depth); + pix = XCreatePixmap(gdi_display, root_window, changes.width, changes.height, + gl->format->visual->depth); if (!pix) goto done; glxp = pglXCreatePixmap(gdi_display, gl->format->fbconfig, pix, NULL ); if (!glxp) @@ -1608,7 +1604,6 @@ void set_gl_drawable_parent( HWND hwnd, HWND parent ) { XDeleteContext( gdi_display, (XID)hwnd, gl_hwnd_context ); release_gl_drawable( gl ); - XFree( gl->visual ); HeapFree( GetProcessHeap(), 0, gl ); __wine_set_pixel_format( hwnd, 0 ); return; @@ -1831,7 +1826,6 @@ static struct wgl_context *glxdrv_wglCreateContext( HDC hdc ) { ret->hdc = hdc; ret->fmt = gl->format; - ret->vis = pglXGetVisualFromFBConfig(gdi_display, gl->format->fbconfig); ret->ctx = create_glxcontext(gdi_display, ret, NULL); list_add_head( &context_list, &ret->entry ); } @@ -1861,7 +1855,6 @@ static BOOL glxdrv_wglDeleteContext(struct wgl_context *ctx) LeaveCriticalSection( &context_section ); if (ctx->ctx) pglXDestroyContext( gdi_display, ctx->ctx ); - if (ctx->vis) XFree( ctx->vis ); return HeapFree( GetProcessHeap(), 0, ctx ); } @@ -2090,7 +2083,6 @@ static struct wgl_context *X11DRV_wglCreateContextAttribsARB( HDC hdc, struct wg { ret->hdc = hdc; ret->fmt = gl->format; - ret->vis = NULL; /* glXCreateContextAttribsARB requires a fbconfig instead of a visual */ ret->gl3_context = TRUE; if (attribList) {

1 0

Alexandre Julliard : winex11: Implement refcounting of GL drawables.
by Alexandre Julliard June 26, 2018

June 26, 2018

Module: wine Branch: stable Commit: a49ad69e99d07fa065ef946f7dc68cb274d77d2d URL: https://source.winehq.org/git/wine.git/?a=commit;h=a49ad69e99d07fa065ef946f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 12 15:34:28 2018 +0100 winex11: Implement refcounting of GL drawables. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 6dc30a2ed31091698f5a0cac47d0959780f08c9c) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winex11.drv/opengl.c | 251 +++++++++++++++++++++++----------------------- 1 file changed, 125 insertions(+), 126 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a49ad69e99d07fa065ef…

1 0