November 2010 - Wine-Commits

Gerald Pfeifer : comctl32: Remove the last, unused parameter fromTOOLTIPS_NewToolRectT.
by Alexandre Julliard Nov. 5, 2010

Nov. 5, 2010

Module: wine Branch: master Commit: 7312981cf5f6d4f6e165fc6f29dc68239f8fb30d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7312981cf5f6d4f6e165fc6f2… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Fri Nov 5 00:03:08 2010 +0100 comctl32: Remove the last, unused parameter fromTOOLTIPS_NewToolRectT. --- dlls/comctl32/tooltips.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c index 5b48d38..5951796 100644 --- a/dlls/comctl32/tooltips.c +++ b/dlls/comctl32/tooltips.c @@ -1430,7 +1430,7 @@ TOOLTIPS_HitTestT (const TOOLTIPS_INFO *infoPtr, LPTTHITTESTINFOW lptthit, static LRESULT -TOOLTIPS_NewToolRectT (TOOLTIPS_INFO *infoPtr, const TTTOOLINFOW *ti, BOOL isW) +TOOLTIPS_NewToolRectT (TOOLTIPS_INFO *infoPtr, const TTTOOLINFOW *ti) { INT nTool; @@ -2212,8 +2212,8 @@ TOOLTIPS_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) uMsg == TTM_HITTESTW); case TTM_NEWTOOLRECTA: case TTM_NEWTOOLRECTW: - return TOOLTIPS_NewToolRectT (infoPtr, (LPTTTOOLINFOW)lParam, - uMsg == TTM_NEWTOOLRECTW); + return TOOLTIPS_NewToolRectT (infoPtr, (LPTTTOOLINFOW)lParam); + case TTM_POP: return TOOLTIPS_Pop (infoPtr);

1 0

Austin Lund : comctl32/tests: Added extra debugging information to toolbar size tests.
by Alexandre Julliard Nov. 5, 2010

Nov. 5, 2010

Module: wine Branch: master Commit: 6a819b102d1744f2cbbfa76321162ae3d9e36c01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a819b102d1744f2cbbfa7632… Author: Austin Lund <austin.lund(a)gmail.com> Date: Fri Nov 5 15:31:52 2010 +1000 comctl32/tests: Added extra debugging information to toolbar size tests. --- dlls/comctl32/tests/toolbar.c | 77 ++++++++++++++++++++++------------------- 1 files changed, 41 insertions(+), 36 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6a819b102d1744f2cbbfa…

1 0

Gerald Pfeifer : urlmon: Avoid accessing an uninitialized variable in a TRACE in validate_path.
by Alexandre Julliard Nov. 5, 2010

Nov. 5, 2010

Module: wine Branch: master Commit: 5fb37aa45471e620016d221d9c7b5c175ec7b0b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fb37aa45471e620016d221d9… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Thu Nov 4 20:38:24 2010 +0100 urlmon: Avoid accessing an uninitialized variable in a TRACE in validate_path. --- dlls/urlmon/uri.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 3bbe54f..fe37558 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -3810,7 +3810,7 @@ static HRESULT validate_path(const UriBuilder *builder, parse_data *data, DWORD if(!valid || (check_len && expected_len != data->path_len)) { TRACE("(%p %p %x): Invalid path component %s.\n", builder, data, flags, - debugstr_wn(component, expected_len)); + debugstr_wn(component, check_len ? expected_len : -1) ); return INET_E_INVALID_URL; }

1 0

Vijay Kiran Kamuju : tools: Add trailing semicolon to MimeType in wine. desktop.
by Alexandre Julliard Nov. 5, 2010

Nov. 5, 2010

Module: wine Branch: master Commit: 0fb718a6575ef0c93ca3f6cd9da23e275c6c4f6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fb718a6575ef0c93ca3f6cd9… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Fri Nov 5 05:01:16 2010 -0400 tools: Add trailing semicolon to MimeType in wine.desktop. --- tools/wine.desktop | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/wine.desktop b/tools/wine.desktop index 9e9a527..76f1bc2 100644 --- a/tools/wine.desktop +++ b/tools/wine.desktop @@ -23,7 +23,7 @@ Name[sr(a)latin]=Wine - dizač Windows programa Name[hr]=Wine - dizač Windows programa Name[he]=Wine — מריץ תכניות Windows Exec=wine start /unix %f -MimeType=application/x-ms-dos-executable;application/x-msi;application/x-win-lnk;application/x-ms-shortcut +MimeType=application/x-ms-dos-executable;application/x-msi;application/x-win-lnk;application/x-ms-shortcut; Icon=wine NoDisplay=true StartupNotify=true

