November 2010 - Wine-commits

Gerald Pfeifer : comctl32: Remove the last, unused parameter fromTOOLTIPS_NewToolRectT.
by Alexandre Julliard 05 Nov '10

05 Nov '10

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

Nikolay Sivov : msxml3: Stub IXMLDOMDocumentType support.
by Alexandre Julliard 05 Nov '10

05 Nov '10

Module: wine Branch: master Commit: e9e58f07d2ca688bd14c27ec0b37d567416456ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9e58f07d2ca688bd14c27ec0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 5 01:34:01 2010 +0300 msxml3: Stub IXMLDOMDocumentType support. --- dlls/msxml3/Makefile.in | 1 + dlls/msxml3/doctype.c | 626 +++++++++++++++++++++++++++++++++++++++++++ dlls/msxml3/msxml_private.h | 2 + dlls/msxml3/node.c | 3 + 4 files changed, 632 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e9e58f07d2ca688bd14c2…

1 0

Austin Lund : comctl32/tests: Added extra debugging information to toolbar size tests.
by Alexandre Julliard 05 Nov '10

05 Nov '10

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

Alexandre Julliard : winex11: Add support for receiving mouse events on non-toplevel windows.
by Alexandre Julliard 05 Nov '10

05 Nov '10

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

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

05 Nov '10

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

Alexandre Julliard : winex11: Sync the window attributes when switching a window to embedded.
by Alexandre Julliard 05 Nov '10

05 Nov '10

