February 2008 - Wine-commits

Rob Shearman : include: Include excpt.h from wine/exception.h.
by Alexandre Julliard 22 Feb '08

22 Feb '08

Module: wine Branch: master Commit: 4a4b1269fa4b55dd3b121dc9f84196aa67b5dde1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a4b1269fa4b55dd3b121dc9f… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Feb 21 16:13:37 2008 +0000 include: Include excpt.h from wine/exception.h. Some files use wine/exception.h without also including excpt.h, but excpt.h is needed when using native exception handling. --- include/wine/exception.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/wine/exception.h b/include/wine/exception.h index 3a14a18..fc90364 100644 --- a/include/wine/exception.h +++ b/include/wine/exception.h @@ -23,6 +23,7 @@ #include <setjmp.h> #include <windef.h> +#include <excpt.h> /* The following definitions allow using exceptions in Wine and Winelib code *

1 0

Rob Shearman : dbghelp: VARIANT unions are accessed by name in msc. c so define NONAMELESSUNION.
by Alexandre Julliard 22 Feb '08

22 Feb '08

Module: wine Branch: master Commit: 5e1976368a5fbcf86633b21820f7c76d95410383 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e1976368a5fbcf86633b2182… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Feb 21 16:44:17 2008 +0000 dbghelp: VARIANT unions are accessed by name in msc.c so define NONAMELESSUNION. --- dlls/dbghelp/msc.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index af09f1f..25589fc 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -32,6 +32,8 @@ * Add symbol size to internal symbol table. */ +#define NONAMELESSUNION + #include "config.h" #include "wine/port.h"

1 0

Mikołaj Zalewski : Make Italian, Spanish, Dutch and German resources use SUBLANG_NEUTRAL.
by Alexandre Julliard 21 Feb '08

21 Feb '08

