January 2009 - Wine-Commits

Alexandre Julliard : gdi32: Release the GDI lock when calling the DC DeleteObject function.
by Alexandre Julliard Jan. 28, 2009

Jan. 28, 2009

Module: wine Branch: master Commit: b4255d295df209c1468f199e20a3a1ae75ae9c6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4255d295df209c1468f199e2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 27 16:15:47 2009 +0100 gdi32: Release the GDI lock when calling the DC DeleteObject function. --- dlls/gdi32/gdiobj.c | 19 ++++++++++++------- 1 files changed, 12 insertions(+), 7 deletions(-) diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index 906cd2a..7b5981b 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -808,6 +808,7 @@ BOOL WINAPI DeleteObject( HGDIOBJ obj ) { /* Check if object is valid */ + struct hdc_list *hdcs_head; GDIOBJHDR * header; if (HIWORD(obj)) return FALSE; @@ -821,21 +822,25 @@ BOOL WINAPI DeleteObject( HGDIOBJ obj ) return TRUE; } - while (header->hdcs) + while ((hdcs_head = header->hdcs) != NULL) { - DC *dc = get_dc_ptr(header->hdcs->hdc); - struct hdc_list *tmp; + DC *dc = get_dc_ptr(hdcs_head->hdc); + + header->hdcs = hdcs_head->next; + TRACE("hdc %p has interest in %p\n", hdcs_head->hdc, obj); - TRACE("hdc %p has interest in %p\n", header->hdcs->hdc, obj); if(dc) { if(dc->funcs->pDeleteObject) + { + GDI_ReleaseObj( obj ); /* release the GDI lock */ dc->funcs->pDeleteObject( dc->physDev, obj ); + header = GDI_GetObjPtr( obj, MAGIC_DONTCARE ); /* and grab it again */ + } release_dc_ptr( dc ); } - tmp = header->hdcs; - header->hdcs = header->hdcs->next; - HeapFree(GetProcessHeap(), 0, tmp); + HeapFree(GetProcessHeap(), 0, hdcs_head); + if (!header) return FALSE; } if (header->dwCount)

1 0

Alexandre Julliard : gdi32: Don' t hold the GDI lock while calling the GetObjectA/W methods for GDI objects.
by Alexandre Julliard Jan. 28, 2009

Jan. 28, 2009

Module: wine Branch: master Commit: 68d19b9552ad7b24671124e20d78ae801b9931ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=68d19b9552ad7b24671124e20… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 27 16:30:43 2009 +0100 gdi32: Don't hold the GDI lock while calling the GetObjectA/W methods for GDI objects. --- dlls/gdi32/bitmap.c | 22 ++++++++++------- dlls/gdi32/brush.c | 19 ++++++++------ dlls/gdi32/font.c | 40 +++++++++++++++++++------------ dlls/gdi32/gdi_private.h | 4 +- dlls/gdi32/gdiobj.c | 17 ++++++++---- dlls/gdi32/palette.c | 18 ++++++++----- dlls/gdi32/pen.c | 58 ++++++++++++++++++++++----------------------- 7 files changed, 100 insertions(+), 78 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=68d19b9552ad7b2467112…

1 0

Frans Kool : cryptdlg: Added Dutch translations.
by Alexandre Julliard Jan. 27, 2009

Jan. 27, 2009

