January 2014 - Wine-commits

Vincent Povirk : winsta: Stub WinStationVirtualOpen.
by Alexandre Julliard 28 Jan '14

28 Jan '14

Module: wine Branch: master Commit: 1be9e3fe10a7c9a1ea0a575df4ec573129d003f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1be9e3fe10a7c9a1ea0a575df… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Jan 27 13:57:16 2014 -0600 winsta: Stub WinStationVirtualOpen. --- dlls/winsta/main.c | 7 +++++++ dlls/winsta/winsta.spec | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/winsta/main.c b/dlls/winsta/main.c index 71e1dda..46a4ce7 100644 --- a/dlls/winsta/main.c +++ b/dlls/winsta/main.c @@ -83,3 +83,10 @@ BOOL WINAPI WinStationGetProcessSid( PVOID a, HANDLE server, DWORD process_id, P SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); return FALSE; } + +BOOL WINAPI WinStationVirtualOpen( PVOID a, PVOID b, PVOID c ) +{ + FIXME( "%p %p %p\n", a, b, c ); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return FALSE; +} diff --git a/dlls/winsta/winsta.spec b/dlls/winsta/winsta.spec index 9505615..5854d83 100644 --- a/dlls/winsta/winsta.spec +++ b/dlls/winsta/winsta.spec @@ -70,7 +70,7 @@ @ stub WinStationShutdownSystem @ stub WinStationTerminateProcess @ stub WinStationUnRegisterConsoleNotification -@ stub WinStationVirtualOpen +@ stdcall WinStationVirtualOpen(ptr ptr ptr) @ stub WinStationWaitSystemEvent @ stub _NWLogonQueryAdmin @ stub _NWLogonSetAdmin

1 0

André Hentschel : user32/tests: Avoid preprocessor check to ensure it compiles.
by Alexandre Julliard 28 Jan '14

28 Jan '14

