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

Hans Leidekker : msi/tests: Fix a WoW64 test failure.
by Alexandre Julliard 27 Aug '10

27 Aug '10

Module: wine Branch: master Commit: d411c49dd148270d8abb55f1d9f4c6b9f334929a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d411c49dd148270d8abb55f1d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Aug 27 10:50:07 2010 +0200 msi/tests: Fix a WoW64 test failure. --- dlls/msi/tests/automation.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index 2b1449b..f883eac 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -2546,8 +2546,8 @@ static void test_Installer_InstallProduct(void) ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); /* Remove registry keys written by RegisterProduct standard action */ - res = delete_key_portable(HKEY_LOCAL_MACHINE, - "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\{F1C3AF50-8B56-4A69-A00C-00773FE42F30}", access); + res = RegDeleteKeyA(HKEY_LOCAL_MACHINE, + "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\{F1C3AF50-8B56-4A69-A00C-00773FE42F30}"); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); res = delete_key_portable(HKEY_LOCAL_MACHINE,

1 0

Hans Leidekker : msi: Open the database storage in transacted mode when MSIDBOPEN_CREATE or MSIDBOPEN_TRANSACT is specified .
by Alexandre Julliard 27 Aug '10

27 Aug '10

Module: wine Branch: master Commit: eef54ffe6bcda7a17a62af432f6386e6967e795a URL: http://source.winehq.org/git/wine.git/?a=commit;h=eef54ffe6bcda7a17a62af432… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Aug 27 10:50:20 2010 +0200 msi: Open the database storage in transacted mode when MSIDBOPEN_CREATE or MSIDBOPEN_TRANSACT is specified. --- dlls/msi/database.c | 28 ++++++++++++++++++++-------- dlls/msi/table.c | 9 ++++++++- 2 files changed, 28 insertions(+), 9 deletions(-) diff --git a/dlls/msi/database.c b/dlls/msi/database.c index 01c3249..986dcbb 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -300,26 +300,38 @@ UINT MSI_OpenDatabaseW(LPCWSTR szDBPath, LPCWSTR szPersist, MSIDATABASE **pdb) } else if( szPersist == MSIDBOPEN_CREATE || szPersist == MSIDBOPEN_CREATEDIRECT ) { - /* FIXME: MSIDBOPEN_CREATE should case STGM_TRANSACTED flag to be - * used here: */ - r = StgCreateDocfile( szDBPath, - STGM_CREATE|STGM_DIRECT|STGM_READWRITE|STGM_SHARE_EXCLUSIVE, 0, &stg); - if( r == ERROR_SUCCESS ) + if ( szPersist == MSIDBOPEN_CREATE ) + { + r = StgCreateDocfile( szDBPath, + STGM_CREATE|STGM_TRANSACTED|STGM_READWRITE|STGM_SHARE_EXCLUSIVE, 0, &stg); + } + else + { + r = StgCreateDocfile( szDBPath, + STGM_CREATE|STGM_DIRECT|STGM_READWRITE|STGM_SHARE_EXCLUSIVE, 0, &stg); + } + if( SUCCEEDED(r) ) { IStorage_SetClass( stg, patch ? &CLSID_MsiPatch : &CLSID_MsiDatabase ); /* create the _Tables stream */ r = write_stream_data(stg, szTables, NULL, 0, TRUE); if (SUCCEEDED(r)) + { r = msi_init_string_table( stg ); + if (SUCCEEDED(r)) + { + r = IStorage_Commit( stg, 0 ); + if (FAILED(r)) + WARN("failed to commit changes 0x%08x\n", r); + } + } } created = TRUE; } else if( szPersist == MSIDBOPEN_TRANSACT ) { - /* FIXME: MSIDBOPEN_TRANSACT should case STGM_TRANSACTED flag to be - * used here: */ r = StgOpenStorage( szDBPath, NULL, - STGM_DIRECT|STGM_READWRITE|STGM_SHARE_EXCLUSIVE, NULL, 0, &stg); + STGM_TRANSACTED|STGM_READWRITE|STGM_SHARE_EXCLUSIVE, NULL, 0, &stg); } else if( szPersist == MSIDBOPEN_DIRECT ) { diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 72d1f21..6755496 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -2319,6 +2319,7 @@ UINT TABLE_CreateView( MSIDATABASE *db, LPCWSTR name, MSIVIEW **view ) UINT MSI_CommitTables( MSIDATABASE *db ) { UINT r; + HRESULT hr; MSITABLE *table = NULL; TRACE("%p\n",db); @@ -2344,7 +2345,13 @@ UINT MSI_CommitTables( MSIDATABASE *db ) /* force everything to reload next time */ free_cached_tables( db ); - return ERROR_SUCCESS; + hr = IStorage_Commit( db->storage, 0 ); + if (FAILED( hr )) + { + WARN("failed to commit changes 0x%08x\n", hr); + r = ERROR_FUNCTION_FAILED; + } + return r; } MSICONDITION MSI_DatabaseIsTablePersistent( MSIDATABASE *db, LPCWSTR table )

1 0

Hans Leidekker : msi: Move database initialization to a separate function.
by Alexandre Julliard 27 Aug '10

27 Aug '10

Module: wine Branch: master Commit: dd7514a38d0be4bdd7f0635d1abad2fca832df0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd7514a38d0be4bdd7f0635d1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Aug 27 10:50:35 2010 +0200 msi: Move database initialization to a separate function. --- dlls/msi/database.c | 79 +++++++++++++++++++++++++++++++++------------------ 1 files changed, 51 insertions(+), 28 deletions(-) diff --git a/dlls/msi/database.c b/dlls/msi/database.c index 986dcbb..748cbfd 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -255,6 +255,43 @@ static VOID MSI_CloseDatabase( MSIOBJECTHDR *arg ) } } +static HRESULT db_initialize( IStorage *stg, const GUID *clsid ) +{ + static const WCHAR szTables[] = { '_','T','a','b','l','e','s',0 }; + HRESULT hr; + + hr = IStorage_SetClass( stg, clsid ); + if (FAILED( hr )) + { + WARN("failed to set class id 0x%08x\n", hr); + return hr; + } + + /* create the _Tables stream */ + hr = write_stream_data( stg, szTables, NULL, 0, TRUE ); + if (FAILED( hr )) + { + WARN("failed to create _Tables stream 0x%08x\n", hr); + return hr; + } + + hr = msi_init_string_table( stg ); + if (FAILED( hr )) + { + WARN("failed to initialize string table 0x%08x\n", hr); + return hr; + } + + hr = IStorage_Commit( stg, 0 ); + if (FAILED( hr )) + { + WARN("failed to commit changes 0x%08x\n", hr); + return hr; + } + + return S_OK; +} + UINT MSI_OpenDatabaseW(LPCWSTR szDBPath, LPCWSTR szPersist, MSIDATABASE **pdb) { IStorage *stg = NULL; @@ -266,8 +303,6 @@ UINT MSI_OpenDatabaseW(LPCWSTR szDBPath, LPCWSTR szPersist, MSIDATABASE **pdb) BOOL created = FALSE, patch = FALSE; WCHAR path[MAX_PATH]; - static const WCHAR szTables[] = { '_','T','a','b','l','e','s',0 }; - TRACE("%s %s\n",debugstr_w(szDBPath),debugstr_w(szPersist) ); if( !pdb ) @@ -298,34 +333,22 @@ UINT MSI_OpenDatabaseW(LPCWSTR szDBPath, LPCWSTR szPersist, MSIDATABASE **pdb) r = StgOpenStorage( szDBPath, NULL, STGM_DIRECT|STGM_READ|STGM_SHARE_DENY_WRITE, NULL, 0, &stg); } - else if( szPersist == MSIDBOPEN_CREATE || szPersist == MSIDBOPEN_CREATEDIRECT ) + else if( szPersist == MSIDBOPEN_CREATE ) { - if ( szPersist == MSIDBOPEN_CREATE ) - { - r = StgCreateDocfile( szDBPath, - STGM_CREATE|STGM_TRANSACTED|STGM_READWRITE|STGM_SHARE_EXCLUSIVE, 0, &stg); - } - else - { - r = StgCreateDocfile( szDBPath, - STGM_CREATE|STGM_DIRECT|STGM_READWRITE|STGM_SHARE_EXCLUSIVE, 0, &stg); - } + r = StgCreateDocfile( szDBPath, + STGM_CREATE|STGM_TRANSACTED|STGM_READWRITE|STGM_SHARE_EXCLUSIVE, 0, &stg ); + if( SUCCEEDED(r) ) - { - IStorage_SetClass( stg, patch ? &CLSID_MsiPatch : &CLSID_MsiDatabase ); - /* create the _Tables stream */ - r = write_stream_data(stg, szTables, NULL, 0, TRUE); - if (SUCCEEDED(r)) - { - r = msi_init_string_table( stg ); - if (SUCCEEDED(r)) - { - r = IStorage_Commit( stg, 0 ); - if (FAILED(r)) - WARN("failed to commit changes 0x%08x\n", r); - } - } - } + r = db_initialize( stg, patch ? &CLSID_MsiPatch : &CLSID_MsiDatabase ); + created = TRUE; + } + else if( szPersist == MSIDBOPEN_CREATEDIRECT ) + { + r = StgCreateDocfile( szDBPath, + STGM_CREATE|STGM_DIRECT|STGM_READWRITE|STGM_SHARE_EXCLUSIVE, 0, &stg ); + + if( SUCCEEDED(r) ) + r = db_initialize( stg, patch ? &CLSID_MsiPatch : &CLSID_MsiDatabase ); created = TRUE; } else if( szPersist == MSIDBOPEN_TRANSACT )

