October 2013 - Wine-Commits

Hans Leidekker : msi/tests: Prepare install. c for the switch to -D__WINESRC__.
by Alexandre Julliard Oct. 15, 2013

Oct. 15, 2013

Module: wine Branch: master Commit: e243979c4f824c0e8227094ef0657af606f4f44c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e243979c4f824c0e8227094ef… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 15 10:29:32 2013 +0200 msi/tests: Prepare install.c for the switch to -D__WINESRC__. --- dlls/msi/tests/install.c | 439 +++++++++++++++++++++++----------------------- 1 files changed, 221 insertions(+), 218 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e243979c4f824c0e82270…

1 0

Hans Leidekker : msi/tests: Prepare format. c for the switch to -D__WINESRC__.
by Alexandre Julliard Oct. 15, 2013

Oct. 15, 2013

Module: wine Branch: master Commit: 569d04cd7b1da0a3dae9367bd5d3fa1c6309a11f URL: http://source.winehq.org/git/wine.git/?a=commit;h=569d04cd7b1da0a3dae9367bd… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 15 10:29:02 2013 +0200 msi/tests: Prepare format.c for the switch to -D__WINESRC__. --- dlls/msi/tests/format.c | 1445 ++++++++++++++++++++++++----------------------- 1 files changed, 723 insertions(+), 722 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=569d04cd7b1da0a3dae93…

1 0

Hans Leidekker : msi/tests: Prepare db.c for the switch to -D__WINESRC__.
by Alexandre Julliard Oct. 15, 2013

Oct. 15, 2013

Module: wine Branch: master Commit: f1498d77366918a3e8d91c4ca0f0ad78d4a5fd80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1498d77366918a3e8d91c4ca… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 15 10:28:19 2013 +0200 msi/tests: Prepare db.c for the switch to -D__WINESRC__. --- dlls/msi/tests/db.c | 1234 +++++++++++++++++++++++++-------------------------- 1 files changed, 614 insertions(+), 620 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f1498d77366918a3e8d91…

1 0

Hans Leidekker : msi/tests: Prepare automation. c for the switch to -D__WINESRC__.
by Alexandre Julliard Oct. 15, 2013

Oct. 15, 2013

