April 2010 - Wine-Commits - list.winehq.org

Alexandre Julliard : wininet: Fix some pointer conversion warnings on 64-bit.
by Alexandre Julliard April 9, 2010

April 9, 2010

Module: wine Branch: master Commit: d982262302433306f103cfbdcc7c1c7ac33c590b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d982262302433306f103cfbdc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 9 13:43:23 2010 +0200 wininet: Fix some pointer conversion warnings on 64-bit. --- dlls/wininet/internet.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 683a605..c82ee29 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -102,8 +102,8 @@ static CRITICAL_SECTION_DEBUG WININET_cs_debug = static CRITICAL_SECTION WININET_cs = { &WININET_cs_debug, -1, 0, 0, 0, 0 }; static object_header_t **WININET_Handles; -static UINT WININET_dwNextHandle; -static UINT WININET_dwMaxHandles; +static UINT_PTR WININET_dwNextHandle; +static UINT_PTR WININET_dwMaxHandles; typedef struct { @@ -122,7 +122,7 @@ static const WCHAR szProxyEnable[] = { 'P','r','o','x','y','E','n','a','b','l',' HINTERNET WININET_AllocHandle( object_header_t *info ) { object_header_t **p; - UINT handle = 0, num; + UINT_PTR handle = 0, num; list_init( &info->children ); @@ -173,7 +173,7 @@ object_header_t *WININET_AddRef( object_header_t *info ) object_header_t *WININET_GetObject( HINTERNET hinternet ) { object_header_t *info = NULL; - UINT handle = (UINT) hinternet; + UINT_PTR handle = (UINT_PTR) hinternet; EnterCriticalSection( &WININET_cs ); @@ -183,7 +183,7 @@ object_header_t *WININET_GetObject( HINTERNET hinternet ) LeaveCriticalSection( &WININET_cs ); - TRACE("handle %d -> %p\n", handle, info); + TRACE("handle %ld -> %p\n", handle, info); return info; } @@ -218,7 +218,7 @@ BOOL WININET_Release( object_header_t *info ) BOOL WININET_FreeHandle( HINTERNET hinternet ) { BOOL ret = FALSE; - UINT handle = (UINT) hinternet; + UINT_PTR handle = (UINT_PTR) hinternet; object_header_t *info = NULL, *child, *next; EnterCriticalSection( &WININET_cs ); @@ -229,7 +229,7 @@ BOOL WININET_FreeHandle( HINTERNET hinternet ) if( WININET_Handles[handle] ) { info = WININET_Handles[handle]; - TRACE( "destroying handle %d for object %p\n", handle+1, info); + TRACE( "destroying handle %ld for object %p\n", handle+1, info); WININET_Handles[handle] = NULL; ret = TRUE; } @@ -245,8 +245,8 @@ BOOL WININET_FreeHandle( HINTERNET hinternet ) /* Free all children as native does */ LIST_FOR_EACH_ENTRY_SAFE( child, next, &info->children, object_header_t, entry ) { - TRACE( "freeing child handle %d for parent handle %d\n", - (UINT)child->hInternet, handle+1); + TRACE( "freeing child handle %ld for parent handle %ld\n", + (UINT_PTR)child->hInternet, handle+1); WININET_FreeHandle( child->hInternet ); } WININET_Release( info );

1 0

Alexandre Julliard : shell32: Store an id in change notifications to avoid invalid pointer conversions.
by Alexandre Julliard April 9, 2010

April 9, 2010

Module: wine Branch: master Commit: 8bfc89ee7cd2ae8a432ce6aa58b956e24aa6f6e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8bfc89ee7cd2ae8a432ce6aa5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 9 14:42:29 2010 +0200 shell32: Store an id in change notifications to avoid invalid pointer conversions. --- dlls/shell32/changenotify.c | 56 +++++++++++++++++++++--------------------- 1 files changed, 28 insertions(+), 28 deletions(-) diff --git a/dlls/shell32/changenotify.c b/dlls/shell32/changenotify.c index 3e79b2e..95f2e42 100644 --- a/dlls/shell32/changenotify.c +++ b/dlls/shell32/changenotify.c @@ -54,10 +54,11 @@ typedef struct _NOTIFICATIONLIST LONG wSignalledEvent; /* event that occurred */ DWORD dwFlags; /* client flags */ LPCITEMIDLIST pidlSignaled; /*pidl of the path that caused the signal*/ - + ULONG id; } NOTIFICATIONLIST, *LPNOTIFICATIONLIST; static struct list notifications = LIST_INIT( notifications ); +static LONG next_id; #define SHCNE_NOITEMEVENTS ( \ SHCNE_ASSOCCHANGED ) @@ -117,15 +118,6 @@ static const char * NodeName(const NOTIFICATIONLIST *item) return str; } -static LPNOTIFICATIONLIST FindNode( HANDLE hitem ) -{ - LPNOTIFICATIONLIST ptr; - LIST_FOR_EACH_ENTRY( ptr, &notifications, NOTIFICATIONLIST, entry ) - if( ptr == hitem ) - return ptr; - return NULL; -} - static void DeleteNode(LPNOTIFICATIONLIST item) { UINT i; @@ -195,6 +187,7 @@ SHChangeNotifyRegister( item->wEventMask = wEventMask; item->wSignalledEvent = 0; item->dwFlags = fSources; + item->id = InterlockedIncrement( &next_id ); TRACE("new node: %s\n", NodeName( item )); @@ -204,7 +197,7 @@ SHChangeNotifyRegister( LeaveCriticalSection(&SHELL32_ChangenotifyCS); - return (ULONG)item; + return item->id; } /************************************************************************* @@ -218,13 +211,17 @@ BOOL WINAPI SHChangeNotifyDeregister(ULONG hNotify) EnterCriticalSection(&SHELL32_ChangenotifyCS); - node = FindNode((HANDLE)hNotify); - if( node ) - DeleteNode(node); - + LIST_FOR_EACH_ENTRY( node, &notifications, NOTIFICATIONLIST, entry ) + { + if (node->id == hNotify) + { + DeleteNode( node ); + LeaveCriticalSection(&SHELL32_ChangenotifyCS); + return TRUE; + } + } LeaveCriticalSection(&SHELL32_ChangenotifyCS); - - return node?TRUE:FALSE; + return FALSE; } /************************************************************************* @@ -429,22 +426,25 @@ HANDLE WINAPI SHChangeNotification_Lock( /* EnterCriticalSection(&SHELL32_ChangenotifyCS); */ - node = FindNode( hChange ); - if( node ) + LIST_FOR_EACH_ENTRY( node, &notifications, NOTIFICATIONLIST, entry ) { - idlist = SHAlloc( sizeof(LPCITEMIDLIST *) * node->cidl ); - for(i=0; i<node->cidl; i++) - idlist[i] = node->pidlSignaled; - *lpwEventId = node->wSignalledEvent; - *lppidls = (LPITEMIDLIST*)idlist; - node->wSignalledEvent = 0; + if (node == hChange) + { + idlist = SHAlloc( sizeof(LPCITEMIDLIST *) * node->cidl ); + for(i=0; i<node->cidl; i++) + idlist[i] = node->pidlSignaled; + *lpwEventId = node->wSignalledEvent; + *lppidls = (LPITEMIDLIST*)idlist; + node->wSignalledEvent = 0; + /* LeaveCriticalSection(&SHELL32_ChangenotifyCS); */ + return node; + } } - else - ERR("Couldn't find %p\n", hChange ); + ERR("Couldn't find %p\n", hChange ); /* LeaveCriticalSection(&SHELL32_ChangenotifyCS); */ - return node; + return 0; } /*************************************************************************

1 0

Alexandre Julliard : oleaut32: Use the x87 assembly code for rounding on x86_64 too.
by Alexandre Julliard April 9, 2010

April 9, 2010

Module: wine Branch: master Commit: 2e5d1f192fdc028b18fbce3c5f3690a3ef16d466 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e5d1f192fdc028b18fbce3c5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 9 11:14:47 2010 +0200 oleaut32: Use the x87 assembly code for rounding on x86_64 too. --- dlls/oleaut32/vartype.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index da1288d..cfd5e8f 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -3503,7 +3503,7 @@ HRESULT WINAPI VarCyFromR4(FLOAT fltIn, CY* pCyOut) */ HRESULT WINAPI VarCyFromR8(double dblIn, CY* pCyOut) { -#if defined(__GNUC__) && defined(__i386__) +#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) /* This code gives identical results to Win32 on Intel. * Here we use fp exceptions to catch overflows when storing the value. */

1 0

Alexandre Julliard : oleaut32: Query the path of the correct kind of typelib when unregistering it.
by Alexandre Julliard April 9, 2010

April 9, 2010

Module: wine Branch: master Commit: 3681a280249a855a25872460e1043dde9b3c2b8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3681a280249a855a25872460e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 9 11:14:16 2010 +0200 oleaut32: Query the path of the correct kind of typelib when unregistering it. --- dlls/oleaut32/typelib.c | 54 ++++++++++++++++++++++++---------------------- 1 files changed, 28 insertions(+), 26 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index be0c221..5792cc5 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -283,30 +283,9 @@ static WCHAR *get_lcid_subkey( LCID lcid, SYSKIND syskind, WCHAR *buffer ) static HRESULT TLB_ReadTypeLib(LPCWSTR pszFileName, LPWSTR pszPath, UINT cchPath, ITypeLib2 **ppTypeLib); -/**************************************************************************** - * QueryPathOfRegTypeLib [OLEAUT32.164] - * - * Gets the path to a registered type library. - * - * PARAMS - * guid [I] referenced guid - * wMaj [I] major version - * wMin [I] minor version - * lcid [I] locale id - * path [O] path of typelib - * - * RETURNS - * Success: S_OK. - * Failure: If the type library is not registered then TYPE_E_LIBNOTREGISTERED - * or TYPE_E_REGISTRYACCESS if the type library registration key couldn't be - * opened. - */ -HRESULT WINAPI QueryPathOfRegTypeLib( - REFGUID guid, - WORD wMaj, - WORD wMin, - LCID lcid, - LPBSTR path ) +/* Get the path to a registered type library. Helper for QueryPathOfRegTypeLib. */ +static HRESULT query_typelib_path( REFGUID guid, WORD wMaj, WORD wMin, + SYSKIND syskind, LCID lcid, LPBSTR path ) { HRESULT hr = TYPE_E_LIBNOTREGISTERED; LCID myLCID = lcid; @@ -336,7 +315,7 @@ HRESULT WINAPI QueryPathOfRegTypeLib( { LONG dwPathLen = sizeof(Path); - get_lcid_subkey( myLCID, SYS_WIN32, buffer ); + get_lcid_subkey( myLCID, syskind, buffer ); if (RegQueryValueW(hkey, buffer, Path, &dwPathLen)) { @@ -368,6 +347,29 @@ HRESULT WINAPI QueryPathOfRegTypeLib( return hr; } +/**************************************************************************** + * QueryPathOfRegTypeLib [OLEAUT32.164] + * + * Gets the path to a registered type library. + * + * PARAMS + * guid [I] referenced guid + * wMaj [I] major version + * wMin [I] minor version + * lcid [I] locale id + * path [O] path of typelib + * + * RETURNS + * Success: S_OK. + * Failure: If the type library is not registered then TYPE_E_LIBNOTREGISTERED + * or TYPE_E_REGISTRYACCESS if the type library registration key couldn't be + * opened. + */ +HRESULT WINAPI QueryPathOfRegTypeLib( REFGUID guid, WORD wMaj, WORD wMin, LCID lcid, LPBSTR path ) +{ + return query_typelib_path( guid, wMaj, wMin, SYS_WIN32, lcid, path ); +} + /****************************************************************************** * CreateTypeLib [OLEAUT32.160] creates a typelib * @@ -799,7 +801,7 @@ HRESULT WINAPI UnRegisterTypeLib( } /* get the path to the typelib on disk */ - if (QueryPathOfRegTypeLib(libid, wVerMajor, wVerMinor, lcid, &tlibPath) != S_OK) { + if (query_typelib_path(libid, wVerMajor, wVerMinor, syskind, lcid, &tlibPath) != S_OK) { result = E_INVALIDARG; goto end; }

1 0

Alexandre Julliard : inetcomm: Rewrite MimeMessage_FindFirst/ Next to iterate correctly and avoid invalid pointer conversions.
by Alexandre Julliard April 9, 2010

April 9, 2010

Module: wine Branch: master Commit: fc81e45af6dcedabd658f3c4172f8dcc94f9415a URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc81e45af6dcedabd658f3c41… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 8 21:15:15 2010 +0200 inetcomm: Rewrite MimeMessage_FindFirst/Next to iterate correctly and avoid invalid pointer conversions. --- dlls/inetcomm/mimeole.c | 53 ++++++++++++++++++++++++---------------------- 1 files changed, 28 insertions(+), 25 deletions(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index 42cc2a1..f297c29 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -2002,38 +2002,35 @@ static HRESULT WINAPI MimeMessage_CountBodies( return S_OK; } -static HRESULT find_next(IMimeMessage *msg, LPFINDBODY find_body, HBODY *out) +static HRESULT find_next(IMimeMessage *msg, body_t *body, LPFINDBODY find, HBODY *out) { - HRESULT hr; - IMimeBody *mime_body; + MimeMessage *This = (MimeMessage *)msg; + struct list *ptr; HBODY next; - if(find_body->dwReserved == 0) - find_body->dwReserved = (DWORD)HBODY_ROOT; - else + for (;;) { - hr = IMimeMessage_GetBody(msg, IBL_FIRST, (HBODY)find_body->dwReserved, &next); - if(hr == S_OK) - find_body->dwReserved = (DWORD)next; + if (!body) ptr = list_head( &This->body_tree ); else { - hr = IMimeMessage_GetBody(msg, IBL_NEXT, (HBODY)find_body->dwReserved, &next); - if(hr == S_OK) - find_body->dwReserved = (DWORD)next; - else - return MIME_E_NOT_FOUND; + ptr = list_head( &body->children ); + while (!ptr) + { + if (!body->parent) return MIME_E_NOT_FOUND; + if (!(ptr = list_next( &body->parent->children, &body->entry ))) body = body->parent; + } } - } - hr = IMimeMessage_BindToObject(msg, (HBODY)find_body->dwReserved, &IID_IMimeBody, (void**)&mime_body); - if(IMimeBody_IsContentType(mime_body, find_body->pszPriType, find_body->pszSubType) == S_OK) - { - IMimeBody_Release(mime_body); - *out = (HBODY)find_body->dwReserved; - return S_OK; + body = LIST_ENTRY( ptr, body_t, entry ); + next = UlongToHandle( body->index ); + find->dwReserved = body->index; + if (IMimeBody_IsContentType(body->mime_body, find->pszPriType, find->pszSubType) == S_OK) + { + *out = next; + return S_OK; + } } - IMimeBody_Release(mime_body); - return find_next(msg, find_body, out); + return MIME_E_NOT_FOUND; } static HRESULT WINAPI MimeMessage_FindFirst( @@ -2044,7 +2041,7 @@ static HRESULT WINAPI MimeMessage_FindFirst( TRACE("(%p)->(%p, %p)\n", iface, pFindBody, phBody); pFindBody->dwReserved = 0; - return find_next(iface, pFindBody, phBody); + return find_next( iface, NULL, pFindBody, phBody ); } static HRESULT WINAPI MimeMessage_FindNext( @@ -2052,9 +2049,15 @@ static HRESULT WINAPI MimeMessage_FindNext( LPFINDBODY pFindBody, LPHBODY phBody) { + MimeMessage *This = (MimeMessage *)iface; + body_t *body; + HRESULT hr; + TRACE("(%p)->(%p, %p)\n", iface, pFindBody, phBody); - return find_next(iface, pFindBody, phBody); + hr = find_body( &This->body_tree, UlongToHandle( pFindBody->dwReserved ), &body ); + if (hr != S_OK) return MIME_E_NOT_FOUND; + return find_next( iface, body, pFindBody, phBody ); } static HRESULT WINAPI MimeMessage_ResolveURL(

1 0

Alexandre Julliard : ntdll: Fix affinity mask check for 64-bit.
by Alexandre Julliard April 9, 2010

April 9, 2010

Module: wine Branch: master Commit: 5189eef6bbd6a452f02bceaa1d6d4fd113171b60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5189eef6bbd6a452f02bceaa1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 8 21:16:29 2010 +0200 ntdll: Fix affinity mask check for 64-bit. --- dlls/kernel32/tests/thread.c | 12 +++++++++++- dlls/ntdll/thread.c | 2 +- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index afa6759..4c4e764 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -814,9 +814,19 @@ static VOID test_thread_processor(void) ok(SetThreadAffinityMask(curthread,processMask+1)==0, "SetThreadAffinityMask passed for an illegal processor\n"); /* NOTE: Pre-Vista does not recognize the "all processors" flag (all bits set) */ - retMask = SetThreadAffinityMask(curthread,~0UL); + retMask = SetThreadAffinityMask(curthread,~0); ok(broken(retMask==0) || retMask==processMask, "SetThreadAffinityMask(thread,-1) failed to request all processors.\n"); + if (retMask == processMask && sizeof(ULONG_PTR) > sizeof(ULONG)) + { + /* only the low 32-bits matter */ + retMask = SetThreadAffinityMask(curthread,~(ULONG_PTR)0); + ok(retMask == processMask, "SetThreadAffinityMask failed\n"); + retMask = SetThreadAffinityMask(curthread,~(ULONG_PTR)0 >> 3); + ok(retMask == processMask, "SetThreadAffinityMask failed\n"); + retMask = SetThreadAffinityMask(curthread,~(ULONG_PTR)1); + ok(retMask == 0, "SetThreadAffinityMask succeeded\n"); + } /* NOTE: This only works on WinNT/2000/XP) */ if (pSetThreadIdealProcessor) { SetLastError(0xdeadbeef); diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index d632f39..36f1499 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -1138,7 +1138,7 @@ NTSTATUS WINAPI NtSetInformationThread( HANDLE handle, THREADINFOCLASS class, if (length != sizeof(ULONG_PTR)) return STATUS_INVALID_PARAMETER; req_aff = *(const ULONG_PTR *)data; - if (req_aff == ~0UL) req_aff = affinity_mask; + if ((ULONG)req_aff == ~0u) req_aff = affinity_mask; else if (req_aff & ~affinity_mask) return STATUS_INVALID_PARAMETER; else if (!req_aff) return STATUS_INVALID_PARAMETER; SERVER_START_REQ( set_thread_info )

1 0

Alexandre Julliard : urlmon: Forward the DllMain call to the dlldata. c generated function.
by Alexandre Julliard April 9, 2010

April 9, 2010

Module: wine Branch: master Commit: 5c632145e84a9dfc4f7ff6f2ff7fa5a05a512fc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c632145e84a9dfc4f7ff6f2f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 8 19:24:04 2010 +0200 urlmon: Forward the DllMain call to the dlldata.c generated function. --- dlls/urlmon/bindprot.c | 4 ++-- dlls/urlmon/regsvr.c | 2 +- dlls/urlmon/urlmon_main.c | 4 ++-- dlls/urlmon/urlmon_main.h | 3 ++- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/urlmon/bindprot.c b/dlls/urlmon/bindprot.c index 07d6fc2..29b8532 100644 --- a/dlls/urlmon/bindprot.c +++ b/dlls/urlmon/bindprot.c @@ -155,7 +155,7 @@ HWND get_notif_hwnd(void) NULL }; - wndclass.hInstance = URLMON_hInstance; + wndclass.hInstance = hProxyDll; wnd_class = RegisterClassExW(&wndclass); if (!wnd_class && GetLastError() == ERROR_CLASS_ALREADY_EXISTS) @@ -164,7 +164,7 @@ HWND get_notif_hwnd(void) tls_data->notif_hwnd = CreateWindowExW(0, wszURLMonikerNotificationWindow, wszURLMonikerNotificationWindow, 0, 0, 0, 0, 0, HWND_MESSAGE, - NULL, URLMON_hInstance, NULL); + NULL, hProxyDll, NULL); if(tls_data->notif_hwnd) tls_data->notif_hwnd_cnt++; diff --git a/dlls/urlmon/regsvr.c b/dlls/urlmon/regsvr.c index 9e27825..6e417ac 100644 --- a/dlls/urlmon/regsvr.c +++ b/dlls/urlmon/regsvr.c @@ -560,7 +560,7 @@ static HRESULT register_inf(BOOL doregister) hAdvpack = LoadLibraryW(wszAdvpack); pRegInstall = (void *)GetProcAddress(hAdvpack, "RegInstall"); - hres = pRegInstall(URLMON_hInstance, doregister ? "RegisterDll" : "UnregisterDll", &strtable); + hres = pRegInstall(hProxyDll, doregister ? "RegisterDll" : "UnregisterDll", &strtable); for(i=0; i < sizeof(pse)/sizeof(pse[0]); i++) heap_free(pse[i].pszValue); diff --git a/dlls/urlmon/urlmon_main.c b/dlls/urlmon/urlmon_main.c index 272884e..edaad42 100644 --- a/dlls/urlmon/urlmon_main.c +++ b/dlls/urlmon/urlmon_main.c @@ -34,7 +34,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(urlmon); LONG URLMON_refCount = 0; -HINSTANCE URLMON_hInstance = 0; static HMODULE hCabinet = NULL; static DWORD urlmon_tls = TLS_OUT_OF_INDEXES; @@ -144,9 +143,10 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad) { TRACE("%p 0x%x %p\n", hinstDLL, fdwReason, fImpLoad); + URLMON_DllMain( hinstDLL, fdwReason, fImpLoad ); + switch(fdwReason) { case DLL_PROCESS_ATTACH: - URLMON_hInstance = hinstDLL; init_session(TRUE); break; diff --git a/dlls/urlmon/urlmon_main.h b/dlls/urlmon/urlmon_main.h index 8db786b..071af8d 100644 --- a/dlls/urlmon/urlmon_main.h +++ b/dlls/urlmon/urlmon_main.h @@ -36,7 +36,7 @@ #include "wine/unicode.h" #include "wine/list.h" -extern HINSTANCE URLMON_hInstance; +extern HINSTANCE hProxyDll DECLSPEC_HIDDEN; extern HRESULT SecManagerImpl_Construct(IUnknown *pUnkOuter, LPVOID *ppobj); extern HRESULT ZoneMgrImpl_Construct(IUnknown *pUnkOuter, LPVOID *ppobj); extern HRESULT StdURLMoniker_Construct(IUnknown *pUnkOuter, LPVOID *ppobj); @@ -48,6 +48,7 @@ extern HRESULT GopherProtocol_Construct(IUnknown *pUnkOuter, LPVOID *ppobj); extern HRESULT MkProtocol_Construct(IUnknown *pUnkOuter, LPVOID *ppobj); extern HRESULT MimeFilter_Construct(IUnknown *pUnkOuter, LPVOID *ppobj); +extern BOOL WINAPI URLMON_DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) DECLSPEC_HIDDEN; extern HRESULT WINAPI URLMON_DllGetClassObject(REFCLSID rclsid, REFIID iid,LPVOID *ppv) DECLSPEC_HIDDEN; extern HRESULT WINAPI URLMON_DllRegisterServer(void) DECLSPEC_HIDDEN; extern HRESULT WINAPI URLMON_DllUnregisterServer(void) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : inetcomm: Store an index instead of a handle for mime bodies to avoid pointer conversion warnings .
by Alexandre Julliard April 9, 2010

April 9, 2010

Module: wine Branch: master Commit: c1043428caaca150c240264da88c3cf656572a7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1043428caaca150c240264da… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 8 21:14:15 2010 +0200 inetcomm: Store an index instead of a handle for mime bodies to avoid pointer conversion warnings. --- dlls/inetcomm/mimeintl.c | 2 +- dlls/inetcomm/mimeole.c | 17 ++++++++--------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/inetcomm/mimeintl.c b/dlls/inetcomm/mimeintl.c index 6d37147..97b482e 100644 --- a/dlls/inetcomm/mimeintl.c +++ b/dlls/inetcomm/mimeintl.c @@ -268,7 +268,7 @@ static HRESULT WINAPI MimeInternat_FindCharset(IMimeInternational *iface, LPCSTR if(SUCCEEDED(hr)) *phCharset = add_charset(&This->charsets, &mlang_info, - (HCHARSET)InterlockedIncrement(&This->next_charset_handle)); + UlongToHandle(InterlockedIncrement(&This->next_charset_handle))); } LeaveCriticalSection(&This->cs); diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index 992949a..42cc2a1 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -1419,7 +1419,7 @@ static HRESULT create_sub_stream(IStream *stream, ULARGE_INTEGER start, ULARGE_I typedef struct body_t { struct list entry; - HBODY hbody; + DWORD index; IMimeBody *mime_body; struct body_t *parent; @@ -1434,7 +1434,7 @@ typedef struct MimeMessage IStream *stream; struct list body_tree; - HBODY next_hbody; + DWORD next_index; } MimeMessage; static HRESULT WINAPI MimeMessage_QueryInterface(IMimeMessage *iface, REFIID riid, void **ppv) @@ -1512,13 +1512,13 @@ static HRESULT WINAPI MimeMessage_IsDirty( return E_NOTIMPL; } -static body_t *new_body_entry(IMimeBody *mime_body, HBODY hbody, body_t *parent) +static body_t *new_body_entry(IMimeBody *mime_body, DWORD index, body_t *parent) { body_t *body = HeapAlloc(GetProcessHeap(), 0, sizeof(*body)); if(body) { body->mime_body = mime_body; - body->hbody = hbody; + body->index = index; list_init(&body->children); body->parent = parent; } @@ -1630,8 +1630,7 @@ static body_t *create_sub_body(MimeMessage *msg, IStream *pStm, BODYOFFSETS *off offset->cbBodyStart = cur.u.LowPart + offset->cbHeaderStart; if(parent) MimeBody_set_offsets(impl_from_IMimeBody(mime_body), offset); IMimeBody_SetData(mime_body, IET_BINARY, NULL, NULL, &IID_IStream, pStm); - body = new_body_entry(mime_body, msg->next_hbody, parent); - msg->next_hbody = (HBODY)((DWORD)msg->next_hbody + 1); + body = new_body_entry(mime_body, msg->next_index++, parent); if(IMimeBody_IsContentType(mime_body, "multipart", NULL) == S_OK) { @@ -1812,7 +1811,7 @@ static HRESULT find_body(struct list *list, HBODY hbody, body_t **body) LIST_FOR_EACH_ENTRY(cur, list, body_t, entry) { - if(cur->hbody == hbody) + if(cur->index == HandleToUlong(hbody)) { *body = cur; return S_OK; @@ -1948,7 +1947,7 @@ static HRESULT WINAPI MimeMessage_GetBody( hr = get_body(This, location, hPivot, &body); - if(hr == S_OK) *phBody = body->hbody; + if(hr == S_OK) *phBody = UlongToHandle(body->index); return hr; } @@ -2562,7 +2561,7 @@ HRESULT MimeMessage_create(IUnknown *outer, void **obj) This->refs = 1; This->stream = NULL; list_init(&This->body_tree); - This->next_hbody = (HBODY)1; + This->next_index = 1; *obj = &This->lpVtbl; return S_OK;

1 0

Rico Schüller : d3d10: Implement ID3DEffectVariable:: GetInputSignatureElementDesc().
by Alexandre Julliard April 8, 2010

April 8, 2010

Module: wine Branch: master Commit: 055a0f0d6c251745164e1730aea28d4fd75737e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=055a0f0d6c251745164e1730a… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Apr 7 18:34:24 2010 +0200 d3d10: Implement ID3DEffectVariable::GetInputSignatureElementDesc(). --- dlls/d3d10/d3d10_private.h | 13 ++++- dlls/d3d10/effect.c | 136 ++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 143 insertions(+), 6 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 50fe710..0cad484 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -29,6 +29,13 @@ #include "d3d10.h" +/* + * This doesn't belong here, but for some functions it is possible to return that value, + * see http://msdn.microsoft.com/en-us/library/bb205278%28v=VS.85%29.aspx + * The original definition is in D3DX10core.h. + */ +#define D3DERR_INVALIDCALL 0x8876086c + /* TRACE helper functions */ const char *debug_d3d10_driver_type(D3D10_DRIVER_TYPE driver_type) DECLSPEC_HIDDEN; const char *debug_d3d10_shader_variable_class(D3D10_SHADER_VARIABLE_CLASS c) DECLSPEC_HIDDEN; @@ -66,6 +73,8 @@ struct d3d10_effect_shader_signature { char *signature; UINT signature_size; + UINT element_count; + D3D10_SIGNATURE_PARAMETER_DESC *elements; }; struct d3d10_effect_shader_variable @@ -188,15 +197,17 @@ struct d3d10_effect DWORD samplerstate_count; DWORD rendertargetview_count; DWORD depthstencilview_count; - DWORD shader_call_count; + DWORD used_shader_count; DWORD anonymous_shader_count; + DWORD used_shader_current; DWORD anonymous_shader_current; struct wine_rb_tree types; struct d3d10_effect_variable *local_buffers; struct d3d10_effect_variable *local_variables; struct d3d10_effect_anonymous_shader *anonymous_shaders; + struct d3d10_effect_variable **used_shaders; struct d3d10_effect_technique *techniques; }; diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index da4e344..9c98b2c 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -223,9 +223,63 @@ static BOOL copy_name(const char *ptr, char **name) return TRUE; } +static HRESULT shader_parse_signature(const char *data, DWORD data_size, struct d3d10_effect_shader_signature *s) +{ + D3D10_SIGNATURE_PARAMETER_DESC *e; + const char *ptr = data; + unsigned int i; + DWORD count; + + read_dword(&ptr, &count); + TRACE("%u elements\n", count); + + skip_dword_unknown(&ptr, 1); + + e = HeapAlloc(GetProcessHeap(), 0, count * sizeof(*e)); + if (!e) + { + ERR("Failed to allocate signature memory.\n"); + return E_OUTOFMEMORY; + } + + for (i = 0; i < count; ++i) + { + UINT name_offset; + UINT mask; + + read_dword(&ptr, &name_offset); + e[i].SemanticName = data + name_offset; + read_dword(&ptr, &e[i].SemanticIndex); + read_dword(&ptr, &e[i].SystemValueType); + read_dword(&ptr, &e[i].ComponentType); + read_dword(&ptr, &e[i].Register); + read_dword(&ptr, &mask); + + e[i].ReadWriteMask = mask >> 8; + e[i].Mask = mask & 0xff; + + TRACE("semantic: %s, semantic idx: %u, sysval_semantic %#x, " + "type %u, register idx: %u, use_mask %#x, input_mask %#x\n", + debugstr_a(e[i].SemanticName), e[i].SemanticIndex, e[i].SystemValueType, + e[i].ComponentType, e[i].Register, e[i].Mask, e[i].ReadWriteMask); + } + + s->elements = e; + s->element_count = count; + + return S_OK; +} + +static void shader_free_signature(struct d3d10_effect_shader_signature *s) +{ + HeapFree(GetProcessHeap(), 0, s->signature); + HeapFree(GetProcessHeap(), 0, s->elements); +} + static HRESULT shader_chunk_handler(const char *data, DWORD data_size, DWORD tag, void *ctx) { struct d3d10_effect_shader_variable *s = ctx; + HRESULT hr; TRACE("tag: %s.\n", debugstr_an((const char *)&tag, 4)); @@ -274,6 +328,14 @@ static HRESULT shader_chunk_handler(const char *data, DWORD data_size, DWORD tag write_dword(&ptr, TAG_ISGN); write_dword(&ptr, data_size); memcpy(ptr, data, data_size); + + hr = shader_parse_signature(ptr, data_size, sig); + if (FAILED(hr)) + { + ERR("Failed to parse shader, hr %#x\n", hr); + shader_free_signature(sig); + } + break; } @@ -302,6 +364,15 @@ static HRESULT parse_shader(struct d3d10_effect_variable *v, const char *data) v->data = s; + if (v->effect->used_shader_current >= v->effect->used_shader_count) + { + WARN("Invalid shader? Used shader current(%u) >= used shader count(%u)\n", v->effect->used_shader_current, v->effect->used_shader_count); + return E_FAIL; + } + + v->effect->used_shaders[v->effect->used_shader_current] = v; + ++v->effect->used_shader_current; + if (!ptr) return S_OK; read_dword(&ptr, &dxbc_size); @@ -1581,6 +1652,13 @@ static HRESULT parse_fx10_body(struct d3d10_effect *e, const char *data, DWORD d return E_OUTOFMEMORY; } + e->used_shaders = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, e->used_shader_count * sizeof(*e->used_shaders)); + if (!e->used_shaders) + { + ERR("Failed to allocate used shaders memory\n"); + return E_OUTOFMEMORY; + } + e->techniques = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, e->technique_count * sizeof(*e->techniques)); if (!e->techniques) { @@ -1683,8 +1761,8 @@ static HRESULT parse_fx10(struct d3d10_effect *e, const char *data, DWORD data_s read_dword(&ptr, &e->depthstencilview_count); TRACE("Depthstencilview count: %u\n", e->depthstencilview_count); - read_dword(&ptr, &e->shader_call_count); - TRACE("Shader call count: %u\n", e->shader_call_count); + read_dword(&ptr, &e->used_shader_count); + TRACE("Used shader count: %u\n", e->used_shader_count); read_dword(&ptr, &e->anonymous_shader_count); TRACE("Anonymous shader count: %u\n", e->anonymous_shader_count); @@ -1785,7 +1863,7 @@ static void d3d10_effect_variable_destroy(struct d3d10_effect_variable *v) case D3D10_SVT_VERTEXSHADER: case D3D10_SVT_PIXELSHADER: case D3D10_SVT_GEOMETRYSHADER: - HeapFree(GetProcessHeap(), 0, ((struct d3d10_effect_shader_variable *)v->data)->input_signature.signature); + shader_free_signature(&((struct d3d10_effect_shader_variable *)v->data)->input_signature); break; default: @@ -1957,6 +2035,8 @@ static ULONG STDMETHODCALLTYPE d3d10_effect_Release(ID3D10Effect *iface) HeapFree(GetProcessHeap(), 0, This->anonymous_shaders); } + HeapFree(GetProcessHeap(), 0, This->used_shaders); + wine_rb_destroy(&This->types, d3d10_effect_type_destroy, NULL); ID3D10Device_Release(This->device); @@ -5160,10 +5240,56 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_shader_variable_GetInputSignatureE ID3D10EffectShaderVariable *iface, UINT shader_index, UINT element_index, D3D10_SIGNATURE_PARAMETER_DESC *desc) { - FIXME("iface %p, shader_index %u, element_index %u, desc %p stub!\n", + struct d3d10_effect_variable *This = (struct d3d10_effect_variable *)iface; + struct d3d10_effect_shader_variable *s; + D3D10_SIGNATURE_PARAMETER_DESC *d; + + TRACE("iface %p, shader_index %u, element_index %u, desc %p\n", iface, shader_index, element_index, desc); - return E_NOTIMPL; + if (!iface->lpVtbl->IsValid(iface)) + { + WARN("Null variable specified\n"); + return E_FAIL; + } + + /* Check shader_index, this crashes on W7/DX10 */ + if (shader_index >= This->effect->used_shader_count) + { + WARN("This should crash on W7/DX10!\n"); + return E_FAIL; + } + + s = This->effect->used_shaders[shader_index]->data; + if (!s->input_signature.signature) + { + WARN("No shader signature\n"); + return D3DERR_INVALIDCALL; + } + + /* Check desc for NULL, this crashes on W7/DX10 */ + if (!desc) + { + WARN("This should crash on W7/DX10!\n"); + return E_FAIL; + } + + if (element_index >= s->input_signature.element_count) + { + WARN("Invalid element index specified\n"); + return E_INVALIDARG; + } + + d = &s->input_signature.elements[element_index]; + desc->SemanticName = d->SemanticName; + desc->SemanticIndex = d->SemanticIndex; + desc->SystemValueType = d->SystemValueType; + desc->ComponentType = d->ComponentType; + desc->Register = d->Register; + desc->ReadWriteMask = d->ReadWriteMask; + desc->Mask = d->Mask; + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d10_effect_shader_variable_GetOutputSignatureElementDesc(

1 0

Rico Schüller : d3d10: Fix an ERR message in parse_fx10_body().
by Alexandre Julliard April 8, 2010

April 8, 2010

Module: wine Branch: master Commit: ce409fe65c48762fe387807607b88145144363f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce409fe65c48762fe38780760… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Apr 7 18:33:39 2010 +0200 d3d10: Fix an ERR message in parse_fx10_body(). --- dlls/d3d10/effect.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 1c995be..89fe623 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -1576,7 +1576,7 @@ static HRESULT parse_fx10_body(struct d3d10_effect *e, const char *data, DWORD d e->anonymous_shaders = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, e->anonymous_shader_count * sizeof(*e->anonymous_shaders)); if (!e->anonymous_shaders) { - ERR("Failed to allocate techniques memory\n"); + ERR("Failed to allocate anonymous shaders memory\n"); return E_OUTOFMEMORY; }

1 0