August 2013 - Wine-commits - list.winehq.org

Rico Schüller : d3dx9: Use d3dx_parameter instead of D3DXHANDLE.
by Alexandre Julliard 02 Aug '13

02 Aug '13

Module: wine Branch: master Commit: fab44cbbfb32e9eb58f56c91ce96de84b8ec6bf7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fab44cbbfb32e9eb58f56c91c… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Aug 1 22:48:25 2013 +0200 d3dx9: Use d3dx_parameter instead of D3DXHANDLE. --- dlls/d3dx9_36/effect.c | 435 ++++++++++++++++++------------------------------ 1 files changed, 163 insertions(+), 272 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fab44cbbfb32e9eb58f56…

1 0

Rico Schüller : d3dx9/tests: Test all registers set by the constant table.
by Alexandre Julliard 02 Aug '13

02 Aug '13

Module: wine Branch: master Commit: b9b6b0585f5cfa72d4ed3974a1f5ab9122339111 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9b6b0585f5cfa72d4ed3974a… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Aug 1 22:53:35 2013 +0200 d3dx9/tests: Test all registers set by the constant table. --- dlls/d3dx9_36/tests/shader.c | 23 +++++++++++++++++++++-- 1 files changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c index 171d62c..7235fad 100644 --- a/dlls/d3dx9_36/tests/shader.c +++ b/dlls/d3dx9_36/tests/shader.c @@ -5912,6 +5912,25 @@ static UINT registerset_compare(IDirect3DDevice9 *device, BOOL is_vs, D3DXREGIST return err; } +static UINT registerset_compare_all(IDirect3DDevice9 *device, BOOL is_vs, D3DXREGISTER_SET regset, + UINT start, UINT in_count, const DWORD *expected) +{ + D3DXREGISTER_SET regsets[] = {D3DXRS_BOOL, D3DXRS_INT4, D3DXRS_FLOAT4}; + UINT err = 0, i; + + for (i = 0; i < sizeof(regsets) / sizeof(*regsets); i++) + { + if (regset == regsets[i]) + err += registerset_compare(device, is_vs, regset, start, in_count, expected); + else + err += registerset_compare(device, is_vs, regsets[i], 0, 0, NULL); + + err += registerset_compare(device, !is_vs, regsets[i], 0, 0, NULL); + } + + return err; +} + static HRESULT registerset_apply(ID3DXConstantTable *ctable, IDirect3DDevice9 *device, D3DXHANDLE constant, UINT index, DWORD count, enum Type type) { @@ -6095,7 +6114,7 @@ static void test_registerset(void) ok(hr == D3D_OK, "Set* \"%s\" index %u, count %u failed, got %x, expected %x\n", tablename, i, test->in_count_min, hr, D3D_OK); - ret = registerset_compare(device, is_vs, registerset_data[k].regset, + ret = registerset_compare_all(device, is_vs, registerset_data[k].regset, registerset_data[k].start, test->out_count, test->out); ok(ret == 0, "Get*ShaderConstant \"%s\" index %u, count %u failed\n", tablename, i, test->in_count_min); @@ -6107,7 +6126,7 @@ static void test_registerset(void) ok(hr == D3D_OK, "Set* \"%s\" index %u, count %u failed, got %x, expected %x\n", tablename, i, test->in_count_max, hr, D3D_OK); - ret = registerset_compare(device, is_vs, registerset_data[k].regset, + ret = registerset_compare_all(device, is_vs, registerset_data[k].regset, registerset_data[k].start, test->out_count, test->out); ok(ret == 0, "Get*ShaderConstant \"%s\" index %u, count %u failed\n", tablename, i, test->in_count_max); }

1 0

Detlef Riekenberg : faultrep/tests: Fix a test failure when the user has limited access rights.
by Alexandre Julliard 02 Aug '13

02 Aug '13

Module: wine Branch: master Commit: c1f9129d7bfa8be0cf39aa267e3d0a2f4fe96568 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1f9129d7bfa8be0cf39aa267… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Aug 2 06:01:59 2013 +0200 faultrep/tests: Fix a test failure when the user has limited access rights. --- dlls/faultrep/faultrep.c | 8 ++++---- dlls/faultrep/tests/faultrep.c | 10 +++++++--- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/dlls/faultrep/faultrep.c b/dlls/faultrep/faultrep.c index a05dabb..83f9027 100644 --- a/dlls/faultrep/faultrep.c +++ b/dlls/faultrep/faultrep.c @@ -53,14 +53,13 @@ static const WCHAR SZ_EXCLUSIONLIST_KEY[] = { * Wine doesn't use this data but stores it in the registry (in the same place * as Windows would) in case it will be useful in a future version * - * According to MSDN this function should succeed even if the user has no write - * access to HKLM. This probably means that there is no error checking. */ BOOL WINAPI AddERExcludedApplicationW(LPCWSTR lpAppFileName) { WCHAR *bslash; DWORD value = 1; HKEY hkey; + LONG res; TRACE("(%s)\n", wine_dbgstr_w(lpAppFileName)); bslash = strrchrW(lpAppFileName, '\\'); @@ -72,13 +71,14 @@ BOOL WINAPI AddERExcludedApplicationW(LPCWSTR lpAppFileName) return FALSE; } - if (!RegCreateKeyW(HKEY_LOCAL_MACHINE, SZ_EXCLUSIONLIST_KEY, &hkey)) + res = RegCreateKeyW(HKEY_LOCAL_MACHINE, SZ_EXCLUSIONLIST_KEY, &hkey); + if (!res) { RegSetValueExW(hkey, lpAppFileName, 0, REG_DWORD, (LPBYTE)&value, sizeof(value)); RegCloseKey(hkey); } - return TRUE; + return !res; } /************************************************************************* diff --git a/dlls/faultrep/tests/faultrep.c b/dlls/faultrep/tests/faultrep.c index dd52928..948310d 100644 --- a/dlls/faultrep/tests/faultrep.c +++ b/dlls/faultrep/tests/faultrep.c @@ -43,7 +43,12 @@ static void test_AddERExcludedApplicationA(void) HKEY hexclude = 0; /* clean state */ - lres = RegOpenKeyExA(HKEY_LOCAL_MACHINE, regpath_root, 0, KEY_WRITE, &hroot); + lres = RegCreateKeyA(HKEY_LOCAL_MACHINE, regpath_root, &hroot); + if (lres == ERROR_ACCESS_DENIED) + { + skip("Not enough access rights\n"); + return; + } if (!lres) lres = RegOpenKeyA(hroot, regpath_exclude, &hexclude); @@ -61,8 +66,7 @@ static void test_AddERExcludedApplicationA(void) ok(!res, "got %d and 0x%x (expected FALSE)\n", res, GetLastError()); SetLastError(0xdeadbeef); - /* access rights to HKLM or existence of the path doesn't matter - this function succeeded */ + /* existence of the path doesn't matter this function succeeded */ res = AddERExcludedApplicationA("winetest_faultrep.exe"); ok(res, "got %d and 0x%x (expected TRUE)\n", res, GetLastError());

1 0

Nikolay Sivov : ntdll: Implement compatible FindActCtxSectionString() for window class section.
by Alexandre Julliard 02 Aug '13

02 Aug '13

Module: wine Branch: master Commit: 5ce01b3597d5dd9aaa510b846dd2fc3db42ab792 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ce01b3597d5dd9aaa510b846… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 2 15:45:46 2013 +0400 ntdll: Implement compatible FindActCtxSectionString() for window class section. --- dlls/kernel32/tests/actctx.c | 92 ++++++++------ dlls/ntdll/actctx.c | 273 ++++++++++++++++++++++++++++++++++++++++-- dlls/ntdll/ntdll_misc.h | 2 + 3 files changed, 317 insertions(+), 50 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5ce01b3597d5dd9aaa510…

1 0

Piotr Caban : scrrun: Fix IFile::get_Attributes tests and implementation.
by Alexandre Julliard 01 Aug '13

01 Aug '13

Module: wine Branch: master Commit: 12d3741200a658cbe2076f4d0efeb56133f666a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12d3741200a658cbe2076f4d0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Aug 1 11:46:34 2013 +0200 scrrun: Fix IFile::get_Attributes tests and implementation. --- dlls/scrrun/filesystem.c | 4 +++- dlls/scrrun/tests/filesystem.c | 8 ++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 19e3e23..19f5f2b 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -791,7 +791,9 @@ static HRESULT WINAPI file_get_Attributes(IFile *iface, FileAttribute *pfa) if(fa == INVALID_FILE_ATTRIBUTES) return create_error(GetLastError()); - *pfa = fa & ~FILE_ATTRIBUTE_NORMAL; + *pfa = fa & (FILE_ATTRIBUTE_READONLY | FILE_ATTRIBUTE_HIDDEN | + FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_DIRECTORY | FILE_ATTRIBUTE_ARCHIVE | + FILE_ATTRIBUTE_REPARSE_POINT | FILE_ATTRIBUTE_COMPRESSED); return S_OK; } diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 0ddbbac..a3ad79f 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -478,9 +478,7 @@ static void test_GetFile(void) hr = IFileSystem3_GetFile(fs3, NULL, &file); ok(hr == E_INVALIDARG, "GetFile returned %x, expected E_INVALIDARG\n", hr); - hf = CreateFileW(path, GENERIC_WRITE, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); - if(hf != INVALID_HANDLE_VALUE) { - CloseHandle(hf); + if(GetFileAttributesW(path) != INVALID_FILE_ATTRIBUTES) { skip("File already exists, skipping GetFile tests\n"); SysFreeString(path); return; @@ -503,7 +501,9 @@ static void test_GetFile(void) ok(hr == S_OK, "GetFile returned %x, expected S_OK\n", hr); hr = IFile_get_Attributes(file, &fa); - gfa = GetFileAttributesW(get_file) & ~FILE_ATTRIBUTE_NORMAL; + gfa = GetFileAttributesW(get_file) & (FILE_ATTRIBUTE_READONLY | FILE_ATTRIBUTE_HIDDEN | + FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_DIRECTORY | FILE_ATTRIBUTE_ARCHIVE | + FILE_ATTRIBUTE_REPARSE_POINT | FILE_ATTRIBUTE_COMPRESSED); ok(hr == S_OK, "get_Attributes returned %x, expected S_OK\n", hr); ok(fa == gfa, "fa = %x, expected %x\n", fa, gfa);

1 0

Piotr Caban : scrrun: Fix IFileSystem3::GetAbsolutePathName tests failures.
by Alexandre Julliard 01 Aug '13

01 Aug '13

Module: wine Branch: master Commit: ec7ebd358d2683baeb7c2bc2b8d51be87964ea18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec7ebd358d2683baeb7c2bc2b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Aug 1 11:46:50 2013 +0200 scrrun: Fix IFileSystem3::GetAbsolutePathName tests failures. --- dlls/scrrun/tests/filesystem.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index a3ad79f..e231f9a 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -401,7 +401,7 @@ static void test_GetAbsolutePathName(void) WIN32_FIND_DATAW fdata; HANDLE find; - WCHAR buf[MAX_PATH]; + WCHAR buf[MAX_PATH], buf2[MAX_PATH]; BSTR path, result; HRESULT hr; @@ -424,22 +424,23 @@ static void test_GetAbsolutePathName(void) path = SysAllocString(dir_match1); hr = IFileSystem3_GetAbsolutePathName(fs3, path, &result); ok(hr == S_OK, "GetAbsolutePathName returned %x, expected S_OK\n", hr); - GetFullPathNameW(dir_match1, MAX_PATH, buf, NULL); - ok(!lstrcmpW(buf, result), "result = %s, expected %s\n", wine_dbgstr_w(result), wine_dbgstr_w(buf)); + GetFullPathNameW(dir_match1, MAX_PATH, buf2, NULL); + ok(!lstrcmpW(buf2, result), "result = %s, expected %s\n", wine_dbgstr_w(result), wine_dbgstr_w(buf2)); SysFreeString(result); ok(CreateDirectoryW(dir1, NULL), "CreateDirectory(%s) failed\n", wine_dbgstr_w(dir1)); hr = IFileSystem3_GetAbsolutePathName(fs3, path, &result); ok(hr == S_OK, "GetAbsolutePathName returned %x, expected S_OK\n", hr); GetFullPathNameW(dir1, MAX_PATH, buf, NULL); - ok(!lstrcmpW(buf, result), "result = %s, expected %s\n", wine_dbgstr_w(result), wine_dbgstr_w(buf)); + ok(!lstrcmpW(buf, result) || broken(!lstrcmpW(buf2, result)), "result = %s, expected %s\n", + wine_dbgstr_w(result), wine_dbgstr_w(buf)); SysFreeString(result); ok(CreateDirectoryW(dir2, NULL), "CreateDirectory(%s) failed\n", wine_dbgstr_w(dir2)); hr = IFileSystem3_GetAbsolutePathName(fs3, path, &result); ok(hr == S_OK, "GetAbsolutePathName returned %x, expected S_OK\n", hr); - if(!lstrcmpW(buf, result)) { - ok(!lstrcmpW(buf, result), "result = %s, expected %s\n", + if(!lstrcmpW(buf, result) || !lstrcmpW(buf2, result)) { + ok(!lstrcmpW(buf, result) || broken(!lstrcmpW(buf2, result)), "result = %s, expected %s\n", wine_dbgstr_w(result), wine_dbgstr_w(buf)); }else { GetFullPathNameW(dir2, MAX_PATH, buf, NULL);

1 0

Piotr Caban : msvcrt: Added _swprintf_s_l implementation.
by Alexandre Julliard 01 Aug '13

01 Aug '13

Module: wine Branch: master Commit: a51ffcd442678ce019a52bd5b95d99d0b7eab4ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=a51ffcd442678ce019a52bd5b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Aug 1 13:55:39 2013 +0200 msvcrt: Added _swprintf_s_l implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/wcs.c | 16 ++++++++++++++++ 6 files changed, 21 insertions(+), 5 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 9d4cc80..7e602ef 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1371,7 +1371,7 @@ @ stub _swprintf_c_l @ stub _swprintf_p @ varargs _swprintf_p_l(ptr long wstr ptr) msvcrt._swprintf_p_l -@ stub _swprintf_s_l +@ varargs _swprintf_s_l(ptr long wstr ptr) msvcrt._swprintf_s_l @ varargs _swscanf_l(wstr wstr ptr) msvcrt._swscanf_l @ varargs _swscanf_s_l(wstr wstr ptr) msvcrt._swscanf_s_l @ extern _sys_errlist msvcrt._sys_errlist diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 6e97edb..6c2da4c 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1733,7 +1733,7 @@ @ stub _swprintf_c_l @ stub _swprintf_p @ varargs _swprintf_p_l(ptr long wstr ptr) msvcrt._swprintf_p_l -@ stub _swprintf_s_l +@ varargs _swprintf_s_l(ptr long wstr ptr) msvcrt._swprintf_s_l @ varargs _swscanf_l(wstr wstr ptr) msvcrt._swscanf_l @ varargs _swscanf_s_l(wstr wstr ptr) msvcrt._swscanf_s_l @ extern _sys_errlist msvcrt._sys_errlist diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 8d91d66..ec886eb 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1049,7 +1049,7 @@ @ stub _swprintf_c @ stub _swprintf_p @ varargs _swprintf_p_l(ptr long wstr ptr) msvcrt._swprintf_p_l -@ stub _swprintf_s_l +@ varargs _swprintf_s_l(ptr long wstr ptr) msvcrt._swprintf_s_l @ varargs _swscanf_l(wstr wstr ptr) msvcrt._swscanf_l @ varargs _swscanf_s_l(wstr wstr ptr) msvcrt._swscanf_s_l @ extern _sys_errlist msvcrt._sys_errlist diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 9469587..d5eebb4 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1025,7 +1025,7 @@ @ stub _swprintf_c_l @ stub _swprintf_p @ varargs _swprintf_p_l(ptr long wstr ptr) msvcrt._swprintf_p_l -@ stub _swprintf_s_l +@ varargs _swprintf_s_l(ptr long wstr ptr) msvcrt._swprintf_s_l @ varargs _swscanf_l(wstr wstr ptr) msvcrt._swscanf_l @ varargs _swscanf_s_l(wstr wstr ptr) msvcrt._swscanf_s_l @ extern _sys_errlist msvcrt._sys_errlist diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 975afe0..7511129 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -993,7 +993,7 @@ # stub _swprintf_c(ptr long str) # stub _swprintf_c_l(ptr long str ptr) @ varargs _swprintf_p_l(ptr long wstr ptr) MSVCRT_swprintf_p_l -# stub _swprintf_s_l(ptr long str ptr) +@ varargs _swprintf_s_l(ptr long wstr ptr) MSVCRT__swprintf_s_l @ varargs _swscanf_l(wstr wstr ptr) MSVCRT__swscanf_l @ varargs _swscanf_s_l(wstr wstr ptr) MSVCRT__swscanf_s_l @ extern _sys_errlist MSVCRT__sys_errlist diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 3df7c02..ca4fba6 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -947,6 +947,22 @@ int CDECL MSVCRT_swprintf_s(MSVCRT_wchar_t *str, MSVCRT_size_t numberOfElements, } /********************************************************************* + * _swprintf_s_l (MSVCRT.@) + */ +int CDECL MSVCRT__swprintf_s_l(MSVCRT_wchar_t *str, MSVCRT_size_t numberOfElements, + const MSVCRT_wchar_t *format, MSVCRT__locale_t locale, ... ) +{ + __ms_va_list ap; + int r; + + __ms_va_start(ap, locale); + r = MSVCRT_vsnwprintf_s_l(str, numberOfElements, INT_MAX, format, locale, ap); + __ms_va_end(ap); + + return r; +} + +/********************************************************************* * _vswprintf (MSVCRT.@) */ int CDECL MSVCRT_vswprintf( MSVCRT_wchar_t* str, const MSVCRT_wchar_t* format, __ms_va_list args )

1 0

Bruno Jesus : ws2_32: Simplify WINSOCK_EnterSingleProtocolA using the W version.
by Alexandre Julliard 01 Aug '13

01 Aug '13

Module: wine Branch: master Commit: 75fc88452c069803e32ddd76129202aa18db37d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75fc88452c069803e32ddd761… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Aug 1 00:30:30 2013 -0300 ws2_32: Simplify WINSOCK_EnterSingleProtocolA using the W version. --- dlls/ws2_32/protocol.c | 106 +++++------------------------------------------- 1 files changed, 10 insertions(+), 96 deletions(-) diff --git a/dlls/ws2_32/protocol.c b/dlls/ws2_32/protocol.c index fa72de8..98e7c38 100644 --- a/dlls/ws2_32/protocol.c +++ b/dlls/ws2_32/protocol.c @@ -53,12 +53,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(winsock); /* names of the protocols */ -static const CHAR NameIpx[] = "IPX"; -static const CHAR NameSpx[] = "SPX"; -static const CHAR NameSpxII[] = "SPX II"; -static const CHAR NameTcp[] = "TCP/IP"; -static const CHAR NameUdp[] = "UDP/IP"; - static const WCHAR NameIpxW[] = {'I', 'P', 'X', '\0'}; static const WCHAR NameSpxW[] = {'S', 'P', 'X', '\0'}; static const WCHAR NameSpxIIW[] = {'S', 'P', 'X', ' ', 'I', 'I', '\0'}; @@ -194,100 +188,20 @@ static INT WINSOCK_EnterSingleProtocolW( INT protocol, WSAPROTOCOL_INFOW* info ) */ static INT WINSOCK_EnterSingleProtocolA( INT protocol, WSAPROTOCOL_INFOA* info ) { + WSAPROTOCOL_INFOW infow; + INT ret; memset( info, 0, sizeof(WSAPROTOCOL_INFOA) ); - info->iProtocol = protocol; - switch (protocol) + ret = WINSOCK_EnterSingleProtocolW( protocol, &infow ); + if (ret != SOCKET_ERROR) { - case WS_IPPROTO_TCP: - info->dwServiceFlags1 = XP1_IFS_HANDLES | XP1_EXPEDITED_DATA | - XP1_GRACEFUL_CLOSE | XP1_GUARANTEED_ORDER | - XP1_GUARANTEED_DELIVERY; - info->ProviderId = ProviderIdIP; - info->dwCatalogEntryId = 0x3e9; - info->ProtocolChain.ChainLen = 1; - info->iVersion = 2; - info->iAddressFamily = WS_AF_INET; - info->iMaxSockAddr = 0x10; - info->iMinSockAddr = 0x10; - info->iSocketType = WS_SOCK_STREAM; - strcpy( info->szProtocol, NameTcp ); - break; - - case WS_IPPROTO_UDP: - info->dwServiceFlags1 = XP1_IFS_HANDLES | XP1_SUPPORT_BROADCAST | - XP1_SUPPORT_MULTIPOINT | XP1_MESSAGE_ORIENTED | - XP1_CONNECTIONLESS; - info->ProviderId = ProviderIdIP; - info->dwCatalogEntryId = 0x3ea; - info->ProtocolChain.ChainLen = 1; - info->iVersion = 2; - info->iAddressFamily = WS_AF_INET; - info->iMaxSockAddr = 0x10; - info->iMinSockAddr = 0x10; - info->iSocketType = WS_SOCK_DGRAM; - info->dwMessageSize = 0xffbb; - strcpy( info->szProtocol, NameUdp ); - break; - - case NSPROTO_IPX: - info->dwServiceFlags1 = XP1_IFS_HANDLES | XP1_SUPPORT_BROADCAST | - XP1_SUPPORT_MULTIPOINT | XP1_MESSAGE_ORIENTED | - XP1_CONNECTIONLESS; - info->ProviderId = ProviderIdIPX; - info->dwCatalogEntryId = 0x406; - info->ProtocolChain.ChainLen = 1; - info->iVersion = 2; - info->iAddressFamily = WS_AF_IPX; - info->iMaxSockAddr = 0x10; - info->iMinSockAddr = 0x0e; - info->iSocketType = WS_SOCK_DGRAM; - info->iProtocolMaxOffset = 0xff; - info->dwMessageSize = 0x240; - strcpy( info->szProtocol, NameIpx ); - break; - - case NSPROTO_SPX: - info->dwServiceFlags1 = XP1_IFS_HANDLES | XP1_PSEUDO_STREAM | - XP1_MESSAGE_ORIENTED | XP1_GUARANTEED_ORDER | - XP1_GUARANTEED_DELIVERY; - info->ProviderId = ProviderIdSPX; - info->dwCatalogEntryId = 0x407; - info->ProtocolChain.ChainLen = 1; - info->iVersion = 2; - info->iAddressFamily = WS_AF_IPX; - info->iMaxSockAddr = 0x10; - info->iMinSockAddr = 0x0e; - info->iSocketType = 5; - info->dwMessageSize = 0xffffffff; - strcpy( info->szProtocol, NameSpx ); - break; - - case NSPROTO_SPXII: - info->dwServiceFlags1 = XP1_IFS_HANDLES | XP1_GRACEFUL_CLOSE | - XP1_PSEUDO_STREAM | XP1_MESSAGE_ORIENTED | - XP1_GUARANTEED_ORDER | XP1_GUARANTEED_DELIVERY; - info->ProviderId = ProviderIdSPX; - info->dwCatalogEntryId = 0x409; - info->ProtocolChain.ChainLen = 1; - info->iVersion = 2; - info->iAddressFamily = WS_AF_IPX; - info->iMaxSockAddr = 0x10; - info->iMinSockAddr = 0x0e; - info->iSocketType = 5; - info->dwMessageSize = 0xffffffff; - strcpy( info->szProtocol, NameSpxII ); - break; - - default: - if ((protocol == ISOPROTO_TP4) || (protocol == NSPROTO_SPX)) - FIXME("Protocol <%s> not implemented\n", - (protocol == ISOPROTO_TP4) ? "ISOPROTO_TP4" : "NSPROTO_SPX"); - else - FIXME("unknown Protocol <0x%08x>\n", protocol); - return SOCKET_ERROR; + /* convert the structure from W to A */ + memcpy( info, &infow, FIELD_OFFSET( WSAPROTOCOL_INFOA, szProtocol ) ); + WideCharToMultiByte( CP_ACP, 0, infow.szProtocol, -1, + info->szProtocol, WSAPROTOCOL_LEN+1, NULL, NULL ); } - return 1; + + return ret; } /*****************************************************************************

1 0

Aric Stewart : wineps.drv: Allow for vertical text printing.
by Alexandre Julliard 01 Aug '13

01 Aug '13

Module: wine Branch: master Commit: 745e7c93c9042f62460f181daaa1f05645560b41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=745e7c93c9042f62460f181da… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Jul 30 07:54:25 2013 -0500 wineps.drv: Allow for vertical text printing. With extensive review and help from Huw Davies. --- dlls/wineps.drv/builtin.c | 2 +- dlls/wineps.drv/download.c | 23 +++-- dlls/wineps.drv/font.c | 14 ++- dlls/wineps.drv/ps.c | 2 +- dlls/wineps.drv/psdrv.h | 10 ++- dlls/wineps.drv/text.c | 206 +++++++++++++++++++++++++++++++++++++------- 6 files changed, 208 insertions(+), 49 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=745e7c93c9042f62460f1…

1 0

Dmitry Timoshkov : windowscodecs: Workaround libtiff bug when it defines toff_t as 32-bit for 32-bit builds.
by Alexandre Julliard 01 Aug '13

01 Aug '13

Module: wine Branch: master Commit: 3894493a76cb766c4322f09a1d12b9723d3d3759 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3894493a76cb766c4322f09a1… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Aug 1 22:04:28 2013 +0900 windowscodecs: Workaround libtiff bug when it defines toff_t as 32-bit for 32-bit builds. --- dlls/windowscodecs/tiffformat.c | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index 62f1ad7..e252ced 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -44,6 +44,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); #ifdef SONAME_LIBTIFF +/* Workaround for broken libtiff 4.x headers on some 64-bit hosts which + * define TIFF_UINT64_T/toff_t as 32-bit for 32-bit builds, while they + * are supposed to be always 64-bit. + * TIFF_UINT64_T doesn't exist in libtiff 3.x, it was introduced in 4.x. + */ +#ifdef TIFF_UINT64_T +# undef toff_t +# define toff_t UINT64 +#endif + static CRITICAL_SECTION init_tiff_cs; static CRITICAL_SECTION_DEBUG init_tiff_cs_debug = { @@ -209,8 +219,8 @@ static TIFF* tiff_open_stream(IStream *stream, const char *mode) IStream_Seek(stream, zero, STREAM_SEEK_SET, NULL); return pTIFFClientOpen("<IStream object>", mode, stream, tiff_stream_read, - tiff_stream_write, tiff_stream_seek, tiff_stream_close, - tiff_stream_size, tiff_stream_map, tiff_stream_unmap); + tiff_stream_write, (void *)tiff_stream_seek, tiff_stream_close, + (void *)tiff_stream_size, (void *)tiff_stream_map, (void *)tiff_stream_unmap); } typedef struct {

1 0