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

Hans Leidekker : wininet: Handle NULL input string in str_to_buffer.
by Alexandre Julliard 31 Jul '13

31 Jul '13

Module: wine Branch: master Commit: 0c9321eb0f45ca3cd32da116b74c205e7b2127da URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c9321eb0f45ca3cd32da116b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jul 30 11:09:19 2013 +0200 wininet: Handle NULL input string in str_to_buffer. --- dlls/wininet/http.c | 17 ++++++++-- dlls/wininet/tests/http.c | 73 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 87 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index c77f77a..b6ed7df 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2032,24 +2032,35 @@ static DWORD str_to_buffer(const WCHAR *str, void *buffer, DWORD *size, BOOL uni int len; if (unicode) { - len = strlenW(str); + WCHAR *buf = buffer; + + if (str) len = strlenW(str); + else len = 0; if (*size < (len + 1) * sizeof(WCHAR)) { *size = (len + 1) * sizeof(WCHAR); return ERROR_INSUFFICIENT_BUFFER; } - strcpyW(buffer, str); + if (str) strcpyW(buf, str); + else buf[0] = 0; + *size = len; return ERROR_SUCCESS; } else { - len = WideCharToMultiByte(CP_ACP, 0, str, -1, buffer, *size, NULL, NULL); + char *buf = buffer; + + if (str) len = WideCharToMultiByte(CP_ACP, 0, str, -1, NULL, 0, NULL, NULL); + else len = 1; if (*size < len) { *size = len; return ERROR_INSUFFICIENT_BUFFER; } + if (str) WideCharToMultiByte(CP_ACP, 0, str, -1, buf, *size, NULL, NULL); + else buf[0] = 0; + *size = len - 1; return ERROR_SUCCESS; } diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 458554f..f04fc7b 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -2249,6 +2249,71 @@ static void test_proxy_direct(int port) hr = HttpOpenRequest(hc, NULL, "/test2", NULL, NULL, NULL, 0, 0); ok(hr != NULL, "HttpOpenRequest failed\n"); + sz = 0; + SetLastError(0xdeadbeef); + r = InternetQueryOption(hr, INTERNET_OPTION_PROXY_PASSWORD, NULL, &sz); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %u\n", GetLastError()); + ok(!r, "unexpected success\n"); + ok(sz == 1, "got %u\n", sz); + + sz = 0; + SetLastError(0xdeadbeef); + r = InternetQueryOption(hr, INTERNET_OPTION_PROXY_USERNAME, NULL, &sz); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %u\n", GetLastError()); + ok(!r, "unexpected success\n"); + ok(sz == 1, "got %u\n", sz); + + sz = sizeof(buffer); + SetLastError(0xdeadbeef); + r = InternetQueryOption(hr, INTERNET_OPTION_PROXY_PASSWORD, buffer, &sz); + ok(r, "unexpected failure %u\n", GetLastError()); + ok(!sz, "got %u\n", sz); + + sz = sizeof(buffer); + SetLastError(0xdeadbeef); + r = InternetQueryOption(hr, INTERNET_OPTION_PROXY_USERNAME, buffer, &sz); + ok(r, "unexpected failure %u\n", GetLastError()); + ok(!sz, "got %u\n", sz); + + sz = 0; + SetLastError(0xdeadbeef); + r = InternetQueryOption(hr, INTERNET_OPTION_PASSWORD, NULL, &sz); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %u\n", GetLastError()); + ok(!r, "unexpected success\n"); + ok(sz == 1, "got %u\n", sz); + + sz = 0; + SetLastError(0xdeadbeef); + r = InternetQueryOption(hr, INTERNET_OPTION_USERNAME, NULL, &sz); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %u\n", GetLastError()); + ok(!r, "unexpected success\n"); + ok(sz == 1, "got %u\n", sz); + + sz = sizeof(buffer); + SetLastError(0xdeadbeef); + r = InternetQueryOption(hr, INTERNET_OPTION_PASSWORD, buffer, &sz); + ok(r, "unexpected failure %u\n", GetLastError()); + ok(!sz, "got %u\n", sz); + + sz = sizeof(buffer); + SetLastError(0xdeadbeef); + r = InternetQueryOption(hr, INTERNET_OPTION_USERNAME, buffer, &sz); + ok(r, "unexpected failure %u\n", GetLastError()); + ok(!sz, "got %u\n", sz); + + sz = 0; + SetLastError(0xdeadbeef); + r = InternetQueryOption(hr, INTERNET_OPTION_URL, NULL, &sz); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %u\n", GetLastError()); + ok(!r, "unexpected success\n"); + ok(sz == 34, "got %u\n", sz); + + sz = sizeof(buffer); + SetLastError(0xdeadbeef); + r = InternetQueryOption(hr, INTERNET_OPTION_URL, buffer, &sz); + ok(r, "unexpected failure %u\n", GetLastError()); + ok(sz == 33, "got %u\n", sz); + r = HttpSendRequest(hr, NULL, 0, NULL, 0); ok(r || broken(!r), "HttpSendRequest failed %u\n", GetLastError()); if (!r) @@ -2270,6 +2335,14 @@ static void test_proxy_direct(int port) ok(r, "failed to set user\n"); buffer[0] = 0; + sz = 3; + SetLastError(0xdeadbeef); + r = InternetQueryOption(hr, INTERNET_OPTION_PROXY_USERNAME, buffer, &sz); + ok(!r, "unexpected failure %u\n", GetLastError()); + ok(!buffer[0], "got %s\n", buffer); + ok(sz == strlen(username) + 1, "got %u\n", sz); + + buffer[0] = 0; sz = 0; SetLastError(0xdeadbeef); r = InternetQueryOption(hr, INTERNET_OPTION_PROXY_USERNAME, buffer, &sz);

