wine-commits October 2010

wine-commits@winehq.org

2 participants
1174 discussions

Vincent Povirk : mscoree: Add stub implementation of ICLRMetaHost.
by Alexandre Julliard 05 Oct '10

05 Oct '10

Module: wine Branch: master Commit: fce6f93b48b9bd5e13cb52a2c122f79575a476ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=fce6f93b48b9bd5e13cb52a2c… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Sep 22 14:09:04 2010 -0500 mscoree: Add stub implementation of ICLRMetaHost. --- dlls/mscoree/Makefile.in | 1 + dlls/mscoree/metahost.c | 154 ++++++++++++++++++++++++++++++++++++++++ dlls/mscoree/mscoree_main.c | 9 ++- dlls/mscoree/mscoree_private.h | 2 + dlls/mscoree/tests/metahost.c | 4 +- 5 files changed, 166 insertions(+), 4 deletions(-) diff --git a/dlls/mscoree/Makefile.in b/dlls/mscoree/Makefile.in index 9f7149d..6346aa9 100644 --- a/dlls/mscoree/Makefile.in +++ b/dlls/mscoree/Makefile.in @@ -3,6 +3,7 @@ IMPORTS = uuid shell32 advapi32 C_SRCS = \ corruntimehost.c \ + metahost.c \ mscoree_main.c @MAKE_DLL_RULES@ diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c new file mode 100644 index 0000000..a6de737 --- /dev/null +++ b/dlls/mscoree/metahost.c @@ -0,0 +1,154 @@ +/* + * ICLRMetaHost - discovery and management of available .NET runtimes + * + * Copyright 2010 Vincent Povirk for CodeWeavers + * + * 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 + */ + +#include <stdarg.h> + +#define COBJMACROS + +#include "wine/unicode.h" +#include "wine/library.h" +#include "windef.h" +#include "winbase.h" +#include "ole2.h" + +#include "mscoree.h" +#include "metahost.h" +#include "mscoree_private.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL( mscoree ); + +struct CLRMetaHost +{ + const struct ICLRMetaHostVtbl *CLRMetaHost_vtbl; +}; + +static const struct CLRMetaHost GlobalCLRMetaHost; + +static HRESULT WINAPI CLRMetaHost_QueryInterface(ICLRMetaHost* iface, + REFIID riid, + void **ppvObject) +{ + TRACE("%s %p\n", debugstr_guid(riid), ppvObject); + + if ( IsEqualGUID( riid, &IID_ICLRMetaHost ) || + IsEqualGUID( riid, &IID_IUnknown ) ) + { + *ppvObject = iface; + } + else + { + FIXME("Unsupported interface %s\n", debugstr_guid(riid)); + return E_NOINTERFACE; + } + + ICLRMetaHost_AddRef( iface ); + + return S_OK; +} + +static ULONG WINAPI CLRMetaHost_AddRef(ICLRMetaHost* iface) +{ + return 2; +} + +static ULONG WINAPI CLRMetaHost_Release(ICLRMetaHost* iface) +{ + return 1; +} + +static HRESULT WINAPI CLRMetaHost_GetRuntime(ICLRMetaHost* iface, + LPCWSTR pwzVersion, REFIID iid, LPVOID *ppRuntime) +{ + FIXME("%s %s %p\n", debugstr_w(pwzVersion), debugstr_guid(iid), ppRuntime); + + return E_NOTIMPL; +} + +static HRESULT WINAPI CLRMetaHost_GetVersionFromFile(ICLRMetaHost* iface, + LPCWSTR pwzFilePath, LPWSTR pwzBuffer, DWORD *pcchBuffer) +{ + FIXME("%s %p %p\n", debugstr_w(pwzFilePath), pwzBuffer, pcchBuffer); + + return E_NOTIMPL; +} + +static HRESULT WINAPI CLRMetaHost_EnumerateInstalledRuntimes(ICLRMetaHost* iface, + IEnumUnknown **ppEnumerator) +{ + FIXME("%p\n", ppEnumerator); + + return E_NOTIMPL; +} + +static HRESULT WINAPI CLRMetaHost_EnumerateLoadedRuntimes(ICLRMetaHost* iface, + HANDLE hndProcess, IEnumUnknown **ppEnumerator) +{ + FIXME("%p %p\n", hndProcess, ppEnumerator); + + return E_NOTIMPL; +} + +static HRESULT WINAPI CLRMetaHost_RequestRuntimeLoadedNotification(ICLRMetaHost* iface, + RuntimeLoadedCallbackFnPtr pCallbackFunction) +{ + FIXME("%p\n", pCallbackFunction); + + return E_NOTIMPL; +} + +static HRESULT WINAPI CLRMetaHost_QueryLegacyV2RuntimeBinding(ICLRMetaHost* iface, + REFIID riid, LPVOID *ppUnk) +{ + FIXME("%s %p\n", debugstr_guid(riid), ppUnk); + + return E_NOTIMPL; +} + +static HRESULT WINAPI CLRMetaHost_ExitProcess(ICLRMetaHost* iface, INT32 iExitCode) +{ + FIXME("%i: stub\n", iExitCode); + + ExitProcess(iExitCode); +} + +static const struct ICLRMetaHostVtbl CLRMetaHost_vtbl = +{ + CLRMetaHost_QueryInterface, + CLRMetaHost_AddRef, + CLRMetaHost_Release, + CLRMetaHost_GetRuntime, + CLRMetaHost_GetVersionFromFile, + CLRMetaHost_EnumerateInstalledRuntimes, + CLRMetaHost_EnumerateLoadedRuntimes, + CLRMetaHost_RequestRuntimeLoadedNotification, + CLRMetaHost_QueryLegacyV2RuntimeBinding, + CLRMetaHost_ExitProcess +}; + +static const struct CLRMetaHost GlobalCLRMetaHost = { + &CLRMetaHost_vtbl +}; + +extern HRESULT CLRMetaHost_CreateInstance(REFIID riid, void **ppobj) +{ + return ICLRMetaHost_QueryInterface((ICLRMetaHost*)&GlobalCLRMetaHost, riid, ppobj); +} diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index 7b33619..5203a41 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -642,9 +642,14 @@ BOOL WINAPI StrongNameSignatureVerificationEx(LPCWSTR filename, BOOL forceVerifi HRESULT WINAPI CLRCreateInstance(REFCLSID clsid, REFIID riid, LPVOID *ppInterface) { - FIXME("(%s,%s,%p): stub\n", debugstr_guid(clsid), debugstr_guid(riid), ppInterface); + TRACE("(%s,%s,%p)\n", debugstr_guid(clsid), debugstr_guid(riid), ppInterface); - return E_NOTIMPL; + if (IsEqualGUID(clsid, &CLSID_CLRMetaHost)) + return CLRMetaHost_CreateInstance(riid, ppInterface); + + FIXME("not implemented for class %s\n", debugstr_guid(clsid)); + + return CLASS_E_CLASSNOTAVAILABLE; } HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID* ppv) diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index f14da1d..dda9bc0 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -22,6 +22,8 @@ extern IUnknown* create_corruntimehost(void); +extern HRESULT CLRMetaHost_CreateInstance(REFIID riid, void **ppobj); + /* Mono 2.6 embedding */ typedef struct _MonoDomain MonoDomain; typedef struct _MonoAssembly MonoAssembly; diff --git a/dlls/mscoree/tests/metahost.c b/dlls/mscoree/tests/metahost.c index 27bed7f..5b3ed2c 100644 --- a/dlls/mscoree/tests/metahost.c +++ b/dlls/mscoree/tests/metahost.c @@ -47,7 +47,7 @@ BOOL init_pointers(void) if (FAILED(hr)) { - todo_wine win_skip(".NET 4 is not installed\n"); + win_skip(".NET 4 is not installed\n"); FreeLibrary(hmscoree); return FALSE; } @@ -72,7 +72,7 @@ void test_enumruntimes(void) WCHAR buf[MAX_PATH]; hr = ICLRMetaHost_EnumerateInstalledRuntimes(metahost, &runtime_enum); - ok(hr == S_OK, "EnumerateInstalledRuntimes returned %x\n", hr); + todo_wine ok(hr == S_OK, "EnumerateInstalledRuntimes returned %x\n", hr); if (FAILED(hr)) return; while ((hr = IEnumUnknown_Next(runtime_enum, 1, &unk, &count)) == S_OK)

