wine-commits April 2015

wine-commits@winehq.org

2 participants
451 discussions

Andrew Eikum : shell32: Add more knownfolders.
by Alexandre Julliard 09 Apr '15

09 Apr '15

Module: wine Branch: master Commit: f58c11767a39b2ace8c6bc9422d1e9e9f9a9886b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f58c11767a39b2ace8c6bc942… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Apr 8 10:59:37 2015 -0500 shell32: Add more knownfolders. --- dlls/shell32/shellpath.c | 451 ++++++++++++++++++++++++++++++++++++++--- dlls/shell32/tests/shellpath.c | 50 ++--- 2 files changed, 451 insertions(+), 50 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f58c11767a39b2ace8c6b…

1 0

Andrew Eikum : shell32: Allocate returned array in IKnownFolderManager:: GetFolderIds.
by Alexandre Julliard 09 Apr '15

09 Apr '15

Module: wine Branch: master Commit: e4868d563574853d40ca04adfc28db1c19ca9dbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4868d563574853d40ca04adf… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Apr 8 10:59:33 2015 -0500 shell32: Allocate returned array in IKnownFolderManager::GetFolderIds. --- dlls/shell32/shellpath.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index d853274..731ea2f 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -4178,7 +4178,8 @@ static HRESULT WINAPI foldermanager_GetFolderIds( TRACE("%p, %p\n", ppKFId, pCount); - *ppKFId = fm->ids; + *ppKFId = CoTaskMemAlloc(fm->num_ids * sizeof(KNOWNFOLDERID)); + memcpy(*ppKFId, fm->ids, fm->num_ids * sizeof(KNOWNFOLDERID)); *pCount = fm->num_ids; return S_OK; }

1 0

Aric Stewart : dinput: Add JoystickID to the Instance Name.
by Alexandre Julliard 08 Apr '15

08 Apr '15

Module: wine Branch: master Commit: 3d30db22484c119d65e1fa476662bd6a4a3eea21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d30db22484c119d65e1fa476… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Apr 7 10:00:31 2015 -0500 dinput: Add JoystickID to the Instance Name. --- dlls/dinput/joystick.c | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c index 547ba56..9425c0b 100644 --- a/dlls/dinput/joystick.c +++ b/dlls/dinput/joystick.c @@ -26,6 +26,8 @@ * force feedback */ +#include <stdio.h> + #include "joystick_private.h" #include "wine/debug.h" #include "winreg.h" @@ -608,6 +610,8 @@ HRESULT WINAPI JoystickAGenericImpl_GetDeviceInfo( LPDIDEVICEINSTANCEA pdidi) { JoystickGenericImpl *This = impl_from_IDirectInputDevice8A(iface); + DIPROPDWORD pd; + DWORD index = 0; TRACE("(%p,%p)\n", iface, pdidi); @@ -622,12 +626,20 @@ HRESULT WINAPI JoystickAGenericImpl_GetDeviceInfo( return DIERR_INVALIDPARAM; } + /* Try to get joystick index */ + pd.diph.dwSize = sizeof(pd); + pd.diph.dwHeaderSize = sizeof(pd.diph); + pd.diph.dwObj = 0; + pd.diph.dwHow = DIPH_DEVICE; + if (SUCCEEDED(IDirectInputDevice2_GetProperty(iface, DIPROP_JOYSTICKID, &pd.diph))) + index = pd.dwData; + /* Return joystick */ pdidi->guidInstance = This->guidInstance; pdidi->guidProduct = This->guidProduct; /* we only support traditional joysticks for now */ pdidi->dwDevType = This->devcaps.dwDevType; - strcpy(pdidi->tszInstanceName, "Joystick"); + snprintf(pdidi->tszInstanceName, MAX_PATH, "Joystick %d", index); strcpy(pdidi->tszProductName, This->name); if (pdidi->dwSize > sizeof(DIDEVICEINSTANCE_DX3A)) { pdidi->guidFFDriver = GUID_NULL; @@ -646,6 +658,9 @@ HRESULT WINAPI JoystickWGenericImpl_GetDeviceInfo( LPDIDEVICEINSTANCEW pdidi) { JoystickGenericImpl *This = impl_from_IDirectInputDevice8W(iface); + CHAR buffer[MAX_PATH]; + DIPROPDWORD pd; + DWORD index = 0; TRACE("(%p,%p)\n", iface, pdidi); @@ -655,12 +670,21 @@ HRESULT WINAPI JoystickWGenericImpl_GetDeviceInfo( return DIERR_INVALIDPARAM; } + /* Try to get joystick index */ + pd.diph.dwSize = sizeof(pd); + pd.diph.dwHeaderSize = sizeof(pd.diph); + pd.diph.dwObj = 0; + pd.diph.dwHow = DIPH_DEVICE; + if (SUCCEEDED(IDirectInputDevice2_GetProperty(iface, DIPROP_JOYSTICKID, &pd.diph))) + index = pd.dwData; + /* Return joystick */ pdidi->guidInstance = This->guidInstance; pdidi->guidProduct = This->guidProduct; /* we only support traditional joysticks for now */ pdidi->dwDevType = This->devcaps.dwDevType; - MultiByteToWideChar(CP_ACP, 0, "Joystick", -1, pdidi->tszInstanceName, MAX_PATH); + snprintf(buffer, sizeof(buffer), "Joystick %d", index); + MultiByteToWideChar(CP_ACP, 0, buffer, -1, pdidi->tszInstanceName, MAX_PATH); MultiByteToWideChar(CP_ACP, 0, This->name, -1, pdidi->tszProductName, MAX_PATH); if (pdidi->dwSize > sizeof(DIDEVICEINSTANCE_DX3W)) { pdidi->guidFFDriver = GUID_NULL;