1 0

Bruno Jesus : ws2_32: Fix service flags returned from TCP and UDP protocols .
by Alexandre Julliard 31 Jul '13

31 Jul '13

Module: wine Branch: master Commit: 63fb7a798c8ed6b97f489bd47b7297938fde21ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=63fb7a798c8ed6b97f489bd47… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Jul 31 02:02:18 2013 -0300 ws2_32: Fix service flags returned from TCP and UDP protocols. --- dlls/ws2_32/protocol.c | 4 +- dlls/ws2_32/tests/protocol.c | 61 +++++++++++++++++++++++++++++++++++------- 2 files changed, 53 insertions(+), 12 deletions(-) diff --git a/dlls/ws2_32/protocol.c b/dlls/ws2_32/protocol.c index 9939257..fa72de8 100644 --- a/dlls/ws2_32/protocol.c +++ b/dlls/ws2_32/protocol.c @@ -96,7 +96,7 @@ static INT WINSOCK_EnterSingleProtocolW( INT protocol, WSAPROTOCOL_INFOW* info ) switch (protocol) { case WS_IPPROTO_TCP: - info->dwServiceFlags1 = XP1_PARTIAL_MESSAGE | XP1_EXPEDITED_DATA | + info->dwServiceFlags1 = XP1_IFS_HANDLES | XP1_EXPEDITED_DATA | XP1_GRACEFUL_CLOSE | XP1_GUARANTEED_ORDER | XP1_GUARANTEED_DELIVERY; info->ProviderId = ProviderIdIP; @@ -111,7 +111,7 @@ static INT WINSOCK_EnterSingleProtocolW( INT protocol, WSAPROTOCOL_INFOW* info ) break; case WS_IPPROTO_UDP: - info->dwServiceFlags1 = XP1_PARTIAL_MESSAGE | XP1_SUPPORT_BROADCAST | + info->dwServiceFlags1 = XP1_IFS_HANDLES | XP1_SUPPORT_BROADCAST | XP1_SUPPORT_MULTIPOINT | XP1_MESSAGE_ORIENTED | XP1_CONNECTIONLESS; info->ProviderId = ProviderIdIP; diff --git a/dlls/ws2_32/tests/protocol.c b/dlls/ws2_32/tests/protocol.c index 368955b..2b95381 100644 --- a/dlls/ws2_32/tests/protocol.c +++ b/dlls/ws2_32/tests/protocol.c @@ -26,22 +26,55 @@ #include "wine/test.h" +/* TCP and UDP over IP fixed set of service flags */ +#define TCPIP_SERVICE_FLAGS (XP1_GUARANTEED_DELIVERY \ + | XP1_GUARANTEED_ORDER \ + | XP1_GRACEFUL_CLOSE \ + | XP1_EXPEDITED_DATA \ + | XP1_IFS_HANDLES) + +#define UDPIP_SERVICE_FLAGS (XP1_CONNECTIONLESS \ + | XP1_MESSAGE_ORIENTED \ + | XP1_SUPPORT_BROADCAST \ + | XP1_SUPPORT_MULTIPOINT \ + | XP1_IFS_HANDLES) + +static void test_service_flags(int family, int version, int socktype, int protocol, DWORD testflags) +{ + DWORD expectedflags = 0; + if (socktype == SOCK_STREAM && protocol == IPPROTO_TCP) + expectedflags = TCPIP_SERVICE_FLAGS; + if (socktype == SOCK_DGRAM && protocol == IPPROTO_UDP) + expectedflags = UDPIP_SERVICE_FLAGS; + + /* check if standard TCP and UDP protocols are offering the correct service flags */ + if ((family == AF_INET || family == AF_INET6) && version == 2 && expectedflags) + { + /* QOS may or may not be installed */ + testflags &= ~XP1_QOS_SUPPORTED; + ok(expectedflags == testflags, + "Incorrect flags, expected 0x%x, received 0x%x\n", + expectedflags, testflags); + } +} static void test_WSAEnumProtocolsA(void) { INT ret; - DWORD len = 0; + DWORD len = 0, error; WSAPROTOCOL_INFOA info, *buffer; ret = WSAEnumProtocolsA( NULL, NULL, &len ); - ok( ret == SOCKET_ERROR, "WSAEnumProtocolsA() succeeded unexpectedly: %d\n", - WSAGetLastError() ); + ok( ret == SOCKET_ERROR, "WSAEnumProtocolsA() succeeded unexpectedly\n"); + error = WSAGetLastError(); + ok( error == WSAENOBUFS, "Expected 10055, received %d\n", error); len = 0; ret = WSAEnumProtocolsA( NULL, &info, &len ); - ok( ret == SOCKET_ERROR, "WSAEnumProtocolsA() succeeded unexpectedly: %d\n", - WSAGetLastError() ); + ok( ret == SOCKET_ERROR, "WSAEnumProtocolsA() succeeded unexpectedly\n"); + error = WSAGetLastError(); + ok( error == WSAENOBUFS, "Expected 10055, received %d\n", error); buffer = HeapAlloc( GetProcessHeap(), 0, len ); @@ -56,6 +89,9 @@ static void test_WSAEnumProtocolsA(void) for (i = 0; i < ret; i++) { ok( strlen( buffer[i].szProtocol ), "No protocol name found\n" ); + test_service_flags( buffer[i].iAddressFamily, buffer[i].iVersion, + buffer[i].iSocketType, buffer[i].iProtocol, + buffer[i].dwServiceFlags1); } HeapFree( GetProcessHeap(), 0, buffer ); @@ -65,18 +101,20 @@ static void test_WSAEnumProtocolsA(void) static void test_WSAEnumProtocolsW(void) { INT ret; - DWORD len = 0; + DWORD len = 0, error; WSAPROTOCOL_INFOW info, *buffer; ret = WSAEnumProtocolsW( NULL, NULL, &len ); - ok( ret == SOCKET_ERROR, "WSAEnumProtocolsW() succeeded unexpectedly: %d\n", - WSAGetLastError() ); + ok( ret == SOCKET_ERROR, "WSAEnumProtocolsW() succeeded unexpectedly\n"); + error = WSAGetLastError(); + ok( error == WSAENOBUFS, "Expected 10055, received %d\n", error); len = 0; ret = WSAEnumProtocolsW( NULL, &info, &len ); - ok( ret == SOCKET_ERROR, "WSAEnumProtocolsW() succeeded unexpectedly: %d\n", - WSAGetLastError() ); + ok( ret == SOCKET_ERROR, "WSAEnumProtocolsW() succeeded unexpectedly\n"); + error = WSAGetLastError(); + ok( error == WSAENOBUFS, "Expected 10055, received %d\n", error); buffer = HeapAlloc( GetProcessHeap(), 0, len ); @@ -91,6 +129,9 @@ static void test_WSAEnumProtocolsW(void) for (i = 0; i < ret; i++) { ok( lstrlenW( buffer[i].szProtocol ), "No protocol name found\n" ); + test_service_flags( buffer[i].iAddressFamily, buffer[i].iVersion, + buffer[i].iSocketType, buffer[i].iProtocol, + buffer[i].dwServiceFlags1); } HeapFree( GetProcessHeap(), 0, buffer );

1 0

Nikolay Sivov : kernel32/tests: Test for several assemblies in context with window class redirects.
by Alexandre Julliard 31 Jul '13

31 Jul '13

Module: wine Branch: master Commit: db5d9aa9e69b2b8c893cc129d9b9853bba706094 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db5d9aa9e69b2b8c893cc129d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jul 31 08:42:45 2013 +0400 kernel32/tests: Test for several assemblies in context with window class redirects. --- dlls/kernel32/tests/actctx.c | 85 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 85 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index 50529f8..0b56c25 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -101,6 +101,39 @@ static const char manifest3[] = "</file>" "</assembly>"; +static const char manifest_wndcls1[] = +"<assembly xmlns=\"urn:schemas-microsoft-com:asm.v1\" manifestVersion=\"1.0\">" +"<assemblyIdentity version=\"1.2.3.4\" name=\"testdep1\" type=\"win32\" processorArchitecture=\"" ARCH "\"/>" +"<file name=\"testlib1.dll\">" +"<windowClass>wndClass1</windowClass>" +"<windowClass>wndClass2</windowClass>" +"</file>" +"</assembly>"; + +static const char manifest_wndcls2[] = +"<assembly xmlns=\"urn:schemas-microsoft-com:asm.v1\" manifestVersion=\"1.0\">" +"<assemblyIdentity version=\"4.3.2.1\" name=\"testdep2\" type=\"win32\" processorArchitecture=\"" ARCH "\" />" +"<file name=\"testlib2.dll\">" +"<windowClass>wndClass3</windowClass>" +"<windowClass>wndClass4</windowClass>" +"</file>" +"</assembly>"; + +static const char manifest_wndcls_main[] = +"<assembly xmlns=\"urn:schemas-microsoft-com:asm.v1\" manifestVersion=\"1.0\">" +"<assemblyIdentity version=\"1.2.3.4\" name=\"Wine.Test\" type=\"win32\" />" +"<dependency>" +" <dependentAssembly>" +" <assemblyIdentity type=\"win32\" name=\"testdep1\" version=\"1.2.3.4\" processorArchitecture=\"" ARCH "\" />" +" </dependentAssembly>" +"</dependency>" +"<dependency>" +" <dependentAssembly>" +" <assemblyIdentity type=\"win32\" name=\"testdep2\" version=\"4.3.2.1\" processorArchitecture=\"" ARCH "\" />" +" </dependentAssembly>" +"</dependency>" +"</assembly>"; + static const char manifest4[] = "<assembly xmlns=\"urn:schemas-microsoft-com:asm.v1\" manifestVersion=\"1.0\">" "<assemblyIdentity version=\"1.2.3.4\" name=\"Wine.Test\" type=\"win32\">" @@ -191,8 +224,12 @@ static const WCHAR testlib2_dll[] = {'t','e','s','t','l','i','b','2','.','d','l','l',0}; static const WCHAR wndClassW[] = {'w','n','d','C','l','a','s','s',0}; +static const WCHAR wndClass1W[] = + {'w','n','d','C','l','a','s','s','1',0}; static const WCHAR wndClass2W[] = {'w','n','d','C','l','a','s','s','2',0}; +static const WCHAR wndClass3W[] = + {'w','n','d','C','l','a','s','s','3',0}; static const WCHAR acr_manifest[] = {'a','c','r','.','m','a','n','i','f','e','s','t',0}; @@ -1088,6 +1125,53 @@ todo_wine data.ulAssemblyRosterIndex, exid); } +static void test_wndclass_section(void) +{ + ACTCTX_SECTION_KEYED_DATA data, data2; + ULONG_PTR cookie; + HANDLE handle; + BOOL ret; + + /* use two dependent manifests, each defines 2 window class redirects */ + create_manifest_file("testdep1.manifest", manifest_wndcls1, -1, NULL, NULL); + create_manifest_file("testdep2.manifest", manifest_wndcls2, -1, NULL, NULL); + create_manifest_file("main_wndcls.manifest", manifest_wndcls_main, -1, NULL, NULL); + + handle = test_create("main_wndcls.manifest"); + DeleteFileA("testdep1.manifest"); + DeleteFileA("testdep2.manifest"); + DeleteFileA("main_wndcls.manifest"); + + ret = pActivateActCtx(handle, &cookie); + ok(ret, "ActivateActCtx failed: %u\n", GetLastError()); + + memset(&data, 0, sizeof(data)); + memset(&data2, 0, sizeof(data2)); + data.cbSize = sizeof(data); + data2.cbSize = sizeof(data2); + + /* get data for two classes from different assemblies */ + ret = pFindActCtxSectionStringW(0, NULL, + ACTIVATION_CONTEXT_SECTION_WINDOW_CLASS_REDIRECTION, + wndClass1W, &data); + ok(ret, "got %d\n", ret); + ret = pFindActCtxSectionStringW(0, NULL, + ACTIVATION_CONTEXT_SECTION_WINDOW_CLASS_REDIRECTION, + wndClass3W, &data2); + ok(ret, "got %d\n", ret); + + /* For both string same section is returned, meaning it's one wndclass section per context */ +todo_wine + ok(data.lpSectionBase == data2.lpSectionBase, "got %p, %p\n", data.lpSectionBase, data2.lpSectionBase); + ok(data.ulSectionTotalLength == data2.ulSectionTotalLength, "got %u, %u\n", data.ulSectionTotalLength, + data2.ulSectionTotalLength); + + ret = pDeactivateActCtx(0, cookie); + ok(ret, "DeactivateActCtx failed: %u\n", GetLastError()); + + pReleaseActCtx(handle); +} + static void test_actctx(void) { ULONG_PTR cookie; @@ -1306,6 +1390,7 @@ static void test_actctx(void) pReleaseActCtx(handle); } + test_wndclass_section(); } static void test_app_manifest(void)

