July 2010 - Wine-commits - list.winehq.org

Andrew Nguyen : krnl386.exe: Use the correct format specifier for size traces.
by Alexandre Julliard 19 Jul '10

19 Jul '10

Module: wine Branch: master Commit: ea7bcc6c3f454875f47f21becec7096dd28a2e0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea7bcc6c3f454875f47f21bec… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Sun Jul 18 16:22:50 2010 -0500 krnl386.exe: Use the correct format specifier for size traces. --- dlls/krnl386.exe16/int31.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/krnl386.exe16/int31.c b/dlls/krnl386.exe16/int31.c index 5183470..eb0f2c9 100644 --- a/dlls/krnl386.exe16/int31.c +++ b/dlls/krnl386.exe16/int31.c @@ -223,7 +223,7 @@ static LPVOID DPMI_xalloc( DWORD len ) if (!xflag && (lastvalloced<oldlastv)) { /* wrapped */ - FIXME( "failed to allocate linearly growing memory (%d bytes), " + FIXME( "failed to allocate linearly growing memory (%u bytes), " "using non-linear growing...\n", len ); xflag++; } @@ -235,7 +235,7 @@ static LPVOID DPMI_xalloc( DWORD len ) xflag++; if ((xflag==2) && (lastvalloced < oldlastv)) { - FIXME( "failed to allocate any memory of %d bytes!\n", len ); + FIXME( "failed to allocate any memory of %u bytes!\n", len ); return NULL; } } @@ -1343,7 +1343,7 @@ void WINAPI DOSVM_Int31Handler( CONTEXT86 *context ) DWORD size = MAKELONG( CX_reg(context), BX_reg(context) ); BYTE *ptr; - TRACE( "allocate memory block (%d bytes)\n", size ); + TRACE( "allocate memory block (%u bytes)\n", size ); ptr = DPMI_xalloc( size ); if (!ptr) @@ -1375,7 +1375,7 @@ void WINAPI DOSVM_Int31Handler( CONTEXT86 *context ) DWORD handle = MAKELONG( DI_reg(context), SI_reg(context) ); BYTE *ptr; - TRACE( "resize memory block (0x%08x, %d bytes)\n", handle, size ); + TRACE( "resize memory block (0x%08x, %u bytes)\n", handle, size ); ptr = DPMI_xrealloc( (void *)handle, size ); if (!ptr)

1 0

Andrew Nguyen : krnl386.exe: Fix a potential leak and NULL dereference in DPMI_xrealloc.
by Alexandre Julliard 19 Jul '10

19 Jul '10

Module: wine Branch: master Commit: be5d66f5d8df2fd90b6a0274cb12fe69a0d7385a URL: http://source.winehq.org/git/wine.git/?a=commit;h=be5d66f5d8df2fd90b6a0274c… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Sun Jul 18 16:23:21 2010 -0500 krnl386.exe: Fix a potential leak and NULL dereference in DPMI_xrealloc. --- dlls/krnl386.exe16/int31.c | 20 +++++++++++++------- 1 files changed, 13 insertions(+), 7 deletions(-) diff --git a/dlls/krnl386.exe16/int31.c b/dlls/krnl386.exe16/int31.c index eb0f2c9..edcf0b3 100644 --- a/dlls/krnl386.exe16/int31.c +++ b/dlls/krnl386.exe16/int31.c @@ -263,21 +263,21 @@ static void DPMI_xfree( LPVOID ptr ) * * FIXME: perhaps we could grow this mapped area... */ -static LPVOID DPMI_xrealloc( LPVOID ptr, DWORD newsize ) +static LPVOID DPMI_xrealloc( LPVOID ptr, DWORD newsize ) { MEMORY_BASIC_INFORMATION mbi; - LPVOID newptr; - newptr = DPMI_xalloc( newsize ); - if (ptr) + if (ptr) { - if (!VirtualQuery(ptr,&mbi,sizeof(mbi))) + LPVOID newptr; + + if (!VirtualQuery(ptr,&mbi,sizeof(mbi))) { FIXME( "realloc of DPMI_xallocd region %p?\n", ptr ); return NULL; } - if (mbi.State == MEM_FREE) + if (mbi.State == MEM_FREE) { FIXME( "realloc of DPMI_xallocd region %p?\n", ptr ); return NULL; @@ -289,11 +289,17 @@ static LPVOID DPMI_xrealloc( LPVOID ptr, DWORD newsize ) if (newsize <= mbi.RegionSize) return ptr; + newptr = DPMI_xalloc( newsize ); + if (!newptr) + return NULL; + memcpy( newptr, ptr, mbi.RegionSize ); DPMI_xfree( ptr ); + + return newptr; } - return newptr; + return DPMI_xalloc( newsize ); }