Module: wine Branch: master Commit: ae5c7c2a1831af9d4f40b257c296746898da1f38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae5c7c2a1831af9d4f40b257c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 15 10:27:50 2013 +0200 msi/tests: Prepare automation.c for the switch to -D__WINESRC__. --- dlls/msi/tests/automation.c | 23 +++++++++++------------ 1 files changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index c1c1d4a..c27031e 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -29,6 +29,7 @@ #include <msidefs.h> #include <msi.h> #include <fci.h> +#include <oaidl.h> #include "wine/test.h" @@ -237,9 +238,8 @@ static void write_file(const CHAR *filename, const char *data, int data_size) { DWORD size; - HANDLE hf = CreateFile(filename, GENERIC_WRITE, 0, NULL, - CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); - + HANDLE hf = CreateFileA(filename, GENERIC_WRITE, 0, NULL, + CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); WriteFile(hf, data, data_size, &size, NULL); CloseHandle(hf); } @@ -333,13 +333,12 @@ static BOOL get_program_files_dir(LPSTR buf) HKEY hkey; DWORD type = REG_EXPAND_SZ, size; - if (RegOpenKey(HKEY_LOCAL_MACHINE, - "Software\\Microsoft\\Windows\\CurrentVersion", &hkey)) + if (RegOpenKeyA(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Windows\\CurrentVersion", &hkey)) return FALSE; size = MAX_PATH; - if (RegQueryValueEx(hkey, "ProgramFilesDir (x86)", 0, &type, (LPBYTE)buf, &size) && - RegQueryValueEx(hkey, "ProgramFilesDir", 0, &type, (LPBYTE)buf, &size)) + if (RegQueryValueExA(hkey, "ProgramFilesDir (x86)", 0, &type, (LPBYTE)buf, &size) && + RegQueryValueExA(hkey, "ProgramFilesDir", 0, &type, (LPBYTE)buf, &size)) return FALSE; RegCloseKey(hkey); @@ -356,7 +355,7 @@ static void create_file(const CHAR *name, DWORD size) WriteFile(file, name, strlen(name), &written, NULL); WriteFile(file, "\n", strlen("\n"), &written, NULL); - left = size - lstrlen(name) - 1; + left = size - lstrlenA(name) - 1; SetFilePointer(file, left, NULL, FILE_CURRENT); SetEndOfFile(file); @@ -2321,7 +2320,7 @@ static UINT delete_registry_key(HKEY hkeyParent, LPCSTR subkey, REGSAM access) HKEY hkey; DWORD dwSize; - ret = RegOpenKeyEx(hkeyParent, subkey, 0, access, &hkey); + ret = RegOpenKeyExA(hkeyParent, subkey, 0, access, &hkey); if (ret != ERROR_SUCCESS) return ret; ret = RegQueryInfoKeyA(hkey, NULL, NULL, NULL, NULL, &dwSize, NULL, NULL, NULL, NULL, NULL, NULL); if (ret != ERROR_SUCCESS) return ret; @@ -2348,7 +2347,7 @@ static UINT find_registry_key(HKEY hkeyParent, LPCSTR subkey, LPCSTR findkey, RE *phkey = 0; - ret = RegOpenKeyEx(hkeyParent, subkey, 0, access, &hkey); + ret = RegOpenKeyExA(hkeyParent, subkey, 0, access, &hkey); if (ret != ERROR_SUCCESS) return ret; ret = RegQueryInfoKeyA(hkey, NULL, NULL, NULL, NULL, &dwSize, NULL, NULL, NULL, NULL, NULL, NULL); if (ret != ERROR_SUCCESS) return ret; @@ -2525,7 +2524,7 @@ static void test_Installer_InstallProduct(void) ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); /* Remove registry keys written by PublishProduct standard action */ - res = RegOpenKey(HKEY_CURRENT_USER, "SOFTWARE\\Microsoft\\Installer", &hkey); + res = RegOpenKeyA(HKEY_CURRENT_USER, "SOFTWARE\\Microsoft\\Installer", &hkey); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); res = delete_registry_key(hkey, "Products\\af054738b93a8cb43b12803b397f483b", KEY_ALL_ACCESS); @@ -2685,7 +2684,7 @@ START_TEST(automation) GetSystemTimeAsFileTime(&systemtime); GetCurrentDirectoryA(MAX_PATH, prev_path); - GetTempPath(MAX_PATH, temp_path); + GetTempPathA(MAX_PATH, temp_path); SetCurrentDirectoryA(temp_path); lstrcpyA(CURR_DIR, temp_path);

1 0

Nikolay Sivov : avifil32/tests: Compile with -D__WINESRC__.
by Alexandre Julliard Oct. 15, 2013

Oct. 15, 2013