1 0

Nikolay Sivov : ntdll: Added RtlFindActivationContextSectionGuid() stub.
by Alexandre Julliard 31 Jul '13

31 Jul '13

Module: wine Branch: master Commit: 1692ccc56dd597a8f07492da352a258847a77388 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1692ccc56dd597a8f07492da3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jul 31 09:09:27 2013 +0400 ntdll: Added RtlFindActivationContextSectionGuid() stub. --- dlls/kernel32/actctx.c | 13 +++++++++---- dlls/ntdll/actctx.c | 31 +++++++++++++++++++++++++++++++ dlls/ntdll/ntdll.spec | 2 +- include/winternl.h | 1 + 4 files changed, 42 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/actctx.c b/dlls/kernel32/actctx.c index abd6459..86752b3 100644 --- a/dlls/kernel32/actctx.c +++ b/dlls/kernel32/actctx.c @@ -272,10 +272,15 @@ BOOL WINAPI FindActCtxSectionGuid(DWORD dwFlags, const GUID* lpExtGuid, ULONG ulId, const GUID* lpSearchGuid, PACTCTX_SECTION_KEYED_DATA pInfo) { - FIXME("%08x %s %u %s %p\n", dwFlags, debugstr_guid(lpExtGuid), - ulId, debugstr_guid(lpSearchGuid), pInfo); - SetLastError( ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + NTSTATUS status; + + if ((status = RtlFindActivationContextSectionGuid(dwFlags, lpExtGuid, ulId, lpSearchGuid, pInfo))) + { + SetLastError(RtlNtStatusToDosError(status)); + return FALSE; + } + + return TRUE; } /*********************************************************************** diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 8e4085d..f2a94c7 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -2716,3 +2716,34 @@ NTSTATUS WINAPI RtlFindActivationContextSectionString( ULONG flags, const GUID * return status; } + +/*********************************************************************** + * RtlFindActivationContextSectionGuid (NTDLL.@) + * + * Find information about a GUID in an activation context. + * FIXME: function signature/prototype may be wrong + */ +NTSTATUS WINAPI RtlFindActivationContextSectionGuid( ULONG flags, const GUID *extguid, ULONG section_kind, + const GUID *guid, void *ptr ) +{ + ACTCTX_SECTION_KEYED_DATA *data = ptr; + + FIXME("%08x %s %u %s %p: stub\n", flags, debugstr_guid(extguid), section_kind, debugstr_guid(guid), data); + + if (extguid) + { + FIXME("expected extguid == NULL\n"); + return STATUS_INVALID_PARAMETER; + } + + if (flags & ~FIND_ACTCTX_SECTION_KEY_RETURN_HACTCTX) + { + FIXME("unknown flags %08x\n", flags); + return STATUS_INVALID_PARAMETER; + } + + if (!data || data->cbSize < FIELD_OFFSET(ACTCTX_SECTION_KEYED_DATA, ulAssemblyRosterIndex) || !guid) + return STATUS_INVALID_PARAMETER; + + return STATUS_NOT_IMPLEMENTED; +} diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 910ded5..6f592b4 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -578,7 +578,7 @@ @ stdcall RtlFillMemory(ptr long long) @ stdcall RtlFillMemoryUlong(ptr long long) @ stub RtlFinalReleaseOutOfProcessMemoryStream -@ stub RtlFindActivationContextSectionGuid +@ stdcall RtlFindActivationContextSectionGuid(long ptr long ptr ptr) @ stdcall RtlFindActivationContextSectionString(long ptr long ptr ptr) @ stdcall RtlFindCharInUnicodeString(long ptr ptr ptr) @ stdcall RtlFindClearBits(ptr long long) diff --git a/include/winternl.h b/include/winternl.h index 955228a..07ebbab 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2351,6 +2351,7 @@ NTSYSAPI void DECLSPEC_NORETURN WINAPI RtlExitUserProcess(ULONG); NTSYSAPI void DECLSPEC_NORETURN WINAPI RtlExitUserThread(ULONG); NTSYSAPI NTSTATUS WINAPI RtlExpandEnvironmentStrings_U(PCWSTR, const UNICODE_STRING*, UNICODE_STRING*, ULONG*); NTSYSAPI NTSTATUS WINAPI RtlFindActivationContextSectionString(ULONG,const GUID*,ULONG,const UNICODE_STRING*,PVOID); +NTSYSAPI NTSTATUS WINAPI RtlFindActivationContextSectionGuid(ULONG,const GUID*,ULONG,const GUID*,PVOID); NTSYSAPI NTSTATUS WINAPI RtlFindCharInUnicodeString(int,const UNICODE_STRING*,const UNICODE_STRING*,USHORT*); NTSYSAPI ULONG WINAPI RtlFindClearBits(PCRTL_BITMAP,ULONG,ULONG); NTSYSAPI ULONG WINAPI RtlFindClearBitsAndSet(PRTL_BITMAP,ULONG,ULONG);

1 0

Nikolay Sivov : msdaps: Implement some proxy/stub methods.
by Alexandre Julliard 31 Jul '13

31 Jul '13

Module: wine Branch: master Commit: 387b5a3c12bed6d92d7cccd7c1ecd3531d8c907e URL: http://source.winehq.org/git/wine.git/?a=commit;h=387b5a3c12bed6d92d7cccd7c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jul 31 09:12:06 2013 +0400 msdaps: Implement some proxy/stub methods. --- dlls/msdaps/usrmarshal.c | 210 ++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 174 insertions(+), 36 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=387b5a3c12bed6d92d7cc…

1 0

Nikolay Sivov : msxml3: Unescape '& ' back to '&' in attribute value.
by Alexandre Julliard 31 Jul '13

31 Jul '13

Module: wine Branch: master Commit: b1bf9a62f94f6a6103eba0405ed693d4f8f6a39f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1bf9a62f94f6a6103eba0405… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jul 31 10:31:04 2013 +0400 msxml3: Unescape '&' back to '&' in attribute value. --- dlls/msxml3/saxreader.c | 46 +++++++++++++++++++++++++++++++++++++++- dlls/msxml3/tests/saxreader.c | 4 +- 2 files changed, 46 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 5a0b1c2..9362941 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -1265,6 +1265,49 @@ static const struct ISAXAttributesVtbl isaxattributes_vtbl = isaxattributes_getValueFromQName }; +/* Libxml2 escapes '&' back to char reference '&' in attribute value, + so when document has escaped value with '&' it's parsed to '&' and then + escaped to '&'. This function takes care of ampersands only. */ +static BSTR saxreader_get_unescaped_value(const xmlChar *buf, int len) +{ + static const WCHAR ampescW[] = {'&','#','3','8',';',0}; + WCHAR *dest, *ptrW, *str; + DWORD str_len; + BSTR bstr; + + if (!buf) + return NULL; + + str_len = MultiByteToWideChar(CP_UTF8, 0, (LPCSTR)buf, len, NULL, 0); + if (len != -1) str_len++; + + str = heap_alloc(str_len*sizeof(WCHAR)); + if (!str) return NULL; + + MultiByteToWideChar(CP_UTF8, 0, (LPCSTR)buf, len, str, str_len); + if (len != -1) str[str_len-1] = 0; + + ptrW = str; + while ((dest = strstrW(ptrW, ampescW))) + { + WCHAR *src; + + /* leave first '&' from a reference as a value */ + src = dest + (sizeof(ampescW)/sizeof(WCHAR) - 1); + dest++; + + /* move together with null terminator */ + memmove(dest, src, (strlenW(src) + 1)*sizeof(WCHAR)); + + ptrW++; + } + + bstr = SysAllocString(str); + heap_free(str); + + return bstr; +} + static HRESULT SAXAttributes_populate(saxlocator *locator, int nb_namespaces, const xmlChar **xmlNamespaces, int nb_attributes, const xmlChar **xmlAttributes) @@ -1317,8 +1360,7 @@ static HRESULT SAXAttributes_populate(saxlocator *locator, attrs[i].szURI = find_element_uri(locator, xmlAttributes[i*5+2]); attrs[i].szLocalname = bstr_from_xmlChar(xmlAttributes[i*5]); - attrs[i].szValue = bstr_from_xmlCharN(xmlAttributes[i*5+3], - xmlAttributes[i*5+4]-xmlAttributes[i*5+3]); + attrs[i].szValue = saxreader_get_unescaped_value(xmlAttributes[i*5+3], xmlAttributes[i*5+4]-xmlAttributes[i*5+3]); attrs[i].szQName = QName_from_xmlChar(xmlAttributes[i*5+1], xmlAttributes[i*5]); } diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 5c7d080..a6c399d 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -888,10 +888,10 @@ static struct call_entry xmlspaceattr_test_alternate[] = { /* attribute value normalization test */ static const char attribute_normalize[] = "<?xml version=\"1.0\" ?>\n" - "<a attr1=\" \r \n \tattr_value A \t \r \n\r\n \n\"/>\n"; + "<a attr1=\" \r \n \tattr_value A & &\t \r \n\r\n \n\"/>\n"; static struct attribute_entry attribute_norm_attrs[] = { - { "", "attr1", "attr1", " attr_value A " }, + { "", "attr1", "attr1", " attr_value A & & " }, { NULL } };

1 0

Jacek Caban : explorerframe: Fixed debug channel name.
by Alexandre Julliard 31 Jul '13

31 Jul '13

Module: wine Branch: master Commit: 722adee7bd72166b3747dcc395f455aff4ab3d17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=722adee7bd72166b3747dcc39… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 31 12:30:51 2013 +0200 explorerframe: Fixed debug channel name. --- dlls/explorerframe/taskbarlist.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/explorerframe/taskbarlist.c b/dlls/explorerframe/taskbarlist.c index d40f652..26a2c1a 100644 --- a/dlls/explorerframe/taskbarlist.c +++ b/dlls/explorerframe/taskbarlist.c @@ -22,7 +22,7 @@ #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(ieframe); +WINE_DEFAULT_DEBUG_CHANNEL(explorerframe); struct taskbar_list {

1 0

Alistair Leslie-Hughes : oledb32: Add IErrorInfo Support.
by Alexandre Julliard 31 Jul '13

31 Jul '13

Module: wine Branch: master Commit: 325b824de586552ed9af9eedfe80d81df51ee2e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=325b824de586552ed9af9eedf… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jun 14 10:23:43 2013 +1000 oledb32: Add IErrorInfo Support. --- dlls/oledb32/Makefile.in | 1 + dlls/oledb32/errorinfo.c | 359 ++++++++++++++++++++++++++++++++++++++ dlls/oledb32/main.c | 8 + dlls/oledb32/oledb32_classes.idl | 11 ++ dlls/oledb32/oledb_private.h | 1 + dlls/oledb32/tests/database.c | 10 +- 6 files changed, 389 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=325b824de586552ed9af9…

1 0

Alistair Leslie-Hughes : oleacc: Add missing interfaces.
by Alexandre Julliard 31 Jul '13

31 Jul '13

Module: wine Branch: master Commit: 6ff047d126f595e50404f34e7f5583ddc9d4e200 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ff047d126f595e50404f34e7… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jul 31 11:34:51 2013 +1000 oleacc: Add missing interfaces. --- include/oleacc.idl | 116 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 116 insertions(+), 0 deletions(-) diff --git a/include/oleacc.idl b/include/oleacc.idl index 5333285..241eb00 100644 --- a/include/oleacc.idl +++ b/include/oleacc.idl @@ -100,6 +100,14 @@ cpp_quote("#define SELFLAG_ADDSELECTION 0x08") cpp_quote("#define SELFLAG_REMOVESELECTION 0x10") cpp_quote("#define SELFLAG_VALID 0x1f") +typedef GUID MSAAPROPID; + +typedef enum AnnoScope +{ + ANNO_THIS, + ANNO_CONTAINER +} AnnoScope; + [ local, object, @@ -154,6 +162,114 @@ interface IAccessible : IDispatch [hidden, propput, id(DISPID_ACC_VALUE)] HRESULT accValue([in]VARIANT varID, [out, retval]BSTR pszValue); } +[ + object, + uuid(03022430-ABC4-11d0-BDE2-00AA001A1953), + hidden, + oleautomation, + pointer_default(unique) +] +interface IAccessibleHandler : IUnknown +{ + typedef [unique] IAccessibleHandler *LPACCESSIBLEHANDLER; + + HRESULT AccessibleObjectFromID( [in] long hwnd, [in] long lObjectID, [out] LPACCESSIBLE *pIAccessible ); +} + +[ + object, + uuid(7852b78d-1cfd-41c1-a615-9c0c85960b5f), + pointer_default(unique) +] +interface IAccIdentity : IUnknown +{ + HRESULT GetIdentityString ([in] DWORD dwIDChild, [out] BYTE **ppIDString, [out] DWORD *pdwIDStringLen); +} + +[ + object, + uuid(76c0dbbb-15e0-4e7b-b61b-20eeea2001e0), + pointer_default(unique) +] +interface IAccPropServer: IUnknown +{ + HRESULT GetPropValue ([in] const BYTE *pIDString, [in] DWORD dwIDStringLen, [in] MSAAPROPID idProp, + [out] VARIANT *pvarValue, [out] BOOL *pfHasProp); +} + +[ + object, + uuid(6e26e776-04f0-495d-80e4-3330352e3169), + pointer_default(unique) +] +interface IAccPropServices : IUnknown +{ + HRESULT SetPropValue([in] const BYTE *pIDString, [in] DWORD dwIDStringLen, [in] MSAAPROPID idProp, [in] VARIANT var); + + HRESULT SetPropServer([in] const BYTE * pIDString, [in] DWORD dwIDStringLen, [in] const MSAAPROPID* paProps, + [in] int cProps, [in] IAccPropServer* pServer, [in] AnnoScope AnnoScope); + + HRESULT ClearProps([in] const BYTE *pIDString, [in] DWORD dwIDStringLen, [in] const MSAAPROPID* paProps, [in] int cProps); + + HRESULT SetHwndProp([in] HWND hwnd, [in] DWORD idObject, [in] DWORD idChild, + [in] MSAAPROPID idProp, [in] VARIANT var); + + HRESULT SetHwndPropStr([in] HWND hwnd, [in] DWORD idObject, [in] DWORD idChild, + [in] MSAAPROPID idProp, [in] LPWSTR str); + + HRESULT SetHwndPropServer([in] HWND hwnd, [in] DWORD idObject, [in] DWORD idChild, + [in] const MSAAPROPID* paProps, [in] int cProps, [in] IAccPropServer* pServer, [in] AnnoScope AnnoScope); + + HRESULT ClearHwndProps([in] HWND hwnd, [in] DWORD idObject, [in] DWORD idChild, + [in] const MSAAPROPID* paProps, [in] int cProps); + + HRESULT ComposeHwndIdentityString([in] HWND hwnd, [in] DWORD idObject, [in] DWORD idChild, + [out] BYTE **ppIDString, [out] DWORD* pdwIDStringLen); + + HRESULT DecomposeHwndIdentityString([in] const BYTE *pIDString, [in] DWORD dwIDStringLen, + [out] HWND* phwnd, [out] DWORD* pidObject, [out] DWORD* pidChild); + + HRESULT SetHmenuProp([in] HMENU hmenu, [in] DWORD idChild, [in] MSAAPROPID idProp, [in] VARIANT var); + + HRESULT SetHmenuPropStr([in] HMENU hmenu, [in] DWORD idChild, [in] MSAAPROPID idProp, [in] LPWSTR str); + + HRESULT SetHmenuPropServer([in] HMENU hmenu, [in] DWORD idChild, [in] const MSAAPROPID* paProps, + [in] int cProps, [in] IAccPropServer* pServer, [in] AnnoScope AnnoScope); + + HRESULT ClearHmenuProps([in] HMENU hmenu, [in] DWORD idChild, [in] const MSAAPROPID* paProps, [in] int cProps); + + HRESULT ComposeHmenuIdentityString([in] HMENU hmenu, [in] DWORD idChild, + [out] BYTE **ppIDString, [out] DWORD *pdwIDStringLen); + + HRESULT DecomposeHmenuIdentityString([in] const BYTE *pIDString, [in] DWORD dwIDStringLen, + [out] HMENU *phmenu, [out] DWORD *pidChild); +} + +[ + uuid(1ea4dbf0-3c3b-11cf-810c-00aa00389b71), + lcid(0), + version(1.1), + hidden +] +library Accessibility +{ + importlib ("stdole2.tlb"); + interface IAccessible; + interface IAccessibleHandler; + + interface IAccIdentity; + interface IAccPropServer; + interface IAccPropServices; + + [ + uuid(b5f8350b-0548-48b1-a6ee-88bd00b4a5e7) + ] + coclass CAccPropServices + { + interface IAccPropServices; + } +}; + cpp_quote("DEFINE_GUID(LIBID_Accessibility, 0x1ea4dbf0, 0x3c3b, 0x11cf, 0x81, 0x0c, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71);") cpp_quote("DEFINE_GUID(CLSID_AccPropServices, 0xb5f8350b, 0x0548, 0x48b1, 0xa6, 0xee, 0x88, 0xbd, 0x00, 0xb4, 0xa5, 0xe7);") cpp_quote("DEFINE_GUID(IIS_IsOleaccProxy, 0x902697fa, 0x80e4, 0x4560, 0x80, 0x2a, 0xa1, 0x3f, 0x22, 0xa6, 0x47, 0x09);")

1 0

Alistair Leslie-Hughes : oleacc: Add typelib.
by Alexandre Julliard 31 Jul '13

31 Jul '13

Module: wine Branch: master Commit: a1e4af2d1e0f35395e44b5e916a326c6a3ffefed URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1e4af2d1e0f35395e44b5e91… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jul 31 12:29:21 2013 +1000 oleacc: Add typelib. --- dlls/oleacc/Makefile.in | 2 ++ dlls/oleacc/oleacc_classes.idl | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 0 deletions(-) diff --git a/dlls/oleacc/Makefile.in b/dlls/oleacc/Makefile.in index 29a0e83..c098386 100644 --- a/dlls/oleacc/Makefile.in +++ b/dlls/oleacc/Makefile.in @@ -5,6 +5,8 @@ IMPORTS = user32 C_SRCS = \ main.c +IDL_TLB_SRCS = oleacc_classes.idl + RC_SRCS = oleacc.rc PO_SRCS = oleacc.rc diff --git a/dlls/oleacc/oleacc_classes.idl b/dlls/oleacc/oleacc_classes.idl new file mode 100644 index 0000000..28cb93e --- /dev/null +++ b/dlls/oleacc/oleacc_classes.idl @@ -0,0 +1,18 @@ +/* + * Copyright (C) 2013 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#include "oleacc.idl"

1 0