Module: wine Branch: master Commit: 8f24cd05b1fde3fd857ccd6fb8d086a9ef3c859f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f24cd05b1fde3fd857ccd6fb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 5 13:42:05 2010 +0100 winex11: Sync the window attributes when switching a window to embedded. --- dlls/winex11.drv/window.c | 21 ++++++++++++--------- 1 files changed, 12 insertions(+), 9 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index acf0b4d..7e96a39 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1356,6 +1356,8 @@ static void set_xembed_flags( Display *display, struct x11drv_win_data *data, un { unsigned long info[2]; + if (!data->whole_window) return; + info[0] = 0; /* protocol version */ info[1] = flags; wine_tsx11_lock(); @@ -1418,18 +1420,19 @@ static void unmap_window( Display *display, struct x11drv_win_data *data ) */ void make_window_embedded( Display *display, struct x11drv_win_data *data ) { - if (data->mapped) - { - /* the window cannot be mapped before being embedded */ - unmap_window( display, data ); - data->embedded = TRUE; + BOOL was_mapped = data->mapped; + /* the window cannot be mapped before being embedded */ + if (data->mapped) unmap_window( display, data ); + + data->embedded = TRUE; + data->managed = TRUE; + SetPropA( data->hwnd, managed_prop, (HANDLE)1 ); + sync_window_style( display, data ); + + if (was_mapped) map_window( display, data, 0 ); - } else - { - data->embedded = TRUE; set_xembed_flags( display, data, 0 ); - } }

1 0

Michael Stefaniuc : wined3d: Move the checkGLcall() right after the corresponding GL call.
by Alexandre Julliard 05 Nov '10

05 Nov '10

Module: wine Branch: master Commit: 809741d5ae2cd3d1f914862bbe68351dba09d407 URL: http://source.winehq.org/git/wine.git/?a=commit;h=809741d5ae2cd3d1f914862bb… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Nov 5 11:17:42 2010 +0100 wined3d: Move the checkGLcall() right after the corresponding GL call. --- dlls/wined3d/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 6e78f04..3221ea8 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5868,8 +5868,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetCursorProperties(IWineD3DDevice *ifa checkGLcall("glBindTexture"); /* Copy the bitmap memory into the cursor texture */ glTexImage2D(GL_TEXTURE_2D, 0, intfmt, width, height, 0, gl_format, type, mem); - HeapFree(GetProcessHeap(), 0, mem); checkGLcall("glTexImage2D"); + HeapFree(GetProcessHeap(), 0, mem); if (gl_info->supported[APPLE_CLIENT_STORAGE]) {

1 0

Pluciński Mariusz : gameux: Loading of game statistics implemented.
by Alexandre Julliard 05 Nov '10

05 Nov '10

Module: wine Branch: master Commit: 2d6875b035ea7d28ed3dafc800c73c3d1bef0415 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d6875b035ea7d28ed3dafc80… Author: Pluciński Mariusz <vshader(a)gmail.com> Date: Thu Nov 4 16:36:41 2010 +0100 gameux: Loading of game statistics implemented. --- dlls/gameux/Makefile.in | 2 +- dlls/gameux/gamestatistics.c | 246 +++++++++++++++++++++++++++++++++++- dlls/gameux/tests/gamestatistics.c | 8 +- 3 files changed, 247 insertions(+), 9 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2d6875b035ea7d28ed3da…

1 0

Pluciński Mariusz : gameux: Add implementation of IGameStatistics::GetCategoryTitle.
by Alexandre Julliard 05 Nov '10

05 Nov '10

Module: wine Branch: master Commit: ff9e31a2b56ed73efdb4f7b52209d102ee24c52e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff9e31a2b56ed73efdb4f7b52… Author: Pluciński Mariusz <vshader(a)gmail.com> Date: Thu Nov 4 16:36:56 2010 +0100 gameux: Add implementation of IGameStatistics::GetCategoryTitle. --- dlls/gameux/gamestatistics.c | 25 +++++++++++++++++++++++-- dlls/gameux/tests/gamestatistics.c | 14 +++++++------- 2 files changed, 30 insertions(+), 9 deletions(-) diff --git a/dlls/gameux/gamestatistics.c b/dlls/gameux/gamestatistics.c index 2d9dd7f..2807c9e 100644 --- a/dlls/gameux/gamestatistics.c +++ b/dlls/gameux/gamestatistics.c @@ -807,8 +807,29 @@ static HRESULT WINAPI GameStatisticsImpl_GetCategoryTitle( WORD categoryIndex, LPWSTR *pTitle) { - FIXME("stub\n"); - return E_NOTIMPL; + HRESULT hr = S_OK; + LONG nLength; + GameStatisticsImpl *This = impl_from_IGameStatistics(iface); + + TRACE("%p, %d, %p\n", This, categoryIndex, pTitle); + + *pTitle = NULL; + + if(!pTitle || categoryIndex >= MAX_CATEGORIES) + hr = E_INVALIDARG; + + + if(SUCCEEDED(hr)) + { + nLength = lstrlenW(This->stats.categories[categoryIndex].sName); + if(nLength != 0) + { + *pTitle = CoTaskMemAlloc(sizeof(WCHAR)*(nLength+1)); + lstrcpyW(*pTitle, This->stats.categories[categoryIndex].sName); + } + } + + return hr; } static HRESULT WINAPI GameStatisticsImpl_GetStatistic( diff --git a/dlls/gameux/tests/gamestatistics.c b/dlls/gameux/tests/gamestatistics.c index 3f5d5d2..a2d0616 100644 --- a/dlls/gameux/tests/gamestatistics.c +++ b/dlls/gameux/tests/gamestatistics.c @@ -346,23 +346,23 @@ static void test_gamestatisticsmgr( void ) /* verify values with these which we stored before*/ hr = IGameStatistics_GetCategoryTitle(gs, 0, &lpName); - todo_wine ok(hr == S_OK, "getting category title failed\n"); - todo_wine ok(lstrcmpW(lpName, sCategory0)==0, "getting category title returned invalid string (%s)\n", wine_dbgstr_w(lpName)); + ok(hr == S_OK, "getting category title failed\n"); + ok(lstrcmpW(lpName, sCategory0)==0, "getting category title returned invalid string (%s)\n", wine_dbgstr_w(lpName)); CoTaskMemFree(lpName); hr = IGameStatistics_GetCategoryTitle(gs, 1, &lpName); - todo_wine ok(hr == S_OK, "getting category title failed\n"); - todo_wine ok(lstrcmpW(lpName, sCategory1)==0, "getting category title returned invalid string (%s)\n", wine_dbgstr_w(lpName)); + ok(hr == S_OK, "getting category title failed\n"); + ok(lstrcmpW(lpName, sCategory1)==0, "getting category title returned invalid string (%s)\n", wine_dbgstr_w(lpName)); CoTaskMemFree(lpName); hr = IGameStatistics_GetCategoryTitle(gs, 2, &lpName); - todo_wine ok(hr == S_OK, "getting category title failed\n"); - todo_wine ok(lstrcmpW(lpName, sCategory2)==0, "getting category title returned invalid string (%s)\n", wine_dbgstr_w(lpName)); + ok(hr == S_OK, "getting category title failed\n"); + ok(lstrcmpW(lpName, sCategory2)==0, "getting category title returned invalid string (%s)\n", wine_dbgstr_w(lpName)); CoTaskMemFree(lpName); /* check result if category doesn't exists */ hr = IGameStatistics_GetCategoryTitle(gs, 3, &lpName); - todo_wine ok(hr == S_OK, "getting category title failed\n"); + ok(hr == S_OK, "getting category title failed\n"); ok(lpName == NULL, "getting category title failed\n"); CoTaskMemFree(lpName);

1 0

Pluciński Mariusz : gameux: Add implementation of IGameStatistics::GetStatistic.
by Alexandre Julliard 05 Nov '10

05 Nov '10

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