Module: wine Branch: master Commit: 8f829034f3fe4da3e7adce2f4685e10ba2e2fe82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f829034f3fe4da3e7adce2f4… Author: Frans Kool <Frans.Kool(a)Gmail.com> Date: Tue Jan 27 13:59:58 2009 +0100 cryptdlg: Added Dutch translations. --- dlls/cryptdlg/cryptdlg.rc | 1 + dlls/cryptdlg/cryptdlg_Nl.rc | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 0 deletions(-) diff --git a/dlls/cryptdlg/cryptdlg.rc b/dlls/cryptdlg/cryptdlg.rc index b56dd71..e815653 100644 --- a/dlls/cryptdlg/cryptdlg.rc +++ b/dlls/cryptdlg/cryptdlg.rc @@ -25,3 +25,4 @@ #include "cryptdlg_En.rc" #include "cryptdlg_Fr.rc" #include "cryptdlg_Ko.rc" +#include "cryptdlg_Nl.rc" diff --git a/dlls/cryptdlg/cryptdlg_Nl.rc b/dlls/cryptdlg/cryptdlg_Nl.rc new file mode 100644 index 0000000..27b0935 --- /dev/null +++ b/dlls/cryptdlg/cryptdlg_Nl.rc @@ -0,0 +1,36 @@ +/* + * cryptdlg dll Dutch resources + * + * Copyright 2009 Frans Kool + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +{ + IDS_CERT_POLICY "Certificaat beleid" + IDS_POLICY_ID "Beleid Identificatie: " + IDS_POLICY_QUALIFIER_INFO "Beleid kwalificator informatie" + IDS_POLICY_QUALIFIER_ID "Beleid kwalificator Id=" + IDS_CPS "CPS" + IDS_USER_NOTICE "Gebruikers verklaring" + IDS_QUALIFIER "Kwalificator" + IDS_NOTICE_REF "Verklaring referentie" + IDS_ORGANIZATION "Organisatie=" + IDS_NOTICE_NUM "Verklaring nummer=" + IDS_NOTICE_TEXT "Verklaring tekst=" +}

1 0

Frans Kool : crypt32: Added missing Dutch translation.
by Alexandre Julliard Jan. 27, 2009

Jan. 27, 2009

Module: wine Branch: master Commit: 70eea24a62d4f2a70fc336943fa89d20555a3aed URL: http://source.winehq.org/git/wine.git/?a=commit;h=70eea24a62d4f2a70fc336943… Author: Frans Kool <Frans.Kool(a)Gmail.com> Date: Tue Jan 27 13:45:17 2009 +0100 crypt32: Added missing Dutch translation. --- dlls/crypt32/crypt32_Nl.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/crypt32_Nl.rc b/dlls/crypt32/crypt32_Nl.rc index c9857f8..fe3fa45 100644 --- a/dlls/crypt32/crypt32_Nl.rc +++ b/dlls/crypt32/crypt32_Nl.rc @@ -171,6 +171,7 @@ STRINGTABLE DISCARDABLE IDS_LOCALIZEDNAME_MY "Persoonlijk" IDS_LOCALIZEDNAME_CA "Certificatie Tussen-Autoriteiten" IDS_LOCALIZEDNAME_ADDRESSBOOK "Overige Personen" + IDS_LOCALIZEDNAME_TRUSTEDPUBLISHER "Vertrouwde uitgevers" } STRINGTABLE DISCARDABLE {

1 0

Michael Stefaniuc : user32: Fix bogus "if (!x & y)" code.
by Alexandre Julliard Jan. 27, 2009

Jan. 27, 2009

Module: wine Branch: master Commit: 56b3341f8eeeee49679d5fb79a26927106fefab6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56b3341f8eeeee49679d5fb79… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 27 15:38:32 2009 +0100 user32: Fix bogus "if (!x & y)" code. The dde.c tests succeed on Windows and the DDE callback registered is set to trigger on all messages it gets. Thus it looks like Windows doesn't calls the callback in that case. --- dlls/user32/dde_client.c | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/dlls/user32/dde_client.c b/dlls/user32/dde_client.c index 12856cc..602a39f 100644 --- a/dlls/user32/dde_client.c +++ b/dlls/user32/dde_client.c @@ -821,7 +821,7 @@ static WDML_QUEUE_STATE WDML_HandleTerminateReply(WDML_CONV* pConv, MSG* msg) FIXME("hmmm shouldn't happen\n"); return WDML_QS_PASS; } - if (!pConv->instance->CBFflags & CBF_SKIP_DISCONNECTS) + if (!(pConv->instance->CBFflags & CBF_SKIP_DISCONNECTS)) { WDML_InvokeCallback(pConv->instance, XTYP_DISCONNECT, 0, (HCONV)pConv, 0, 0, 0, 0, (pConv->wStatus & ST_ISSELF) ? 1 : 0); @@ -904,11 +904,6 @@ static WDML_QUEUE_STATE WDML_HandleIncomingTerminate(WDML_CONV* pConv, MSG* msg, return WDML_QS_PASS; pConv->wStatus |= ST_TERMINATED; - if (!pConv->instance->CBFflags & CBF_SKIP_DISCONNECTS) - { - WDML_InvokeCallback(pConv->instance, XTYP_DISCONNECT, 0, (HCONV)pConv, - 0, 0, 0, 0, (pConv->wStatus & ST_ISSELF) ? 1 : 0); - } if (pConv->wStatus & ST_CONNECTED) { /* don't care about result code (if server exists or not) */

