December 2013 - Wine-commits

Austin English : wine.inf: Bump XP 64-bit to service pack 2.
by Alexandre Julliard 30 Dec '13

30 Dec '13

Module: wine Branch: master Commit: 4af2ca4c39f86111494ebcf39e1fd4285cbfd667 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4af2ca4c39f86111494ebcf39… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Dec 27 14:12:37 2013 -0600 wine.inf: Bump XP 64-bit to service pack 2. --- loader/wine.inf.in | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 1cefe01..ac6c697 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -3030,12 +3030,12 @@ HKLM,%Control%\Session Manager\Environment,"OS",2,"Windows_NT" [VersionInfo.ntamd64] HKLM,%CurrentVersionNT%,"CurrentVersion",2,"5.2" -HKLM,%CurrentVersionNT%,"CSDVersion",2,"Service Pack 1" +HKLM,%CurrentVersionNT%,"CSDVersion",2,"Service Pack 2" HKLM,%CurrentVersionNT%,"CurrentBuildNumber",2,"3790" HKLM,%CurrentVersionNT%,"CurrentType",2,"Uniprocessor Free" HKLM,%CurrentVersionNT%,"ProductName",2,"Microsoft Windows XP" HKLM,%Control%\ProductOptions,"ProductType",2,"WinNT" -HKLM,%Control%\Windows,"CSDVersion",0x10003,0x100 +HKLM,%Control%\Windows,"CSDVersion",0x10003,0x200 HKLM,%Control%\Session Manager\Environment,"OS",2,"Windows_NT" [Wow64]

1 0

Bruno Jesus : ws2_32: Add support to print IPX socket address.
by Alexandre Julliard 30 Dec '13

30 Dec '13

