June 2007 - Wine-Commits - list.winehq.org

lostwages/ include/winehq.conf news/2007062901.xml
by Alexandre Julliard June 29, 2007

June 29, 2007

ChangeSet ID: 31233 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: julliard(a)winehq.org 2007/06/29 12:57:21 Modified files: include : winehq.conf Added files: news : 2007062901.xml Log message: Release 0.9.40 Patch: http://cvs.winehq.org/patch.py?id=31233 Old revision New revision Changes Path 1.62 1.63 +1 -1 lostwages/include/winehq.conf Added 1.1 +0 -0 lostwages/news/2007062901.xml Index: lostwages/include/winehq.conf diff -u -p lostwages/include/winehq.conf:1.62 lostwages/include/winehq.conf:1.63 --- lostwages/include/winehq.conf:1.62 29 Jun 2007 17:57:21 -0000 +++ lostwages/include/winehq.conf 29 Jun 2007 17:57:21 -0000 @@ -29,7 +29,7 @@ news_xml_path: news wwn_xml_path: wwn # Snapshot Date -snapshot_date: 0.9.39 +snapshot_date: 0.9.40 # Current RH Packages Snapshot Date snapshot_date_rh: 0.9.2 Index: lostwages/news/2007062901.xml diff -u -p /dev/null lostwages/news/2007062901.xml:1.1 --- /dev/null 29 Jun 2007 17:57:21 -0000 +++ lostwages/news/2007062901.xml 29 Jun 2007 17:57:21 -0000 @@ -0,0 +1,24 @@ +<news> +<date>June 29, 2007</date> +<title>Wine 0.9.40 Released</title> +<body> +<p>Wine 0.9.40 was released today, with the following main changes:</p> + +<ul> +<li>Many MSHTML improvements.</li> +<li>A few more sound fixes.</li> +<li>Many Direct3D fixes.</li> +<li>Lots of bug fixes.</li> +</ul> + +<p> +Binary packages are in the process of being built and it may take a +few days for them to appear, but the source is +<a href="http://prdownloads.sourceforge.net/wine/wine-0.9.40.tar.bz2">available now</a>. +You can find out more about this release in the +<a href="?announce=0.9.40">announcement</a>. Check out our +<a href="/site/download">download page</a> for packages for your +distribution. +</p> +</body> +</news>

1 0

Tag wine-0.9.40 : Alexandre Julliard : Release 0.9.40
by Alexandre Julliard June 29, 2007

June 29, 2007

Module: wine Branch: refs/tags/wine-0.9.40 Tag: 995c8850e3132c1fcd48d27c1f6efaddf3f35289 URL: http://source.winehq.org/git/wine.git/?a=tag;h=995c8850e3132c1fcd48d27c1f6e… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 29 19:36:21 2007 +0200 Release 0.9.40

1 0

Alexandre Julliard : Release 0.9.40.
by Alexandre Julliard June 29, 2007

June 29, 2007

Module: wine Branch: master Commit: b28c41f107ff6dee421bd43452f3f617dc69328f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b28c41f107ff6dee421bd4345… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 29 19:36:20 2007 +0200 Release 0.9.40. --- ANNOUNCE | 882 +++++++++++++++++------------------ ChangeLog | 1585 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ VERSION | 2 +- configure | 18 +- 4 files changed, 2027 insertions(+), 460 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b28c41f107ff6dee421bd…

1 0

Konstantin Kondratyuk : programs/winefile: Add Russian resources.
by Alexandre Julliard June 29, 2007

June 29, 2007