Module: wine Branch: master Commit: c855459a403d7cff8446ffd057372f4682b6b66c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c855459a403d7cff8446ffd05… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jan 27 22:21:43 2014 +0100 user32/tests: Avoid preprocessor check to ensure it compiles. --- dlls/user32/tests/broadcast.c | 18 ++++++++++-------- dlls/user32/tests/menu.c | 12 ++++++------ dlls/user32/tests/win.c | 5 +++-- 3 files changed, 19 insertions(+), 16 deletions(-) diff --git a/dlls/user32/tests/broadcast.c b/dlls/user32/tests/broadcast.c index 0476c99..322fbd0 100644 --- a/dlls/user32/tests/broadcast.c +++ b/dlls/user32/tests/broadcast.c @@ -119,7 +119,8 @@ static void test_parameters(PBROADCAST broadcast, const char *functionname) ok(!ret || broken(ret), "Returned: %d\n", ret); if (!ret) ok(GetLastError() == ERROR_INVALID_PARAMETER, "Last error: %08x\n", GetLastError()); -#if 0 /* TODO: Check the hang flags */ +if (0) /* TODO: Check the hang flags */ +{ SetLastError(0xcafebabe); recips = BSM_APPLICATIONS; ret = broadcast( BSF_QUERY|(BSF_NOHANG|BSF_FORCEIFHUNG), &recips, WM_NULL, 30000, 0 ); @@ -143,7 +144,7 @@ static void test_parameters(PBROADCAST broadcast, const char *functionname) ret = broadcast( BSF_POSTMESSAGE|(BSF_NOTIMEOUTIFNOTHUNG|BSF_FORCEIFHUNG), &recips, WM_NULL, 30000, 0 ); ok(0, "Last error: %08x\n", GetLastError()); ok(0, "Returned: %d\n", ret); -#endif +} recips = BSM_APPLICATIONS; ResetEvent(hevent); @@ -204,31 +205,32 @@ static void test_parametersEx(PBROADCASTEX broadcastex) ok(GetLastError() == ERROR_INVALID_PARAMETER, "Last error: %08x\n", GetLastError()); ok(!ret, "Returned: %d\n", ret); -#if 0 /* TODO: Check the hang flags */ +if (0) /* TODO: Check the hang flags */ +{ SetLastError(0xcafebabe); recips = BSM_APPLICATIONS; - ret = broadcast( BSF_QUERY|(BSF_NOHANG|BSF_FORCEIFHUNG), &recips, WM_NULL, 30000, 0, NULL ); + ret = broadcastex( BSF_QUERY|(BSF_NOHANG|BSF_FORCEIFHUNG), &recips, WM_NULL, 30000, 0, NULL ); ok(0, "Last error: %08x\n", GetLastError()); ok(0, "Returned: %d\n", ret); SetLastError(0xcafebabe); recips = BSM_APPLICATIONS; - ret = broadcast( BSF_QUERY|(BSF_NOHANG|BSF_NOTIMEOUTIFNOTHUNG), &recips, WM_NULL, 30000, 0, NULL ); + ret = broadcastex( BSF_QUERY|(BSF_NOHANG|BSF_NOTIMEOUTIFNOTHUNG), &recips, WM_NULL, 30000, 0, NULL ); ok(0, "Last error: %08x\n", GetLastError()); ok(0, "Returned: %d\n", ret); SetLastError(0xcafebabe); recips = BSM_APPLICATIONS; - ret = broadcast( BSF_QUERY|(BSF_NOTIMEOUTIFNOTHUNG|BSF_FORCEIFHUNG), &recips, WM_NULL, 30000, 0, NULL ); + ret = broadcastex( BSF_QUERY|(BSF_NOTIMEOUTIFNOTHUNG|BSF_FORCEIFHUNG), &recips, WM_NULL, 30000, 0, NULL ); ok(0, "Last error: %08x\n", GetLastError()); ok(0, "Returned: %d\n", ret); SetLastError(0xcafebabe); recips = BSM_APPLICATIONS; - ret = broadcast( BSF_POSTMESSAGE|(BSF_NOTIMEOUTIFNOTHUNG|BSF_FORCEIFHUNG), &recips, WM_NULL, 30000, 0, NULL ); + ret = broadcastex( BSF_POSTMESSAGE|(BSF_NOTIMEOUTIFNOTHUNG|BSF_FORCEIFHUNG), &recips, WM_NULL, 30000, 0, NULL ); ok(0, "Last error: %08x\n", GetLastError()); ok(0, "Returned: %d\n", ret); -#endif +} recips = BSM_APPLICATIONS; ResetEvent(hevent); diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c index d02eb91..3334a8a 100644 --- a/dlls/user32/tests/menu.c +++ b/dlls/user32/tests/menu.c @@ -2498,10 +2498,10 @@ static void check_menu_items(HMENU hmenu, UINT checked_cmd, UINT checked_type, mii.fMask = MIIM_FTYPE | MIIM_STATE | MIIM_ID | MIIM_SUBMENU; ret = GetMenuItemInfoA(hmenu, i, TRUE, &mii); ok(ret, "GetMenuItemInfo(%u) failed\n", i); -#if 0 +if (0) trace("item #%u: fType %04x, fState %04x, wID %u, hSubMenu %p\n", i, mii.fType, mii.fState, mii.wID, mii.hSubMenu); -#endif + if (mii.hSubMenu) { ok(mii.wID == (UINT_PTR)mii.hSubMenu, "id %u: wID should be equal to hSubMenu\n", checked_cmd); @@ -2657,10 +2657,10 @@ static void test_menu_resource_layout(void) mii.fMask = MIIM_FTYPE | MIIM_STATE | MIIM_ID | MIIM_STRING; ret = GetMenuItemInfoA(hmenu, i, TRUE, &mii); ok(ret, "GetMenuItemInfo(%u) failed\n", i); -#if 0 +if (0) trace("item #%u: fType %04x, fState %04x, wID %u, dwTypeData %s\n", i, mii.fType, mii.fState, mii.wID, (LPCSTR)mii.dwTypeData); -#endif + ok(mii.fType == menu_data[i].type, "%u: expected fType %04x, got %04x\n", i, menu_data[i].type, mii.fType); ok(mii.fState == menu_data[i].state, @@ -2763,10 +2763,10 @@ static void compare_menu_data(HMENU hmenu, const struct menu_data *item, INT ite mii.fMask = MIIM_FTYPE | MIIM_ID | MIIM_STRING | MIIM_BITMAP; ret = GetMenuItemInfoA(hmenu, i, TRUE, &mii); ok(ret, "GetMenuItemInfo(%u) failed\n", i); -#if 0 +if (0) trace("item #%u: fType %04x, fState %04x, wID %04x, hbmp %p\n", i, mii.fType, mii.fState, mii.wID, mii.hbmpItem); -#endif + ok(mii.fType == item[i].type, "%u: expected fType %04x, got %04x\n", i, item[i].type, mii.fType); ok(mii.wID == item[i].id, diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index dfcad52..3c63c8a 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -895,14 +895,15 @@ static void verify_window_info(const char *hook, HWND hwnd, const WINDOWINFO *in /* win2k and XP return broken border info in GetWindowInfo most of * the time, so there is no point in testing it. */ -#if 0 +if (0) +{ UINT border; ok(info->cxWindowBorders == (unsigned)(rcClient.left - rcWindow.left), "wrong cxWindowBorders %d != %d\n", info->cxWindowBorders, rcClient.left - rcWindow.left); border = min(rcWindow.bottom - rcClient.bottom, rcClient.top - rcWindow.top); ok(info->cyWindowBorders == border, "wrong cyWindowBorders %d != %d\n", info->cyWindowBorders, border); -#endif +} ok(info->atomWindowType == GetClassLongA(hwnd, GCW_ATOM), "wrong atomWindowType for %p in hook %s\n", hwnd, hook); ok(info->wCreatorVersion == 0x0400 /* NT4, Win2000, XP, Win2003 */ ||

1 0

André Hentschel : user32/tests: Remove #if 1.
by Alexandre Julliard 28 Jan '14

28 Jan '14

Module: wine Branch: master Commit: fc185ccd9bebf2de9857136abd859ceac38d4bae URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc185ccd9bebf2de9857136ab… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jan 27 22:22:27 2014 +0100 user32/tests: Remove #if 1. --- dlls/user32/tests/msg.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index dffaa8d..8cc431c 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -14329,7 +14329,6 @@ START_TEST(msg) test_winevents(); /* Fix message sequences before removing 4 lines below */ -#if 1 if (pUnhookWinEvent && hEvent_hook) { ret = pUnhookWinEvent(hEvent_hook); @@ -14337,7 +14336,6 @@ START_TEST(msg) pUnhookWinEvent = 0; } hEvent_hook = 0; -#endif test_SetFocus(); test_SetParent();

1 0

Vincent Povirk : user32: Treat empty rects as 1x1 in MonitorFromRect.
by Alexandre Julliard 28 Jan '14

28 Jan '14

