December 2013 - Wine-commits

Alexandre Julliard : msvcp: Don't forward the mbtowc functions to msvcrt.
by Alexandre Julliard 27 Dec '13

27 Dec '13

Module: wine Branch: master Commit: db0a6fcaa5ef8529a66273bc7f43204de11a0cff URL: http://source.winehq.org/git/wine.git/?a=commit;h=db0a6fcaa5ef8529a66273bc7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 27 12:22:52 2013 +0100 msvcp: Don't forward the mbtowc functions to msvcrt. --- dlls/msvcp71/msvcp71.spec | 14 +++--- dlls/msvcp90/locale.c | 102 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 109 insertions(+), 7 deletions(-) diff --git a/dlls/msvcp71/msvcp71.spec b/dlls/msvcp71/msvcp71.spec index 5acc18b..8e21fb7 100644 --- a/dlls/msvcp71/msvcp71.spec +++ b/dlls/msvcp71/msvcp71.spec @@ -5157,13 +5157,13 @@ # extern _Xbig # extern _Zero @ stub __Wcrtomb_lk -@ cdecl btowc(long) msvcrt.btowc -@ cdecl mbrlen(ptr long ptr) msvcrt.mbrlen -@ cdecl mbrtowc(ptr str long ptr) msvcrt.mbrtowc -@ cdecl mbsrtowcs(ptr ptr long ptr) msvcrt.mbsrtowcs +@ cdecl btowc(long) +@ cdecl mbrlen(ptr long ptr) +@ cdecl mbrtowc(ptr str long ptr) +@ cdecl mbsrtowcs(ptr ptr long ptr) @ cdecl towctrans(long long) -@ cdecl wcrtomb(ptr long ptr) msvcrt.wcrtomb -@ cdecl wcsrtombs(ptr ptr long ptr) msvcrt.wcsrtombs -@ cdecl wctob(long) msvcrt.wctob +@ cdecl wcrtomb(ptr long ptr) +@ cdecl wcsrtombs(ptr ptr long ptr) +@ cdecl wctob(long) @ cdecl wctrans(str) @ cdecl wctype(str) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 08cc893..9b84b63 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -26,6 +26,7 @@ #include "limits.h" #include "math.h" #include "stdio.h" +#include "wchar.h" #include "wctype.h" #include "time.h" @@ -9487,6 +9488,107 @@ wint_t __cdecl towctrans(wint_t c, wctrans_t category) return towlower(c); } +/* btowc */ +wint_t __cdecl btowc(int c) +{ + wchar_t ret; + int state = 0; + char ch = c; + + if (c == EOF || _Mbrtowc( &ret, &ch, 1, &state, NULL ) != 1) return WEOF; + return ret; +} + +/* mbrlen */ +size_t __cdecl mbrlen(const char *str, size_t n, mbstate_t *state) +{ + static int local_state; + + if (!state) state = &local_state; + return _Mbrtowc( NULL, str, n, state, NULL ); +} + +/* mbrtowc */ +size_t __cdecl mbrtowc(wchar_t *dst, const char *str, size_t n, mbstate_t *state) +{ + static int local_state; + + if (!state) state = &local_state; + return _Mbrtowc( dst, str, n, state, NULL ); +} + +/* mbsrtowcs */ +size_t __cdecl mbsrtowcs(wchar_t *dst, const char **pstr, size_t n, mbstate_t *state) +{ + static int local_state; + size_t ret = 0; + wchar_t wc; + const char *src; + + if (!pstr) + { + *_errno() = EINVAL; + _invalid_parameter( NULL, NULL, NULL, 0, 0 ); + } + src = *pstr; + if (!state) state = &local_state; + + while (!dst || n > ret) + { + int len = _Mbrtowc( &wc, src, 2, state, NULL ); + if (len < 0) return -1; + if (!len) break; + if (dst) dst[ret] = wc; + ret++; + if (!wc) break; + src += len; + } + return ret; +} + +/* wctob */ +int __cdecl wctob(wint_t wc) +{ + char ret[MB_LEN_MAX]; + + if (wc == WEOF || _Wcrtomb( ret, wc, NULL, NULL ) != -1) return EOF; + return ret[0]; +} + +/* wcrtomb */ +size_t __cdecl wcrtomb(char *dst, wchar_t wc, mbstate_t *state) +{ + return _Wcrtomb( dst, wc, state, NULL ); +} + +/* wcsrtombs */ +size_t __cdecl wcsrtombs(char *dst, const wchar_t **pstr, size_t n, mbstate_t *state) +{ + const wchar_t *src; + char buffer[MB_LEN_MAX]; + size_t ret = 0; + + if (!pstr) + { + *_errno() = EINVAL; + _invalid_parameter( NULL, NULL, NULL, 0, 0 ); + } + src = *pstr; + + while (!dst || n > ret) + { + int len = _Wcrtomb( buffer, *src, state, NULL ); + if (len <= 0) return -1; + if (n < ret + len) break; + memcpy( dst + ret, buffer, len ); + ret += len; + if (!buffer[0]) break; + src++; + } + return ret; +} + + DEFINE_RTTI_DATA0(locale_facet, 0, ".?AVfacet(a)locale@std@@") DEFINE_RTTI_DATA1(collate_char, 0, &locale_facet_rtti_base_descriptor, ".?AV?$collate(a)D@std@@") DEFINE_RTTI_DATA1(collate_wchar, 0, &locale_facet_rtti_base_descriptor, ".?AV?$collate(a)_W@std@@")