1 0

Alexandre Julliard : winex11: Don't try to unmap systray windows, it confuses some systray docks.
by Alexandre Julliard Nov. 5, 2010

Nov. 5, 2010

Module: wine Branch: master Commit: de983c2268b177197fb29629cca551113e16ec9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=de983c2268b177197fb29629c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 5 13:41:30 2010 +0100 winex11: Don't try to unmap systray windows, it confuses some systray docks. --- dlls/winex11.drv/systray.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/systray.c b/dlls/winex11.drv/systray.c index fbbe8c2..d5adcb9 100644 --- a/dlls/winex11.drv/systray.c +++ b/dlls/winex11.drv/systray.c @@ -432,7 +432,7 @@ void change_systray_owner( Display *display, Window systray_window ) { struct tray_icon *icon; - ERR( "new owner %lx\n", systray_window ); + TRACE( "new owner %lx\n", systray_window ); LIST_FOR_EACH_ENTRY( icon, &icon_list, struct tray_icon, entry ) { if (icon->display == -1) continue; @@ -444,10 +444,15 @@ void change_systray_owner( Display *display, Window systray_window ) /* hide a tray icon */ static BOOL hide_icon( struct tray_icon *icon ) { + struct x11drv_win_data *data; + TRACE( "id=0x%x, hwnd=%p\n", icon->id, icon->owner ); if (!icon->window) return TRUE; /* already hidden */ + /* make sure we don't try to unmap it, it confuses some systray docks */ + if ((data = X11DRV_get_win_data( icon->window )) && data->embedded) data->mapped = FALSE; + DestroyWindow(icon->window); DestroyWindow(icon->tooltip); icon->window = 0;

1 0

Vijay Kiran Kamuju : include: Fix macro signatures in d3drmobj.h.
by Alexandre Julliard Nov. 5, 2010

Nov. 5, 2010

Module: wine Branch: master Commit: 5c431a0ffa8e02350037b078ced621106118ab5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c431a0ffa8e02350037b078c… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Fri Nov 5 04:53:36 2010 -0400 include: Fix macro signatures in d3drmobj.h. --- include/d3drmobj.h | 334 ++++++++++++++++++++++++++-------------------------- 1 files changed, 167 insertions(+), 167 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5c431a0ffa8e02350037b…

1 0

Alexandre Julliard : winex11: Add support for receiving mouse events on non-toplevel windows.
by Alexandre Julliard Nov. 5, 2010

Nov. 5, 2010

Module: wine Branch: master Commit: cdaff0a918e1c9fa885cc756ecb08070a77b649b URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdaff0a918e1c9fa885cc756e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 5 13:41:03 2010 +0100 winex11: Add support for receiving mouse events on non-toplevel windows. --- dlls/winex11.drv/event.c | 2 +- dlls/winex11.drv/mouse.c | 97 +++++++++++++++++++++++++------------------- dlls/winex11.drv/x11drv.h | 2 +- 3 files changed, 57 insertions(+), 44 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cdaff0a918e1c9fa885cc…

1 0

Vijay Kiran Kamuju : include: Add missing definitions for LPDIRECT3DRM2 and LPDIRECT3DRM3.
by Alexandre Julliard Nov. 5, 2010

Nov. 5, 2010