Module: wine Branch: master Commit: 997e5f1230844ab749f0325a5cc6e961f54a4cc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=997e5f1230844ab749f0325a5… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Wed Feb 20 11:56:02 2008 +0100 Make Italian, Spanish, Dutch and German resources use SUBLANG_NEUTRAL. --- dlls/devenum/devenum.rc | 6 +++--- dlls/gphoto2.ds/gphoto2_Es.rc | 2 +- dlls/localui/ui_De.rc | 2 +- dlls/msvfw32/msvfw32_Es.rc | 2 +- dlls/sane.ds/sane_Es.rc | 2 +- programs/clock/Nl.rc | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/devenum/devenum.rc b/dlls/devenum/devenum.rc index 97474f5..1e7fea2 100644 --- a/dlls/devenum/devenum.rc +++ b/dlls/devenum/devenum.rc @@ -63,7 +63,7 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL } STRINGTABLE DISCARDABLE -LANGUAGE LANG_ITALIAN, SUBLANG_DEFAULT +LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL { 7 "DirectSound di Default" 8 "DirectSound: %s" @@ -81,7 +81,7 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_DEFAULT } STRINGTABLE DISCARDABLE -LANGUAGE LANG_SPANISH, SUBLANG_DEFAULT +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL { 7 "DirectSound por defecto" 8 "DirectSound: %s" @@ -117,7 +117,7 @@ LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL } STRINGTABLE DISCARDABLE -LANGUAGE LANG_DUTCH, SUBLANG_DEFAULT +LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL { 7 "Standaard DirectSound" 8 "DirectSound: %s" diff --git a/dlls/gphoto2.ds/gphoto2_Es.rc b/dlls/gphoto2.ds/gphoto2_Es.rc index 534c68e..2a41b1c 100644 --- a/dlls/gphoto2.ds/gphoto2_Es.rc +++ b/dlls/gphoto2.ds/gphoto2_Es.rc @@ -19,7 +19,7 @@ */ #pragma code_page(65001) -LANGUAGE LANG_SPANISH, SUBLANG_DEFAULT +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL IDD_CAMERAUI DIALOG DISCARDABLE 0, 0, 372, 273 STYLE DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUP | WS_VISIBLE | diff --git a/dlls/localui/ui_De.rc b/dlls/localui/ui_De.rc index 5e82f22..2fe35fc 100644 --- a/dlls/localui/ui_De.rc +++ b/dlls/localui/ui_De.rc @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL ADDPORT_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 245, 47 STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION diff --git a/dlls/msvfw32/msvfw32_Es.rc b/dlls/msvfw32/msvfw32_Es.rc index 0f3803b..07e857c 100644 --- a/dlls/msvfw32/msvfw32_Es.rc +++ b/dlls/msvfw32/msvfw32_Es.rc @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -LANGUAGE LANG_SPANISH, SUBLANG_DEFAULT +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL ICM_CHOOSE_COMPRESSOR DIALOG DISCARDABLE 36, 24, 187, 95 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU diff --git a/dlls/sane.ds/sane_Es.rc b/dlls/sane.ds/sane_Es.rc index bae6b62..0f0b4cb 100644 --- a/dlls/sane.ds/sane_Es.rc +++ b/dlls/sane.ds/sane_Es.rc @@ -19,7 +19,7 @@ */ #pragma code_page(65001) -LANGUAGE LANG_SPANISH, SUBLANG_DEFAULT +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL IDD_DIALOG1 DIALOG DISCARDABLE 0, 0, 186, 46 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE | DS_CENTER | DS_SETFOREGROUND diff --git a/programs/clock/Nl.rc b/programs/clock/Nl.rc index cdb7d43..688418a 100644 --- a/programs/clock/Nl.rc +++ b/programs/clock/Nl.rc @@ -42,7 +42,7 @@ MAIN_MENU MENU } } -STRINGTABLE DISCARDABLE LANGUAGE LANG_DUTCH, SUBLANG_DEFAULT +STRINGTABLE DISCARDABLE LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL { IDS_LICENSE_CAPTION, "LICENTIE" IDS_LICENSE,

1 0

Jacek Caban : urlmon: Make session object thread safe.
by Alexandre Julliard 21 Feb '08

21 Feb '08

Module: wine Branch: master Commit: a821cc34f6f437af5f9ba83896299274ec9dd984 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a821cc34f6f437af5f9ba8389… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 21 13:08:44 2008 +0100 urlmon: Make session object thread safe. --- dlls/urlmon/session.c | 76 ++++++++++++++++++++++++++++++++++++------------- 1 files changed, 56 insertions(+), 20 deletions(-) diff --git a/dlls/urlmon/session.c b/dlls/urlmon/session.c index 20be8c5..72308e1 100644 --- a/dlls/urlmon/session.c +++ b/dlls/urlmon/session.c @@ -43,6 +43,15 @@ typedef struct mime_filter { static name_space *name_space_list = NULL; static mime_filter *mime_filter_list = NULL; +static CRITICAL_SECTION session_cs; +static CRITICAL_SECTION_DEBUG session_cs_dbg = +{ + 0, 0, &session_cs, + { &session_cs_dbg.ProcessLocksList, &session_cs_dbg.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": session") } +}; +static CRITICAL_SECTION session_cs = { &session_cs_dbg, -1, 0, 0, 0, 0 }; + static name_space *find_name_space(LPCWSTR protocol) { name_space *iter; @@ -115,9 +124,13 @@ static HRESULT register_namespace(IClassFactory *cf, REFIID clsid, LPCWSTR proto new_name_space->urlmon = urlmon_protocol; new_name_space->protocol = heap_strdupW(protocol); + EnterCriticalSection(&session_cs); + new_name_space->next = name_space_list; name_space_list = new_name_space; + LeaveCriticalSection(&session_cs); + return S_OK; } @@ -125,6 +138,8 @@ static HRESULT unregister_namespace(IClassFactory *cf, LPCWSTR protocol) { name_space *iter, *last = NULL; + EnterCriticalSection(&session_cs); + for(iter = name_space_list; iter; iter = iter->next) { if(iter->cf == cf && !strcmpW(iter->protocol, protocol)) break; @@ -136,7 +151,11 @@ static HRESULT unregister_namespace(IClassFactory *cf, LPCWSTR protocol) last->next = iter->next; else name_space_list = iter->next; + } + + LeaveCriticalSection(&session_cs); + if(iter) { if(!iter->urlmon) IClassFactory_Release(iter->cf); heap_free(iter->protocol); @@ -183,20 +202,20 @@ IInternetProtocolInfo *get_protocol_info(LPCWSTR url) if(FAILED(hres) || !schema_len) return NULL; - ns = find_name_space(schema); - if(ns) { - if(ns->urlmon) - return NULL; + EnterCriticalSection(&session_cs); + ns = find_name_space(schema); + if(ns && !ns->urlmon) { hres = IClassFactory_QueryInterface(ns->cf, &IID_IInternetProtocolInfo, (void**)&ret); - if(SUCCEEDED(hres)) - return ret; - - hres = IClassFactory_CreateInstance(ns->cf, NULL, &IID_IInternetProtocolInfo, (void**)&ret); - if(SUCCEEDED(hres)) - return ret; + if(FAILED(hres)) + hres = IClassFactory_CreateInstance(ns->cf, NULL, &IID_IInternetProtocolInfo, (void**)&ret); } + LeaveCriticalSection(&session_cs); + + if(ns && SUCCEEDED(hres)) + return ret; + hres = get_protocol_cf(schema, schema_len, NULL, &cf); if(FAILED(hres)) return NULL; @@ -216,20 +235,28 @@ HRESULT get_protocol_handler(LPCWSTR url, CLSID *clsid, IClassFactory **ret) DWORD schema_len; HRESULT hres; + *ret = NULL; + hres = CoInternetParseUrl(url, PARSE_SCHEMA, 0, schema, sizeof(schema)/sizeof(schema[0]), &schema_len, 0); if(FAILED(hres) || !schema_len) return schema_len ? hres : E_FAIL; + EnterCriticalSection(&session_cs); + ns = find_name_space(schema); if(ns) { *ret = ns->cf; IClassFactory_AddRef(*ret); if(clsid) *clsid = ns->clsid; - return S_OK; } + LeaveCriticalSection(&session_cs); + + if(*ret) + return S_OK; + return get_protocol_cf(schema, schema_len, clsid, ret); } @@ -305,9 +332,13 @@ static HRESULT WINAPI InternetSession_RegisterMimeFilter(IInternetSession *iface filter->clsid = *rclsid; filter->mime = heap_strdupW(pwzType); + EnterCriticalSection(&session_cs); + filter->next = mime_filter_list; mime_filter_list = filter; + LeaveCriticalSection(&session_cs); + return S_OK; } @@ -318,23 +349,28 @@ static HRESULT WINAPI InternetSession_UnregisterMimeFilter(IInternetSession *ifa TRACE("(%p %s)\n", pCF, debugstr_w(pwzType)); + EnterCriticalSection(&session_cs); + for(iter = mime_filter_list; iter; iter = iter->next) { if(iter->cf == pCF && !strcmpW(iter->mime, pwzType)) break; prev = iter; } - if(!iter) - return S_OK; + if(iter) { + if(prev) + prev->next = iter->next; + else + mime_filter_list = iter->next; + } - if(prev) - prev->next = iter->next; - else - mime_filter_list = iter->next; + LeaveCriticalSection(&session_cs); - IClassFactory_Release(iter->cf); - heap_free(iter->mime); - heap_free(iter); + if(iter) { + IClassFactory_Release(iter->cf); + heap_free(iter->mime); + heap_free(iter); + } return S_OK; }

1 0

Jacek Caban : urlmon: Optimize get_protocol_info for urlmon protocols.
by Alexandre Julliard 21 Feb '08

21 Feb '08

Module: wine Branch: master Commit: a23a36077ca2bf1e99052ececb3e0fe8888120a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a23a36077ca2bf1e99052ecec… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 21 13:08:06 2008 +0100 urlmon: Optimize get_protocol_info for urlmon protocols. --- dlls/urlmon/session.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/urlmon/session.c b/dlls/urlmon/session.c index 09cd330..20be8c5 100644 --- a/dlls/urlmon/session.c +++ b/dlls/urlmon/session.c @@ -27,6 +27,7 @@ typedef struct name_space { LPWSTR protocol; IClassFactory *cf; CLSID clsid; + BOOL urlmon; struct name_space *next; } name_space; @@ -111,6 +112,7 @@ static HRESULT register_namespace(IClassFactory *cf, REFIID clsid, LPCWSTR proto IClassFactory_AddRef(cf); new_name_space->cf = cf; new_name_space->clsid = *clsid; + new_name_space->urlmon = urlmon_protocol; new_name_space->protocol = heap_strdupW(protocol); new_name_space->next = name_space_list; @@ -119,7 +121,7 @@ static HRESULT register_namespace(IClassFactory *cf, REFIID clsid, LPCWSTR proto return S_OK; } -static HRESULT unregister_namespace(IClassFactory *cf, LPCWSTR protocol, BOOL urlmon_protocol) +static HRESULT unregister_namespace(IClassFactory *cf, LPCWSTR protocol) { name_space *iter, *last = NULL; @@ -135,7 +137,7 @@ static HRESULT unregister_namespace(IClassFactory *cf, LPCWSTR protocol, BOOL ur else name_space_list = iter->next; - if(!urlmon_protocol) + if(!iter->urlmon) IClassFactory_Release(iter->cf); heap_free(iter->protocol); heap_free(iter); @@ -150,7 +152,7 @@ void register_urlmon_namespace(IClassFactory *cf, REFIID clsid, LPCWSTR protocol if(do_register) register_namespace(cf, clsid, protocol, TRUE); else - unregister_namespace(cf, protocol, TRUE); + unregister_namespace(cf, protocol); } BOOL is_registered_protocol(LPCWSTR url) @@ -183,6 +185,9 @@ IInternetProtocolInfo *get_protocol_info(LPCWSTR url) ns = find_name_space(schema); if(ns) { + if(ns->urlmon) + return NULL; + hres = IClassFactory_QueryInterface(ns->cf, &IID_IInternetProtocolInfo, (void**)&ret); if(SUCCEEDED(hres)) return ret; @@ -283,7 +288,7 @@ static HRESULT WINAPI InternetSession_UnregisterNameSpace(IInternetSession *ifac if(!pCF || !pszProtocol) return E_INVALIDARG; - return unregister_namespace(pCF, pszProtocol, FALSE); + return unregister_namespace(pCF, pszProtocol); } static HRESULT WINAPI InternetSession_RegisterMimeFilter(IInternetSession *iface,

1 0

Jacek Caban : urlmon: Optimize registering urlmon protocols.
by Alexandre Julliard 21 Feb '08

21 Feb '08

Module: wine Branch: master Commit: 2b90a7d6d5859f6fcb1c5e1a1a0a6b306683fcfb URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b90a7d6d5859f6fcb1c5e1a1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 21 13:07:41 2008 +0100 urlmon: Optimize registering urlmon protocols. --- dlls/urlmon/session.c | 87 ++++++++++++++++++++++++++++----------------- dlls/urlmon/urlmon_main.c | 25 ++----------- dlls/urlmon/urlmon_main.h | 1 + 3 files changed, 59 insertions(+), 54 deletions(-) diff --git a/dlls/urlmon/session.c b/dlls/urlmon/session.c index 9ce7b66..09cd330 100644 --- a/dlls/urlmon/session.c +++ b/dlls/urlmon/session.c @@ -101,6 +101,58 @@ static HRESULT get_protocol_cf(LPCWSTR schema, DWORD schema_len, CLSID *pclsid, return CoGetClassObject(&clsid, CLSCTX_INPROC_SERVER, NULL, &IID_IClassFactory, (void**)ret); } +static HRESULT register_namespace(IClassFactory *cf, REFIID clsid, LPCWSTR protocol, BOOL urlmon_protocol) +{ + name_space *new_name_space; + + new_name_space = heap_alloc(sizeof(name_space)); + + if(!urlmon_protocol) + IClassFactory_AddRef(cf); + new_name_space->cf = cf; + new_name_space->clsid = *clsid; + new_name_space->protocol = heap_strdupW(protocol); + + new_name_space->next = name_space_list; + name_space_list = new_name_space; + + return S_OK; +} + +static HRESULT unregister_namespace(IClassFactory *cf, LPCWSTR protocol, BOOL urlmon_protocol) +{ + name_space *iter, *last = NULL; + + for(iter = name_space_list; iter; iter = iter->next) { + if(iter->cf == cf && !strcmpW(iter->protocol, protocol)) + break; + last = iter; + } + + if(iter) { + if(last) + last->next = iter->next; + else + name_space_list = iter->next; + + if(!urlmon_protocol) + IClassFactory_Release(iter->cf); + heap_free(iter->protocol); + heap_free(iter); + } + + return S_OK; +} + + +void register_urlmon_namespace(IClassFactory *cf, REFIID clsid, LPCWSTR protocol, BOOL do_register) +{ + if(do_register) + register_namespace(cf, clsid, protocol, TRUE); + else + unregister_namespace(cf, protocol, TRUE); +} + BOOL is_registered_protocol(LPCWSTR url) { DWORD schema_len; @@ -209,8 +261,6 @@ static HRESULT WINAPI InternetSession_RegisterNameSpace(IInternetSession *iface, IClassFactory *pCF, REFCLSID rclsid, LPCWSTR pwzProtocol, ULONG cPatterns, const LPCWSTR *ppwzPatterns, DWORD dwReserved) { - name_space *new_name_space; - TRACE("(%p %s %s %d %p %d)\n", pCF, debugstr_guid(rclsid), debugstr_w(pwzProtocol), cPatterns, ppwzPatterns, dwReserved); @@ -222,47 +272,18 @@ static HRESULT WINAPI InternetSession_RegisterNameSpace(IInternetSession *iface, if(!pCF || !pwzProtocol) return E_INVALIDARG; - new_name_space = heap_alloc(sizeof(name_space)); - - IClassFactory_AddRef(pCF); - new_name_space->cf = pCF; - new_name_space->clsid = *rclsid; - new_name_space->protocol = heap_strdupW(pwzProtocol); - - new_name_space->next = name_space_list; - name_space_list = new_name_space; - return S_OK; + return register_namespace(pCF, rclsid, pwzProtocol, FALSE); } static HRESULT WINAPI InternetSession_UnregisterNameSpace(IInternetSession *iface, IClassFactory *pCF, LPCWSTR pszProtocol) { - name_space *iter, *last = NULL; - TRACE("(%p %s)\n", pCF, debugstr_w(pszProtocol)); if(!pCF || !pszProtocol) return E_INVALIDARG; - for(iter = name_space_list; iter; iter = iter->next) { - if(iter->cf == pCF && !strcmpW(iter->protocol, pszProtocol)) - break; - last = iter; - } - - if(!iter) - return S_OK; - - if(last) - last->next = iter->next; - else - name_space_list = iter->next; - - IClassFactory_Release(iter->cf); - heap_free(iter->protocol); - heap_free(iter); - - return S_OK; + return unregister_namespace(pCF, pszProtocol, FALSE); } static HRESULT WINAPI InternetSession_RegisterMimeFilter(IInternetSession *iface, diff --git a/dlls/urlmon/urlmon_main.c b/dlls/urlmon/urlmon_main.c index 07a9e89..7d56062 100644 --- a/dlls/urlmon/urlmon_main.c +++ b/dlls/urlmon/urlmon_main.c @@ -210,31 +210,14 @@ static const struct object_creation_info object_creation[] = static void init_session(BOOL init) { - IInternetSession *session; int i; - CoInternetGetSession(0, &session, 0); - for(i=0; i < sizeof(object_creation)/sizeof(object_creation[0]); i++) { - if(object_creation[i].protocol) { - if(init) - { - IInternetSession_RegisterNameSpace(session, object_creation[i].cf, - object_creation[i].clsid, object_creation[i].protocol, 0, NULL, 0); - /* make sure that the AddRef on the class factory doesn't keep us loaded */ - URLMON_UnlockModule(); - } - else - { - /* make sure that the Release on the class factory doesn't unload us */ - URLMON_LockModule(); - IInternetSession_UnregisterNameSpace(session, object_creation[i].cf, - object_creation[i].protocol); - } - } - } - IInternetSession_Release(session); + if(object_creation[i].protocol) + register_urlmon_namespace(object_creation[i].cf, object_creation[i].clsid, + object_creation[i].protocol, init); + } } /******************************************************************************* diff --git a/dlls/urlmon/urlmon_main.h b/dlls/urlmon/urlmon_main.h index 0e5ebff..17cbd76 100644 --- a/dlls/urlmon/urlmon_main.h +++ b/dlls/urlmon/urlmon_main.h @@ -68,6 +68,7 @@ void UMCloseCacheFileStream(IUMCacheStream *pstr); IInternetProtocolInfo *get_protocol_info(LPCWSTR url); HRESULT get_protocol_handler(LPCWSTR url, CLSID *clsid, IClassFactory **ret); BOOL is_registered_protocol(LPCWSTR); +void register_urlmon_namespace(IClassFactory*,REFIID,LPCWSTR,BOOL); HRESULT bind_to_storage(LPCWSTR url, IBindCtx *pbc, REFIID riid, void **ppv); HRESULT bind_to_object(IMoniker *mon, LPCWSTR url, IBindCtx *pbc, REFIID riid, void **ppv);

1 0

Rob Shearman : ntdll: When using HEAP_ZERO_MEMORY in heap allocation functions, don' t clear the whole block.
by Alexandre Julliard 21 Feb '08

21 Feb '08

Module: wine Branch: master Commit: e7d91129d9ba966b12f4dc6ba8100886d85102f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7d91129d9ba966b12f4dc6ba… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Feb 20 12:57:30 2008 +0000 ntdll: When using HEAP_ZERO_MEMORY in heap allocation functions, don't clear the whole block. Instead only clear the number of bytes requested and mark the remainder as uninitialised. --- dlls/ntdll/heap.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index ce95c5d..3cd59f7 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -1231,7 +1231,10 @@ PVOID WINAPI RtlAllocateHeap( HANDLE heap, ULONG flags, SIZE_T size ) notify_alloc( pInUse + 1, size, flags & HEAP_ZERO_MEMORY ); if (flags & HEAP_ZERO_MEMORY) - clear_block( pInUse + 1, pInUse->size & ARENA_SIZE_MASK ); + { + clear_block( pInUse + 1, size ); + mark_block_uninitialized( (char *)(pInUse + 1) + size, pInUse->unused_bytes ); + } else mark_block_uninitialized( pInUse + 1, pInUse->size & ARENA_SIZE_MASK ); @@ -1431,11 +1434,13 @@ PVOID WINAPI RtlReAllocateHeap( HANDLE heap, ULONG flags, PVOID ptr, SIZE_T size /* Clear the extra bytes if needed */ - if ((pArena->size & ARENA_SIZE_MASK) > oldActualSize) + if (size > oldActualSize) { if (flags & HEAP_ZERO_MEMORY) - clear_block( (char *)(pArena + 1) + oldActualSize, - (pArena->size & ARENA_SIZE_MASK) - oldActualSize ); + { + clear_block( (char *)(pArena + 1) + oldActualSize, size - oldActualSize ); + mark_block_uninitialized( (char *)(pArena + 1) + size, pArena->unused_bytes ); + } else mark_block_uninitialized( (char *)(pArena + 1) + oldActualSize, (pArena->size & ARENA_SIZE_MASK) - oldActualSize );

1 0

Andrew Talbot : dmcompos: Assign to structs instead of using memcpy.
by Alexandre Julliard 21 Feb '08

21 Feb '08

Module: wine Branch: master Commit: 1cfdeb0e0ac3888a967dde3158c2783087fe6123 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cfdeb0e0ac3888a967dde315… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Feb 20 22:52:55 2008 +0000 dmcompos: Assign to structs instead of using memcpy. --- dlls/dmcompos/chordmap.c | 22 +++++++++++----------- dlls/dmcompos/chordmaptrack.c | 4 ++-- dlls/dmcompos/signposttrack.c | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/dmcompos/chordmap.c b/dlls/dmcompos/chordmap.c index e131cf6..fae1771 100644 --- a/dlls/dmcompos/chordmap.c +++ b/dlls/dmcompos/chordmap.c @@ -145,12 +145,12 @@ static HRESULT WINAPI IDirectMusicChordMapImpl_IDirectMusicObject_GetDescriptor static HRESULT WINAPI IDirectMusicChordMapImpl_IDirectMusicObject_SetDescriptor (LPDIRECTMUSICOBJECT iface, LPDMUS_OBJECTDESC pDesc) { ICOM_THIS_MULTI(IDirectMusicChordMapImpl, ObjectVtbl, iface); TRACE("(%p, %p): setting descriptor:\n%s\n", This, pDesc, debugstr_DMUS_OBJECTDESC (pDesc)); - + /* According to MSDN, we should copy only given values, not whole struct */ if (pDesc->dwValidData & DMUS_OBJ_OBJECT) - memcpy (&This->pDesc->guidObject, &pDesc->guidObject, sizeof (pDesc->guidObject)); + This->pDesc->guidObject = pDesc->guidObject; if (pDesc->dwValidData & DMUS_OBJ_CLASS) - memcpy (&This->pDesc->guidClass, &pDesc->guidClass, sizeof (pDesc->guidClass)); + This->pDesc->guidClass = pDesc->guidClass; if (pDesc->dwValidData & DMUS_OBJ_NAME) lstrcpynW (This->pDesc->wszName, pDesc->wszName, DMUS_MAX_NAME); if (pDesc->dwValidData & DMUS_OBJ_CATEGORY) @@ -158,11 +158,11 @@ static HRESULT WINAPI IDirectMusicChordMapImpl_IDirectMusicObject_SetDescriptor if (pDesc->dwValidData & DMUS_OBJ_FILENAME) lstrcpynW (This->pDesc->wszFileName, pDesc->wszFileName, DMUS_MAX_FILENAME); if (pDesc->dwValidData & DMUS_OBJ_VERSION) - memcpy (&This->pDesc->vVersion, &pDesc->vVersion, sizeof (pDesc->vVersion)); + This->pDesc->vVersion = pDesc->vVersion; if (pDesc->dwValidData & DMUS_OBJ_DATE) - memcpy (&This->pDesc->ftDate, &pDesc->ftDate, sizeof (pDesc->ftDate)); + This->pDesc->ftDate = pDesc->ftDate; if (pDesc->dwValidData & DMUS_OBJ_MEMORY) { - memcpy (&This->pDesc->llMemLength, &pDesc->llMemLength, sizeof (pDesc->llMemLength)); + This->pDesc->llMemLength = pDesc->llMemLength; memcpy (This->pDesc->pbMemData, pDesc->pbMemData, sizeof (pDesc->pbMemData)); } if (pDesc->dwValidData & DMUS_OBJ_STREAM) { @@ -182,11 +182,11 @@ static HRESULT WINAPI IDirectMusicChordMapImpl_IDirectMusicObject_ParseDescripto LARGE_INTEGER liMove; /* used when skipping chunks */ TRACE("(%p, %p)\n", pStream, pDesc); - + /* FIXME: should this be determined from stream? */ pDesc->dwValidData |= DMUS_OBJ_CLASS; - memcpy (&pDesc->guidClass, &CLSID_DirectMusicChordMap, sizeof(CLSID)); - + pDesc->guidClass = CLSID_DirectMusicChordMap; + IStream_Read (pStream, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); TRACE_(dmfile)(": %s chunk (size = 0x%04x)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); switch (Chunk.fccID) { @@ -539,8 +539,8 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicChordMapImpl (LPCGUID lpcGUID, LPVOID* pp obj->pDesc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DMUS_OBJECTDESC)); DM_STRUCT_INIT(obj->pDesc); obj->pDesc->dwValidData |= DMUS_OBJ_CLASS; - memcpy (&obj->pDesc->guidClass, &CLSID_DirectMusicChordMap, sizeof (CLSID)); + obj->pDesc->guidClass = CLSID_DirectMusicChordMap; obj->ref = 0; /* will be inited by QueryInterface */ - + return IDirectMusicChordMapImpl_IUnknown_QueryInterface ((LPUNKNOWN)&obj->UnknownVtbl, lpcGUID, ppobj); } diff --git a/dlls/dmcompos/chordmaptrack.c b/dlls/dmcompos/chordmaptrack.c index cd65797..5fa462d 100644 --- a/dlls/dmcompos/chordmaptrack.c +++ b/dlls/dmcompos/chordmaptrack.c @@ -283,8 +283,8 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicChordMapTrack (LPCGUID lpcGUID, LPVOID *p track->pDesc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DMUS_OBJECTDESC)); DM_STRUCT_INIT(track->pDesc); track->pDesc->dwValidData |= DMUS_OBJ_CLASS; - memcpy (&track->pDesc->guidClass, &CLSID_DirectMusicChordMapTrack, sizeof (CLSID)); + track->pDesc->guidClass = CLSID_DirectMusicChordMapTrack; track->ref = 0; /* will be inited by QueryInterface */ - + return IDirectMusicChordMapTrack_IUnknown_QueryInterface ((LPUNKNOWN)&track->UnknownVtbl, lpcGUID, ppobj); } diff --git a/dlls/dmcompos/signposttrack.c b/dlls/dmcompos/signposttrack.c index 954959f..bcea894 100644 --- a/dlls/dmcompos/signposttrack.c +++ b/dlls/dmcompos/signposttrack.c @@ -281,8 +281,8 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicSignPostTrack (LPCGUID lpcGUID, LPVOID *p track->pDesc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DMUS_OBJECTDESC)); DM_STRUCT_INIT(track->pDesc); track->pDesc->dwValidData |= DMUS_OBJ_CLASS; - memcpy (&track->pDesc->guidClass, &CLSID_DirectMusicSignPostTrack, sizeof (CLSID)); + track->pDesc->guidClass = CLSID_DirectMusicSignPostTrack; track->ref = 0; /* will be inited by QueryInterface */ - + return IDirectMusicSignPostTrack_IUnknown_QueryInterface ((LPUNKNOWN)&track->UnknownVtbl, lpcGUID, ppobj); }

1 0

Dmitry Timoshkov : winex11.drv: Add an optimized path for BitBlt(SRCINVERT) .
by Alexandre Julliard 21 Feb '08

21 Feb '08

Module: wine Branch: master Commit: ae8457e431f9733415ae6a183c275dce3dd30826 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae8457e431f9733415ae6a183… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Feb 21 18:24:48 2008 +0800 winex11.drv: Add an optimized path for BitBlt(SRCINVERT). --- dlls/winex11.drv/bitblt.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index 771a52b..6f91413 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -1390,10 +1390,11 @@ static BOOL BITBLT_InternalStretchBlt( X11DRV_PDEVICE *physDevDst, INT xDst, INT return TRUE; case SRCCOPY: /* 0xcc */ + case SRCINVERT: if (physDevSrc->depth == physDevDst->depth) { wine_tsx11_lock(); - XSetFunction( gdi_display, physDevDst->gc, GXcopy ); + XSetFunction( gdi_display, physDevDst->gc, rop == SRCCOPY ? GXcopy : GXxor ); XCopyArea( gdi_display, physDevSrc->drawable, physDevDst->drawable, physDevDst->gc, physDevSrc->dc_rect.left + visRectSrc.left, @@ -1414,7 +1415,7 @@ static BOOL BITBLT_InternalStretchBlt( X11DRV_PDEVICE *physDevDst, INT xDst, INT XSetBackground( gdi_display, physDevDst->gc, fg ); XSetForeground( gdi_display, physDevDst->gc, bg ); - XSetFunction( gdi_display, physDevDst->gc, GXcopy ); + XSetFunction( gdi_display, physDevDst->gc, rop == SRCCOPY ? GXcopy : GXxor ); XCopyPlane( gdi_display, physDevSrc->drawable, physDevDst->drawable, physDevDst->gc, physDevSrc->dc_rect.left + visRectSrc.left,

1 0

Rob Shearman : ntdll: Fix the use of oldSize in RtlReAllocateHeap as both the size of the old block and the number of bytes used in the old block .
by Alexandre Julliard 21 Feb '08

21 Feb '08

Module: wine Branch: master Commit: 10b38faf3adb42273084eb267fba20ab1704af27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10b38faf3adb42273084eb267… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Feb 20 12:56:59 2008 +0000 ntdll: Fix the use of oldSize in RtlReAllocateHeap as both the size of the old block and the number of bytes used in the old block. --- dlls/ntdll/heap.c | 28 +++++++++++++++------------- 1 files changed, 15 insertions(+), 13 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 57ae2cb..ce95c5d 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -1323,7 +1323,7 @@ PVOID WINAPI RtlReAllocateHeap( HANDLE heap, ULONG flags, PVOID ptr, SIZE_T size ARENA_INUSE *pArena; HEAP *heapPtr; SUBHEAP *subheap; - SIZE_T oldSize, rounded_size; + SIZE_T oldBlockSize, oldActualSize, rounded_size; if (!ptr) return NULL; if (!(heapPtr = HEAP_GetPtr( heap ))) @@ -1355,13 +1355,14 @@ PVOID WINAPI RtlReAllocateHeap( HANDLE heap, ULONG flags, PVOID ptr, SIZE_T size /* Check if we need to grow the block */ - oldSize = (pArena->size & ARENA_SIZE_MASK); - if (rounded_size > oldSize) + oldBlockSize = (pArena->size & ARENA_SIZE_MASK); + oldActualSize = (pArena->size & ARENA_SIZE_MASK) - pArena->unused_bytes; + if (rounded_size > oldBlockSize) { - char *pNext = (char *)(pArena + 1) + oldSize; + char *pNext = (char *)(pArena + 1) + oldBlockSize; if ((pNext < (char *)subheap->base + subheap->size) && (*(DWORD *)pNext & ARENA_FLAG_FREE) && - (oldSize + (*(DWORD *)pNext & ARENA_SIZE_MASK) + sizeof(ARENA_FREE) >= rounded_size)) + (oldBlockSize + (*(DWORD *)pNext & ARENA_SIZE_MASK) + sizeof(ARENA_FREE) >= rounded_size)) { /* The next block is free and large enough */ ARENA_FREE *pFree = (ARENA_FREE *)pNext; @@ -1378,7 +1379,7 @@ PVOID WINAPI RtlReAllocateHeap( HANDLE heap, ULONG flags, PVOID ptr, SIZE_T size HEAP_ShrinkBlock( subheap, pArena, rounded_size ); notify_alloc( pArena + 1, size, FALSE ); /* FIXME: this is wrong as we may lose old VBits settings */ - mark_block_initialized( pArena + 1, oldSize ); + mark_block_initialized( pArena + 1, oldActualSize ); } else /* Do it the hard way */ { @@ -1403,9 +1404,10 @@ PVOID WINAPI RtlReAllocateHeap( HANDLE heap, ULONG flags, PVOID ptr, SIZE_T size + sizeof(ARENA_FREE) - sizeof(ARENA_INUSE); pInUse->magic = ARENA_INUSE_MAGIC; HEAP_ShrinkBlock( newsubheap, pInUse, rounded_size ); - mark_block_initialized( pInUse + 1, oldSize ); + + mark_block_initialized( pInUse + 1, oldActualSize ); notify_alloc( pInUse + 1, size, FALSE ); - memcpy( pInUse + 1, pArena + 1, oldSize ); + memcpy( pInUse + 1, pArena + 1, oldActualSize ); /* Free the previous block */ @@ -1429,14 +1431,14 @@ PVOID WINAPI RtlReAllocateHeap( HANDLE heap, ULONG flags, PVOID ptr, SIZE_T size /* Clear the extra bytes if needed */ - if (rounded_size > oldSize) + if ((pArena->size & ARENA_SIZE_MASK) > oldActualSize) { if (flags & HEAP_ZERO_MEMORY) - clear_block( (char *)(pArena + 1) + oldSize, - (pArena->size & ARENA_SIZE_MASK) - oldSize ); + clear_block( (char *)(pArena + 1) + oldActualSize, + (pArena->size & ARENA_SIZE_MASK) - oldActualSize ); else - mark_block_uninitialized( (char *)(pArena + 1) + oldSize, - (pArena->size & ARENA_SIZE_MASK) - oldSize ); + mark_block_uninitialized( (char *)(pArena + 1) + oldActualSize, + (pArena->size & ARENA_SIZE_MASK) - oldActualSize ); } /* Return the new arena */

1 0