1 0

Vincent Povirk : fusion: Return the path from IAssemblyCacheImpl_QueryAssemblyInfo.
by Alexandre Julliard 05 Oct '10

05 Oct '10

Module: wine Branch: master Commit: 1b978eadde8d78f5f03c28fdafd95ab350b62a23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b978eadde8d78f5f03c28fda… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Oct 4 14:14:23 2010 -0500 fusion: Return the path from IAssemblyCacheImpl_QueryAssemblyInfo. --- dlls/fusion/asmcache.c | 2 + dlls/fusion/asmenum.c | 21 ++++++-- dlls/fusion/asmname.c | 41 ++++++++++++++++ dlls/fusion/fusionpriv.h | 3 + dlls/fusion/tests/asmcache.c | 107 ++++++++++++++++++++--------------------- 5 files changed, 113 insertions(+), 61 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1b978eadde8d78f5f03c2…

1 0

Francois Gouget : shdocvw: Add a space before ellipses in the Slovenian translation.
by Alexandre Julliard 05 Oct '10

05 Oct '10

Module: wine Branch: master Commit: bb4ba69942e7928222f8c6e036afee5bd19dd60e URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb4ba69942e7928222f8c6e03… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Oct 4 18:05:11 2010 +0200 shdocvw: Add a space before ellipses in the Slovenian translation. --- dlls/shdocvw/Si.rc | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/shdocvw/Si.rc b/dlls/shdocvw/Si.rc index c6b1a26..35d5014 100644 --- a/dlls/shdocvw/Si.rc +++ b/dlls/shdocvw/Si.rc @@ -42,15 +42,15 @@ IDR_BROWSE_MAIN_MENU MENU { MENUITEM "&Okno" ID_BROWSE_NEW_WINDOW } - MENUITEM "&Odpri...", ID_BROWSE_OPEN + MENUITEM "&Odpri ...", ID_BROWSE_OPEN MENUITEM "&Shrani", ID_BROWSE_SAVE - MENUITEM "Shrani &kot...", ID_BROWSE_SAVE_AS + MENUITEM "Shrani &kot ...", ID_BROWSE_SAVE_AS MENUITEM SEPARATOR - MENUITEM "Nastavitve tiskanja...", ID_BROWSE_PRINT_FORMAT - MENUITEM "Na&tisni...", ID_BROWSE_PRINT - MENUITEM "Predo&gled tiskanja...", ID_BROWSE_PRINT_PREVIEW + MENUITEM "Nastavitve tiskanja ...", ID_BROWSE_PRINT_FORMAT + MENUITEM "Na&tisni ...", ID_BROWSE_PRINT + MENUITEM "Predo&gled tiskanja ...", ID_BROWSE_PRINT_PREVIEW MENUITEM SEPARATOR - MENUITEM "&Lastnosti...", ID_BROWSE_PROPERTIES + MENUITEM "&Lastnosti ...", ID_BROWSE_PROPERTIES MENUITEM "&Zapri", ID_BROWSE_QUIT } POPUP "Pogl&ed" @@ -63,12 +63,12 @@ IDR_BROWSE_MAIN_MENU MENU } POPUP "&Priljubljene" { - MENUITEM "&Dodaj med priljubljene..." ID_BROWSE_ADDFAV + MENUITEM "&Dodaj med priljubljene ..." ID_BROWSE_ADDFAV MENUITEM SEPARATOR } POPUP "&Pomoč" { - MENUITEM "O programu Internet Explorer...", ID_BROWSE_ABOUT + MENUITEM "O programu Internet Explorer ...",ID_BROWSE_ABOUT } }

