June 2017 - Wine-commits - list.winehq.org

Owen Rudge : wsdapi/tests: Add tests for Get/SetPort.
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: wine Branch: master Commit: d0291c272692896def11e65ac73b849a10739268 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0291c272692896def11e65ac… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Sat Jun 3 10:34:44 2017 +0100 wsdapi/tests: Add tests for Get/SetPort. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/tests/address.c | 49 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/dlls/wsdapi/tests/address.c b/dlls/wsdapi/tests/address.c index c1bf3ba..74a1c12 100644 --- a/dlls/wsdapi/tests/address.c +++ b/dlls/wsdapi/tests/address.c @@ -132,12 +132,61 @@ static void GetSetTransportAddress_udp_tests(void) ok(ret == 0, "WSACleanup failed: %d\n", ret); } +static void GetSetPort_udp_tests(void) +{ + IWSDUdpAddress *udpAddress = NULL; + WORD expectedPort1 = 12345; + WORD expectedPort2 = 8080; + WORD actualPort = 0; + HRESULT rc; + int ret; + + rc = WSDCreateUdpAddress(&udpAddress); + ok(rc == S_OK, "WSDCreateUdpAddress(NULL, &udpAddress) failed: %08x\n", rc); + ok(udpAddress != NULL, "WSDCreateUdpAddress(NULL, &udpAddress) failed: udpAddress == NULL\n"); + + /* No test for GetPort(NULL) as this causes an access violation exception on Windows */ + + rc = IWSDUdpAddress_GetPort(udpAddress, &actualPort); + todo_wine ok(rc == S_OK, "GetPort returned unexpected result: %08x\n", rc); + ok(actualPort == 0, "GetPort returned unexpected port: %d\n", actualPort); + + /* Try setting a zero port */ + rc = IWSDUdpAddress_SetPort(udpAddress, 0); + todo_wine ok(rc == S_OK, "SetPort returned unexpected result: %08x\n", rc); + + rc = IWSDUdpAddress_GetPort(udpAddress, &actualPort); + todo_wine ok(rc == S_OK, "GetPort returned unexpected result: %08x\n", rc); + ok(actualPort == 0, "GetPort returned unexpected port: %d\n", actualPort); + + /* Set a real port */ + rc = IWSDUdpAddress_SetPort(udpAddress, expectedPort1); + todo_wine ok(rc == S_OK, "SetPort returned unexpected result: %08x\n", rc); + + rc = IWSDUdpAddress_GetPort(udpAddress, &actualPort); + todo_wine ok(rc == S_OK, "GetPort returned unexpected result: %08x\n", rc); + todo_wine ok(actualPort == expectedPort1, "GetPort returned unexpected port: %d\n", actualPort); + + /* Now set a different port */ + rc = IWSDUdpAddress_SetPort(udpAddress, expectedPort2); + todo_wine ok(rc == S_OK, "SetPort returned unexpected result: %08x\n", rc); + + rc = IWSDUdpAddress_GetPort(udpAddress, &actualPort); + todo_wine ok(rc == S_OK, "GetPort returned unexpected result: %08x\n", rc); + todo_wine ok(actualPort == expectedPort2, "GetPort returned unexpected port: %d\n", actualPort); + + /* Release the object */ + ret = IWSDUdpAddress_Release(udpAddress); + ok(ret == 0, "IWSDUdpAddress_Release() has %d references, should have 0\n", ret); +} + START_TEST(address) { CoInitialize(NULL); CreateUdpAddress_tests(); GetSetTransportAddress_udp_tests(); + GetSetPort_udp_tests(); CoUninitialize(); }

1 0

Owen Rudge : wsdapi/tests: Add tests for Get/SetMessageType.
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: wine Branch: master Commit: 529688312128647dd372f1cefe4645e6c9e819d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=529688312128647dd372f1cef… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Sat Jun 3 10:34:49 2017 +0100 wsdapi/tests: Add tests for Get/SetMessageType. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/tests/address.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/dlls/wsdapi/tests/address.c b/dlls/wsdapi/tests/address.c index 74a1c12..c3112f4 100644 --- a/dlls/wsdapi/tests/address.c +++ b/dlls/wsdapi/tests/address.c @@ -180,6 +180,47 @@ static void GetSetPort_udp_tests(void) ok(ret == 0, "IWSDUdpAddress_Release() has %d references, should have 0\n", ret); } +static void GetSetMessageType_udp_tests(void) +{ + WSDUdpMessageType expectedMessageType1 = TWO_WAY; + WSDUdpMessageType expectedMessageType2 = ONE_WAY; + WSDUdpMessageType actualMessageType = 0; + IWSDUdpAddress *udpAddress = NULL; + HRESULT rc; + int ret; + + rc = WSDCreateUdpAddress(&udpAddress); + ok(rc == S_OK, "WSDCreateUdpAddress(NULL, &udpAddress) failed: %08x\n", rc); + ok(udpAddress != NULL, "WSDCreateUdpAddress(NULL, &udpAddress) failed: udpAddress == NULL\n"); + + rc = IWSDUdpAddress_GetMessageType(udpAddress, NULL); + todo_wine ok(rc == E_POINTER, "GetMessageType returned unexpected result: %08x\n", rc); + + rc = IWSDUdpAddress_GetMessageType(udpAddress, &actualMessageType); + todo_wine ok(rc == S_OK, "GetMessageType returned unexpected result: %08x\n", rc); + ok(actualMessageType == 0, "GetMessageType returned unexpected message type: %d\n", actualMessageType); + + /* Try setting a message type */ + rc = IWSDUdpAddress_SetMessageType(udpAddress, expectedMessageType1); + todo_wine ok(rc == S_OK, "SetMessageType returned unexpected result: %08x\n", rc); + + rc = IWSDUdpAddress_GetMessageType(udpAddress, &actualMessageType); + todo_wine ok(rc == S_OK, "GetMessageType returned unexpected result: %08x\n", rc); + todo_wine ok(actualMessageType == expectedMessageType1, "GetMessageType returned unexpected message type: %d\n", actualMessageType); + + /* Set another one */ + rc = IWSDUdpAddress_SetMessageType(udpAddress, expectedMessageType2); + todo_wine ok(rc == S_OK, "SetMessageType returned unexpected result: %08x\n", rc); + + rc = IWSDUdpAddress_GetMessageType(udpAddress, &actualMessageType); + todo_wine ok(rc == S_OK, "GetMessageType returned unexpected result: %08x\n", rc); + ok(actualMessageType == expectedMessageType2, "GetMessageType returned unexpected message type: %d\n", actualMessageType); + + /* Release the object */ + ret = IWSDUdpAddress_Release(udpAddress); + ok(ret == 0, "IWSDUdpAddress_Release() has %d references, should have 0\n", ret); +} + START_TEST(address) { CoInitialize(NULL); @@ -187,6 +228,7 @@ START_TEST(address) CreateUdpAddress_tests(); GetSetTransportAddress_udp_tests(); GetSetPort_udp_tests(); + GetSetMessageType_udp_tests(); CoUninitialize(); }

