February 2010 - Wine-Commits

Alexandre Julliard : advapi32/tests: Fix the service inactive state check to match the documentation.
by Alexandre Julliard Feb. 3, 2010

Feb. 3, 2010

Module: wine Branch: master Commit: 823edff3127740633611fe89fe5c203a356b1e75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=823edff3127740633611fe89f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 2 23:44:32 2010 +0100 advapi32/tests: Fix the service inactive state check to match the documentation. --- dlls/advapi32/tests/service.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index 17f89d1..605f384 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -1315,10 +1315,10 @@ static void test_enum_svc(void) */ if (status.dwServiceType & (SERVICE_WIN32_OWN_PROCESS | SERVICE_WIN32_SHARE_PROCESS)) { - if (status.dwCurrentState == SERVICE_RUNNING) - servicecountactive--; - else + if (status.dwCurrentState == SERVICE_STOPPED) servicecountinactive--; + else + servicecountactive--; } } HeapFree(GetProcessHeap(), 0, services); @@ -1661,7 +1661,7 @@ static void test_enum_svc(void) if (status.dwServiceType & (SERVICE_WIN32_OWN_PROCESS | SERVICE_WIN32_SHARE_PROCESS)) { - if (status.dwCurrentState == SERVICE_RUNNING) + if (status.dwCurrentState != SERVICE_STOPPED) { /* We expect a process id for every running service */ ok(status.dwProcessId > 0, "Expected a process id for this running service (%s)\n",

1 0

Alexandre Julliard : winex11: Synchronize the shaped flag with the window region before determining the window size .
by Alexandre Julliard Feb. 3, 2010

Feb. 3, 2010

Module: wine Branch: master Commit: aa4778413025a5b93695cd97ab39fc77e3e838fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa4778413025a5b93695cd97a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 1 22:35:32 2010 +0100 winex11: Synchronize the shaped flag with the window region before determining the window size. --- dlls/winex11.drv/window.c | 17 ++++++++++++++--- 1 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index ec7f6dd..1dfecce 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1444,6 +1444,7 @@ static Window create_whole_window( Display *display, struct x11drv_win_data *dat COLORREF key; BYTE alpha; DWORD layered_flags; + HRGN win_rgn; if (!data->managed && is_window_managed( data->hwnd, SWP_NOACTIVATE, &data->window_rect )) { @@ -1452,6 +1453,14 @@ static Window create_whole_window( Display *display, struct x11drv_win_data *dat SetPropA( data->hwnd, managed_prop, (HANDLE)1 ); } + if ((win_rgn = CreateRectRgn( 0, 0, 0, 0 )) && + GetWindowRgn( data->hwnd, win_rgn ) == ERROR) + { + DeleteObject( win_rgn ); + win_rgn = 0; + } + data->shaped = (win_rgn != 0); + mask = get_window_attributes( display, data, &attr ); data->whole_rect = data->window_rect; @@ -1471,7 +1480,7 @@ static Window create_whole_window( Display *display, struct x11drv_win_data *dat if (data->whole_window) XSaveContext( display, data->whole_window, winContext, (char *)data->hwnd ); wine_tsx11_unlock(); - if (!data->whole_window) return 0; + if (!data->whole_window) goto done; if (!create_client_window( display, data, NULL )) { @@ -1480,7 +1489,7 @@ static Window create_whole_window( Display *display, struct x11drv_win_data *dat XDestroyWindow( display, data->whole_window ); data->whole_window = 0; wine_tsx11_unlock(); - return 0; + goto done; } set_initial_wm_hints( display, data ); @@ -1493,7 +1502,7 @@ static Window create_whole_window( Display *display, struct x11drv_win_data *dat sync_window_text( display, data->whole_window, text ); /* set the window region */ - sync_window_region( display, data, (HRGN)1 ); + if (win_rgn) sync_window_region( display, data, win_rgn ); /* set the window opacity */ if (!GetLayeredWindowAttributes( data->hwnd, &key, &alpha, &layered_flags )) layered_flags = 0; @@ -1502,6 +1511,8 @@ static Window create_whole_window( Display *display, struct x11drv_win_data *dat wine_tsx11_lock(); XFlush( display ); /* make sure the window exists before we start painting to it */ wine_tsx11_unlock(); +done: + if (win_rgn) DeleteObject( win_rgn ); return data->whole_window; }

1 0

Christian Costa : d3drm/tests: Use better name for test function and make it static ( spotted by Stefan Dosinger).
by Alexandre Julliard Feb. 3, 2010

Feb. 3, 2010

Module: wine Branch: master Commit: 3d361e64127db24b8188e43bed8681cca5a751ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d361e64127db24b8188e43be… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Wed Feb 3 08:38:41 2010 +0100 d3drm/tests: Use better name for test function and make it static (spotted by Stefan Dosinger). --- dlls/d3drm/tests/d3drm.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 9e74c12..3a89aa3 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -62,7 +62,7 @@ char data_bad[] = "1; 2; 3;\n" "}\n"; -void Test(void) +static void MeshBuilderTest(void) { HRESULT hr; LPDIRECT3DRM pD3DRM; @@ -95,7 +95,7 @@ START_TEST(d3drm) if (!InitFunctionPtrs()) return; - Test(); + MeshBuilderTest(); FreeLibrary(d3drm_handle); }

1 0

Dan Kegel : cmd: Size buffer in create_full_path() correctly.
by Alexandre Julliard Feb. 3, 2010

Feb. 3, 2010

Module: wine Branch: master Commit: 15998c2bdba386554b7e5f3e12d535d31bb9170c URL: http://source.winehq.org/git/wine.git/?a=commit;h=15998c2bdba386554b7e5f3e1… Author: Dan Kegel <dank(a)kegel.com> Date: Tue Feb 2 17:42:01 2010 -0800 cmd: Size buffer in create_full_path() correctly. --- programs/cmd/builtins.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index c63360b..d1019cc 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -319,7 +319,7 @@ static BOOL create_full_path(WCHAR* path) WCHAR *new_path; BOOL ret = TRUE; - new_path = HeapAlloc(GetProcessHeap(),0,(strlenW(path) * sizeof(WCHAR))+1); + new_path = HeapAlloc(GetProcessHeap(),0,(strlenW(path)+1) * sizeof(WCHAR)); strcpyW(new_path,path); while ((len = strlenW(new_path)) && new_path[len - 1] == '\\')

1 0

Alexandre Julliard : user32: Fix the WM_CONTEXTMENU parameter for 64-bit.
by Alexandre Julliard Feb. 3, 2010

Feb. 3, 2010

Module: wine Branch: master Commit: 48ab8eb3fd088df66f65205da88fdfce00851b57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48ab8eb3fd088df66f65205da… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 2 23:44:10 2010 +0100 user32: Fix the WM_CONTEXTMENU parameter for 64-bit. --- dlls/user32/defwnd.c | 2 +- dlls/user32/tests/msg.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/defwnd.c b/dlls/user32/defwnd.c index e3736fc..0101ee2 100644 --- a/dlls/user32/defwnd.c +++ b/dlls/user32/defwnd.c @@ -563,7 +563,7 @@ static LRESULT DEFWND_DefWinProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa else if( wParam == VK_F10 ) { if (GetKeyState(VK_SHIFT) & 0x8000) - SendMessageW( hwnd, WM_CONTEXTMENU, (WPARAM)hwnd, MAKELPARAM(-1, -1) ); + SendMessageW( hwnd, WM_CONTEXTMENU, (WPARAM)hwnd, -1 ); iF10Key = 1; } else if( wParam == VK_ESCAPE && (GetKeyState(VK_SHIFT) & 0x8000)) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 96b9ccc..76fef3b 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -6910,7 +6910,7 @@ static const struct message WmShiftF10Seq[] = { { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, VK_F10, 1 }, /* XP */ { WM_SYSKEYDOWN, wparam|lparam, VK_F10, 1 }, { WM_SYSKEYDOWN, sent|wparam|lparam, VK_F10, 0x00000001 }, - { WM_CONTEXTMENU, sent|defwinproc|lparam, /*hwnd*/0, MAKELPARAM(-1, -1) }, + { WM_CONTEXTMENU, sent|defwinproc|lparam, /*hwnd*/0, -1 }, { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, VK_F10, 0xc0000001 }, /* XP */ { WM_SYSKEYUP, wparam|lparam, VK_F10, 0xc0000001 }, { WM_SYSKEYUP, sent|wparam|lparam, VK_F10, 0xc0000001 },

1 0

Andrew Nguyen : ws2_32: Fix parameter validation order in getpeername.
by Alexandre Julliard Feb. 3, 2010

Feb. 3, 2010

Module: wine Branch: master Commit: 1bcc3aa35ca21b64d98f9777967bb6ccf98af567 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bcc3aa35ca21b64d98f97779… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Wed Feb 3 01:18:40 2010 -0600 ws2_32: Fix parameter validation order in getpeername. --- dlls/ws2_32/socket.c | 27 ++++++---------- dlls/ws2_32/tests/sock.c | 76 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 86 insertions(+), 17 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 9a65cb0..a9e9538 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -149,6 +149,7 @@ #include "iphlpapi.h" #include "wine/server.h" #include "wine/debug.h" +#include "wine/exception.h" #include "wine/unicode.h" #ifdef HAVE_IPX @@ -1796,13 +1797,6 @@ int WINAPI WS_getpeername(SOCKET s, struct WS_sockaddr *name, int *namelen) TRACE("socket: %04lx, ptr %p, len %08x\n", s, name, *namelen); - /* Check if what we've received is valid. Should we use IsBadReadPtr? */ - if( (name == NULL) || (namelen == NULL) ) - { - SetLastError( WSAEFAULT ); - return SOCKET_ERROR; - } - fd = get_sock_fd( s, 0, NULL ); res = SOCKET_ERROR; @@ -1811,19 +1805,18 @@ int WINAPI WS_getpeername(SOCKET s, struct WS_sockaddr *name, int *namelen) union generic_unix_sockaddr uaddr; unsigned int uaddrlen = sizeof(uaddr); - if (getpeername(fd, &uaddr.addr, &uaddrlen) != 0) - { - SetLastError(wsaErrno()); - } - else if (ws_sockaddr_u2ws(&uaddr.addr, name, namelen) != 0) + if (getpeername(fd, &uaddr.addr, &uaddrlen) == 0) { - /* The buffer was too small */ - SetLastError(WSAEFAULT); + if (!name || !namelen) + SetLastError(WSAEFAULT); + else if (ws_sockaddr_u2ws(&uaddr.addr, name, namelen) != 0) + /* The buffer was too small */ + SetLastError(WSAEFAULT); + else + res = 0; } else - { - res=0; - } + SetLastError(wsaErrno()); release_sock_fd( s, fd ); } return res; diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index fbe55f6..72242c4 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3257,6 +3257,81 @@ end: closesocket(connector2); } +static void test_getpeername(void) +{ + SOCKET sock; + struct sockaddr_in sa, sa_out; + int sa_len; + const char buf[] = "hello world"; + int ret; + + /* Test the parameter validation order. */ + ret = getpeername(INVALID_SOCKET, NULL, NULL); + ok(ret == SOCKET_ERROR, "Expected getpeername to return SOCKET_ERROR, got %d\n", ret); + ok(WSAGetLastError() == WSAENOTSOCK, + "Expected WSAGetLastError() to return WSAENOTSOCK, got %d\n", WSAGetLastError()); + + sock = socket(PF_INET, SOCK_DGRAM, IPPROTO_IP); + ok(sock != INVALID_SOCKET, "Expected socket to return a valid socket\n"); + if (sock == INVALID_SOCKET) + { + skip("Socket creation failed with %d\n", WSAGetLastError()); + return; + } + + ret = getpeername(sock, NULL, NULL); + ok(ret == SOCKET_ERROR, "Expected getpeername to return SOCKET_ERROR, got %d\n", ret); + ok(WSAGetLastError() == WSAENOTCONN, + "Expected WSAGetLastError() to return WSAENOTCONN, got %d\n", WSAGetLastError()); + + memset(&sa, 0, sizeof(sa)); + sa.sin_family = AF_INET; + sa.sin_port = htons(139); + sa.sin_addr.s_addr = inet_addr("127.0.0.1"); + + /* sendto does not change a socket's connection state. */ + ret = sendto(sock, buf, sizeof(buf), 0, (struct sockaddr*)&sa, sizeof(sa)); + ok(ret != SOCKET_ERROR, + "Expected sendto to succeed, WSAGetLastError() = %d\n", WSAGetLastError()); + + ret = getpeername(sock, NULL, NULL); + ok(ret == SOCKET_ERROR, "Expected getpeername to return SOCKET_ERROR, got %d\n", ret); + ok(WSAGetLastError() == WSAENOTCONN, + "Expected WSAGetLastError() to return WSAENOTCONN, got %d\n", WSAGetLastError()); + + ret = connect(sock, (struct sockaddr*)&sa, sizeof(sa)); + ok(ret == 0, + "Expected connect to succeed, WSAGetLastError() = %d\n", WSAGetLastError()); + + ret = getpeername(sock, NULL, NULL); + ok(ret == SOCKET_ERROR, "Expected getpeername to return SOCKET_ERROR, got %d\n", ret); + ok(WSAGetLastError() == WSAEFAULT, + "Expected WSAGetLastError() to return WSAEFAULT, got %d\n", WSAGetLastError()); + + /* Test crashes on Wine. */ + if (0) + { + ret = getpeername(sock, (void*)0xdeadbeef, (void*)0xcafebabe); + ok(ret == SOCKET_ERROR, "Expected getpeername to return SOCKET_ERROR, got %d\n", ret); + ok(WSAGetLastError() == WSAEFAULT, + "Expected WSAGetLastError() to return WSAEFAULT, got %d\n", WSAGetLastError()); + } + + sa_len = 0; + ret = getpeername(sock, (struct sockaddr*)&sa_out, &sa_len); + ok(ret == SOCKET_ERROR, "Expected getpeername to return 0, got %d\n", ret); + ok(WSAGetLastError() == WSAEFAULT, + "Expected WSAGetLastError() to return WSAEFAULT, got %d\n", WSAGetLastError()); + + sa_len = sizeof(sa_out); + ret = getpeername(sock, (struct sockaddr*)&sa_out, &sa_len); + ok(ret == 0, "Expected getpeername to return 0, got %d\n", ret); + ok(!memcmp(&sa, &sa_out, sizeof(sa)), + "Expected the returned structure to be identical to the connect structure\n"); + + closesocket(sock); +} + /**************** Main program ***************/ START_TEST( sock ) @@ -3294,6 +3369,7 @@ START_TEST( sock ) test_select(); test_accept(); + test_getpeername(); test_getsockname(); test_inet_addr(); test_addr_to_print();

1 0

Andrew Nguyen : msnet32: Add copyright author information.
by Alexandre Julliard Feb. 3, 2010

Feb. 3, 2010

Module: wine Branch: master Commit: f1b30eb49d5ac61afed0d88d4f5bc59e60967eba URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1b30eb49d5ac61afed0d88d4… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Wed Feb 3 01:28:37 2010 -0600 msnet32: Add copyright author information. --- dlls/msnet32/msnet_main.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/msnet32/msnet_main.c b/dlls/msnet32/msnet_main.c index 7c75900..1ffef50 100644 --- a/dlls/msnet32/msnet_main.c +++ b/dlls/msnet32/msnet_main.c @@ -1,4 +1,9 @@ /* + * Microsoft Network API implementation + * + * Copyright 2003 Rein Klazes + * Copyright 2006 Alexandre Julliard + * * 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

1 0

Lei Zhang : userenv: Add a small test for DestroyEnvironmentBlock.
by Alexandre Julliard Feb. 3, 2010

Feb. 3, 2010

Module: wine Branch: master Commit: a96db3c35c24624bac4f73e312f05d76ff0960fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=a96db3c35c24624bac4f73e31… Author: Lei Zhang <thestig(a)google.com> Date: Tue Feb 2 12:45:06 2010 -0800 userenv: Add a small test for DestroyEnvironmentBlock. --- dlls/userenv/tests/userenv.c | 6 ++++++ include/userenv.h | 1 + 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/userenv/tests/userenv.c b/dlls/userenv/tests/userenv.c index 39c1bbf..c61958f 100644 --- a/dlls/userenv/tests/userenv.c +++ b/dlls/userenv/tests/userenv.c @@ -197,6 +197,12 @@ static void test_create_env(void) r = get_env(env[3], "WINE_XYZZY", &st); expect(TRUE, r); if (r) HeapFree(GetProcessHeap(), 0, st); + + for (i = 0; i < sizeof(env) / sizeof(env[0]); i++) + { + r = DestroyEnvironmentBlock(env[i]); + expect(TRUE, r); + } } START_TEST(userenv) diff --git a/include/userenv.h b/include/userenv.h index 507715f..de8bbe0 100644 --- a/include/userenv.h +++ b/include/userenv.h @@ -31,6 +31,7 @@ extern "C" { #endif BOOL WINAPI CreateEnvironmentBlock(LPVOID*,HANDLE,BOOL); +BOOL WINAPI DestroyEnvironmentBlock(LPVOID); BOOL WINAPI ExpandEnvironmentStringsForUserA(HANDLE,LPCSTR,LPSTR,DWORD); BOOL WINAPI ExpandEnvironmentStringsForUserW(HANDLE,LPCWSTR,LPWSTR,DWORD); #define ExpandEnvironmentStringsForUser WINELIB_NAME_AW(ExpandEnvironmentStringsForUser)

1 0

Luca Bennati : winspool.drv: Fix Italian translation.
by Alexandre Julliard Feb. 3, 2010

Feb. 3, 2010

Module: wine Branch: master Commit: 4509d9aa1030ed672b75ae4aa59b5d4b436f0f1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4509d9aa1030ed672b75ae4aa… Author: Luca Bennati <lucak3(a)gmail.com> Date: Tue Feb 2 10:57:29 2010 +0100 winspool.drv: Fix Italian translation. --- dlls/winspool.drv/It.rc | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/winspool.drv/It.rc b/dlls/winspool.drv/It.rc index aff05a4..a661dc7 100644 --- a/dlls/winspool.drv/It.rc +++ b/dlls/winspool.drv/It.rc @@ -20,6 +20,9 @@ #include "wspool.h" +/*UTF-8*/ +#pragma code_page(65001) + LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL FILENAME_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 245, 47 @@ -36,6 +39,6 @@ END STRINGTABLE DISCARDABLE { IDS_CAPTION "Porta Locale" - IDS_FILE_EXISTS "Il file in uscita esiste gi�. Clicca su OK per sovrascriverlo." + IDS_FILE_EXISTS "Il file in uscita esiste già. Clicca su OK per sovrascriverlo." IDS_CANNOT_OPEN "Impossibile creare il file in uscita." }

1 0

Alexandre Julliard : atl: The object map entries for version 1 don' t have the last two fields.
by Alexandre Julliard Feb. 3, 2010

Feb. 3, 2010

Module: wine Branch: master Commit: 4356e4941192332d4e927efc392cb8fd12948770 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4356e4941192332d4e927efc3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 2 20:13:56 2010 +0100 atl: The object map entries for version 1 don't have the last two fields. --- dlls/atl/atl_main.c | 32 +++++++++++++++++++++----------- dlls/atl/atlbase.h | 22 ++++++++++++++++++++++ 2 files changed, 43 insertions(+), 11 deletions(-) diff --git a/dlls/atl/atl_main.c b/dlls/atl/atl_main.c index 374b0d2..75f9a11 100644 --- a/dlls/atl/atl_main.c +++ b/dlls/atl/atl_main.c @@ -97,6 +97,19 @@ HRESULT WINAPI AtlModuleInit(_ATL_MODULEW* pM, _ATL_OBJMAP_ENTRYW* p, HINSTANCE return S_OK; } +static _ATL_OBJMAP_ENTRYW_V1 *get_objmap_entry( _ATL_MODULEW *mod, unsigned int index ) +{ + _ATL_OBJMAP_ENTRYW_V1 *ret; + + if (mod->cbSize == ATLVer1Size) + ret = (_ATL_OBJMAP_ENTRYW_V1 *)mod->m_pObjMap + index; + else + ret = (_ATL_OBJMAP_ENTRYW_V1 *)(mod->m_pObjMap + index); + + if (!ret->pclsid) ret = NULL; + return ret; +} + HRESULT WINAPI AtlModuleLoadTypeLib(_ATL_MODULEW *pM, LPCOLESTR lpszIndex, BSTR *pbstrPath, ITypeLib **ppTypeLib) { @@ -158,6 +171,7 @@ HRESULT WINAPI AtlModuleAddTermFunc(_ATL_MODULEW *pM, _ATL_TERMFUNC *pFunc, DWOR HRESULT WINAPI AtlModuleRegisterClassObjects(_ATL_MODULEW *pM, DWORD dwClsContext, DWORD dwFlags) { + _ATL_OBJMAP_ENTRYW_V1 *obj; HRESULT hRes = S_OK; int i=0; @@ -166,10 +180,9 @@ HRESULT WINAPI AtlModuleRegisterClassObjects(_ATL_MODULEW *pM, DWORD dwClsContex if (pM == NULL) return E_INVALIDARG; - while(pM->m_pObjMap[i].pclsid != NULL) + while ((obj = get_objmap_entry( pM, i++ ))) { IUnknown* pUnknown; - _ATL_OBJMAP_ENTRYW *obj = &(pM->m_pObjMap[i]); HRESULT rc; TRACE("Registering object %i\n",i); @@ -185,7 +198,6 @@ HRESULT WINAPI AtlModuleRegisterClassObjects(_ATL_MODULEW *pM, DWORD dwClsContex IUnknown_Release(pUnknown); } } - i++; } return hRes; @@ -269,6 +281,7 @@ HRESULT WINAPI AtlInternalQueryInterface(void* this, const _ATL_INTMAP_ENTRY* pE */ HRESULT WINAPI AtlModuleRegisterServer(_ATL_MODULEW* pM, BOOL bRegTypeLib, const CLSID* clsid) { + const _ATL_OBJMAP_ENTRYW_V1 *obj; int i; HRESULT hRes; @@ -277,12 +290,10 @@ HRESULT WINAPI AtlModuleRegisterServer(_ATL_MODULEW* pM, BOOL bRegTypeLib, const if (pM == NULL) return E_INVALIDARG; - for (i = 0; pM->m_pObjMap[i].pclsid != NULL; i++) /* register CLSIDs */ + for (i = 0; (obj = get_objmap_entry( pM, i )) != NULL; i++) /* register CLSIDs */ { - if (!clsid || IsEqualCLSID(pM->m_pObjMap[i].pclsid, clsid)) + if (!clsid || IsEqualCLSID(obj->pclsid, clsid)) { - const _ATL_OBJMAP_ENTRYW *obj = &pM->m_pObjMap[i]; - TRACE("Registering clsid %s\n", debugstr_guid(obj->pclsid)); hRes = obj->pfnUpdateRegistry(TRUE); /* register */ if (FAILED(hRes)) @@ -351,6 +362,7 @@ HRESULT WINAPI AtlUnmarshalPtr(IStream *stm, const IID *iid, IUnknown **ppUnk) HRESULT WINAPI AtlModuleGetClassObject(_ATL_MODULEW *pm, REFCLSID rclsid, REFIID riid, LPVOID *ppv) { + _ATL_OBJMAP_ENTRYW_V1 *obj; int i; HRESULT hres = CLASS_E_CLASSNOTAVAILABLE; @@ -359,12 +371,10 @@ HRESULT WINAPI AtlModuleGetClassObject(_ATL_MODULEW *pm, REFCLSID rclsid, if (pm == NULL) return E_INVALIDARG; - for (i = 0; pm->m_pObjMap[i].pclsid != NULL; i++) + for (i = 0; (obj = get_objmap_entry( pm, i )) != NULL; i++) { - if (IsEqualCLSID(pm->m_pObjMap[i].pclsid, rclsid)) + if (IsEqualCLSID(obj->pclsid, rclsid)) { - _ATL_OBJMAP_ENTRYW *obj = &pm->m_pObjMap[i]; - TRACE("found object %i\n", i); if (obj->pfnGetClassObject) { diff --git a/dlls/atl/atlbase.h b/dlls/atl/atlbase.h index 49c13e4..59cdddf 100644 --- a/dlls/atl/atlbase.h +++ b/dlls/atl/atlbase.h @@ -33,6 +33,28 @@ typedef LPCWSTR (WINAPI _ATL_DESCRIPTIONFUNCW)(void); typedef const struct _ATL_CATMAP_ENTRY* (_ATL_CATMAPFUNC)(void); typedef void (WINAPI _ATL_TERMFUNC)(DWORD dw); +typedef struct _ATL_OBJMAP_ENTRYA_V1_TAG +{ + const CLSID* pclsid; + HRESULT (WINAPI *pfnUpdateRegistry)(BOOL bRegister); + _ATL_CREATORFUNC* pfnGetClassObject; + _ATL_CREATORFUNC* pfnCreateInstance; + IUnknown* pCF; + DWORD dwRegister; + _ATL_DESCRIPTIONFUNCA* pfnGetObjectDescription; +}_ATL_OBJMAP_ENTRYA_V1; + +typedef struct _ATL_OBJMAP_ENTRYW_V1_TAG +{ + const CLSID* pclsid; + HRESULT (WINAPI *pfnUpdateRegistry)(BOOL bRegister); + _ATL_CREATORFUNC* pfnGetClassObject; + _ATL_CREATORFUNC* pfnCreateInstance; + IUnknown* pCF; + DWORD dwRegister; + _ATL_DESCRIPTIONFUNCW* pfnGetObjectDescription; +} _ATL_OBJMAP_ENTRYW_V1; + typedef struct _ATL_OBJMAP_ENTRYA_TAG { const CLSID* pclsid;

1 0