1 0

Francois Gouget : mshtml: Add a space before ellipses in the Slovenian translation.
by Alexandre Julliard 05 Oct '10

05 Oct '10

Module: wine Branch: master Commit: 2174e77d34c2649ad4b679bb4ff6324a8cf3732a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2174e77d34c2649ad4b679bb4… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Oct 4 18:04:58 2010 +0200 mshtml: Add a space before ellipses in the Slovenian translation. --- dlls/mshtml/Si.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/Si.rc b/dlls/mshtml/Si.rc index 7e40100..96d0dfa 100644 --- a/dlls/mshtml/Si.rc +++ b/dlls/mshtml/Si.rc @@ -25,7 +25,7 @@ LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT STRINGTABLE { IDS_STATUS_DONE "Končano" - IDS_STATUS_DOWNLOADINGFROM "Prenašam iz %s..." + IDS_STATUS_DOWNLOADINGFROM "Prenašam iz %s ..." } STRINGTABLE

1 0

Alexandre Julliard : advapi32/tests: Don' t bother running HKCR tests when the registry key doesn't exist.
by Alexandre Julliard 05 Oct '10

05 Oct '10

Module: wine Branch: master Commit: 625bce13fb56c325c0af24e7c706a796adb9852e URL: http://source.winehq.org/git/wine.git/?a=commit;h=625bce13fb56c325c0af24e7c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 5 10:58:45 2010 +0200 advapi32/tests: Don't bother running HKCR tests when the registry key doesn't exist. --- dlls/advapi32/tests/registry.c | 31 ++++++++++++++++--------------- 1 files changed, 16 insertions(+), 15 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 8322d89..8b0dbee 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -1922,7 +1922,10 @@ static void test_classesroot(void) /* create a key in the user's classes */ if (!RegOpenKeyA( HKEY_CURRENT_USER, "Software\\Classes\\WineTestCls", &hkey )) + { delete_key( hkey ); + RegCloseKey( hkey ); + } if (RegCreateKeyExA( HKEY_CURRENT_USER, "Software\\Classes\\WineTestCls", 0, NULL, 0, KEY_QUERY_VALUE|KEY_SET_VALUE, NULL, &hkey, NULL )) return; @@ -1932,6 +1935,13 @@ static void test_classesroot(void) todo_wine ok(res == ERROR_SUCCESS || broken(res == ERROR_FILE_NOT_FOUND /* Win9x */), "test key not found in hkcr: %d\n", res); + if (res) + { + trace( "HKCR key merging not supported\n" ); + delete_key( hkey ); + RegCloseKey( hkey ); + return; + } /* set a value in user's classes */ res = RegSetValueExA(hkey, "val1", 0, REG_SZ, (const BYTE *)"user", sizeof("user")); @@ -1939,31 +1949,22 @@ static void test_classesroot(void) /* try to find the value in hkcr */ res = RegQueryValueExA(hkcr, "val1", NULL, &type, (LPBYTE)buffer, &size); - todo_wine - { - ok(res == ERROR_SUCCESS || - broken(res == ERROR_BADKEY /* Win9x */) || - broken(res == ERROR_INVALID_HANDLE /* NT+ */), - "RegQueryValueExA failed: %d, GLE=%x\n", res, GetLastError()); - ok(!strcmp( buffer, "user" ) || broken(!strcmp( buffer, "" ) /* Win9x */), - "value set to '%s'\n", buffer ); - } + ok(res == ERROR_SUCCESS, "RegQueryValueExA failed: %d\n", res); + ok(!strcmp( buffer, "user" ), "value set to '%s'\n", buffer ); /* modify the value in hkcr */ res = RegSetValueExA(hkcr, "val1", 0, REG_SZ, (const BYTE *)"hkcr", sizeof("hkcr")); - todo_wine ok(res == ERROR_SUCCESS || - broken(res == ERROR_BADKEY /* Win9x */) || - broken(res == ERROR_INVALID_HANDLE /* NT+ */), - "RegSetValueExA failed: %d, GLE=%x\n", res, GetLastError()); + ok(res == ERROR_SUCCESS, "RegSetValueExA failed: %d\n", res); /* check if the value is also modified in user's classes */ res = RegQueryValueExA(hkey, "val1", NULL, &type, (LPBYTE)buffer, &size); ok(res == ERROR_SUCCESS, "RegQueryValueExA failed: %d, GLE=%x\n", res, GetLastError()); - todo_wine ok(!strcmp( buffer, "hkcr" ) || broken(!strcmp( buffer, "user" ) /* Win9x */), - "value set to '%s'\n", buffer ); + ok(!strcmp( buffer, "hkcr" ), "value set to '%s'\n", buffer ); /* cleanup */ delete_key( hkey ); + RegCloseKey( hkey ); + RegCloseKey( hkcr ); } static void test_deleted_key(void)