Module: wine Branch: master Commit: 8b9454d4866ba7b9bff8fa5d13a665c5cc01057f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b9454d4866ba7b9bff8fa5d1… Author: Konstantin Kondratyuk <kondratyuk(a)etersoft.ru> Date: Fri Jun 29 15:18:08 2007 +0400 programs/winefile: Add Russian resources. --- programs/winefile/Ru.rc | 125 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 125 insertions(+), 0 deletions(-) diff --git a/programs/winefile/Ru.rc b/programs/winefile/Ru.rc index ef8e879..a459f8a 100644 --- a/programs/winefile/Ru.rc +++ b/programs/winefile/Ru.rc @@ -2,6 +2,7 @@ * WineFile (Russian resources) * * Copyright 2003 Igor Stepin + * Copyright 2007 Konstantin Kondratyuk (Etersoft) * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -158,3 +159,127 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "��", 2, 158, 23, 47, 14 PUSHBUTTON "&��", 254, 158, 43, 47, 14 } +IDD_SELECT_DESTINATION DIALOG FIXED IMPURE 15, 13, 210, 63 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "�� " +FONT 8, "MS Shell Dlg" +{ + CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 + CONTROL "&��:", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 + EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL + DEFPUSHBUTTON "OK", 1, 158, 6, 47, 14 + PUSHBUTTON "��", 2, 158, 23, 47, 14 + PUSHBUTTON "&��", 254, 158, 43, 47, 14 +} + +IDD_DIALOG_VIEW_TYPE DIALOG DISCARDABLE 15, 13, 161, 97 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "�� " +FONT 8, "MS Sans Serif" +BEGIN + LTEXT "&��:",-1,7,8,22,10 + EDITTEXT IDC_VIEW_PATTERN,31,7,63,12,ES_AUTOHSCROLL + GROUPBOX "�� ",-1,7,23,87,56 + CONTROL "&��",IDC_VIEW_TYPE_DIRECTORIES,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,13,32,70,10 + CONTROL "&��",IDC_VIEW_TYPE_PROGRAMS,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,13,43,70,10 + CONTROL "&��",IDC_VIEW_TYPE_DOCUMENTS,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,13,54,70,10 + CONTROL "�� &��",IDC_VIEW_TYPE_OTHERS,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,13,65,70,10 + CONTROL "�� /&�� ",IDC_VIEW_TYPE_HIDDEN, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,81,106,9 + DEFPUSHBUTTON "OK",IDOK,104,7,50,14 + PUSHBUTTON "��",IDCANCEL,104,24,50,14 +END + +IDD_DIALOG_PROPERTIES DIALOG DISCARDABLE 0, 0, 248, 215 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "�� %s" +FONT 8, "MS Sans Serif" +BEGIN + DEFPUSHBUTTON "OK",IDOK,191,7,50,14 + PUSHBUTTON "��",IDCANCEL,191,29,50,14 + LTEXT "�� &��:",-1,7,7,59,9 + EDITTEXT IDC_STATIC_PROP_FILENAME,71,7,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "&�� :",-1,7,18,59,9 + EDITTEXT IDC_STATIC_PROP_PATH,71,18,120,9, ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "�� :",-1,7,29,59,9 + EDITTEXT IDC_STATIC_PROP_LASTCHANGE,71,29,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "��:",-1,7,40,59,9 + EDITTEXT IDC_STATIC_PROP_VERSION,71,40,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "Cop&yright:",-1,7,51,59,9 + EDITTEXT IDC_STATIC_PROP_COPYRIGHT,71,51,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "��:",-1,7,62,59,9 + EDITTEXT IDC_STATIC_PROP_SIZE,71,62,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + GROUPBOX "��",-1,7,79,158,46 + CONTROL "&�� ",IDC_CHECK_READONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,91,68,9 + CONTROL "�&��",IDC_CHECK_HIDDEN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,91,68,9 + CONTROL "&Archive",IDC_CHECK_ARCHIVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,101,68,9 + CONTROL "&��",IDC_CHECK_SYSTEM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,101,68,9 + CONTROL "�&��",IDC_CHECK_COMPRESSED,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,17,111,68,9 + GROUPBOX "&�� ",-1,7,129,234,79 + LISTBOX IDC_LIST_PROP_VERSION_TYPES,13,139,107,63,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP + EDITTEXT IDC_LIST_PROP_VERSION_VALUES,123,139,111,63,ES_MULTILINE | ES_READONLY | WS_VSCROLL +END + + +STRINGTABLE +{ + IDS_FONT_SEL_DLG_NAME "�� " + IDS_FONT_SEL_ERROR "�� ." +} + +STRINGTABLE +{ + IDS_WINEFILE "Winefile" + IDS_ERROR "��" + IDS_ROOT_FS "�� " + IDS_UNIXFS "�� " + IDS_DESKTOP "�� " + IDS_SHELL "Shell" + IDS_TITLEFMT "%s - %s" + IDS_NO_IMPL "�� " + IDS_WINE "WINE" + IDS_WINE_FILE "Wine File" +} + +STRINGTABLE +{ + IDS_COL_NAME "��" + IDS_COL_SIZE "��" + IDS_COL_CDATE "�� " + IDS_COL_ADATE "�� " + IDS_COL_MDATE "�� " + IDS_COL_IDX "Index/Inode" + IDS_COL_LINKS "��" + IDS_COL_ATTR "��" + IDS_COL_SEC "��" + + IDS_FREE_SPACE_FMT "%s �� %s ��" +} + +STRINGTABLE +{ +IDS_LICENSE_CAPTION, "��" +IDS_LICENSE, +"�� ; �� /�� \ +�� GNU General Public \ +�� Free Software Foundation; \ +�� 2.1, �� .\n\ +�� , �� , \ +�� ; � �� \ +�� . \ +��. GNU Lesser General Public License �� .\n\ +�� the GNU Lesser General Public \ +License �� ; �� , ��: the Free Software \ +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA" + +IDS_WARRANTY_CAPTION, "�� " +IDS_WARRANTY, +"�� , �� , \ +�� ; � �� \ +�� . \ +��. GNU Lesser General Public License �� ." +}