1 0

Andrew Eikum : shell32: Add more knownfolder definitions.
by Alexandre Julliard 08 Apr '15

08 Apr '15

Module: wine Branch: master Commit: 915bef8725d2403c2d07a258865f64865852cfa0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=915bef8725d2403c2d07a2588… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Apr 8 08:55:46 2015 -0500 shell32: Add more knownfolder definitions. --- dlls/shell32/shellpath.c | 195 ++++++++++++++++++++++++++++++++++++++--- dlls/shell32/tests/shellpath.c | 22 ++--- 2 files changed, 196 insertions(+), 21 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=915bef8725d2403c2d07a…

1 0

Andrew Eikum : shell32: Support setting and retrieving KnownFolder parsing names.
by Alexandre Julliard 08 Apr '15

08 Apr '15

Module: wine Branch: master Commit: c01efd0666bd1d5bf57ae6659899b1edfaeab764 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c01efd0666bd1d5bf57ae6659… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Apr 8 08:52:46 2015 -0500 shell32: Support setting and retrieving KnownFolder parsing names. --- dlls/shell32/shellpath.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index b35f04f..5337809 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -771,6 +771,7 @@ VOID WINAPI PathSetDlgItemPathAW(HWND hDlg, int id, LPCVOID pszPath) static const WCHAR szCategory[] = {'C','a','t','e','g','o','r','y',0}; static const WCHAR szAttributes[] = {'A','t','t','r','i','b','u','t','e','s',0}; static const WCHAR szName[] = {'N','a','m','e',0}; +static const WCHAR szParsingName[] = {'P','a','r','s','i','n','g','N','a','m','e',0}; static const WCHAR szRelativePath[] = {'R','e','l','a','t','i','v','e','P','a','t','h',0}; static const WCHAR szParentFolder[] = {'P','a','r','e','n','t','F','o','l','d','e','r',0}; @@ -3869,6 +3870,8 @@ static HRESULT WINAPI knownfolder_GetFolderDefinition( get_known_folder_wstr(knownfolder->registryPath, szRelativePath, &pKFD->pszRelativePath); + get_known_folder_wstr(knownfolder->registryPath, szParsingName, &pKFD->pszParsingName); + return S_OK; } @@ -4093,6 +4096,9 @@ static HRESULT register_folder(const KNOWNFOLDERID *rfid, const KNOWNFOLDER_DEFI if(SUCCEEDED(hr)) hr = HRESULT_FROM_WIN32(RegSetValueExW(hKey, szName, 0, REG_SZ, (LPBYTE)pKFD->pszName, (lstrlenW(pKFD->pszName)+1)*sizeof(WCHAR) )); + if(SUCCEEDED(hr) && pKFD->pszParsingName) + hr = HRESULT_FROM_WIN32(RegSetValueExW(hKey, szParsingName, 0, REG_SZ, (LPBYTE)pKFD->pszParsingName, (lstrlenW(pKFD->pszParsingName)+1)*sizeof(WCHAR) )); + if(SUCCEEDED(hr) && !IsEqualGUID(&pKFD->fidParent, &GUID_NULL)) { WCHAR sParentGuid[39];

1 0

Bruno Jesus : ws2_32: Handle SO_ERROR manually in getsockopt().
by Alexandre Julliard 08 Apr '15

08 Apr '15

Module: wine Branch: master Commit: 71c60d15d3fb6c88c23d8c8cd4f7e6cfd3e89458 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71c60d15d3fb6c88c23d8c8cd… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Apr 8 02:02:55 2015 -0300 ws2_32: Handle SO_ERROR manually in getsockopt(). As soon as SO_ERROR is read from getsockopt it is reset in the kernel, when attempting a non-blocking connection the wine server reads SO_ERROR first so when the application tries to read the value it will end with zero. --- dlls/ws2_32/socket.c | 31 ++++++++++++++++++++++++++++++- dlls/ws2_32/tests/sock.c | 1 - 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index ad75a75..6903909 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3286,7 +3286,6 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, * alphabetically */ case WS_SO_BROADCAST: case WS_SO_DEBUG: - case WS_SO_ERROR: case WS_SO_KEEPALIVE: case WS_SO_OOBINLINE: case WS_SO_RCVBUF: @@ -3450,6 +3449,36 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, *optlen = sizeof(BOOL); return 0; + case WS_SO_ERROR: + { + if ( (fd = get_sock_fd( s, 0, NULL )) == -1) + return SOCKET_ERROR; + if (getsockopt(fd, SOL_SOCKET, SO_ERROR, optval, (socklen_t *)optlen) != 0 ) + { + SetLastError((errno == EBADF) ? WSAENOTSOCK : wsaErrno()); + ret = SOCKET_ERROR; + } + release_sock_fd( s, fd ); + + /* The wineserver may have swallowed the error before us */ + if (!ret && *(int*) optval == 0) + { + int i, events[FD_MAX_EVENTS]; + _get_sock_errors(s, events); + for (i = 0; i < FD_MAX_EVENTS; i++) + { + if(events[i]) + { + events[i] = NtStatusToWSAError(events[i]); + TRACE("returning SO_ERROR %d from wine server\n", events[i]); + *(int*) optval = events[i]; + break; + } + } + } + return ret; + } + case WS_SO_LINGER: { struct linger lingval; diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 2b4daae..5f25471 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3788,7 +3788,6 @@ static void test_select(void) len = sizeof(id); id = 0xdeadbeef; ok(!getsockopt(fdWrite, SOL_SOCKET, SO_ERROR, (char*)&id, &len), "getsockopt failed with %d\n",WSAGetLastError()); -todo_wine ok(id == WSAECONNREFUSED, "expected 10061, got %d\n", id); ok(FD_ISSET(fdWrite, &exceptfds), "fdWrite socket is not in the set\n"); ok(select_timeout.tv_usec == 250000, "select timeout should not have changed\n");

1 0

Bruno Jesus : ws2_32: Add a more generic function to retrieve socket errors from server.
by Alexandre Julliard 08 Apr '15

08 Apr '15

Module: wine Branch: master Commit: b34ca6f4fe836b5ddd43672d1a789aa2ddde7360 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b34ca6f4fe836b5ddd43672d1… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Apr 8 02:02:41 2015 -0300 ws2_32: Add a more generic function to retrieve socket errors from server. --- dlls/ws2_32/socket.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 7494b5f..ad75a75 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1075,19 +1075,23 @@ static void _sync_sock_state(SOCKET s) (void)_is_blocking(s, &dummy); } -static int _get_sock_error(SOCKET s, unsigned int bit) +static void _get_sock_errors(SOCKET s, int *events) { - int events[FD_MAX_EVENTS]; - SERVER_START_REQ( get_socket_event ) { req->handle = wine_server_obj_handle( SOCKET2HANDLE(s) ); req->service = FALSE; req->c_event = 0; - wine_server_set_reply( req, events, sizeof(events) ); + wine_server_set_reply( req, events, sizeof(int) * FD_MAX_EVENTS ); wine_server_call( req ); } SERVER_END_REQ; +} + +static int _get_sock_error(SOCKET s, unsigned int bit) +{ + int events[FD_MAX_EVENTS]; + _get_sock_errors(s, events); return events[bit]; }

1 0

Bruno Jesus : ws2_32/tests: Add some more select() related tests.
by Alexandre Julliard 08 Apr '15

08 Apr '15

Module: wine Branch: master Commit: f01ccea4b538e624f1efc59a91ba9e998d10762f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f01ccea4b538e624f1efc59a9… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Apr 8 02:02:01 2015 -0300 ws2_32/tests: Add some more select() related tests. --- dlls/ws2_32/tests/sock.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 287a24b..2b4daae 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3675,6 +3675,12 @@ static void test_select(void) select_timeout.tv_sec = 1; select_timeout.tv_usec = 250000; + /* When no events are pending select returns 0 with no error */ + FD_ZERO_ALL(); + FD_SET_ALL(fdListen); + ret = select(0, &readfds, &writefds, &exceptfds, &select_timeout); + ok(ret == 0, "expected 0, got %d\n", ret); + /* When a socket is attempting to connect the listening socket receives the read descriptor */ fdWrite = setup_connector_socket(&address, len, TRUE); FD_ZERO_ALL(); @@ -3695,6 +3701,10 @@ static void test_select(void) ok(ret == 2, "expected 2, got %d\n", ret); ok(FD_ISSET(fdWrite, &writefds), "fdWrite socket is not in the set\n"); ok(FD_ISSET(fdRead, &writefds), "fdRead socket is not in the set\n"); + len = sizeof(id); + id = 0xdeadbeef; + ok(!getsockopt(fdWrite, SOL_SOCKET, SO_ERROR, (char*)&id, &len), "getsockopt failed with %d\n",WSAGetLastError()); + ok(id == 0, "expected 0, got %d\n", id); /* When data is received the receiver gets the read descriptor */ ret = send(fdWrite, "1234", 4, 0); @@ -3767,6 +3777,7 @@ static void test_select(void) ok(ret == 0, "expected 0, got %d\n", ret); ret = closesocket(fdListen); ok(ret == 0, "expected 0, got %d\n", ret); + len = sizeof(address); fdWrite = setup_connector_socket(&address, len, TRUE); FD_ZERO_ALL(); FD_SET(fdWrite, &writefds); @@ -3774,6 +3785,11 @@ static void test_select(void) select_timeout.tv_sec = 2; /* requires more time to realize it will not connect */ ret = select(0, &readfds, &writefds, &exceptfds, &select_timeout); ok(ret == 1, "expected 1, got %d\n", ret); + len = sizeof(id); + id = 0xdeadbeef; + ok(!getsockopt(fdWrite, SOL_SOCKET, SO_ERROR, (char*)&id, &len), "getsockopt failed with %d\n",WSAGetLastError()); +todo_wine + ok(id == WSAECONNREFUSED, "expected 10061, got %d\n", id); ok(FD_ISSET(fdWrite, &exceptfds), "fdWrite socket is not in the set\n"); ok(select_timeout.tv_usec == 250000, "select timeout should not have changed\n"); closesocket(fdWrite);

1 0

Sebastian Lackner : wined3d: Fix a typo in vertexshader_init.
by Alexandre Julliard 08 Apr '15

08 Apr '15

Module: wine Branch: master Commit: 14219b0c3b39d696028718a91bdec9c5ad6239ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=14219b0c3b39d696028718a91… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Apr 8 04:56:33 2015 +0200 wined3d: Fix a typo in vertexshader_init. Should fix the graphical corruptions recently introduced by 002713de6d6afed8f1483316fd32fbfc0956b338. --- dlls/wined3d/shader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 6428ec7..0bedf24 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -2312,7 +2312,7 @@ static HRESULT vertexshader_init(struct wined3d_shader *shader, struct wined3d_d shader->u.vs.attributes[input->register_idx].usage = shader_usage_from_semantic_name(input->semantic_name); - shader->u.vs.attributes[i].usage_idx = input->semantic_idx; + shader->u.vs.attributes[input->register_idx].usage_idx = input->semantic_idx; } shader->load_local_constsF = (reg_maps->usesrelconstF && !list_empty(&shader->constantsF)) ||

1 0

Bruno Jesus : gdi32: Support negative count values in GetBitmapBits.
by Alexandre Julliard 08 Apr '15

08 Apr '15

Module: wine Branch: master Commit: 5c323a540c2892fdd4ca98e2b51da82a66e30f80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c323a540c2892fdd4ca98e2b… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Apr 7 23:19:44 2015 -0300 gdi32: Support negative count values in GetBitmapBits. --- dlls/gdi32/bitmap.c | 2 +- dlls/gdi32/tests/bitmap.c | 28 ++++++++++++++++++++-------- 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index 79374a0..6d1bed9 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -253,7 +253,7 @@ LONG WINAPI GetBitmapBits( dst_stride = get_bitmap_stride( bmp->dib.dsBm.bmWidth, bmp->dib.dsBm.bmBitsPixel ); ret = max = dst_stride * bmp->dib.dsBm.bmHeight; if (!bits) goto done; - if (count > max) count = max; + if (count < 0 || count > max) count = max; ret = count; src.visrect.left = 0; diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 84f843f..e19c552 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -56,8 +56,9 @@ static void test_bitmap_info(HBITMAP hbm, INT expected_depth, const BITMAPINFOHE { BITMAP bm; BITMAP bma[2]; - INT ret, width_bytes; + INT ret, width_bytes, i; BYTE buf[512], buf_cmp[512]; + INT test_size[] = {0 /*first value will be changed */, 0, -1, -1000, ~0, sizeof(buf)}; ret = GetObjectW(hbm, sizeof(bm), &bm); ok(ret == sizeof(bm), "GetObject returned %d\n", ret); @@ -75,17 +76,28 @@ static void test_bitmap_info(HBITMAP hbm, INT expected_depth, const BITMAPINFOHE assert(sizeof(buf) == sizeof(buf_cmp)); SetLastError(0xdeadbeef); - ret = GetBitmapBits(hbm, 0, NULL); - ok(ret == bm.bmWidthBytes * bm.bmHeight, "%d != %d\n", ret, bm.bmWidthBytes * bm.bmHeight); + test_size[0] = bm.bmWidthBytes * bm.bmHeight; + /* NULL output buffer with different count values */ + for (i = 0; i < sizeof(test_size) / sizeof(test_size[0]); i++) + { + ret = GetBitmapBits(hbm, test_size[i], NULL); + ok(ret == bm.bmWidthBytes * bm.bmHeight, "%d != %d\n", ret, bm.bmWidthBytes * bm.bmHeight); + } memset(buf_cmp, 0xAA, sizeof(buf_cmp)); memset(buf_cmp, 0, bm.bmWidthBytes * bm.bmHeight); - memset(buf, 0xAA, sizeof(buf)); - ret = GetBitmapBits(hbm, sizeof(buf), buf); - ok(ret == bm.bmWidthBytes * bm.bmHeight, "%d != %d\n", ret, bm.bmWidthBytes * bm.bmHeight); - ok(!memcmp(buf, buf_cmp, sizeof(buf)), - "buffers do not match, depth %d\n", bmih->biBitCount); + /* Correct output buffer with different count values */ + for (i = 0; i < sizeof(test_size) / sizeof(test_size[0]); i++) + { + int expect = i == 1 ? 0 : bm.bmWidthBytes * bm.bmHeight; + memset(buf, 0xAA, sizeof(buf)); + ret = GetBitmapBits(hbm, test_size[i], buf); + ok(ret == expect, "Test[%d]: %d != %d\n", i, ret, expect); + if (expect) + ok(!memcmp(buf, buf_cmp, sizeof(buf)), + "Test[%d]: buffers do not match, depth %d\n", i, bmih->biBitCount); + } /* test various buffer sizes for GetObject */ ret = GetObjectW(hbm, sizeof(*bma) * 2, bma);

1 0

← Newer
1
...
28
29
30
31
32
33
34
...
46
Older →

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 April 2015