wine-commits June 2018

wine-commits@winehq.org

1 participants
629 discussions

Matteo Bruni : d3dx9: Implement FindNextValidTechnique().
by Alexandre Julliard 26 Jun '18

26 Jun '18

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

Alistair Leslie-Hughes : pidgen: Add PIDGenSimpA stub.
by Alexandre Julliard 26 Jun '18

26 Jun '18

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

Michael Müller : ieframe: Return S_OK in IViewObject: :Draw stub.
by Alexandre Julliard 26 Jun '18

26 Jun '18

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

Jarkko Korpi : kernel32: Silence repeated LocaleNameToLCID unsupported flags.
by Alexandre Julliard 26 Jun '18

26 Jun '18

Module: wine Branch: stable Commit: 2a8412e646071986402a25bff46efa0ee3916600 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a8412e646071986402a25bf… Author: Jarkko Korpi <jarkko_korpi(a)hotmail.com> Date: Wed Jul 15 02:38:25 2015 +0300 kernel32: Silence repeated LocaleNameToLCID unsupported flags. Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit dc5b22963bac51f796e5f9618b18ae2ab9488325) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/locale.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index e4c323e..7f6c287 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -1396,8 +1396,10 @@ LANGID WINAPI GetSystemDefaultUILanguage(void) LCID WINAPI LocaleNameToLCID( LPCWSTR name, DWORD flags ) { struct locale_name locale_name; + static int once; - if (flags) FIXME( "unsupported flags %x\n", flags ); + if (flags && !once++) + FIXME( "unsupported flags %x\n", flags ); if (name == LOCALE_NAME_USER_DEFAULT) return GetUserDefaultLCID(); @@ -1427,7 +1429,8 @@ LCID WINAPI LocaleNameToLCID( LPCWSTR name, DWORD flags ) */ INT WINAPI LCIDToLocaleName( LCID lcid, LPWSTR name, INT count, DWORD flags ) { - if (flags) FIXME( "unsupported flags %x\n", flags ); + static int once; + if (flags && !once++) FIXME( "unsupported flags %x\n", flags ); return GetLocaleInfoW( lcid, LOCALE_SNAME | LOCALE_NOUSEROVERRIDE, name, count ); }

1 0

Austin English : wininet: Add ParseX509EncodedCertificateForListBoxEntry stub.
by Alexandre Julliard 26 Jun '18

26 Jun '18

Module: wine Branch: stable Commit: b2cdad1b589fec00c60d305d9ca29f120c5704f1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b2cdad1b589fec00c60d305d… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Mar 28 03:20:02 2018 +0000 wininet: Add ParseX509EncodedCertificateForListBoxEntry stub. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit c8861df6d11343d4742afed32b7a9fc5a50e2ccc) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wininet/dialogs.c | 9 +++++++++ dlls/wininet/wininet.spec | 2 +- include/winineti.h | 1 + 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/wininet/dialogs.c b/dlls/wininet/dialogs.c index 938daa8..b13b566 100644 --- a/dlls/wininet/dialogs.c +++ b/dlls/wininet/dialogs.c @@ -574,6 +574,15 @@ BOOL WINAPI InternetShowSecurityInfoByURLW(LPCWSTR url, HWND window) } /*********************************************************************** + * ParseX509EncodedCertificateForListBoxEntry (@) + */ +DWORD WINAPI ParseX509EncodedCertificateForListBoxEntry(LPBYTE cert, DWORD len, LPSTR szlistbox, LPDWORD listbox) +{ + FIXME("stub: %p %d %s %p\n", cert, len, debugstr_a(szlistbox), listbox); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/*********************************************************************** * ShowX509EncodedCertificate (@) */ DWORD WINAPI ShowX509EncodedCertificate(HWND parent, LPBYTE cert, DWORD len) diff --git a/dlls/wininet/wininet.spec b/dlls/wininet/wininet.spec index e4337a2..7ef28d6 100644 --- a/dlls/wininet/wininet.spec +++ b/dlls/wininet/wininet.spec @@ -216,7 +216,7 @@ @ stdcall IsUrlCacheEntryExpiredA(str long ptr) @ stdcall IsUrlCacheEntryExpiredW(wstr long ptr) @ stdcall LoadUrlCacheContent() -@ stub ParseX509EncodedCertificateForListBoxEntry +@ stdcall ParseX509EncodedCertificateForListBoxEntry(ptr long str ptr) @ stdcall PrivacyGetZonePreferenceW(long long ptr ptr ptr) @ stdcall PrivacySetZonePreferenceW(long long long wstr) @ stdcall ReadUrlCacheEntryStream(ptr long ptr ptr long) diff --git a/include/winineti.h b/include/winineti.h index 5b6f15f..5e38424 100644 --- a/include/winineti.h +++ b/include/winineti.h @@ -120,6 +120,7 @@ BOOL WINAPI InternetQueryFortezzaStatus(DWORD*,DWORD_PTR); BOOL WINAPI IsUrlCacheEntryExpiredA(LPCSTR,DWORD,FILETIME*); BOOL WINAPI IsUrlCacheEntryExpiredW(LPCWSTR,DWORD,FILETIME*); #define IsUrlCacheEntryExpired WINELIB_NAME_AW(IsUrlCacheEntryExpired) +DWORD WINAPI ParseX509EncodedCertificateForListBoxEntry(LPBYTE,DWORD,LPSTR,LPDWORD); BOOL WINAPI SetUrlCacheConfigInfoA(LPINTERNET_CACHE_CONFIG_INFOA,DWORD); BOOL WINAPI SetUrlCacheConfigInfoW(LPINTERNET_CACHE_CONFIG_INFOW,DWORD); #define SetUrlCacheConfigInfo WINELIB_NAME_AW(SetUrlCacheConfigInfo)

1 0

Johann Frei : dinput: Implement X/Y axis granularity and add test.
by Alexandre Julliard 26 Jun '18

26 Jun '18

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

Alexandre Julliard : wininet/tests: Update the winehq.org certificate data.
by Alexandre Julliard 26 Jun '18

26 Jun '18

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

Alexandre Julliard : winex11: Hold a reference to the drawable from the GL context.
by Alexandre Julliard 26 Jun '18

26 Jun '18

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: Implement refcounting of GL drawables.
by Alexandre Julliard 26 Jun '18

26 Jun '18

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

Alexandre Julliard : winex11: Store only the pixmap size instead of the window rectangle in the GL drawable.
by Alexandre Julliard 26 Jun '18

26 Jun '18

Module: wine Branch: stable Commit: e6fcc8503ef64f37bc2c0a9bc9bf9c238df320d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e6fcc8503ef64f37bc2c0a9b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 9 13:08:04 2018 +0100 winex11: Store only the pixmap size instead of the window rectangle in the GL drawable. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 99041a6fd369deeeb60ce1f11195414d16c9dc44) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winex11.drv/opengl.c | 40 +++++++++++++++++++--------------------- dlls/winex11.drv/window.c | 7 ++++++- dlls/winex11.drv/x11drv.h | 2 +- 3 files changed, 26 insertions(+), 23 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 32df651..de09925 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -257,7 +257,7 @@ 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 */ - RECT rect; /* drawable rect, relative to whole window drawable */ + SIZE pixmap_size; /* pixmap size for GLXPixmap drawables */ int swap_interval; BOOL refresh_swap_interval; }; @@ -1346,6 +1346,12 @@ 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; + RECT rect; + int width, height; + + GetClientRect( hwnd, &rect ); + width = min( max( 1, rect.right ), 65535 ); + height = min( max( 1, rect.bottom ), 65535 ); gl->drawable = 0; @@ -1387,8 +1393,7 @@ static BOOL create_gl_drawable( HWND hwnd, struct gl_drawable *gl ) XInstallColormap(gdi_display, attrib.colormap); 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, + gl->window = XCreateWindow( gdi_display, dummy_parent, 0, 0, width, height, 0, visual->depth, InputOutput, visual->visual, CWColormap | CWBorderPixel | CWOverrideRedirect, &attrib ); if (gl->window) @@ -1408,13 +1413,13 @@ static BOOL create_gl_drawable( HWND hwnd, struct gl_drawable *gl ) WARN("XComposite is not available, using GLXPixmap hack\n"); 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, - visual->depth ); + gl->pixmap = XCreatePixmap( gdi_display, root_window, width, height, visual->depth ); if (gl->pixmap) { gl->drawable = pglXCreatePixmap( gdi_display, gl->format->fbconfig, gl->pixmap, NULL ); if (!gl->drawable) XFreePixmap( gdi_display, gl->pixmap ); + gl->pixmap_size.cx = width; + gl->pixmap_size.cy = height; } } @@ -1440,9 +1445,6 @@ 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; - 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 )) { @@ -1515,31 +1517,26 @@ static BOOL set_pixel_format(HDC hdc, int format, BOOL allow_change) /*********************************************************************** * sync_gl_drawable */ -void sync_gl_drawable( HWND hwnd, const RECT *visible_rect, const RECT *client_rect ) +void sync_gl_drawable( HWND hwnd, int width, int height ) { struct gl_drawable *gl; GLXDrawable glxp; Pixmap pix; - int mask = 0; XWindowChanges changes; - changes.width = min( max( 1, client_rect->right - client_rect->left ), 65535 ); - changes.height = min( max( 1, client_rect->bottom - client_rect->top ), 65535 ); + changes.width = min( max( 1, width ), 65535 ); + changes.height = min( max( 1, height ), 65535 ); if (!(gl = get_gl_drawable( hwnd, 0 ))) return; - if (changes.width != gl->rect.right - gl->rect.left) mask |= CWWidth; - if (changes.height != gl->rect.bottom - gl->rect.top) mask |= CWHeight; - TRACE( "setting drawable %lx size %dx%d\n", gl->drawable, changes.width, changes.height ); switch (gl->type) { case DC_GL_CHILD_WIN: - if (mask) XConfigureWindow( gdi_display, gl->window, mask, &changes ); + XConfigureWindow( gdi_display, gl->window, CWWidth | CWHeight, &changes ); break; case DC_GL_PIXMAP_WIN: - if (!mask) break; pix = XCreatePixmap(gdi_display, root_window, changes.width, changes.height, gl->format->visual->depth); if (!pix) goto done; @@ -1558,11 +1555,12 @@ void sync_gl_drawable( HWND hwnd, const RECT *visible_rect, const RECT *client_r gl->pixmap = pix; gl->drawable = glxp; + gl->pixmap_size.cx = width; + gl->pixmap_size.cy = height; break; default: break; } - SetRect( &gl->rect, 0, 0, changes.width, changes.height ); done: release_gl_drawable( gl ); } @@ -3334,7 +3332,7 @@ static BOOL glxdrv_wglSwapBuffers( HDC hdc ) * copying */ pglFlush(); pglXCopySubBufferMESA( gdi_display, gl->drawable, 0, 0, - gl->rect.right - gl->rect.left, gl->rect.bottom - gl->rect.top ); + gl->pixmap_size.cx, gl->pixmap_size.cy ); break; } if (pglXSwapBuffersMscOML) @@ -3403,7 +3401,7 @@ struct opengl_funcs *get_glx_driver( UINT version ) return NULL; } -void sync_gl_drawable( HWND hwnd, const RECT *visible_rect, const RECT *client_rect ) +void sync_gl_drawable( HWND hwnd, int width, int height ) { } diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index d35328c..4f61758 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2304,8 +2304,13 @@ void CDECL X11DRV_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flags if (!data->whole_window) { + int width = data->client_rect.right - data->client_rect.left; + int height = data->client_rect.bottom - data->client_rect.top; + release_win_data( data ); - sync_gl_drawable( hwnd, visible_rect, rectClient ); + if (width != old_client_rect.right - old_client_rect.left || + height != old_client_rect.bottom - old_client_rect.top) + sync_gl_drawable( hwnd, width, height ); return; } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 938ff22..0bb5b37 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -578,7 +578,7 @@ extern void release_win_data( struct x11drv_win_data *data ) DECLSPEC_HIDDEN; extern Window X11DRV_get_whole_window( HWND hwnd ) DECLSPEC_HIDDEN; extern XIC X11DRV_get_ic( HWND hwnd ) DECLSPEC_HIDDEN; -extern void sync_gl_drawable( HWND hwnd, const RECT *visible_rect, const RECT *client_rect ) DECLSPEC_HIDDEN; +extern void sync_gl_drawable( HWND hwnd, int width, int height ) DECLSPEC_HIDDEN; extern void set_gl_drawable_parent( HWND hwnd, HWND parent ) DECLSPEC_HIDDEN; extern void destroy_gl_drawable( HWND hwnd ) DECLSPEC_HIDDEN;

1 0

← Newer
1
...
15
16
17
18
19
20
21
...
63
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 June 2018