1 0

Maarten Lankhorst : dsound: Fix calcplayposition to handle mixed amount > buffer length better.
by Alexandre Julliard June 29, 2007

June 29, 2007

Module: wine Branch: master Commit: 6d97123536f595a132765294080800400857948f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d97123536f595a1327652940… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Jun 29 18:30:52 2007 +0200 dsound: Fix calcplayposition to handle mixed amount > buffer length better. --- dlls/dsound/buffer.c | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index 96fb3d1..9de2a39 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -444,13 +444,11 @@ DWORD DSOUND_CalcPlayPosition(IDirectSoundBufferImpl *This, DWORD pplay, DWORD p TRACE("this back-offset=%d\n", pmix); /* sanity */ - if(pmix > This->buflen){ - ERR("Bad length in CalcPlayPosition!\n"); - return 0; - } + if(pmix > This->buflen) + WARN("Mixed length (%d) is longer then buffer length (%d)\n", pmix, This->buflen); /* subtract from our last mixed position */ - if (bplay < pmix) bplay += This->buflen; /* wraparound */ + while (bplay < pmix) bplay += This->buflen; /* wraparound */ bplay -= pmix; /* check for lead-in */ @@ -461,9 +459,9 @@ DWORD DSOUND_CalcPlayPosition(IDirectSoundBufferImpl *This, DWORD pplay, DWORD p } /* sanity */ - if(bplay > This->buflen){ - ERR("Bad play position in CalcPlayPosition!\n"); - return 0; + if (bplay >= This->buflen){ + FIXME("Bad play position. bplay: %d, buflen: %d\n", bplay, This->buflen); + bplay %= This->buflen; } /* return the result */

1 0

Andrew Talbot : ole32: Constify some variables.
by Alexandre Julliard June 29, 2007

June 29, 2007

Module: wine Branch: master Commit: 66b05dde026f0cd368f5ad2bc964dd5465fe7034 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66b05dde026f0cd368f5ad2bc… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Thu Jun 28 21:32:45 2007 +0100 ole32: Constify some variables. --- dlls/ole32/compobj.c | 18 ++++++++---------- dlls/ole32/compobj_private.h | 4 ++-- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 832770e..11b08fe 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -76,8 +76,9 @@ HINSTANCE OLE32_hInstance = 0; /* FIXME: make static ... */ * TODO: Most of these things will have to be made thread-safe. */ -static HRESULT COM_GetRegisteredClassObject(struct apartment *apt, REFCLSID rclsid, DWORD dwClsContext, LPUNKNOWN* ppUnk); -static void COM_RevokeAllClasses(struct apartment *apt); +static HRESULT COM_GetRegisteredClassObject(const struct apartment *apt, REFCLSID rclsid, + DWORD dwClsContext, LPUNKNOWN* ppUnk); +static void COM_RevokeAllClasses(const struct apartment *apt); static HRESULT get_inproc_class_object(APARTMENT *apt, HKEY hkeydll, REFCLSID rclsid, REFIID riid, void **ppv); static APARTMENT *MTA; /* protected by csApartment */ @@ -327,7 +328,7 @@ static APARTMENT *apartment_get_or_create(DWORD model) return apt; } -static inline BOOL apartment_is_model(APARTMENT *apt, DWORD model) +static inline BOOL apartment_is_model(const APARTMENT *apt, DWORD model) { return (apt->multi_threaded == !(model & COINIT_APARTMENTTHREADED)); } @@ -728,7 +729,7 @@ HRESULT apartment_createwindowifneeded(struct apartment *apt) return S_OK; } -HWND apartment_getwindow(struct apartment *apt) +HWND apartment_getwindow(const struct apartment *apt) { assert(!apt->multi_threaded); return apt->win; @@ -1754,11 +1755,8 @@ HRESULT WINAPI CoRegisterPSClsid(REFIID riid, REFCLSID rclsid) * to normal COM usage, this method will increase the * reference count on this object. */ -static HRESULT COM_GetRegisteredClassObject( - struct apartment *apt, - REFCLSID rclsid, - DWORD dwClsContext, - LPUNKNOWN* ppUnk) +static HRESULT COM_GetRegisteredClassObject(const struct apartment *apt, REFCLSID rclsid, + DWORD dwClsContext, LPUNKNOWN* ppUnk) { HRESULT hr = S_FALSE; RegisteredClass *curClass; @@ -1951,7 +1949,7 @@ static void COM_RevokeRegisteredClassObject(RegisteredClass *curClass) HeapFree(GetProcessHeap(), 0, curClass); } -static void COM_RevokeAllClasses(struct apartment *apt) +static void COM_RevokeAllClasses(const struct apartment *apt) { RegisteredClass *curClass, *cursor; diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index a5d8378..c12150a 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -255,13 +255,13 @@ DWORD apartment_addref(struct apartment *apt); DWORD apartment_release(struct apartment *apt); HRESULT apartment_disconnectproxies(struct apartment *apt); void apartment_disconnectobject(struct apartment *apt, void *object); -static inline HRESULT apartment_getoxid(struct apartment *apt, OXID *oxid) +static inline HRESULT apartment_getoxid(const struct apartment *apt, OXID *oxid) { *oxid = apt->oxid; return S_OK; } HRESULT apartment_createwindowifneeded(struct apartment *apt); -HWND apartment_getwindow(struct apartment *apt); +HWND apartment_getwindow(const struct apartment *apt); void apartment_joinmta(void);

1 0

Kai Blin : ws2_32: Return WSAEINVAL for unhandled address families in WSAStringToAddress.
by Alexandre Julliard June 29, 2007

June 29, 2007

Module: wine Branch: master Commit: d89f2b4810ebbef1deb3b4377e5af44d09c6ef74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d89f2b4810ebbef1deb3b4377… Author: Kai Blin <kai.blin(a)gmail.com> Date: Fri Jun 29 12:41:28 2007 +0200 ws2_32: Return WSAEINVAL for unhandled address families in WSAStringToAddress. Prepare for IPv6 support. --- dlls/ws2_32/socket.c | 122 +++++++++++++++++++++++++++------------------- dlls/ws2_32/tests/sock.c | 73 +++++++++++++++++++++++++++ 2 files changed, 144 insertions(+), 51 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 92fd3f6..90fa9b0 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -4429,7 +4429,6 @@ INT WINAPI WSAStringToAddressA(LPSTR AddressString, LPINT lpAddressLength) { INT res=0; - struct in_addr inetaddr; LPSTR workBuffer=NULL,ptrPort; TRACE( "(%s, %x, %p, %p, %p)\n", AddressString, AddressFamily, lpProtocolInfo, @@ -4437,63 +4436,84 @@ INT WINAPI WSAStringToAddressA(LPSTR AddressString, if (!lpAddressLength || !lpAddress) return SOCKET_ERROR; - if (AddressString) + if (!AddressString) { - workBuffer = HeapAlloc( GetProcessHeap(), 0, strlen(AddressString)+1 ); - if (workBuffer) + WSASetLastError(WSAEINVAL); + return SOCKET_ERROR; + } + + if (lpProtocolInfo) + FIXME("ProtocolInfo not implemented.\n"); + + workBuffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + strlen(AddressString) + 1); + if (!workBuffer) + { + WSASetLastError(WSA_NOT_ENOUGH_MEMORY); + return SOCKET_ERROR; + } + + strcpy(workBuffer, AddressString); + + switch(AddressFamily) + { + case AF_INET: + { + struct in_addr inetaddr; + + /* If lpAddressLength is too small, tell caller the size we need */ + if (*lpAddressLength < sizeof(SOCKADDR_IN)) { - strcpy(workBuffer,AddressString); - switch (AddressFamily) - { - case AF_INET: - /* caller wants to know the size of the socket buffer */ - if (*lpAddressLength < sizeof(SOCKADDR_IN)) - { - *lpAddressLength = sizeof(SOCKADDR_IN); - res = WSAEFAULT; - } - else - { - /* caller wants to translate an AddressString into a SOCKADDR */ - if (lpAddress) - { - memset(lpAddress,0,sizeof(SOCKADDR_IN)); - ((LPSOCKADDR_IN)lpAddress)->sin_family = AF_INET; - ptrPort = strchr(workBuffer,':'); - if (ptrPort) - { - ((LPSOCKADDR_IN)lpAddress)->sin_port = (WS_u_short)atoi(ptrPort+1); - *ptrPort = '\0'; - } - else - ((LPSOCKADDR_IN)lpAddress)->sin_port = 0; - if (inet_aton(workBuffer, &inetaddr) > 0) - { - ((LPSOCKADDR_IN)lpAddress)->sin_addr.WS_s_addr = inetaddr.s_addr; - res = 0; - } - else - res = WSAEINVAL; - } - } - if (lpProtocolInfo) - FIXME("(%s, %x, %p, %p, %p) - ProtocolInfo not implemented!\n", - AddressString, AddressFamily, - lpProtocolInfo, lpAddress, lpAddressLength); + *lpAddressLength = sizeof(SOCKADDR_IN); + res = WSAEFAULT; + break; + } + memset(lpAddress, 0, sizeof(SOCKADDR_IN)); - break; - default: - FIXME("(%s, %x, %p, %p, %p) - AddressFamiliy not implemented!\n", - AddressString, AddressFamily, - lpProtocolInfo, lpAddress, lpAddressLength); - } - HeapFree( GetProcessHeap(), 0, workBuffer ); + ((LPSOCKADDR_IN)lpAddress)->sin_family = AF_INET; + + ptrPort = strchr(workBuffer, ':'); + if(ptrPort) + { + ((LPSOCKADDR_IN)lpAddress)->sin_port = (WS_u_short)atoi(ptrPort+1); + *ptrPort = '\0'; } else - res = WSA_NOT_ENOUGH_MEMORY; + { + ((LPSOCKADDR_IN)lpAddress)->sin_port = 0; + } + + if(inet_aton(workBuffer, &inetaddr) > 0) + { + ((LPSOCKADDR_IN)lpAddress)->sin_addr.WS_s_addr = inetaddr.s_addr; + res = 0; + } + else + res = WSAEINVAL; + + break; + } - else + case AF_INET6: + { + /* If lpAddressLength is too small, tell caller the size we need */ + if (*lpAddressLength < sizeof(SOCKADDR_IN6)) + { + *lpAddressLength = sizeof(SOCKADDR_IN6); + res = WSAEFAULT; + break; + } + FIXME("We don't support IPv6 yet.\n"); res = WSAEINVAL; + break; + } + default: + /* According to MSDN, only AF_INET and AF_INET6 are supported. */ + TRACE("Unsupported address family specified: %d.\n", AddressFamily); + res = WSAEINVAL; + } + + HeapFree(GetProcessHeap(), 0, workBuffer); if (!res) return 0; WSASetLastError(res); diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index cc41320..7eb6d38 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -24,6 +24,7 @@ #include <windef.h> #include <winbase.h> #include <winsock2.h> +#include <ws2tcpip.h> #include <mswsock.h> #include "wine/test.h" #include <winnt.h> @@ -1250,6 +1251,7 @@ static void test_WSAStringToAddressA(void) { INT ret, len; SOCKADDR_IN sockaddr; + SOCKADDR_IN6 sockaddr6; int GLE; CHAR address1[] = "0.0.0.0"; @@ -1257,6 +1259,9 @@ static void test_WSAStringToAddressA(void) CHAR address3[] = "255.255.255.255"; CHAR address4[] = "127.127.127.127:65535"; CHAR address5[] = "255.255.255.255:65535"; + CHAR address6[] = "::1"; + CHAR address7[] = "[::1]"; + CHAR address8[] = "[::1]:65535"; len = 0; sockaddr.sin_family = AF_INET; @@ -1308,12 +1313,45 @@ static void test_WSAStringToAddressA(void) ok( (ret == 0 && sockaddr.sin_addr.s_addr == 0xffffffff && sockaddr.sin_port == 0xffff) || (ret == SOCKET_ERROR && (GLE == ERROR_INVALID_PARAMETER || GLE == WSAEINVAL)), "WSAStringToAddressA() failed unexpectedly: %d\n", GLE ); + + len = sizeof(sockaddr6); + memset(&sockaddr6, 0, len); + sockaddr6.sin6_family = AF_INET6; + + ret = WSAStringToAddressA( address6, AF_INET6, NULL, (SOCKADDR*)&sockaddr6, + &len ); + GLE = WSAGetLastError(); + ok( ret == 0 || (ret == SOCKET_ERROR && GLE == WSAEINVAL), + "WSAStringToAddressA() failed for IPv6 address: %d\n", GLE); + + len = sizeof(sockaddr6); + memset(&sockaddr6, 0, len); + sockaddr6.sin6_family = AF_INET6; + + ret = WSAStringToAddressA( address7, AF_INET6, NULL, (SOCKADDR*)&sockaddr6, + &len ); + GLE = WSAGetLastError(); + ok( ret == 0 || (ret == SOCKET_ERROR && GLE == WSAEINVAL), + "WSAStringToAddressA() failed for IPv6 address: %d\n", GLE); + + len = sizeof(sockaddr6); + memset(&sockaddr6, 0, len); + sockaddr6.sin6_family = AF_INET6; + + ret = WSAStringToAddressA( address8, AF_INET6, NULL, (SOCKADDR*)&sockaddr6, + &len ); + GLE = WSAGetLastError(); + ok( (ret == 0 && sockaddr6.sin6_port == 0xffff) || + (ret == SOCKET_ERROR && GLE == WSAEINVAL), + "WSAStringToAddressA() failed for IPv6 address: %d\n", GLE); + } static void test_WSAStringToAddressW(void) { INT ret, len; SOCKADDR_IN sockaddr; + SOCKADDR_IN6 sockaddr6; int GLE; WCHAR address1[] = { '0','.','0','.','0','.','0', 0 }; @@ -1323,6 +1361,9 @@ static void test_WSAStringToAddressW(void) ':', '6', '5', '5', '3', '5', 0 }; WCHAR address5[] = { '2','5','5','.','2','5','5','.','2','5','5','.','2','5','5', ':', '6', '5', '5', '3', '5', 0 }; + WCHAR address6[] = {':',':','1','\0'}; + WCHAR address7[] = {'[',':',':','1',']','\0'}; + WCHAR address8[] = {'[',':',':','1',']',':','6','5','5','3','5','\0'}; len = 0; sockaddr.sin_family = AF_INET; @@ -1373,6 +1414,38 @@ static void test_WSAStringToAddressW(void) ok( (ret == 0 && sockaddr.sin_addr.s_addr == 0xffffffff && sockaddr.sin_port == 0xffff) || (ret == SOCKET_ERROR && (GLE == ERROR_INVALID_PARAMETER || GLE == WSAEINVAL)), "WSAStringToAddressW() failed unexpectedly: %d\n", GLE ); + + len = sizeof(sockaddr6); + memset(&sockaddr6, 0, len); + sockaddr6.sin6_family = AF_INET6; + + ret = WSAStringToAddressW( address6, AF_INET6, NULL, (SOCKADDR*)&sockaddr6, + &len ); + GLE = WSAGetLastError(); + ok( ret == 0 || (ret == SOCKET_ERROR && GLE == WSAEINVAL), + "WSAStringToAddressW() failed for IPv6 address: %d\n", GLE); + + len = sizeof(sockaddr6); + memset(&sockaddr6, 0, len); + sockaddr6.sin6_family = AF_INET6; + + ret = WSAStringToAddressW( address7, AF_INET6, NULL, (SOCKADDR*)&sockaddr6, + &len ); + GLE = WSAGetLastError(); + ok( ret == 0 || (ret == SOCKET_ERROR && GLE == WSAEINVAL), + "WSAStringToAddressW() failed for IPv6 address: %d\n", GLE); + + len = sizeof(sockaddr6); + memset(&sockaddr6, 0, len); + sockaddr6.sin6_family = AF_INET6; + + ret = WSAStringToAddressW( address8, AF_INET6, NULL, (SOCKADDR*)&sockaddr6, + &len ); + GLE = WSAGetLastError(); + ok( (ret == 0 && sockaddr6.sin6_port == 0xffff) || + (ret == SOCKET_ERROR && GLE == WSAEINVAL), + "WSAStringToAddressW() failed for IPv6 address: %d\n", GLE); + } static VOID WINAPI SelectReadThread(select_thread_params *par)

1 0

Misha Koshelev : shell32/tests: Fix tests of IShellLinkA_SetPath to conform on both Windows 98 and XP.
by Alexandre Julliard June 29, 2007

June 29, 2007

Module: wine Branch: master Commit: 240648534fc7880de49bd40a1a7e39518d838bad URL: http://source.winehq.org/git/wine.git/?a=commit;h=240648534fc7880de49bd40a1… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Thu Jun 28 19:56:30 2007 -0500 shell32/tests: Fix tests of IShellLinkA_SetPath to conform on both Windows 98 and XP. --- dlls/shell32/tests/shelllink.c | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index 57e1d7c..237ce8f 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -158,9 +158,10 @@ static void test_get_set(void) ok(SUCCEEDED(r), "GetPath failed (0x%08x)\n", r); ok(*buffer=='\0', "GetPath returned '%s'\n", buffer); + /* Win98 returns S_FALSE, but WinXP returns S_OK */ str="c:\\nonexistent\\file"; r = IShellLinkA_SetPath(sl, str); - ok(r==S_FALSE, "SetPath failed (0x%08x)\n", r); + ok(r==S_FALSE || r==S_OK, "SetPath failed (0x%08x)\n", r); strcpy(buffer,"garbage"); r = IShellLinkA_GetPath(sl, buffer, sizeof(buffer), NULL, SLGP_RAWPATH); @@ -211,28 +212,28 @@ static void test_get_set(void) ok(lstrcmpi(buffer, mypath)==0, "GetPath returned '%s'\n", buffer); } - /* test path with quotes */ + /* test path with quotes (Win98 IShellLinkA_SetPath returns S_FALSE, WinXP returns S_OK) */ r = IShellLinkA_SetPath(sl, "\"c:\\nonexistent\\file\""); - ok(r==S_FALSE, "SetPath failed (0x%08x)\n", r); + ok(r==S_FALSE || r == S_OK, "SetPath failed (0x%08x)\n", r); r = IShellLinkA_GetPath(sl, buffer, sizeof(buffer), NULL, SLGP_RAWPATH); ok(r==S_OK, "GetPath failed (0x%08x)\n", r); ok(!lstrcmp(buffer, "C:\\nonexistent\\file"), "case doesn't match\n"); r = IShellLinkA_SetPath(sl, "\"c:\\foo"); - ok(r==S_FALSE, "SetPath failed (0x%08x)\n", r); + ok(r==S_FALSE || r == S_OK, "SetPath failed (0x%08x)\n", r); r = IShellLinkA_SetPath(sl, "\"\"c:\\foo"); - ok(r==S_FALSE, "SetPath failed (0x%08x)\n", r); + ok(r==S_FALSE || r == S_OK, "SetPath failed (0x%08x)\n", r); r = IShellLinkA_SetPath(sl, "c:\\foo\""); - ok(r==S_FALSE, "SetPath failed (0x%08x)\n", r); + ok(r==S_FALSE || r == S_OK, "SetPath failed (0x%08x)\n", r); r = IShellLinkA_SetPath(sl, "\"\"c:\\foo\""); - ok(r==S_FALSE, "SetPath failed (0x%08x)\n", r); + ok(r==S_FALSE || r == S_OK, "SetPath failed (0x%08x)\n", r); r = IShellLinkA_SetPath(sl, "\"\"c:\\foo\"\""); - ok(r==S_FALSE, "SetPath failed (0x%08x)\n", r); + ok(r==S_FALSE || r == S_OK, "SetPath failed (0x%08x)\n", r); /* Test Getting / Setting the arguments */ strcpy(buffer,"garbage");

1 0

Misha Koshelev : shell32: Fix shelllink creation to non-executable files and remove unnecessary code .
by Alexandre Julliard June 29, 2007

June 29, 2007

Module: wine Branch: master Commit: 0d750e3282c88af6daae433874554c6e2a616a54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d750e3282c88af6daae43387… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Thu Jun 28 20:00:30 2007 -0500 shell32: Fix shelllink creation to non-executable files and remove unnecessary code. --- dlls/shell32/shelllink.c | 19 +------------------ dlls/shell32/tests/shelllink.c | 2 +- 2 files changed, 2 insertions(+), 19 deletions(-) diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c index 5f99c9d..62fc3e5 100644 --- a/dlls/shell32/shelllink.c +++ b/dlls/shell32/shelllink.c @@ -1048,10 +1048,7 @@ static HRESULT WINAPI IPersistStream_fnSave( IStream* stm, BOOL fClearDirty) { - static const WCHAR wOpen[] = {'o','p','e','n',0}; - LINK_HEADER header; - WCHAR exePath[MAX_PATH]; ULONG count; DWORD zero; HRESULT r; @@ -1060,20 +1057,6 @@ static HRESULT WINAPI IPersistStream_fnSave( TRACE("%p %p %x\n", This, stm, fClearDirty); - *exePath = '\0'; - - if (This->sPath) - { - SHELL_FindExecutable(NULL, This->sPath, wOpen, exePath, MAX_PATH, - NULL, NULL, NULL, NULL); - /* - * windows can create lnk files to executables that do not exist yet - * so if the executable does not exist the just trust the path they - * gave us - */ - if (!*exePath) lstrcpyW(exePath,This->sPath); - } - memset(&header, 0, sizeof(header)); header.dwSize = sizeof(header); header.fStartup = This->iShowCmd; @@ -1125,7 +1108,7 @@ static HRESULT WINAPI IPersistStream_fnSave( } if( This->sPath ) - Stream_WriteLocationInfo( stm, exePath, &This->volume ); + Stream_WriteLocationInfo( stm, This->sPath, &This->volume ); if( This->sDescription ) r = Stream_WriteString( stm, This->sDescription ); diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index 237ce8f..8db88bb 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -586,7 +586,7 @@ static void test_load_save(void) desc.icon_id=0; desc.hotkey=0x1234; create_lnk(lnkfile, &desc, 0); - check_lnk(lnkfile, &desc, 0x4); + check_lnk(lnkfile, &desc, 0x0); r = DeleteFileA(mypath); ok(r, "failed to delete file %s (%d)\n", mypath, GetLastError());

1 0

Misha Koshelev : shell32/tests: Allow CoCreateInstance to return E_NOINTERFACE to pass on Win98; add skips and display return values.
by Alexandre Julliard June 29, 2007

June 29, 2007

Module: wine Branch: master Commit: de774710d6f61d07e9a46dc5aaae84c3f920bf72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de774710d6f61d07e9a46dc5a… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Thu Jun 28 19:56:24 2007 -0500 shell32/tests: Allow CoCreateInstance to return E_NOINTERFACE to pass on Win98; add skips and display return values. --- dlls/shell32/tests/shelllink.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index dc139e4..57e1d7c 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -624,15 +624,21 @@ static void test_datalink(void) r = CoCreateInstance( &CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, &IID_IShellLinkW, (LPVOID*)&sl ); - ok( r == S_OK, "no shelllink\n"); + ok( r == S_OK || r == E_NOINTERFACE, "CoCreateInstance failed (0x%08x)\n", r); if (!sl) + { + skip("no shelllink\n"); return; + } r = IShellLinkW_QueryInterface( sl, &_IID_IShellLinkDataList, (LPVOID*) &dl ); - ok(r == S_OK, "no datalink interface\n"); + ok(r == S_OK, "IShellLinkW_QueryInterface failed (0x%08x)\n", r); if (!dl) + { + skip("no datalink interface\n"); return; + } flags = 0; r = dl->lpVtbl->GetFlags( dl, &flags );

1 0