August 2011 - Wine-Commits - list.winehq.org

Lucas Fialho Zawacki : dinput: In BuildActionMap, don' t assign objects to actions mapped by an user.
by Alexandre Julliard Aug. 24, 2011

Aug. 24, 2011

Module: wine Branch: master Commit: 4a2033934628a501347e5addf781503036f9056b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a2033934628a501347e5addf… Author: Lucas Fialho Zawacki <lfzawacki(a)gmail.com> Date: Tue Aug 23 23:42:51 2011 -0300 dinput: In BuildActionMap, don't assign objects to actions mapped by an user. --- dlls/dinput/device.c | 3 +++ dlls/dinput/joystick.c | 3 +++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index a2412b8..d2de525 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -605,6 +605,9 @@ HRESULT _build_action_map(LPDIRECTINPUTDEVICE8W iface, LPDIACTIONFORMATW lpdiaf, for (i=0; i < lpdiaf->dwNumActions; i++) { + /* Don't touch an user configured action */ + if (lpdiaf->rgoAction[i].dwHow == DIAH_USERCONFIG) continue; + if ((lpdiaf->rgoAction[i].dwSemantic & devMask) == devMask) { DWORD obj_id = semantic_to_obj_id(This, lpdiaf->rgoAction[i].dwSemantic); diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c index c6bae98..779472d 100644 --- a/dlls/dinput/joystick.c +++ b/dlls/dinput/joystick.c @@ -445,6 +445,9 @@ HRESULT WINAPI JoystickWGenericImpl_BuildActionMap(LPDIRECTINPUTDEVICE8W iface, DWORD type = 0x000000ff & (lpdiaf->rgoAction[i].dwSemantic >> 8); DWORD genre = 0xff000000 & lpdiaf->rgoAction[i].dwSemantic; + /* Don't touch an user configured action */ + if (lpdiaf->rgoAction[i].dwHow == DIAH_USERCONFIG) continue; + /* Only consider actions of the right genre */ if (lpdiaf->dwGenre != genre && genre != DIGENRE_ANY) continue;

1 0

Jörg Höhle : mmdevapi: After GetBuffer, refuse Reset, but Start/Stop is ok.
by Alexandre Julliard Aug. 24, 2011

Aug. 24, 2011

Module: wine Branch: master Commit: 541075c3db2829031d783e54aaa1b639fb23155b URL: http://source.winehq.org/git/wine.git/?a=commit;h=541075c3db2829031d783e54a… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Wed Aug 10 18:07:51 2011 +0200 mmdevapi: After GetBuffer, refuse Reset, but Start/Stop is ok. --- dlls/winealsa.drv/mmdevdrv.c | 5 +++++ dlls/winecoreaudio.drv/mmdevdrv.c | 5 +++++ dlls/wineoss.drv/mmdevdrv.c | 5 +++++ 3 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 8ea2f09..01fe4fd 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -1753,6 +1753,11 @@ static HRESULT WINAPI AudioClient_Reset(IAudioClient *iface) return AUDCLNT_E_NOT_STOPPED; } + if(This->buf_state != NOT_LOCKED){ + LeaveCriticalSection(&This->lock); + return AUDCLNT_E_BUFFER_OPERATION_PENDING; + } + This->held_frames = 0; This->written_frames = 0; This->lcl_offs_frames = 0; diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index fcb337d..8311a29 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -1391,6 +1391,11 @@ static HRESULT WINAPI AudioClient_Reset(IAudioClient *iface) return AUDCLNT_E_NOT_STOPPED; } + if(This->getbuf_last){ + OSSpinLockUnlock(&This->lock); + return AUDCLNT_E_BUFFER_OPERATION_PENDING; + } + This->written_frames = 0; hr = AudioClock_GetPosition_nolock(This, &This->last_time, NULL, TRUE); diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index f962f8a..0e44842 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -1379,6 +1379,11 @@ static HRESULT WINAPI AudioClient_Reset(IAudioClient *iface) return AUDCLNT_E_NOT_STOPPED; } + if(This->buf_state != NOT_LOCKED){ + LeaveCriticalSection(&This->lock); + return AUDCLNT_E_BUFFER_OPERATION_PENDING; + } + This->written_frames = 0; This->inbuf_frames = 0; This->held_frames = 0;

1 0

Stefan Dösinger : ddraw: Correct WINED3DFMT_X8D24_UNORM.
by Alexandre Julliard Aug. 24, 2011

Aug. 24, 2011

Module: wine Branch: master Commit: 138a12545d0e0af2a12ed75bcd04ae04c3150233 URL: http://source.winehq.org/git/wine.git/?a=commit;h=138a12545d0e0af2a12ed75bc… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Aug 18 18:47:48 2011 +0200 ddraw: Correct WINED3DFMT_X8D24_UNORM. --- dlls/ddraw/utils.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/utils.c b/dlls/ddraw/utils.c index b4b9dab..94e4ac0 100644 --- a/dlls/ddraw/utils.c +++ b/dlls/ddraw/utils.c @@ -228,7 +228,7 @@ void PixelFormat_WineD3DtoDD(DDPIXELFORMAT *DDPixelFormat, enum wined3d_format_i DDPixelFormat->dwFourCC = 0; DDPixelFormat->u1.dwZBufferBitDepth = 32; DDPixelFormat->u2.dwStencilBitDepth = 0; - DDPixelFormat->u3.dwZBitMask = 0x00FFFFFFFF; + DDPixelFormat->u3.dwZBitMask = 0x00FFFFFF; DDPixelFormat->u4.dwStencilBitMask = 0x00000000; DDPixelFormat->u5.dwRGBAlphaBitMask = 0x0; break;

1 0

André Hentschel : wininet: Don' t return a relative path when building the proxy url request.
by Alexandre Julliard Aug. 24, 2011

Aug. 24, 2011

Module: wine Branch: master Commit: d8f036e4dc7c43661437b830e8b8bd318dcc59e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8f036e4dc7c43661437b830e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Aug 22 21:31:14 2011 +0200 wininet: Don't return a relative path when building the proxy url request. --- dlls/wininet/http.c | 37 +++++++++++++++++++++---------------- 1 files changed, 21 insertions(+), 16 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 7934c43..772aba6 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1648,34 +1648,39 @@ static BOOL HTTP_InsertAuthorization( http_request_t *request, struct HttpAuthIn static WCHAR *HTTP_BuildProxyRequestUrl(http_request_t *req) { + static const WCHAR slash[] = { '/',0 }; + static const WCHAR format[] = { 'h','t','t','p',':','/','/','%','s',':','%','u',0 }; + static const WCHAR formatSSL[] = { 'h','t','t','p','s',':','/','/','%','s',':','%','u',0 }; + http_session_t *session = req->session; WCHAR new_location[INTERNET_MAX_URL_LENGTH], *url; DWORD size; size = sizeof(new_location); if (HTTP_HttpQueryInfoW(req, HTTP_QUERY_LOCATION, new_location, &size, NULL) == ERROR_SUCCESS) { + URL_COMPONENTSW UrlComponents; + if (!(url = heap_alloc(size + sizeof(WCHAR)))) return NULL; strcpyW( url, new_location ); + + ZeroMemory(&UrlComponents,sizeof(URL_COMPONENTSW)); + if(InternetCrackUrlW(url, 0, 0, &UrlComponents)) goto done; + heap_free(url); } - else - { - static const WCHAR slash[] = { '/',0 }; - static const WCHAR format[] = { 'h','t','t','p',':','/','/','%','s',':','%','u',0 }; - static const WCHAR formatSSL[] = { 'h','t','t','p','s',':','/','/','%','s',':','%','u',0 }; - http_session_t *session = req->session; - size = 16; /* "https://" + sizeof(port#) + ":/\0" */ - size += strlenW( session->hostName ) + strlenW( req->path ); + size = 16; /* "https://" + sizeof(port#) + ":/\0" */ + size += strlenW( session->hostName ) + strlenW( req->path ); - if (!(url = heap_alloc(size * sizeof(WCHAR)))) return NULL; + if (!(url = heap_alloc(size * sizeof(WCHAR)))) return NULL; - if (req->hdr.dwFlags & INTERNET_FLAG_SECURE) - sprintfW( url, formatSSL, session->hostName, session->hostPort ); - else - sprintfW( url, format, session->hostName, session->hostPort ); - if (req->path[0] != '/') strcatW( url, slash ); - strcatW( url, req->path ); - } + if (req->hdr.dwFlags & INTERNET_FLAG_SECURE) + sprintfW( url, formatSSL, session->hostName, session->hostPort ); + else + sprintfW( url, format, session->hostName, session->hostPort ); + if (req->path[0] != '/') strcatW( url, slash ); + strcatW( url, req->path ); + +done: TRACE("url=%s\n", debugstr_w(url)); return url; }

1 0

Lucas Fialho Zawacki : dinput: Proper conversion of username parameters for Set and BuildActionMap.
by Alexandre Julliard Aug. 24, 2011

Aug. 24, 2011

Module: wine Branch: master Commit: 64c1f4778c339f8cb77f4ba03a99465b0f983715 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64c1f4778c339f8cb77f4ba03… Author: Lucas Fialho Zawacki <lfzawacki(a)gmail.com> Date: Tue Aug 23 23:42:53 2011 -0300 dinput: Proper conversion of username parameters for Set and BuildActionMap. --- dlls/dinput/joystick.c | 24 ++++++++++++++++++++++-- dlls/dinput/keyboard.c | 24 ++++++++++++++++++++++-- dlls/dinput/mouse.c | 24 ++++++++++++++++++++++-- 3 files changed, 66 insertions(+), 6 deletions(-) diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c index 779472d..8dd1566 100644 --- a/dlls/dinput/joystick.c +++ b/dlls/dinput/joystick.c @@ -486,14 +486,24 @@ HRESULT WINAPI JoystickAGenericImpl_BuildActionMap(LPDIRECTINPUTDEVICE8A iface, JoystickGenericImpl *This = impl_from_IDirectInputDevice8A(iface); DIACTIONFORMATW diafW; HRESULT hr; + WCHAR *lpszUserNameW = NULL; + int username_size; diafW.rgoAction = HeapAlloc(GetProcessHeap(), 0, sizeof(DIACTIONW)*lpdiaf->dwNumActions); _copy_diactionformatAtoW(&diafW, lpdiaf); - hr = JoystickWGenericImpl_BuildActionMap(&This->base.IDirectInputDevice8W_iface, &diafW, NULL, dwFlags); + if (lpszUserName != NULL) + { + username_size = MultiByteToWideChar(CP_ACP, 0, lpszUserName, -1, NULL, 0); + lpszUserNameW = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*username_size); + MultiByteToWideChar(CP_ACP, 0, lpszUserName, -1, lpszUserNameW, username_size); + } + + hr = JoystickWGenericImpl_BuildActionMap(&This->base.IDirectInputDevice8W_iface, &diafW, lpszUserNameW, dwFlags); _copy_diactionformatWtoA(lpdiaf, &diafW); HeapFree(GetProcessHeap(), 0, diafW.rgoAction); + HeapFree(GetProcessHeap(), 0, lpszUserNameW); return hr; } @@ -518,13 +528,23 @@ HRESULT WINAPI JoystickAGenericImpl_SetActionMap(LPDIRECTINPUTDEVICE8A iface, JoystickGenericImpl *This = impl_from_IDirectInputDevice8A(iface); DIACTIONFORMATW diafW; HRESULT hr; + WCHAR *lpszUserNameW = NULL; + int username_size; diafW.rgoAction = HeapAlloc(GetProcessHeap(), 0, sizeof(DIACTIONW)*lpdiaf->dwNumActions); _copy_diactionformatAtoW(&diafW, lpdiaf); - hr = JoystickWGenericImpl_SetActionMap(&This->base.IDirectInputDevice8W_iface, &diafW, NULL, dwFlags); + if (lpszUserName != NULL) + { + username_size = MultiByteToWideChar(CP_ACP, 0, lpszUserName, -1, NULL, 0); + lpszUserNameW = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*username_size); + MultiByteToWideChar(CP_ACP, 0, lpszUserName, -1, lpszUserNameW, username_size); + } + + hr = JoystickWGenericImpl_SetActionMap(&This->base.IDirectInputDevice8W_iface, &diafW, lpszUserNameW, dwFlags); HeapFree(GetProcessHeap(), 0, diafW.rgoAction); + HeapFree(GetProcessHeap(), 0, lpszUserNameW); return hr; } diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index cade73f..4de8692 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -542,14 +542,24 @@ static HRESULT WINAPI SysKeyboardAImpl_BuildActionMap(LPDIRECTINPUTDEVICE8A ifac SysKeyboardImpl *This = impl_from_IDirectInputDevice8A(iface); DIACTIONFORMATW diafW; HRESULT hr; + WCHAR *lpszUserNameW = NULL; + int username_size; diafW.rgoAction = HeapAlloc(GetProcessHeap(), 0, sizeof(DIACTIONW)*lpdiaf->dwNumActions); _copy_diactionformatAtoW(&diafW, lpdiaf); - hr = SysKeyboardWImpl_BuildActionMap(&This->base.IDirectInputDevice8W_iface, &diafW, NULL, dwFlags); + if (lpszUserName != NULL) + { + username_size = MultiByteToWideChar(CP_ACP, 0, lpszUserName, -1, NULL, 0); + lpszUserNameW = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*username_size); + MultiByteToWideChar(CP_ACP, 0, lpszUserName, -1, lpszUserNameW, username_size); + } + + hr = SysKeyboardWImpl_BuildActionMap(&This->base.IDirectInputDevice8W_iface, &diafW, lpszUserNameW, dwFlags); _copy_diactionformatWtoA(lpdiaf, &diafW); HeapFree(GetProcessHeap(), 0, diafW.rgoAction); + HeapFree(GetProcessHeap(), 0, lpszUserNameW); return hr; } @@ -572,13 +582,23 @@ static HRESULT WINAPI SysKeyboardAImpl_SetActionMap(LPDIRECTINPUTDEVICE8A iface, SysKeyboardImpl *This = impl_from_IDirectInputDevice8A(iface); DIACTIONFORMATW diafW; HRESULT hr; + WCHAR *lpszUserNameW = NULL; + int username_size; diafW.rgoAction = HeapAlloc(GetProcessHeap(), 0, sizeof(DIACTIONW)*lpdiaf->dwNumActions); _copy_diactionformatAtoW(&diafW, lpdiaf); - hr = SysKeyboardWImpl_SetActionMap(&This->base.IDirectInputDevice8W_iface, &diafW, NULL, dwFlags); + if (lpszUserName != NULL) + { + username_size = MultiByteToWideChar(CP_ACP, 0, lpszUserName, -1, NULL, 0); + lpszUserNameW = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*username_size); + MultiByteToWideChar(CP_ACP, 0, lpszUserName, -1, lpszUserNameW, username_size); + } + + hr = SysKeyboardWImpl_SetActionMap(&This->base.IDirectInputDevice8W_iface, &diafW, lpszUserNameW, dwFlags); HeapFree(GetProcessHeap(), 0, diafW.rgoAction); + HeapFree(GetProcessHeap(), 0, lpszUserNameW); return hr; } diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index c362c3d..011deb0 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -791,14 +791,24 @@ static HRESULT WINAPI SysMouseAImpl_BuildActionMap(LPDIRECTINPUTDEVICE8A iface, SysMouseImpl *This = impl_from_IDirectInputDevice8A(iface); DIACTIONFORMATW diafW; HRESULT hr; + WCHAR *lpszUserNameW = NULL; + int username_size; diafW.rgoAction = HeapAlloc(GetProcessHeap(), 0, sizeof(DIACTIONW)*lpdiaf->dwNumActions); _copy_diactionformatAtoW(&diafW, lpdiaf); - hr = SysMouseWImpl_BuildActionMap(&This->base.IDirectInputDevice8W_iface, &diafW, NULL, dwFlags); + if (lpszUserName != NULL) + { + username_size = MultiByteToWideChar(CP_ACP, 0, lpszUserName, -1, NULL, 0); + lpszUserNameW = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*username_size); + MultiByteToWideChar(CP_ACP, 0, lpszUserName, -1, lpszUserNameW, username_size); + } + + hr = SysMouseWImpl_BuildActionMap(&This->base.IDirectInputDevice8W_iface, &diafW, lpszUserNameW, dwFlags); _copy_diactionformatWtoA(lpdiaf, &diafW); HeapFree(GetProcessHeap(), 0, diafW.rgoAction); + HeapFree(GetProcessHeap(), 0, lpszUserNameW); return hr; } @@ -821,13 +831,23 @@ static HRESULT WINAPI SysMouseAImpl_SetActionMap(LPDIRECTINPUTDEVICE8A iface, SysMouseImpl *This = impl_from_IDirectInputDevice8A(iface); DIACTIONFORMATW diafW; HRESULT hr; + WCHAR *lpszUserNameW = NULL; + int username_size; diafW.rgoAction = HeapAlloc(GetProcessHeap(), 0, sizeof(DIACTIONW)*lpdiaf->dwNumActions); _copy_diactionformatAtoW(&diafW, lpdiaf); - hr = SysMouseWImpl_SetActionMap(&This->base.IDirectInputDevice8W_iface, &diafW, NULL, dwFlags); + if (lpszUserName != NULL) + { + username_size = MultiByteToWideChar(CP_ACP, 0, lpszUserName, -1, NULL, 0); + lpszUserNameW = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*username_size); + MultiByteToWideChar(CP_ACP, 0, lpszUserName, -1, lpszUserNameW, username_size); + } + + hr = SysMouseWImpl_SetActionMap(&This->base.IDirectInputDevice8W_iface, &diafW, lpszUserNameW, dwFlags); HeapFree(GetProcessHeap(), 0, diafW.rgoAction); + HeapFree(GetProcessHeap(), 0, lpszUserNameW); return hr; }