Module: wine Branch: master Commit: f6750b7ddd0e7e2710d39e0e05cc06d63d9adf88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6750b7ddd0e7e2710d39e0e0… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Thu Nov 4 16:02:10 2010 -0400 include: Add missing definitions for LPDIRECT3DRM2 and LPDIRECT3DRM3. --- include/d3drm.h | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/include/d3drm.h b/include/d3drm.h index 54beaab..1a1bcce 100644 --- a/include/d3drm.h +++ b/include/d3drm.h @@ -22,10 +22,13 @@ #include <ddraw.h> -typedef struct IDirect3DRM *LPDIRECT3DRM; +typedef struct IDirect3DRM *LPDIRECT3DRM, **LPLPDIRECT3DRM; #include <d3drmobj.h> +#ifdef __cplusplus +extern "C" { +#endif /* Direct3DRM Object CLSID */ DEFINE_GUID(CLSID_CDirect3DRM, 0x4516ec41, 0x8f20, 0x11d0, 0x9b, 0x6d, 0x00, 0x00, 0xc0, 0x78, 0x1b, 0xc3); @@ -35,6 +38,9 @@ DEFINE_GUID(IID_IDirect3DRM, 0x2bc49361, 0x8327, 0x11cf, 0xac, 0x DEFINE_GUID(IID_IDirect3DRM2, 0x4516ecc8, 0x8f20, 0x11d0, 0x9b, 0x6d, 0x00, 0x00, 0xc0, 0x78, 0x1b, 0xc3); DEFINE_GUID(IID_IDirect3DRM3, 0x4516ec83, 0x8f20, 0x11d0, 0x9b, 0x6d, 0x00, 0x00, 0xc0, 0x78, 0x1b, 0xc3); +typedef struct IDirect3DRM2 *LPDIRECT3DRM2, **LPLPDIRECT3DRM2; +typedef struct IDirect3DRM3 *LPDIRECT3DRM3, **LPLPDIRECT3DRM3; + HRESULT WINAPI Direct3DRMCreate(LPDIRECT3DRM* ppDirect3DRM); /***************************************************************************** @@ -494,4 +500,8 @@ DECLARE_INTERFACE_(IDirect3DRM3,IUnknown) #define D3DRMERR_TEXTUREFORMATNOTFOUND MAKE_DDHRESULT(811) #define D3DRMERR_NOTAGGREGATED MAKE_DDHRESULT(812) +#ifdef __cplusplus +} +#endif + #endif /* __D3DRM_H__ */

1 0

Pluciński Mariusz : gameux: Add implementation of IGameStatistics::GetStatistic.
by Alexandre Julliard Nov. 5, 2010

Nov. 5, 2010