1 0

Piotr Caban : wininet: Cache non basic authorization data.
by Alexandre Julliard 19 Jul '10

19 Jul '10

Module: wine Branch: master Commit: c398e6fc7718030c82215bd1ab10518b1b4b672c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c398e6fc7718030c82215bd1a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Jul 17 14:08:44 2010 +0200 wininet: Cache non basic authorization data. --- dlls/wininet/http.c | 127 ++++++++++++++++++++++++++++++++++++++++++++-- dlls/wininet/internet.h | 21 ++++++++ 2 files changed, 142 insertions(+), 6 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 57c4f75..c9bbde2 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -179,7 +179,7 @@ struct gzip_stream_t { BOOL end_of_data; }; -typedef struct _authorizationData +typedef struct _basicAuthorizationData { struct list entry; @@ -187,9 +187,24 @@ typedef struct _authorizationData LPWSTR lpszwRealm; LPSTR lpszAuthorization; UINT AuthorizationLen; +} basicAuthorizationData; + +typedef struct _authorizationData +{ + struct list entry; + + LPWSTR host; + LPWSTR scheme; + LPWSTR domain; + UINT domain_len; + LPWSTR user; + UINT user_len; + LPWSTR password; + UINT password_len; } authorizationData; static struct list basicAuthorizationCache = LIST_INIT(basicAuthorizationCache); +static struct list authorizationCache = LIST_INIT(authorizationCache); static CRITICAL_SECTION authcache_cs; static CRITICAL_SECTION_DEBUG critsect_debug = @@ -570,13 +585,13 @@ static void destroy_authinfo( struct HttpAuthInfo *authinfo ) static UINT retrieve_cached_basic_authorization(LPWSTR host, LPWSTR realm, LPSTR *auth_data) { - authorizationData *ad; + basicAuthorizationData *ad; UINT rc = 0; TRACE("Looking for authorization for %s:%s\n",debugstr_w(host),debugstr_w(realm)); EnterCriticalSection(&authcache_cs); - LIST_FOR_EACH_ENTRY(ad, &basicAuthorizationCache, authorizationData, entry) + LIST_FOR_EACH_ENTRY(ad, &basicAuthorizationCache, basicAuthorizationData, entry) { if (!strcmpiW(host,ad->lpszwHost) && !strcmpW(realm,ad->lpszwRealm)) { @@ -594,14 +609,14 @@ static UINT retrieve_cached_basic_authorization(LPWSTR host, LPWSTR realm, LPSTR static void cache_basic_authorization(LPWSTR host, LPWSTR realm, LPSTR auth_data, UINT auth_data_len) { struct list *cursor; - authorizationData* ad = NULL; + basicAuthorizationData* ad = NULL; TRACE("caching authorization for %s:%s = %s\n",debugstr_w(host),debugstr_w(realm),debugstr_an(auth_data,auth_data_len)); EnterCriticalSection(&authcache_cs); LIST_FOR_EACH(cursor, &basicAuthorizationCache) { - authorizationData *check = LIST_ENTRY(cursor,authorizationData,entry); + basicAuthorizationData *check = LIST_ENTRY(cursor,basicAuthorizationData,entry); if (!strcmpiW(host,check->lpszwHost) && !strcmpW(realm,check->lpszwRealm)) { ad = check; @@ -619,7 +634,7 @@ static void cache_basic_authorization(LPWSTR host, LPWSTR realm, LPSTR auth_data } else { - ad = HeapAlloc(GetProcessHeap(),0,sizeof(authorizationData)); + ad = HeapAlloc(GetProcessHeap(),0,sizeof(basicAuthorizationData)); ad->lpszwHost = heap_strdupW(host); ad->lpszwRealm = heap_strdupW(realm); ad->lpszAuthorization = HeapAlloc(GetProcessHeap(),0,auth_data_len); @@ -631,6 +646,95 @@ static void cache_basic_authorization(LPWSTR host, LPWSTR realm, LPSTR auth_data LeaveCriticalSection(&authcache_cs); } +static BOOL retrieve_cached_authorization(LPWSTR host, LPWSTR scheme, + SEC_WINNT_AUTH_IDENTITY_W *nt_auth_identity) +{ + authorizationData *ad; + + TRACE("Looking for authorization for %s:%s\n", debugstr_w(host), debugstr_w(scheme)); + + EnterCriticalSection(&authcache_cs); + LIST_FOR_EACH_ENTRY(ad, &authorizationCache, authorizationData, entry) { + if(!strcmpiW(host, ad->host) && !strcmpiW(scheme, ad->scheme)) { + TRACE("Authorization found in cache\n"); + + nt_auth_identity->User = heap_strdupW(ad->user); + nt_auth_identity->Password = heap_strdupW(ad->password); + nt_auth_identity->Domain = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*ad->domain_len); + if(!nt_auth_identity->User || !nt_auth_identity->Password || + (!nt_auth_identity->Domain && ad->domain_len)) { + HeapFree(GetProcessHeap(), 0, nt_auth_identity->User); + HeapFree(GetProcessHeap(), 0, nt_auth_identity->Password); + HeapFree(GetProcessHeap(), 0, nt_auth_identity->Domain); + break; + } + + nt_auth_identity->Flags = SEC_WINNT_AUTH_IDENTITY_UNICODE; + nt_auth_identity->UserLength = ad->user_len; + nt_auth_identity->PasswordLength = ad->password_len; + memcpy(nt_auth_identity->Domain, ad->domain, sizeof(WCHAR)*ad->domain_len); + nt_auth_identity->DomainLength = ad->domain_len; + LeaveCriticalSection(&authcache_cs); + return TRUE; + } + } + LeaveCriticalSection(&authcache_cs); + + return FALSE; +} + +static void cache_authorization(LPWSTR host, LPWSTR scheme, + SEC_WINNT_AUTH_IDENTITY_W *nt_auth_identity) +{ + authorizationData *ad; + BOOL found = FALSE; + + TRACE("Caching authorization for %s:%s\n", debugstr_w(host), debugstr_w(scheme)); + + EnterCriticalSection(&authcache_cs); + LIST_FOR_EACH_ENTRY(ad, &authorizationCache, authorizationData, entry) + if(!strcmpiW(host, ad->host) && !strcmpiW(scheme, ad->scheme)) { + found = TRUE; + break; + } + + if(found) { + HeapFree(GetProcessHeap(), 0, ad->user); + HeapFree(GetProcessHeap(), 0, ad->password); + HeapFree(GetProcessHeap(), 0, ad->domain); + } else { + ad = HeapAlloc(GetProcessHeap(), 0, sizeof(authorizationData)); + if(!ad) { + LeaveCriticalSection(&authcache_cs); + return; + } + + ad->host = heap_strdupW(host); + ad->scheme = heap_strdupW(scheme); + list_add_head(&authorizationCache, &ad->entry); + } + + ad->user = heap_strndupW(nt_auth_identity->User, nt_auth_identity->UserLength); + ad->password = heap_strndupW(nt_auth_identity->Password, nt_auth_identity->PasswordLength); + ad->domain = heap_strndupW(nt_auth_identity->Domain, nt_auth_identity->DomainLength); + ad->user_len = nt_auth_identity->UserLength; + ad->password_len = nt_auth_identity->PasswordLength; + ad->domain_len = nt_auth_identity->DomainLength; + + if(!ad->host || !ad->scheme || !ad->user || !ad->password + || (nt_auth_identity->Domain && !ad->domain)) { + HeapFree(GetProcessHeap(), 0, ad->host); + HeapFree(GetProcessHeap(), 0, ad->scheme); + HeapFree(GetProcessHeap(), 0, ad->user); + HeapFree(GetProcessHeap(), 0, ad->password); + HeapFree(GetProcessHeap(), 0, ad->domain); + list_remove(&ad->entry); + HeapFree(GetProcessHeap(), 0, ad); + } + + LeaveCriticalSection(&authcache_cs); +} + static BOOL HTTP_DoAuthorization( http_request_t *lpwhr, LPCWSTR pszAuthValue, struct HttpAuthInfo **ppAuthInfo, LPWSTR domain_and_username, LPWSTR password, @@ -705,7 +809,11 @@ static BOOL HTTP_DoAuthorization( http_request_t *lpwhr, LPCWSTR pszAuthValue, nt_auth_identity.DomainLength = domain ? user - domain - 1 : 0; nt_auth_identity.Password = password; nt_auth_identity.PasswordLength = strlenW(nt_auth_identity.Password); + + cache_authorization(host, pAuthInfo->scheme, &nt_auth_identity); } + else if(retrieve_cached_authorization(host, pAuthInfo->scheme, &nt_auth_identity)) + pAuthData = &nt_auth_identity; else /* use default credentials */ pAuthData = NULL; @@ -715,6 +823,13 @@ static BOOL HTTP_DoAuthorization( http_request_t *lpwhr, LPCWSTR pszAuthValue, pAuthData, NULL, NULL, &pAuthInfo->cred, &exp); + + if(pAuthData && !domain_and_username) { + HeapFree(GetProcessHeap(), 0, nt_auth_identity.User); + HeapFree(GetProcessHeap(), 0, nt_auth_identity.Domain); + HeapFree(GetProcessHeap(), 0, nt_auth_identity.Password); + } + if (sec_status == SEC_E_OK) { PSecPkgInfoW sec_pkg_info; diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 07b92d8..6e41f66 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -71,6 +71,27 @@ static inline LPWSTR heap_strdupW(LPCWSTR str) return ret; } +static inline LPWSTR heap_strndupW(LPCWSTR str, UINT max_len) +{ + LPWSTR ret; + UINT len; + + if(!str) + return NULL; + + for(len=0; len<max_len; len++) + if(str[len] == '\0') + break; + + ret = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*(len+1)); + if(ret) { + memcpy(ret, str, sizeof(WCHAR)*len); + ret[len] = '\0'; + } + + return ret; +} + static inline WCHAR *heap_strdupAtoW(const char *str) { LPWSTR ret = NULL;

1 0

Seth Shelnutt : wined3d: Nvidia Geforce 8400 and 8500 are now reported as 8400GS instead of 8300GS.
by Alexandre Julliard 19 Jul '10

19 Jul '10

Module: wine Branch: master Commit: b5a5db910f3db869a1d2587dd957a4215a3e057c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5a5db910f3db869a1d2587dd… Author: Seth Shelnutt <Shelnutt2(a)gmail.com> Date: Mon Jul 12 22:56:37 2010 +0000 wined3d: Nvidia Geforce 8400 and 8500 are now reported as 8400GS instead of 8300GS. --- dlls/wined3d/directx.c | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 268fee1..0c4e994 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1009,6 +1009,7 @@ static const struct driver_version_information driver_version_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_7600, "NVIDIA GeForce 7600 GT", 15, 11, 9745 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_7800GT, "NVIDIA GeForce 7800 GT", 15, 11, 9745 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8300GS, "NVIDIA GeForce 8300 GS", 15, 11, 9745 }, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8400GS, "NVIDIA GeForce 8400 GS", 15, 11, 9745 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8600GT, "NVIDIA GeForce 8600 GT", 15, 11, 9745 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8600MGT, "NVIDIA GeForce 8600M GT", 15, 11, 9745 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8800GTS, "NVIDIA GeForce 8800 GTS", 15, 11, 9745 }, @@ -1405,14 +1406,20 @@ static enum wined3d_pci_device select_card_nvidia_binary(const struct wined3d_gl return CARD_NVIDIA_GEFORCE_8600GT; } + /* Geforce8 - mid-lowend */ + if (strstr(gl_renderer, "8400") + || strstr(gl_renderer, "8500")) + { + *vidmem = 128; /* 128-256MB for a 8400, 256-512MB for a 8500 */ + return CARD_NVIDIA_GEFORCE_8400GS; + } + /* Geforce8 - lowend */ if (strstr(gl_renderer, "8100") || strstr(gl_renderer, "8200") - || strstr(gl_renderer, "8300") - || strstr(gl_renderer, "8400") - || strstr(gl_renderer, "8500")) + || strstr(gl_renderer, "8300")) { - *vidmem = 128; /* 128-256MB for a 8300, 256-512MB for a 8400 */ + *vidmem = 128; /* 128-256MB for a 8300 */ return CARD_NVIDIA_GEFORCE_8300GS; }

1 0

Alexandre Julliard : gdi32/tests: Fixed coordinates matching to use a relative error.
by Alexandre Julliard 19 Jul '10

19 Jul '10

Module: wine Branch: master Commit: e36f326f354f13926de3d3b21cd67ac04441b0f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e36f326f354f13926de3d3b21… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 19 11:17:14 2010 +0200 gdi32/tests: Fixed coordinates matching to use a relative error. --- dlls/gdi32/tests/mapping.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/gdi32/tests/mapping.c b/dlls/gdi32/tests/mapping.c index 8c53e2f..655ab2c 100644 --- a/dlls/gdi32/tests/mapping.c +++ b/dlls/gdi32/tests/mapping.c @@ -29,7 +29,7 @@ #include "winuser.h" #include "winerror.h" -#define rough_match(got, expected) (abs((got) - (expected)) <= 5) +#define rough_match(got, expected) (abs( MulDiv( (got) - (expected), 1000, (expected) )) <= 5) #define expect_LPtoDP(_hdc, _x, _y) \ { \ @@ -121,11 +121,11 @@ static void test_world_transform(void) { expect_viewport_ext(hdc, res_x, -res_y); ok( GetWindowExtEx( hdc, &size ), "GetWindowExtEx failed\n" ); - ok( size.cx == size_cx * 10 || - size.cx == MulDiv( res_x, 254, dpi_x ), /* Vista uses a more precise method */ + ok( rough_match( size.cx, size_cx * 10 ) || + rough_match( size.cx, MulDiv( res_x, 254, dpi_x )), /* Vista uses a more precise method */ "expected cx %d or %d, got %d\n", size_cx * 10, MulDiv( res_x, 254, dpi_x ), size.cx ); - ok( size.cy == size_cy * 10 || - size.cy == MulDiv( res_y, 254, dpi_y ), /* Vista uses a more precise method */ + ok( rough_match( size.cy, size_cy * 10 ) || + rough_match( size.cy, MulDiv( res_y, 254, dpi_y )), /* Vista uses a more precise method */ "expected cy %d or %d, got %d\n", size_cy * 10, MulDiv( res_y, 254, dpi_y ), size.cy ); } expect_world_trasform(hdc, 1.0, 1.0); @@ -186,11 +186,11 @@ static void test_world_transform(void) expect_viewport_ext(hdc, res_x, -res_y); ok( GetWindowExtEx( hdc, &size ), "GetWindowExtEx failed\n" ); - ok( size.cx == size_cx * 10 || - size.cx == MulDiv( res_x, 254, dpi_x ), /* Vista uses a more precise method */ + ok( rough_match( size.cx, size_cx * 10 ) || + rough_match( size.cx, MulDiv( res_x, 254, dpi_x )), /* Vista uses a more precise method */ "expected cx %d or %d, got %d\n", size_cx * 10, MulDiv( res_x, 254, dpi_x ), size.cx ); - ok( size.cy == size_cy * 10 || - size.cy == MulDiv( res_y, 254, dpi_y ), /* Vista uses a more precise method */ + ok( rough_match( size.cy, size_cy * 10 ) || + rough_match( size.cy, MulDiv( res_y, 254, dpi_y )), /* Vista uses a more precise method */ "expected cy %d or %d, got %d\n", size_cy * 10, MulDiv( res_y, 254, dpi_y ), size.cy ); expect_world_trasform(hdc, 20.0, 20.0); expect_LPtoDP(hdc, MulDiv(20000, res_x, size.cx), -MulDiv(20000, res_y, size.cy));

1 0

Sven Baars : user32: Fix the Dutch translation.
by Alexandre Julliard 19 Jul '10

19 Jul '10

Module: wine Branch: master Commit: cb07a59a805b6d55636fce02da0a6b0d8ed360e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb07a59a805b6d55636fce02d… Author: Sven Baars <sven.wine(a)gmail.com> Date: Sat Jul 17 14:41:22 2010 +0200 user32: Fix the Dutch translation. --- dlls/user32/resources/user32_Nl.rc | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/user32/resources/user32_Nl.rc b/dlls/user32/resources/user32_Nl.rc index 2216976..0f15806 100644 --- a/dlls/user32/resources/user32_Nl.rc +++ b/dlls/user32/resources/user32_Nl.rc @@ -20,6 +20,8 @@ LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL +#pragma code_page(65001) + SYSMENU MENU LOADONCALL MOVEABLE DISCARDABLE { MENUITEM "&Vorig formaat", 61728 @@ -40,7 +42,7 @@ EDITMENU MENU LOADONCALL MOVEABLE DISCARDABLE MENUITEM "&Ongedaan maken", EM_UNDO MENUITEM SEPARATOR MENUITEM "K&nippen", WM_CUT - MENUITEM "&Kopieren", WM_COPY + MENUITEM "&Kopiëren", WM_COPY MENUITEM "&Plakken", WM_PASTE MENUITEM "&Wissen", WM_CLEAR MENUITEM SEPARATOR @@ -56,11 +58,11 @@ BEGIN PUSHBUTTON "&OK", 1, 16, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "&Annuleren", 2, 64, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "A&fbreken", 3, 112, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "&Herhaal", 4, 160, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "N&egeer", 5, 208, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "O&pnieuw", 4, 160, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "N&egeren", 5, 208, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "&Ja", 6, 256, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "&Nee", 7, 304, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "&Probeer opnieuw", 10, 352, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "P&robeer opnieuw", 10, 352, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "&Verder", 11, 400, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "Help", 9, 448, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END

1 0

Vincent Povirk : ole32: Update storage header saving code based on the latest MS spec.
by Alexandre Julliard 19 Jul '10

19 Jul '10

Module: wine Branch: master Commit: 7f3c92b2a0daf53dbcc22ac111929ecf0c22e6f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f3c92b2a0daf53dbcc22ac11… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat Jul 17 09:46:43 2010 -0500 ole32: Update storage header saving code based on the latest MS spec. These fields are needed for the MS storage implementation to load files that were created by Wine with a block size of 4096. --- dlls/ole32/storage32.c | 52 +++++++++++++++++++++++++++++++++++++++++------ dlls/ole32/storage32.h | 4 +++ 2 files changed, 49 insertions(+), 7 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 98df144..15fe143 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -1306,6 +1306,8 @@ static HRESULT StorageImpl_CreateDirEntry( entryIndex, emptyData); } + + StorageImpl_SaveFileHeader(storage); } UpdateRawDirEntry(currentData, newData); @@ -3465,6 +3467,7 @@ static void StorageImpl_SaveFileHeader( HRESULT hr; ULARGE_INTEGER offset; DWORD bytes_read, bytes_written; + DWORD major_version, dirsectorcount; /* * Get a pointer to the big block of data containing the header. @@ -3475,6 +3478,16 @@ static void StorageImpl_SaveFileHeader( if (SUCCEEDED(hr) && bytes_read != HEADER_SIZE) hr = STG_E_FILENOTFOUND; + if (This->bigBlockSizeBits == 0x9) + major_version = 3; + else if (This->bigBlockSizeBits == 0xc) + major_version = 4; + else + { + ERR("invalid big block shift 0x%x\n", This->bigBlockSizeBits); + major_version = 4; + } + /* * If the block read failed, the file is probably new. */ @@ -3489,13 +3502,6 @@ static void StorageImpl_SaveFileHeader( * Initialize the magic number. */ memcpy(headerBigBlock, STORAGE_magic, sizeof(STORAGE_magic)); - - /* - * And a bunch of things we don't know what they mean - */ - StorageUtl_WriteWord(headerBigBlock, 0x18, 0x3b); - StorageUtl_WriteWord(headerBigBlock, 0x1a, 0x3); - StorageUtl_WriteWord(headerBigBlock, 0x1c, (WORD)-2); } /* @@ -3503,6 +3509,21 @@ static void StorageImpl_SaveFileHeader( */ StorageUtl_WriteWord( headerBigBlock, + OFFSET_MINORVERSION, + 0x3e); + + StorageUtl_WriteWord( + headerBigBlock, + OFFSET_MAJORVERSION, + major_version); + + StorageUtl_WriteWord( + headerBigBlock, + OFFSET_BYTEORDERMARKER, + (WORD)-2); + + StorageUtl_WriteWord( + headerBigBlock, OFFSET_BIGBLOCKSIZEBITS, This->bigBlockSizeBits); @@ -3511,6 +3532,23 @@ static void StorageImpl_SaveFileHeader( OFFSET_SMALLBLOCKSIZEBITS, This->smallBlockSizeBits); + if (major_version >= 4) + { + if (This->rootBlockChain) + dirsectorcount = BlockChainStream_GetCount(This->rootBlockChain); + else + /* This file is being created, and it will start out with one block. */ + dirsectorcount = 1; + } + else + /* This field must be 0 in versions older than 4 */ + dirsectorcount = 0; + + StorageUtl_WriteDWord( + headerBigBlock, + OFFSET_DIRSECTORCOUNT, + dirsectorcount); + StorageUtl_WriteDWord( headerBigBlock, OFFSET_BBDEPOTCOUNT, diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h index 19f3f2d..524ff7d 100644 --- a/dlls/ole32/storage32.h +++ b/dlls/ole32/storage32.h @@ -42,8 +42,12 @@ /* * Definitions for the file format offsets. */ +static const ULONG OFFSET_MINORVERSION = 0x00000018; +static const ULONG OFFSET_MAJORVERSION = 0x0000001a; +static const ULONG OFFSET_BYTEORDERMARKER = 0x0000001c; static const ULONG OFFSET_BIGBLOCKSIZEBITS = 0x0000001e; static const ULONG OFFSET_SMALLBLOCKSIZEBITS = 0x00000020; +static const ULONG OFFSET_DIRSECTORCOUNT = 0x00000028; static const ULONG OFFSET_BBDEPOTCOUNT = 0x0000002C; static const ULONG OFFSET_ROOTSTARTBLOCK = 0x00000030; static const ULONG OFFSET_SMALLBLOCKLIMIT = 0x00000038;

1 0

Vincent Povirk : ole32: Don't map storage files in memory.
by Alexandre Julliard 19 Jul '10

19 Jul '10

Module: wine Branch: master Commit: 4171499411295dd94aa40bb6303a457eaf15ffc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4171499411295dd94aa40bb63… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Apr 7 09:54:51 2010 -0500 ole32: Don't map storage files in memory. --- dlls/ole32/stg_bigblockfile.c | 495 +++-------------------------------------- 1 files changed, 37 insertions(+), 458 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4171499411295dd94aa40…

1 0

Vincent Povirk : ole32: Remove the BigBlockFile abstraction and always use an ILockBytes.
by Alexandre Julliard 19 Jul '10

19 Jul '10

Module: wine Branch: master Commit: 14f8f9d5b56ee569ea50e72dc7911b785089539c URL: http://source.winehq.org/git/wine.git/?a=commit;h=14f8f9d5b56ee569ea50e72dc… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat Jul 17 11:56:17 2010 -0500 ole32: Remove the BigBlockFile abstraction and always use an ILockBytes. --- dlls/ole32/Makefile.in | 2 +- dlls/ole32/{stg_bigblockfile.c => filelockbytes.c} | 298 ++++++++------------ dlls/ole32/storage32.c | 33 ++- dlls/ole32/storage32.h | 32 +-- 4 files changed, 144 insertions(+), 221 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=14f8f9d5b56ee569ea50e…

1 0

Vincent Povirk : ole32: Use ILockBytes_Stat to get the filename of a storage.
by Alexandre Julliard 19 Jul '10

19 Jul '10

Module: wine Branch: master Commit: d0e6e4aa828a73866bc7307550d6553c6869eefb URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0e6e4aa828a73866bc730755… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat Jul 17 13:00:17 2010 -0500 ole32: Use ILockBytes_Stat to get the filename of a storage. --- dlls/ole32/filelockbytes.c | 33 ++++++++++++++++-- dlls/ole32/storage32.c | 80 ++++++++++++++++++++++--------------------- dlls/ole32/storage32.h | 12 ++++--- 3 files changed, 77 insertions(+), 48 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d0e6e4aa828a73866bc73…

1 0