Module: wine Branch: master Commit: 9273a6715f6b98ecde3da78c793bcf4caddcd3d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9273a6715f6b98ecde3da78c7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 15 12:57:01 2013 +0400 avifil32/tests: Compile with -D__WINESRC__. --- dlls/avifil32/tests/Makefile.in | 1 - dlls/avifil32/tests/api.c | 59 +++++++++++++++++++-------------------- 2 files changed, 29 insertions(+), 31 deletions(-) diff --git a/dlls/avifil32/tests/Makefile.in b/dlls/avifil32/tests/Makefile.in index ac6f1c7..abe1ad4 100644 --- a/dlls/avifil32/tests/Makefile.in +++ b/dlls/avifil32/tests/Makefile.in @@ -1,6 +1,5 @@ TESTDLL = avifil32.dll IMPORTS = avifil32 ole32 -EXTRADEFS = -U__WINESRC__ -DWINE_STRICT_PROTOTYPES -DWINE_NO_NAMELESS_EXTENSION -DWIDL_C_INLINE_WRAPPERS C_SRCS = \ api.c diff --git a/dlls/avifil32/tests/api.c b/dlls/avifil32/tests/api.c index 22c15c5..c2a2d24 100644 --- a/dlls/avifil32/tests/api.c +++ b/dlls/avifil32/tests/api.c @@ -226,38 +226,38 @@ static void test_EditStreamSetInfo(void) { PAVISTREAM stream = NULL; HRESULT hres; - AVISTREAMINFO info, info2; + AVISTREAMINFOA info, info2; hres = CreateEditableStream(&stream, NULL); ok(hres == AVIERR_OK, "got 0x%08X, expected AVIERR_OK\n", hres); /* Size parameter is somehow checked (notice the crash with size=-1 below) */ - hres = EditStreamSetInfo(stream, NULL, 0); + hres = EditStreamSetInfoA(stream, NULL, 0); ok( hres == AVIERR_BADSIZE, "got 0x%08X, expected AVIERR_BADSIZE\n", hres); - hres = EditStreamSetInfo(stream, NULL, sizeof(AVISTREAMINFO)-1 ); + hres = EditStreamSetInfoA(stream, NULL, sizeof(AVISTREAMINFOA)-1 ); ok( hres == AVIERR_BADSIZE, "got 0x%08X, expected AVIERR_BADSIZE\n", hres); if(0) { /* Crashing - first parameter not checked */ - EditStreamSetInfo(NULL, &info, sizeof(AVISTREAMINFO) ); + EditStreamSetInfoA(NULL, &info, sizeof(info) ); /* Crashing - second parameter not checked */ - EditStreamSetInfo(stream, NULL, sizeof(AVISTREAMINFO) ); + EditStreamSetInfoA(stream, NULL, sizeof(AVISTREAMINFOA) ); - EditStreamSetInfo(stream, NULL, -1); + EditStreamSetInfoA(stream, NULL, -1); } - hres = AVIStreamInfo(stream, &info, sizeof(AVISTREAMINFO) ); + hres = AVIStreamInfoA(stream, &info, sizeof(info) ); ok( hres == 0, "got 0x%08X, expected 0\n", hres); /* Does the function check what's it's updating ? */ #define IS_INFO_UPDATED(m) do { \ - hres = EditStreamSetInfo(stream, &info, sizeof(AVISTREAMINFO) ); \ + hres = EditStreamSetInfoA(stream, &info, sizeof(info) ); \ ok( hres == 0, "got 0x%08X, expected 0\n", hres); \ - hres = AVIStreamInfo(stream, &info2, sizeof(AVISTREAMINFO) ); \ + hres = AVIStreamInfoA(stream, &info2, sizeof(info2) ); \ ok( hres == 0, "got 0x%08X, expected 0\n", hres); \ ok( info2.m == info.m, "EditStreamSetInfo did not update "#m" parameter\n" ); \ } while(0) @@ -332,7 +332,7 @@ static void create_avi_file(const COMMON_AVI_HEADERS *cah, char *filename) HANDLE hFile; DWORD written; - hFile = CreateFile(filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + hFile = CreateFileA(filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); ok(hFile != INVALID_HANDLE_VALUE, "Couldn't create file\n"); @@ -360,17 +360,16 @@ static void test_default_data(void) LONG lSize; PAVISTREAM pStream0; PAVISTREAM pStream1; - AVISTREAMINFO asi0; - AVISTREAMINFO asi1; + AVISTREAMINFOA asi0, asi1; WAVEFORMATEX wfx; - GetTempPath(MAX_PATH, filename); + GetTempPathA(MAX_PATH, filename); strcpy(filename+strlen(filename), testfilename); init_test_struct(&cah); create_avi_file(&cah, filename); - res = AVIFileOpen(&pFile, filename, OF_SHARE_DENY_WRITE, 0L); + res = AVIFileOpenA(&pFile, filename, OF_SHARE_DENY_WRITE, 0L); ok(res != AVIERR_BADFORMAT, "Unable to open file: error1=%u\n", AVIERR_BADFORMAT); ok(res != AVIERR_MEMORY, "Unable to open file: error2=%u\n", AVIERR_MEMORY); ok(res != AVIERR_FILEREAD, "Unable to open file: error3=%u\n", AVIERR_FILEREAD); @@ -384,10 +383,10 @@ static void test_default_data(void) res = AVIFileGetStream(pFile, &pStream1, 0, 1); ok(res == 0, "Unable to open audio stream: error=%u\n", res); - res = AVIStreamInfo(pStream0, &asi0, sizeof(AVISTREAMINFO)); + res = AVIStreamInfoA(pStream0, &asi0, sizeof(asi0)); ok(res == 0, "Unable to read stream info: error=%u\n", res); - res = AVIStreamInfo(pStream1, &asi1, sizeof(AVISTREAMINFO)); + res = AVIStreamInfoA(pStream1, &asi1, sizeof(asi1)); ok(res == 0, "Unable to read stream info: error=%u\n", res); res = AVIStreamReadFormat(pStream0, AVIStreamStart(pStream1), NULL, &lSize); @@ -446,7 +445,7 @@ static void test_default_data(void) AVIStreamRelease(pStream0); AVIStreamRelease(pStream1); AVIFileRelease(pFile); - ok(DeleteFile(filename) !=0, "Deleting file %s failed\n", filename); + ok(DeleteFileA(filename) !=0, "Deleting file %s failed\n", filename); } static void test_amh_corruption(void) @@ -456,7 +455,7 @@ static void test_amh_corruption(void) PAVIFILE pFile; int res; - GetTempPath(MAX_PATH, filename); + GetTempPathA(MAX_PATH, filename); strcpy(filename+strlen(filename), testfilename); /* Make sure only AVI files with the proper headers will be loaded */ @@ -464,10 +463,10 @@ static void test_amh_corruption(void) cah.fh[3] = mmioFOURCC('A', 'V', 'i', ' '); create_avi_file(&cah, filename); - res = AVIFileOpen(&pFile, filename, OF_SHARE_DENY_WRITE, 0L); + res = AVIFileOpenA(&pFile, filename, OF_SHARE_DENY_WRITE, 0L); ok(res != 0, "Able to open file: error=%u\n", res); - ok(DeleteFile(filename) !=0, "Deleting file %s failed\n", filename); + ok(DeleteFileA(filename) !=0, "Deleting file %s failed\n", filename); } static void test_ash1_corruption(void) @@ -477,9 +476,9 @@ static void test_ash1_corruption(void) PAVIFILE pFile; int res; PAVISTREAM pStream1; - AVISTREAMINFO asi1; + AVISTREAMINFOA asi1; - GetTempPath(MAX_PATH, filename); + GetTempPathA(MAX_PATH, filename); strcpy(filename+strlen(filename), testfilename); /* Corrupt the sample size in the audio stream header */ @@ -488,13 +487,13 @@ static void test_ash1_corruption(void) create_avi_file(&cah, filename); - res = AVIFileOpen(&pFile, filename, OF_SHARE_DENY_WRITE, 0L); + res = AVIFileOpenA(&pFile, filename, OF_SHARE_DENY_WRITE, 0L); ok(res == 0, "Unable to open file: error=%u\n", res); res = AVIFileGetStream(pFile, &pStream1, 0, 1); ok(res == 0, "Unable to open audio stream: error=%u\n", res); - res = AVIStreamInfo(pStream1, &asi1, sizeof(AVISTREAMINFO)); + res = AVIStreamInfoA(pStream1, &asi1, sizeof(asi1)); ok(res == 0, "Unable to read stream info: error=%u\n", res); /* The result will still be 2, because the value is dynamically replaced with the nBlockAlign @@ -503,7 +502,7 @@ static void test_ash1_corruption(void) AVIStreamRelease(pStream1); AVIFileRelease(pFile); - ok(DeleteFile(filename) !=0, "Deleting file %s failed\n", filename); + ok(DeleteFileA(filename) !=0, "Deleting file %s failed\n", filename); } static void test_ash1_corruption2(void) @@ -513,9 +512,9 @@ static void test_ash1_corruption2(void) PAVIFILE pFile; int res; PAVISTREAM pStream1; - AVISTREAMINFO asi1; + AVISTREAMINFOA asi1; - GetTempPath(MAX_PATH, filename); + GetTempPathA(MAX_PATH, filename); strcpy(filename+strlen(filename), testfilename); /* Corrupt the block alignment in the audio format header */ @@ -524,20 +523,20 @@ static void test_ash1_corruption2(void) create_avi_file(&cah, filename); - res = AVIFileOpen(&pFile, filename, OF_SHARE_DENY_WRITE, 0L); + res = AVIFileOpenA(&pFile, filename, OF_SHARE_DENY_WRITE, 0L); ok(res == 0, "Unable to open file: error=%u\n", res); res = AVIFileGetStream(pFile, &pStream1, 0, 1); ok(res == 0, "Unable to open audio stream: error=%u\n", res); - ok(AVIStreamInfo(pStream1, &asi1, sizeof(AVISTREAMINFO)) == 0, "Unable to read stream info\n"); + ok(AVIStreamInfoA(pStream1, &asi1, sizeof(asi1)) == 0, "Unable to read stream info\n"); /* The result will also be the corrupt value, as explained above. */ ok(asi1.dwSampleSize == 0xdead, "got 0x%x (expected 0xdead)\n", asi1.dwSampleSize); AVIStreamRelease(pStream1); AVIFileRelease(pFile); - ok(DeleteFile(filename) !=0, "Deleting file %s failed\n", filename); + ok(DeleteFileA(filename) !=0, "Deleting file %s failed\n", filename); } /* Outer IUnknown for COM aggregation tests */

1 0

Nikolay Sivov : advpack/tests: Compile with -D__WINESRC__.
by Alexandre Julliard Oct. 15, 2013

Oct. 15, 2013

Module: wine Branch: master Commit: ba7f633fc849c10e1e3714020b3fb46f8515c3ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba7f633fc849c10e1e3714020… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 15 12:49:55 2013 +0400 advpack/tests: Compile with -D__WINESRC__. --- dlls/advpack/tests/Makefile.in | 1 - dlls/advpack/tests/advpack.c | 74 ++++++++++++++++++++-------------------- dlls/advpack/tests/files.c | 10 +++--- dlls/advpack/tests/install.c | 34 +++++++++--------- 4 files changed, 59 insertions(+), 60 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ba7f633fc849c10e1e371…

1 0

Nikolay Sivov : advapi32/tests: Compile with -D__WINESRC__.
by Alexandre Julliard Oct. 15, 2013

Oct. 15, 2013

Module: wine Branch: master Commit: f6b2aa4a012363f043e7fa6755073454b932f1a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6b2aa4a012363f043e7fa675… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 15 12:15:45 2013 +0400 advapi32/tests: Compile with -D__WINESRC__. --- dlls/advapi32/tests/Makefile.in | 1 - dlls/advapi32/tests/cred.c | 27 +++++---- dlls/advapi32/tests/crypt.c | 40 +++++++------- dlls/advapi32/tests/eventlog.c | 10 ++-- dlls/advapi32/tests/lsa.c | 2 +- dlls/advapi32/tests/registry.c | 41 ++++++++------ dlls/advapi32/tests/security.c | 118 +++++++++++++++++++------------------- dlls/advapi32/tests/service.c | 18 +++--- 8 files changed, 131 insertions(+), 126 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f6b2aa4a012363f043e7f…

1 0

Nikolay Sivov : msvcrt: Prevent msvcrt.dll unloading.
by Alexandre Julliard Oct. 15, 2013

Oct. 15, 2013

Module: wine Branch: master Commit: 08422163cf11d45f7153b284fb5caf71ffd7f9cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=08422163cf11d45f7153b284f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 15 10:22:23 2013 +0400 msvcrt: Prevent msvcrt.dll unloading. --- dlls/msvcrt/main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/main.c b/dlls/msvcrt/main.c index a62e62b..df42a9a 100644 --- a/dlls/msvcrt/main.c +++ b/dlls/msvcrt/main.c @@ -112,7 +112,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) msvcrt_init_args(); msvcrt_init_signals(); /* don't allow unloading msvcrt, we can't setup file handles twice */ - LdrAddRefDll( 0, hinstDLL ); + LdrAddRefDll( LDR_ADDREF_DLL_PIN, hinstDLL ); TRACE("finished process init\n"); break; case DLL_THREAD_ATTACH:

1 0

Frédéric Delanoy : xcopy: Use BOOL type where appropriate.
by Alexandre Julliard Oct. 15, 2013

Oct. 15, 2013

Module: wine Branch: master Commit: 9b6715226e00d0be889226dfb8e8ae67a6af6a15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b6715226e00d0be889226dfb… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Oct 15 00:27:18 2013 +0200 xcopy: Use BOOL type where appropriate. --- programs/xcopy/xcopy.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/xcopy/xcopy.c b/programs/xcopy/xcopy.c index e3312db..3967b18 100644 --- a/programs/xcopy/xcopy.c +++ b/programs/xcopy/xcopy.c @@ -662,7 +662,7 @@ static WCHAR *skip_whitespace(WCHAR *p) Example: 'XCOPY "c:\DIR A" "c:DIR B\"' is OK. */ static int find_end_of_word(const WCHAR *word, WCHAR **end) { - BOOL in_quotes = 0; + BOOL in_quotes = FALSE; const WCHAR *ptr = word; for (;;) { for (; *ptr != '\0' && *ptr != '"' &&

1 0

Francois Gouget : ntdll/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard Oct. 15, 2013

Oct. 15, 2013

Module: wine Branch: master Commit: 4db9cd5f21fd3356045839e71290f563274c2918 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4db9cd5f21fd3356045839e71… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Oct 15 01:33:48 2013 +0200 ntdll/tests: Fix compilation on systems that don't support nameless unions. --- dlls/ntdll/tests/file.c | 110 +++++++++++++++++++++++----------------------- 1 files changed, 55 insertions(+), 55 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4db9cd5f21fd335604583…

1 0