Module: wine Branch: master Commit: 38a3a574f37b7b77b5566a8498040b475252d902 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38a3a574f37b7b77b5566a849… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri Dec 27 18:28:05 2013 -0200 ws2_32: Add support to print IPX socket address. --- dlls/ws2_32/socket.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 8f9c491..1d79b74 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -292,6 +292,18 @@ static inline const char *debugstr_sockaddr( const struct WS_sockaddr *a ) return wine_dbg_sprintf("{ family AF_INET6, address %s, port %d }", p, ntohs(sin->sin6_port)); } + case WS_AF_IPX: + { + int i; + char netnum[16], nodenum[16]; + struct WS_sockaddr_ipx *sin = (struct WS_sockaddr_ipx *)a; + + for (i = 0;i < 4; i++) sprintf(netnum + i * 2, "%02X", (unsigned char) sin->sa_netnum[i]); + for (i = 0;i < 6; i++) sprintf(nodenum + i * 2, "%02X", (unsigned char) sin->sa_nodenum[i]); + + return wine_dbg_sprintf("{ family AF_IPX, address %s.%s, ipx socket %d }", + netnum, nodenum, sin->sa_socket); + } case WS_AF_IRDA: { DWORD addr;

1 0

Bruno Jesus : ws2_32: Add support to check if an IPX socket is bound.
by Alexandre Julliard 30 Dec '13

30 Dec '13

Module: wine Branch: master Commit: ae728cfa274e3517f38a9fe21c9b738c43b1ad73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae728cfa274e3517f38a9fe21… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri Dec 27 18:32:29 2013 -0200 ws2_32: Add support to check if an IPX socket is bound. --- dlls/ws2_32/socket.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 1d79b74..36f2ac4 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1427,8 +1427,11 @@ static BOOL is_sockaddr_bound(const struct sockaddr *uaddr, int uaddrlen) { #ifdef HAS_IPX case AF_IPX: - FIXME("don't know how to tell if IPX socket is bound, assuming it is!\n"); - return TRUE; + { + static const struct sockaddr_ipx emptyAddr; + struct sockaddr_ipx *ipx = (struct sockaddr_ipx*) uaddr; + return ipx->sipx_port || ipx->sipx_network || memcmp(&ipx->sipx_node, &emptyAddr.sipx_node, sizeof(emptyAddr.sipx_node)); + } #endif case AF_INET6: {

1 0

Frédéric Delanoy : qedit/tests: Constify some character strings.
by Alexandre Julliard 30 Dec '13

30 Dec '13

Module: wine Branch: master Commit: 7d8f8dbad925df6236283ec2d1882e7d196b9f5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d8f8dbad925df6236283ec2d… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Dec 28 14:10:44 2013 +0100 qedit/tests: Constify some character strings. --- dlls/qedit/tests/mediadet.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/qedit/tests/mediadet.c b/dlls/qedit/tests/mediadet.c index 42ac7dc..c488b37 100644 --- a/dlls/qedit/tests/mediadet.c +++ b/dlls/qedit/tests/mediadet.c @@ -76,8 +76,8 @@ static WCHAR test_sound_avi_filename[MAX_PATH]; static BOOL unpack_avi_file(int id, WCHAR name[MAX_PATH]) { static WCHAR temp_path[MAX_PATH]; - static WCHAR prefix[] = {'D','E','S',0}; - static WCHAR avi[] = {'a','v','i',0}; + static const WCHAR prefix[] = {'D','E','S',0}; + static const WCHAR avi[] = {'a','v','i',0}; HRSRC res; HGLOBAL data; char *mem;

1 0

Frédéric Delanoy : scrrun/tests: Constify a character string.
by Alexandre Julliard 30 Dec '13

30 Dec '13

Module: wine Branch: master Commit: fe7f9e5fbb80f6505a58c489a9005ee56595b45d URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe7f9e5fbb80f6505a58c489a… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Dec 28 14:10:45 2013 +0100 scrrun/tests: Constify a character string. --- dlls/scrrun/tests/filesystem.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 630de1b..ba0ff37 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -134,7 +134,7 @@ static void test_createfolder(void) static void test_textstream(void) { - static WCHAR testfileW[] = {'t','e','s','t','f','i','l','e','.','t','x','t',0}; + static const WCHAR testfileW[] = {'t','e','s','t','f','i','l','e','.','t','x','t',0}; ITextStream *stream; VARIANT_BOOL b; HANDLE file;

1 0

Frédéric Delanoy : secur32/tests: Constify a character string.
by Alexandre Julliard 30 Dec '13

30 Dec '13

Module: wine Branch: master Commit: 9ad67a9a8ea185942f7962008d906adc0d0871cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ad67a9a8ea185942f7962008… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Dec 28 14:10:46 2013 +0100 secur32/tests: Constify a character string. --- dlls/secur32/tests/ntlm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/secur32/tests/ntlm.c b/dlls/secur32/tests/ntlm.c index f01fa12..1e865ad 100644 --- a/dlls/secur32/tests/ntlm.c +++ b/dlls/secur32/tests/ntlm.c @@ -113,7 +113,7 @@ static BYTE message_binary[] = {0x48, 0x65, 0x6c, 0x6c, 0x6f, 0x2c, 0x20, 0x77, 0x6f, 0x72, 0x6c, 0x64, 0x21}; -static char message[] = "Hello, world!"; +static const char message[] = "Hello, world!"; static char message_header[] = "Header Test";

1 0

Frédéric Delanoy : shdocvw/tests: Constify some character strings.
by Alexandre Julliard 30 Dec '13

30 Dec '13

Module: wine Branch: master Commit: 844ea00392883f1913fe7254dd5a1c78924fc50f URL: http://source.winehq.org/git/wine.git/?a=commit;h=844ea00392883f1913fe7254d… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Dec 28 14:10:47 2013 +0100 shdocvw/tests: Constify some character strings. --- dlls/shdocvw/tests/shdocvw.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/shdocvw/tests/shdocvw.c b/dlls/shdocvw/tests/shdocvw.c index ad89c4a..7b4eccf 100644 --- a/dlls/shdocvw/tests/shdocvw.c +++ b/dlls/shdocvw/tests/shdocvw.c @@ -36,13 +36,13 @@ static HRESULT (WINAPI *pURLSubRegQueryA)(LPCSTR, LPCSTR, DWORD, LPVOID, DWORD, static DWORD (WINAPI *pParseURLFromOutsideSourceA)(LPCSTR, LPSTR, LPDWORD, LPDWORD); static DWORD (WINAPI *pParseURLFromOutsideSourceW)(LPCWSTR, LPWSTR, LPDWORD, LPDWORD); -static CHAR appdata[] = "AppData"; -static CHAR common_appdata[] = "Common AppData"; -static CHAR default_page_url[] = "Default_Page_URL"; -static CHAR does_not_exist[] = "does_not_exist"; -static CHAR regpath_iemain[] = "Software\\Microsoft\\Internet Explorer\\Main"; -static CHAR regpath_shellfolders[] = "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders"; -static CHAR start_page[] = "Start Page"; +static const char appdata[] = "AppData"; +static const char common_appdata[] = "Common AppData"; +static const char default_page_url[] = "Default_Page_URL"; +static const char does_not_exist[] = "does_not_exist"; +static const char regpath_iemain[] = "Software\\Microsoft\\Internet Explorer\\Main"; +static const char regpath_shellfolders[] = "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders"; +static const char start_page[] = "Start Page"; /* ################ */

1 0

Frédéric Delanoy : shell32/tests: Constify some character strings.
by Alexandre Julliard 30 Dec '13

30 Dec '13

Module: wine Branch: master Commit: 7b9058c87a3538dd0cc2d227b401905ba81c3edc URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b9058c87a3538dd0cc2d227b… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Dec 28 14:10:48 2013 +0100 shell32/tests: Constify some character strings. --- dlls/shell32/tests/shlfolder.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 0992924..f692837 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -1970,8 +1970,8 @@ static void test_SHGetFolderPathAndSubDirA(void) BOOL delret; DWORD dwret; int i; - static char wine[] = "wine"; - static char winetemp[] = "wine\\temp"; + static const char wine[] = "wine"; + static const char winetemp[] = "wine\\temp"; static char appdata[MAX_PATH]; static char testpath[MAX_PATH]; static char toolongpath[MAX_PATH+1];

1 0

Frédéric Delanoy : shlwapi/tests: Fix StrChrNW prototype.
by Alexandre Julliard 30 Dec '13

30 Dec '13

Module: wine Branch: master Commit: bdce3b9994463e8df5eb2e9af8d1b724609c35a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdce3b9994463e8df5eb2e9af… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Dec 28 14:14:57 2013 +0100 shlwapi/tests: Fix StrChrNW prototype. --- dlls/shlwapi/tests/string.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shlwapi/tests/string.c b/dlls/shlwapi/tests/string.c index d45b2a7..12f8bfc 100644 --- a/dlls/shlwapi/tests/string.c +++ b/dlls/shlwapi/tests/string.c @@ -64,7 +64,7 @@ static LPWSTR (WINAPI *pStrStrNW)(LPCWSTR,LPCWSTR,UINT); static LPWSTR (WINAPI *pStrStrNIW)(LPCWSTR,LPCWSTR,UINT); static INT (WINAPIV *pwnsprintfA)(LPSTR,INT,LPCSTR, ...); static INT (WINAPIV *pwnsprintfW)(LPWSTR,INT,LPCWSTR, ...); -static LPWSTR (WINAPI *pStrChrNW)(LPWSTR,WCHAR,UINT); +static LPWSTR (WINAPI *pStrChrNW)(LPCWSTR,WCHAR,UINT); static BOOL (WINAPI *pStrToInt64ExA)(LPCSTR,DWORD,LONGLONG*); static BOOL (WINAPI *pStrToInt64ExW)(LPCWSTR,DWORD,LONGLONG*);

1 0

Frédéric Delanoy : shlwapi/tests: Constify some character strings.
by Alexandre Julliard 30 Dec '13

30 Dec '13

Module: wine Branch: master Commit: 36e80042915e98fef1f4fae063a2cfbe968be5e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36e80042915e98fef1f4fae06… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Dec 28 14:14:58 2013 +0100 shlwapi/tests: Constify some character strings. --- dlls/shlwapi/tests/shreg.c | 4 ++-- dlls/shlwapi/tests/string.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/shlwapi/tests/shreg.c b/dlls/shlwapi/tests/shreg.c index 2b6cb1c..dfc8c3e 100644 --- a/dlls/shlwapi/tests/shreg.c +++ b/dlls/shlwapi/tests/shreg.c @@ -39,8 +39,8 @@ static DWORD (WINAPI *pSHRegGetPathA)(HKEY,LPCSTR,LPCSTR,LPSTR,DWORD); static LSTATUS (WINAPI *pSHRegGetValueA)(HKEY,LPCSTR,LPCSTR,SRRF,LPDWORD,LPVOID,LPDWORD); static LSTATUS (WINAPI *pSHRegCreateUSKeyW)(LPCWSTR,REGSAM,HUSKEY,PHUSKEY,DWORD); -static char sTestpath1[] = "%LONGSYSTEMVAR%\\subdir1"; -static char sTestpath2[] = "%FOO%\\subdir1"; +static const char sTestpath1[] = "%LONGSYSTEMVAR%\\subdir1"; +static const char sTestpath2[] = "%FOO%\\subdir1"; static const char * sEnvvar1 = "bar"; static const char * sEnvvar2 = "ImARatherLongButIndeedNeededString"; diff --git a/dlls/shlwapi/tests/string.c b/dlls/shlwapi/tests/string.c index 12f8bfc..e5f0283 100644 --- a/dlls/shlwapi/tests/string.c +++ b/dlls/shlwapi/tests/string.c @@ -433,7 +433,7 @@ static void test_StrCpyW(void) static void test_StrChrNW(void) { - static WCHAR string[] = {'T','e','s','t','i','n','g',' ','S','t','r','i','n','g',0}; + static const WCHAR string[] = {'T','e','s','t','i','n','g',' ','S','t','r','i','n','g',0}; LPWSTR p; if (!pStrChrNW)

1 0