October 2010 - Wine-commits

Detlef Riekenberg : winspool: Remove unused code.
by Alexandre Julliard 05 Oct '10

05 Oct '10

Module: wine Branch: master Commit: b23be05eefcb8c1195f1055e0062040022a39328 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b23be05eefcb8c1195f1055e0… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Oct 5 07:04:41 2010 +0200 winspool: Remove unused code. --- dlls/winspool.drv/info.c | 18 ------------------ 1 files changed, 0 insertions(+), 18 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 2db3100..92098f1 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -337,24 +337,6 @@ static inline BOOL is_local_file(LPWSTR name) return (name[0] && (name[1] == ':') && (name[2] == '\\')); } -/****************************************************************** - * Return the number of bytes for an multi_sz string. - * The result includes all \0s - * (specifically the extra \0, that is needed as multi_sz terminator). - */ -#if 0 -static int multi_sz_lenW(const WCHAR *str) -{ - const WCHAR *ptr = str; - if(!str) return 0; - do - { - ptr += lstrlenW(ptr) + 1; - } while(*ptr); - - return (ptr - str + 1) * sizeof(WCHAR); -} -#endif /* ################################ */ static int multi_sz_lenA(const char *str)

1 0

Dmitry Timoshkov : comctl32: Postpone setting the property sheet focus until the tab control is initialized .
by Alexandre Julliard 05 Oct '10

05 Oct '10

