October 2013 - Wine-commits

Qian Hong : user32/tests: Skip winstation tests when no enough privileges.
by Alexandre Julliard 15 Oct '13

15 Oct '13

Module: wine Branch: master Commit: a0637a7f52f4a40499d9689a6f71d6e957694afe URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0637a7f52f4a40499d9689a6… Author: Qian Hong <qhong(a)codeweavers.com> Date: Tue Oct 15 17:01:27 2013 +0800 user32/tests: Skip winstation tests when no enough privileges. --- dlls/user32/tests/winstation.c | 19 +++++++++++++++++-- 1 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/winstation.c b/dlls/user32/tests/winstation.c index 9525902..fd6bcc0 100644 --- a/dlls/user32/tests/winstation.c +++ b/dlls/user32/tests/winstation.c @@ -662,8 +662,16 @@ static void test_inputdesktop2(void) ok(thread_desk != NULL, "GetThreadDesktop failed!\n"); w1 = GetProcessWindowStation(); ok(w1 != NULL, "GetProcessWindowStation failed!\n"); + SetLastError(0xdeadbeef); w2 = CreateWindowStation("winsta_test", 0, WINSTA_ALL_ACCESS, NULL); - ok(w2 != NULL, "CreateWindowStation failed!\n"); + ret = GetLastError(); + ok(w2 != NULL || ret == ERROR_ACCESS_DENIED, "CreateWindowStation failed (%u)\n", ret); + if (!w2) + { + win_skip("Not enough privileges for CreateWindowStation\n"); + return; + } + ret = EnumDesktopsA(GetProcessWindowStation(), desktop_callbackA, 0); ok(!ret, "EnumDesktopsA failed!\n"); input_desk = OpenInputDesktop(0, FALSE, DESKTOP_ALL_ACCESS); @@ -804,8 +812,15 @@ static void test_foregroundwindow(void) hdesks[0] = GetThreadDesktop(GetCurrentThreadId()); ok(hdesks[0] != NULL, "OpenDesktop failed!\n"); + SetLastError(0xdeadbeef); hdesks[1] = CreateDesktop("desk2", NULL, NULL, 0, DESKTOP_ALL_ACCESS, NULL); - ok(hdesks[1] != NULL, "CreateDesktop failed!\n"); + ret = GetLastError(); + ok(hdesks[1] != NULL || ret == ERROR_ACCESS_DENIED, "CreateDesktop failed (%u)\n", ret); + if(!hdesks[1]) + { + win_skip("Not enough privileges for CreateDesktop\n"); + return; + } for (thread_desk_id = 0; thread_desk_id < DESKTOPS; thread_desk_id++) {

1 0

Qian Hong : user32/tests: Skip winstation tests on NT4.
by Alexandre Julliard 15 Oct '13

15 Oct '13

Module: wine Branch: master Commit: 00c9c6fde360d7f938a987ed066794eed36af73b URL: http://source.winehq.org/git/wine.git/?a=commit;h=00c9c6fde360d7f938a987ed0… Author: Qian Hong <qhong(a)codeweavers.com> Date: Tue Oct 15 17:01:50 2013 +0800 user32/tests: Skip winstation tests on NT4. --- dlls/user32/tests/winstation.c | 25 +++++++++++++++---------- 1 files changed, 15 insertions(+), 10 deletions(-) diff --git a/dlls/user32/tests/winstation.c b/dlls/user32/tests/winstation.c index fd6bcc0..0bc9966 100644 --- a/dlls/user32/tests/winstation.c +++ b/dlls/user32/tests/winstation.c @@ -822,6 +822,21 @@ static void test_foregroundwindow(void) return; } + ret = SystemParametersInfo(SPI_GETFOREGROUNDLOCKTIMEOUT, 0, &timeout_old, 0); + if(!ret) + { + win_skip("Skip tests on NT4\n"); + CloseDesktop(hdesks[1]); + return; + } + trace("old timeout %d\n", timeout_old); + timeout = 0; + ret = SystemParametersInfo(SPI_SETFOREGROUNDLOCKTIMEOUT, 0, 0, SPIF_SENDCHANGE | SPIF_UPDATEINIFILE); + ok(ret, "set foreground lock timeout failed!\n"); + ret = SystemParametersInfo(SPI_GETFOREGROUNDLOCKTIMEOUT, 0, &timeout, 0); + ok(ret, "get foreground lock timeout failed!\n"); + ok(timeout == 0, "unexpected timeout %d\n", timeout); + for (thread_desk_id = 0; thread_desk_id < DESKTOPS; thread_desk_id++) { param.hdesk = hdesks[thread_desk_id]; @@ -844,16 +859,6 @@ static void test_foregroundwindow(void) trace("hwnd0 %p hwnd1 %p partner0 %p partner1 %p\n", hwnds[0], hwnds[1], partners[0], partners[1]); - ret = SystemParametersInfo(SPI_GETFOREGROUNDLOCKTIMEOUT, 0, &timeout_old, 0); - ok(ret, "get foreground lock timeout failed!\n"); - trace("old timeout %d\n", timeout_old); - timeout = 0; - ret = SystemParametersInfo(SPI_SETFOREGROUNDLOCKTIMEOUT, 0, 0, SPIF_SENDCHANGE | SPIF_UPDATEINIFILE); - ok(ret, "set foreground lock timeout failed!\n"); - ret = SystemParametersInfo(SPI_GETFOREGROUNDLOCKTIMEOUT, 0, &timeout, 0); - ok(ret, "get foreground lock timeout failed!\n"); - ok(timeout == 0, "unexpected timeout %d\n", timeout); - for (hwnd_id = 0; hwnd_id < DESKTOPS; hwnd_id++) for (thread_desk_id = 0; thread_desk_id < DESKTOPS; thread_desk_id++) for (input_desk_id = 0; input_desk_id < DESKTOPS; input_desk_id++)

1 0

Aric Stewart : tools: Add new Explicit Formatting types for Unicode 6.3.
by Alexandre Julliard 15 Oct '13

15 Oct '13

Module: wine Branch: master Commit: b5d9fc323d4a8414819443a966511de3f22c8a5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5d9fc323d4a8414819443a96… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Oct 7 10:18:31 2013 -0500 tools: Add new Explicit Formatting types for Unicode 6.3. --- tools/make_unicode | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/tools/make_unicode b/tools/make_unicode index 1acc424..cae3547 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -279,13 +279,8 @@ my %special_categories = my %directions = ( "L" => 1, # Left-to-Right - "LRE" => 15, # Left-to-Right Embedding - "LRO" => 15, # Left-to-Right Override "R" => 2, # Right-to-Left "AL" => 12, # Right-to-Left Arabic - "RLE" => 15, # Right-to-Left Embedding - "RLO" => 15, # Right-to-Left Override - "PDF" => 15, # Pop Directional Format "EN" => 3, # European Number "ES" => 4, # European Number Separator "ET" => 5, # European Number Terminator @@ -296,7 +291,16 @@ my %directions = "B" => 8, # Paragraph Separator "S" => 9, # Segment Separator "WS" => 10, # Whitespace - "ON" => 11 # Other Neutrals + "ON" => 11, # Other Neutrals + "LRE" => 15, # Left-to-Right Embedding + "LRO" => 15, # Left-to-Right Override + "RLE" => 15, # Right-to-Left Embedding + "RLO" => 15, # Right-to-Left Override + "PDF" => 15, # Pop Directional Format + "LRI" => 15, # Left-to-Right Isolate + "RLI" => 15, # Right-to-Left Isolate + "FSI" => 15, # First Strong Isolate + "PDI" => 15 # Pop Directional Isolate ); my %joining_types =

1 0

Alexandre Julliard : tools: Update the character data tables to Unicode 6.3 .0.
by Alexandre Julliard 15 Oct '13

15 Oct '13

Module: wine Branch: master Commit: 13479aa7b8116982f2db839d056f9d66afd8c7a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13479aa7b8116982f2db839d0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 15 16:09:16 2013 +0200 tools: Update the character data tables to Unicode 6.3.0. --- dlls/usp10/indicsyllable.c | 4 +- dlls/usp10/linebreak.c | 168 ++++++++++++++++++++++---------------------- dlls/usp10/mirror.c | 2 +- dlls/usp10/shaping.c | 70 ++++++++++-------- libs/wine/wctype.c | 12 ++-- tools/make_unicode | 2 +- 6 files changed, 133 insertions(+), 125 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=13479aa7b8116982f2db8…

1 0

Andrew Eikum : advapi32: Attempt to open WOW64 key before the lowest level key, too.
by Alexandre Julliard 15 Oct '13

15 Oct '13

Module: wine Branch: master Commit: 8cb7f877d7406065074183ae8541355f0090e6db URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cb7f877d7406065074183ae8… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Oct 4 09:44:21 2013 -0500 advapi32: Attempt to open WOW64 key before the lowest level key, too. Without this, we'll fail to open the correct key for e.g. <Machine\Software\Classes> with KEY_WOW64_32KEY, which should resolve to <Machine\Software\Wow6432Node\Classes>. --- dlls/advapi32/registry.c | 43 +++++++++++++++++++++++++------------------ 1 files changed, 25 insertions(+), 18 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 11e7500..c4113fb 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -140,10 +140,9 @@ static NTSTATUS create_key( HKEY *retkey, ACCESS_MASK access, OBJECT_ATTRIBUTES if (i == len && !force_wow32) return status; attrs = attr->Attributes; - attr->Attributes &= ~OBJ_OPENLINK; attr->ObjectName = &str; - while (i < len) + for (;;) { str.Buffer = buffer + pos; str.Length = (i - pos) * sizeof(WCHAR); @@ -157,20 +156,25 @@ static NTSTATUS create_key( HKEY *retkey, ACCESS_MASK access, OBJECT_ATTRIBUTES force_wow32 = FALSE; } } - status = NtCreateKey( &subkey, access, attr, 0, class, - options & ~REG_OPTION_CREATE_LINK, dispos ); + if (i == len) + { + attr->Attributes = attrs; + status = NtCreateKey( (PHANDLE)retkey, access, attr, 0, class, options, dispos ); + } + else + { + attr->Attributes = attrs & ~OBJ_OPENLINK; + status = NtCreateKey( &subkey, access, attr, 0, class, + options & ~REG_OPTION_CREATE_LINK, dispos ); + } if (attr->RootDirectory != root) NtClose( attr->RootDirectory ); if (status) return status; + if (i == len) break; attr->RootDirectory = subkey; while (i < len && buffer[i] == '\\') i++; pos = i; while (i < len && buffer[i] != '\\') i++; } - str.Buffer = buffer + pos; - str.Length = (i - pos) * sizeof(WCHAR); - attr->Attributes = attrs; - status = NtCreateKey( (PHANDLE)retkey, access, attr, 0, class, options, dispos ); - if (attr->RootDirectory != root) NtClose( attr->RootDirectory ); } return status; } @@ -190,10 +194,9 @@ static NTSTATUS open_key( HKEY *retkey, ACCESS_MASK access, OBJECT_ATTRIBUTES *a if (len && buffer[0] == '\\') return STATUS_OBJECT_PATH_INVALID; while (i < len && buffer[i] != '\\') i++; attrs = attr->Attributes; - attr->Attributes &= ~OBJ_OPENLINK; attr->ObjectName = &str; - while (i < len) + for (;;) { str.Buffer = buffer + pos; str.Length = (i - pos) * sizeof(WCHAR); @@ -207,21 +210,25 @@ static NTSTATUS open_key( HKEY *retkey, ACCESS_MASK access, OBJECT_ATTRIBUTES *a force_wow32 = FALSE; } } - status = NtOpenKey( &subkey, access, attr ); + if (i == len) + { + attr->Attributes = attrs; + status = NtOpenKey( (PHANDLE)retkey, access, attr ); + } + else + { + attr->Attributes = attrs & ~OBJ_OPENLINK; + status = NtOpenKey( &subkey, access, attr ); + } if (attr->RootDirectory != root) NtClose( attr->RootDirectory ); if (status) return status; + if (i == len) break; attr->RootDirectory = subkey; while (i < len && buffer[i] == '\\') i++; pos = i; while (i < len && buffer[i] != '\\') i++; } - str.Buffer = buffer + pos; - str.Length = (i - pos) * sizeof(WCHAR); - attr->Attributes = attrs; - status = NtOpenKey( (PHANDLE)retkey, access, attr ); - if (attr->RootDirectory != root) NtClose( attr->RootDirectory ); return status; - } /* create one of the HKEY_* special root keys */

1 0

Nikolay Sivov : msvcrt: Prevent msvcrt.dll unloading.
by Alexandre Julliard 15 Oct '13

15 Oct '13

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

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

15 Oct '13

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 : advpack/tests: Compile with -D__WINESRC__.
by Alexandre Julliard 15 Oct '13

15 Oct '13

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 : avifil32/tests: Compile with -D__WINESRC__.
by Alexandre Julliard 15 Oct '13

15 Oct '13

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

Huw Davies : wsock32: Add a fallback for inet_network.
by Alexandre Julliard 15 Oct '13

15 Oct '13

Module: wine Branch: master Commit: 0dff81f49501710ad18a33216757e0115ede44c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0dff81f49501710ad18a33216… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 15 09:55:49 2013 +0100 wsock32: Add a fallback for inet_network. --- configure | 1 + configure.ac | 1 + dlls/wsock32/protocol.c | 2 ++ include/config.h.in | 3 +++ 4 files changed, 7 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 683043c..bfde1af 100755 --- a/configure +++ b/configure @@ -14338,6 +14338,7 @@ for ac_func in \ getprotobyname \ getprotobynumber \ getservbyport \ + inet_addr \ inet_network \ inet_ntop \ inet_pton \ diff --git a/configure.ac b/configure.ac index fc68e1d..a2e1874 100644 --- a/configure.ac +++ b/configure.ac @@ -2130,6 +2130,7 @@ AC_CHECK_FUNCS(\ getprotobyname \ getprotobynumber \ getservbyport \ + inet_addr \ inet_network \ inet_ntop \ inet_pton \ diff --git a/dlls/wsock32/protocol.c b/dlls/wsock32/protocol.c index f398d6a..416613a 100644 --- a/dlls/wsock32/protocol.c +++ b/dlls/wsock32/protocol.c @@ -51,6 +51,8 @@ UINT WINAPI WSOCK32_inet_network(const char *cp) { #ifdef HAVE_INET_NETWORK return inet_network(cp); +#elif defined(HAVE_INET_ADDR) + return ntohl( inet_addr( cp ) ); #else return 0; #endif diff --git a/include/config.h.in b/include/config.h.in index 01e484e..6422b5a 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -264,6 +264,9 @@ /* Define to 1 if you have the `if_nameindex' function. */ #undef HAVE_IF_NAMEINDEX +/* Define to 1 if you have the `inet_addr' function. */ +#undef HAVE_INET_ADDR + /* Define to 1 if you have the <inet/mib2.h> header file. */ #undef HAVE_INET_MIB2_H

1 0