Module: wine Branch: master Commit: 2fef984ed5e85cd04ddcaf7b5a6ddefdbf50a627 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fef984ed5e85cd04ddcaf7b5… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Jan 8 16:02:23 2014 -0600 user32: Treat empty rects as 1x1 in MonitorFromRect. --- dlls/user32/misc.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/user32/misc.c b/dlls/user32/misc.c index eb2631f..41b2b16 100644 --- a/dlls/user32/misc.c +++ b/dlls/user32/misc.c @@ -359,6 +359,13 @@ HMONITOR WINAPI MonitorFromRect( LPRECT rect, DWORD flags ) info.primary = 0; info.nearest = 0; info.ret = 0; + + if (IsRectEmpty(&info.rect)) + { + info.rect.right = info.rect.left + 1; + info.rect.bottom = info.rect.top + 1; + } + if (!EnumDisplayMonitors( 0, NULL, monitor_enum, (LPARAM)&info )) return 0; if (!info.ret) {

1 0

Vincent Povirk : user32/tests: Add tests for MonitorFromRect.
by Alexandre Julliard 28 Jan '14

28 Jan '14

Module: wine Branch: master Commit: ef5341b4d72db206b7baa7cf2b5251a543c32b45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef5341b4d72db206b7baa7cf2… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Jan 27 15:16:38 2014 -0600 user32/tests: Add tests for MonitorFromRect. --- dlls/user32/tests/monitor.c | 68 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 65 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index f442338..a2df20e 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -31,6 +31,7 @@ static BOOL (WINAPI *pEnumDisplayDevicesA)(LPCSTR,DWORD,LPDISPLAY_DEVICEA,DWORD) static BOOL (WINAPI *pEnumDisplayMonitors)(HDC,LPRECT,MONITORENUMPROC,LPARAM); static BOOL (WINAPI *pGetMonitorInfoA)(HMONITOR,LPMONITORINFO); static HMONITOR (WINAPI *pMonitorFromPoint)(POINT,DWORD); +static HMONITOR (WINAPI *pMonitorFromRect)(LPCRECT,DWORD); static HMONITOR (WINAPI *pMonitorFromWindow)(HWND,DWORD); static void init_function_pointers(void) @@ -48,6 +49,7 @@ static void init_function_pointers(void) GET_PROC(EnumDisplayMonitors) GET_PROC(GetMonitorInfoA) GET_PROC(MonitorFromPoint) + GET_PROC(MonitorFromRect) GET_PROC(MonitorFromWindow) #undef GET_PROC @@ -291,12 +293,13 @@ static void test_ChangeDisplaySettingsEx(void) static void test_monitors(void) { - HMONITOR monitor, primary; + HMONITOR monitor, primary, nearest; POINT pt; + RECT rc; - if (!pMonitorFromPoint || !pMonitorFromWindow) + if (!pMonitorFromPoint || !pMonitorFromWindow || !pMonitorFromRect) { - win_skip("MonitorFromPoint or MonitorFromWindow are not available\n"); + win_skip("MonitorFromPoint, MonitorFromWindow, or MonitorFromRect is not available\n"); return; } @@ -310,6 +313,65 @@ static void test_monitors(void) ok( monitor == primary, "got %p, should get primary %p for MONITOR_DEFAULTTOPRIMARY\n", monitor, primary ); monitor = pMonitorFromWindow( 0, MONITOR_DEFAULTTONEAREST ); ok( monitor == primary, "got %p, should get primary %p for MONITOR_DEFAULTTONEAREST\n", monitor, primary ); + + SetRect( &rc, 0, 0, 1, 1 ); + monitor = pMonitorFromRect( &rc, MONITOR_DEFAULTTONULL ); + ok( monitor == primary, "got %p, should get primary %p\n", monitor, primary ); + + monitor = pMonitorFromRect( &rc, MONITOR_DEFAULTTOPRIMARY ); + ok( monitor == primary, "got %p, should get primary %p\n", monitor, primary ); + + monitor = pMonitorFromRect( &rc, MONITOR_DEFAULTTONEAREST ); + ok( monitor == primary, "got %p, should get primary %p\n", monitor, primary ); + + /* Empty rect at 0,0 is considered inside the primary monitor */ + SetRect( &rc, 0, 0, -1, -1 ); + monitor = pMonitorFromRect( &rc, MONITOR_DEFAULTTONULL ); + ok( monitor == primary, "got %p, should get primary %p\n", monitor, primary ); + + /* Even if there is a monitor left of the primary, the primary will have the most overlapping area */ + SetRect( &rc, -1, 0, 2, 1 ); + monitor = pMonitorFromRect( &rc, MONITOR_DEFAULTTONULL ); + ok( monitor == primary, "got %p, should get primary %p\n", monitor, primary ); + + /* But the width of the rect doesn't matter if it's empty. */ + SetRect( &rc, -1, 0, 2, -1 ); + monitor = pMonitorFromRect( &rc, MONITOR_DEFAULTTONULL ); + ok( monitor != primary, "got primary %p\n", monitor ); + + if (!pGetMonitorInfoA) + { + win_skip("GetMonitorInfoA is not available\n"); + return; + } + + /* Search for a monitor that has no others equally near to (left, top-1) */ + SetRect( &rc, -1, -2, 2, 0 ); + monitor = pMonitorFromRect( &rc, MONITOR_DEFAULTTONULL ); + nearest = primary; + while (monitor != NULL) + { + MONITORINFO mi; + BOOL ret; + ok( monitor != primary, "got primary %p\n", monitor ); + nearest = monitor; + mi.cbSize = sizeof(mi); + ret = pGetMonitorInfoA( monitor, &mi ); + ok( ret, "GetMonitorInfo failed\n" ); + SetRect( &rc, mi.rcMonitor.left-1, mi.rcMonitor.top-2, mi.rcMonitor.left+2, mi.rcMonitor.top ); + monitor = pMonitorFromRect( &rc, MONITOR_DEFAULTTONULL ); + } + + SetRect( &rc, rc.left+1, rc.top+1, rc.left+2, rc.top+2 ); + + monitor = pMonitorFromRect( &rc, MONITOR_DEFAULTTONULL ); + ok( monitor == NULL, "got %p\n", monitor ); + + monitor = pMonitorFromRect( &rc, MONITOR_DEFAULTTOPRIMARY ); + ok( monitor == primary, "got %p, should get primary %p\n", monitor, primary ); + + monitor = pMonitorFromRect( &rc, MONITOR_DEFAULTTONEAREST ); + ok( monitor == nearest, "got %p, should get nearest %p\n", monitor, nearest ); } static BOOL CALLBACK find_primary_mon(HMONITOR hmon, HDC hdc, LPRECT rc, LPARAM lp)

1 0

Alexandre Julliard : user32: Fail creation of the desktop window earlier on when it already exists.
by Alexandre Julliard 28 Jan '14

28 Jan '14

Module: wine Branch: master Commit: 6bf64f0ac278b826b526504d69f384dfce598bc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bf64f0ac278b826b526504d6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 28 12:41:56 2014 +0100 user32: Fail creation of the desktop window earlier on when it already exists. --- dlls/user32/desktop.c | 2 ++ dlls/user32/win.c | 3 +++ programs/explorer/desktop.c | 19 ++++++------------- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/dlls/user32/desktop.c b/dlls/user32/desktop.c index bc91252..d22e732 100644 --- a/dlls/user32/desktop.c +++ b/dlls/user32/desktop.c @@ -117,6 +117,8 @@ LRESULT WINAPI DesktopWndProc( HWND hwnd, UINT message, WPARAM wParam, LPARAM lP ATOM atom; WCHAR buffer[37]; + if (GetAncestor( hwnd, GA_PARENT )) return FALSE; /* refuse to create non-desktop window */ + sprintfW( buffer, guid_formatW, guid->Data1, guid->Data2, guid->Data3, guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3], guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7] ); diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 275b93c..e29153a 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -2086,6 +2086,9 @@ HWND WINAPI GetDesktopWindow(void) SERVER_END_REQ; } + /* wait for the desktop process to be ready */ + SendMessageW( thread_info->top_window, WM_NULL, 0, 0 ); + if (!thread_info->top_window || !USER_Driver->pCreateDesktopWindow( thread_info->top_window )) ERR( "failed to create desktop window\n" ); diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index db6a355..474e93e 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -799,7 +799,7 @@ void manage_desktop( WCHAR *arg ) HDESK desktop = 0; GUID guid; MSG msg; - HWND hwnd, msg_hwnd; + HWND hwnd; HMODULE graphics_driver; unsigned int width, height; WCHAR *cmdline = NULL, *driver = NULL; @@ -856,12 +856,12 @@ void manage_desktop( WCHAR *arg ) hwnd = CreateWindowExW( 0, DESKTOP_CLASS_ATOM, NULL, WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN, 0, 0, 0, 0, 0, 0, 0, &guid ); - /* create the HWND_MESSAGE parent */ - msg_hwnd = CreateWindowExW( 0, messageW, NULL, WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN, - 0, 0, 100, 100, 0, 0, 0, NULL ); - - if (hwnd == GetDesktopWindow()) + if (hwnd) { + /* create the HWND_MESSAGE parent */ + CreateWindowExW( 0, messageW, NULL, WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN, + 0, 0, 100, 100, 0, 0, 0, NULL ); + using_root = !desktop || !create_desktop( graphics_driver, name, width, height ); SetWindowLongPtrW( hwnd, GWLP_WNDPROC, (LONG_PTR)desktop_wnd_proc ); SendMessageW( hwnd, WM_SETICON, ICON_BIG, (LPARAM)LoadIconW( 0, MAKEINTRESOURCEW(OIC_WINLOGO))); @@ -891,13 +891,6 @@ void manage_desktop( WCHAR *arg ) } } } - else - { - DestroyWindow( hwnd ); /* someone beat us to it */ - hwnd = 0; - } - - if (GetAncestor( msg_hwnd, GA_PARENT )) DestroyWindow( msg_hwnd ); /* someone beat us to it */ /* if we have a command line, execute it */ if (cmdline)