1 0

Stefan Dösinger : wined3d: Disable WINED3DFMT_S1_UINT_D15_UNORM and WINED3DFMT_S4X4_UINT_D24_UNORM.
by Alexandre Julliard Aug. 24, 2011

Aug. 24, 2011

Module: wine Branch: master Commit: 2459d79b53dd8d70289f5d11a4ca64d55ca3c8ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=2459d79b53dd8d70289f5d11a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Aug 18 18:44:28 2011 +0200 wined3d: Disable WINED3DFMT_S1_UINT_D15_UNORM and WINED3DFMT_S4X4_UINT_D24_UNORM. --- dlls/wined3d/directx.c | 20 ++++++++++++++++++-- 1 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index afc77df..7a659ee 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3242,6 +3242,18 @@ static BOOL CheckDepthStencilCapability(const struct wined3d_adapter *adapter, /* Only allow depth/stencil formats */ if (!(ds_format->depth_size || ds_format->stencil_size)) return FALSE; + /* Blacklist formats not supported on Windows */ + switch (ds_format->id) + { + case WINED3DFMT_S1_UINT_D15_UNORM: /* Breaks the shadowvol2 dx7 sdk sample */ + case WINED3DFMT_S4X4_UINT_D24_UNORM: + TRACE_(d3d_caps)("[FAILED] - not supported on windows\n"); + return FALSE; + + default: + break; + } + if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { /* With FBOs WGL limitations do not apply, but the format needs to be FBO attachable */ @@ -3425,9 +3437,7 @@ static BOOL CheckTextureCapability(const struct wined3d_adapter *adapter, const */ case WINED3DFMT_D16_LOCKABLE: case WINED3DFMT_D16_UNORM: - case WINED3DFMT_S1_UINT_D15_UNORM: case WINED3DFMT_X8D24_UNORM: - case WINED3DFMT_S4X4_UINT_D24_UNORM: case WINED3DFMT_D24_UNORM_S8_UINT: case WINED3DFMT_S8_UINT_D24_FLOAT: case WINED3DFMT_D32_UNORM: @@ -3440,6 +3450,12 @@ static BOOL CheckTextureCapability(const struct wined3d_adapter *adapter, const return TRUE; return FALSE; + /* Not supported on Windows */ + case WINED3DFMT_S1_UINT_D15_UNORM: + case WINED3DFMT_S4X4_UINT_D24_UNORM: + TRACE_(d3d_caps)("[FAILED] - not supported on windows\n"); + return FALSE; + /***** * Not supported everywhere(depends on GL_ATI_envmap_bumpmap or * GL_NV_texture_shader). Emulated by shaders

1 0

Lucas Fialho Zawacki : dinput: Common implementation for joystick, keyboard and mouse SetActionMap.
by Alexandre Julliard Aug. 24, 2011

Aug. 24, 2011

Module: wine Branch: master Commit: d175c1526f8912b4295df6faf0977571d2416041 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d175c1526f8912b4295df6faf… Author: Lucas Fialho Zawacki <lfzawacki(a)gmail.com> Date: Tue Aug 23 23:42:50 2011 -0300 dinput: Common implementation for joystick, keyboard and mouse SetActionMap. --- dlls/dinput/device.c | 106 +++++++++++++++++++++++++++++++++--------- dlls/dinput/device_private.h | 1 + dlls/dinput/joystick.c | 58 +---------------------- dlls/dinput/keyboard.c | 48 +------------------ dlls/dinput/mouse.c | 52 +-------------------- 5 files changed, 90 insertions(+), 175 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d175c1526f8912b4295df…

1 0

Lucas Fialho Zawacki : dinput: Common implementation of BuildActionMap for keyboard and mouse.
by Alexandre Julliard Aug. 24, 2011

Aug. 24, 2011

Module: wine Branch: master Commit: c0fd222321059e1063d5f717b4b08f2a99395006 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0fd222321059e1063d5f717b… Author: Lucas Fialho Zawacki <lfzawacki(a)gmail.com> Date: Tue Aug 23 23:42:49 2011 -0300 dinput: Common implementation of BuildActionMap for keyboard and mouse. --- dlls/dinput/device.c | 42 ++++++++++++++++++++++++++++++++++++++++++ dlls/dinput/device_private.h | 2 ++ dlls/dinput/keyboard.c | 26 +------------------------- dlls/dinput/mouse.c | 26 ++------------------------ 4 files changed, 47 insertions(+), 49 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 8719066..e3dfd03 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -598,6 +598,48 @@ DWORD semantic_to_obj_id(IDirectInputDeviceImpl* This, DWORD dwSemantic) return type | (0x0000ff00 & (obj_instance << 8)); } +HRESULT _build_action_map(LPDIRECTINPUTDEVICE8W iface, LPDIACTIONFORMATW lpdiaf, LPCWSTR lpszUserName, DWORD dwFlags, DWORD devMask, LPCDIDATAFORMAT df) +{ + IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface); + int i, has_actions = 0; + + for (i=0; i < lpdiaf->dwNumActions; i++) + { + if ((lpdiaf->rgoAction[i].dwSemantic & devMask) == devMask) + { + DWORD obj_id = semantic_to_obj_id(This, lpdiaf->rgoAction[i].dwSemantic); + DWORD type = DIDFT_GETTYPE(obj_id); + DWORD inst = DIDFT_GETINSTANCE(obj_id); + + LPDIOBJECTDATAFORMAT odf; + + if (type == DIDFT_PSHBUTTON) type = DIDFT_BUTTON; + if (type == DIDFT_RELAXIS) type = DIDFT_AXIS; + + /* Assure that the object exists */ + odf = dataformat_to_odf_by_type(df, inst, type); + + if (odf != NULL) + { + lpdiaf->rgoAction[i].dwObjID = obj_id; + lpdiaf->rgoAction[i].guidInstance = This->guid; + lpdiaf->rgoAction[i].dwHow = DIAH_DEFAULT; + has_actions = 1; + } + } + else if (!(dwFlags & DIDBAM_PRESERVE)) + { + /* we must clear action data belonging to other devices */ + memset(&lpdiaf->rgoAction[i].guidInstance, 0, sizeof(GUID)); + lpdiaf->rgoAction[i].dwHow = DIAH_UNMAPPED; + } + } + + if (!has_actions) return DI_NOEFFECT; + + return IDirectInputDevice8WImpl_BuildActionMap(iface, lpdiaf, lpszUserName, dwFlags); +} + /****************************************************************************** * queue_event - add new event to the ring queue */ diff --git a/dlls/dinput/device_private.h b/dlls/dinput/device_private.h index e8fe00a..9b7b370 100644 --- a/dlls/dinput/device_private.h +++ b/dlls/dinput/device_private.h @@ -127,6 +127,8 @@ extern const char *_dump_dinput_GUID(const GUID *guid) DECLSPEC_HIDDEN; extern DWORD semantic_to_obj_id(IDirectInputDeviceImpl* This, DWORD dwSemantic) DECLSPEC_HIDDEN; extern LPDIOBJECTDATAFORMAT dataformat_to_odf_by_type(LPCDIDATAFORMAT df, int n, DWORD type) DECLSPEC_HIDDEN; +extern HRESULT _build_action_map(LPDIRECTINPUTDEVICE8W iface, LPDIACTIONFORMATW lpdiaf, LPCWSTR lpszUserName, DWORD dwFlags, DWORD devMask, LPCDIDATAFORMAT df) DECLSPEC_HIDDEN; + /* And the stubs */ extern HRESULT WINAPI IDirectInputDevice2AImpl_Acquire(LPDIRECTINPUTDEVICE8A iface) DECLSPEC_HIDDEN; extern HRESULT WINAPI IDirectInputDevice2WImpl_Acquire(LPDIRECTINPUTDEVICE8W iface) DECLSPEC_HIDDEN; diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index 3c93bcd..1f766fc 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -529,33 +529,9 @@ static HRESULT WINAPI SysKeyboardWImpl_BuildActionMap(LPDIRECTINPUTDEVICE8W ifac LPCWSTR lpszUserName, DWORD dwFlags) { - SysKeyboardImpl *This = impl_from_IDirectInputDevice8W(iface); - int i, has_actions = 0; - FIXME("(%p)->(%p,%s,%08x): semi-stub !\n", iface, lpdiaf, debugstr_w(lpszUserName), dwFlags); - for (i=0; i < lpdiaf->dwNumActions; i++) - { - if ((lpdiaf->rgoAction[i].dwSemantic & DIKEYBOARD_MASK) == DIKEYBOARD_MASK) - { - DWORD obj_id = semantic_to_obj_id(&This->base, lpdiaf->rgoAction[i].dwSemantic); - - lpdiaf->rgoAction[i].dwObjID = obj_id; - lpdiaf->rgoAction[i].guidInstance = This->base.guid; - lpdiaf->rgoAction[i].dwHow = DIAH_DEFAULT; - has_actions = 1; - } - else if (!(dwFlags & DIDBAM_PRESERVE)) - { - /* we must clear action data belonging to other devices */ - memset(&lpdiaf->rgoAction[i].guidInstance, 0, sizeof(GUID)); - lpdiaf->rgoAction[i].dwHow = DIAH_UNMAPPED; - } - } - - if (!has_actions) return DI_NOEFFECT; - - return IDirectInputDevice8WImpl_BuildActionMap(iface, lpdiaf, lpszUserName, dwFlags); + return _build_action_map(iface, lpdiaf, lpszUserName, dwFlags, DIKEYBOARD_MASK, &c_dfDIKeyboard); } static HRESULT WINAPI SysKeyboardAImpl_BuildActionMap(LPDIRECTINPUTDEVICE8A iface, diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 8da35f4..f42cdb5 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -778,31 +778,9 @@ static HRESULT WINAPI SysMouseWImpl_BuildActionMap(LPDIRECTINPUTDEVICE8W iface, LPCWSTR lpszUserName, DWORD dwFlags) { - SysMouseImpl *This = impl_from_IDirectInputDevice8W(iface); - int i, has_actions = 0; - - for (i=0; i < lpdiaf->dwNumActions; i++) - { - if ((lpdiaf->rgoAction[i].dwSemantic & DIMOUSE_MASK) == DIMOUSE_MASK) - { - DWORD obj_id = semantic_to_obj_id(&This->base, lpdiaf->rgoAction[i].dwSemantic); - - lpdiaf->rgoAction[i].dwObjID = obj_id; - lpdiaf->rgoAction[i].guidInstance = This->base.guid; - lpdiaf->rgoAction[i].dwHow = DIAH_DEFAULT; - has_actions = 1; - } - else if (!(dwFlags & DIDBAM_PRESERVE)) - { - /* we must clear action data belonging to other devices */ - memset(&lpdiaf->rgoAction[i].guidInstance, 0, sizeof(GUID)); - lpdiaf->rgoAction[i].dwHow = DIAH_UNMAPPED; - } - } - - if (!has_actions) return DI_NOEFFECT; + FIXME("(%p)->(%p,%s,%08x): semi-stub !\n", iface, lpdiaf, debugstr_w(lpszUserName), dwFlags); - return IDirectInputDevice8WImpl_BuildActionMap(iface, lpdiaf, lpszUserName, dwFlags); + return _build_action_map(iface, lpdiaf, lpszUserName, dwFlags, DIMOUSE_MASK, &c_dfDIMouse2); } static HRESULT WINAPI SysMouseAImpl_BuildActionMap(LPDIRECTINPUTDEVICE8A iface,

1 0

Bruno Jesus : ws2_32: Fix false-positive write fds on select().
by Alexandre Julliard Aug. 24, 2011

Aug. 24, 2011

Module: wine Branch: master Commit: bebc425bb52fde72611a767c732b0214074b3f17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bebc425bb52fde72611a767c7… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri Aug 5 01:04:06 2011 -0300 ws2_32: Fix false-positive write fds on select(). --- dlls/ws2_32/socket.c | 3 ++- dlls/ws2_32/tests/sock.c | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index eafaefd..a51b921 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3661,7 +3661,8 @@ static int get_poll_results( WS_fd_set *readfds, WS_fd_set *writefds, WS_fd_set if (writefds) { for (i = k = 0; i < writefds->fd_count; i++, j++) - if (fds[j].revents) writefds->fd_array[k++] = writefds->fd_array[i]; + if ((fds[j].revents & POLLOUT) && !(fds[j].revents & POLLHUP)) + writefds->fd_array[k++] = writefds->fd_array[i]; writefds->fd_count = k; total += k; } diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index a171c85..9e6912c 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2311,7 +2311,7 @@ static void test_errors(void) timeval.tv_usec = 50000; ret = select(1, NULL, &set, NULL, &timeval); - todo_wine ok( (ret == 0), "expected 0 (timeout), got: %d\n", ret ); + ok( (ret == 0), "expected 0 (timeout), got: %d\n", ret ); } ret = closesocket(sock); @@ -2353,8 +2353,8 @@ static void test_select(void) ret = select(maxfd+1, &readfds, &writefds, &exceptfds, &select_timeout); ok ( (ret == 0), "select should not return any socket handles\n"); ok ( !FD_ISSET(fdRead, &readfds), "FD should not be set\n"); - ok ( !FD_ISSET(fdWrite, &writefds), "FD should not be set\n"); } + ok ( !FD_ISSET(fdWrite, &writefds), "FD should not be set\n"); ok ( !FD_ISSET(fdRead, &exceptfds), "FD should not be set\n"); ok ( !FD_ISSET(fdWrite, &exceptfds), "FD should not be set\n");

1 0

Jacek Caban : oleaut32: Correctly test VARIANT_BOOL value in VarCat.
by Alexandre Julliard Aug. 23, 2011

Aug. 23, 2011

Module: wine Branch: master Commit: 6ee95c77381791299ae040248897ac58c74f49f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ee95c77381791299ae040248… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 23 15:49:07 2011 +0200 oleaut32: Correctly test VARIANT_BOOL value in VarCat. --- dlls/oleaut32/tests/vartest.c | 38 ++++++++++++++++++++++++++++++++++++++ dlls/oleaut32/variant.c | 4 ++-- 2 files changed, 40 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 3032a9e..c52e3ce 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -345,6 +345,20 @@ static void test_var_call2( int line, HRESULT (WINAPI *func)(LPVARIANT,LPVARIANT VariantClear( &result ); } +static int strcmp_wa(const WCHAR *strw, const char *stra) +{ + WCHAR buf[512]; + MultiByteToWideChar(CP_ACP, 0, stra, -1, buf, sizeof(buf)); + return lstrcmpW(strw, buf); +} + +#define test_bstr_var(a,b) _test_bstr_var(__LINE__,a,b) +static void _test_bstr_var(unsigned line, const VARIANT *v, const char *str) +{ + ok_(__FILE__,line)(V_VT(v) == VT_BSTR, "unexpected vt=%d\n", V_VT(v)); + if(V_VT(v) == VT_BSTR) + ok(!strcmp_wa(V_BSTR(v), str), "v=%s, expected %s\n", wine_dbgstr_w(V_BSTR(v)), str); +} static void test_VariantInit(void) { @@ -5645,6 +5659,30 @@ static void test_VarCat(void) VariantClear(&right); VariantClear(&result); VariantClear(&expected); + + /* Test boolean conversion */ + V_VT(&left) = VT_BOOL; + V_BOOL(&left) = VARIANT_TRUE; + V_VT(&right) = VT_BSTR; + V_BSTR(&right) = SysAllocStringLen(NULL,0); + hres = VarCat(&left, &right, &result); + ok(hres == S_OK, "VarCat failed: %08x\n", hres); + if(!strcmp_wa(V_BSTR(&result), "True")) { + V_VT(&right) = VT_BOOL; + V_BOOL(&right) = 100; + hres = VarCat(&left, &right, &result); + ok(hres == S_OK, "VarCat failed: %08x\n", hres); + test_bstr_var(&result, "TrueTrue"); + VariantClear(&result); + + V_BOOL(&right) = VARIANT_FALSE; + hres = VarCat(&left, &right, &result); + ok(hres == S_OK, "VarCat failed: %08x\n", hres); + test_bstr_var(&result, "TrueFalse"); + VariantClear(&result); + }else { + skip("Got %s as True, assuming non-English locale\n", wine_dbgstr_w(V_BSTR(&result))); + } } static HRESULT (WINAPI *pVarAnd)(LPVARIANT,LPVARIANT,LPVARIANT); diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 60407d5..0d1f2cc 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -2624,7 +2624,7 @@ HRESULT WINAPI VarCat(LPVARIANT left, LPVARIANT right, LPVARIANT out) { /* Bools are handled as localized True/False strings instead of 0/-1 as in MSDN */ V_VT(&bstrvar_left) = VT_BSTR; - if (V_BOOL(left) == TRUE) + if (V_BOOL(left)) V_BSTR(&bstrvar_left) = SysAllocString(str_true); else V_BSTR(&bstrvar_left) = SysAllocString(str_false); @@ -2664,7 +2664,7 @@ HRESULT WINAPI VarCat(LPVARIANT left, LPVARIANT right, LPVARIANT out) { /* Bools are handled as localized True/False strings instead of 0/-1 as in MSDN */ V_VT(&bstrvar_right) = VT_BSTR; - if (V_BOOL(right) == TRUE) + if (V_BOOL(right)) V_BSTR(&bstrvar_right) = SysAllocString(str_true); else V_BSTR(&bstrvar_right) = SysAllocString(str_false);

1 0