1 0

Owen Rudge : wsdapi/tests: Add tests for Get/SetSockaddr.
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: wine Branch: master Commit: 5b57a6a52fc5935f4c9b10b90383bc97d467f6bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b57a6a52fc5935f4c9b10b90… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Sat Jun 3 10:34:52 2017 +0100 wsdapi/tests: Add tests for Get/SetSockaddr. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/tests/address.c | 131 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 131 insertions(+) diff --git a/dlls/wsdapi/tests/address.c b/dlls/wsdapi/tests/address.c index c3112f4..fefc253 100644 --- a/dlls/wsdapi/tests/address.c +++ b/dlls/wsdapi/tests/address.c @@ -22,6 +22,7 @@ #define COBJMACROS #include <winsock2.h> +#include <ws2tcpip.h> #include <windows.h> #include "wine/test.h" @@ -221,6 +222,135 @@ static void GetSetMessageType_udp_tests(void) ok(ret == 0, "IWSDUdpAddress_Release() has %d references, should have 0\n", ret); } +static void GetSetSockaddr_udp_tests(void) +{ + SOCKADDR_STORAGE storage1, storage2; + SOCKADDR_STORAGE returnedStorage; + struct sockaddr_in6 *sockAddr6Ptr; + struct sockaddr_in *sockAddrPtr; + IWSDUdpAddress *udpAddress = NULL; + LPCWSTR returnedAddress = NULL; + char addressBuffer[MAX_PATH]; + WSADATA wsaData; + WORD port = 0; + HRESULT rc; + int ret; + + const char *ipv4Address = "1.2.3.4"; + const short ipv4Port = 1234; + const WCHAR expectedIpv4TransportAddr[] = {'1','.','2','.','3','.','4',':','1','2','3','4',0}; + + const char *ipv6Address = "2a00:1234:5678:dead:beef::aaaa"; + const short ipv6Port = 2345; + const WCHAR expectedIpv6TransportAddr[] = {'[','2','a','0','0',':','1','2','3','4',':','5','6','7','8',':','d','e','a','d',':', + 'b','e','e','f',':',':','a','a','a','a',']',':','2','3','4','5',0}; + + ZeroMemory(&storage1, sizeof(SOCKADDR_STORAGE)); + ZeroMemory(&storage2, sizeof(SOCKADDR_STORAGE)); + ZeroMemory(&returnedStorage, sizeof(SOCKADDR_STORAGE)); + + ret = WSAStartup(MAKEWORD(2, 2), &wsaData); + ok(ret == 0, "WSAStartup failed: %d\n", ret); + + rc = WSDCreateUdpAddress(&udpAddress); + ok(rc == S_OK, "WSDCreateUdpAddress(NULL, &udpAddress) failed: %08x\n", rc); + ok(udpAddress != NULL, "WSDCreateUdpAddress(NULL, &udpAddress) failed: udpAddress == NULL\n"); + + rc = IWSDUdpAddress_GetSockaddr(udpAddress, NULL); + todo_wine ok(rc == E_POINTER, "GetSockaddr returned unexpected result: %08x\n", rc); + + rc = IWSDUdpAddress_GetSockaddr(udpAddress, &returnedStorage); + todo_wine ok(rc == E_FAIL, "GetSockaddr returned unexpected result: %08x\n", rc); + + /* Try setting a transport address */ + rc = IWSDUdpAddress_SetTransportAddress(udpAddress, expectedIpv6TransportAddr); + todo_wine ok(rc == S_OK, "SetTransportAddress failed: %08x\n", rc); + + /* A socket address should be returned */ + rc = IWSDUdpAddress_GetSockaddr(udpAddress, &returnedStorage); + todo_wine ok(rc == S_OK, "GetSockaddr returned unexpected result: %08x\n", rc); + todo_wine ok(returnedStorage.ss_family == AF_INET6, "returnedStorage.ss_family != AF_INET6 (%d)\n", returnedStorage.ss_family); + + sockAddr6Ptr = (struct sockaddr_in6 *) &returnedStorage; + + /* Windows however doesn't set the port number */ + ok(sockAddr6Ptr->sin6_port == 0, "returnedStorage.sin6_port != 0 (%d)\n", sockAddr6Ptr->sin6_port); + + todo_wine ok(inet_ntop(returnedStorage.ss_family, &sockAddr6Ptr->sin6_addr, addressBuffer, MAX_PATH) != NULL, "inet_ntop failed (%d)\n", WSAGetLastError()); + todo_wine ok(strcmp(addressBuffer, ipv6Address) == 0, "returnedStorage.sin6_addr != '%s' ('%s')\n", ipv6Address, addressBuffer); + + /* Release the object and create a new one */ + ret = IWSDUdpAddress_Release(udpAddress); + ok(ret == 0, "IWSDUdpAddress_Release() has %d references, should have 0\n", ret); + + rc = WSDCreateUdpAddress(&udpAddress); + ok(rc == S_OK, "WSDCreateUdpAddress(NULL, &udpAddress) failed: %08x\n", rc); + ok(udpAddress != NULL, "WSDCreateUdpAddress(NULL, &udpAddress) failed: udpAddress == NULL\n"); + + /* Try setting an IPv4 address */ + sockAddrPtr = (struct sockaddr_in *) &storage1; + sockAddrPtr->sin_family = AF_INET; + sockAddrPtr->sin_port = htons(ipv4Port); + + ret = inet_pton(AF_INET, ipv4Address, &sockAddrPtr->sin_addr); + ok(ret == 1, "inet_pton(ipv4) failed: %d\n", WSAGetLastError()); + + rc = IWSDUdpAddress_SetSockaddr(udpAddress, &storage1); + todo_wine ok(rc == S_OK, "SetSockaddr returned unexpected result: %08x\n", rc); + + rc = IWSDUdpAddress_GetSockaddr(udpAddress, &returnedStorage); + todo_wine ok(rc == S_OK, "GetSockaddr returned unexpected result: %08x\n", rc); + + todo_wine ok(returnedStorage.ss_family == storage1.ss_family, "returnedStorage.ss_family != storage1.ss_family (%d)\n", returnedStorage.ss_family); + todo_wine ok(memcmp(&returnedStorage, &storage1, sizeof(struct sockaddr_in)) == 0, "returnedStorage != storage1\n"); + + /* Check that GetTransportAddress returns the address set via the socket */ + rc = IWSDUdpAddress_GetTransportAddress(udpAddress, &returnedAddress); + todo_wine ok(rc == S_OK, "GetTransportAddress failed: %08x\n", rc); + todo_wine ok(returnedAddress != NULL, "GetTransportAddress returned unexpected address: %p\n", returnedAddress); + todo_wine ok(lstrcmpW(returnedAddress, expectedIpv4TransportAddr) == 0, "GetTransportAddress returned unexpected address: %s\n", wine_dbgstr_w(returnedAddress)); + + /* Check that GetPort doesn't return the port set via the socket */ + rc = IWSDUdpAddress_GetPort(udpAddress, &port); + todo_wine ok(rc == S_OK, "GetPort returned unexpected result: %08x\n", rc); + ok(port == 0, "GetPort returned unexpected port: %d\n", port); + + /* Try setting an IPv6 address */ + sockAddr6Ptr = (struct sockaddr_in6 *) &storage2; + sockAddr6Ptr->sin6_family = AF_INET6; + sockAddr6Ptr->sin6_port = htons(ipv6Port); + + ret = inet_pton(AF_INET6, ipv6Address, &sockAddr6Ptr->sin6_addr); + ok(ret == 1, "inet_pton(ipv6) failed: %d\n", WSAGetLastError()); + + rc = IWSDUdpAddress_SetSockaddr(udpAddress, &storage2); + todo_wine ok(rc == S_OK, "SetSockaddr returned unexpected result: %08x\n", rc); + + rc = IWSDUdpAddress_GetSockaddr(udpAddress, &returnedStorage); + todo_wine ok(rc == S_OK, "GetSockaddr returned unexpected result: %08x\n", rc); + + todo_wine ok(returnedStorage.ss_family == storage2.ss_family, "returnedStorage.ss_family != storage2.ss_family (%d)\n", returnedStorage.ss_family); + todo_wine ok(memcmp(&returnedStorage, &storage2, sizeof(struct sockaddr_in6)) == 0, "returnedStorage != storage2\n"); + + /* Check that GetTransportAddress returns the address set via the socket */ + rc = IWSDUdpAddress_GetTransportAddress(udpAddress, &returnedAddress); + todo_wine ok(rc == S_OK, "GetTransportAddress failed: %08x\n", rc); + todo_wine ok(returnedAddress != NULL, "GetTransportAddress returned unexpected address: %p\n", returnedAddress); + todo_wine ok(lstrcmpW(returnedAddress, expectedIpv6TransportAddr) == 0, "GetTransportAddress returned unexpected address: %s\n", wine_dbgstr_w(returnedAddress)); + + /* Check that GetPort doesn't return the port set via the socket */ + rc = IWSDUdpAddress_GetPort(udpAddress, &port); + todo_wine ok(rc == S_OK, "GetPort returned unexpected result: %08x\n", rc); + ok(port == 0, "GetPort returned unexpected port: %d\n", port); + + /* Release the object */ + ret = IWSDUdpAddress_Release(udpAddress); + ok(ret == 0, "IWSDUdpAddress_Release() has %d references, should have 0\n", ret); + + ret = WSACleanup(); + ok(ret == 0, "WSACleanup failed: %d\n", ret); +} + START_TEST(address) { CoInitialize(NULL); @@ -229,6 +359,7 @@ START_TEST(address) GetSetTransportAddress_udp_tests(); GetSetPort_udp_tests(); GetSetMessageType_udp_tests(); + GetSetSockaddr_udp_tests(); CoUninitialize(); }