1 0

Alexandre Julliard : msvcp: Don't assume that msvcrt is imported.
by Alexandre Julliard 27 Dec '13

27 Dec '13

Module: wine Branch: master Commit: 263a1448f96816120011b5a5855929e24b7a4818 URL: http://source.winehq.org/git/wine.git/?a=commit;h=263a1448f96816120011b5a58… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 26 23:43:03 2013 +0100 msvcp: Don't assume that msvcrt is imported. --- dlls/msvcp90/locale.c | 5 ++++- dlls/msvcp90/msvcp_main.c | 7 ++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 9b84b63..f9d8e1b 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -1410,8 +1410,11 @@ void __thiscall ctype_char__Tidy(ctype_char *this) /* ?classic_table@?$ctype(a)D@std@@KAPEBFXZ */ const short* __cdecl ctype_char_classic_table(void) { + ctype_char *ctype; + TRACE("()\n"); - return &((short*)GetProcAddress(GetModuleHandleA("msvcrt.dll"), "_ctype"))[1]; + ctype = ctype_char_use_facet( locale_classic() ); + return ctype->ctype.table; } /* ??0?$ctype(a)D@std@@QAE(a)ABV_Locinfo@1(a)I@Z */ diff --git a/dlls/msvcp90/msvcp_main.c b/dlls/msvcp90/msvcp_main.c index 848d5bb..489aacb 100644 --- a/dlls/msvcp90/msvcp_main.c +++ b/dlls/msvcp90/msvcp_main.c @@ -60,9 +60,14 @@ void* (__cdecl *MSVCRT_operator_new)(MSVCP_size_t); void (__cdecl *MSVCRT_operator_delete)(void*); void* (__cdecl *MSVCRT_set_new_handler)(void*); +#define VERSION_STRING(ver) #ver +#define MSVCRT_NAME(ver) "msvcr" VERSION_STRING(ver) ".dll" + static void init_cxx_funcs(void) { - HMODULE hmod = GetModuleHandleA("msvcrt.dll"); + HMODULE hmod = GetModuleHandleA( MSVCRT_NAME(_MSVCP_VER) ); + + if (!hmod) FIXME( "%s not loaded\n", MSVCRT_NAME(_MSVCP_VER) ); if (sizeof(void *) > sizeof(int)) /* 64-bit has different names */ {

1 0

Bruno Jesus : ws2_32: Do not convert EAI_xxx return in case of success.
by Alexandre Julliard 27 Dec '13

27 Dec '13