1 0

Jacek Caban : atl80: Share atl_ax.c with atl100.
by Alexandre Julliard 28 Jan '14

28 Jan '14

Module: wine Branch: master Commit: 3f9b3718e92bf2c48b83d958f5d1e1525ff6a45f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f9b3718e92bf2c48b83d958f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 28 12:48:24 2014 +0100 atl80: Share atl_ax.c with atl100. --- dlls/atl100/atl_ax.c | 4 +++- dlls/atl80/Makefile.in | 8 +++++--- dlls/atl80/atl80.c | 53 ------------------------------------------------ dlls/atl80/atl80.spec | 18 ++++++++-------- 4 files changed, 17 insertions(+), 66 deletions(-) diff --git a/dlls/atl100/atl_ax.c b/dlls/atl100/atl_ax.c index 0f0f3c6..be0b836 100644 --- a/dlls/atl100/atl_ax.c +++ b/dlls/atl100/atl_ax.c @@ -87,7 +87,9 @@ BOOL WINAPI AtlAxWinInit(void) { WNDCLASSEXW wcex; -#if _ATL_VER == _ATL_VER_90 +#if _ATL_VER == _ATL_VER_80 +#define ATL_NAME_SUFFIX '8','0',0 +#elif _ATL_VER == _ATL_VER_90 #define ATL_NAME_SUFFIX '9','0',0 #elif _ATL_VER == _ATL_VER_100 #define ATL_NAME_SUFFIX '1','0','0',0 diff --git a/dlls/atl80/Makefile.in b/dlls/atl80/Makefile.in index 43cc2d3..65f8055 100644 --- a/dlls/atl80/Makefile.in +++ b/dlls/atl80/Makefile.in @@ -1,9 +1,11 @@ MODULE = atl80.dll IMPORTLIB = atl80 -IMPORTS = atl100 oleaut32 user32 ole32 +IMPORTS = atl100 oleaut32 user32 ole32 uuid EXTRADEFS = -D_ATL_VER=_ATL_VER_80 +PARENTSRC = ../atl100 - -C_SRCS = atl80.c +C_SRCS = \ + atl80.c \ + atl_ax.c RC_SRCS = atl80.rc diff --git a/dlls/atl80/atl80.c b/dlls/atl80/atl80.c index 487ee49..d39819a 100644 --- a/dlls/atl80/atl80.c +++ b/dlls/atl80/atl80.c @@ -98,56 +98,3 @@ DWORD WINAPI AtlGetVersion(void *pReserved) TRACE("version %04x (%p)\n", _ATL_VER, pReserved); return _ATL_VER; } - -/********************************************************************** - * AtlAxWin class window procedure - */ -static LRESULT CALLBACK AtlAxWin_wndproc( HWND hWnd, UINT wMsg, WPARAM wParam, LPARAM lParam ) -{ - if ( wMsg == WM_CREATE ) - { - DWORD len = GetWindowTextLengthW( hWnd ) + 1; - WCHAR *ptr = HeapAlloc( GetProcessHeap(), 0, len*sizeof(WCHAR) ); - if (!ptr) - return 1; - GetWindowTextW( hWnd, ptr, len ); - AtlAxCreateControlEx( ptr, hWnd, NULL, NULL, NULL, NULL, NULL ); - HeapFree( GetProcessHeap(), 0, ptr ); - return 0; - } - return DefWindowProcW( hWnd, wMsg, wParam, lParam ); -} - -BOOL WINAPI AtlAxWinInit(void) -{ - WNDCLASSEXW wcex; - const WCHAR AtlAxWin80[] = {'A','t','l','A','x','W','i','n','8','0',0}; - const WCHAR AtlAxWinLic80[] = {'A','t','l','A','x','W','i','n','L','i','c','8','0',0}; - - FIXME("version %04x semi-stub\n", _ATL_VER); - - if ( FAILED( OleInitialize(NULL) ) ) - return FALSE; - - wcex.cbSize = sizeof(wcex); - wcex.style = CS_GLOBALCLASS | CS_DBLCLKS; - wcex.cbClsExtra = 0; - wcex.cbWndExtra = 0; - wcex.hInstance = GetModuleHandleW( NULL ); - wcex.hIcon = NULL; - wcex.hCursor = NULL; - wcex.hbrBackground = NULL; - wcex.lpszMenuName = NULL; - wcex.hIconSm = 0; - - wcex.lpfnWndProc = AtlAxWin_wndproc; - wcex.lpszClassName = AtlAxWin80; - if ( !RegisterClassExW( &wcex ) ) - return FALSE; - - wcex.lpszClassName = AtlAxWinLic80; - if ( !RegisterClassExW( &wcex ) ) - return FALSE; - - return TRUE; -} diff --git a/dlls/atl80/atl80.spec b/dlls/atl80/atl80.spec index 3d53d06..a595681 100644 --- a/dlls/atl80/atl80.spec +++ b/dlls/atl80/atl80.spec @@ -20,20 +20,20 @@ 31 stdcall AtlComQIPtrAssign(ptr ptr ptr) atl100.AtlComQIPtrAssign 32 stdcall AtlInternalQueryInterface(ptr ptr ptr ptr) atl100.AtlInternalQueryInterface 34 stdcall AtlGetVersion(ptr) -35 stdcall AtlAxDialogBoxW(long wstr long ptr long) atl100.AtlAxDialogBoxW -36 stdcall AtlAxDialogBoxA(long str long ptr long) atl100.AtlAxDialogBoxA -37 stdcall AtlAxCreateDialogW(long wstr long ptr long) atl100.AtlAxCreateDialogW -38 stdcall AtlAxCreateDialogA(long str long ptr long) atl100.AtlAxCreateDialogA -39 stdcall AtlAxCreateControl(ptr ptr ptr ptr) atl100.AtlAxCreateControl -40 stdcall AtlAxCreateControlEx(ptr ptr ptr ptr ptr ptr ptr) atl100.AtlAxCreateControlEx -41 stdcall AtlAxAttachControl(ptr ptr ptr) atl100.AtlAxAttachControl +35 stdcall AtlAxDialogBoxW(long wstr long ptr long) +36 stdcall AtlAxDialogBoxA(long str long ptr long) +37 stdcall AtlAxCreateDialogW(long wstr long ptr long) +38 stdcall AtlAxCreateDialogA(long str long ptr long) +39 stdcall AtlAxCreateControl(ptr ptr ptr ptr) +40 stdcall AtlAxCreateControlEx(ptr ptr ptr ptr ptr ptr ptr) +41 stdcall AtlAxAttachControl(ptr ptr ptr) 42 stdcall AtlAxWinInit() 43 stdcall AtlWinModuleAddCreateWndData(ptr ptr ptr) atl100.AtlWinModuleAddCreateWndData 44 stdcall AtlWinModuleExtractCreateWndData(ptr) atl100.AtlWinModuleExtractCreateWndData 45 stub AtlWinModuleRegisterWndClassInfoW 46 stub AtlWinModuleRegisterWndClassInfoA -47 stdcall AtlAxGetControl(long ptr) atl100.AtlAxGetControl -48 stdcall AtlAxGetHost(long ptr) atl100.AtlAxGetHost +47 stdcall AtlAxGetControl(long ptr) +48 stdcall AtlAxGetHost(long ptr) 49 stdcall AtlRegisterClassCategoriesHelper(ptr ptr long) atl100.AtlRegisterClassCategoriesHelper 50 stdcall AtlIPersistStreamInit_Load(ptr ptr ptr ptr) atl100.AtlIPersistStreamInit_Load 51 stdcall AtlIPersistStreamInit_Save(ptr long ptr ptr ptr) atl100.AtlIPersistStreamInit_Save

1 0

Jacek Caban : atl90: Share atl.c with atl100.
by Alexandre Julliard 28 Jan '14

28 Jan '14

Module: wine Branch: master Commit: 52c9b51ca88ade36ead5bdb54a78a8d3ff2c71bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=52c9b51ca88ade36ead5bdb54… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 28 12:48:34 2014 +0100 atl90: Share atl.c with atl100. --- dlls/atl90/Makefile.in | 4 ++-- dlls/atl90/atl90.c | 42 ----------------------------------- dlls/atl90/atl90.spec | 58 ++++++++++++++++++++++++------------------------ 3 files changed, 31 insertions(+), 73 deletions(-) diff --git a/dlls/atl90/Makefile.in b/dlls/atl90/Makefile.in index 677aaae..88f441b 100644 --- a/dlls/atl90/Makefile.in +++ b/dlls/atl90/Makefile.in @@ -1,10 +1,10 @@ MODULE = atl90.dll -IMPORTS = atl100 oleaut32 user32 ole32 uuid +IMPORTS = atl100 oleaut32 user32 ole32 gdi32 advapi32 uuid EXTRADEFS = -D_ATL_VER=_ATL_VER_90 PARENTSRC = ../atl100 C_SRCS = \ - atl90.c \ + atl.c \ atl_ax.c RC_SRCS = atl90.rc diff --git a/dlls/atl90/atl90.c b/dlls/atl90/atl90.c deleted file mode 100644 index 9dd0b70..0000000 --- a/dlls/atl90/atl90.c +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright 2013 Zhenbo Li - * - * 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> -#include <stdio.h> - -#define COBJMACROS - -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "winuser.h" -#include "atlbase.h" - -#include "wine/debug.h" -#include "wine/unicode.h" - -WINE_DEFAULT_DEBUG_CHANNEL(atl); - -/*********************************************************************** - * AtlGetVersion [atl90.@] - */ -DWORD WINAPI AtlGetVersion(void *reserved) -{ - TRACE("version %04x (%p)\n", _ATL_VER, reserved); - return _ATL_VER; -} diff --git a/dlls/atl90/atl90.spec b/dlls/atl90/atl90.spec index 35facf8..a8fcf46 100644 --- a/dlls/atl90/atl90.spec +++ b/dlls/atl90/atl90.spec @@ -1,22 +1,22 @@ -10 stdcall AtlAdvise(ptr ptr ptr ptr) atl100.AtlAdvise -11 stdcall AtlUnadvise(ptr ptr long) atl100.AtlUnadvise -12 stdcall AtlFreeMarshalStream(ptr) atl100.AtlFreeMarshalStream -13 stdcall AtlMarshalPtrInProc(ptr ptr ptr) atl100.AtlMarshalPtrInProc -14 stdcall AtlUnmarshalPtr(ptr ptr ptr) atl100.AtlUnmarshalPtr -15 stdcall AtlComModuleGetClassObject(ptr ptr ptr ptr) atl100.AtlComModuleGetClassObject -17 stdcall AtlComModuleRegisterClassObjects(ptr long long) atl100.AtlComModuleRegisterClassObjects -20 stdcall AtlComModuleRevokeClassObjects(ptr) atl100.AtlComModuleRevokeClassObjects -22 stdcall AtlComModuleUnregisterServer(ptr long ptr) atl100.AtlComModuleUnregisterServer +10 stdcall AtlAdvise(ptr ptr ptr ptr) +11 stdcall AtlUnadvise(ptr ptr long) +12 stdcall AtlFreeMarshalStream(ptr) +13 stdcall AtlMarshalPtrInProc(ptr ptr ptr) +14 stdcall AtlUnmarshalPtr(ptr ptr ptr) +15 stdcall AtlComModuleGetClassObject(ptr ptr ptr ptr) +17 stdcall AtlComModuleRegisterClassObjects(ptr long long) +20 stdcall AtlComModuleRevokeClassObjects(ptr) +22 stdcall AtlComModuleUnregisterServer(ptr long ptr) 23 stdcall AtlUpdateRegistryFromResourceD(long wstr long ptr ptr) atl100.AtlUpdateRegistryFromResourceD -24 stdcall AtlWaitWithMessageLoop(long) atl100.AtlWaitWithMessageLoop +24 stdcall AtlWaitWithMessageLoop(long) 25 stub AtlSetErrorInfo -26 stdcall AtlCreateTargetDC(long ptr) atl100.AtlCreateTargetDC -27 stdcall AtlHiMetricToPixel(ptr ptr) atl100.AtlHiMetricToPixel -28 stdcall AtlPixelToHiMetric(ptr ptr) atl100.AtlPixelToHiMetric +26 stdcall AtlCreateTargetDC(long ptr) +27 stdcall AtlHiMetricToPixel(ptr ptr) +28 stdcall AtlPixelToHiMetric(ptr ptr) 29 stub AtlDevModeW2A -30 stdcall AtlComPtrAssign(ptr ptr) atl100.AtlComPtrAssign -31 stdcall AtlComQIPtrAssign(ptr ptr ptr) atl100.AtlComQIPtrAssign -32 stdcall AtlInternalQueryInterface(ptr ptr ptr ptr) atl100.AtlInternalQueryInterface +30 stdcall AtlComPtrAssign(ptr ptr) +31 stdcall AtlComQIPtrAssign(ptr ptr ptr) +32 stdcall AtlInternalQueryInterface(ptr ptr ptr ptr) 34 stdcall AtlGetVersion(ptr) 35 stdcall AtlAxDialogBoxW(long wstr long ptr long) 36 stdcall AtlAxDialogBoxA(long str long ptr long) @@ -26,27 +26,27 @@ 40 stdcall AtlAxCreateControlEx(ptr ptr ptr ptr ptr ptr ptr) 41 stdcall AtlAxAttachControl(ptr ptr ptr) 42 stdcall AtlAxWinInit() -43 stdcall AtlWinModuleAddCreateWndData(ptr ptr ptr) atl100.AtlWinModuleAddCreateWndData -44 stdcall AtlWinModuleExtractCreateWndData(ptr) atl100.AtlWinModuleExtractCreateWndData +43 stdcall AtlWinModuleAddCreateWndData(ptr ptr ptr) +44 stdcall AtlWinModuleExtractCreateWndData(ptr) 45 stub AtlWinModuleRegisterWndClassInfoW 46 stub AtlWinModuleRegisterWndClassInfoA 47 stdcall AtlAxGetControl(long ptr) 48 stdcall AtlAxGetHost(long ptr) -49 stdcall AtlRegisterClassCategoriesHelper(ptr ptr long) atl100.AtlRegisterClassCategoriesHelper -50 stdcall AtlIPersistStreamInit_Load(ptr ptr ptr ptr) atl100.AtlIPersistStreamInit_Load -51 stdcall AtlIPersistStreamInit_Save(ptr long ptr ptr ptr) atl100.AtlIPersistStreamInit_Save -52 stdcall AtlIPersistPropertyBag_Load(ptr ptr ptr ptr ptr) atl100.AtlIPersistPropertyBag_Load +49 stdcall AtlRegisterClassCategoriesHelper(ptr ptr long) +50 stdcall AtlIPersistStreamInit_Load(ptr ptr ptr ptr) +51 stdcall AtlIPersistStreamInit_Save(ptr long ptr ptr ptr) +52 stdcall AtlIPersistPropertyBag_Load(ptr ptr ptr ptr ptr) 53 stub AtlIPersistPropertyBag_Save -54 stdcall AtlGetObjectSourceInterface(ptr ptr ptr ptr ptr) atl100.AtlGetObjectSourceInterface -56 stdcall AtlLoadTypeLib(long wstr ptr ptr) atl100.AtlLoadTypeLib -58 stdcall AtlModuleAddTermFunc(ptr ptr long) atl100.AtlModuleAddTermFunc +54 stdcall AtlGetObjectSourceInterface(ptr ptr ptr ptr ptr) +56 stdcall AtlLoadTypeLib(long wstr ptr ptr) +58 stdcall AtlModuleAddTermFunc(ptr ptr long) 59 stub AtlAxCreateControlLic 60 stub AtlAxCreateControlLicEx 61 stdcall AtlCreateRegistrar(ptr) atl100.AtlCreateRegistrar 62 stub AtlWinModuleRegisterClassExW 63 stub AtlWinModuleRegisterClassExA -64 stdcall AtlCallTermFunc(ptr) atl100.AtlCallTermFunc -65 stdcall AtlWinModuleInit(ptr) atl100.AtlWinModuleInit +64 stdcall AtlCallTermFunc(ptr) +65 stdcall AtlWinModuleInit(ptr) 66 stub AtlWinModuleTerm -67 stdcall AtlSetPerUserRegistration(long) atl100.AtlSetPerUserRegistration -68 stdcall AtlGetPerUserRegistration(ptr) atl100.AtlGetPerUserRegistration +67 stdcall AtlSetPerUserRegistration(long) +68 stdcall AtlGetPerUserRegistration(ptr)

1 0

Jacek Caban : atl90: Share registrar.c with atl100.
by Alexandre Julliard 28 Jan '14

28 Jan '14

Module: wine Branch: master Commit: bd82d6446727a8beaa5d57d035596c495d1ef0bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd82d6446727a8beaa5d57d03… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 28 12:48:47 2014 +0100 atl90: Share registrar.c with atl100. --- dlls/atl90/Makefile.in | 5 +++-- dlls/atl90/atl90.spec | 4 ++-- tools/make_specfiles | 1 - 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/atl90/Makefile.in b/dlls/atl90/Makefile.in index 88f441b..3e5114b 100644 --- a/dlls/atl90/Makefile.in +++ b/dlls/atl90/Makefile.in @@ -1,10 +1,11 @@ MODULE = atl90.dll -IMPORTS = atl100 oleaut32 user32 ole32 gdi32 advapi32 uuid +IMPORTS = oleaut32 user32 ole32 gdi32 advapi32 uuid EXTRADEFS = -D_ATL_VER=_ATL_VER_90 PARENTSRC = ../atl100 C_SRCS = \ atl.c \ - atl_ax.c + atl_ax.c \ + registrar.c RC_SRCS = atl90.rc diff --git a/dlls/atl90/atl90.spec b/dlls/atl90/atl90.spec index a8fcf46..0d41c1e 100644 --- a/dlls/atl90/atl90.spec +++ b/dlls/atl90/atl90.spec @@ -7,7 +7,7 @@ 17 stdcall AtlComModuleRegisterClassObjects(ptr long long) 20 stdcall AtlComModuleRevokeClassObjects(ptr) 22 stdcall AtlComModuleUnregisterServer(ptr long ptr) -23 stdcall AtlUpdateRegistryFromResourceD(long wstr long ptr ptr) atl100.AtlUpdateRegistryFromResourceD +23 stdcall AtlUpdateRegistryFromResourceD(long wstr long ptr ptr) 24 stdcall AtlWaitWithMessageLoop(long) 25 stub AtlSetErrorInfo 26 stdcall AtlCreateTargetDC(long ptr) @@ -42,7 +42,7 @@ 58 stdcall AtlModuleAddTermFunc(ptr ptr long) 59 stub AtlAxCreateControlLic 60 stub AtlAxCreateControlLicEx -61 stdcall AtlCreateRegistrar(ptr) atl100.AtlCreateRegistrar +61 stdcall AtlCreateRegistrar(ptr) 62 stub AtlWinModuleRegisterClassExW 63 stub AtlWinModuleRegisterClassExA 64 stdcall AtlCallTermFunc(ptr) diff --git a/tools/make_specfiles b/tools/make_specfiles index 31449b8..f587f39 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -123,7 +123,6 @@ my @dll_groups = "atl110", "atl", "atl80", - "atl90", ], [ "advapi32",

1 0

Jacek Caban : wmp: Added IProvideClassInfo2 stub implementation.
by Alexandre Julliard 28 Jan '14

28 Jan '14

Module: wine Branch: master Commit: cc01eb8f2142b6e034ee2cdbb9989ffe473c1bc2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc01eb8f2142b6e034ee2cdbb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 28 13:10:44 2014 +0100 wmp: Added IProvideClassInfo2 stub implementation. --- dlls/wmp/oleobj.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/dlls/wmp/oleobj.c b/dlls/wmp/oleobj.c index de50c48..bab6c62 100644 --- a/dlls/wmp/oleobj.c +++ b/dlls/wmp/oleobj.c @@ -24,6 +24,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wmp); struct WindowsMediaPlayer { IOleObject IOleObject_iface; + IProvideClassInfo2 IProvideClassInfo2_iface; LONG ref; }; @@ -42,6 +43,12 @@ static HRESULT WINAPI OleObject_QueryInterface(IOleObject *iface, REFIID riid, v }else if(IsEqualGUID(riid, &IID_IOleObject)) { TRACE("(%p)->(IID_IOleObject %p)\n", This, ppv); *ppv = &This->IOleObject_iface; + }else if(IsEqualGUID(riid, &IID_IProvideClassInfo)) { + TRACE("(%p)->(IID_IProvideClassInfo %p)\n", This, ppv); + *ppv = &This->IProvideClassInfo2_iface; + }else if(IsEqualGUID(riid, &IID_IProvideClassInfo2)) { + TRACE("(%p)->(IID_IProvideClassInfo2 %p)\n", This, ppv); + *ppv = &This->IProvideClassInfo2_iface; }else { FIXME("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); *ppv = NULL; @@ -251,6 +258,51 @@ static const IOleObjectVtbl OleObjectVtbl = { OleObject_SetColorScheme }; +static inline WindowsMediaPlayer *impl_from_IProvideClassInfo2(IProvideClassInfo2 *iface) +{ + return CONTAINING_RECORD(iface, WindowsMediaPlayer, IProvideClassInfo2_iface); +} + +static HRESULT WINAPI ProvideClassInfo2_QueryInterface(IProvideClassInfo2 *iface, REFIID riid, void **ppv) +{ + WindowsMediaPlayer *This = impl_from_IProvideClassInfo2(iface); + return IOleObject_QueryInterface(&This->IOleObject_iface, riid, ppv); +} + +static ULONG WINAPI ProvideClassInfo2_AddRef(IProvideClassInfo2 *iface) +{ + WindowsMediaPlayer *This = impl_from_IProvideClassInfo2(iface); + return IOleObject_AddRef(&This->IOleObject_iface); +} + +static ULONG WINAPI ProvideClassInfo2_Release(IProvideClassInfo2 *iface) +{ + WindowsMediaPlayer *This = impl_from_IProvideClassInfo2(iface); + return IOleObject_Release(&This->IOleObject_iface); +} + +static HRESULT WINAPI ProvideClassInfo2_GetClassInfo(IProvideClassInfo2 *iface, ITypeInfo **ppTI) +{ + WindowsMediaPlayer *This = impl_from_IProvideClassInfo2(iface); + FIXME("(%p)->(%p)\n", This, ppTI); + return E_NOTIMPL; +} + +static HRESULT WINAPI ProvideClassInfo2_GetGUID(IProvideClassInfo2 *iface, DWORD dwGuidKind, GUID *pGUID) +{ + WindowsMediaPlayer *This = impl_from_IProvideClassInfo2(iface); + FIXME("(%p)->(%d %p)\n", This, dwGuidKind, pGUID); + return E_NOTIMPL; +} + +static const IProvideClassInfo2Vtbl ProvideClassInfo2Vtbl = { + ProvideClassInfo2_QueryInterface, + ProvideClassInfo2_AddRef, + ProvideClassInfo2_Release, + ProvideClassInfo2_GetClassInfo, + ProvideClassInfo2_GetGUID +}; + HRESULT WINAPI WMPFactory_CreateInstance(IClassFactory *iface, IUnknown *outer, REFIID riid, void **ppv) { @@ -264,6 +316,8 @@ HRESULT WINAPI WMPFactory_CreateInstance(IClassFactory *iface, IUnknown *outer, return E_OUTOFMEMORY; wmp->IOleObject_iface.lpVtbl = &OleObjectVtbl; + wmp->IProvideClassInfo2_iface.lpVtbl = &ProvideClassInfo2Vtbl; + wmp->ref = 1; hres = IOleObject_QueryInterface(&wmp->IOleObject_iface, riid, ppv);

1 0