Module: wine Branch: master Commit: 6b35b5dd37873e42484127336ed0b9707dc67179 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b35b5dd37873e42484127336… Author: Pluciński Mariusz <vshader(a)gmail.com> Date: Thu Nov 4 16:37:04 2010 +0100 gameux: Add implementation of IGameStatistics::GetStatistic. --- dlls/gameux/gamestatistics.c | 45 ++++++++++++++++++++++++++++++++++- dlls/gameux/tests/gamestatistics.c | 36 ++++++++++++++-------------- 2 files changed, 61 insertions(+), 20 deletions(-) diff --git a/dlls/gameux/gamestatistics.c b/dlls/gameux/gamestatistics.c index 2807c9e..da2a3e5 100644 --- a/dlls/gameux/gamestatistics.c +++ b/dlls/gameux/gamestatistics.c @@ -839,8 +839,49 @@ static HRESULT WINAPI GameStatisticsImpl_GetStatistic( LPWSTR *pName, LPWSTR *pValue) { - FIXME("stub\n"); - return E_NOTIMPL; + HRESULT hr = S_OK; + LONG nLength; + GameStatisticsImpl *This = impl_from_IGameStatistics(iface); + + TRACE("%p, %d,%d, %p, %p\n", This, categoryIndex, statIndex, pName, pValue); + + if(!pName || !pValue) + return E_INVALIDARG; + + *pName = NULL; + *pValue = NULL; + + if(categoryIndex >= MAX_CATEGORIES || statIndex >= MAX_STATS_PER_CATEGORY) + hr = E_INVALIDARG; + + if(SUCCEEDED(hr)) + { + nLength = lstrlenW(This->stats.categories[categoryIndex].stats[statIndex].sName); + if(nLength != 0) + { + *pName = CoTaskMemAlloc(sizeof(WCHAR)*(nLength+1)); + if(!(*pName)) + hr = E_OUTOFMEMORY; + else + lstrcpyW(*pName, This->stats.categories[categoryIndex].stats[statIndex].sName); + } + } + + if(SUCCEEDED(hr)) + { + nLength = lstrlenW(This->stats.categories[categoryIndex].stats[statIndex].sValue); + if(nLength != 0) + { + *pValue = CoTaskMemAlloc(sizeof(WCHAR)*(nLength+1)); + if(!(*pValue)) + hr = E_OUTOFMEMORY; + else + lstrcpyW(*pValue, This->stats.categories[categoryIndex].stats[statIndex].sValue); + } + } + + TRACE("returning pair; %s => %s\n", debugstr_w(*pName), debugstr_w(*pValue)); + return hr; } static HRESULT WINAPI GameStatisticsImpl_SetStatistic( diff --git a/dlls/gameux/tests/gamestatistics.c b/dlls/gameux/tests/gamestatistics.c index a2d0616..7eb9864 100644 --- a/dlls/gameux/tests/gamestatistics.c +++ b/dlls/gameux/tests/gamestatistics.c @@ -367,44 +367,44 @@ static void test_gamestatisticsmgr( void ) CoTaskMemFree(lpName); hr = IGameStatistics_GetStatistic(gs, 0, 0, &lpName, &lpValue); - todo_wine ok(hr == S_OK, "getting statistic failed\n"); - todo_wine ok(lstrcmpW(lpName, sStatistic00)==0, "getting statistic returned invalid name\n"); - todo_wine ok(lstrcmpW(lpValue, sValue00)==0, "getting statistic returned invalid value\n"); + ok(hr == S_OK, "getting statistic failed\n"); + ok(lstrcmpW(lpName, sStatistic00)==0, "getting statistic returned invalid name\n"); + ok(lstrcmpW(lpValue, sValue00)==0, "getting statistic returned invalid value\n"); CoTaskMemFree(lpName); CoTaskMemFree(lpValue); hr = IGameStatistics_GetStatistic(gs, 0, 1, &lpName, &lpValue); - todo_wine ok(hr == S_OK, "getting statistic failed\n"); - todo_wine ok(lstrcmpW(lpName, sStatistic01)==0, "getting statistic returned invalid name\n"); - todo_wine ok(lstrcmpW(lpValue, sValue01)==0, "getting statistic returned invalid value\n"); + ok(hr == S_OK, "getting statistic failed\n"); + ok(lstrcmpW(lpName, sStatistic01)==0, "getting statistic returned invalid name\n"); + ok(lstrcmpW(lpValue, sValue01)==0, "getting statistic returned invalid value\n"); CoTaskMemFree(lpName); CoTaskMemFree(lpValue); hr = IGameStatistics_GetStatistic(gs, 1, 0, &lpName, &lpValue); - todo_wine ok(hr == S_OK, "getting statistic failed\n"); - todo_wine ok(lstrcmpW(lpName, sStatistic10)==0, "getting statistic returned invalid name\n"); - todo_wine ok(lstrcmpW(lpValue, sValue10)==0, "getting statistic returned invalid value\n"); + ok(hr == S_OK, "getting statistic failed\n"); + ok(lstrcmpW(lpName, sStatistic10)==0, "getting statistic returned invalid name\n"); + ok(lstrcmpW(lpValue, sValue10)==0, "getting statistic returned invalid value\n"); CoTaskMemFree(lpName); CoTaskMemFree(lpValue); hr = IGameStatistics_GetStatistic(gs, 1, 1, &lpName, &lpValue); - todo_wine ok(hr == S_OK, "getting statistic failed\n"); - todo_wine ok(lstrcmpW(lpName, sStatistic11)==0, "getting statistic returned invalid name\n"); - todo_wine ok(lstrcmpW(lpValue, sValue11)==0, "getting statistic returned invalid value\n"); + ok(hr == S_OK, "getting statistic failed\n"); + ok(lstrcmpW(lpName, sStatistic11)==0, "getting statistic returned invalid name\n"); + ok(lstrcmpW(lpValue, sValue11)==0, "getting statistic returned invalid value\n"); CoTaskMemFree(lpName); CoTaskMemFree(lpValue); hr = IGameStatistics_GetStatistic(gs, 2, 0, &lpName, &lpValue); - todo_wine ok(hr == S_OK, "getting statistic failed\n"); - todo_wine ok(lstrcmpW(lpName, sStatistic20)==0, "getting statistic returned invalid name\n"); - todo_wine ok(lstrcmpW(lpValue, sValue20)==0, "getting statistic returned invalid value\n"); + ok(hr == S_OK, "getting statistic failed\n"); + ok(lstrcmpW(lpName, sStatistic20)==0, "getting statistic returned invalid name\n"); + ok(lstrcmpW(lpValue, sValue20)==0, "getting statistic returned invalid value\n"); CoTaskMemFree(lpName); CoTaskMemFree(lpValue); hr = IGameStatistics_GetStatistic(gs, 2, 1, &lpName, &lpValue); - todo_wine ok(hr == S_OK, "getting statistic failed\n"); - todo_wine ok(lstrcmpW(lpName, sStatistic21)==0, "getting statistic returned invalid name\n"); - todo_wine ok(lstrcmpW(lpValue, sValue21)==0, "getting statistic returned invalid value\n"); + ok(hr == S_OK, "getting statistic failed\n"); + ok(lstrcmpW(lpName, sStatistic21)==0, "getting statistic returned invalid name\n"); + ok(lstrcmpW(lpValue, sValue21)==0, "getting statistic returned invalid value\n"); CoTaskMemFree(lpName); CoTaskMemFree(lpValue);

1 0

Maarten Lankhorst : quartz: Fix EC_COMPLETE handling on dsound renderer.
by Alexandre Julliard Nov. 5, 2010

Nov. 5, 2010

Module: wine Branch: master Commit: 89223ff78bc8bbf9430ecef0cd7e671d43c5630e URL: http://source.winehq.org/git/wine.git/?a=commit;h=89223ff78bc8bbf9430ecef0c… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu Nov 4 17:02:21 2010 +0100 quartz: Fix EC_COMPLETE handling on dsound renderer. --- dlls/quartz/dsoundrender.c | 38 +++++++++++++++++++++++++------------- 1 files changed, 25 insertions(+), 13 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index a51da6c..5e8d7b7 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -620,6 +620,7 @@ static HRESULT WINAPI DSoundRender_Run(IBaseFilter * iface, REFERENCE_TIME tStar TRACE("(%p/%p)->(%s)\n", This, iface, wine_dbgstr_longlong(tStart)); EnterCriticalSection(&This->filter.csFilter); + if (This->pInputPin->pin.pConnectedTo) { This->filter.rtStreamStart = tStart; if (This->filter.state == State_Paused) @@ -633,9 +634,18 @@ static HRESULT WINAPI DSoundRender_Run(IBaseFilter * iface, REFERENCE_TIME tStar This->pInputPin->end_of_stream = 0; } ResetEvent(This->blocked); - - This->filter.state = State_Running; + } else if (This->filter.filterInfo.pGraph) { + IMediaEventSink *pEventSink; + hr = IFilterGraph_QueryInterface(This->filter.filterInfo.pGraph, &IID_IMediaEventSink, (LPVOID*)&pEventSink); + if (SUCCEEDED(hr)) + { + hr = IMediaEventSink_Notify(pEventSink, EC_COMPLETE, S_OK, (LONG_PTR)This); + IMediaEventSink_Release(pEventSink); + } + hr = S_OK; } + if (SUCCEEDED(hr)) + This->filter.state = State_Running; LeaveCriticalSection(&This->filter.csFilter); return hr; @@ -802,6 +812,7 @@ static HRESULT WINAPI DSoundRender_InputPin_EndOfStream(IPin * iface) BaseInputPin* This = (BaseInputPin*)iface; DSoundRenderImpl *me = (DSoundRenderImpl*)This->pin.pinInfo.pFilter; IMediaEventSink* pEventSink; + BYTE *silence; HRESULT hr; EnterCriticalSection(This->pin.pCritSec); @@ -815,21 +826,22 @@ static HRESULT WINAPI DSoundRender_InputPin_EndOfStream(IPin * iface) return hr; } - hr = IFilterGraph_QueryInterface(me->filter.filterInfo.pGraph, &IID_IMediaEventSink, (LPVOID*)&pEventSink); - if (SUCCEEDED(hr)) + silence = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, me->buf_size); + if (silence) { - BYTE * silence; + memset(silence, 0, me->buf_size); + DSoundRender_SendSampleData(me, silence, me->buf_size); + HeapFree(GetProcessHeap(), 0, silence); + } - silence = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, me->buf_size); - if (silence) + if (me->filter.filterInfo.pGraph) + { + hr = IFilterGraph_QueryInterface(me->filter.filterInfo.pGraph, &IID_IMediaEventSink, (LPVOID*)&pEventSink); + if (SUCCEEDED(hr)) { - memset(silence, 0, me->buf_size); - DSoundRender_SendSampleData((DSoundRenderImpl*)This->pin.pinInfo.pFilter, silence, me->buf_size); - HeapFree(GetProcessHeap(), 0, silence); + hr = IMediaEventSink_Notify(pEventSink, EC_COMPLETE, S_OK, (LONG_PTR)me); + IMediaEventSink_Release(pEventSink); } - - hr = IMediaEventSink_Notify(pEventSink, EC_COMPLETE, S_OK, 0); - IMediaEventSink_Release(pEventSink); } MediaSeekingPassThru_EOS(me->seekthru_unk); LeaveCriticalSection(This->pin.pCritSec);

1 0