1 0

Alistair Leslie-Hughes : shdocvw: Add IServiceProvider support.
by Alexandre Julliard Jan. 27, 2009

Jan. 27, 2009

Module: wine Branch: master Commit: 58292e8a65ac6d3edb8a03fd76439cd120bee3ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=58292e8a65ac6d3edb8a03fd7… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Jan 26 20:34:11 2009 +1100 shdocvw: Add IServiceProvider support. --- dlls/shdocvw/shdocvw.h | 1 + dlls/shdocvw/tests/webbrowser.c | 13 ++++++- dlls/shdocvw/webbrowser.c | 76 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 89 insertions(+), 1 deletions(-) diff --git a/dlls/shdocvw/shdocvw.h b/dlls/shdocvw/shdocvw.h index 0005143..fc8c3b5 100644 --- a/dlls/shdocvw/shdocvw.h +++ b/dlls/shdocvw/shdocvw.h @@ -119,6 +119,7 @@ struct WebBrowser { const IOleInPlaceActiveObjectVtbl *lpOleInPlaceActiveObjectVtbl; const IOleCommandTargetVtbl *lpOleCommandTargetVtbl; const IHlinkFrameVtbl *lpHlinkFrameVtbl; + const IServiceProviderVtbl *lpServiceProviderVtbl; LONG ref; diff --git a/dlls/shdocvw/tests/webbrowser.c b/dlls/shdocvw/tests/webbrowser.c index 6002292..5b04119 100644 --- a/dlls/shdocvw/tests/webbrowser.c +++ b/dlls/shdocvw/tests/webbrowser.c @@ -1994,12 +1994,23 @@ static void test_IServiceProvider(IUnknown *unk) { IServiceProvider *servprov = (void*)0xdeadbeef; HRESULT hres; + IUnknown *ret = NULL; + static const IID IID_IBrowserService2 = + {0x68BD21CC,0x438B,0x11d2,{0xA5,0x60,0x00,0xA0,0xC,0x2D,0xBF,0xE8}}; hres = IUnknown_QueryInterface(unk, &IID_IServiceProvider, (void**)&servprov); - todo_wine ok(hres == S_OK, "QueryInterface returned %08x, expected S_OK\n", hres); + ok(hres == S_OK, "QueryInterface returned %08x, expected S_OK\n", hres); if(FAILED(hres)) return; + hres = IServiceProvider_QueryService(servprov, &SID_STopLevelBrowser, &IID_IBrowserService2, (LPVOID*)&ret); + ok(hres == E_FAIL, "QueryService returned %08x, expected E_FAIL\n", hres); + ok(ret == NULL, "ret returned %p, expected NULL\n", ret); + if(hres == S_OK) + { + IUnknown_Release(ret); + } + IServiceProvider_Release(servprov); } diff --git a/dlls/shdocvw/webbrowser.c b/dlls/shdocvw/webbrowser.c index 859707f..9fdbde8 100644 --- a/dlls/shdocvw/webbrowser.c +++ b/dlls/shdocvw/webbrowser.c @@ -102,6 +102,9 @@ static HRESULT WINAPI WebBrowser_QueryInterface(IWebBrowser2 *iface, REFIID riid }else if(IsEqualGUID(&IID_IHlinkFrame, riid)) { TRACE("(%p)->(IID_IHlinkFrame %p)\n", This, ppv); *ppv = HLINKFRAME(This); + }else if(IsEqualGUID(&IID_IServiceProvider, riid)) { + *ppv = SERVPROV(This); + TRACE("(%p)->(IID_IServiceProvider %p)\n", This, ppv); }else if(IsEqualGUID(&IID_IQuickActivate, riid)) { TRACE("(%p)->(IID_IQuickActivate %p) returning NULL\n", This, ppv); return E_NOINTERFACE; @@ -1014,6 +1017,78 @@ static const IWebBrowser2Vtbl WebBrowser2Vtbl = WebBrowser_put_Resizable }; +#define SERVPROV_THIS(iface) DEFINE_THIS(WebBrowser, OleObject, iface) +/* + * IServiceProvider interface. + */ +static HRESULT WINAPI WebBrowser_IServiceProvider_QueryInterface(IServiceProvider *iface, + REFIID riid, LPVOID *ppv) +{ + WebBrowser *This = SERVPROV_THIS(iface); + + if (ppv == NULL) + return E_POINTER; + *ppv = NULL; + + if(IsEqualGUID(&IID_IUnknown, riid)) { + *ppv = WEBBROWSER(This); + TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); + }else if(IsEqualGUID(&IID_IServiceProvider, riid)) { + *ppv = WEBBROWSER(This); + TRACE("(%p)->(IID_IServiceProvider %p)\n", This, ppv); + } + + if(*ppv) { + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; + } + + FIXME("(%p)->(%s %p) interface not supported\n", This, debugstr_guid(riid), ppv); + return E_NOINTERFACE; +} + +static ULONG WINAPI WebBrowser_IServiceProvider_AddRef(IServiceProvider *iface) +{ + WebBrowser *This = SERVPROV_THIS(iface); + return IWebBrowser_AddRef(WEBBROWSER(This)); +} + +static ULONG WINAPI WebBrowser_IServiceProvider_Release(IServiceProvider *iface) +{ + WebBrowser *This = SERVPROV_THIS(iface); + return IWebBrowser_Release(WEBBROWSER(This)); +} + +static HRESULT STDMETHODCALLTYPE WebBrowser_IServiceProvider_QueryService(IServiceProvider *iface, + REFGUID guidService, REFIID riid, void **ppv) +{ + WebBrowser *This = SERVPROV_THIS(iface); + static const IID IID_IBrowserService2 = + {0x68BD21CC,0x438B,0x11d2,{0xA5,0x60,0x00,0xA0,0xC,0x2D,0xBF,0xE8}}; + + if(*ppv) + ppv = NULL; + + if(IsEqualGUID(&IID_IBrowserService2, riid)) { + TRACE("(%p)->(IID_IBrowserService2 return E_FAIL)\n", This); + return E_FAIL; + } + + FIXME("(%p)->(%s, %s %p)\n", This, debugstr_guid(guidService), debugstr_guid(riid), ppv); + + return E_NOINTERFACE; +} + +#undef SERVPROV_THIS + +static const IServiceProviderVtbl ServiceProviderVtbl = +{ + WebBrowser_IServiceProvider_QueryInterface, + WebBrowser_IServiceProvider_AddRef, + WebBrowser_IServiceProvider_Release, + WebBrowser_IServiceProvider_QueryService +}; + static HRESULT WebBrowser_Create(INT version, IUnknown *pOuter, REFIID riid, void **ppv) { WebBrowser *ret; @@ -1024,6 +1099,7 @@ static HRESULT WebBrowser_Create(INT version, IUnknown *pOuter, REFIID riid, voi ret = heap_alloc(sizeof(WebBrowser)); ret->lpWebBrowser2Vtbl = &WebBrowser2Vtbl; + ret->lpServiceProviderVtbl = &ServiceProviderVtbl; ret->ref = 0; ret->version = version;

1 0

Florian Köberle : user32: Unify handling of child and normal windows in getMinMaxInfo.
by Alexandre Julliard Jan. 27, 2009

Jan. 27, 2009

Module: wine Branch: master Commit: 640d2e029a12f21eacd3860f385d0424f818b572 URL: http://source.winehq.org/git/wine.git/?a=commit;h=640d2e029a12f21eacd3860f3… Author: Florian Köberle <florian(a)fkoeberle.de> Date: Sat Jan 24 18:06:42 2009 +0100 user32: Unify handling of child and normal windows in getMinMaxInfo. The code for the child windows works now for the standalone windows as well. --- dlls/user32/winpos.c | 72 ++++++++++++++------------------------------------ 1 files changed, 20 insertions(+), 52 deletions(-) diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index b9f7b1a..6419478 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -669,66 +669,34 @@ void WINPOS_GetMinMaxInfo( HWND hwnd, POINT *maxSize, POINT *maxPos, MinMax.ptReserved.x = rc.left; MinMax.ptReserved.y = rc.top; - if (style & WS_CHILD) - { - if ((style & WS_CAPTION) == WS_CAPTION) - adjustedStyle = style & ~WS_BORDER; /* WS_CAPTION = WS_DLGFRAME | WS_BORDER */ - else - adjustedStyle = style; + if ((style & WS_CAPTION) == WS_CAPTION) + adjustedStyle = style & ~WS_BORDER; /* WS_CAPTION = WS_DLGFRAME | WS_BORDER */ + else + adjustedStyle = style; - GetClientRect(GetAncestor(hwnd,GA_PARENT), &rc); - AdjustWindowRectEx(&rc, adjustedStyle, ((style & WS_POPUP) && GetMenu(hwnd)), exstyle); + GetClientRect(GetAncestor(hwnd,GA_PARENT), &rc); + AdjustWindowRectEx(&rc, adjustedStyle, ((style & WS_POPUP) && GetMenu(hwnd)), exstyle); - MinMax.ptMaxSize.x = rc.right - rc.left; - MinMax.ptMaxSize.y = rc.bottom - rc.top; - if (style & (WS_DLGFRAME | WS_BORDER)) - { - MinMax.ptMinTrackSize.x = GetSystemMetrics(SM_CXMINTRACK); - MinMax.ptMinTrackSize.y = GetSystemMetrics(SM_CYMINTRACK); - } - else - { - MinMax.ptMinTrackSize.x = -2 * rc.left; - MinMax.ptMinTrackSize.y = -2 * rc.top; - } - MinMax.ptMaxTrackSize.x = GetSystemMetrics(SM_CXMAXTRACK); - MinMax.ptMaxTrackSize.y = GetSystemMetrics(SM_CYMAXTRACK); - xinc = -rc.left; - yinc = -rc.top; - } - else + xinc = -rc.left; + yinc = -rc.top; + + MinMax.ptMaxSize.x = rc.right - rc.left; + MinMax.ptMaxSize.y = rc.bottom - rc.top; + if (style & (WS_DLGFRAME | WS_BORDER)) { - MinMax.ptMaxSize.x = GetSystemMetrics(SM_CXSCREEN); - MinMax.ptMaxSize.y = GetSystemMetrics(SM_CYSCREEN); MinMax.ptMinTrackSize.x = GetSystemMetrics(SM_CXMINTRACK); MinMax.ptMinTrackSize.y = GetSystemMetrics(SM_CYMINTRACK); - MinMax.ptMaxTrackSize.x = GetSystemMetrics(SM_CXMAXTRACK); - MinMax.ptMaxTrackSize.y = GetSystemMetrics(SM_CYMAXTRACK); - - if (HAS_DLGFRAME( style, exstyle )) - { - xinc = GetSystemMetrics(SM_CXDLGFRAME); - yinc = GetSystemMetrics(SM_CYDLGFRAME); - } - else - { - xinc = yinc = 0; - if (HAS_THICKFRAME(style)) - { - xinc += GetSystemMetrics(SM_CXFRAME); - yinc += GetSystemMetrics(SM_CYFRAME); - } - if (style & WS_BORDER) - { - xinc += GetSystemMetrics(SM_CXBORDER); - yinc += GetSystemMetrics(SM_CYBORDER); - } - } - MinMax.ptMaxSize.x += 2 * xinc; - MinMax.ptMaxSize.y += 2 * yinc; } + else + { + MinMax.ptMinTrackSize.x = 2 * xinc; + MinMax.ptMinTrackSize.y = 2 * yinc; + } + MinMax.ptMaxTrackSize.x = GetSystemMetrics(SM_CXMAXTRACK); + MinMax.ptMaxTrackSize.y = GetSystemMetrics(SM_CYMAXTRACK); MinMax.ptMaxPosition.x = -xinc; MinMax.ptMaxPosition.y = -yinc; + if ((win = WIN_GetPtr( hwnd )) && win != WND_DESKTOP && win != WND_OTHER_PROCESS) { if (!EMPTYPOINT(win->max_pos)) MinMax.ptMaxPosition = win->max_pos;

1 0

Andrew Nguyen : gdi32: Stub the NamedEscape function.
by Alexandre Julliard Jan. 27, 2009

Jan. 27, 2009

Module: wine Branch: master Commit: e670b01f39b13ee49ca379331350a1bc6c3ea5da URL: http://source.winehq.org/git/wine.git/?a=commit;h=e670b01f39b13ee49ca379331… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Sun Jan 25 01:04:25 2009 -0600 gdi32: Stub the NamedEscape function. --- dlls/gdi32/driver.c | 12 ++++++++++++ dlls/gdi32/gdi32.spec | 2 +- 2 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 21342bb..101bad4 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -729,3 +729,15 @@ INT WINAPI DrawEscape(HDC hdc, INT nEscape, INT cbInput, LPCSTR lpszInData) FIXME("DrawEscape, stub\n"); return 0; } + +/******************************************************************* + * NamedEscape [GDI32.@] + */ +INT WINAPI NamedEscape( HDC hdc, LPCWSTR pDriver, INT nEscape, INT cbInput, LPCSTR lpszInData, + INT cbOutput, LPSTR lpszOutData ) +{ + FIXME("(%p, %s, %d, %d, %p, %d, %p)\n", + hdc, wine_dbgstr_w(pDriver), nEscape, cbInput, lpszInData, cbOutput, + lpszOutData); + return 0; +} diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 99df6d1..36a8fb1 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -365,7 +365,7 @@ # @ stub MirrorRgn @ stdcall ModifyWorldTransform(long ptr long) @ stdcall MoveToEx(long long long ptr) -# @ stub NamedEscape +@ stdcall NamedEscape(long wstr long long ptr long ptr) @ stdcall OffsetClipRgn(long long long) @ stdcall OffsetRgn(long long long) @ stdcall OffsetViewportOrgEx(long long long ptr)

1 0

Florian Köberle : user32: Fix maximized child windows.
by Alexandre Julliard Jan. 27, 2009

Jan. 27, 2009

Module: wine Branch: master Commit: 8afc5fe6d5509a8f63a0c5fde8151aa7bc685dc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8afc5fe6d5509a8f63a0c5fde… Author: Florian Köberle <florian(a)fkoeberle.de> Date: Sat Jan 24 18:06:41 2009 +0100 user32: Fix maximized child windows. --- dlls/user32/tests/win.c | 9 --------- dlls/user32/winpos.c | 7 +++++-- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 93c6039..dcfe103 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -5190,15 +5190,6 @@ static void test_fullscreen(void) /* Windows makes a maximized window slightly larger (to hide the borders?) */ fixup = min(abs(rc.left), abs(rc.top)); InflateRect(&rc, -fixup, -fixup); - /* FIXME: this doesn't work correctly in Wine for child windows yet */ - if (style & WS_CHILD) - todo_wine - ok(rc.left >= mi.rcWork.left && rc.top <= mi.rcWork.top && - rc.right <= mi.rcWork.right && rc.bottom <= mi.rcWork.bottom, - "%#x/%#x: window rect %d,%d-%d,%d must be in %d,%d-%d,%d\n", - ex_style, style, rc.left, rc.top, rc.right, rc.bottom, - mi.rcWork.left, mi.rcWork.top, mi.rcWork.right, mi.rcWork.bottom); - else ok(rc.left >= mi.rcWork.left && rc.top <= mi.rcWork.top && rc.right <= mi.rcWork.right && rc.bottom <= mi.rcWork.bottom, "%#x/%#x: window rect %d,%d-%d,%d must be in %d,%d-%d,%d\n", diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index f758514..b9f7b1a 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -658,6 +658,7 @@ void WINPOS_GetMinMaxInfo( HWND hwnd, POINT *maxSize, POINT *maxPos, HMONITOR monitor; INT xinc, yinc; LONG style = GetWindowLongW( hwnd, GWL_STYLE ); + LONG adjustedStyle; LONG exstyle = GetWindowLongW( hwnd, GWL_EXSTYLE ); RECT rc; WND *win; @@ -671,10 +672,12 @@ void WINPOS_GetMinMaxInfo( HWND hwnd, POINT *maxSize, POINT *maxPos, if (style & WS_CHILD) { if ((style & WS_CAPTION) == WS_CAPTION) - style &= ~WS_BORDER; /* WS_CAPTION = WS_DLGFRAME | WS_BORDER */ + adjustedStyle = style & ~WS_BORDER; /* WS_CAPTION = WS_DLGFRAME | WS_BORDER */ + else + adjustedStyle = style; GetClientRect(GetAncestor(hwnd,GA_PARENT), &rc); - AdjustWindowRectEx(&rc, style, ((style & WS_POPUP) && GetMenu(hwnd)), exstyle); + AdjustWindowRectEx(&rc, adjustedStyle, ((style & WS_POPUP) && GetMenu(hwnd)), exstyle); MinMax.ptMaxSize.x = rc.right - rc.left; MinMax.ptMaxSize.y = rc.bottom - rc.top;

1 0

Florian Köberle : user32/tests: Improved an error message.
by Alexandre Julliard Jan. 27, 2009

Jan. 27, 2009

Module: wine Branch: master Commit: 4cfb1e6952e7b4ae16228b103790bf1512979d8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4cfb1e6952e7b4ae16228b103… Author: Florian Köberle <florian(a)fkoeberle.de> Date: Sat Jan 24 18:06:40 2009 +0100 user32/tests: Improved an error message. --- dlls/user32/tests/win.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 13534ab..93c6039 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -5195,11 +5195,15 @@ static void test_fullscreen(void) todo_wine ok(rc.left >= mi.rcWork.left && rc.top <= mi.rcWork.top && rc.right <= mi.rcWork.right && rc.bottom <= mi.rcWork.bottom, - "%#x/%#x: window rect %d,%d-%d,%d\n", ex_style, style, rc.left, rc.top, rc.right, rc.bottom); + "%#x/%#x: window rect %d,%d-%d,%d must be in %d,%d-%d,%d\n", + ex_style, style, rc.left, rc.top, rc.right, rc.bottom, + mi.rcWork.left, mi.rcWork.top, mi.rcWork.right, mi.rcWork.bottom); else ok(rc.left >= mi.rcWork.left && rc.top <= mi.rcWork.top && rc.right <= mi.rcWork.right && rc.bottom <= mi.rcWork.bottom, - "%#x/%#x: window rect %d,%d-%d,%d\n", ex_style, style, rc.left, rc.top, rc.right, rc.bottom); + "%#x/%#x: window rect %d,%d-%d,%d must be in %d,%d-%d,%d\n", + ex_style, style, rc.left, rc.top, rc.right, rc.bottom, + mi.rcWork.left, mi.rcWork.top, mi.rcWork.right, mi.rcWork.bottom); DestroyWindow(hwnd); style = t_style[i] | WS_MAXIMIZE | WS_MAXIMIZEBOX;

1 0