wine-commits July 2013

wine-commits@winehq.org

2 participants
447 discussions

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

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

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 : 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 : 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

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

Thomas Faber : quartz: Correct IAMDirectSound::GetFocusWindow signature.
by Alexandre Julliard 30 Jul '13

30 Jul '13

Module: wine Branch: master Commit: 7944ca48556d0fcd2e6ce4f846170977fa303124 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7944ca48556d0fcd2e6ce4f84… Author: Thomas Faber <thfabba(a)gmx.de> Date: Thu Jul 25 20:26:49 2013 +0200 quartz: Correct IAMDirectSound::GetFocusWindow signature. --- dlls/quartz/dsoundrender.c | 8 ++++---- include/amaudio.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 0a498b0..57e3d3b 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -1247,20 +1247,20 @@ static HRESULT WINAPI AMDirectSound_ReleaseSecondaryBufferInterface(IAMDirectSou return E_NOTIMPL; } -static HRESULT WINAPI AMDirectSound_SetFocusWindow(IAMDirectSound *iface, HWND hwnd, BOOL bgsilent) +static HRESULT WINAPI AMDirectSound_SetFocusWindow(IAMDirectSound *iface, HWND hwnd, BOOL bgaudible) { DSoundRenderImpl *This = impl_from_IAMDirectSound(iface); - FIXME("(%p/%p)->(%p,%d): stub\n", This, iface, hwnd, bgsilent); + FIXME("(%p/%p)->(%p,%d): stub\n", This, iface, hwnd, bgaudible); return E_NOTIMPL; } -static HRESULT WINAPI AMDirectSound_GetFocusWindow(IAMDirectSound *iface, HWND hwnd) +static HRESULT WINAPI AMDirectSound_GetFocusWindow(IAMDirectSound *iface, HWND *hwnd, BOOL *bgaudible) { DSoundRenderImpl *This = impl_from_IAMDirectSound(iface); - FIXME("(%p/%p)->(%p): stub\n", This, iface, hwnd); + FIXME("(%p/%p)->(%p,%p): stub\n", This, iface, hwnd, bgaudible); return E_NOTIMPL; } diff --git a/include/amaudio.h b/include/amaudio.h index 11bf5cb..e684821 100644 --- a/include/amaudio.h +++ b/include/amaudio.h @@ -39,8 +39,8 @@ DECLARE_INTERFACE_(IAMDirectSound,IUnknown) STDMETHOD(ReleaseDirectSoundInterface)(THIS_ IDirectSound *ds) PURE; STDMETHOD(ReleasePrimaryBufferInterface)(THIS_ IDirectSoundBuffer *buf) PURE; STDMETHOD(ReleaseSecondaryBufferInterface)(THIS_ IDirectSoundBuffer *buf) PURE; - STDMETHOD(SetFocusWindow)(THIS_ HWND hwnd, BOOL bgsilent) PURE; - STDMETHOD(GetFocusWindow)(THIS_ HWND hwnd) PURE; + STDMETHOD(SetFocusWindow)(THIS_ HWND hwnd, BOOL bgaudible) PURE; + STDMETHOD(GetFocusWindow)(THIS_ HWND *hwnd, BOOL *bgaudible) PURE; }; #undef INTERFACE

1 0

Alistair Leslie-Hughes : windowscodecsext: Add stub DllGetClassObject.
by Alexandre Julliard 30 Jul '13

30 Jul '13