1 0

Alexandre Julliard : wineandroid: Allocate a native window wrapper in the client process for every window.
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: wine Branch: master Commit: fbc482db1d011887468d11ef2fbac99e50af04a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbc482db1d011887468d11ef2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 5 12:21:26 2017 +0200 wineandroid: Allocate a native window wrapper in the client process for every window. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/android.h | 4 +- dlls/wineandroid.drv/device.c | 114 ++++++++++++++++++++++++++++++++++++++++- dlls/wineandroid.drv/window.c | 5 +- 3 files changed, 119 insertions(+), 4 deletions(-) diff --git a/dlls/wineandroid.drv/android.h b/dlls/wineandroid.drv/android.h index f03671a..3d9ac5a 100644 --- a/dlls/wineandroid.drv/android.h +++ b/dlls/wineandroid.drv/android.h @@ -53,7 +53,9 @@ DECL_FUNCPTR( ANativeWindow_release ); extern void start_android_device(void) DECLSPEC_HIDDEN; extern void register_native_window( HWND hwnd, struct ANativeWindow *win ) DECLSPEC_HIDDEN; -extern void create_ioctl_window( HWND hwnd ) DECLSPEC_HIDDEN; +extern struct ANativeWindow *create_ioctl_window( HWND hwnd ) DECLSPEC_HIDDEN; +extern struct ANativeWindow *grab_ioctl_window( struct ANativeWindow *window ) DECLSPEC_HIDDEN; +extern void release_ioctl_window( struct ANativeWindow *window ) DECLSPEC_HIDDEN; extern void destroy_ioctl_window( HWND hwnd ) DECLSPEC_HIDDEN; extern int ioctl_window_pos_changed( HWND hwnd, const RECT *window_rect, const RECT *client_rect, const RECT *visible_rect, UINT style, UINT flags, diff --git a/dlls/wineandroid.drv/device.c b/dlls/wineandroid.drv/device.c index 3dacd48..e6ddc50 100644 --- a/dlls/wineandroid.drv/device.c +++ b/dlls/wineandroid.drv/device.c @@ -66,6 +66,14 @@ struct native_win_data HWND hwnd; }; +/* wrapper for a native window in the context of the client (non-Java) process */ +struct native_win_wrapper +{ + struct ANativeWindow win; + HWND hwnd; + LONG ref; +}; + struct ioctl_header { int hwnd; @@ -452,14 +460,118 @@ static int android_ioctl( enum android_ioctl code, void *in, DWORD in_size, void return status_to_android_error( status ); } -void create_ioctl_window( HWND hwnd ) +static void win_incRef( struct android_native_base_t *base ) +{ + struct native_win_wrapper *win = (struct native_win_wrapper *)base; + InterlockedIncrement( &win->ref ); +} + +static void win_decRef( struct android_native_base_t *base ) +{ + struct native_win_wrapper *win = (struct native_win_wrapper *)base; + InterlockedDecrement( &win->ref ); +} + +static int dequeueBuffer( struct ANativeWindow *window, struct ANativeWindowBuffer **buffer, int *fence ) +{ + return 0; +} + +static int cancelBuffer( struct ANativeWindow *window, struct ANativeWindowBuffer *buffer, int fence ) +{ + return 0; +} + +static int queueBuffer( struct ANativeWindow *window, struct ANativeWindowBuffer *buffer, int fence ) +{ + return 0; +} + +static int dequeueBuffer_DEPRECATED( struct ANativeWindow *window, struct ANativeWindowBuffer **buffer ) +{ + return 0; +} + +static int cancelBuffer_DEPRECATED( struct ANativeWindow *window, struct ANativeWindowBuffer *buffer ) +{ + return 0; +} + +static int lockBuffer_DEPRECATED( struct ANativeWindow *window, struct ANativeWindowBuffer *buffer ) +{ + return 0; /* nothing to do */ +} + +static int queueBuffer_DEPRECATED( struct ANativeWindow *window, struct ANativeWindowBuffer *buffer ) +{ + return 0; +} + +static int setSwapInterval( struct ANativeWindow *window, int interval ) +{ + return 0; +} + +static int query( const ANativeWindow *window, int what, int *value ) +{ + return 0; +} + +static int perform( ANativeWindow *window, int operation, ... ) +{ + return 0; +} + +struct ANativeWindow *create_ioctl_window( HWND hwnd ) { struct ioctl_android_create_window req; + struct native_win_wrapper *win = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*win) ); HWND parent = GetAncestor( hwnd, GA_PARENT ); + if (!win) return NULL; + + win->win.common.magic = ANDROID_NATIVE_WINDOW_MAGIC; + win->win.common.version = sizeof(ANativeWindow); + win->win.common.incRef = win_incRef; + win->win.common.decRef = win_decRef; + win->win.setSwapInterval = setSwapInterval; + win->win.dequeueBuffer_DEPRECATED = dequeueBuffer_DEPRECATED; + win->win.lockBuffer_DEPRECATED = lockBuffer_DEPRECATED; + win->win.queueBuffer_DEPRECATED = queueBuffer_DEPRECATED; + win->win.query = query; + win->win.perform = perform; + win->win.cancelBuffer_DEPRECATED = cancelBuffer_DEPRECATED; + win->win.dequeueBuffer = dequeueBuffer; + win->win.queueBuffer = queueBuffer; + win->win.cancelBuffer = cancelBuffer; + win->ref = 1; + win->hwnd = hwnd; + TRACE( "-> %p %p\n", win, win->hwnd ); + req.hdr.hwnd = HandleToLong( hwnd ); req.parent = parent == GetDesktopWindow() ? 0 : HandleToLong( parent ); android_ioctl( IOCTL_CREATE_WINDOW, &req, sizeof(req), NULL, NULL ); + + return &win->win; +} + +struct ANativeWindow *grab_ioctl_window( struct ANativeWindow *window ) +{ + struct native_win_wrapper *win = (struct native_win_wrapper *)window; + InterlockedIncrement( &win->ref ); + return window; +} + +void release_ioctl_window( struct ANativeWindow *window ) +{ + struct native_win_wrapper *win = (struct native_win_wrapper *)window; + + if (InterlockedDecrement( &win->ref ) > 0) return; + + TRACE( "%p %p\n", win, win->hwnd ); + + destroy_ioctl_window( win->hwnd ); + HeapFree( GetProcessHeap(), 0, win ); } void destroy_ioctl_window( HWND hwnd ) diff --git a/dlls/wineandroid.drv/window.c b/dlls/wineandroid.drv/window.c index 49520eb..65b37d8 100644 --- a/dlls/wineandroid.drv/window.c +++ b/dlls/wineandroid.drv/window.c @@ -57,6 +57,7 @@ struct android_win_data RECT window_rect; /* USER window rectangle relative to parent */ RECT whole_rect; /* X window rectangle for the whole window relative to parent */ RECT client_rect; /* client area relative to parent */ + ANativeWindow *window; /* native window wrapper that forwards calls to the desktop process */ }; #define SWP_AGG_NOPOSCHANGE (SWP_NOSIZE | SWP_NOMOVE | SWP_NOCLIENTSIZE | SWP_NOCLIENTMOVE | SWP_NOZORDER) @@ -88,7 +89,7 @@ static struct android_win_data *alloc_win_data( HWND hwnd ) if ((data = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*data)))) { data->hwnd = hwnd; - create_ioctl_window( hwnd ); + data->window = create_ioctl_window( hwnd ); EnterCriticalSection( &win_data_section ); win_data_context[context_idx(hwnd)] = data; } @@ -103,7 +104,7 @@ static void free_win_data( struct android_win_data *data ) { win_data_context[context_idx( data->hwnd )] = NULL; LeaveCriticalSection( &win_data_section ); - destroy_ioctl_window( data->hwnd ); + if (data->window) release_ioctl_window( data->window ); HeapFree( GetProcessHeap(), 0, data ); }

