wine-commits April 2009

wine-commits@winehq.org

2 participants
664 discussions

Alexandre Julliard : wininet: Add stubs for PrivacyGet/SetZonePreferenceW.
by Alexandre Julliard 28 Apr '09

28 Apr '09

Module: wine Branch: master Commit: e12ade9fb39fd0d9b78c052496f301b8bfe446a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e12ade9fb39fd0d9b78c05249… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 27 20:04:34 2009 +0200 wininet: Add stubs for PrivacyGet/SetZonePreferenceW. --- dlls/wininet/internet.c | 19 +++++++++++++++++++ dlls/wininet/wininet.spec | 4 ++-- include/wininet.h | 17 +++++++++++++++++ 3 files changed, 38 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 785a1ef..4bb25e7 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -3815,6 +3815,25 @@ DWORD WINAPI InternetConfirmZoneCrossingW( HWND hWnd, LPWSTR szUrlPrev, LPWSTR s return ERROR_SUCCESS; } +/*********************************************************************** + * PrivacySetZonePreferenceW (WININET.@) + */ +DWORD WINAPI PrivacySetZonePreferenceW( DWORD zone, DWORD type, DWORD template, LPCWSTR preference ) +{ + FIXME( "%x %x %x %s: stub\n", zone, type, template, debugstr_w(preference) ); + return 0; +} + +/*********************************************************************** + * PrivacyGetZonePreferenceW (WININET.@) + */ +DWORD WINAPI PrivacyGetZonePreferenceW( DWORD zone, DWORD type, LPDWORD template, + LPWSTR preference, LPDWORD length ) +{ + FIXME( "%x %x: stub\n", zone, type ); + return 0; +} + DWORD WINAPI InternetDialA( HWND hwndParent, LPSTR lpszConnectoid, DWORD dwFlags, DWORD_PTR* lpdwConnection, DWORD dwReserved ) { diff --git a/dlls/wininet/wininet.spec b/dlls/wininet/wininet.spec index 78b98cc..61beaf4 100644 --- a/dlls/wininet/wininet.spec +++ b/dlls/wininet/wininet.spec @@ -213,8 +213,8 @@ @ stdcall IsUrlCacheEntryExpiredW(wstr long ptr) @ stub LoadUrlCacheContent @ stub ParseX509EncodedCertificateForListBoxEntry -@ stub PrivacyGetZonePreferenceW # (long long ptr ptr ptr) -@ stub PrivacySetZonePreferenceW # (long long long wstr) +@ stdcall PrivacyGetZonePreferenceW(long long ptr ptr ptr) +@ stdcall PrivacySetZonePreferenceW(long long long wstr) @ stdcall ReadUrlCacheEntryStream(ptr long ptr ptr long) @ stdcall RegisterUrlCacheNotification(ptr long long long long long) @ stdcall ResumeSuspendedDownload(long long) diff --git a/include/wininet.h b/include/wininet.h index d3263fe..6ce8ae0 100644 --- a/include/wininet.h +++ b/include/wininet.h @@ -1356,6 +1356,23 @@ INTERNETAPI DWORD WINAPI InternetConfirmZoneCrossingA(HWND ,LPSTR ,LPSTR ,BOOL); INTERNETAPI DWORD WINAPI InternetConfirmZoneCrossingW(HWND ,LPWSTR ,LPWSTR ,BOOL); #define InternetConfirmZoneCrossing WINELIB_NAME_AW(InternetConfirmZoneCrossing) +#define PRIVACY_TEMPLATE_NO_COOKIES 0 +#define PRIVACY_TEMPLATE_HIGH 1 +#define PRIVACY_TEMPLATE_MEDIUM_HIGH 2 +#define PRIVACY_TEMPLATE_MEDIUM 3 +#define PRIVACY_TEMPLATE_MEDIUM_LOW 4 +#define PRIVACY_TEMPLATE_LOW 5 +#define PRIVACY_TEMPLATE_CUSTOM 100 +#define PRIVACY_TEMPLATE_ADVANCED 101 + +#define PRIVACY_TEMPLATE_MAX PRIVACY_TEMPLATE_LOW + +#define PRIVACY_TYPE_FIRST_PARTY 0 +#define PRIVACY_TYPE_THIRD_PARTY 1 + +INTERNETAPI DWORD WINAPI PrivacySetZonePreferenceW(DWORD,DWORD,DWORD,LPCWSTR); +INTERNETAPI DWORD WINAPI PrivacyGetZonePreferenceW(DWORD,DWORD,LPDWORD,LPWSTR,LPDWORD); + #define INTERNET_ERROR_BASE 12000 #define ERROR_INTERNET_OUT_OF_HANDLES (INTERNET_ERROR_BASE + 1)

1 0

Alexandre Julliard : winetest: Split per-platform results to different index files.
by Alexandre Julliard 27 Apr '09

27 Apr '09

Module: tools Branch: master Commit: 3b8743fae628af8b9e04f3b38976ab86110ab2bf URL: http://source.winehq.org/git/tools.git/?a=commit;h=3b8743fae628af8b9e04f3b3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 27 15:09:42 2009 +0200 winetest: Split per-platform results to different index files. --- winetest/build-index | 2 +- winetest/gather | 215 ++++++++++++++++++++++++++------------------------ winetest/site | 17 +++-- 3 files changed, 124 insertions(+), 110 deletions(-) Diff: http://source.winehq.org/git/tools.git/?a=commitdiff;h=3b8743fae628af8b9e04…

1 0

André Hentschel : winemaker: Add often used negative optimization.
by Alexandre Julliard 27 Apr '09

27 Apr '09

Module: wine Branch: master Commit: dc31d870823de968c49987dd3bbb742ac0c6fa30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc31d870823de968c49987dd3… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Apr 25 16:41:48 2009 +0200 winemaker: Add often used negative optimization. --- tools/winemaker | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/tools/winemaker b/tools/winemaker index 3144b59..1df8fa7 100755 --- a/tools/winemaker +++ b/tools/winemaker @@ -638,6 +638,9 @@ sub source_scan_project_file($$$) } elsif (/^Oy$/) { # Frame-Pointer Omission $prj_target_cflags.="-fomit-frame-pointer "; + } elsif (/^Oy-$/) { + # Frame-Pointer Omission + $prj_target_cflags.="-fno-omit-frame-pointer "; } elsif (/^GZ$/) { # Catch Release-Build Errors in Debug Build } elsif (/^M[DLT]d?$/) {

1 0

André Hentschel : winemaker: Fix optimizations.
by Alexandre Julliard 27 Apr '09

27 Apr '09

Module: wine Branch: master Commit: e1cdd9778ff0af880bce04b6db8809ed0f9d5be1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1cdd9778ff0af880bce04b6d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Apr 25 16:27:42 2009 +0200 winemaker: Fix optimizations. --- tools/winemaker | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/tools/winemaker b/tools/winemaker index 1c177aa..3144b59 100755 --- a/tools/winemaker +++ b/tools/winemaker @@ -627,10 +627,14 @@ sub source_scan_project_file($$$) # Disables inline Expansion $prj_target_cflags.="-fno-inline "; } elsif (/^Ob1$/) { - # In-line Function Expansion + #In-line Function Expansion + $prj_target_cflags.="-finline-functions "; } elsif (/^Ob2$/) { # auto In-line Function Expansion $prj_target_cflags.="-finline-functions "; + } elsif (/^Ox$/) { + # Use maximum optimization + $prj_target_cflags.="-O3 "; } elsif (/^Oy$/) { # Frame-Pointer Omission $prj_target_cflags.="-fomit-frame-pointer ";

1 0

André Hentschel : winemaker: Fix project file path parsing.
by Alexandre Julliard 27 Apr '09

27 Apr '09

Module: wine Branch: master Commit: 1199d05d597ef1fc56fa17018cb3cc5ef1927018 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1199d05d597ef1fc56fa17018… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Apr 25 15:47:59 2009 +0200 winemaker: Fix project file path parsing. --- tools/winemaker | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/winemaker b/tools/winemaker index ba7d284..1c177aa 100755 --- a/tools/winemaker +++ b/tools/winemaker @@ -1096,10 +1096,11 @@ sub source_scan_workspace_file($) s/\r\n$/\n/; # catch a project definition - if (/^Project:\s\"(.*)\"=(.*)\s-/) { + if (/^Project:\s\"(.*)\"=\"?(.*)\s-/) { $prj_name=$1; $prj_path=$2; - @components=split /[\/\\]+/, $2; + $prj_path=~s/\"$//; + @components=split /[\/\\]+/, $prj_path; $prj_path=search_from($path, \@components); print "Name: $prj_name\nPath: $prj_path\n"; source_scan_project_file(\@main_project,1,$prj_path);

1 0

André Hentschel : winemaker: Fix path handling for Current Working Directory.
by Alexandre Julliard 27 Apr '09

27 Apr '09

Module: wine Branch: master Commit: 70fbe9770a4775f9c6cf8769ff6a9b0c15891428 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70fbe9770a4775f9c6cf8769f… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Apr 24 17:40:32 2009 +0200 winemaker: Fix path handling for Current Working Directory. --- tools/winemaker | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/winemaker b/tools/winemaker index eca6417..ba7d284 100755 --- a/tools/winemaker +++ b/tools/winemaker @@ -1724,7 +1724,7 @@ sub search_from($$) my $path=$_[1]; my $real_path=""; - if ($dirname eq "" or $dirname eq ".") { + if ($dirname eq "" or $dirname eq "." or $dirname eq "./") { $dirname=cwd; } elsif ($dirname !~ m+^/+) { $dirname=cwd . "/" . $dirname;

1 0

Rico Schüller : notepad: Allow only one search/ replace dialog to open.
by Alexandre Julliard 27 Apr '09

27 Apr '09

Module: wine Branch: master Commit: ac6a18f1f6d5eb3fb453c7eea913ed4d720088a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac6a18f1f6d5eb3fb453c7eea… Author: Rico Schüller <kgbricola(a)web.de> Date: Sat Apr 25 17:54:03 2009 +0200 notepad: Allow only one search/replace dialog to open. --- programs/notepad/dialog.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/programs/notepad/dialog.c b/programs/notepad/dialog.c index ce4bbfa..aa0a53c 100644 --- a/programs/notepad/dialog.c +++ b/programs/notepad/dialog.c @@ -724,6 +724,13 @@ VOID DIALOG_SelectFont(VOID) VOID DIALOG_Search(VOID) { + /* Allow only one search/replace dialog to open */ + if(Globals.hFindReplaceDlg != NULL) + { + SetActiveWindow(Globals.hFindReplaceDlg); + return; + } + ZeroMemory(&Globals.find, sizeof(Globals.find)); Globals.find.lStructSize = sizeof(Globals.find); Globals.find.hwndOwner = Globals.hMainWnd; @@ -749,6 +756,13 @@ VOID DIALOG_SearchNext(VOID) VOID DIALOG_Replace(VOID) { + /* Allow only one search/replace dialog to open */ + if(Globals.hFindReplaceDlg != NULL) + { + SetActiveWindow(Globals.hFindReplaceDlg); + return; + } + ZeroMemory(&Globals.find, sizeof(Globals.find)); Globals.find.lStructSize = sizeof(Globals.find); Globals.find.hwndOwner = Globals.hMainWnd;

1 0

Rico Schüller : notepad: Implement replace.
by Alexandre Julliard 27 Apr '09

27 Apr '09

Module: wine Branch: master Commit: 3137600651a203486f44e312b6a23cf577f27ca6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3137600651a203486f44e312b… Author: Rico Schüller <kgbricola(a)web.de> Date: Sat Apr 25 17:53:58 2009 +0200 notepad: Implement replace. --- programs/notepad/De.rc | 1 + programs/notepad/En.rc | 1 + programs/notepad/dialog.c | 19 +++++++++ programs/notepad/dialog.h | 1 + programs/notepad/main.c | 82 ++++++++++++++++++++++++++++++++++++++++ programs/notepad/main.h | 1 + programs/notepad/notepad_res.h | 1 + programs/notepad/rsrc.rc | 1 + 8 files changed, 107 insertions(+), 0 deletions(-) diff --git a/programs/notepad/De.rc b/programs/notepad/De.rc index 24d713a..fb315a8 100644 --- a/programs/notepad/De.rc +++ b/programs/notepad/De.rc @@ -53,6 +53,7 @@ POPUP "&Bearbeiten" { POPUP "&Suchen" { MENUITEM "Suchen...\tStrg+F", CMD_SEARCH MENUITEM "&Weitersuchen\tF3", CMD_SEARCH_NEXT + MENUITEM "&Ersetzen...\tStrg+H", CMD_REPLACE } POPUP "&Hilfe" { MENUITEM "&Inhalt", CMD_HELP_CONTENTS diff --git a/programs/notepad/En.rc b/programs/notepad/En.rc index c68404e..c4a4baf 100644 --- a/programs/notepad/En.rc +++ b/programs/notepad/En.rc @@ -53,6 +53,7 @@ POPUP "&Edit" { POPUP "&Search" { MENUITEM "&Search...\tCtrl+F", CMD_SEARCH MENUITEM "&Search next\tF3", CMD_SEARCH_NEXT + MENUITEM "&Replace...\tCtrl+H", CMD_REPLACE } POPUP "&Help" { MENUITEM "&Contents", CMD_HELP_CONTENTS diff --git a/programs/notepad/dialog.c b/programs/notepad/dialog.c index d97e102..ce4bbfa 100644 --- a/programs/notepad/dialog.c +++ b/programs/notepad/dialog.c @@ -747,6 +747,25 @@ VOID DIALOG_SearchNext(VOID) NOTEPAD_DoFind(&Globals.lastFind); } +VOID DIALOG_Replace(VOID) +{ + ZeroMemory(&Globals.find, sizeof(Globals.find)); + Globals.find.lStructSize = sizeof(Globals.find); + Globals.find.hwndOwner = Globals.hMainWnd; + Globals.find.hInstance = Globals.hInstance; + Globals.find.lpstrFindWhat = Globals.szFindText; + Globals.find.wFindWhatLen = SIZEOF(Globals.szFindText); + Globals.find.lpstrReplaceWith = Globals.szReplaceText; + Globals.find.wReplaceWithLen = SIZEOF(Globals.szReplaceText); + Globals.find.Flags = FR_DOWN|FR_HIDEWHOLEWORD; + + /* We only need to create the modal FindReplace dialog which will */ + /* notify us of incoming events using hMainWnd Window Messages */ + + Globals.hFindReplaceDlg = ReplaceText(&Globals.find); + assert(Globals.hFindReplaceDlg !=0); +} + VOID DIALOG_HelpContents(VOID) { WinHelp(Globals.hMainWnd, helpfileW, HELP_INDEX, 0); diff --git a/programs/notepad/dialog.h b/programs/notepad/dialog.h index d780991..d927143 100644 --- a/programs/notepad/dialog.h +++ b/programs/notepad/dialog.h @@ -38,6 +38,7 @@ VOID DIALOG_EditWrap(VOID); VOID DIALOG_Search(VOID); VOID DIALOG_SearchNext(VOID); +VOID DIALOG_Replace(VOID); VOID DIALOG_SelectFont(VOID); diff --git a/programs/notepad/main.c b/programs/notepad/main.c index 1751c90..33b4859 100644 --- a/programs/notepad/main.c +++ b/programs/notepad/main.c @@ -294,6 +294,7 @@ static int NOTEPAD_MenuCommand(WPARAM wParam) case CMD_SEARCH: DIALOG_Search(); break; case CMD_SEARCH_NEXT: DIALOG_SearchNext(); break; + case CMD_REPLACE: DIALOG_Replace(); break; case CMD_WRAP: DIALOG_EditWrap(); break; case CMD_FONT: DIALOG_SelectFont(); break; @@ -414,6 +415,77 @@ void NOTEPAD_DoFind(FINDREPLACE *fr) SendMessage(Globals.hEdit, EM_SETSEL, found - content, found - content + len); } +void NOTEPAD_DoReplace(FINDREPLACE *fr) +{ + LPTSTR content; + int len = lstrlen(fr->lpstrFindWhat); + int fileLen; + DWORD pos; + DWORD pos_start; + + fileLen = GetWindowTextLength(Globals.hEdit) + 1; + content = HeapAlloc(GetProcessHeap(), 0, fileLen * sizeof(TCHAR)); + if (!content) return; + GetWindowText(Globals.hEdit, content, fileLen); + + SendMessage(Globals.hEdit, EM_GETSEL, (WPARAM)&pos_start, (LPARAM)&pos); + switch (fr->Flags & (FR_DOWN|FR_MATCHCASE)) + { + case FR_DOWN: + if ( pos-pos_start == len && StrCmpNI(fr->lpstrFindWhat, content+pos_start, len) == 0) + SendMessage(Globals.hEdit, EM_REPLACESEL, TRUE, (LPARAM)fr->lpstrReplaceWith); + break; + case FR_DOWN|FR_MATCHCASE: + if ( pos-pos_start == len && StrCmpN(fr->lpstrFindWhat, content+pos_start, len) == 0) + SendMessage(Globals.hEdit, EM_REPLACESEL, TRUE, (LPARAM)fr->lpstrReplaceWith); + break; + default: /* shouldn't happen */ + return; + } + HeapFree(GetProcessHeap(), 0, content); + + NOTEPAD_DoFind(fr); +} + +void NOTEPAD_DoReplaceAll(FINDREPLACE *fr) +{ + LPTSTR content; + LPTSTR found; + int len = lstrlen(fr->lpstrFindWhat); + int fileLen; + DWORD pos; + + SendMessage(Globals.hEdit, EM_SETSEL, 0, 0); + while(TRUE){ + fileLen = GetWindowTextLength(Globals.hEdit) + 1; + content = HeapAlloc(GetProcessHeap(), 0, fileLen * sizeof(TCHAR)); + if (!content) return; + GetWindowText(Globals.hEdit, content, fileLen); + + SendMessage(Globals.hEdit, EM_GETSEL, 0, (LPARAM)&pos); + switch (fr->Flags & (FR_DOWN|FR_MATCHCASE)) + { + case FR_DOWN: + found = StrStrI(content+pos, fr->lpstrFindWhat); + break; + case FR_DOWN|FR_MATCHCASE: + found = StrStr(content+pos, fr->lpstrFindWhat); + break; + default: /* shouldn't happen */ + return; + } + HeapFree(GetProcessHeap(), 0, content); + + if(found == NULL) + { + SendMessage(Globals.hEdit, EM_SETSEL, 0, 0); + return; + } + SendMessage(Globals.hEdit, EM_SETSEL, found - content, found - content + len); + SendMessage(Globals.hEdit, EM_REPLACESEL, TRUE, (LPARAM)fr->lpstrReplaceWith); + } +} + /*********************************************************************** * * NOTEPAD_WndProc @@ -432,6 +504,16 @@ static LRESULT WINAPI NOTEPAD_WndProc(HWND hWnd, UINT msg, WPARAM wParam, Globals.lastFind = *fr; NOTEPAD_DoFind(fr); } + if (fr->Flags & FR_REPLACE) + { + Globals.lastFind = *fr; + NOTEPAD_DoReplace(fr); + } + if (fr->Flags & FR_REPLACEALL) + { + Globals.lastFind = *fr; + NOTEPAD_DoReplaceAll(fr); + } return 0; } diff --git a/programs/notepad/main.h b/programs/notepad/main.h index 51db639..88e7fbe 100644 --- a/programs/notepad/main.h +++ b/programs/notepad/main.h @@ -35,6 +35,7 @@ typedef struct LOGFONT lfFont; BOOL bWrapLongLines; WCHAR szFindText[MAX_PATH]; + WCHAR szReplaceText[MAX_PATH]; WCHAR szFileName[MAX_PATH]; WCHAR szFileTitle[MAX_PATH]; WCHAR szFilter[2 * MAX_STRING_LEN + 100]; diff --git a/programs/notepad/notepad_res.h b/programs/notepad/notepad_res.h index 9228a5e..8176b85 100644 --- a/programs/notepad/notepad_res.h +++ b/programs/notepad/notepad_res.h @@ -45,6 +45,7 @@ #define CMD_SEARCH 0x120 #define CMD_SEARCH_NEXT 0x121 +#define CMD_REPLACE 0x122 #define CMD_WRAP 0x119 #define CMD_FONT 0x140 diff --git a/programs/notepad/rsrc.rc b/programs/notepad/rsrc.rc index 8018a58..50b3558 100644 --- a/programs/notepad/rsrc.rc +++ b/programs/notepad/rsrc.rc @@ -30,6 +30,7 @@ ID_ACCEL ACCELERATORS "^A", CMD_SELECT_ALL "^C", CMD_COPY "^F", CMD_SEARCH + "H", CMD_REPLACE, VIRTKEY, CONTROL "^N", CMD_NEW "^O", CMD_OPEN "^P", CMD_PRINT

1 0

Jeff Latimer : ws2_32: Make inet_ntop conform to msdn definition.
by Alexandre Julliard 27 Apr '09

27 Apr '09

Module: wine Branch: master Commit: 4d4819d8c4d13d1bc53f82c3b4322c897e8bdd8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d4819d8c4d13d1bc53f82c3b… Author: Jeff Latimer <lats(a)yless4u.com.au> Date: Sat Apr 25 00:30:22 2009 +1000 ws2_32: Make inet_ntop conform to msdn definition. --- dlls/ws2_32/socket.c | 12 +++++++----- dlls/ws2_32/tests/sock.c | 6 +++--- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 42bab60..01ebd7c 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -4698,16 +4698,18 @@ int WINAPI WSARemoveServiceClass(LPGUID info) PCSTR WINAPI WS_inet_ntop( INT family, PVOID addr, PSTR buffer, size_t len ) { #ifdef HAVE_INET_NTOP - union generic_unix_sockaddr unix_addr; + struct WS_in6_addr *in6; + struct WS_in_addr *in; + TRACE("family %d, addr (%p), buffer (%p), len %d\n", family, addr, buffer, len); switch (family) { case WS_AF_INET: - ws_sockaddr_ws2u( addr, sizeof(struct WS_sockaddr_in), &unix_addr ); - return inet_ntop( AF_INET, &unix_addr, buffer, len ); + in = addr; + return inet_ntop( AF_INET, &in->WS_s_addr, buffer, len ); case WS_AF_INET6: - ws_sockaddr_ws2u( addr, sizeof(struct WS_sockaddr_in6), &unix_addr ); - return inet_ntop( AF_INET6, &unix_addr, buffer, len ); + in6 = addr; + return inet_ntop( AF_INET6, in6->WS_s6_addr, buffer, len ); } #else FIXME( "not supported on this platform\n" ); diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 7bc3ee8..8316982 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2040,7 +2040,7 @@ static void test_addr_to_print(void) pdst = pInetNtop(AF_INET,(void*)&in.s_addr, dst, sizeof(dst)); ok(pdst != NULL, "InetNtop failed %s\n", dst); - todo_wine ok(!strcmp(pdst, addr1_Str),"Address %s != %s\n", pdst, addr1_Str); + ok(!strcmp(pdst, addr1_Str),"Address %s != %s\n", pdst, addr1_Str); /* Test invalid parm conditions */ pdst = pInetNtop(1, (void*)&in.s_addr, dst, sizeof(dst)); @@ -2051,13 +2051,13 @@ static void test_addr_to_print(void) memcpy(in6.u.Byte, addr2_Num, sizeof(addr2_Num)); pdst = pInetNtop(AF_INET6,(void*)&in6.s6_addr, dst6, sizeof(dst6)); ok(pdst != NULL, "InetNtop failed %s\n", dst6); - todo_wine ok(!strcmp(pdst, addr2_Str),"Address %s != %s\n", pdst, addr2_Str); + ok(!strcmp(pdst, addr2_Str),"Address %s != %s\n", pdst, addr2_Str); /* Test an zero suffixed IPV6 address */ memcpy(in6.s6_addr, addr3_Num, sizeof(addr3_Num)); pdst = pInetNtop(AF_INET6,(void*)&in6.s6_addr, dst6, sizeof(dst6)); ok(pdst != NULL, "InetNtop failed %s\n", dst6); - todo_wine ok(!strcmp(pdst, addr3_Str),"Address %s != %s\n", pdst, addr3_Str); + ok(!strcmp(pdst, addr3_Str),"Address %s != %s\n", pdst, addr3_Str); } static void test_ioctlsocket(void)

1 0

Jeff Latimer : ws2_32/tests: Add tests for Inet_Ntop and inet_ntoa.
by Alexandre Julliard 27 Apr '09

27 Apr '09

Module: wine Branch: master Commit: 0cdd0d80eef747f7400568f6a16e89292bbaa531 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cdd0d80eef747f7400568f6a… Author: Jeff Latimer <lats(a)yless4u.com.au> Date: Sat Apr 25 00:30:06 2009 +1000 ws2_32/tests: Add tests for Inet_Ntop and inet_ntoa. --- dlls/ws2_32/tests/sock.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 65 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index dbd43d8..7bc3ee8 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -55,6 +55,9 @@ ok ( cond tmp, msg, GetCurrentThreadId(), err); \ } while (0); +/* Function pointers */ +static HMODULE hws2_32 = 0; +static PCSTR (WINAPI *pInetNtop)(INT,LPVOID,LPSTR,ULONG) = 0; /**************** Structs and typedefs ***************/ @@ -1996,6 +1999,67 @@ static void test_inet_addr(void) ok(addr == INADDR_NONE, "inet_addr succeeded unexpectedly\n"); } +static void test_addr_to_print(void) +{ + char dst[16]; + char dst6[64]; + const char * pdst; + struct in_addr in; + struct in6_addr in6; + + u_long addr0_Num = 0x00000000; + PCSTR addr0_Str = "0.0.0.0"; + u_long addr1_Num = 0x20201015; + PCSTR addr1_Str = "21.16.32.32"; + u_char addr2_Num[16] = {0,0,0,0,0,0,0,0,0,0,0xff,0xfe,0xcC,0x98,0xbd,0x74}; + PCSTR addr2_Str = "::fffe:cc98:bd74"; + u_char addr3_Num[16] = {0x20,0x30,0xa4,0xb1}; + PCSTR addr3_Str = "2030:a4b1::"; + + hws2_32 = GetModuleHandle("ws2_32.dll"); + pInetNtop = (void *)GetProcAddress(hws2_32, "inet_ntop"); + + in.s_addr = addr0_Num; + + pdst = inet_ntoa(*((struct in_addr*)&in.s_addr)); + ok(pdst != NULL, "inet_ntoa failed %s\n", dst); + ok(!strcmp(pdst, addr0_Str),"Address %s != %s\n", pdst, addr0_Str); + + /* Test that inet_ntoa and inet_ntop return the same value */ + in.S_un.S_addr = addr1_Num; + pdst = inet_ntoa(*((struct in_addr*)&in.s_addr)); + ok(pdst != NULL, "inet_ntoa failed %s\n", dst); + ok(!strcmp(pdst, addr1_Str),"Address %s != %s\n", pdst, addr1_Str); + + /* InetNtop became available in Vista and Win2008 */ + if (!pInetNtop) + { + win_skip("InetNtop not present, not executing tests\n"); + return; + } + + pdst = pInetNtop(AF_INET,(void*)&in.s_addr, dst, sizeof(dst)); + ok(pdst != NULL, "InetNtop failed %s\n", dst); + todo_wine ok(!strcmp(pdst, addr1_Str),"Address %s != %s\n", pdst, addr1_Str); + + /* Test invalid parm conditions */ + pdst = pInetNtop(1, (void*)&in.s_addr, dst, sizeof(dst)); + ok(pdst == NULL, "The pointer should not be returned (%p)\n", pdst); + ok(WSAGetLastError() == WSAEAFNOSUPPORT, "Should be WSAEAFNOSUPPORT\n"); + + /* Test an zero prefixed IPV6 address */ + memcpy(in6.u.Byte, addr2_Num, sizeof(addr2_Num)); + pdst = pInetNtop(AF_INET6,(void*)&in6.s6_addr, dst6, sizeof(dst6)); + ok(pdst != NULL, "InetNtop failed %s\n", dst6); + todo_wine ok(!strcmp(pdst, addr2_Str),"Address %s != %s\n", pdst, addr2_Str); + + /* Test an zero suffixed IPV6 address */ + memcpy(in6.s6_addr, addr3_Num, sizeof(addr3_Num)); + pdst = pInetNtop(AF_INET6,(void*)&in6.s6_addr, dst6, sizeof(dst6)); + ok(pdst != NULL, "InetNtop failed %s\n", dst6); + todo_wine ok(!strcmp(pdst, addr3_Str),"Address %s != %s\n", pdst, addr3_Str); +} + static void test_ioctlsocket(void) { SOCKET sock; @@ -2369,6 +2433,7 @@ START_TEST( sock ) test_accept(); test_getsockname(); test_inet_addr(); + test_addr_to_print(); test_ioctlsocket(); test_dns(); test_gethostbyname_hack();

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
67
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2009