Module: wine Branch: master Commit: 09539e4219c0019b4155dea1f1414ac753bed937 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09539e4219c0019b4155dea1f… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Oct 5 15:18:21 2010 +0900 comctl32: Postpone setting the property sheet focus until the tab control is initialized. --- dlls/comctl32/propsheet.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index 3e313ba..3d2cd3b 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -3415,10 +3415,7 @@ PROPSHEET_DialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { /* set up the Next and Back buttons by default */ PROPSHEET_SetWizButtons(hwnd, PSWIZB_BACK|PSWIZB_NEXT); - SetFocus(GetDlgItem(hwnd, IDC_NEXT_BUTTON)); } - else - SetFocus(GetDlgItem(hwnd, IDOK)); /* Set up fonts */ SystemParametersInfoW (SPI_GETICONTITLELOGFONT, 0, &logFont, 0); @@ -3464,6 +3461,7 @@ PROPSHEET_DialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) ShowWindow(hwndTabCtrl, SW_HIDE); PROPSHEET_AdjustSizeWizard(hwnd, psInfo); PROPSHEET_AdjustButtonsWizard(hwnd, psInfo); + SetFocus(GetDlgItem(hwnd, IDC_NEXT_BUTTON)); } else { @@ -3472,6 +3470,7 @@ PROPSHEET_DialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) PROPSHEET_AdjustSize(hwnd, psInfo); PROPSHEET_AdjustButtons(hwnd, psInfo); } + SetFocus(GetDlgItem(hwnd, IDOK)); } if (IS_INTRESOURCE(psInfo->ppshheader.pszCaption) &&

1 0

Detlef Riekenberg : comctl32: Dump a parameter in a TRACE.
by Alexandre Julliard 05 Oct '10

05 Oct '10

Module: wine Branch: master Commit: 51db7f0a15ac2e15057558006a1f57ebdfb66c47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51db7f0a15ac2e15057558006… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Oct 5 00:29:49 2010 +0200 comctl32: Dump a parameter in a TRACE. --- dlls/comctl32/propsheet.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index 3d2cd3b..e25db1d 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -613,7 +613,7 @@ static INT_PTR PROPSHEET_CreateDialog(PropSheetInfo* psInfo) DWORD resSize; WORD resID = IDD_PROPSHEET; - TRACE("\n"); + TRACE("(%p)\n", psInfo); if (psInfo->ppshheader.dwFlags & INTRNL_ANY_WIZARD) resID = IDD_WIZARD;

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

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 : 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 : 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

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

Vincent Povirk : mscoree: Stub CLRCreateInstance.
by Alexandre Julliard 04 Oct '10

04 Oct '10

Module: wine Branch: master Commit: 1fbb2142488c1fc171b840f42c93237f949c805c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fbb2142488c1fc171b840f42… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Sep 21 15:34:18 2010 -0500 mscoree: Stub CLRCreateInstance. --- dlls/mscoree/mscoree.spec | 1 + dlls/mscoree/mscoree_main.c | 9 +++++++++ include/metahost.idl | 2 ++ 3 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/mscoree/mscoree.spec b/dlls/mscoree/mscoree.spec index 2654813..1d4d7f7 100644 --- a/dlls/mscoree/mscoree.spec +++ b/dlls/mscoree/mscoree.spec @@ -7,6 +7,7 @@ @ stub CallFunctionShim @ stub CloseCtrs +@ stdcall CLRCreateInstance(ptr ptr ptr) @ stdcall ClrCreateManagedInstance(wstr ptr ptr) @ stub CoEEShutDownCOM @ stdcall CoInitializeCor(long) diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index 980bed1..7b33619 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -29,12 +29,14 @@ #include "winnls.h" #include "winreg.h" #include "ole2.h" +#include "ocidl.h" #include "shellapi.h" #include "initguid.h" #include "cor.h" #include "corerror.h" #include "mscoree.h" +#include "metahost.h" #include "mscoree_private.h" #include "wine/debug.h" @@ -638,6 +640,13 @@ BOOL WINAPI StrongNameSignatureVerificationEx(LPCWSTR filename, BOOL forceVerifi return FALSE; } +HRESULT WINAPI CLRCreateInstance(REFCLSID clsid, REFIID riid, LPVOID *ppInterface) +{ + FIXME("(%s,%s,%p): stub\n", debugstr_guid(clsid), debugstr_guid(riid), ppInterface); + + return E_NOTIMPL; +} + HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID* ppv) { FIXME("(%s, %s, %p): stub\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); diff --git a/include/metahost.idl b/include/metahost.idl index d0d3355..369addb 100644 --- a/include/metahost.idl +++ b/include/metahost.idl @@ -65,3 +65,5 @@ interface ICLRMetaHost : IUnknown HRESULT ExitProcess( [in] INT32 iExitCode); }; + +cpp_quote("HRESULT WINAPI CLRCreateInstance(REFCLSID clsid, REFIID riid, LPVOID *ppInterface);")

1 0

Vincent Povirk : mscoree: Add test for creating CLRMetaHost.
by Alexandre Julliard 04 Oct '10

04 Oct '10

Module: wine Branch: master Commit: ddda173064a7f7e19004e340b882107d8e5af57a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddda173064a7f7e19004e340b… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Sep 21 15:55:05 2010 -0500 mscoree: Add test for creating CLRMetaHost. --- dlls/mscoree/tests/Makefile.in | 1 + dlls/mscoree/tests/metahost.c | 71 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 72 insertions(+), 0 deletions(-) diff --git a/dlls/mscoree/tests/Makefile.in b/dlls/mscoree/tests/Makefile.in index 5077958..0ff1e2b 100644 --- a/dlls/mscoree/tests/Makefile.in +++ b/dlls/mscoree/tests/Makefile.in @@ -1,6 +1,7 @@ TESTDLL = mscoree.dll C_SRCS = \ + metahost.c \ mscoree.c @MAKE_TEST_RULES@ diff --git a/dlls/mscoree/tests/metahost.c b/dlls/mscoree/tests/metahost.c new file mode 100644 index 0000000..b79c9b6 --- /dev/null +++ b/dlls/mscoree/tests/metahost.c @@ -0,0 +1,71 @@ +/* + * Copyright 2010 Vincent Povirk + * + * 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 + */ + +#define COBJMACROS + +#include <stdarg.h> + +#include "windef.h" +#include "ole2.h" + +#include "initguid.h" +#include "metahost.h" +#include "wine/test.h" + +static HMODULE hmscoree; + +static HRESULT (WINAPI *pCLRCreateInstance)(REFCLSID clsid, REFIID riid, LPVOID *ppInterface); + +static ICLRMetaHost *metahost; + +BOOL init_pointers(void) +{ + HRESULT hr = E_FAIL; + + hmscoree = LoadLibraryA("mscoree.dll"); + + if (hmscoree) + pCLRCreateInstance = (void *)GetProcAddress(hmscoree, "CLRCreateInstance"); + + if (pCLRCreateInstance) + hr = pCLRCreateInstance(&CLSID_CLRMetaHost, &IID_ICLRMetaHost, (void**)&metahost); + + if (FAILED(hr)) + { + todo_wine win_skip(".NET 4 is not installed\n"); + FreeLibrary(hmscoree); + return FALSE; + } + + return TRUE; +} + +void cleanup(void) +{ + ICLRMetaHost_Release(metahost); + + FreeLibrary(hmscoree); +} + +START_TEST(metahost) +{ + if (!init_pointers()) + return; + + cleanup(); +}

1 0