Module: wine Branch: master Commit: de8498c781143b934e30671076b975111f377d23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de8498c781143b934e3067107… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Jun 24 10:59:14 2013 +1000 windowscodecsext: Add stub DllGetClassObject. --- dlls/windowscodecsext/main.c | 10 ++++++++++ dlls/windowscodecsext/windowscodecsext.spec | 2 +- 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/windowscodecsext/main.c b/dlls/windowscodecsext/main.c index c22766c..8835a31 100644 --- a/dlls/windowscodecsext/main.c +++ b/dlls/windowscodecsext/main.c @@ -48,6 +48,16 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) return TRUE; } +/****************************************************************** + * DllGetClassObject + */ +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv) +{ + FIXME("(%s,%s,%p) stub\n", debugstr_guid(rclsid), debugstr_guid(iid), ppv); + + return CLASS_E_CLASSNOTAVAILABLE; +} + HRESULT WINAPI WICCreateColorTransform_Proxy(IWICColorTransform **ppIWICColorTransform) { HRESULT hr, init; diff --git a/dlls/windowscodecsext/windowscodecsext.spec b/dlls/windowscodecsext/windowscodecsext.spec index 02cfd9b..34d3b83 100644 --- a/dlls/windowscodecsext/windowscodecsext.spec +++ b/dlls/windowscodecsext/windowscodecsext.spec @@ -1,3 +1,3 @@ -@ stub DllGetClassObject +@ stdcall -private DllGetClassObject(ptr ptr ptr) @ stdcall IWICColorTransform_Initialize_Proxy(ptr ptr ptr ptr ptr) IWICColorTransform_Initialize_Proxy_W @ stdcall WICCreateColorTransform_Proxy(ptr)

1 0

Dmitry Timoshkov : gdiplus: Reimplement GdipSetClipRect to avoid potential problems with rotating world transform .
by Alexandre Julliard 30 Jul '13

30 Jul '13

Module: wine Branch: master Commit: f575eb494bec354c0e6ca05605fc06995a51b2bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=f575eb494bec354c0e6ca0560… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jul 22 17:49:24 2013 +0900 gdiplus: Reimplement GdipSetClipRect to avoid potential problems with rotating world transform. --- dlls/gdiplus/graphics.c | 36 ++++++++++++++---------------------- 1 files changed, 14 insertions(+), 22 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index d79239e..76af444 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -54,26 +54,6 @@ static GpStatus draw_driver_string(GpGraphics *graphics, GDIPCONST UINT16 *text, static GpStatus get_graphics_transform(GpGraphics *graphics, GpCoordinateSpace dst_space, GpCoordinateSpace src_space, GpMatrix *matrix); -static void transform_rectf(GpGraphics *graphics, GpCoordinateSpace dst_space, - GpCoordinateSpace src_space, GpRectF *rect) -{ - GpPointF pt[3]; - - pt[0].X = rect->X; - pt[0].Y = rect->Y; - pt[1].X = rect->X + rect->Width; - pt[1].Y = rect->Y; - pt[2].X = rect->X; - pt[2].Y = rect->Y + rect->Height; - GdipTransformPoints(graphics, dst_space, src_space, pt, 3); - rect->X = pt[0].X; - rect->Y = pt[0].Y; - rect->Width = sqrt((pt[1].Y - pt[0].Y) * (pt[1].Y - pt[0].Y) + - (pt[1].X - pt[0].X) * (pt[1].X - pt[0].X)); - rect->Height = sqrt((pt[2].Y - pt[0].Y) * (pt[2].Y - pt[0].Y) + - (pt[2].X - pt[0].X) * (pt[2].X - pt[0].X)); -} - /* Converts from gdiplus path point type to gdi path point type. */ static BYTE convert_path_point_type(BYTE type) { @@ -5476,7 +5456,9 @@ GpStatus WINGDIPAPI GdipSetClipRect(GpGraphics *graphics, REAL x, REAL y, REAL width, REAL height, CombineMode mode) { + GpStatus status; GpRectF rect; + GpRegion *region; TRACE("(%p, %.2f, %.2f, %.2f, %.2f, %d)\n", graphics, x, y, width, height, mode); @@ -5490,9 +5472,19 @@ GpStatus WINGDIPAPI GdipSetClipRect(GpGraphics *graphics, REAL x, REAL y, rect.Y = y; rect.Width = width; rect.Height = height; - transform_rectf(graphics, CoordinateSpaceDevice, CoordinateSpaceWorld, &rect); + status = GdipCreateRegionRect(&rect, &region); + if (status == Ok) + { + GpMatrix world_to_device; - return GdipCombineRegionRect(graphics->clip, &rect, mode); + get_graphics_transform(graphics, CoordinateSpaceDevice, CoordinateSpaceWorld, &world_to_device); + status = GdipTransformRegion(region, &world_to_device); + if (status == Ok) + status = GdipCombineRegionRegion(graphics->clip, region, mode); + + GdipDeleteRegion(region); + } + return status; } GpStatus WINGDIPAPI GdipSetClipRectI(GpGraphics *graphics, INT x, INT y,

1 0

Dmitry Timoshkov : gdiplus: Fix clipping region bounds calculation with rotating transform.
by Alexandre Julliard 30 Jul '13

30 Jul '13

Module: wine Branch: master Commit: cdc3e820cd109ee086f0d1b7bab7a1fb21ee5fd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdc3e820cd109ee086f0d1b7b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jul 22 17:49:19 2013 +0900 gdiplus: Fix clipping region bounds calculation with rotating transform. --- dlls/gdiplus/graphics.c | 9 +++++++-- dlls/gdiplus/tests/graphics.c | 20 +++++++++----------- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 43464c9..d79239e 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -4068,6 +4068,7 @@ GpStatus WINGDIPAPI GdipFlush(GpGraphics *graphics, GpFlushIntention intention) GpStatus WINGDIPAPI GdipGetClipBounds(GpGraphics *graphics, GpRectF *rect) { GpStatus status; + GpRegion *clip; TRACE("(%p, %p)\n", graphics, rect); @@ -4077,10 +4078,14 @@ GpStatus WINGDIPAPI GdipGetClipBounds(GpGraphics *graphics, GpRectF *rect) if(graphics->busy) return ObjectBusy; - status = GdipGetRegionBounds(graphics->clip, graphics, rect); + status = GdipCreateRegion(&clip); + if (status != Ok) return status; + + status = GdipGetClip(graphics, clip); if (status == Ok) - transform_rectf(graphics, CoordinateSpaceWorld, CoordinateSpaceDevice, rect); + status = GdipGetRegionBounds(clip, graphics, rect); + GdipDeleteRegion(clip); return status; } diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index db7a409..b773d63 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -4741,6 +4741,8 @@ static void test_clipping(void) status = GdipGetClipBounds(graphics, &rect); expect(Ok, status); ok((rect.X == 13.75 && rect.Y == 4.375 && rect.Width == 18.75 && rect.Height == 9.375) || + /* rounding under Wine is slightly different */ + (rect.X == 14.0 && rect.Y == 4.0 && rect.Width == 19.0 && rect.Height == 10.0) /* Wine */ || broken(rect.X == 45.0 && rect.Y == 20.0 && rect.Width == 50.0 && rect.Height == 25.0) /* before Win7 */, "expected 13.75,4.375-18.75,9.375, got %.2f,%.2f-%.2f,%.2f\n", rect.X, rect.Y, rect.Width, rect.Height); @@ -4885,9 +4887,7 @@ static void test_clipping(void) status = GdipGetClipBounds(graphics, &rect); expect(Ok, status); expectf_(20.612978, rect.X, 1.0); -todo_wine expectf_(-6.256012, rect.Y, 1.5); -todo_wine expectf_(25.612978, rect.Width, 1.0); expectf_(12.806489, rect.Height, 1.0); @@ -4989,13 +4989,10 @@ todo_wine status = GdipGetClipBounds(graphics, &rect); expect(Ok, status); -todo_wine - expectf(-28.100956, rect.X); - expectf(7.806488, rect.Y); -todo_wine - expectf(25.612978, rect.Width); -todo_wine - expectf(12.806489, rect.Height); + expectf_(-28.100956, rect.X, 1.0); + expectf_(7.806488, rect.Y, 1.5); + expectf_(25.612978, rect.Width, 1.0); + expectf_(12.806489, rect.Height, 1.0); status = GdipSetEmpty(region); expect(Ok, status); @@ -5063,8 +5060,9 @@ todo_wine expect(Ok, status); ret = GetRgnBox(hrgn, &rc); ok(ret == COMPLEXREGION, "expected COMPLEXREGION, got %d\n", ret); -todo_wine - ok(rc.left == 4500 && rc.top == 351 && rc.right == 8728 && rc.bottom == 3407, + ok((rc.left == 4500 && rc.top == 351 && rc.right == 8728 && rc.bottom == 3407) || + /* rounding under Wine is slightly different */ + (rc.left == 4499 && rc.top == 351 && rc.right == 8728 && rc.bottom == 3407) /* Wine */, "expected (4500,351)-(8728,3407), got (%d,%d)-(%d,%d)\n", rc.left, rc.top, rc.right, rc.bottom); DeleteObject(hrgn);

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2013