1 0

Alexandre Julliard : wineandroid: Forward native window query() calls to the desktop process.
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: wine Branch: master Commit: f69836eba907653b581a0ea7287ee4a74bef489a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f69836eba907653b581a0ea72… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 5 12:26:27 2017 +0200 wineandroid: Forward native window query() calls to the desktop process. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/device.c | 64 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 63 insertions(+), 1 deletion(-) diff --git a/dlls/wineandroid.drv/device.c b/dlls/wineandroid.drv/device.c index e6ddc50..48b595f 100644 --- a/dlls/wineandroid.drv/device.c +++ b/dlls/wineandroid.drv/device.c @@ -56,6 +56,7 @@ enum android_ioctl IOCTL_CREATE_WINDOW, IOCTL_DESTROY_WINDOW, IOCTL_WINDOW_POS_CHANGED, + IOCTL_QUERY, NB_IOCTLS }; @@ -102,6 +103,13 @@ struct ioctl_android_window_pos_changed int owner; }; +struct ioctl_android_query +{ + struct ioctl_header hdr; + int what; + int value; +}; + static inline DWORD current_client_id(void) { return HandleToUlong( PsGetCurrentProcessId() ); @@ -197,6 +205,29 @@ void register_native_window( HWND hwnd, struct ANativeWindow *win ) NtQueueApcThread( thread, register_native_window_callback, (ULONG_PTR)hwnd, (ULONG_PTR)win, 0 ); } +static NTSTATUS android_error_to_status( int err ) +{ + switch (err) + { + case 0: return STATUS_SUCCESS; + case -ENOMEM: return STATUS_NO_MEMORY; + case -ENOSYS: return STATUS_NOT_SUPPORTED; + case -EINVAL: return STATUS_INVALID_PARAMETER; + case -ENOENT: return STATUS_INVALID_HANDLE; + case -EPERM: return STATUS_ACCESS_DENIED; + case -ENODEV: return STATUS_NO_SUCH_DEVICE; + case -EEXIST: return STATUS_DUPLICATE_NAME; + case -EPIPE: return STATUS_PIPE_DISCONNECTED; + case -ENODATA: return STATUS_NO_MORE_FILES; + case -ETIMEDOUT: return STATUS_IO_TIMEOUT; + case -EBADMSG: return STATUS_INVALID_DEVICE_REQUEST; + case -EWOULDBLOCK: return STATUS_DEVICE_NOT_READY; + default: + FIXME( "unmapped error %d\n", err ); + return STATUS_UNSUCCESSFUL; + } +} + static int status_to_android_error( NTSTATUS status ) { switch (status) @@ -323,12 +354,33 @@ static NTSTATUS windowPosChanged_ioctl( void *data, DWORD in_size, DWORD out_siz return STATUS_SUCCESS; } +static NTSTATUS query_ioctl( void *data, DWORD in_size, DWORD out_size, ULONG_PTR *ret_size ) +{ + struct ioctl_android_query *res = data; + struct ANativeWindow *parent; + struct native_win_data *win_data; + int ret; + + if (in_size < sizeof(*res)) return STATUS_INVALID_PARAMETER; + if (out_size < sizeof(*res)) return STATUS_BUFFER_OVERFLOW; + + if (!(win_data = get_ioctl_native_win_data( &res->hdr ))) return STATUS_INVALID_HANDLE; + if (!(parent = win_data->parent)) return STATUS_DEVICE_NOT_READY; + + *ret_size = sizeof( *res ); + wrap_java_call(); + ret = parent->query( parent, res->what, &res->value ); + unwrap_java_call(); + return android_error_to_status( ret ); +} + typedef NTSTATUS (*ioctl_func)( void *in, DWORD in_size, DWORD out_size, ULONG_PTR *ret_size ); static const ioctl_func ioctl_funcs[] = { createWindow_ioctl, /* IOCTL_CREATE_WINDOW */ destroyWindow_ioctl, /* IOCTL_DESTROY_WINDOW */ windowPosChanged_ioctl, /* IOCTL_WINDOW_POS_CHANGED */ + query_ioctl, /* IOCTL_QUERY */ }; static NTSTATUS WINAPI ioctl_callback( DEVICE_OBJECT *device, IRP *irp ) @@ -514,7 +566,17 @@ static int setSwapInterval( struct ANativeWindow *window, int interval ) static int query( const ANativeWindow *window, int what, int *value ) { - return 0; + struct native_win_wrapper *win = (struct native_win_wrapper *)window; + struct ioctl_android_query query; + DWORD size = sizeof( query ); + int ret; + + query.hdr.hwnd = HandleToLong( win->hwnd ); + query.what = what; + ret = android_ioctl( IOCTL_QUERY, &query, sizeof(query), &query, &size ); + TRACE( "hwnd %p what %d got %d -> %p\n", win->hwnd, what, query.value, value ); + if (!ret) *value = query.value; + return ret; } static int perform( ANativeWindow *window, int operation, ... )

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: wine Branch: master Commit: e6f225fc5f36a22a709d2cb0dfe0a53a722309ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6f225fc5f36a22a709d2cb0d… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Sat Jun 3 07:44:47 2017 +0300 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 36 +++++++++--------------------------- 1 file changed, 9 insertions(+), 27 deletions(-) diff --git a/po/lt.po b/po/lt.po index 651dce7..33e1718 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2017-05-25 08:05+0300\n" +"PO-Revision-Date: 2017-06-03 07:42+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -11027,7 +11027,7 @@ msgstr "&Sistemos konfigūracija" #: oleview.rc:36 msgid "&Run the Registry Editor" -msgstr "Paleisti &registro tvarkytuvę" +msgstr "Paleisti &Registro tvarkytuvę" #: oleview.rc:42 msgid "&CoCreateInstance Flag" @@ -11199,7 +11199,7 @@ msgstr "Keisti paskirstytojo COM kompiuterio nustatymus" #: oleview.rc:108 msgid "Run the Wine registry editor" -msgstr "Paleisti „Wine“ registro tvarkytuvę" +msgstr "Paleisti „Wine“ Registro tvarkytuvę" #: oleview.rc:109 msgid "Quit the application. Prompts to save changes" @@ -11871,14 +11871,10 @@ msgid "Contains commands for accessing frequently used keys" msgstr "Pateikiamos komandos dažnai naudojamų raktų prieigai" #: regedit.rc:165 -#, fuzzy -#| msgid "" -#| "Contains commands for displaying help and information about registry " -#| "editor" msgid "" "Contains commands for displaying Help and information about Registry Editor" msgstr "" -"Pateikiamos komandos žinyno ir informacijos apie registro tvarkytuvę rodymui" +"Pateikiamos komandos žinyno ir informacijos apie Registro tvarkytuvę rodymui" #: regedit.rc:166 msgid "Contains commands for creating new keys or values" @@ -12119,10 +12115,8 @@ msgid "regedit: The line contains invalid syntax.\n" msgstr "regedit: Eilutėje yra netinkama sintaksė.\n" #: regedit.rc:189 -#, fuzzy -#| msgid "Quits the registry editor" msgid "Quits the Registry Editor" -msgstr "Išeina iš registro tvarkytuvės" +msgstr "Išeina iš Registro tvarkytuvės" #: regedit.rc:190 msgid "Adds keys to the favorites list" @@ -12137,8 +12131,6 @@ msgid "Shows or hides the status bar" msgstr "Parodo arba paslepia būsenos juostą" #: regedit.rc:193 -#, fuzzy -#| msgid "Change position of split between two panes" msgid "Changes the position of the split between two panes" msgstr "Pakeičia polangių skirtuko poziciją tarp polangių" @@ -12183,10 +12175,8 @@ msgid "Adds a new binary value" msgstr "Prideda naują dvejetainę reikšmę" #: regedit.rc:176 -#, fuzzy -#| msgid "Adds a new binary value" msgid "Adds a new 32-bit value" -msgstr "Prideda naują dvejetainę reikšmę" +msgstr "Prideda naują 32-bitų reikšmę" #: regedit.rc:179 msgid "Imports a text file into the registry" @@ -12201,10 +12191,8 @@ msgid "Prints all or part of the registry" msgstr "Atspausdina visą ar dalį registro" #: regedit.rc:183 -#, fuzzy -#| msgid "Registry Editor" msgid "Opens Registry Editor Help" -msgstr "Registro tvarkytuvė" +msgstr "Atveria Registro tvarkytuvės žinyną" #: regedit.rc:184 msgid "Displays program information, version number and copyright" @@ -12247,26 +12235,20 @@ msgid "Unable to query the registry key '%1'." msgstr "Nepavyko užklausti registro rakto „%1“." #: regedit.rc:172 -#, fuzzy -#| msgid "Modifies the value's data" msgid "Modifies the value's data in binary form" -msgstr "Modifikuoja reikšmės duomenis" +msgstr "Modifikuoja reikšmės duomenis dvejetainiu formatu" #: regedit.rc:177 msgid "Adds a new multi-string value" msgstr "Prideda naują kelių eilučių reikšmę" #: regedit.rc:200 -#, fuzzy -#| msgid "Exports selected branch of the registry to a text file" msgid "Exports the selected branch of the registry to a text file" msgstr "Eksportuoja pasirinktą registro šaką į tekstinį failą" #: regedit.rc:178 -#, fuzzy -#| msgid "Adds a new string value" msgid "Adds a new expandable string value" -msgstr "Prideda naują eilutės reikšmę" +msgstr "Prideda naują išplečiamos eilutės reikšmę" #: regedit.rc:213 msgid "Confirm Key Delete"

1 0

Marcin Mikołajczak : po: Updated Polish translation.
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: wine Branch: master Commit: 37d7c519053b0cf30334acf087db67f804892ac7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37d7c519053b0cf30334acf08… Author: Marcin Mikołajczak <me(a)m4sk.in> Date: Sat Jun 3 20:42:16 2017 +0200 po: Updated Polish translation. Signed-off-by: Marcin Mikołajczak <me(a)m4sk.in> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/pl.po | 53 ++++++++++++++--------------------------------------- 1 file changed, 14 insertions(+), 39 deletions(-) diff --git a/po/pl.po b/po/pl.po index 50231bc..de2a989 100644 --- a/po/pl.po +++ b/po/pl.po @@ -2,20 +2,20 @@ # # Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com>, 2011, 2012, 2013, 2014. # Adam "Saibamen" Stachowicz <saibamenppl(a)gmail.com>, 2015. -# Marcin Mikołajczak <marcin123407(a)vivaldi.net>, 2017. +# Marcin Mikołajczak <me(a)m4sk.in>, 2017. msgid "" msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2017-04-05 21:48+0200\n" -"Last-Translator: Marcin Mikołajczak <marcin123407(a)vivaldi.net>\n" +"PO-Revision-Date: 2017-06-03 20:40+0200\n" +"Last-Translator: Marcin Mikołajczak <me(a)m4sk.in>\n" "Language-Team: Polish <kde-i18n-doc(a)kde.org>\n" "Language: pl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 1.8.11\n" +"X-Generator: Poedit 2.0.1\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2);\n" @@ -11807,11 +11807,8 @@ msgid "&About Registry Editor" msgstr "Edytor rejestru - i&nformacje" #: regedit.rc:91 regedit.rc:98 regedit.rc:231 -#, fuzzy -#| msgctxt "object state" -#| msgid "expanded" msgid "Expand" -msgstr "rozwinięty" +msgstr "Rozwiń" #: regedit.rc:136 msgid "Modify Binary Data..." @@ -11914,13 +11911,10 @@ msgid "Contains commands for accessing frequently used keys" msgstr "Zawiera polecenia dla dostępu do często używanych klawiszy" #: regedit.rc:165 -#, fuzzy -#| msgid "" -#| "Contains commands for displaying help and information about registry " -#| "editor" msgid "" "Contains commands for displaying Help and information about Registry Editor" -msgstr "Zawiera polecenia wyświetlające informacje o programie" +msgstr "" +"Zawiera polecenia wyświetlające pomoc i informacje dotyczące edytora rejestru" #: regedit.rc:166 msgid "Contains commands for creating new keys or values" @@ -12161,14 +12155,10 @@ msgid "regedit: Unable to delete the registry class '%1'.\n" msgstr "regedit: Nie udało się usunąć klasy rejestru '%1'.\n" #: regedit.rc:430 -#, fuzzy -#| msgid "regedit: The line '%1' was not recognized.\n" msgid "regedit: The line contains invalid syntax.\n" -msgstr "regedit: Nie rozpoznano linii '%1'.\n" +msgstr "regedit: Wiersz zawiera nieprawidłową składnię.\n" #: regedit.rc:189 -#, fuzzy -#| msgid "Quits the registry editor" msgid "Quits the Registry Editor" msgstr "Kończy działanie edytora rejestru" @@ -12185,10 +12175,8 @@ msgid "Shows or hides the status bar" msgstr "Pokazuje lub ukrywa pasek stanu" #: regedit.rc:193 -#, fuzzy -#| msgid "Change position of split between two panes" msgid "Changes the position of the split between two panes" -msgstr "Zmienia pozycję podziału pomiędzy dwoma okienkami" +msgstr "Zmienia pozycję podziału pomiędzy dwoma oknami" #: regedit.rc:194 msgid "Refreshes the window" @@ -12232,10 +12220,8 @@ msgid "Adds a new binary value" msgstr "Dodaje nową wartość binarną" #: regedit.rc:176 -#, fuzzy -#| msgid "Adds a new binary value" msgid "Adds a new 32-bit value" -msgstr "Dodaje nową wartość binarną" +msgstr "Dodaje nową wartość 32-bitową" #: regedit.rc:179 msgid "Imports a text file into the registry" @@ -12250,10 +12236,8 @@ msgid "Prints all or part of the registry" msgstr "Drukuje całość lub część rejestru" #: regedit.rc:183 -#, fuzzy -#| msgid "Registry Editor" msgid "Opens Registry Editor Help" -msgstr "Edytor rejestru" +msgstr "Otwiera pomoc edytora rejestru" #: regedit.rc:184 msgid "Displays program information, version number and copyright" @@ -12296,26 +12280,20 @@ msgid "Unable to query the registry key '%1'." msgstr "Nie można odnaleźć klucza rejestru '%1'." #: regedit.rc:172 -#, fuzzy -#| msgid "Modifies the value's data" msgid "Modifies the value's data in binary form" -msgstr "Umożliwia zmianę wartości danej" +msgstr "Modyfikuje wartość rejestru w formie binarnej" #: regedit.rc:177 msgid "Adds a new multi-string value" msgstr "Dodaje nową wartość ciągu rozwijalnego" #: regedit.rc:200 -#, fuzzy -#| msgid "Exports selected branch of the registry to a text file" msgid "Exports the selected branch of the registry to a text file" msgstr "Eksportuje zaznaczoną gałąź rejestru do pliku tekstowego" #: regedit.rc:178 -#, fuzzy -#| msgid "Adds a new string value" msgid "Adds a new expandable string value" -msgstr "Dodaje nową wartość ciągu" +msgstr "Dodaje nową rozwiniętą wartość ciągu" #: regedit.rc:213 msgid "Confirm Key Delete" @@ -12328,11 +12306,8 @@ msgstr "" "Czy na pewno chcesz usunąć klucz rejestru '%1' i wszystkie jego pochodne?" #: regedit.rc:232 -#, fuzzy -#| msgctxt "object state" -#| msgid "collapsed" msgid "Collapse" -msgstr "zwinięty" +msgstr "Zwiń" #: regsvr32.rc:32 msgid ""

1 0

André Hentschel : ntdll: Fix Cpsr value in CONTEXT_ARM64.
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: wine Branch: master Commit: 99db4c697d0349f31879126adcb9d365383513c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99db4c697d0349f31879126ad… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jun 4 18:51:59 2017 +0200 ntdll: Fix Cpsr value in CONTEXT_ARM64. The CPU can be configured to not allow reading DAIF in EL0t (User Mode), and for debugging purpose NZCV might be more interesting. Reported by Stefan Dösinger Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm64.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 14c5260..ca169a1 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -185,7 +185,7 @@ __ASM_STDCALL_FUNC( RtlCaptureContext, 8, "mov w1, #0x400000\n\t" /* CONTEXT_ARM64 */ "add w1, w1, #0x3\n\t" /* CONTEXT_FULL */ "str w1, [x0]\n\t" /* context->ContextFlags */ /* 32-bit, look at cpsr */ - "mrs x1, DAIF\n\t" + "mrs x1, NZCV\n\t" "str w1, [x0, #0x4]\n\t" /* context->Cpsr */ "ldp x0, x1, [sp], #32\n\t" "str x0, [x0, #0x8]\n\t" /* context->X0 */

1 0

Nikolay Sivov : mf: Added IMFMediaSession stub.
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: wine Branch: master Commit: 58adb553e4b7181628d2a7e5712fd30ab417ccae URL: http://source.winehq.org/git/wine.git/?a=commit;h=58adb553e4b7181628d2a7e57… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 5 02:09:48 2017 +0300 mf: Added IMFMediaSession stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/Makefile.in | 1 + dlls/mf/mf.spec | 2 +- dlls/mf/session.c | 264 ++++++++++++++++++++++++++++++++++++++++++++++++++++ include/mfidl.idl | 1 + 4 files changed, 267 insertions(+), 1 deletion(-) diff --git a/dlls/mf/Makefile.in b/dlls/mf/Makefile.in index 6725d5b..9c61d94 100644 --- a/dlls/mf/Makefile.in +++ b/dlls/mf/Makefile.in @@ -3,4 +3,5 @@ IMPORTLIB = mf C_SRCS = \ main.c \ + session.c \ topology.c diff --git a/dlls/mf/mf.spec b/dlls/mf/mf.spec index cd6d3dc..3b02bd2 100644 --- a/dlls/mf/mf.spec +++ b/dlls/mf/mf.spec @@ -39,7 +39,7 @@ @ stub MFCreateMP3MediaSink @ stub MFCreateMPEG4MediaSink @ stub MFCreateMediaProcessor -@ stub MFCreateMediaSession +@ stdcall MFCreateMediaSession(ptr ptr) @ stub MFCreateNSCByteStreamPlugin @ stub MFCreateNetSchemePlugin @ stub MFCreatePMPHost diff --git a/dlls/mf/session.c b/dlls/mf/session.c new file mode 100644 index 0000000..18c5f3b --- /dev/null +++ b/dlls/mf/session.c @@ -0,0 +1,264 @@ +/* + * Copyright 2017 Nikolay Sivov + * + * 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 "config.h" + +#include <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "mfidl.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(mfplat); + +typedef struct mfsession +{ + IMFMediaSession IMFMediaSession_iface; + LONG ref; +} mfsession; + +static inline mfsession *impl_from_IMFMediaSession(IMFMediaSession *iface) +{ + return CONTAINING_RECORD(iface, mfsession, IMFMediaSession_iface); +} + +static HRESULT WINAPI mfsession_QueryInterface(IMFMediaSession *iface, REFIID riid, void **out) +{ + mfsession *This = impl_from_IMFMediaSession(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), out); + + if (IsEqualIID(riid, &IID_IMFMediaSession) || + IsEqualIID(riid, &IID_IMFMediaEventGenerator) || + IsEqualIID(riid, &IID_IUnknown)) + { + *out = &This->IMFMediaSession_iface; + } + else + { + FIXME("(%s, %p)\n", debugstr_guid(riid), out); + *out = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*out); + return S_OK; +} + +static ULONG WINAPI mfsession_AddRef(IMFMediaSession *iface) +{ + mfsession *This = impl_from_IMFMediaSession(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%u\n", This, ref); + + return ref; +} + +static ULONG WINAPI mfsession_Release(IMFMediaSession *iface) +{ + mfsession *This = impl_from_IMFMediaSession(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%u\n", This, ref); + + if (!ref) + { + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} + +static HRESULT WINAPI mfsession_GetEvent(IMFMediaSession *iface, DWORD flags, IMFMediaEvent **event) +{ + mfsession *This = impl_from_IMFMediaSession(iface); + + FIXME("(%p)->(%#x, %p)\n", This, flags, event); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfsession_BeginGetEvent(IMFMediaSession *iface, IMFAsyncCallback *callback, IUnknown *state) +{ + mfsession *This = impl_from_IMFMediaSession(iface); + + FIXME("(%p)->(%p, %p)\n", This, callback, state); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfsession_EndGetEvent(IMFMediaSession *iface, IMFAsyncResult *result, IMFMediaEvent **event) +{ + mfsession *This = impl_from_IMFMediaSession(iface); + + FIXME("(%p)->(%p, %p)\n", This, result, event); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfsession_QueueEvent(IMFMediaSession *iface, MediaEventType event_type, REFGUID ext_type, + HRESULT hr, const PROPVARIANT *value) +{ + mfsession *This = impl_from_IMFMediaSession(iface); + + FIXME("(%p)->(%d, %s, %#x, %p)\n", This, event_type, debugstr_guid(ext_type), hr, value); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfsession_SetTopology(IMFMediaSession *iface, DWORD flags, IMFTopology *topology) +{ + mfsession *This = impl_from_IMFMediaSession(iface); + + FIXME("(%p)->(%#x, %p)\n", This, flags, topology); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfsession_ClearTopologies(IMFMediaSession *iface) +{ + mfsession *This = impl_from_IMFMediaSession(iface); + + FIXME("(%p)\n", This); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfsession_Start(IMFMediaSession *iface, const GUID *format, const PROPVARIANT *start) +{ + mfsession *This = impl_from_IMFMediaSession(iface); + + FIXME("(%p)->(%s, %p)\n", This, debugstr_guid(format), start); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfsession_Pause(IMFMediaSession *iface) +{ + mfsession *This = impl_from_IMFMediaSession(iface); + + FIXME("(%p)\n", This); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfsession_Stop(IMFMediaSession *iface) +{ + mfsession *This = impl_from_IMFMediaSession(iface); + + FIXME("(%p)\n", This); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfsession_Close(IMFMediaSession *iface) +{ + mfsession *This = impl_from_IMFMediaSession(iface); + + FIXME("(%p)\n", This); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfsession_Shutdown(IMFMediaSession *iface) +{ + mfsession *This = impl_from_IMFMediaSession(iface); + + FIXME("(%p)\n", This); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfsession_GetClock(IMFMediaSession *iface, IMFClock **clock) +{ + mfsession *This = impl_from_IMFMediaSession(iface); + + FIXME("(%p)->(%p)\n", This, clock); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfsession_GetSessionCapabilities(IMFMediaSession *iface, DWORD *caps) +{ + mfsession *This = impl_from_IMFMediaSession(iface); + + FIXME("(%p)->(%p)\n", This, caps); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfsession_GetFullTopology(IMFMediaSession *iface, DWORD flags, TOPOID id, IMFTopology **topology) +{ + mfsession *This = impl_from_IMFMediaSession(iface); + + FIXME("(%p)->(%#x, %s, %p)\n", This, flags, wine_dbgstr_longlong(id), topology); + + return E_NOTIMPL; +} + +static const IMFMediaSessionVtbl mfmediasessionvtbl = +{ + mfsession_QueryInterface, + mfsession_AddRef, + mfsession_Release, + mfsession_GetEvent, + mfsession_BeginGetEvent, + mfsession_EndGetEvent, + mfsession_QueueEvent, + mfsession_SetTopology, + mfsession_ClearTopologies, + mfsession_Start, + mfsession_Pause, + mfsession_Stop, + mfsession_Close, + mfsession_Shutdown, + mfsession_GetClock, + mfsession_GetSessionCapabilities, + mfsession_GetFullTopology, +}; + +/*********************************************************************** + * MFCreateTopology (mf.@) + */ +HRESULT WINAPI MFCreateMediaSession(IMFAttributes *config, IMFMediaSession **session) +{ + mfsession *object; + + TRACE("(%p, %p)\n", config, session); + + if (!session) + return E_POINTER; + + if (config) + FIXME("session configuration ignored\n"); + + object = HeapAlloc(GetProcessHeap(), 0, sizeof(*object)); + if (!object) + return E_OUTOFMEMORY; + + object->IMFMediaSession_iface.lpVtbl = &mfmediasessionvtbl; + object->ref = 1; + + *session = &object->IMFMediaSession_iface; + + return S_OK; +} diff --git a/include/mfidl.idl b/include/mfidl.idl index 767ff42..45b4957 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -163,5 +163,6 @@ interface IMFSourceResolver : IUnknown [local] HRESULT CanceObjectCreation([in] IUnknown *cancel_cookie); } +cpp_quote("HRESULT WINAPI MFCreateMediaSession(IMFAttributes *config, IMFMediaSession **session);") cpp_quote("HRESULT WINAPI MFCreateSourceResolver(IMFSourceResolver **resolver);") cpp_quote("HRESULT WINAPI MFCreateTopology(IMFTopology **topology);")

1 0

Nikolay Sivov : shell32: Avoid zero length allocations when converting path in ExtractIconA() ( Valgrind).
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: wine Branch: master Commit: 1a5561c0cf202805436dd58635f6f61b8254d3d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a5561c0cf202805436dd5863… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 5 02:10:28 2017 +0300 shell32: Avoid zero length allocations when converting path in ExtractIconA() (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32_main.c | 15 +++++++-------- dlls/shell32/shell32_main.h | 15 +++++++++++++++ 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c index 04924c0..34b906c 100644 --- a/dlls/shell32/shell32_main.c +++ b/dlls/shell32/shell32_main.c @@ -846,17 +846,16 @@ HICON WINAPI DuplicateIcon( HINSTANCE hInstance, HICON hIcon) /************************************************************************* * ExtractIconA [SHELL32.@] */ -HICON WINAPI ExtractIconA(HINSTANCE hInstance, LPCSTR lpszFile, UINT nIconIndex) -{ +HICON WINAPI ExtractIconA(HINSTANCE hInstance, const char *file, UINT nIconIndex) +{ + WCHAR *fileW; HICON ret; - INT len = MultiByteToWideChar(CP_ACP, 0, lpszFile, -1, NULL, 0); - LPWSTR lpwstrFile = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - TRACE("%p %s %d\n", hInstance, lpszFile, nIconIndex); + TRACE("%p %s %d\n", hInstance, debugstr_a(file), nIconIndex); - MultiByteToWideChar(CP_ACP, 0, lpszFile, -1, lpwstrFile, len); - ret = ExtractIconW(hInstance, lpwstrFile, nIconIndex); - HeapFree(GetProcessHeap(), 0, lpwstrFile); + fileW = strdupAtoW(file); + ret = ExtractIconW(hInstance, fileW, nIconIndex); + HeapFree(GetProcessHeap(), 0, fileW); return ret; } diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h index 941ca74..fc2a5ba 100644 --- a/dlls/shell32/shell32_main.h +++ b/dlls/shell32/shell32_main.h @@ -236,4 +236,19 @@ static inline WCHAR *strdupW(const WCHAR *src) return dest; } +static inline WCHAR *strdupAtoW(const char *str) +{ + WCHAR *ret; + DWORD len; + + if (!str) return NULL; + + len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); + ret = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (ret) + MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); + + return ret; +} + #endif

1 0