1 0

Hans Leidekker : wininet: Handle HTTP_STATUS_REDIRECT_METHOD.
by Alexandre Julliard 27 Aug '10

27 Aug '10

Module: wine Branch: master Commit: 94deb85d12eba2a7a0162523e82b55320316ea6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=94deb85d12eba2a7a0162523e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Aug 27 10:50:59 2010 +0200 wininet: Handle HTTP_STATUS_REDIRECT_METHOD. --- dlls/wininet/http.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index e74c974..f5ae426 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3787,7 +3787,9 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *lpwhr, LPCWSTR lpszHeaders, { WCHAR *new_url, szNewLocation[INTERNET_MAX_URL_LENGTH]; dwBufferSize=sizeof(szNewLocation); - if ((dwStatusCode==HTTP_STATUS_REDIRECT || dwStatusCode==HTTP_STATUS_MOVED) && + if ((dwStatusCode == HTTP_STATUS_REDIRECT || + dwStatusCode == HTTP_STATUS_MOVED || + dwStatusCode == HTTP_STATUS_REDIRECT_METHOD) && HTTP_HttpQueryInfoW(lpwhr,HTTP_QUERY_LOCATION,szNewLocation,&dwBufferSize,NULL) == ERROR_SUCCESS) { if (strcmpW(lpwhr->lpszVerb, szGET) && strcmpW(lpwhr->lpszVerb, szHEAD))

1 0

Matteo Bruni : d3dx9_43: Add d3dx9_43.dll, forwarding to d3dx9_36.dll.
by Alexandre Julliard 27 Aug '10

27 Aug '10

Module: wine Branch: master Commit: 90c615aa6117a1014633b6a747aef2822eb3d0bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=90c615aa6117a1014633b6a74… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Wed Aug 25 17:12:51 2010 +0200 d3dx9_43: Add d3dx9_43.dll, forwarding to d3dx9_36.dll. --- configure | 1 + configure.ac | 1 + dlls/d3dx9_43/Makefile.in | 13 ++ dlls/d3dx9_43/d3dx9_43.spec | 329 +++++++++++++++++++++++++++++++++++++++++ dlls/d3dx9_43/d3dx9_43_main.c | 63 ++++++++ dlls/d3dx9_43/version.rc | 27 ++++ 6 files changed, 434 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=90c615aa6117a1014633b…

1 0

Juan Lang : userenv/tests: Add tests for GetProfilesDirectory.
by Alexandre Julliard 27 Aug '10

27 Aug '10

Module: wine Branch: master Commit: 4e19b7ae3516432d4be3ac258d5621ebf8f29833 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e19b7ae3516432d4be3ac258… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Aug 26 17:01:05 2010 -0700 userenv/tests: Add tests for GetProfilesDirectory. --- dlls/userenv/tests/userenv.c | 68 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 68 insertions(+), 0 deletions(-) diff --git a/dlls/userenv/tests/userenv.c b/dlls/userenv/tests/userenv.c index c61958f..790cc80 100644 --- a/dlls/userenv/tests/userenv.c +++ b/dlls/userenv/tests/userenv.c @@ -25,6 +25,7 @@ #include "windef.h" #include "winbase.h" #include "winnls.h" +#include "winreg.h" #include "userenv.h" @@ -32,6 +33,7 @@ #define expect(EXPECTED,GOT) ok((GOT)==(EXPECTED), "Expected %d, got %d\n", (EXPECTED), (GOT)) #define expect_env(EXPECTED,GOT,VAR) ok((GOT)==(EXPECTED), "Expected %d, got %d for %s (%d)\n", (EXPECTED), (GOT), (VAR), j) +#define expect_gle(EXPECTED) ok(GetLastError() == (EXPECTED), "Expected %d, got %d\n", (EXPECTED), GetLastError()) struct profile_item { @@ -205,7 +207,73 @@ static void test_create_env(void) } } +static void test_get_profiles_dir(void) +{ + static const char ProfileListA[] = "Software\\Microsoft\\Windows NT\\CurrentVersion\\ProfileList"; + static const char ProfilesDirectory[] = "ProfilesDirectory"; + BOOL r; + DWORD cch, profiles_len; + LONG l; + HKEY key; + char *profiles_dir, *buf, small_buf[1]; + + l = RegOpenKeyExA(HKEY_LOCAL_MACHINE, ProfileListA, 0, KEY_READ, &key); + if (l) + { + win_skip("No ProfileList key (Win9x), skipping tests\n"); + return; + } + l = RegQueryValueExA(key, ProfilesDirectory, NULL, NULL, NULL, &cch); + if (l) + { + win_skip("No ProfilesDirectory value, skipping tests\n"); + return; + } + buf = HeapAlloc(GetProcessHeap(), 0, cch); + RegQueryValueExA(key, ProfilesDirectory, NULL, NULL, (BYTE *)buf, &cch); + RegCloseKey(key); + profiles_len = ExpandEnvironmentStringsA(buf, NULL, 0); + profiles_dir = HeapAlloc(GetProcessHeap(), 0, profiles_len); + ExpandEnvironmentStringsA(buf, profiles_dir, profiles_len); + HeapFree(GetProcessHeap(), 0, buf); + + SetLastError(0xdeadbeef); + r = GetProfilesDirectoryA(NULL, NULL); + expect(FALSE, r); + todo_wine + expect_gle(ERROR_INVALID_PARAMETER); + SetLastError(0xdeadbeef); + r = GetProfilesDirectoryA(NULL, &cch); + expect(FALSE, r); + todo_wine + expect_gle(ERROR_INVALID_PARAMETER); + SetLastError(0xdeadbeef); + cch = 1; + r = GetProfilesDirectoryA(small_buf, &cch); + expect(FALSE, r); + todo_wine + expect_gle(ERROR_INSUFFICIENT_BUFFER); + /* MSDN claims the returned character count includes the NULL terminator + * when the buffer is too small, but that's not in fact what gets returned. + */ + todo_wine + ok(cch == profiles_len - 1, "expected %d, got %d\n", profiles_len - 1, cch); + buf = HeapAlloc(GetProcessHeap(), 0, cch); + r = GetProfilesDirectoryA(buf, &cch); + /* Rather than a BOOL, the return value is also the number of characters + * stored in the buffer. + */ + todo_wine + expect(profiles_len - 1, r); + todo_wine + ok(!strcmp(buf, profiles_dir), "expected %s, got %s\n", profiles_dir, buf); + + HeapFree(GetProcessHeap(), 0, buf); + HeapFree(GetProcessHeap(), 0, profiles_dir); +} + START_TEST(userenv) { test_create_env(); + test_get_profiles_dir(); }

1 0

Juan Lang : userenv: Implement GetProfilesDirectory.
by Alexandre Julliard 27 Aug '10

27 Aug '10

Module: wine Branch: master Commit: e5394c6ce562104a5fc5a34c787396363b61a281 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5394c6ce562104a5fc5a34c7… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Aug 26 17:17:44 2010 -0700 userenv: Implement GetProfilesDirectory. --- dlls/userenv/Makefile.in | 1 + dlls/userenv/tests/userenv.c | 11 ++--- dlls/userenv/userenv_main.c | 120 ++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 121 insertions(+), 11 deletions(-) diff --git a/dlls/userenv/Makefile.in b/dlls/userenv/Makefile.in index f3a4149..aaf0de1 100644 --- a/dlls/userenv/Makefile.in +++ b/dlls/userenv/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = userenv.dll +IMPORTS = advapi32 IMPORTLIB = userenv C_SRCS = \ diff --git a/dlls/userenv/tests/userenv.c b/dlls/userenv/tests/userenv.c index 790cc80..4fa257b 100644 --- a/dlls/userenv/tests/userenv.c +++ b/dlls/userenv/tests/userenv.c @@ -240,32 +240,29 @@ static void test_get_profiles_dir(void) SetLastError(0xdeadbeef); r = GetProfilesDirectoryA(NULL, NULL); expect(FALSE, r); - todo_wine expect_gle(ERROR_INVALID_PARAMETER); SetLastError(0xdeadbeef); r = GetProfilesDirectoryA(NULL, &cch); expect(FALSE, r); - todo_wine expect_gle(ERROR_INVALID_PARAMETER); SetLastError(0xdeadbeef); cch = 1; r = GetProfilesDirectoryA(small_buf, &cch); expect(FALSE, r); - todo_wine expect_gle(ERROR_INSUFFICIENT_BUFFER); /* MSDN claims the returned character count includes the NULL terminator * when the buffer is too small, but that's not in fact what gets returned. */ - todo_wine ok(cch == profiles_len - 1, "expected %d, got %d\n", profiles_len - 1, cch); - buf = HeapAlloc(GetProcessHeap(), 0, cch); + /* Allocate one more character than the return value to prevent a buffer + * overrun. + */ + buf = HeapAlloc(GetProcessHeap(), 0, cch + 1); r = GetProfilesDirectoryA(buf, &cch); /* Rather than a BOOL, the return value is also the number of characters * stored in the buffer. */ - todo_wine expect(profiles_len - 1, r); - todo_wine ok(!strcmp(buf, profiles_dir), "expected %s, got %s\n", profiles_dir, buf); HeapFree(GetProcessHeap(), 0, buf); diff --git a/dlls/userenv/userenv_main.c b/dlls/userenv/userenv_main.c index ddf0e21..9247f44 100644 --- a/dlls/userenv/userenv_main.c +++ b/dlls/userenv/userenv_main.c @@ -114,16 +114,128 @@ BOOL WINAPI GetUserProfileDirectoryW( HANDLE hToken, LPWSTR lpProfileDir, return FALSE; } +static const char ProfileListA[] = "Software\\Microsoft\\Windows NT\\CurrentVersion\\ProfileList"; + BOOL WINAPI GetProfilesDirectoryA( LPSTR lpProfilesDir, LPDWORD lpcchSize ) { - FIXME("%p %p\n", lpProfilesDir, lpcchSize ); - return FALSE; + static const char ProfilesDirectory[] = "ProfilesDirectory"; + LONG l; + HKEY key; + BOOL ret = FALSE; + DWORD len = 0, expanded_len; + LPSTR unexpanded_profiles_dir = NULL; + + TRACE("%p %p\n", lpProfilesDir, lpcchSize ); + + if (!lpProfilesDir || !lpcchSize) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + l = RegOpenKeyExA(HKEY_LOCAL_MACHINE, ProfileListA, 0, KEY_READ, &key); + if (l) + { + SetLastError(l); + return FALSE; + } + l = RegQueryValueExA(key, ProfilesDirectory, NULL, NULL, NULL, &len); + if (l) + { + SetLastError(l); + goto end; + } + unexpanded_profiles_dir = HeapAlloc(GetProcessHeap(), 0, len); + if (!unexpanded_profiles_dir) + { + SetLastError(ERROR_OUTOFMEMORY); + goto end; + } + l = RegQueryValueExA(key, ProfilesDirectory, NULL, NULL, + (BYTE *)unexpanded_profiles_dir, &len); + if (l) + { + SetLastError(l); + goto end; + } + expanded_len = ExpandEnvironmentStringsA(unexpanded_profiles_dir, NULL, 0); + /* The returned length doesn't include the NULL terminator. */ + if (*lpcchSize < expanded_len - 1) + { + *lpcchSize = expanded_len - 1; + SetLastError(ERROR_INSUFFICIENT_BUFFER); + goto end; + } + *lpcchSize = expanded_len - 1; + /* The return value is also the expected length. */ + ret = ExpandEnvironmentStringsA(unexpanded_profiles_dir, lpProfilesDir, + expanded_len) - 1; +end: + HeapFree(GetProcessHeap(), 0, unexpanded_profiles_dir); + RegCloseKey(key); + return ret; } +static const WCHAR ProfileListW[] = {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s',' ','N','T','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\','P','r','o','f','i','l','e','L','i','s','t',0}; + BOOL WINAPI GetProfilesDirectoryW( LPWSTR lpProfilesDir, LPDWORD lpcchSize ) { - FIXME("%p %p\n", lpProfilesDir, lpcchSize ); - return FALSE; + static const WCHAR ProfilesDirectory[] = {'P','r','o','f','i','l','e','s','D','i','r','e','c','t','o','r','y',0}; + LONG l; + HKEY key; + BOOL ret = FALSE; + DWORD len = 0, expanded_len; + LPWSTR unexpanded_profiles_dir = NULL; + + TRACE("%p %p\n", lpProfilesDir, lpcchSize ); + + if (!lpProfilesDir || !lpcchSize) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + l = RegOpenKeyExW(HKEY_LOCAL_MACHINE, ProfileListW, 0, KEY_READ, &key); + if (l) + { + SetLastError(l); + return FALSE; + } + l = RegQueryValueExW(key, ProfilesDirectory, NULL, NULL, NULL, &len); + if (l) + { + SetLastError(l); + goto end; + } + unexpanded_profiles_dir = HeapAlloc(GetProcessHeap(), 0, len); + if (!unexpanded_profiles_dir) + { + SetLastError(ERROR_OUTOFMEMORY); + goto end; + } + l = RegQueryValueExW(key, ProfilesDirectory, NULL, NULL, + (BYTE *)unexpanded_profiles_dir, &len); + if (l) + { + SetLastError(l); + goto end; + } + expanded_len = ExpandEnvironmentStringsW(unexpanded_profiles_dir, NULL, 0); + /* The returned length doesn't include the NULL terminator. */ + if (*lpcchSize < expanded_len - 1) + { + *lpcchSize = expanded_len - 1; + SetLastError(ERROR_INSUFFICIENT_BUFFER); + goto end; + } + *lpcchSize = expanded_len - 1; + /* The return value is also the expected length. */ + ret = ExpandEnvironmentStringsW(unexpanded_profiles_dir, lpProfilesDir, + expanded_len) - 1; +end: + HeapFree(GetProcessHeap(), 0, unexpanded_profiles_dir); + RegCloseKey(key); + return ret; } BOOL WINAPI GetAllUsersProfileDirectoryA( LPSTR lpProfileDir, LPDWORD lpcchSize )

1 0

Piotr Caban : msvcrt: Added _scprintf implementation.
by Alexandre Julliard 27 Aug '10

27 Aug '10

Module: wine Branch: master Commit: 600fa766f30b3ceced2b5fdd384852608c090c6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=600fa766f30b3ceced2b5fdd3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Aug 27 01:46:25 2010 +0200 msvcrt: Added _scprintf implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/wcs.c | 13 +++++++++++++ 7 files changed, 19 insertions(+), 6 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 5e8680b..a1c5a37 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1055,7 +1055,7 @@ @ cdecl _scalb(double long) msvcrt._scalb @ varargs _scanf_l(str ptr) msvcrt._scanf_l @ varargs _scanf_s_l(str ptr) msvcrt._scanf_s_l -@ stub _scprintf +@ varargs _scprintf(str) msvcrt._scprintf @ stub _scprintf_l @ stub _scprintf_p @ stub _scprintf_p_l diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index 964a0e6..2949b54 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -509,7 +509,7 @@ @ cdecl -arch=i386 _safe_fprem() msvcrt._safe_fprem @ cdecl -arch=i386 _safe_fprem1() msvcrt._safe_fprem1 @ cdecl _scalb( double long) msvcrt._scalb -@ stub _scprintf +@ varargs _scprintf(str) msvcrt._scprintf @ varargs _scwprintf(wstr) msvcrt._scwprintf @ cdecl _searchenv(str str ptr) msvcrt._searchenv @ stdcall -i386 _seh_longjmp_unwind(ptr) msvcrt._seh_longjmp_unwind diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index 2483d6b..8d488cf 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -504,7 +504,7 @@ @ cdecl _safe_fprem() msvcrt._safe_fprem @ cdecl _safe_fprem1() msvcrt._safe_fprem1 @ cdecl _scalb( double long) msvcrt._scalb -@ stub _scprintf +@ varargs _scprintf(str) msvcrt._scprintf @ varargs _scwprintf(wstr) msvcrt._scwprintf @ cdecl _searchenv(str str ptr) msvcrt._searchenv @ stdcall -i386 _seh_longjmp_unwind(ptr) msvcrt._seh_longjmp_unwind diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index f47bd83..a161b64 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -907,7 +907,7 @@ @ cdecl _scalb( double long) msvcrt._scalb @ varargs _scanf_l(str ptr) msvcrt._scanf_l @ varargs _scanf_s_l(str ptr) msvcrt._scanf_s_l -@ stub _scprintf +@ varargs _scprintf(str) msvcrt._scprintf @ stub _scprintf_l @ stub _scprintf_p @ stub _scprintf_p_l diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index fbe5458..d369331 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -893,7 +893,7 @@ @ cdecl _scalb( double long) msvcrt._scalb @ varargs _scanf_l(str ptr) msvcrt._scanf_l @ varargs _scanf_s_l(str ptr) msvcrt._scanf_s_l -@ stub _scprintf +@ varargs _scprintf(str) msvcrt._scprintf @ stub _scprintf_l @ stub _scprintf_p @ stub _scprintf_p_l diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 93bbfd7..6d3e1dd 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -836,7 +836,7 @@ @ cdecl -arch=x86_64 _scalbf(double long) MSVCRT__scalbf @ varargs _scanf_l(str ptr) MSVCRT__scanf_l @ varargs _scanf_s_l(str ptr) MSVCRT__scanf_s_l -# stub _scprintf +@ varargs _scprintf(str) MSVCRT__scprintf # stub _scprintf_l # stub _scprintf_p_l @ varargs _scwprintf(wstr) MSVCRT__scwprintf diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 529547b..9ee737e 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1120,6 +1120,19 @@ int CDECL MSVCRT__snprintf_s(char *str, unsigned int len, unsigned int count, } /********************************************************************* + * _scprintf (MSVCRT.@) + */ +int CDECL MSVCRT__scprintf(const char *format, ...) +{ + int retval; + __ms_va_list valist; + __ms_va_start(valist, format); + retval = _vscprintf(format, valist); + __ms_va_end(valist); + return retval; +} + +/********************************************************************* * vsnwprintf_internal (INTERNAL) */ static inline int vsnwprintf_internal(MSVCRT_wchar_t *str, MSVCRT_size_t len,

1 0

Piotr Caban : msvcrt: Added _gcvt_s implementation.
by Alexandre Julliard 27 Aug '10

27 Aug '10

Module: wine Branch: master Commit: 3a25d7d9aad35a28373cad6740741cdd777f51ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a25d7d9aad35a28373cad674… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Aug 27 01:46:35 2010 +0200 msvcrt: Added _gcvt_s implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/math.c | 45 +++++++++++++++++++++++++++++++++++++++-- dlls/msvcrt/msvcrt.h | 2 + dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/tests/string.c | 46 +++++++++++++++++++++++++++++++++++++++--- 7 files changed, 90 insertions(+), 11 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index a1c5a37..a8cbbab 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -674,7 +674,7 @@ @ varargs _fwscanf_l(ptr wstr ptr) msvcrt._fwscanf_l @ varargs _fwscanf_s_l(ptr wstr ptr) msvcrt._fwscanf_s_l @ cdecl _gcvt(double long str) msvcrt._gcvt -@ stub _gcvt_s +@ cdecl _gcvt_s(ptr long double long) msvcrt._gcvt_s @ stub _get_current_locale @ stub _get_daylight @ stub _get_doserrno diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index a161b64..0a54876 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -515,7 +515,7 @@ @ varargs _fwscanf_l(ptr wstr ptr) msvcrt._fwscanf_l @ varargs _fwscanf_s_l(ptr wstr ptr) msvcrt._fwscanf_s_l @ cdecl _gcvt(double long str) msvcrt._gcvt -@ stub _gcvt_s +@ cdecl _gcvt_s(ptr long double long) msvcrt._gcvt_s @ stub _get_amblksiz @ stub _get_current_locale @ stub _get_daylight diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index d369331..ffdd84e 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -507,7 +507,7 @@ @ varargs _fwscanf_l(ptr wstr ptr) msvcrt._fwscanf_l @ varargs _fwscanf_s_l(ptr wstr ptr) msvcrt._fwscanf_s_l @ cdecl _gcvt(double long str) msvcrt._gcvt -@ stub _gcvt_s +@ cdecl _gcvt_s(ptr long double long) msvcrt._gcvt_s @ stub _get_amblksiz @ stub _get_current_locale @ stub _get_daylight diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 5a31ae1..4a3f65e 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1196,15 +1196,54 @@ char * CDECL _fcvt( double number, int ndigits, int *decpt, int *sign ) /*********************************************************************** * _gcvt (MSVCRT.@) - * - * FIXME: uses both E and F. */ char * CDECL _gcvt( double number, int ndigit, char *buff ) { - sprintf(buff, "%.*E", ndigit, number); + if(!buff) { + *MSVCRT__errno() = MSVCRT_EINVAL; + return NULL; + } + + if(ndigit < 0) { + *MSVCRT__errno() = MSVCRT_ERANGE; + return NULL; + } + + MSVCRT_sprintf(buff, "%.*g", ndigit, number); return buff; } +/*********************************************************************** + * _gcvt_s (MSVCRT.@) + */ +int CDECL _gcvt_s(char *buff, MSVCRT_size_t size, double number, int digits) +{ + int len; + + if(!buff) { + *MSVCRT__errno() = MSVCRT_EINVAL; + return MSVCRT_EINVAL; + } + + if( digits<0 || digits>=size) { + if(size) + buff[0] = '\0'; + + *MSVCRT__errno() = MSVCRT_ERANGE; + return MSVCRT_ERANGE; + } + + len = MSVCRT__scprintf("%.*g", digits, number); + if(len > size) { + buff[0] = '\0'; + *MSVCRT__errno() = MSVCRT_ERANGE; + return MSVCRT_ERANGE; + } + + MSVCRT_sprintf(buff, "%.*g", digits, number); + return 0; +} + #include <stdlib.h> /* div_t, ldiv_t */ /********************************************************************* diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 363223d..86df133 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -743,6 +743,8 @@ MSVCRT_FILE* __cdecl MSVCRT__wfdopen(int, const MSVCRT_wchar_t *); int __cdecl MSVCRT_vsnprintf(char *str, MSVCRT_size_t len, const char *format, __ms_va_list valist); int __cdecl MSVCRT_vsnwprintf(MSVCRT_wchar_t *str, MSVCRT_size_t len, const MSVCRT_wchar_t *format, __ms_va_list valist ); +int __cdecl MSVCRT_sprintf(char*,const char*,...); +int __cdecl MSVCRT__scprintf(const char*,...); int __cdecl MSVCRT_raise(int sig); typedef struct MSVCRT_tagLC_ID { diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 6d3e1dd..a7371a8 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -461,7 +461,7 @@ @ varargs _fwscanf_l(ptr wstr ptr) MSVCRT__fwscanf_l @ varargs _fwscanf_s_l(ptr wstr ptr) MSVCRT__fwscanf_s_l @ cdecl _gcvt(double long str) -# stub _gcvt_s +@ cdecl _gcvt_s(ptr long double long) # stub _get_doserrno # stub _get_environ # stub _get_errno diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index e2324b0..94c2fa3 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -58,6 +58,7 @@ static __int64 (__cdecl *p_strtoi64)(const char *, char **, int); static unsigned __int64 (__cdecl *p_strtoui64)(const char *, char **, int); static int (__cdecl *pwcstombs_s)(size_t*,char*,size_t,const wchar_t*,size_t); static int (__cdecl *pmbstowcs_s)(size_t*,wchar_t*,size_t,const char*,size_t); +static errno_t (__cdecl *p_gcvt_s)(char*,size_t,double,int); static int *p__mb_cur_max; static unsigned char *p_mbctype; @@ -1241,6 +1242,41 @@ static void test_mbstowcs(void) ok(!memcmp(mOut, mHiragana, sizeof(mHiragana)), "mOut = %s\n", mOut); } +static void test_gcvt(void) +{ + char buf[1024], *res; + errno_t err; + + if(!p_gcvt_s) { + win_skip("Skipping _gcvt tests\n"); + return; + } + + errno = 0; + res = _gcvt(1.2, -1, buf); + ok(res == NULL, "res != NULL\n"); + ok(errno == ERANGE, "errno = %d\n", errno); + + errno = 0; + res = _gcvt(1.2, 5, NULL); + ok(res == NULL, "res != NULL\n"); + ok(errno == EINVAL, "errno = %d\n", errno); + + res = gcvt(1.2, 5, buf); + ok(res == buf, "res != buf\n"); + ok(!strcmp(buf, "1.2"), "buf = %s\n", buf); + + buf[0] = 'x'; + err = p_gcvt_s(buf, 5, 1.2, 10); + ok(err == ERANGE, "err = %d\n", err); + ok(buf[0] == '\0', "buf[0] = %c\n", buf[0]); + + buf[0] = 'x'; + err = p_gcvt_s(buf, 4, 123456, 2); + ok(err == ERANGE, "err = %d\n", err); + ok(buf[0] == '\0', "buf[0] = %c\n", buf[0]); +} + START_TEST(string) { char mem[100]; @@ -1261,10 +1297,11 @@ START_TEST(string) p_wcscpy_s = (void *)GetProcAddress( hMsvcrt,"wcscpy_s" ); p_wcsupr_s = (void *)GetProcAddress( hMsvcrt,"_wcsupr_s" ); p_strnlen = (void *)GetProcAddress( hMsvcrt,"strnlen" ); - p_strtoi64 = (void *) GetProcAddress(hMsvcrt, "_strtoi64"); - p_strtoui64 = (void *) GetProcAddress(hMsvcrt, "_strtoui64"); - pmbstowcs_s = (void *) GetProcAddress(hMsvcrt, "mbstowcs_s"); - pwcstombs_s = (void *) GetProcAddress(hMsvcrt, "wcstombs_s"); + p_strtoi64 = (void *)GetProcAddress(hMsvcrt, "_strtoi64"); + p_strtoui64 = (void *)GetProcAddress(hMsvcrt, "_strtoui64"); + pmbstowcs_s = (void *)GetProcAddress(hMsvcrt, "mbstowcs_s"); + pwcstombs_s = (void *)GetProcAddress(hMsvcrt, "wcstombs_s"); + p_gcvt_s = (void *)GetProcAddress(hMsvcrt, "_gcvt_s"); /* MSVCRT memcpy behaves like memmove for overlapping moves, MFC42 CString::Insert seems to rely on that behaviour */ @@ -1298,4 +1335,5 @@ START_TEST(string) test__strtoi64(); test__strtod(); test_mbstowcs(); + test_gcvt(); }

1 0

Piotr Caban : msvcr90: Added _wstat64i32 implementation.
by Alexandre Julliard 27 Aug '10

27 Aug '10

Module: wine Branch: master Commit: 25efb008579679e8236eba7e2dc18a8208cf9047 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25efb008579679e8236eba7e2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Aug 27 01:46:45 2010 +0200 msvcr90: Added _wstat64i32 implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.c | 14 ++++++++++++++ dlls/msvcr90/msvcr90.spec | 2 +- 4 files changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index a8cbbab..5c68805 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1396,7 +1396,7 @@ @ stub _wstat32 @ stub _wstat32i64 @ cdecl _wstat64(wstr ptr) msvcrt._wstat64 -@ stub _wstat64i32 +@ cdecl _wstat64i32(wstr ptr) msvcr90._wstat64i32 @ cdecl _wstrdate(ptr) msvcrt._wstrdate @ cdecl _wstrdate_s(ptr long) msvcrt._wstrdate_s @ cdecl _wstrtime(ptr) msvcrt._wstrtime diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 0a54876..701e28a 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1252,7 +1252,7 @@ @ stub _wstat32 @ stub _wstat32i64 @ cdecl _wstat64(wstr ptr) msvcrt._wstat64 -@ stub _wstat64i32 +@ cdecl _wstat64i32(wstr ptr) msvcr90._wstat64i32 @ cdecl _wstrdate(ptr) msvcrt._wstrdate @ cdecl _wstrdate_s(ptr long) msvcrt._wstrdate_s @ cdecl _wstrtime(ptr) msvcrt._wstrtime diff --git a/dlls/msvcr90/msvcr90.c b/dlls/msvcr90/msvcr90.c index 0d7d101..2fff15a 100644 --- a/dlls/msvcr90/msvcr90.c +++ b/dlls/msvcr90/msvcr90.c @@ -204,3 +204,17 @@ int CDECL _stat64i32(const char* path, struct _stat64i32 * buf) msvcrt_stat64_to_stat64i32(&buf64, buf); return ret; } + +/********************************************************************* + * _wstat64i32 (MSVCRT.@) + */ +int CDECL _wstat64i32(const wchar_t *path, struct _stat64i32 *buf) +{ + int ret; + struct _stat64 buf64; + + ret = _wstat64(path, &buf64); + if (!ret) + msvcrt_stat64_to_stat64i32(&buf64, buf); + return ret; +} diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index ffdd84e..965b9c3 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1236,7 +1236,7 @@ @ stub _wstat32 @ stub _wstat32i64 @ cdecl _wstat64(wstr ptr) msvcrt._wstat64 -@ stub _wstat64i32 +@ cdecl _wstat64i32(wstr ptr) @ cdecl _wstrdate(ptr) msvcrt._wstrdate @ cdecl _wstrdate_s(ptr long) msvcrt._wstrdate_s @ cdecl _wstrtime(ptr) msvcrt._wstrtime

1 0