1 0

Alexandre Julliard : winex11: Mirror the DC exposure region for RTL devices .
by Alexandre Julliard 05 Oct '10

05 Oct '10

Module: wine Branch: master Commit: 84102e758f19edb5a03b3d1cbda4c508a010ac7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=84102e758f19edb5a03b3d1cb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 4 20:41:11 2010 +0200 winex11: Mirror the DC exposure region for RTL devices. --- dlls/winex11.drv/init.c | 20 +++++++++++--------- dlls/winex11.drv/x11drv.h | 8 ++++++++ 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index 1462b5e..7df6fe2 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -388,18 +388,20 @@ INT CDECL X11DRV_ExtEscape( X11DRV_PDEVICE *physDev, INT escape, INT in_count, L if (event.type == NoExpose) break; if (event.type == GraphicsExpose) { - int x = event.xgraphicsexpose.x - physDev->dc_rect.left; - int y = event.xgraphicsexpose.y - physDev->dc_rect.top; + RECT rect; - TRACE( "got %d,%d %dx%d count %d\n", x, y, - event.xgraphicsexpose.width, - event.xgraphicsexpose.height, + rect.left = event.xgraphicsexpose.x - physDev->dc_rect.left; + rect.top = event.xgraphicsexpose.y - physDev->dc_rect.top; + rect.right = rect.left + event.xgraphicsexpose.width; + rect.bottom = rect.top + event.xgraphicsexpose.height; + if (GetLayout( physDev->hdc ) & LAYOUT_RTL) + mirror_rect( &physDev->dc_rect, &rect ); + + TRACE( "got %s count %d\n", wine_dbgstr_rect(&rect), event.xgraphicsexpose.count ); - if (!tmp) tmp = CreateRectRgn( 0, 0, 0, 0 ); - SetRectRgn( tmp, x, y, - x + event.xgraphicsexpose.width, - y + event.xgraphicsexpose.height ); + if (!tmp) tmp = CreateRectRgnIndirect( &rect ); + else SetRectRgn( tmp, rect.left, rect.top, rect.right, rect.bottom ); if (hrgn) CombineRgn( hrgn, hrgn, tmp, RGN_OR ); else { diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 3590d44..a4b9d76 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -777,6 +777,14 @@ extern void update_user_time( Time time ); extern void update_net_wm_states( Display *display, struct x11drv_win_data *data ); extern void make_window_embedded( Display *display, struct x11drv_win_data *data ); +static inline void mirror_rect( const RECT *window_rect, RECT *rect ) +{ + int width = window_rect->right - window_rect->left; + int tmp = rect->left; + rect->left = width - rect->right; + rect->right = width - tmp; +} + /* X context to associate a hwnd to an X window */ extern XContext winContext;

1 0

Alexandre Julliard : server: Update child window positions when resizing a mirrored parent.
by Alexandre Julliard 05 Oct '10

05 Oct '10

Module: wine Branch: master Commit: d076dfa8e817688641184e91b6ceedc72a13a296 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d076dfa8e817688641184e91b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 4 20:12:44 2010 +0200 server: Update child window positions when resizing a mirrored parent. --- dlls/user32/tests/win.c | 20 ++++++++++++++++++++ server/window.c | 19 +++++++++++++++++-- 2 files changed, 37 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index f1f590c..50c5be5 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -6213,6 +6213,26 @@ static void test_rtl_layout(void) pt.x = pt.y = 12; MapWindowPoints( child, parent, &pt, 1 ); ok( pt.x == 22 && pt.y == 22, "wrong point %d,%d\n", pt.x, pt.y ); + SetWindowPos( parent, 0, 0, 0, 250, 250, SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE ); + GetWindowRect( parent, &r ); + ok( r.left == 100 && r.right == 350, "wrong rect %d,%d - %d,%d\n", r.left, r.top, r.right, r.bottom ); + GetWindowRect( child, &r ); + ok( r.left == 320 && r.right == 340, "wrong rect %d,%d - %d,%d\n", r.left, r.top, r.right, r.bottom ); + SetWindowLongW( parent, GWL_EXSTYLE, 0 ); + GetWindowRect( child, &r ); + ok( r.left == 320 && r.right == 340, "wrong rect %d,%d - %d,%d\n", r.left, r.top, r.right, r.bottom ); + MapWindowPoints( NULL, parent, (POINT *)&r, 2 ); + ok( r.left == 220 && r.right == 240, "wrong rect %d,%d - %d,%d\n", r.left, r.top, r.right, r.bottom ); + SetWindowLongW( parent, GWL_EXSTYLE, WS_EX_LAYOUTRTL ); + GetWindowRect( child, &r ); + ok( r.left == 320 && r.right == 340, "wrong rect %d,%d - %d,%d\n", r.left, r.top, r.right, r.bottom ); + MapWindowPoints( NULL, parent, (POINT *)&r, 2 ); + ok( r.left == 10 && r.right == 30, "wrong rect %d,%d - %d,%d\n", r.left, r.top, r.right, r.bottom ); + SetWindowPos( child, 0, 0, 0, 30, 30, SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE ); + GetWindowRect( child, &r ); + ok( r.left == 310 && r.right == 340, "wrong rect %d,%d - %d,%d\n", r.left, r.top, r.right, r.bottom ); + MapWindowPoints( NULL, parent, (POINT *)&r, 2 ); + ok( r.left == 10 && r.right == 40, "wrong rect %d,%d - %d,%d\n", r.left, r.top, r.right, r.bottom ); DestroyWindow( child ); DestroyWindow( parent ); } diff --git a/server/window.c b/server/window.c index 8900751..c8c075f 100644 --- a/server/window.c +++ b/server/window.c @@ -1536,6 +1536,21 @@ static void set_window_pos( struct window *win, struct window *previous, if (swp_flags & SWP_SHOWWINDOW) win->style |= WS_VISIBLE; else if (swp_flags & SWP_HIDEWINDOW) win->style &= ~WS_VISIBLE; + /* keep children at the same position relative to top right corner when the parent is mirrored */ + if (win->ex_style & WS_EX_LAYOUTRTL) + { + struct window *child; + int old_size = old_client_rect.right - old_client_rect.left; + int new_size = win->client_rect.right - win->client_rect.left; + + if (old_size != new_size) LIST_FOR_EACH_ENTRY( child, &win->children, struct window, entry ) + { + offset_rect( &child->window_rect, new_size - old_size, 0 ); + offset_rect( &child->visible_rect, new_size - old_size, 0 ); + offset_rect( &child->client_rect, new_size - old_size, 0 ); + } + } + /* if the window is not visible, everything is easy */ if (!visible) return; @@ -2237,7 +2252,7 @@ DECL_HANDLER(get_windows_offset) if (win->ex_style & WS_EX_LAYOUTRTL) { mirror_from = 1; - reply->x += win->client_rect.right - win->client_rect.left - 1; + reply->x += win->client_rect.right - win->client_rect.left; } while (win && !is_desktop_window(win)) { @@ -2252,7 +2267,7 @@ DECL_HANDLER(get_windows_offset) if (win->ex_style & WS_EX_LAYOUTRTL) { mirror_to = 1; - reply->x -= win->client_rect.right - win->client_rect.left - 1; + reply->x -= win->client_rect.right - win->client_rect.left; } while (win && !is_desktop_window(win)) {

1 0

Alexandre Julliard : user32: Don' t rely on the cached position for windows that have a mirrored parent.
by Alexandre Julliard 05 Oct '10

05 Oct '10

Module: wine Branch: master Commit: 377820e313e72d064df3304af3032acf24a4e755 URL: http://source.winehq.org/git/wine.git/?a=commit;h=377820e313e72d064df3304af… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 4 20:12:36 2010 +0200 user32: Don't rely on the cached position for windows that have a mirrored parent. --- dlls/user32/win.c | 11 +++++++++++ dlls/user32/win.h | 1 + dlls/user32/winpos.c | 21 +++++++++++++++++++-- 3 files changed, 31 insertions(+), 2 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index ee44278..1b67329 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -709,6 +709,12 @@ BOOL WIN_GetRectangles( HWND hwnd, enum coords_relative relative, RECT *rectWind WIN_ReleasePtr( win ); goto other_process; } + if (parent->flags & WIN_CHILDREN_MOVED) + { + WIN_ReleasePtr( parent ); + WIN_ReleasePtr( win ); + goto other_process; + } if (parent->dwExStyle & WS_EX_LAYOUTRTL) { mirror_rect( &parent->rectClient, &window_rect ); @@ -728,6 +734,11 @@ BOOL WIN_GetRectangles( HWND hwnd, enum coords_relative relative, RECT *rectWind goto other_process; } WIN_ReleasePtr( win ); + if (parent->flags & WIN_CHILDREN_MOVED) + { + WIN_ReleasePtr( parent ); + goto other_process; + } win = parent; OffsetRect( &window_rect, win->rectClient.left, win->rectClient.top ); OffsetRect( &client_rect, win->rectClient.left, win->rectClient.top ); diff --git a/dlls/user32/win.h b/dlls/user32/win.h index 6907889..13ee58e 100644 --- a/dlls/user32/win.h +++ b/dlls/user32/win.h @@ -72,6 +72,7 @@ typedef struct tagWND #define WIN_ISMDICLIENT 0x0008 /* Window is an MDIClient */ #define WIN_ISUNICODE 0x0010 /* Window is Unicode */ #define WIN_NEEDS_SHOW_OWNEDPOPUP 0x0020 /* WM_SHOWWINDOW:SC_SHOW must be sent in the next ShowOwnedPopup call */ +#define WIN_CHILDREN_MOVED 0x0040 /* children may have moved, ignore stored positions */ /* Window functions */ extern HWND get_hwnd_message_parent(void) DECLSPEC_HIDDEN; diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index ca3b8e0..716616f 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -445,7 +445,7 @@ static POINT WINPOS_GetWinOffset( HWND hwndFrom, HWND hwndTo, BOOL *mirrored ) mirror_from = TRUE; offset.x += wndPtr->rectClient.right - wndPtr->rectClient.left; } - while (wndPtr != WND_DESKTOP) + for (;;) { offset.x += wndPtr->rectClient.left; offset.y += wndPtr->rectClient.top; @@ -453,6 +453,12 @@ static POINT WINPOS_GetWinOffset( HWND hwndFrom, HWND hwndTo, BOOL *mirrored ) WIN_ReleasePtr( wndPtr ); if (!(wndPtr = WIN_GetPtr( hwnd ))) break; if (wndPtr == WND_OTHER_PROCESS) goto other_process; + if (wndPtr == WND_DESKTOP) break; + if (wndPtr->flags & WIN_CHILDREN_MOVED) + { + WIN_ReleasePtr( wndPtr ); + goto other_process; + } } } } @@ -469,7 +475,7 @@ static POINT WINPOS_GetWinOffset( HWND hwndFrom, HWND hwndTo, BOOL *mirrored ) mirror_to = TRUE; offset.x -= wndPtr->rectClient.right - wndPtr->rectClient.left; } - while (wndPtr != WND_DESKTOP) + for (;;) { offset.x -= wndPtr->rectClient.left; offset.y -= wndPtr->rectClient.top; @@ -477,6 +483,12 @@ static POINT WINPOS_GetWinOffset( HWND hwndFrom, HWND hwndTo, BOOL *mirrored ) WIN_ReleasePtr( wndPtr ); if (!(wndPtr = WIN_GetPtr( hwnd ))) break; if (wndPtr == WND_OTHER_PROCESS) goto other_process; + if (wndPtr == WND_DESKTOP) break; + if (wndPtr->flags & WIN_CHILDREN_MOVED) + { + WIN_ReleasePtr( wndPtr ); + goto other_process; + } } } } @@ -1932,6 +1944,7 @@ BOOL set_window_pos( HWND hwnd, HWND insert_after, UINT swp_flags, WND *win; BOOL ret; RECT visible_rect, old_window_rect; + int old_width; visible_rect = *window_rect; USER_Driver->pWindowPosChanging( hwnd, insert_after, swp_flags, @@ -1941,6 +1954,7 @@ BOOL set_window_pos( HWND hwnd, HWND insert_after, UINT swp_flags, if (!(win = WIN_GetPtr( hwnd ))) return FALSE; if (win == WND_DESKTOP || win == WND_OTHER_PROCESS) return FALSE; + old_width = win->rectClient.right - win->rectClient.left; SERVER_START_REQ( set_window_pos ) { @@ -1974,6 +1988,9 @@ BOOL set_window_pos( HWND hwnd, HWND insert_after, UINT swp_flags, mirror_rect( &client, &win->rectWindow ); mirror_rect( &client, &win->rectClient ); } + /* if an RTL window is resized the children have moved */ + if (win->dwExStyle & WS_EX_LAYOUTRTL && client_rect->right - client_rect->left != old_width) + win->flags |= WIN_CHILDREN_MOVED; } } SERVER_END_REQ;

1 0

Vincent Povirk : mscoree: Add a test that enumerates .NET runtimes.
by Alexandre Julliard 04 Oct '10

04 Oct '10

Module: wine Branch: master Commit: 79ed8429319509db1ca7723661af5fb4a8017320 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79ed8429319509db1ca772366… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Sep 21 16:40:07 2010 -0500 mscoree: Add a test that enumerates .NET runtimes. --- dlls/mscoree/tests/metahost.c | 47 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 47 insertions(+), 0 deletions(-) diff --git a/dlls/mscoree/tests/metahost.c b/dlls/mscoree/tests/metahost.c index b79c9b6..27bed7f 100644 --- a/dlls/mscoree/tests/metahost.c +++ b/dlls/mscoree/tests/metahost.c @@ -62,10 +62,57 @@ void cleanup(void) FreeLibrary(hmscoree); } +void test_enumruntimes(void) +{ + IEnumUnknown *runtime_enum; + IUnknown *unk; + DWORD count; + ICLRRuntimeInfo *runtime_info; + HRESULT hr; + WCHAR buf[MAX_PATH]; + + hr = ICLRMetaHost_EnumerateInstalledRuntimes(metahost, &runtime_enum); + ok(hr == S_OK, "EnumerateInstalledRuntimes returned %x\n", hr); + if (FAILED(hr)) return; + + while ((hr = IEnumUnknown_Next(runtime_enum, 1, &unk, &count)) == S_OK) + { + hr = IUnknown_QueryInterface(unk, &IID_ICLRRuntimeInfo, (void**)&runtime_info); + ok(hr == S_OK, "QueryInterface returned %x\n", hr); + + count = 1; + hr = ICLRRuntimeInfo_GetVersionString(runtime_info, buf, &count); + ok(hr == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), "GetVersionString returned %x\n", hr); + ok(count > 1, "GetVersionString returned count %u\n", count); + + count = 0xdeadbeef; + hr = ICLRRuntimeInfo_GetVersionString(runtime_info, NULL, &count); + ok(hr == S_OK, "GetVersionString returned %x\n", hr); + ok(count > 1 && count != 0xdeadbeef, "GetVersionString returned count %u\n", count); + + count = MAX_PATH; + hr = ICLRRuntimeInfo_GetVersionString(runtime_info, buf, &count); + ok(hr == S_OK, "GetVersionString returned %x\n", hr); + ok(count > 1, "GetVersionString returned count %u\n", count); + + trace("runtime found: %s\n", wine_dbgstr_w(buf)); + + ICLRRuntimeInfo_Release(runtime_info); + + IUnknown_Release(unk); + } + + ok(hr == S_FALSE, "IEnumUnknown_Next returned %x\n", hr); + + IEnumUnknown_Release(runtime_enum); +} + START_TEST(metahost) { if (!init_pointers()) return; + test_enumruntimes(); + cleanup(); }

1 0

Vincent Povirk : include: Add definition of ICLRRuntimeInfo.
by Alexandre Julliard 04 Oct '10

04 Oct '10

Module: wine Branch: master Commit: d1dd372a0c96b0c541ba0780d80e9b052be12b2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1dd372a0c96b0c541ba0780d… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Sep 21 16:36:43 2010 -0500 include: Add definition of ICLRRuntimeInfo. --- include/metahost.idl | 61 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 60 insertions(+), 1 deletions(-) diff --git a/include/metahost.idl b/include/metahost.idl index 369addb..a352556 100644 --- a/include/metahost.idl +++ b/include/metahost.idl @@ -19,7 +19,66 @@ import "wtypes.idl"; import "propidl.idl"; -interface ICLRRuntimeInfo; +cpp_quote("#ifdef WINE_NO_UNICODE_MACROS") +cpp_quote("#undef LoadLibrary") +cpp_quote("#endif") + +[ + object, + local, + uuid(bd39d1d2-ba2f-486a-89b0-b4b0cb466891) +] +interface ICLRRuntimeInfo : IUnknown +{ + HRESULT GetVersionString( + [out, size_is(*pcchBuffer)] LPWSTR pwzBuffer, + [in, out] DWORD *pcchBuffer); + + HRESULT GetRuntimeDirectory( + [out, size_is(*pcchBuffer)] LPWSTR pwzBuffer, + [in, out] DWORD *pcchBuffer); + + HRESULT IsLoaded( + [in] HANDLE hndProcess, + [out, retval] BOOL *pbLoaded); + + HRESULT LoadErrorString( + [in] UINT iResourceID, + [out, size_is(*pcchBuffer)] LPWSTR pwzBuffer, + [in, out] DWORD *pcchBuffer, + [in] LONG iLocaleid); + + HRESULT LoadLibrary( + [in] LPCWSTR pwzDllName, + [out, retval] HMODULE *phndModule); + + HRESULT GetProcAddress( + [in] LPCSTR pszProcName, + [out, retval] LPVOID *ppProc); + + HRESULT GetInterface( + [in] REFCLSID rclsid, + [in] REFIID riid, + [out, iid_is(riid), retval] LPVOID *ppUnk); + + HRESULT IsLoadable( + [out, retval] BOOL *pbLoadable); + + HRESULT SetDefaultStartupFlags( + [in] DWORD dwStartupFlags, + [in] LPCWSTR pwzHostConfigFile); + + HRESULT GetDefaultStartupFlags( + [out] DWORD *pdwStartupFlags, + [out, size_is(*pcchHostConfigFile)] LPWSTR pwzHostConfigFile, + [in, out] DWORD *pcchHostConfigFile); + + HRESULT BindAsLegacyV2Runtime(); + + HRESULT IsStarted( + [out] BOOL *pbStarted, + [out] DWORD *pdwStartupFlags); +}; typedef HRESULT (__stdcall *CallbackThreadSetFnPtr)(); typedef HRESULT (__stdcall *CallbackThreadUnsetFnPtr)();

1 0

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 October 2010