Module: wine Branch: master Commit: ef601fcb7ee71f35c310cb767bd90ae25ea372a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef601fcb7ee71f35c310cb767b... Author: Qian Hong <qhong(a)codeweavers.com> Date: Fri Mar 15 22:13:06 2013 +0800 atl100: Fixed register class names in AtlAxWinInit. --- dlls/atl100/atl_ax.c | 9 +++++++-- dlls/atl100/tests/atl.c | 4 ++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/atl100/atl_ax.c b/dlls/atl100/atl_ax.c index 4874d39..cdefbea 100644 --- a/dlls/atl100/atl_ax.c +++ b/dlls/atl100/atl_ax.c @@ -86,7 +86,8 @@ static LRESULT CALLBACK AtlAxWin_wndproc( HWND hWnd, UINT wMsg, WPARAM wParam, L BOOL WINAPI AtlAxWinInit(void) { WNDCLASSEXW wcex; - const WCHAR AtlAxWin[] = {'A','t','l','A','x','W','i','n',0}; + const WCHAR AtlAxWin100[] = {'A','t','l','A','x','W','i','n','1','0','0',0}; + const WCHAR AtlAxWinLic100[] = {'A','t','l','A','x','W','i','n','L','i','c','1','0','0',0}; FIXME("semi-stub\n"); @@ -105,7 +106,11 @@ BOOL WINAPI AtlAxWinInit(void) wcex.hIconSm = 0; wcex.lpfnWndProc = AtlAxWin_wndproc; - wcex.lpszClassName = AtlAxWin; + wcex.lpszClassName = AtlAxWin100; + if ( !RegisterClassExW( &wcex ) ) + return FALSE; + + wcex.lpszClassName = AtlAxWinLic100; if ( !RegisterClassExW( &wcex ) ) return FALSE; diff --git a/dlls/atl100/tests/atl.c b/dlls/atl100/tests/atl.c index 40d8583..76fa9c4 100644 --- a/dlls/atl100/tests/atl.c +++ b/dlls/atl100/tests/atl.c @@ -582,12 +582,12 @@ static void test_ax_win(void) memset(&wcex, 0, sizeof(wcex)); wcex.cbSize = sizeof(wcex); ret = GetClassInfoExW(hinstance, AtlAxWin100, &wcex); - todo_wine ok(ret, "AtlAxWin100 has not registered\n"); + ok(ret, "AtlAxWin100 has not registered\n"); memset(&wcex, 0, sizeof(wcex)); wcex.cbSize = sizeof(wcex); ret = GetClassInfoExW(hinstance, AtlAxWinLic100, &wcex); - todo_wine ok(ret, "AtlAxWinLic100 has not registered\n"); + ok(ret, "AtlAxWinLic100 has not registered\n"); } START_TEST(atl)