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

Álvaro Nieto : msvrct: Fix strncpy to fill the buffer.
by Alexandre Julliard 16 Aug '13

16 Aug '13

Module: wine Branch: master Commit: e3e12845572dce7b35660814c44dedf069de1dfb URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3e12845572dce7b35660814c… Author: Álvaro Nieto <alvaro.nieto(a)gmail.com> Date: Tue Aug 13 21:47:20 2013 +0200 msvrct: Fix strncpy to fill the buffer. --- dlls/msvcrt/string.c | 2 ++ dlls/msvcrt/tests/string.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index c5d0e18..082029d 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -581,6 +581,8 @@ char* __cdecl MSVCRT_strncpy(char *dst, const char *src, MSVCRT_size_t len) for(i=0; i<len; i++) if((dst[i] = src[i]) == '\0') break; + while (i < len) dst[i++] = 0; + return dst; } diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 6e3f962..dc90b38 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -2574,6 +2574,36 @@ static void test_atoi(void) ok(r == 0, "atoi(4294967296) = %d\n", r); } +static void test_strncpy(void) +{ +#define TEST_STRNCPY_LEN 10 + char *ret; + char dst[TEST_STRNCPY_LEN + 1]; + char not_null_terminated[] = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '0'}; + + /* strlen(src) > TEST_STRNCPY_LEN */ + ret = strncpy(dst, "01234567890123456789", TEST_STRNCPY_LEN); + ok(ret == dst, "ret != dst\n"); + ok(!strncmp(dst, "0123456789", TEST_STRNCPY_LEN), "dst != 0123456789\n"); + + /* without null-terminated */ + ret = strncpy(dst, not_null_terminated, TEST_STRNCPY_LEN); + ok(ret == dst, "ret != dst\n"); + ok(!strncmp(dst, "0123456789", TEST_STRNCPY_LEN), "dst != 0123456789\n"); + + /* strlen(src) < TEST_STRNCPY_LEN */ + strcpy(dst, "0123456789"); + ret = strncpy(dst, "012345", TEST_STRNCPY_LEN); + ok(ret == dst, "ret != dst\n"); + ok(!strcmp(dst, "012345"), "dst != 012345\n"); + ok(dst[TEST_STRNCPY_LEN - 1] == '\0', "dst[TEST_STRNCPY_LEN - 1] != 0\n"); + + /* strlen(src) == TEST_STRNCPY_LEN */ + ret = strncpy(dst, "0123456789", TEST_STRNCPY_LEN); + ok(ret == dst, "ret != dst\n"); + ok(!strncmp(dst, "0123456789", TEST_STRNCPY_LEN), "dst != 0123456789\n"); +} + START_TEST(string) { char mem[100]; @@ -2675,4 +2705,5 @@ START_TEST(string) test__stricmp(); test__wcstoi64(); test_atoi(); + test_strncpy(); }

1 0

George Stephanos : quartz: Replace CloseHandle by RegCloseKey.
by Alexandre Julliard 16 Aug '13

16 Aug '13

Module: wine Branch: master Commit: 637257b939e2f8185d7cb151aa8fdc06a7f9ffb7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=637257b939e2f8185d7cb151a… Author: George Stephanos <gaf.stephanos(a)gmail.com> Date: Sun Aug 11 14:29:27 2013 +0200 quartz: Replace CloseHandle by RegCloseKey. --- dlls/quartz/filtermapper.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/quartz/filtermapper.c b/dlls/quartz/filtermapper.c index 51b5ed7..6d02a7a 100644 --- a/dlls/quartz/filtermapper.c +++ b/dlls/quartz/filtermapper.c @@ -307,7 +307,7 @@ static HRESULT WINAPI FilterMapper3_CreateCategory( hr = HRESULT_FROM_WIN32(lRet); } - CloseHandle(hKey); + RegCloseKey(hKey); CoTaskMemFree(wClsidCategory); CoTaskMemFree(wClsidAMCat); @@ -1287,7 +1287,7 @@ static HRESULT WINAPI FilterMapper_RegisterFilter(IFilterMapper * iface, CLSID c { lRet = RegSetValueExW(hKey, NULL, 0, REG_SZ, (const BYTE*)szName, (strlenW(szName) + 1) * sizeof(WCHAR)); hr = HRESULT_FROM_WIN32(lRet); - CloseHandle(hKey); + RegCloseKey(hKey); } if (SUCCEEDED(hr)) @@ -1303,7 +1303,7 @@ static HRESULT WINAPI FilterMapper_RegisterFilter(IFilterMapper * iface, CLSID c { lRet = RegSetValueExW(hKey, wszMeritName, 0, REG_DWORD, (LPBYTE)&dwMerit, sizeof(dwMerit)); hr = HRESULT_FROM_WIN32(lRet); - CloseHandle(hKey); + RegCloseKey(hKey); } CoTaskMemFree(wszClsid); @@ -1407,9 +1407,9 @@ static HRESULT WINAPI FilterMapper_RegisterPin( CoTaskMemFree(wszClsid); if (hKey) - CloseHandle(hKey); + RegCloseKey(hKey); if (hPinsKey) - CloseHandle(hPinsKey); + RegCloseKey(hPinsKey); return hr; } @@ -1480,7 +1480,7 @@ static HRESULT WINAPI FilterMapper_RegisterPinType( lRet = RegCreateKeyExW(hKey, wszKeyName, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hkeyDummy, NULL); hr = HRESULT_FROM_WIN32(lRet); - CloseHandle(hKey); + RegCloseKey(hKey); if (hkeyDummy) RegCloseKey(hkeyDummy); } @@ -1514,7 +1514,7 @@ static HRESULT WINAPI FilterMapper_UnregisterFilter(IFilterMapper * iface, CLSID { lRet = RegDeleteKeyW(hKey, wszClsid); hr = HRESULT_FROM_WIN32(lRet); - CloseHandle(hKey); + RegCloseKey(hKey); } if (SUCCEEDED(hr)) @@ -1536,7 +1536,7 @@ static HRESULT WINAPI FilterMapper_UnregisterFilter(IFilterMapper * iface, CLSID if (lRet != ERROR_SUCCESS) hr = HRESULT_FROM_WIN32(lRet); - CloseHandle(hKey); + RegCloseKey(hKey); } CoTaskMemFree(wszClsid); @@ -1598,7 +1598,7 @@ static HRESULT WINAPI FilterMapper_UnregisterPin(IFilterMapper * iface, CLSID Fi CoTaskMemFree(wszClsid); if (hKey) - CloseHandle(hKey); + RegCloseKey(hKey); return hr; }

1 0

Daniel Lehman : msvcrt: Invoke invalid_handler in _wcscpy_s.
by Alexandre Julliard 16 Aug '13

16 Aug '13

Module: wine Branch: master Commit: a0d8d1e2239b59c777862202d5dcbae2deb001ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0d8d1e2239b59c777862202d… Author: Daniel Lehman <dlehman(a)esri.com> Date: Fri Aug 2 10:58:57 2013 -0700 msvcrt: Invoke invalid_handler in _wcscpy_s. --- dlls/msvcrt/tests/string.c | 22 +++++++++++++++++++++- dlls/msvcrt/wcs.c | 13 ++++--------- 2 files changed, 25 insertions(+), 10 deletions(-) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 7edaa23..6e3f962 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -808,23 +808,33 @@ static void test_wcscpy_s(void) return; } + if (p_set_invalid_parameter_handler) + ok(p_set_invalid_parameter_handler(test_invalid_parameter_handler) == NULL, + "Invalid parameter handler was already set\n"); + /* Test NULL Dest */ + errno = EBADF; ret = p_wcscpy_s(NULL, 18, szLongText); ok(ret == EINVAL, "p_wcscpy_s expect EINVAL got %d\n", ret); + ok(errno == EINVAL, "expected errno EINVAL got %d\n", errno); /* Test NULL Source */ + errno = EBADF; szDest[0] = 'A'; ret = p_wcscpy_s(szDest, 18, NULL); ok(ret == EINVAL, "expected EINVAL got %d\n", ret); - ok(szDest[0] == 0, "szDest[0] not 0\n"); + ok(errno == EINVAL, "expected errno EINVAL got %d\n", errno); + ok(szDest[0] == 0, "szDest[0] not 0, got %c\n", szDest[0]); /* Test invalid size */ + errno = EBADF; szDest[0] = 'A'; ret = p_wcscpy_s(szDest, 0, szLongText); /* Later versions changed the return value for this case to EINVAL, * and don't modify the result if the dest size is 0. */ ok(ret == ERANGE || ret == EINVAL, "expected ERANGE/EINVAL got %d\n", ret); + ok(errno == ERANGE || errno == EINVAL, "expected errno ERANGE/EINVAL got %d\n", errno); ok(szDest[0] == 0 || ret == EINVAL, "szDest[0] not 0\n"); /* Copy same buffer size */ @@ -833,14 +843,20 @@ static void test_wcscpy_s(void) ok(lstrcmpW(szDest, szLongText) == 0, "szDest != szLongText\n"); /* Copy smaller buffer size */ + errno = EBADF; szDest[0] = 'A'; ret = p_wcscpy_s(szDestShort, 8, szLongText); ok(ret == ERANGE || ret == EINVAL, "expected ERANGE/EINVAL got %d\n", ret); + ok(errno == ERANGE || errno == EINVAL, "expected errno ERANGE/EINVAL got %d\n", errno); ok(szDestShort[0] == 0, "szDestShort[0] not 0\n"); if(!p_wcsncpy_s) { win_skip("wcsncpy_s not found\n"); + + if (p_set_invalid_parameter_handler) + ok(p_set_invalid_parameter_handler(NULL) == test_invalid_parameter_handler, + "Cannot reset invalid parameter handler\n"); return; } @@ -886,6 +902,10 @@ static void test_wcscpy_s(void) ok(ret == STRUNCATE, "expected ERROR_SUCCESS got %d\n", ret); ok(szDestShort[0]=='1' && szDestShort[1]=='1' && szDestShort[2]=='1' && szDestShort[3]=='1', "szDestShort = %s\n", wine_dbgstr_w(szDestShort)); + + if (p_set_invalid_parameter_handler) + ok(p_set_invalid_parameter_handler(NULL) == test_invalid_parameter_handler, + "Cannot reset invalid parameter handler\n"); } static void test__wcsupr_s(void) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index ca4fba6..a140e62 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1391,22 +1391,17 @@ INT CDECL MSVCRT_wcscpy_s( MSVCRT_wchar_t* wcDest, MSVCRT_size_t numElement, con { MSVCRT_size_t size = 0; - if(!wcDest || !numElement) - return MSVCRT_EINVAL; + if(!MSVCRT_CHECK_PMT(wcDest)) return MSVCRT_EINVAL; + if(!MSVCRT_CHECK_PMT(numElement)) return MSVCRT_EINVAL; wcDest[0] = 0; - if(!wcSrc) - { - return MSVCRT_EINVAL; - } + if(!MSVCRT_CHECK_PMT(wcSrc)) return MSVCRT_EINVAL; size = strlenW(wcSrc) + 1; - if(size > numElement) - { + if(!MSVCRT_CHECK_PMT_ERR(size <= numElement, MSVCRT_ERANGE)) return MSVCRT_ERANGE; - } memcpy( wcDest, wcSrc, size*sizeof(WCHAR) );

1 0

André Hentschel : msvcrt/tests: Fix dynamically loaded functions for ARM.
by Alexandre Julliard 16 Aug '13

16 Aug '13

Module: wine Branch: master Commit: 3d6ebecedbe46746dff1c3e0c1787db7e7ceadbc URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d6ebecedbe46746dff1c3e0c… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Aug 6 00:16:19 2013 +0200 msvcrt/tests: Fix dynamically loaded functions for ARM. --- dlls/msvcrt/tests/cpp.c | 50 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 50 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/tests/cpp.c b/dlls/msvcrt/tests/cpp.c index fc223c5..3693014 100644 --- a/dlls/msvcrt/tests/cpp.c +++ b/dlls/msvcrt/tests/cpp.c @@ -238,6 +238,55 @@ static BOOL InitFunctionPtrs(void) } else { +#ifdef __arm__ + SETNOFAIL(poperator_new, "??_U(a)YAPAXI@Z"); + SETNOFAIL(poperator_delete, "??_V(a)YAXPAX@Z"); + + SET(pexception_ctor, "??0exception(a)std@@QAA(a)ABQBD@Z"); + SET(pexception_copy_ctor, "??0exception(a)std@@QAA(a)ABV01@@Z"); + SET(pexception_default_ctor, "??0exception(a)std@@QAA(a)XZ"); + SET(pexception_dtor, "??1exception(a)std@@UAA(a)XZ"); + SET(pexception_opequals, "??4exception(a)std@@QAAAAV01(a)ABV01@@Z"); + SET(pexception_what, "?what(a)exception@std@@UBAPBDXZ"); + SET(pexception_vector_dtor, "??_Eexception@@UAEPAXI(a)Z");/**/ + SET(pexception_scalar_dtor, "??_Gexception@@UAEPAXI(a)Z");/**/ + + SET(pbad_typeid_ctor, "??0bad_typeid(a)std@@QAA(a)PBD@Z"); + SETNOFAIL(pbad_typeid_ctor_closure, "??_Fbad_typeid(a)std@@QAAXXZ"); + SET(pbad_typeid_copy_ctor, "??0bad_typeid(a)std@@QAA(a)ABV01@@Z"); + SET(pbad_typeid_dtor, "??1bad_typeid(a)std@@UAA(a)XZ"); + SET(pbad_typeid_opequals, "??4bad_typeid(a)std@@QAAAAV01(a)ABV01@@Z"); + SET(pbad_typeid_what, "?what(a)exception@std@@UBAPBDXZ"); + SET(pbad_typeid_vector_dtor, "??_Ebad_cast@@UAEPAXI(a)Z"); + SET(pbad_typeid_scalar_dtor, "??_Gbad_cast@@UAEPAXI(a)Z"); + + SETNOFAIL(pbad_cast_ctor, "??0bad_cast@@QAE(a)ABQBD@Z"); + if (!pbad_cast_ctor) + SET(pbad_cast_ctor, "??0bad_cast(a)std@@AAA(a)PBQBD@Z"); + SETNOFAIL(pbad_cast_ctor2, "??0bad_cast(a)std@@QAA(a)PBD@Z"); + SETNOFAIL(pbad_cast_ctor_closure, "??_Fbad_cast(a)std@@QAAXXZ"); + /* FIXME: No ARM equivalent for "??0bad_cast@@QAE(a)ABV0@@Z" */ + SET(pbad_cast_dtor, "??1bad_cast(a)std@@UAA(a)XZ"); + SET(pbad_cast_opequals, "??4bad_cast(a)std@@QAAAAV01(a)ABV01@@Z"); + SET(pbad_cast_what, "?what(a)exception@std@@UBAPBDXZ"); + SET(pbad_cast_vector_dtor, "??_Ebad_cast@@UAEPAXI(a)Z"); + SET(pbad_cast_scalar_dtor, "??_Gbad_cast@@UAEPAXI(a)Z"); + + SET(p__non_rtti_object_ctor, "??0__non_rtti_object(a)std@@QAA(a)PBD@Z"); + SET(p__non_rtti_object_copy_ctor, "??0__non_rtti_object(a)std@@QAA(a)ABV01@@Z"); + SET(p__non_rtti_object_dtor, "??1__non_rtti_object(a)std@@UAA(a)XZ"); + SET(p__non_rtti_object_opequals, "??4__non_rtti_object(a)std@@QAAAAV01(a)ABV01@@Z"); + SET(p__non_rtti_object_what, "?what(a)exception@std@@UBAPBDXZ"); + SET(p__non_rtti_object_vector_dtor, "??_E__non_rtti_object@@UAEPAXI(a)Z"); + SET(p__non_rtti_object_scalar_dtor, "??_G__non_rtti_object@@UAEPAXI(a)Z"); + + SET(ptype_info_dtor, "??1type_info@@UAA(a)XZ"); + SET(ptype_info_raw_name, "?raw_name(a)type_info@@QBAPBDXZ"); + SET(ptype_info_name, "?name(a)type_info@@QBEPBDXZ"); + SET(ptype_info_before, "?before(a)type_info@@QBEHABV1@@Z"); + SET(ptype_info_opequals_equals, "??8type_info@@QBA_NABV0@@Z"); + SET(ptype_info_opnot_equals, "??9type_info@@QBA_NABV0@@Z"); +#else SETNOFAIL(poperator_new, "??_U(a)YAPAXI@Z"); SETNOFAIL(poperator_delete, "??_V(a)YAXPAX@Z"); @@ -285,6 +334,7 @@ static BOOL InitFunctionPtrs(void) SET(ptype_info_before, "?before(a)type_info@@QBEHABV1@@Z"); SET(ptype_info_opequals_equals, "??8type_info@@QBEHABV0@@Z"); SET(ptype_info_opnot_equals, "??9type_info@@QBEHABV0@@Z"); +#endif /* __arm__ */ } if (!poperator_new)

1 0

André Hentschel : include/ddk: Add USB_HUB_DESCRIPTOR.
by Alexandre Julliard 16 Aug '13

16 Aug '13

Module: wine Branch: master Commit: 545bbb13155eae97b79981ed655f33b25158237d URL: http://source.winehq.org/git/wine.git/?a=commit;h=545bbb13155eae97b79981ed6… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Aug 7 00:01:40 2013 +0200 include/ddk: Add USB_HUB_DESCRIPTOR. --- include/ddk/usb100.h | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/include/ddk/usb100.h b/include/ddk/usb100.h index b013f21..7ec7493 100644 --- a/include/ddk/usb100.h +++ b/include/ddk/usb100.h @@ -102,6 +102,17 @@ typedef struct _USB_COMMON_DESCRIPTOR { } USB_COMMON_DESCRIPTOR; typedef struct _USB_COMMON_DESCRIPTOR *PUSB_COMMON_DESCRIPTOR; +typedef struct _USB_HUB_DESCRIPTOR { + UCHAR bDescriptorLength; + UCHAR bDescriptorType; + UCHAR bNumberOfPorts; + USHORT wHubCharacteristics; + UCHAR bPowerOnToPowerGood; + UCHAR bHubControlCurrent; + UCHAR bRemoveAndPowerMask[64]; +} USB_HUB_DESCRIPTOR; +typedef struct _USB_HUB_DESCRIPTOR *PUSB_HUB_DESCRIPTOR; + #include <poppack.h> #endif

1 0

André Hentschel : include/ddk: Add DEVICE_RELATIONS and DEVICE_INTERFACE_CHANGE_NOTIFICATION.
by Alexandre Julliard 16 Aug '13

16 Aug '13

Module: wine Branch: master Commit: 8bbbf7cd25c37d9896ccac743dc3ae68c54b36a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8bbbf7cd25c37d9896ccac743… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Aug 7 00:01:47 2013 +0200 include/ddk: Add DEVICE_RELATIONS and DEVICE_INTERFACE_CHANGE_NOTIFICATION. --- include/ddk/wdm.h | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 35773a0..4869a3c 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -267,6 +267,7 @@ typedef struct _WAIT_CONTEXT_BLOCK { #define IRP_MN_QUERY_BUS_INFORMATION 0x15 #define IRP_MN_DEVICE_USAGE_NOTIFICATION 0x16 #define IRP_MN_SURPRISE_REMOVAL 0x17 +#define IRP_MN_QUERY_LEGACY_BUS_INFORMATION 0x18 #define IRP_QUOTA_CHARGED 0x01 #define IRP_ALLOCATED_MUST_SUCCEED 0x02 @@ -319,6 +320,12 @@ typedef struct _DEVICE_OBJECT { } DEVICE_OBJECT; typedef struct _DEVICE_OBJECT *PDEVICE_OBJECT; +typedef struct _DEVICE_RELATIONS { + ULONG Count; + PDEVICE_OBJECT Objects[1]; +} DEVICE_RELATIONS; +typedef struct _DEVICE_RELATIONS *PDEVICE_RELATIONS; + typedef struct _DRIVER_EXTENSION { struct _DRIVER_OBJECT *DriverObject; PVOID AddDevice; @@ -585,6 +592,14 @@ typedef struct _DEVICE_CAPABILITIES { ULONG D3Latency; } DEVICE_CAPABILITIES, *PDEVICE_CAPABILITIES; +typedef struct _DEVICE_INTERFACE_CHANGE_NOTIFICATION { + USHORT Version; + USHORT Size; + GUID Event; + GUID InterfaceClassGuid; + PUNICODE_STRING SymbolicLinkName; +} DEVICE_INTERFACE_CHANGE_NOTIFICATION, *PDEVICE_INTERFACE_CHANGE_NOTIFICATION; + typedef enum _INTERFACE_TYPE { InterfaceTypeUndefined = -1, Internal,

1 0

Bruno Jesus : ws2_32: Implement WSAEnumProtocols[A|W] using a helper function.
by Alexandre Julliard 16 Aug '13

16 Aug '13

Module: wine Branch: master Commit: 5fa343047f187d9a3733d460277be541f70f53de URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fa343047f187d9a3733d4602… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Aug 7 00:18:17 2013 -0300 ws2_32: Implement WSAEnumProtocols[A|W] using a helper function. --- dlls/ws2_32/protocol.c | 61 ++++++++++++++++++++++------------------------- 1 files changed, 29 insertions(+), 32 deletions(-) diff --git a/dlls/ws2_32/protocol.c b/dlls/ws2_32/protocol.c index 98e7c38..c039e7c 100644 --- a/dlls/ws2_32/protocol.c +++ b/dlls/ws2_32/protocol.c @@ -204,22 +204,23 @@ static INT WINSOCK_EnterSingleProtocolA( INT protocol, WSAPROTOCOL_INFOA* info ) return ret; } -/***************************************************************************** - * WSAEnumProtocolsA [WS2_32.@] - * - * see function WSAEnumProtocolsW - */ -INT WINAPI WSAEnumProtocolsA( LPINT protocols, LPWSAPROTOCOL_INFOA buffer, LPDWORD len ) +static INT WINSOCK_EnumProtocols( BOOL unicode, LPINT protocols, LPWSAPROTOCOL_INFOW buffer, LPDWORD len ) { INT i = 0; DWORD size = 0; INT local[] = { WS_IPPROTO_TCP, WS_IPPROTO_UDP, NSPROTO_IPX, NSPROTO_SPX, NSPROTO_SPXII, 0 }; + union _info + { + LPWSAPROTOCOL_INFOA a; + LPWSAPROTOCOL_INFOW w; + } info; + info.w = buffer; if (!protocols) protocols = local; while (protocols[i]) i++; - size = i * sizeof(WSAPROTOCOL_INFOA); + size = i * (unicode ? sizeof(WSAPROTOCOL_INFOW) : sizeof(WSAPROTOCOL_INFOA)); if (*len < size || !buffer) { @@ -230,13 +231,31 @@ INT WINAPI WSAEnumProtocolsA( LPINT protocols, LPWSAPROTOCOL_INFOA buffer, LPDWO for (i = 0; protocols[i]; i++) { - if (WINSOCK_EnterSingleProtocolA( protocols[i], &buffer[i] ) == SOCKET_ERROR) - return i; + if (unicode) + { + if (WINSOCK_EnterSingleProtocolW( protocols[i], &info.w[i] ) == SOCKET_ERROR) + break; + } + else + { + if (WINSOCK_EnterSingleProtocolA( protocols[i], &info.a[i] ) == SOCKET_ERROR) + break; + } } return i; } /***************************************************************************** + * WSAEnumProtocolsA [WS2_32.@] + * + * see function WSAEnumProtocolsW + */ +INT WINAPI WSAEnumProtocolsA( LPINT protocols, LPWSAPROTOCOL_INFOA buffer, LPDWORD len ) +{ + return WINSOCK_EnumProtocols( FALSE, protocols, (LPWSAPROTOCOL_INFOW) buffer, len); +} + +/***************************************************************************** * WSAEnumProtocolsW [WS2_32.@] * * Retrieves information about specified set of active network protocols. @@ -275,29 +294,7 @@ INT WINAPI WSAEnumProtocolsA( LPINT protocols, LPWSAPROTOCOL_INFOA buffer, LPDWO */ INT WINAPI WSAEnumProtocolsW( LPINT protocols, LPWSAPROTOCOL_INFOW buffer, LPDWORD len ) { - INT i = 0; - DWORD size = 0; - INT local[] = { WS_IPPROTO_TCP, WS_IPPROTO_UDP, NSPROTO_IPX, NSPROTO_SPX, NSPROTO_SPXII, 0 }; - - if (!protocols) protocols = local; - - while (protocols[i]) i++; - - size = i * sizeof(WSAPROTOCOL_INFOW); - - if (*len < size || !buffer) - { - *len = size; - WSASetLastError(WSAENOBUFS); - return SOCKET_ERROR; - } - - for (i = 0; protocols[i]; i++) - { - if (WINSOCK_EnterSingleProtocolW( protocols[i], &buffer[i] ) == SOCKET_ERROR) - return i; - } - return i; + return WINSOCK_EnumProtocols( TRUE, protocols, buffer, len); } /*****************************************************************************

1 0

Daniel Jelinski : comctl32: Do not rearrange treeview when collapsing already collapsed item.
by Alexandre Julliard 16 Aug '13

16 Aug '13

Module: wine Branch: master Commit: 0ba24895f667db5b0cf397151f04518c50697007 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ba24895f667db5b0cf397151… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Sun Aug 11 22:25:54 2013 +0200 comctl32: Do not rearrange treeview when collapsing already collapsed item. --- dlls/comctl32/treeview.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index c3ce406..c73fb54 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -3296,6 +3296,8 @@ TREEVIEW_Collapse(TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *item, TREEVIEW_RemoveAllChildren(infoPtr, item); item->cChildren = old_cChildren; } + if (!wasExpanded) + return FALSE; if (item->firstChild) {

1 0

Andrey Turkin : ntdll/tests: Test FileDispositionInformation file class.
by Alexandre Julliard 16 Aug '13

16 Aug '13

Module: wine Branch: master Commit: 2df4caa6a13435f26d85be8b5ef202368d976435 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2df4caa6a13435f26d85be8b5… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Mon Aug 12 19:09:13 2013 +0400 ntdll/tests: Test FileDispositionInformation file class. --- dlls/ntdll/tests/file.c | 153 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 153 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index c077b71..617a92c 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -1299,6 +1299,158 @@ static void test_file_both_information(void) CloseHandle( h ); } +static void test_file_disposition_information(void) +{ + char buffer[MAX_PATH + 16]; + DWORD dirpos; + HANDLE handle, handle2; + NTSTATUS res; + IO_STATUS_BLOCK io; + FILE_DISPOSITION_INFORMATION fdi; + BOOL fileDeleted; + + /* cannot set disposition on file not opened with delete access */ + GetTempFileNameA( ".", "dis", 0, buffer ); + handle = CreateFileA(buffer, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); + ok( handle != INVALID_HANDLE_VALUE, "failed to create temp file\n" ); + res = pNtQueryInformationFile( handle, &io, &fdi, sizeof fdi, FileDispositionInformation ); + ok( res == STATUS_INVALID_INFO_CLASS || res == STATUS_NOT_IMPLEMENTED, "Unexpected NtQueryInformationFile result (expected STATUS_INVALID_INFO_CLASS, got %x)\n", res ); + fdi.DoDeleteFile = TRUE; + res = pNtSetInformationFile( handle, &io, &fdi, sizeof fdi, FileDispositionInformation ); + todo_wine + ok( res == STATUS_ACCESS_DENIED, "unexpected FileDispositionInformation result (expected STATUS_ACCESS_DENIED, got %x)\n", res ); + CloseHandle( handle ); + fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; + ok( !fileDeleted, "File shouldn't have been deleted\n" ); + DeleteFileA( buffer ); + + /* can set disposition on file opened with proper access */ + GetTempFileNameA( ".", "dis", 0, buffer ); + handle = CreateFileA(buffer, GENERIC_WRITE | DELETE, 0, NULL, CREATE_ALWAYS, 0, 0); + ok( handle != INVALID_HANDLE_VALUE, "failed to create temp file\n" ); + fdi.DoDeleteFile = TRUE; + res = pNtSetInformationFile( handle, &io, &fdi, sizeof fdi, FileDispositionInformation ); + todo_wine + ok( res == STATUS_SUCCESS, "unexpected FileDispositionInformation result (expected STATUS_SUCCESS, got %x)\n", res ); + CloseHandle( handle ); + fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; + todo_wine + ok( fileDeleted, "File should have been deleted\n" ); + DeleteFileA( buffer ); + + /* cannot set disposition on readonly file */ + GetTempFileNameA( ".", "dis", 0, buffer ); + handle = CreateFileA(buffer, GENERIC_WRITE | DELETE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_READONLY, 0); + ok( handle != INVALID_HANDLE_VALUE, "failed to create temp file\n" ); + fdi.DoDeleteFile = TRUE; + res = pNtSetInformationFile( handle, &io, &fdi, sizeof fdi, FileDispositionInformation ); + todo_wine + ok( res == STATUS_CANNOT_DELETE, "unexpected FileDispositionInformation result (expected STATUS_CANNOT_DELETE, got %x)\n", res ); + CloseHandle( handle ); + fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; + ok( !fileDeleted, "File shouldn't have been deleted\n" ); + SetFileAttributesA( buffer, FILE_ATTRIBUTE_NORMAL ); + DeleteFileA( buffer ); + + /* can set disposition on file and then reset it */ + GetTempFileNameA( ".", "dis", 0, buffer ); + handle = CreateFileA(buffer, GENERIC_WRITE | DELETE, 0, NULL, CREATE_ALWAYS, 0, 0); + ok( handle != INVALID_HANDLE_VALUE, "failed to create temp file\n" ); + fdi.DoDeleteFile = TRUE; + res = pNtSetInformationFile( handle, &io, &fdi, sizeof fdi, FileDispositionInformation ); + todo_wine + ok( res == STATUS_SUCCESS, "unexpected FileDispositionInformation result (expected STATUS_SUCCESS, got %x)\n", res ); + fdi.DoDeleteFile = FALSE; + res = pNtSetInformationFile( handle, &io, &fdi, sizeof fdi, FileDispositionInformation ); + todo_wine + ok( res == STATUS_SUCCESS, "unexpected FileDispositionInformation result (expected STATUS_SUCCESS, got %x)\n", res ); + CloseHandle( handle ); + fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; + ok( !fileDeleted, "File shouldn't have been deleted\n" ); + DeleteFileA( buffer ); + + /* Delete-on-close flag doesn't change file disposition until a handle is closed */ + GetTempFileNameA( ".", "dis", 0, buffer ); + handle = CreateFileA(buffer, GENERIC_WRITE | DELETE, 0, NULL, CREATE_ALWAYS, FILE_FLAG_DELETE_ON_CLOSE, 0); + ok( handle != INVALID_HANDLE_VALUE, "failed to create temp file\n" ); + fdi.DoDeleteFile = FALSE; + res = pNtSetInformationFile( handle, &io, &fdi, sizeof fdi, FileDispositionInformation ); + todo_wine + ok( res == STATUS_SUCCESS, "unexpected FileDispositionInformation result (expected STATUS_SUCCESS, got %x)\n", res ); + CloseHandle( handle ); + fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; + ok( fileDeleted, "File should have been deleted\n" ); + DeleteFileA( buffer ); + + /* Delete-on-close flag sets disposition when a handle is closed and then it could be changed back */ + GetTempFileNameA( ".", "dis", 0, buffer ); + handle = CreateFileA(buffer, GENERIC_WRITE | DELETE, 0, NULL, CREATE_ALWAYS, FILE_FLAG_DELETE_ON_CLOSE, 0); + ok( handle != INVALID_HANDLE_VALUE, "failed to create temp file\n" ); + ok( DuplicateHandle( GetCurrentProcess(), handle, GetCurrentProcess(), &handle2, 0, FALSE, DUPLICATE_SAME_ACCESS ), "DuplicateHandle failed" ); + CloseHandle( handle ); + fdi.DoDeleteFile = FALSE; + res = pNtSetInformationFile( handle2, &io, &fdi, sizeof fdi, FileDispositionInformation ); + todo_wine + ok( res == STATUS_SUCCESS, "unexpected FileDispositionInformation result (expected STATUS_SUCCESS, got %x)\n", res ); + CloseHandle( handle2 ); + fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; + ok( fileDeleted, "File should have been deleted\n" ); + DeleteFileA( buffer ); + + /* can set disposition on a directory opened with proper access */ + GetTempFileNameA( ".", "dis", 0, buffer ); + DeleteFileA( buffer ); + ok( CreateDirectoryA( buffer, NULL ), "CreateDirectory failed\n" ); + handle = CreateFileA(buffer, DELETE, 0, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0); + ok( handle != INVALID_HANDLE_VALUE, "failed to open a directory\n" ); + fdi.DoDeleteFile = TRUE; + res = pNtSetInformationFile( handle, &io, &fdi, sizeof fdi, FileDispositionInformation ); + todo_wine + ok( res == STATUS_SUCCESS, "unexpected FileDispositionInformation result (expected STATUS_SUCCESS, got %x)\n", res ); + CloseHandle( handle ); + fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; + todo_wine + ok( fileDeleted, "Directory should have been deleted\n" ); + RemoveDirectoryA( buffer ); + + /* RemoveDirectory sets directory disposition and it can be undone */ + GetTempFileNameA( ".", "dis", 0, buffer ); + DeleteFileA( buffer ); + ok( CreateDirectoryA( buffer, NULL ), "CreateDirectory failed\n" ); + handle = CreateFileA(buffer, DELETE, 0, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0); + ok( handle != INVALID_HANDLE_VALUE, "failed to open a directory\n" ); + RemoveDirectoryA( buffer ); + fdi.DoDeleteFile = FALSE; + res = pNtSetInformationFile( handle, &io, &fdi, sizeof fdi, FileDispositionInformation ); + todo_wine + ok( res == STATUS_SUCCESS, "unexpected FileDispositionInformation result (expected STATUS_SUCCESS, got %x)\n", res ); + CloseHandle( handle ); + fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; + ok( !fileDeleted, "Directory shouldn't have been deleted\n" ); + RemoveDirectoryA( buffer ); + + /* cannot set disposition on a non-empty directory */ + GetTempFileNameA( ".", "dis", 0, buffer ); + DeleteFileA( buffer ); + ok( CreateDirectoryA( buffer, NULL ), "CreateDirectory failed\n" ); + handle = CreateFileA(buffer, DELETE, 0, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0); + ok( handle != INVALID_HANDLE_VALUE, "failed to open a directory\n" ); + dirpos = lstrlenA( buffer ); + lstrcpyA( buffer + dirpos, "\\tst" ); + handle2 = CreateFileA(buffer, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); + CloseHandle( handle2 ); + fdi.DoDeleteFile = TRUE; + res = pNtSetInformationFile( handle, &io, &fdi, sizeof fdi, FileDispositionInformation ); + todo_wine + ok( res == STATUS_DIRECTORY_NOT_EMPTY, "unexpected FileDispositionInformation result (expected STATUS_DIRECTORY_NOT_EMPTY, got %x)\n", res ); + DeleteFileA( buffer ); + buffer[dirpos] = '\0'; + CloseHandle( handle ); + fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; + ok( !fileDeleted, "Directory shouldn't have been deleted\n" ); + RemoveDirectoryA( buffer ); +} + static void test_iocompletion(void) { HANDLE h = INVALID_HANDLE_VALUE; @@ -1815,6 +1967,7 @@ START_TEST(file) test_file_both_information(); test_file_name_information(); test_file_all_name_information(); + test_file_disposition_information(); test_query_volume_information_file(); test_query_attribute_information_file(); }

1 0

Charles Davis : winemac.drv: Advertise some legacy WGL extensions in the GL_EXTENSIONS string.
by Alexandre Julliard 16 Aug '13

16 Aug '13

Module: wine Branch: master Commit: 8a041504c8b1dbfdba5c32d889cfd59ffae23b87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a041504c8b1dbfdba5c32d88… Author: Charles Davis <cdavis5x(a)gmail.com> Date: Mon Aug 12 15:07:04 2013 -0600 winemac.drv: Advertise some legacy WGL extensions in the GL_EXTENSIONS string. --- dlls/winemac.drv/opengl.c | 34 +++++++++++++++++++++++++++++++++- 1 files changed, 33 insertions(+), 1 deletions(-) diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index fb294d1..7327e12 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -104,6 +104,7 @@ static void (*pglCopyColorTable)(GLenum target, GLenum internalformat, GLint x, static void (*pglCopyPixels)(GLint x, GLint y, GLsizei width, GLsizei height, GLenum type); static void (*pglFlush)(void); static void (*pglFlushRenderAPPLE)(void); +static const GLubyte *(*pglGetString)(GLenum name); static void (*pglReadPixels)(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, void *pixels); static void (*pglViewport)(GLint x, GLint y, GLsizei width, GLsizei height); @@ -1186,6 +1187,9 @@ static const pixel_format *get_pixel_format(int format, BOOL allow_nondisplayabl static BOOL init_gl_info(void) { + static char legacy_extensions[] = " WGL_EXT_extensions_string"; + static const char legacy_ext_swap_control[] = " WGL_EXT_swap_control"; + CGDirectDisplayID display = CGMainDisplayID(); CGOpenGLDisplayMask displayMask = CGDisplayIDToOpenGLDisplayMask(display); CGLPixelFormatAttribute attribs[] = { @@ -1198,6 +1202,7 @@ static BOOL init_gl_info(void) CGLContextObj context; CGLContextObj old_context = CGLGetCurrentContext(); const char *str; + size_t length; err = CGLChoosePixelFormat(attribs, &pix, &virtualScreens); if (err != kCGLNoError || !pix) @@ -1226,8 +1231,14 @@ static BOOL init_gl_info(void) gl_info.glVersion = HeapAlloc(GetProcessHeap(), 0, strlen(str) + 1); strcpy(gl_info.glVersion, str); str = (const char*)opengl_funcs.gl.p_glGetString(GL_EXTENSIONS); - gl_info.glExtensions = HeapAlloc(GetProcessHeap(), 0, strlen(str) + 1); + length = strlen(str) + sizeof(legacy_extensions); + if (allow_vsync) + length += strlen(legacy_ext_swap_control); + gl_info.glExtensions = HeapAlloc(GetProcessHeap(), 0, length); strcpy(gl_info.glExtensions, str); + strcat(gl_info.glExtensions, legacy_extensions); + if (allow_vsync) + strcat(gl_info.glExtensions, legacy_ext_swap_control); opengl_funcs.gl.p_glGetIntegerv(GL_MAX_VIEWPORT_DIMS, gl_info.max_viewport_dims); @@ -1516,6 +1527,26 @@ static void macdrv_glFlush(void) /********************************************************************** + * macdrv_glGetString + * + * Hook into glGetString in order to return some legacy WGL extensions + * that couldn't be advertised via the standard + * WGL_ARB_extensions_string mechanism. Some programs, especially + * older ones, expect to find certain older extensions, such as + * WGL_EXT_extensions_string itself, in the standard GL extensions + * string, and won't query any other WGL extensions unless they find + * that particular extension there. + */ +static const GLubyte *macdrv_glGetString(GLenum name) +{ + if (name == GL_EXTENSIONS && gl_info.glExtensions) + return (const GLubyte *)gl_info.glExtensions; + else + return pglGetString(name); +} + + +/********************************************************************** * macdrv_glReadPixels * * Hook into glReadPixels as part of the implementation of @@ -3054,6 +3085,7 @@ static BOOL init_opengl(void) #define REDIRECT(func) \ do { p##func = opengl_funcs.gl.p_##func; opengl_funcs.gl.p_##func = macdrv_##func; } while(0) REDIRECT(glCopyPixels); + REDIRECT(glGetString); REDIRECT(glReadPixels); REDIRECT(glViewport); if (skip_single_buffer_flushes)

1 0