Module: wine Branch: master Commit: fc5884c23296c0f121442d0832b0187074e95a10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc5884c23296c0f121442d083… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Dec 26 17:57:05 2013 -0200 ws2_32: Do not convert EAI_xxx return in case of success. --- dlls/ws2_32/socket.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index cafe103..39912bf 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -5365,6 +5365,8 @@ static int convert_aiflag_u2w(int unixflags) { static int convert_eai_u2w(int unixret) { int i; + if (!unixret) return 0; + for (i=0;ws_eai_map[i][0];i++) if (ws_eai_map[i][1] == unixret) return ws_eai_map[i][0];

1 0

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

27 Dec '13

Module: wine Branch: master Commit: 1d36b93f7e484d8e6bc15d6acdbad12af5ecd4e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d36b93f7e484d8e6bc15d6ac… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Dec 26 22:49:27 2013 +0100 msi/tests: Constify some character strings. --- dlls/msi/tests/action.c | 2 +- dlls/msi/tests/automation.c | 40 ++++++++++++++++++++-------------------- dlls/msi/tests/install.c | 6 +++--- dlls/msi/tests/msi.c | 2 +- dlls/msi/tests/package.c | 6 +++--- dlls/msi/tests/patch.c | 2 +- 6 files changed, 29 insertions(+), 29 deletions(-) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 8386038..ee750b0 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -5547,7 +5547,7 @@ error: static void test_publish_components(void) { - static char keypath[] = + static const char keypath[] = "Software\\Microsoft\\Installer\\Components\\0CBCFA296AC907244845745CEEB2F8AA"; UINT r; diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index 550afc2..c7cc411 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -452,7 +452,7 @@ static CHAR string1[MAX_PATH], string2[MAX_PATH]; ok(0, format, extra, string1, aString); \ /* exception checker */ -static WCHAR szSource[] = {'M','s','i',' ','A','P','I',' ','E','r','r','o','r',0}; +static const WCHAR szSource[] = {'M','s','i',' ','A','P','I',' ','E','r','r','o','r',0}; #define ok_exception(hr, szDescription) \ if (hr == DISP_E_EXCEPTION) \ @@ -595,7 +595,7 @@ static void test_dispid(void) static void test_dispatch(void) { static WCHAR szOpenPackage[] = { 'O','p','e','n','P','a','c','k','a','g','e',0 }; - static WCHAR szOpenPackageException[] = {'O','p','e','n','P','a','c','k','a','g','e',',','P','a','c','k','a','g','e','P','a','t','h',',','O','p','t','i','o','n','s',0}; + static const WCHAR szOpenPackageException[] = {'O','p','e','n','P','a','c','k','a','g','e',',','P','a','c','k','a','g','e','P','a','t','h',',','O','p','t','i','o','n','s',0}; static WCHAR szProductState[] = { 'P','r','o','d','u','c','t','S','t','a','t','e',0 }; HRESULT hr; DISPID dispid; @@ -1688,11 +1688,11 @@ static void test_SummaryInfo(IDispatch *pSummaryInfo, const msi_summary_info *in static void test_Database(IDispatch *pDatabase, BOOL readonly) { - static WCHAR szSql[] = { 'S','E','L','E','C','T',' ','`','F','e','a','t','u','r','e','`',' ','F','R','O','M',' ','`','F','e','a','t','u','r','e','`',' ','W','H','E','R','E',' ','`','F','e','a','t','u','r','e','_','P','a','r','e','n','t','`','=','\'','O','n','e','\'',0 }; - static WCHAR szThree[] = { 'T','h','r','e','e',0 }; - static WCHAR szTwo[] = { 'T','w','o',0 }; - static WCHAR szStringDataField[] = { 'S','t','r','i','n','g','D','a','t','a',',','F','i','e','l','d',0 }; - static WCHAR szModifyModeRecord[] = { 'M','o','d','i','f','y',',','M','o','d','e',',','R','e','c','o','r','d',0 }; + static const WCHAR szSql[] = { 'S','E','L','E','C','T',' ','`','F','e','a','t','u','r','e','`',' ','F','R','O','M',' ','`','F','e','a','t','u','r','e','`',' ','W','H','E','R','E',' ','`','F','e','a','t','u','r','e','_','P','a','r','e','n','t','`','=','\'','O','n','e','\'',0 }; + static const WCHAR szThree[] = { 'T','h','r','e','e',0 }; + static const WCHAR szTwo[] = { 'T','w','o',0 }; + static const WCHAR szStringDataField[] = { 'S','t','r','i','n','g','D','a','t','a',',','F','i','e','l','d',0 }; + static const WCHAR szModifyModeRecord[] = { 'M','o','d','i','f','y',',','M','o','d','e',',','R','e','c','o','r','d',0 }; IDispatch *pView = NULL, *pSummaryInfo = NULL; HRESULT hr; @@ -1801,17 +1801,17 @@ static void test_Database(IDispatch *pDatabase, BOOL readonly) static void test_Session(IDispatch *pSession) { - static WCHAR szProductName[] = { 'P','r','o','d','u','c','t','N','a','m','e',0 }; - static WCHAR szOne[] = { 'O','n','e',0 }; - static WCHAR szOneStateFalse[] = { '!','O','n','e','>','0',0 }; - static WCHAR szOneStateTrue[] = { '!','O','n','e','=','-','1',0 }; - static WCHAR szOneActionFalse[] = { '$','O','n','e','=','-','1',0 }; - static WCHAR szOneActionTrue[] = { '$','O','n','e','>','0',0 }; - static WCHAR szCostInitialize[] = { 'C','o','s','t','I','n','i','t','i','a','l','i','z','e',0 }; - static WCHAR szEmpty[] = { 0 }; - static WCHAR szEquals[] = { '=',0 }; - static WCHAR szPropertyName[] = { 'P','r','o','p','e','r','t','y',',','N','a','m','e',0 }; - static WCHAR szModeFlag[] = { 'M','o','d','e',',','F','l','a','g',0 }; + static const WCHAR szProductName[] = { 'P','r','o','d','u','c','t','N','a','m','e',0 }; + static const WCHAR szOne[] = { 'O','n','e',0 }; + static const WCHAR szOneStateFalse[] = { '!','O','n','e','>','0',0 }; + static const WCHAR szOneStateTrue[] = { '!','O','n','e','=','-','1',0 }; + static const WCHAR szOneActionFalse[] = { '$','O','n','e','=','-','1',0 }; + static const WCHAR szOneActionTrue[] = { '$','O','n','e','>','0',0 }; + static const WCHAR szCostInitialize[] = { 'C','o','s','t','I','n','i','t','i','a','l','i','z','e',0 }; + static const WCHAR szEmpty[] = { 0 }; + static const WCHAR szEquals[] = { '=',0 }; + static const WCHAR szPropertyName[] = { 'P','r','o','p','e','r','t','y',',','N','a','m','e',0 }; + static const WCHAR szModeFlag[] = { 'M','o','d','e',',','F','l','a','g',0 }; WCHAR stringw[MAX_PATH]; CHAR string[MAX_PATH]; UINT len; @@ -2547,8 +2547,8 @@ static void test_Installer_InstallProduct(void) static void test_Installer(void) { - static WCHAR szCreateRecordException[] = { 'C','r','e','a','t','e','R','e','c','o','r','d',',','C','o','u','n','t',0 }; - static WCHAR szIntegerDataException[] = { 'I','n','t','e','g','e','r','D','a','t','a',',','F','i','e','l','d',0 }; + static const WCHAR szCreateRecordException[] = { 'C','r','e','a','t','e','R','e','c','o','r','d',',','C','o','u','n','t',0 }; + static const WCHAR szIntegerDataException[] = { 'I','n','t','e','g','e','r','D','a','t','a',',','F','i','e','l','d',0 }; WCHAR szPath[MAX_PATH]; HRESULT hr; IDispatch *pSession = NULL, *pDatabase = NULL, *pRecord = NULL, *pStringList = NULL; diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 24f87eb..45c6a5f 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -4806,7 +4806,7 @@ error: static void test_installed_prop(void) { - static char prodcode[] = "{7df88a48-996f-4ec8-a022-bf956f9b2cbb}"; + static const char prodcode[] = "{7df88a48-996f-4ec8-a022-bf956f9b2cbb}"; UINT r; if (is_process_limited()) @@ -4959,8 +4959,8 @@ error: DeleteFileA(msifile); } -static char session_manager[] = "System\\CurrentControlSet\\Control\\Session Manager"; -static char rename_ops[] = "PendingFileRenameOperations"; +static const char session_manager[] = "System\\CurrentControlSet\\Control\\Session Manager"; +static const char rename_ops[] = "PendingFileRenameOperations"; static void process_pending_renames(HKEY hkey) { diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index 95fe97f..b65d131 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -13752,7 +13752,7 @@ static void test_MsiSetExternalUI(void) static void test_lastusedsource(void) { - static char prodcode[] = "{38847338-1BBC-4104-81AC-2FAAC7ECDDCD}"; + static const char prodcode[] = "{38847338-1BBC-4104-81AC-2FAAC7ECDDCD}"; char value[MAX_PATH], path[MAX_PATH]; DWORD size; UINT r; diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index c527118..359c745 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -2647,9 +2647,9 @@ static void test_component_states( UINT line, MSIHANDLE package, const char *com static void test_states(void) { - static char msifile2[] = "winetest2-package.msi"; - static char msifile3[] = "winetest3-package.msi"; - static char msifile4[] = "winetest4-package.msi"; + static const char msifile2[] = "winetest2-package.msi"; + static const char msifile3[] = "winetest3-package.msi"; + static const char msifile4[] = "winetest4-package.msi"; static const WCHAR msifile2W[] = {'w','i','n','e','t','e','s','t','2','-','p','a','c','k','a','g','e','.','m','s','i',0}; static const WCHAR msifile3W[] = diff --git a/dlls/msi/tests/patch.c b/dlls/msi/tests/patch.c index 3168c85..62a4b86 100644 --- a/dlls/msi/tests/patch.c +++ b/dlls/msi/tests/patch.c @@ -950,7 +950,7 @@ static void test_MsiOpenDatabase( void ) static UINT find_entry( MSIHANDLE hdb, const char *table, const char *entry ) { - static char fmt[] = "SELECT * FROM `%s` WHERE `Name` = '%s'"; + static const char fmt[] = "SELECT * FROM `%s` WHERE `Name` = '%s'"; char query[0x100]; UINT r; MSIHANDLE hview, hrec;

1 0

Dmitry Timoshkov : ws2_32: Add more traces.
by Alexandre Julliard 26 Dec '13

26 Dec '13

Module: wine Branch: master Commit: 7fd3d9d499edf9dd3f582d9c0734d7529471b9b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fd3d9d499edf9dd3f582d9c0… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Dec 11 17:02:42 2013 +0900 ws2_32: Add more traces. --- dlls/ws2_32/socket.c | 17 ++++++++++++++++- include/ws2tcpip.h | 4 ++-- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 9fd85c5..ee64d45 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2944,6 +2944,7 @@ int WINAPI WS_getsockname(SOCKET s, struct WS_sockaddr *name, int *namelen) else { res=0; + TRACE("=> %s\n", debugstr_sockaddr(name)); } release_sock_fd( s, fd ); } @@ -5455,7 +5456,7 @@ int WINAPI WS_getaddrinfo(LPCSTR nodename, LPCSTR servname, const struct WS_addr *xai = NULL; while (xuai) { struct WS_addrinfo *ai = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY, sizeof(struct WS_addrinfo)); - int len; + SIZE_T len; if (!ai) goto outofmem; @@ -5493,6 +5494,18 @@ int WINAPI WS_getaddrinfo(LPCSTR nodename, LPCSTR servname, const struct WS_addr xuai = xuai->ai_next; } freeaddrinfo(unixaires); + + if (TRACE_ON(winsock)) + { + struct WS_addrinfo *ai = *res; + while (ai) + { + TRACE("=> %p, flags %#x, family %d, type %d, protocol %d, len %ld, name %s, addr %s\n", + ai, ai->ai_flags, ai->ai_family, ai->ai_socktype, ai->ai_protocol, ai->ai_addrlen, + ai->ai_canonname, debugstr_sockaddr(ai->ai_addr)); + ai = ai->ai_next; + } + } } else result = convert_eai_u2w(result); @@ -6985,6 +6998,7 @@ INT WINAPI WSAAddressToStringA( LPSOCKADDR sockaddr, DWORD len, return SOCKET_ERROR; } + TRACE("=> %s,%u bytes\n", debugstr_a(buffer), size); *lenstr = size; strcpy( string, buffer ); return 0; @@ -7034,6 +7048,7 @@ INT WINAPI WSAAddressToStringW( LPSOCKADDR sockaddr, DWORD len, return SOCKET_ERROR; } + TRACE("=> %s,%u bytes\n", debugstr_w(buffer), size); *lenstr = size; lstrcpyW( string, buffer ); return 0; diff --git a/include/ws2tcpip.h b/include/ws2tcpip.h index 705c5ed..89f4895 100644 --- a/include/ws2tcpip.h +++ b/include/ws2tcpip.h @@ -36,7 +36,7 @@ typedef struct WS(addrinfo) int ai_family; int ai_socktype; int ai_protocol; - size_t ai_addrlen; + SIZE_T ai_addrlen; char * ai_canonname; struct WS(sockaddr)* ai_addr; struct WS(addrinfo)* ai_next; @@ -48,7 +48,7 @@ typedef struct WS(addrinfoW) int ai_family; int ai_socktype; int ai_protocol; - size_t ai_addrlen; + SIZE_T ai_addrlen; PWSTR ai_canonname; struct WS(sockaddr)* ai_addr; struct WS(addrinfoW)* ai_next;

1 0

Dmitry Timoshkov : ws2_32/tests: Add a test for inet_ntoa called from two threads.
by Alexandre Julliard 26 Dec '13

26 Dec '13

Module: wine Branch: master Commit: 3a56f9b9563bfb113b6004430292ba19da754799 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a56f9b9563bfb113b6004430… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Dec 11 17:03:40 2013 +0900 ws2_32/tests: Add a test for inet_ntoa called from two threads. --- dlls/ws2_32/tests/sock.c | 47 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 47 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 636a292..40e12a0 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -7038,6 +7038,52 @@ static void test_completion_port(void) CloseHandle(previous_port); } +static DWORD WINAPI inet_ntoa_thread_proc(void *param) +{ + ULONG addr; + const char *str; + HANDLE *event = param; + + addr = inet_addr("4.3.2.1"); + ok(addr == htonl(0x04030201), "expected 0x04030201, got %08x\n", addr); + str = inet_ntoa(*(struct in_addr *)&addr); + ok(!strcmp(str, "4.3.2.1"), "expected 4.3.2.1, got %s\n", str); + + SetEvent(event[0]); + WaitForSingleObject(event[1], 3000); + + return 0; +} + +static void test_inet_ntoa(void) +{ + ULONG addr; + const char *str; + HANDLE thread, event[2]; + DWORD tid; + + addr = inet_addr("1.2.3.4"); + ok(addr == htonl(0x01020304), "expected 0x01020304, got %08x\n", addr); + str = inet_ntoa(*(struct in_addr *)&addr); + ok(!strcmp(str, "1.2.3.4"), "expected 1.2.3.4, got %s\n", str); + + event[0] = CreateEventW(NULL, TRUE, FALSE, NULL); + event[1] = CreateEventW(NULL, TRUE, FALSE, NULL); + + thread = CreateThread(NULL, 0, inet_ntoa_thread_proc, event, 0, &tid); + WaitForSingleObject(event[0], 3000); + +todo_wine + ok(!strcmp(str, "1.2.3.4"), "expected 1.2.3.4, got %s\n", str); + + SetEvent(event[1]); + WaitForSingleObject(thread, 3000); + + CloseHandle(event[0]); + CloseHandle(event[1]); + CloseHandle(thread); +} + /**************** Main program ***************/ START_TEST( sock ) @@ -7051,6 +7097,7 @@ START_TEST( sock ) Init(); + test_inet_ntoa(); test_set_getsockopt(); test_so_reuseaddr(); test_ip_pktinfo();

1 0

Dmitry Timoshkov : ws2_32: Move the buffer used by inet_ntoa into the per-thread data.
by Alexandre Julliard 26 Dec '13

26 Dec '13

Module: wine Branch: master Commit: c66c14ddda242cee69e8a730310c1855dc85a445 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c66c14ddda242cee69e8a7303… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Dec 11 17:05:01 2013 +0900 ws2_32: Move the buffer used by inet_ntoa into the per-thread data. --- dlls/ws2_32/socket.c | 12 ++++-------- dlls/ws2_32/tests/sock.c | 1 - 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index ee64d45..cafe103 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -378,6 +378,7 @@ struct per_thread_data int he_len; int se_len; int pe_len; + char ntoa_buffer[16]; /* 4*3 digits + 3 '.' + 1 '\0' */ }; /* internal: routing description information */ @@ -3525,17 +3526,12 @@ WS_u_short WINAPI WS_ntohs(WS_u_short netshort) */ char* WINAPI WS_inet_ntoa(struct WS_in_addr in) { - /* use "buffer for dummies" here because some applications have a - * propensity to decode addresses in ws_hostent structure without - * saving them first... - */ - static char dbuffer[16]; /* Yes, 16: 4*3 digits + 3 '.' + 1 '\0' */ - char* s = inet_ntoa(*((struct in_addr*)&in)); if( s ) { - strcpy(dbuffer, s); - return dbuffer; + struct per_thread_data *data = get_per_thread_data(); + strcpy(data->ntoa_buffer, s); + return data->ntoa_buffer; } SetLastError(wsaErrno()); return NULL; diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 40e12a0..341b7e7 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -7073,7 +7073,6 @@ static void test_inet_ntoa(void) thread = CreateThread(NULL, 0, inet_ntoa_thread_proc, event, 0, &tid); WaitForSingleObject(event[0], 3000); -todo_wine ok(!strcmp(str, "1.2.3.4"), "expected 1.2.3.4, got %s\n", str); SetEvent(event[1]);

1 0

Alexandre Julliard : configure: Always use the local install-sh script for installing.
by Alexandre Julliard 26 Dec '13

26 Dec '13

Module: wine Branch: master Commit: 6af2d29f4ead3f12fbd94167fe6940368488f332 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6af2d29f4ead3f12fbd94167f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 26 14:28:30 2013 +0100 configure: Always use the local install-sh script for installing. --- configure | 95 +++------------------------------------------------------ configure.ac | 6 ++- 2 files changed, 9 insertions(+), 92 deletions(-) diff --git a/configure b/configure index f9b91aa..8aa722d 100755 --- a/configure +++ b/configure @@ -728,6 +728,7 @@ FONTFORGE INSTALL_DATA INSTALL_SCRIPT INSTALL_PROGRAM +INSTALL LDCONFIG MKDIR_P EGREP @@ -5447,99 +5448,13 @@ fi -test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM="STRIPPROG=\"\$(STRIP)\" \$(top_srcdir)/tools/install-sh" -# Find a good install program. We prefer a C program (faster), -# so one script is as good as another. But avoid the broken or -# incompatible versions: -# SysV /etc/install, /usr/sbin/install -# SunOS /usr/etc/install -# IRIX /sbin/install -# AIX /bin/install -# AmigaOS /C/install, which installs bootblocks on floppy discs -# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag -# AFS /usr/afsws/bin/install, which mishandles nonexistent args -# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" -# OS/2's system install, which has a completely different semantic -# ./install, which can be erroneously created by make from ./install.sh. -# Reject install programs that cannot install multiple files. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 -$as_echo_n "checking for a BSD-compatible install... " >&6; } -if test -z "$INSTALL"; then -if ${ac_cv_path_install+:} false; then : - $as_echo_n "(cached) " >&6 -else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - # Account for people who put trailing slashes in PATH elements. -case $as_dir/ in #(( - ./ | .// | /[cC]/* | \ - /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ - ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \ - /usr/ucb/* ) ;; - *) - # OSF1 and SCO ODT 3.0 have their own names for install. - # Don't use installbsd from OSF since it installs stuff as root - # by default. - for ac_prog in ginstall scoinst install; do - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then - if test $ac_prog = install && - grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # AIX install. It has an incompatible calling convention. - : - elif test $ac_prog = install && - grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # program-specific install script used by HP pwplus--don't use. - : - else - rm -rf conftest.one conftest.two conftest.dir - echo one > conftest.one - echo two > conftest.two - mkdir conftest.dir - if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && - test -s conftest.one && test -s conftest.two && - test -s conftest.dir/conftest.one && - test -s conftest.dir/conftest.two - then - ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" - break 3 - fi - fi - fi - done - done - ;; -esac - - done -IFS=$as_save_IFS - -rm -rf conftest.one conftest.two conftest.dir - -fi - if test "${ac_cv_path_install+set}" = set; then - INSTALL=$ac_cv_path_install - else - # As a last resort, use the slow shell script. Don't cache a - # value for INSTALL within a source directory, because that will - # break other packages using the cache if that directory is - # removed, or if the value is a relative name. - INSTALL=$ac_install_sh - fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 -$as_echo "$INSTALL" >&6; } +test -z "$INSTALL" && INSTALL="\$(top_srcdir)/tools/install-sh" -# Use test -z because SunOS4 sh mishandles braces in ${var-val}. -# It thinks the first close brace ends the variable substitution. -test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' +test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM="STRIPPROG=\"\$(STRIP)\" \$(INSTALL)" -test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' +test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT="\$(INSTALL)" -test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' +test -z "$INSTALL_DATA" && INSTALL_DATA="\$(INSTALL) -m 644" for ac_prog in fontforge diff --git a/configure.ac b/configure.ac index 94b1e29..bbf8258 100644 --- a/configure.ac +++ b/configure.ac @@ -266,8 +266,10 @@ AC_PROG_MKDIR_P AC_PATH_PROG(LDCONFIG, ldconfig, true, [/sbin /usr/sbin $PATH]) dnl Use the correct strip to install programs -test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM="STRIPPROG=\"\$(STRIP)\" \$(top_srcdir)/tools/install-sh" -AC_PROG_INSTALL +test -z "$INSTALL" && AC_SUBST([INSTALL],"\$(top_srcdir)/tools/install-sh") +test -z "$INSTALL_PROGRAM" && AC_SUBST([INSTALL_PROGRAM],"STRIPPROG=\"\$(STRIP)\" \$(INSTALL)") +test -z "$INSTALL_SCRIPT" && AC_SUBST([INSTALL_SCRIPT],"\$(INSTALL)") +test -z "$INSTALL_DATA" && AC_SUBST([INSTALL_DATA],"\$(INSTALL) -m 644") dnl Check for various programs AC_CHECK_PROGS(FONTFORGE, fontforge, false)

1 0

Alexandre Julliard : makefiles: Leave it to install-sh to create destination directories.
by Alexandre Julliard 26 Dec '13

26 Dec '13

Module: wine Branch: master Commit: 1047e0474d9e1ec872ce5f3451f16283c293369c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1047e0474d9e1ec872ce5f345… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 26 13:24:26 2013 +0100 makefiles: Leave it to install-sh to create destination directories. --- Make.rules.in | 3 -- Makefile.in | 14 +----------- aclocal.m4 | 20 +++++++++--------- configure | 46 ++++++++++++++++++------------------------ configure.ac | 20 +++++++++--------- documentation/Makefile.in | 8 ++---- fonts/Makefile.in | 4 +-- include/Makefile.in | 11 +-------- libs/wine/Makefile.in | 2 - loader/Makefile.in | 4 --- server/Makefile.in | 4 +-- tools/Makefile.in | 8 +----- tools/makedep.c | 4 +- tools/widl/Makefile.in | 3 +- tools/winebuild/Makefile.in | 4 +-- tools/winedump/Makefile.in | 4 +-- tools/winegcc/Makefile.in | 4 +-- tools/wmc/Makefile.in | 4 +-- tools/wrc/Makefile.in | 4 +-- 19 files changed, 59 insertions(+), 112 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1047e0474d9e1ec872ce5…

1 0

Dmitry Timoshkov : ntdll: Implement NtQuerySemaphore/ SemaphoreBasicInformation.
by Alexandre Julliard 26 Dec '13

26 Dec '13

Module: wine Branch: master Commit: bfb4f28dc5f4ddbb4f94b33e50beb7407f08f305 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfb4f28dc5f4ddbb4f94b33e5… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Dec 25 13:28:36 2013 +0900 ntdll: Implement NtQuerySemaphore/SemaphoreBasicInformation. --- dlls/ntdll/sync.c | 35 ++++++++++++++++++++++++++--------- include/wine/server_protocol.h | 16 +++++++++++++++- include/winnt.h | 1 + server/protocol.def | 6 ++++++ server/request.h | 7 +++++++ server/semaphore.c | 14 ++++++++++++++ server/trace.c | 14 ++++++++++++++ 7 files changed, 83 insertions(+), 10 deletions(-) diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index af1dba9..b05bd19 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -211,16 +211,33 @@ NTSTATUS WINAPI NtOpenSemaphore( OUT PHANDLE SemaphoreHandle, /****************************************************************************** * NtQuerySemaphore (NTDLL.@) */ -NTSTATUS WINAPI NtQuerySemaphore( - HANDLE SemaphoreHandle, - SEMAPHORE_INFORMATION_CLASS SemaphoreInformationClass, - PVOID SemaphoreInformation, - ULONG Length, - PULONG ReturnLength) +NTSTATUS WINAPI NtQuerySemaphore( HANDLE handle, SEMAPHORE_INFORMATION_CLASS class, + void *info, ULONG len, ULONG *ret_len ) { - FIXME("(%p,%d,%p,0x%08x,%p) stub!\n", - SemaphoreHandle, SemaphoreInformationClass, SemaphoreInformation, Length, ReturnLength); - return STATUS_SUCCESS; + NTSTATUS ret; + SEMAPHORE_BASIC_INFORMATION *out = info; + + if (class != SemaphoreBasicInformation) + { + FIXME("(%p,%d,%u) Unknown class\n", handle, class, len); + return STATUS_INVALID_INFO_CLASS; + } + + if (len != sizeof(SEMAPHORE_BASIC_INFORMATION)) return STATUS_INFO_LENGTH_MISMATCH; + + SERVER_START_REQ( query_semaphore ) + { + req->handle = wine_server_obj_handle( handle ); + if (!(ret = wine_server_call( req ))) + { + out->CurrentCount = reply->current; + out->MaximumCount = reply->max; + if (ret_len) *ret_len = sizeof(SEMAPHORE_BASIC_INFORMATION); + } + } + SERVER_END_REQ; + + return ret; } /****************************************************************************** diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index f936a88..0d69ad3 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -1280,6 +1280,17 @@ struct release_semaphore_reply char __pad_12[4]; }; +struct query_semaphore_request +{ + struct request_header __header; + obj_handle_t handle; +}; +struct query_semaphore_reply +{ + struct reply_header __header; + unsigned int current; + unsigned int max; +}; struct open_semaphore_request @@ -5108,6 +5119,7 @@ enum request REQ_open_mutex, REQ_create_semaphore, REQ_release_semaphore, + REQ_query_semaphore, REQ_open_semaphore, REQ_create_file, REQ_open_file_object, @@ -5369,6 +5381,7 @@ union generic_request struct open_mutex_request open_mutex_request; struct create_semaphore_request create_semaphore_request; struct release_semaphore_request release_semaphore_request; + struct query_semaphore_request query_semaphore_request; struct open_semaphore_request open_semaphore_request; struct create_file_request create_file_request; struct open_file_object_request open_file_object_request; @@ -5628,6 +5641,7 @@ union generic_reply struct open_mutex_reply open_mutex_reply; struct create_semaphore_reply create_semaphore_reply; struct release_semaphore_reply release_semaphore_reply; + struct query_semaphore_reply query_semaphore_reply; struct open_semaphore_reply open_semaphore_reply; struct create_file_reply create_file_reply; struct open_file_object_reply open_file_object_reply; @@ -5848,6 +5862,6 @@ union generic_reply struct set_suspend_context_reply set_suspend_context_reply; }; -#define SERVER_PROTOCOL_VERSION 453 +#define SERVER_PROTOCOL_VERSION 454 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/include/winnt.h b/include/winnt.h index f1751a5..f55f2fe 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -4512,6 +4512,7 @@ typedef enum tagSID_NAME_USE { #define EVENT_MODIFY_STATE 0x0002 #define EVENT_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED|SYNCHRONIZE|0x3) +#define SEMAPHORE_QUERY_STATE 0x0001 #define SEMAPHORE_MODIFY_STATE 0x0002 #define SEMAPHORE_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED|SYNCHRONIZE|0x3) diff --git a/server/protocol.def b/server/protocol.def index 8c5f953..fec5e75 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1072,6 +1072,12 @@ enum event_op { PULSE_EVENT, SET_EVENT, RESET_EVENT }; unsigned int prev_count; /* previous semaphore count */ @END +(a)REQ(query_semaphore) + obj_handle_t handle; /* handle to the semaphore */ +(a)REPLY + unsigned int current; /* current count */ + unsigned int max; /* maximum count */ +(a)END /* Open a semaphore */ @REQ(open_semaphore) diff --git a/server/request.h b/server/request.h index 3730f7b..8e35b0d 100644 --- a/server/request.h +++ b/server/request.h @@ -142,6 +142,7 @@ DECL_HANDLER(release_mutex); DECL_HANDLER(open_mutex); DECL_HANDLER(create_semaphore); DECL_HANDLER(release_semaphore); +DECL_HANDLER(query_semaphore); DECL_HANDLER(open_semaphore); DECL_HANDLER(create_file); DECL_HANDLER(open_file_object); @@ -402,6 +403,7 @@ static const req_handler req_handlers[REQ_NB_REQUESTS] = (req_handler)req_open_mutex, (req_handler)req_create_semaphore, (req_handler)req_release_semaphore, + (req_handler)req_query_semaphore, (req_handler)req_open_semaphore, (req_handler)req_create_file, (req_handler)req_open_file_object, @@ -888,6 +890,11 @@ C_ASSERT( FIELD_OFFSET(struct release_semaphore_request, count) == 16 ); C_ASSERT( sizeof(struct release_semaphore_request) == 24 ); C_ASSERT( FIELD_OFFSET(struct release_semaphore_reply, prev_count) == 8 ); C_ASSERT( sizeof(struct release_semaphore_reply) == 16 ); +C_ASSERT( FIELD_OFFSET(struct query_semaphore_request, handle) == 12 ); +C_ASSERT( sizeof(struct query_semaphore_request) == 16 ); +C_ASSERT( FIELD_OFFSET(struct query_semaphore_reply, current) == 8 ); +C_ASSERT( FIELD_OFFSET(struct query_semaphore_reply, max) == 12 ); +C_ASSERT( sizeof(struct query_semaphore_reply) == 16 ); C_ASSERT( FIELD_OFFSET(struct open_semaphore_request, access) == 12 ); C_ASSERT( FIELD_OFFSET(struct open_semaphore_request, attributes) == 16 ); C_ASSERT( FIELD_OFFSET(struct open_semaphore_request, rootdir) == 20 ); diff --git a/server/semaphore.c b/server/semaphore.c index 109eb9a..bdc35fe 100644 --- a/server/semaphore.c +++ b/server/semaphore.c @@ -237,3 +237,17 @@ DECL_HANDLER(release_semaphore) release_object( sem ); } } + +/* query details about the semaphore */ +DECL_HANDLER(query_semaphore) +{ + struct semaphore *sem; + + if ((sem = (struct semaphore *)get_handle_obj( current->process, req->handle, + SEMAPHORE_QUERY_STATE, &semaphore_ops ))) + { + reply->current = sem->count; + reply->max = sem->max; + release_object( sem ); + } +} diff --git a/server/trace.c b/server/trace.c index 7fe5c4f..b792494 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1543,6 +1543,17 @@ static void dump_release_semaphore_reply( const struct release_semaphore_reply * fprintf( stderr, " prev_count=%08x", req->prev_count ); } +static void dump_query_semaphore_request( const struct query_semaphore_request *req ) +{ + fprintf( stderr, " handle=%04x", req->handle ); +} + +static void dump_query_semaphore_reply( const struct query_semaphore_reply *req ) +{ + fprintf( stderr, " current=%08x", req->current ); + fprintf( stderr, ", max=%08x", req->max ); +} + static void dump_open_semaphore_request( const struct open_semaphore_request *req ) { fprintf( stderr, " access=%08x", req->access ); @@ -4121,6 +4132,7 @@ static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_open_mutex_request, (dump_func)dump_create_semaphore_request, (dump_func)dump_release_semaphore_request, + (dump_func)dump_query_semaphore_request, (dump_func)dump_open_semaphore_request, (dump_func)dump_create_file_request, (dump_func)dump_open_file_object_request, @@ -4378,6 +4390,7 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_open_mutex_reply, (dump_func)dump_create_semaphore_reply, (dump_func)dump_release_semaphore_reply, + (dump_func)dump_query_semaphore_reply, (dump_func)dump_open_semaphore_reply, (dump_func)dump_create_file_reply, (dump_func)dump_open_file_object_reply, @@ -4635,6 +4648,7 @@ static const char * const req_names[REQ_NB_REQUESTS] = { "open_mutex", "create_semaphore", "release_semaphore", + "query_semaphore", "open_semaphore", "create_file", "open_file_object",

1 0