July 2010 - Wine-Commits - list.winehq.org

Michael Stefaniuc : oleaut32: Use IsEqualGUID instead of memcmp to compare GUIDs.
by Alexandre Julliard July 28, 2010

July 28, 2010

Module: wine Branch: master Commit: c165fd743cc5b7ff7b82db0debf18999b3be4749 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c165fd743cc5b7ff7b82db0de… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jul 27 01:00:51 2010 +0200 oleaut32: Use IsEqualGUID instead of memcmp to compare GUIDs. --- dlls/oleaut32/typelib2.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index 1096ea8..92d4ab0 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -317,7 +317,7 @@ static int ctl2_find_guid( while (offset != -1) { guidentry = (MSFT_GuidEntry *)&This->typelib_segment_data[MSFT_SEG_GUID][offset]; - if (!memcmp(guidentry, guid, sizeof(GUID))) return offset; + if (IsEqualGUID(guidentry, guid)) return offset; offset = guidentry->next_hash; } @@ -1695,7 +1695,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddRefTypeInfo( impinfo.oGuid = guid_offset; *phRefType = ctl2_alloc_importinfo(This->typelib, &impinfo)+1; - if(!memcmp(&guid.guid, &IID_IDispatch, sizeof(GUID))) + if(IsEqualGUID(&guid.guid, &IID_IDispatch)) This->typelib->typelib_header.dispatchpos = *phRefType; } @@ -2469,7 +2469,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnLayOut( return hres; } - if(!memcmp(&typeattr->guid, &IID_IDispatch, sizeof(IDispatch))) + if(IsEqualGUID(&typeattr->guid, &IID_IDispatch)) This->typeinfo->flags |= TYPEFLAG_FDISPATCHABLE; This->typeinfo->datatype2 += (typeattr->cFuncs<<16) + 1;

1 0

Frédéric Delanoy : Fix French about page
by Jeremy Newman July 28, 2010

July 28, 2010

Module: website Branch: master Commit: 846cec75e34c401c084563a6ab34dc65ade18fed URL: http://source.winehq.org/git/website.git/?a=commit;h=846cec75e34c401c084563… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Jul 28 11:46:09 2010 +0200 Fix French about page >From 42afd515dbbdbfbde4865233d1111879ab1ada99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Delanoy?= <frederic.delanoy(a)gmail.com> Date: Wed, 28 Jul 2010 11:45:09 +0200 Subject: Fix French about page --- templates/fr/about.template | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/templates/fr/about.template b/templates/fr/about.template index f989cd7..bc29852 100644 --- a/templates/fr/about.template +++ b/templates/fr/about.template @@ -1,7 +1,7 @@   -<h1 class="title">About Wine</h1> +<h1 class="title">À propos de Wine</h1> <p>Wine vous permet d'exécuter des logiciels Windows sous d'autres systèmes d'exploitation. Avec Wine, vous pouvez installer et exécuter ces applications, @@ -9,9 +9,9 @@ exactement comme vous le feriez sous Windows.</p> <p>Wine est toujours en cours de développement actif. Tous les programmes ne fonctionnent pas encore, mais il y a déjà <a -href="http://wiki.winehq.org/UsageStatistics" title="Statistiques d'utilisation -de Wine">plusieurs millions de personnes</a> qui utilisent Wine pour faire -tourner leurs logiciels.</p> +href="http://wiki.winehq.org/UsageStatistics" +title="Statistiques d'utilisation de Wine">plusieurs millions de personnes</a> +qui utilisent Wine pour faire tourner leurs logiciels.</p> <h3>Open Source et conduit par ses utilisateurs</h3> @@ -23,11 +23,11 @@ title="Codeweavers Crossover Office">Codeweavers</a> qui vend une version de Wine avec du support.</p> <p>Wine dépend fortement de sa communauté d'utilisateurs. Les tests des -utilisateurs composant notre <a href="http://appdb.winehq.org/" title="Base de -données d'applications de Wine">Base de données d'applications</a> permettent de -vérifier la façon dont les programmes fonctionnent, et toutes les réponses des <a -href="http://forums.winehq.org/" title="Forums WineHQ">forums</a> proviennent de -volontaires.</p> +utilisateurs composant notre <a href="http://appdb.winehq.org/" +title="Base de données d'applications de Wine">base de données d'applications</a> +permettent de vérifier la façon dont les programmes fonctionnent, et toutes les +réponses des <a href="http://forums.winehq.org/" title="Forums WineHQ">forums</a> +proviennent de volontaires.</p> <h3>En savoir plus :</h3> <ul>

1 0

Frédéric Delanoy : Update French translation of ' About Wine' page
by Jeremy Newman July 27, 2010

July 27, 2010

Module: website Branch: master Commit: 7425ff45ff74cb0773e4f510af7fb4d028863377 URL: http://source.winehq.org/git/website.git/?a=commit;h=7425ff45ff74cb0773e4f5… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Jul 27 11:25:06 2010 +0200 Update French translation of 'About Wine' page >From d9eb3a4cf56f7fbaf972ed3418c82e91524117a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Delanoy?= <frederic.delanoy(a)gmail.com> Date: Tue, 27 Jul 2010 11:22:49 +0200 Subject: Update French translation of 'About Wine' page --- templates/fr/about.template | 77 ++++++++++++++++++++---------------------- 1 files changed, 37 insertions(+), 40 deletions(-) diff --git a/templates/fr/about.template b/templates/fr/about.template index 68629e2..f989cd7 100644 --- a/templates/fr/about.template +++ b/templates/fr/about.template @@ -1,49 +1,46 @@   -<h1 class="title">À propos de Wine</h1> - -<p>Wine est une couche de traduction (un chargeur de programme) capable d'exécuter -des applications Windows sous Linux et d'autres systèmes d'exploitation compatibles -POSIX. Les programmes Windows exécutés par Wine agissent comme le feraient des programmes natifs, -c'est à dire sans pénalités de performances ou d'utilisation de mémoire (ce qui serait le cas avec un émulateur) et -avec un aspect et une utilisation similaire aux autres applications de votre environnement de travail.</p> - -<p>Le projet Wine a débuté en 1993 comme un moyen d'exécuter des -programmes Windows 3.1 sous Linux. Bob Amstadt était le coordinateur -à l'origine, mais Alexandre Julliard a rapidement pris le relai et -continue de gérer le projet jusqu'à aujourd'hui. Au cours des années -le projet a été porté pour d'autres Unixes et le support pour les applications -Win32 a été ajouté au fur et à mesure que celles-ci sont devenues populaires.</p> - -<p>Wine est toujours en cours de développement et n'est pas prévu pour une utilisation -générale. Néanmoins, de nombreuses personnes le trouve utile pour exécuter un nombre -grandissant de programmes Windows. Veuillez vous rapporter à la -<a href="http://appdb.winehq.org/">base de données des applications</a> -pour des rapports concernant le succès ou l'échec de l'exécution de centaines de programmes -Windows, ainsi qu'à la <a href="http://bugs.winehq.org/">base de données de suivi des -anomalies</a> pour une liste des problèmes connus et, finalement, à la page -<a href="{$root}/status">État</a> pour une vue globale de l'état d'implémentation de Wine.</p> - -<p>Une grande partie des développeurs de Wine peuvent être contactés dans les -<a href="{$root}/forums">forums de Wine</a>. Les commentaires à propos du site winehq.org -peuvent être envoyés par courriel à <a -href="mailto:web-admin_at_winehq.org">web-admin_at_winehq.org</a>. Alexandre -Julliard mène le projet Wine et peut être contacté par courriel à -<a href="mailto:julliard_at_winehq.org">julliard_at_winehq.org</a>.</p> - -<p>Nous avons également mis en place une courte liste de resources qui vous aideront a comprendre le projet :</p> +<h1 class="title">About Wine</h1> + +<p>Wine vous permet d'exécuter des logiciels Windows sous d'autres systèmes +d'exploitation. Avec Wine, vous pouvez installer et exécuter ces applications, +exactement comme vous le feriez sous Windows.</p> + +<p>Wine est toujours en cours de développement actif. Tous les programmes ne +fonctionnent pas encore, mais il y a déjà <a +href="http://wiki.winehq.org/UsageStatistics" title="Statistiques d'utilisation +de Wine">plusieurs millions de personnes</a> qui utilisent Wine pour faire +tourner leurs logiciels.</p> + +<h3>Open Source et conduit par ses utilisateurs</h3> + +<p>Wine sera toujours du <a href="http://wiki.winehq.org/Licensing" +title="Licence de Wine">logiciel libre</a>. À peu près la moitié du code source +de Wine est écrite par des volontaires. Le reste est sponsorisé par des intérêts +commerciaux, en particulier <a href="http://www.codeweavers.com/products/" +title="Codeweavers Crossover Office">Codeweavers</a> qui vend une version de +Wine avec du support.</p> + +<p>Wine dépend fortement de sa communauté d'utilisateurs. Les tests des +utilisateurs composant notre <a href="http://appdb.winehq.org/" title="Base de +données d'applications de Wine">Base de données d'applications</a> permettent de +vérifier la façon dont les programmes fonctionnent, et toutes les réponses des <a +href="http://forums.winehq.org/" title="Forums WineHQ">forums</a> proviennent de +volontaires.</p> + +<h3>En savoir plus :</h3> <ul> - <li><a href="{$root}/history">L'historique de Wine</a></li> - <li><a href="{$root}/why">Pourquoi Wine est-il si important ?</a></li> - <li><a href="{$root}/myths">Démonter les mythes sur Wine</a></li> - <li><a href="{$root}/wine_features">Fonctionnalités de Wine</a></li> - <li><a href="{$root}/acknowledgement">Remerciements</a></li> - <li><a href="{$root}/wwn">World Wine News : les nouvelles de Wine</a></li> - <li><a href="{$root}/interview">Interviews</a></li> + <li><a href="http://wiki.winehq.org/ImportanceOfWine">Pourquoi Wine est-il +si important</a></li> + <li><a href="http://wiki.winehq.org/Debunking_Wine_Myths">Mythes courants +sur Wine</a></li> + <li><a href="http://wiki.winehq.org/WineHistory">Historique du projet Wine</a></li> + <li><a href="http://wiki.winehq.org/ProjectOrganization">Organisation du +projet</a></li> </ul> <hr> <div class="link-container"> - <p class="right-link">Wine's History: <a href="{$root}/history">Next</a></p> + <p class="right-link">Historique de Wine : <a href="{$root}/history">Suivant</a></p> </div>

1 0

Louis Lenders : d3d9/tests: Test GetAdapterDisplayModeEx with D3DDISPLAYROTATION null-pointer.
by Alexandre Julliard July 26, 2010

July 26, 2010

Module: wine Branch: master Commit: 5a05950271987d4dbfc4a9d84924276dc4056760 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a05950271987d4dbfc4a9d84… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Sun Jul 25 21:05:55 2010 +0200 d3d9/tests: Test GetAdapterDisplayModeEx with D3DDISPLAYROTATION null-pointer. --- dlls/d3d9/tests/d3d9ex.c | 20 ++++++++++++++++++-- 1 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index f84ad7d..6e11116 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -312,10 +312,26 @@ static void test_get_adapter_displaymode_ex(void) /* check that orientation is returned correctly by GetAdapterDisplayModeEx and EnumDisplaySettingsEx*/ todo_wine ok(startmode.dmDisplayOrientation == DMDO_180 && rotation == D3DDISPLAYROTATION_180, "rotation is %d instead of %d\n", rotation, startmode.dmDisplayOrientation); - /* return to the default mode */ - pChangeDisplaySettingsExA(NULL, NULL, NULL, 0, NULL); trace("GetAdapterDisplayModeEx returned Width = %d,Height = %d, RefreshRate = %d, Format = %x, ScanLineOrdering = %x, rotation = %d\n", mode_ex.Width, mode_ex.Height, mode_ex.RefreshRate, mode_ex.Format, mode_ex.ScanLineOrdering, rotation); + + /* test GetAdapterDisplayModeEx with null pointer for D3DDISPLAYROTATION */ + memset(&mode_ex, 0, sizeof(mode_ex)); + mode_ex.Size = sizeof(D3DDISPLAYMODEEX); + + hr = IDirect3D9Ex_GetAdapterDisplayModeEx(d3d9ex, D3DADAPTER_DEFAULT, &mode_ex, NULL); + todo_wine ok(SUCCEEDED(hr), "GetAdapterDisplayModeEx failed, hr %#x.\n", hr); + + ok(mode_ex.Size == sizeof(D3DDISPLAYMODEEX), "size is %d\n", mode_ex.Size); + todo_wine ok(mode_ex.Width == mode.Width, "width is %d instead of %d\n", mode_ex.Width, mode.Width); + todo_wine ok(mode_ex.Height == mode.Height, "height is %d instead of %d\n", mode_ex.Height, mode.Height); + todo_wine ok(mode_ex.RefreshRate == mode.RefreshRate, "RefreshRate is %d instead of %d\n", mode_ex.RefreshRate, mode.RefreshRate); + todo_wine ok(mode_ex.Format == mode.Format, "format is %x instead of %x\n", mode_ex.Format, mode.Format); + /* don't know yet how to test for ScanLineOrdering, just testing that it is set to a value by GetAdapterDisplayModeEx*/ + todo_wine ok(mode_ex.ScanLineOrdering != 0, "ScanLineOrdering returned 0\n"); + + /* return to the default mode */ + pChangeDisplaySettingsExA(NULL, NULL, NULL, 0, NULL); out: IDirect3D9_Release(d3d9); IDirect3D9Ex_Release(d3d9ex);

1 0

Matteo Bruni : wined3d: Setup target if offscreen rendering setting changed .
by Alexandre Julliard July 26, 2010

July 26, 2010

Module: wine Branch: master Commit: 20f51c29a99299384e840e148f02aae66bfb45be URL: http://source.winehq.org/git/wine.git/?a=commit;h=20f51c29a99299384e840e148… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Mon Jun 28 21:13:56 2010 +0200 wined3d: Setup target if offscreen rendering setting changed. --- dlls/wined3d/context.c | 2 +- dlls/wined3d/swapchain.c | 3 --- 2 files changed, 1 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 949e137..2ddb02b 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2242,8 +2242,8 @@ static void context_setup_target(IWineD3DDeviceImpl *device, const struct StateEntry *StateTable = device->StateTable; if (!target) return; - else if (context->current_rt == target) return; render_offscreen = surface_is_offscreen(target); + if (context->current_rt == target && render_offscreen == old_render_offscreen) return; context_set_render_offscreen(context, StateTable, render_offscreen); diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 6f99dc1..2245f0c 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -334,9 +334,6 @@ static HRESULT WINAPI IWineD3DSwapChainImpl_Present(IWineD3DSwapChain *iface, CO surface_load_location(This->back_buffers[0], SFLAG_INTEXTURE, NULL); surface_modify_location(This->back_buffers[0], SFLAG_INDRAWABLE, FALSE); This->render_to_fbo = TRUE; - - /* Force the context manager to update the render target configuration next draw. */ - context->current_rt = NULL; } if(This->render_to_fbo)

1 0

Nikolay Sivov : comctl32/tests: Merge one test function to existing tests, use explicit message numbers.
by Alexandre Julliard July 26, 2010

July 26, 2010

Module: wine Branch: master Commit: 6711780a8fba24afcb1436dcc7cb5474ebf4c649 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6711780a8fba24afcb1436dcc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 26 15:59:54 2010 +0400 comctl32/tests: Merge one test function to existing tests, use explicit message numbers. --- dlls/comctl32/tests/treeview.c | 75 +++++++++++++++++++-------------------- 1 files changed, 37 insertions(+), 38 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index d1ca581..a0a3e23 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -70,8 +70,8 @@ static const struct message rootchild_select_seq[] = { }; static const struct message getitemtext_seq[] = { - { TVM_INSERTITEM, sent }, - { TVM_GETITEM, sent }, + { TVM_INSERTITEMA, sent }, + { TVM_GETITEMA, sent }, { TVM_DELETEITEM, sent }, { 0 } }; @@ -134,10 +134,10 @@ static const struct message test_get_set_insertmarkcolor_seq[] = { }; static const struct message test_get_set_item_seq[] = { - { TVM_GETITEM, sent }, - { TVM_SETITEM, sent }, - { TVM_GETITEM, sent }, - { TVM_SETITEM, sent }, + { TVM_GETITEMA, sent }, + { TVM_SETITEMA, sent }, + { TVM_GETITEMA, sent }, + { TVM_SETITEMA, sent }, { 0 } }; @@ -187,8 +187,8 @@ static const struct message test_get_set_unicodeformat_seq[] = { }; static const struct message parent_expand_seq[] = { - { WM_NOTIFY, sent|id, 0, 0, TVN_ITEMEXPANDING }, - { WM_NOTIFY, sent|id, 0, 0, TVN_ITEMEXPANDED }, + { WM_NOTIFY, sent|id, 0, 0, TVN_ITEMEXPANDINGA }, + { WM_NOTIFY, sent|id, 0, 0, TVN_ITEMEXPANDEDA }, { 0 } }; @@ -302,7 +302,7 @@ static void fill_tree(HWND hTree) static void test_fillroot(void) { - TVITEM tvi; + TVITEMA tvi; HWND hTree; hTree = create_treeview_control(); @@ -323,7 +323,7 @@ static void test_fillroot(void) /* UMLPad 1.15 depends on this being not -1 (I_IMAGECALLBACK) */ tvi.hItem = hRoot; tvi.mask = TVIF_IMAGE | TVIF_SELECTEDIMAGE; - SendMessage( hTree, TVM_GETITEM, 0, (LPARAM)&tvi ); + SendMessage( hTree, TVM_GETITEMA, 0, (LPARAM)&tvi ); ok(tvi.iImage == 0, "tvi.iImage=%d\n", tvi.iImage); ok(tvi.iSelectedImage == 0, "tvi.iSelectedImage=%d\n", tvi.iSelectedImage); @@ -335,7 +335,7 @@ static void test_callback(void) HTREEITEM hRoot; HTREEITEM hItem1, hItem2; TVINSERTSTRUCTA ins; - TVITEM tvi; + TVITEMA tvi; CHAR test_string[] = "Test_string"; CHAR buf[128]; LRESULT ret; @@ -464,7 +464,7 @@ static void test_getitemtext(void) { TVINSERTSTRUCTA ins; HTREEITEM hChild; - TVITEM tvi; + TVITEMA tvi; HWND hTree; CHAR szBuffer[80] = "Blah"; @@ -490,7 +490,7 @@ static void test_getitemtext(void) tvi.cchTextMax = nBufferSize; tvi.pszText = szBuffer; - SendMessageA( hTree, TVM_GETITEM, 0, (LPARAM)&tvi ); + SendMessageA( hTree, TVM_GETITEMA, 0, (LPARAM)&tvi ); ok(!strcmp(szBuffer, ""), "szBuffer=\"%s\", expected \"\"\n", szBuffer); ok(SendMessageA(hTree, TVM_DELETEITEM, 0, (LPARAM)hChild), "DeleteItem failed\n"); ok_sequence(sequences, TREEVIEW_SEQ_INDEX, getitemtext_seq, "get item text seq", FALSE); @@ -645,7 +645,7 @@ static void test_get_set_insertmark(void) static void test_get_set_item(void) { - TVITEM tviRoot = {0}; + TVITEMA tviRoot = {0}; int nBufferSize = 80; char szBuffer[80] = {0}; HWND hTree; @@ -660,20 +660,20 @@ static void test_get_set_item(void) tviRoot.mask = TVIF_TEXT; tviRoot.cchTextMax = nBufferSize; tviRoot.pszText = szBuffer; - SendMessage( hTree, TVM_GETITEM, 0, (LPARAM)&tviRoot ); + SendMessage( hTree, TVM_GETITEMA, 0, (LPARAM)&tviRoot ); ok(!strcmp("Root", szBuffer), "GetItem: szBuffer=\"%s\", expected \"Root\"\n", szBuffer); /* Change the root text */ strncpy(szBuffer, "Testing123", nBufferSize); - SendMessage( hTree, TVM_SETITEM, 0, (LPARAM)&tviRoot ); + SendMessage( hTree, TVM_SETITEMA, 0, (LPARAM)&tviRoot ); memset(szBuffer, 0, nBufferSize); - SendMessage( hTree, TVM_GETITEM, 0, (LPARAM)&tviRoot ); + SendMessage( hTree, TVM_GETITEMA, 0, (LPARAM)&tviRoot ); ok(!strcmp("Testing123", szBuffer), "GetItem: szBuffer=\"%s\", expected \"Testing123\"\n", szBuffer); /* Reset the root text */ memset(szBuffer, 0, nBufferSize); strncpy(szBuffer, "Root", nBufferSize); - SendMessage( hTree, TVM_SETITEM, 0, (LPARAM)&tviRoot ); + SendMessage( hTree, TVM_SETITEMA, 0, (LPARAM)&tviRoot ); ok_sequence(sequences, TREEVIEW_SEQ_INDEX, test_get_set_item_seq, "test get set item", FALSE); @@ -889,7 +889,7 @@ static LRESULT CALLBACK parent_wnd_proc(HWND hWnd, UINT message, WPARAM wParam, break; } case TVN_ENDLABELEDIT: return TRUE; - case TVN_ITEMEXPANDING: + case TVN_ITEMEXPANDINGA: ok(pTreeView->itemNew.mask == (TVIF_HANDLE | TVIF_SELECTEDIMAGE | TVIF_IMAGE | TVIF_PARAM | TVIF_STATE), "got wrong mask %x\n", pTreeView->itemNew.mask); @@ -906,7 +906,7 @@ static LRESULT CALLBACK parent_wnd_proc(HWND hWnd, UINT message, WPARAM wParam, ok(ret == TRUE, "got %lu\n", ret); } break; - case TVN_ITEMEXPANDED: + case TVN_ITEMEXPANDEDA: ok(pTreeView->itemNew.mask & TVIF_STATE, "got wrong mask %x\n", pTreeView->itemNew.mask); ok(pTreeView->itemNew.state & (TVIS_EXPANDED|TVIS_EXPANDEDONCE), "got wrong mask %x\n", pTreeView->itemNew.mask); @@ -920,7 +920,8 @@ static LRESULT CALLBACK parent_wnd_proc(HWND hWnd, UINT message, WPARAM wParam, ret = SendMessageA(pHdr->hwndFrom, TVM_GETITEMA, 0, (LPARAM)&g_item_expanded); ok(ret == TRUE, "got %lu\n", ret); } - if (g_get_rect_in_expand) { + if (g_get_rect_in_expand) + { visibleItem = TreeView_GetNextItem(pHdr->hwndFrom, NULL, TVGN_FIRSTVISIBLE); ok(pTreeView->itemNew.hItem == visibleItem, "expanded item == first visible item\n"); *(HTREEITEM*)&rect = visibleItem; @@ -1082,7 +1083,7 @@ static void test_itemedit(void) item.hItem = hRoot; item.pszText = buff; item.cchTextMax = sizeof(buff)/sizeof(CHAR); - r = SendMessage(hTree, TVM_GETITEM, 0, (LPARAM)&item); + r = SendMessage(hTree, TVM_GETITEMA, 0, (LPARAM)&item); expect(TRUE, r); ok(!strcmp("x", buff), "Expected item text to change\n"); @@ -1188,22 +1189,20 @@ static void test_expandnotify(void) ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, "collapse after expand notifications", FALSE); DestroyWindow(hTree); -} -static void test_rect_retrieval_after_expand_with_select(void) { - BOOL ret; - HWND hTree; - hTree = create_treeview_control(); - fill_tree(hTree); - g_get_rect_in_expand = TRUE; - ret = TreeView_Select(hTree, hChild, TVGN_CARET); - g_get_rect_in_expand = FALSE; - ok(ret,"TreeView_Select should return true\n"); + /* test TVM_GETITEMRECT inside TVN_ITEMEXPANDED notification */ + hTree = create_treeview_control(); + fill_tree(hTree); + g_get_rect_in_expand = TRUE; + ret = TreeView_Select(hTree, hChild, TVGN_CARET); + g_get_rect_in_expand = FALSE; + ok(ret, "got %d\n", ret); + DestroyWindow(hTree); } static void test_expandedimage(void) { - TVITEMEX item; + TVITEMEXA item; HWND hTree; BOOL ret; @@ -1213,13 +1212,13 @@ static void test_expandedimage(void) item.mask = TVIF_EXPANDEDIMAGE; item.iExpandedImage = 1; item.hItem = hRoot; - ret = SendMessageA(hTree, TVM_SETITEM, 0, (LPARAM)&item); + ret = SendMessageA(hTree, TVM_SETITEMA, 0, (LPARAM)&item); ok(ret, "got %d\n", ret); item.mask = TVIF_EXPANDEDIMAGE; item.iExpandedImage = -1; item.hItem = hRoot; - ret = SendMessageA(hTree, TVM_GETITEM, 0, (LPARAM)&item); + ret = SendMessageA(hTree, TVM_GETITEMA, 0, (LPARAM)&item); ok(ret, "got %d\n", ret); if (item.iExpandedImage != 1) @@ -1233,7 +1232,7 @@ static void test_expandedimage(void) item.mask = TVIF_EXPANDEDIMAGE; item.iExpandedImage = -1; item.hItem = hChild; - ret = SendMessageA(hTree, TVM_GETITEM, 0, (LPARAM)&item); + ret = SendMessageA(hTree, TVM_GETITEMA, 0, (LPARAM)&item); ok(ret, "got %d\n", ret); ok(item.iExpandedImage == (WORD)I_IMAGENONE, "got %d\n", item.iExpandedImage); @@ -1323,7 +1322,6 @@ START_TEST(treeview) test_itemedit(); test_treeview_classinfo(); test_expandnotify(); - test_rect_retrieval_after_expand_with_select(); test_TVS_SINGLEEXPAND(); if (!load_v6_module(&ctx_cookie, &hCtx)) @@ -1353,7 +1351,8 @@ START_TEST(treeview) unload_v6_module(ctx_cookie, hCtx); PostMessageA(hMainWnd, WM_CLOSE, 0, 0); - while(GetMessageA(&msg,0,0,0)) { + while(GetMessageA(&msg, 0, 0, 0)) + { TranslateMessage(&msg); DispatchMessageA(&msg); }

1 0

Nikolay Sivov : comctl32/treeview: Fix TVS_SINGLEEXPAND notifications order .
by Alexandre Julliard July 26, 2010

July 26, 2010

Module: wine Branch: master Commit: 16dfb1a03974c2627a3b24b51399ba27d3f981aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=16dfb1a03974c2627a3b24b51… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 26 15:49:09 2010 +0400 comctl32/treeview: Fix TVS_SINGLEEXPAND notifications order. --- dlls/comctl32/tests/treeview.c | 29 ++++++++++ dlls/comctl32/treeview.c | 117 +++++++++++++++++++++------------------ 2 files changed, 92 insertions(+), 54 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index d3de85f..d1ca581 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -192,6 +192,15 @@ static const struct message parent_expand_seq[] = { { 0 } }; +static const struct message parent_singleexpand_seq[] = { + { WM_NOTIFY, sent|id, 0, 0, TVN_SELCHANGINGA }, + { WM_NOTIFY, sent|id, 0, 0, TVN_SELCHANGEDA }, + { WM_NOTIFY, sent|id, 0, 0, TVN_SINGLEEXPAND }, + { WM_NOTIFY, sent|id, 0, 0, TVN_ITEMEXPANDINGA }, + { WM_NOTIFY, sent|id, 0, 0, TVN_ITEMEXPANDEDA }, + { 0 } +}; + static const struct message empty_seq[] = { { 0 } }; @@ -1231,6 +1240,25 @@ static void test_expandedimage(void) DestroyWindow(hTree); } +static void test_TVS_SINGLEEXPAND(void) +{ + HWND hTree; + BOOL ret; + + hTree = create_treeview_control(); + SetWindowLongA(hTree, GWL_STYLE, GetWindowLong(hTree, GWL_STYLE) | TVS_SINGLEEXPAND); + /* to avoid paiting related notifications */ + ShowWindow(hTree, SW_HIDE); + fill_tree(hTree); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + ret = SendMessageA(hTree, TVM_SELECTITEM, TVGN_CARET, (LPARAM)hRoot); + ok(ret, "got %d\n", ret); + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_singleexpand_seq, "singleexpand notifications", FALSE); + + DestroyWindow(hTree); +} + START_TEST(treeview) { HMODULE hComctl32; @@ -1296,6 +1324,7 @@ START_TEST(treeview) test_treeview_classinfo(); test_expandnotify(); test_rect_retrieval_after_expand_with_select(); + test_TVS_SINGLEEXPAND(); if (!load_v6_module(&ctx_cookie, &hCtx)) { diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 8683b4a..3ee1639 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -3305,7 +3305,7 @@ TREEVIEW_Collapse(TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *wineItem, static BOOL TREEVIEW_Expand(TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *wineItem, - BOOL bExpandPartial, BOOL bUser) + BOOL partial, BOOL user) { LONG scrollDist; LONG orgNextTop = 0; @@ -3313,7 +3313,7 @@ TREEVIEW_Expand(TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *wineItem, TREEVIEW_ITEM *nextItem, *tmpItem; BOOL sendsNotifications; - TRACE("(%p, %p, partial=%d, %d\n", infoPtr, wineItem, bExpandPartial, bUser); + TRACE("(%p, %p, partial=%d, %d\n", infoPtr, wineItem, partial, user); if (wineItem->state & TVIS_EXPANDED) return TRUE; @@ -3334,7 +3334,7 @@ TREEVIEW_Expand(TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *wineItem, TRACE("TVE_EXPAND %p %s\n", wineItem, TREEVIEW_ItemName(wineItem)); - sendsNotifications = bUser || ((wineItem->cChildren != 0) && + sendsNotifications = user || ((wineItem->cChildren != 0) && !(wineItem->state & TVIS_EXPANDEDONCE)); if (sendsNotifications) { @@ -3349,7 +3349,7 @@ TREEVIEW_Expand(TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *wineItem, wineItem->state |= TVIS_EXPANDED; - if (bExpandPartial) + if (partial) FIXME("TVE_EXPANDPARTIAL not implemented\n"); if (ISVISIBLE(wineItem)) @@ -3415,6 +3415,58 @@ TREEVIEW_Expand(TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *wineItem, return TRUE; } +/* Handler for TVS_SINGLEEXPAND behaviour. Used on response + to mouse messages and TVM_SELECTITEM. + + selection - previously selected item, used to collapse a part of a tree + item - new selected item +*/ +static void TREEVIEW_SingleExpand(TREEVIEW_INFO *infoPtr, + HTREEITEM selection, HTREEITEM item) +{ + TREEVIEW_ITEM *SelItem; + + if ((infoPtr->dwStyle & TVS_SINGLEEXPAND) == 0 || infoPtr->hwndEdit) return; + + TREEVIEW_SendTreeviewNotify(infoPtr, TVN_SINGLEEXPAND, TVC_UNKNOWN, TVIF_HANDLE | TVIF_PARAM, item, 0); + + /* + * Close the previous selection all the way to the root + * as long as the new selection is not a child + */ + if(selection && (selection != item)) + { + BOOL closeit = TRUE; + SelItem = item; + + /* determine if the hitItem is a child of the currently selected item */ + while(closeit && SelItem && TREEVIEW_ValidItem(infoPtr, SelItem) && + (SelItem->parent != infoPtr->root)) + { + closeit = (SelItem != selection); + SelItem = SelItem->parent; + } + + if(closeit) + { + if(TREEVIEW_ValidItem(infoPtr, selection)) + SelItem = selection; + + while(SelItem && (SelItem != item) && TREEVIEW_ValidItem(infoPtr, SelItem) && + SelItem->parent != infoPtr->root) + { + TREEVIEW_Collapse(infoPtr, SelItem, FALSE, FALSE); + SelItem = SelItem->parent; + } + } + } + + /* + * Expand the current item + */ + TREEVIEW_Expand(infoPtr, item, FALSE, FALSE); +} + static BOOL TREEVIEW_Toggle(TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *wineItem, BOOL bUser) { @@ -4132,58 +4184,11 @@ TREEVIEW_LButtonDown(TREEVIEW_INFO *infoPtr, LPARAM lParam) } else if (ht.flags & (TVHT_ONITEMICON|TVHT_ONITEMLABEL)) /* select the item if the hit was inside of the icon or text */ { - /* - * if we are TVS_SINGLEEXPAND then we want this single click to - * do a bunch of things. - */ - if((infoPtr->dwStyle & TVS_SINGLEEXPAND) && - (infoPtr->hwndEdit == 0)) - { - TREEVIEW_ITEM *SelItem; - - /* - * Send the notification - */ - TREEVIEW_SendTreeviewNotify(infoPtr, TVN_SINGLEEXPAND, TVC_UNKNOWN, TVIF_HANDLE | TVIF_PARAM, ht.hItem, 0); - - /* - * Close the previous selection all the way to the root - * as long as the new selection is not a child - */ - if((infoPtr->selectedItem) - && (infoPtr->selectedItem != ht.hItem)) - { - BOOL closeit = TRUE; - SelItem = ht.hItem; - - /* determine if the hitItem is a child of the currently selected item */ - while(closeit && SelItem && TREEVIEW_ValidItem(infoPtr, SelItem) && (SelItem != infoPtr->root)) - { - closeit = (SelItem != infoPtr->selectedItem); - SelItem = SelItem->parent; - } - - if(closeit) - { - if(TREEVIEW_ValidItem(infoPtr, infoPtr->selectedItem)) - SelItem = infoPtr->selectedItem; - - while(SelItem && (SelItem != ht.hItem) && TREEVIEW_ValidItem(infoPtr, SelItem) && (SelItem != infoPtr->root)) - { - TREEVIEW_Collapse(infoPtr, SelItem, FALSE, FALSE); - SelItem = SelItem->parent; - } - } - } - - /* - * Expand the current item - */ - TREEVIEW_Expand(infoPtr, ht.hItem, TVE_TOGGLE, FALSE); - } + TREEVIEW_ITEM *selection = infoPtr->selectedItem; /* Select the current item */ TREEVIEW_DoSelectItem(infoPtr, TVGN_CARET, ht.hItem, TVC_BYMOUSE); + TREEVIEW_SingleExpand(infoPtr, selection, ht.hItem); } else if (ht.flags & TVHT_ONITEMSTATEICON) { @@ -4415,7 +4420,9 @@ TREEVIEW_DoSelectItem(TREEVIEW_INFO *infoPtr, INT action, HTREEITEM newSelect, static LRESULT TREEVIEW_SelectItem(TREEVIEW_INFO *infoPtr, INT wParam, HTREEITEM item) { - if (item != NULL && !TREEVIEW_ValidItem(infoPtr, item)) + TREEVIEW_ITEM *selection = infoPtr->selectedItem; + + if (item && !TREEVIEW_ValidItem(infoPtr, item)) return FALSE; TRACE("%p (%s) %d\n", item, TREEVIEW_ItemName(item), wParam); @@ -4423,6 +4430,8 @@ TREEVIEW_SelectItem(TREEVIEW_INFO *infoPtr, INT wParam, HTREEITEM item) if (!TREEVIEW_DoSelectItem(infoPtr, wParam, item, TVC_UNKNOWN)) return FALSE; + TREEVIEW_SingleExpand(infoPtr, selection, item); + return TRUE; }

1 0

Nikolay Sivov : comctl32/treeview: Properly initialize expanded image index .
by Alexandre Julliard July 26, 2010

July 26, 2010

Module: wine Branch: master Commit: b3a61c1329d1577eed17e1d46909ee2e293c47f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3a61c1329d1577eed17e1d46… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 26 12:53:08 2010 +0400 comctl32/treeview: Properly initialize expanded image index. --- dlls/comctl32/tests/treeview.c | 70 ++++++++++++++++++++++++++++++++++++++++ dlls/comctl32/treeview.c | 4 +- 2 files changed, 72 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 18528e3..d3de85f 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -30,6 +30,7 @@ #include "commctrl.h" #include "wine/test.h" +#include "v6util.h" #include "msg.h" const char *TEST_CALLBACK_TEXT = "callback_text"; @@ -1191,12 +1192,55 @@ static void test_rect_retrieval_after_expand_with_select(void) { ok(ret,"TreeView_Select should return true\n"); } +static void test_expandedimage(void) +{ + TVITEMEX item; + HWND hTree; + BOOL ret; + + hTree = create_treeview_control(); + fill_tree(hTree); + + item.mask = TVIF_EXPANDEDIMAGE; + item.iExpandedImage = 1; + item.hItem = hRoot; + ret = SendMessageA(hTree, TVM_SETITEM, 0, (LPARAM)&item); + ok(ret, "got %d\n", ret); + + item.mask = TVIF_EXPANDEDIMAGE; + item.iExpandedImage = -1; + item.hItem = hRoot; + ret = SendMessageA(hTree, TVM_GETITEM, 0, (LPARAM)&item); + ok(ret, "got %d\n", ret); + + if (item.iExpandedImage != 1) + { + win_skip("TVIF_EXPANDEDIMAGE not supported\n"); + DestroyWindow(hTree); + return; + } + + /* test for default iExpandedImage value */ + item.mask = TVIF_EXPANDEDIMAGE; + item.iExpandedImage = -1; + item.hItem = hChild; + ret = SendMessageA(hTree, TVM_GETITEM, 0, (LPARAM)&item); + ok(ret, "got %d\n", ret); + ok(item.iExpandedImage == (WORD)I_IMAGENONE, "got %d\n", item.iExpandedImage); + + DestroyWindow(hTree); +} + START_TEST(treeview) { HMODULE hComctl32; BOOL (WINAPI *pInitCommonControlsEx)(const INITCOMMONCONTROLSEX*); WNDCLASSA wc; MSG msg; + + ULONG_PTR ctx_cookie; + HANDLE hCtx; + HWND hwnd; hComctl32 = GetModuleHandleA("comctl32.dll"); pInitCommonControlsEx = (void*)GetProcAddress(hComctl32, "InitCommonControlsEx"); @@ -1253,6 +1297,32 @@ START_TEST(treeview) test_expandnotify(); test_rect_retrieval_after_expand_with_select(); + if (!load_v6_module(&ctx_cookie, &hCtx)) + { + DestroyWindow(hMainWnd); + return; + } + + /* this is a XP SP3 failure workaround */ + hwnd = CreateWindowExA(0, WC_TREEVIEW, "foo", + WS_CHILD | WS_BORDER | WS_VISIBLE, + 0, 0, 100, 100, + hMainWnd, NULL, GetModuleHandleA(NULL), NULL); + if (!IsWindow(hwnd)) + { + win_skip("FIXME: failed to create TreeView window.\n"); + unload_v6_module(ctx_cookie, hCtx); + DestroyWindow(hMainWnd); + return; + } + else + DestroyWindow(hwnd); + + /* comctl32 version 6 tests start here */ + test_expandedimage(); + + unload_v6_module(ctx_cookie, hCtx); + PostMessageA(hMainWnd, WM_CLOSE, 0, 0); while(GetMessageA(&msg,0,0,0)) { TranslateMessage(&msg); diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index b49bbcd..8683b4a 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -1005,7 +1005,7 @@ TREEVIEW_AllocateItem(const TREEVIEW_INFO *infoPtr) * inc/dec to toggle the images. */ newItem->iImage = 0; newItem->iSelectedImage = 0; - newItem->iExpandedImage = 0; + newItem->iExpandedImage = (WORD)I_IMAGENONE; if (DPA_InsertPtr(infoPtr->items, INT_MAX, newItem) == -1) { @@ -2575,7 +2575,7 @@ TREEVIEW_DrawItem(const TREEVIEW_INFO *infoPtr, HDC hdc, TREEVIEW_ITEM *wineItem /* The item is currently selected */ imageIndex = wineItem->iSelectedImage; } - else if ((wineItem->state & TVIS_EXPANDED) && (wineItem->iExpandedImage >= 0)) + else if ((wineItem->state & TVIS_EXPANDED) && (wineItem->iExpandedImage != (WORD)I_IMAGENONE)) { /* The item is currently not selected but expanded */ imageIndex = wineItem->iExpandedImage;

1 0

Maarten Lankhorst : mmdevapi: Blacklist portaudio.
by Alexandre Julliard July 26, 2010

July 26, 2010

Module: wine Branch: master Commit: 47d28ace151390d102a34c51ce5d0ed3abad5e1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=47d28ace151390d102a34c51c… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sun May 30 19:18:35 2010 +0200 mmdevapi: Blacklist portaudio. --- dlls/mmdevapi/devenum.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index 85eeb5e..6fa637f 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -756,6 +756,8 @@ static int blacklist(const char *dev) { return 1; if (!strncmp(dev, "ALSA ", 5) && strstr(dev, "hw:")) return 1; + if (!strncmp(dev, "PortAudio ", 10)) + return 1; return 0; }

1 0

Hwang YunSong : start: Update Korean resource.
by Alexandre Julliard July 26, 2010

July 26, 2010

Module: wine Branch: master Commit: 0379acc27d23d485bcd6715b00398124479fe0b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0379acc27d23d485bcd6715b0… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Mon Jul 26 10:46:16 2010 +0900 start: Update Korean resource. --- programs/start/Ko.rc | 28 +++++++++++++++------------- 1 files changed, 15 insertions(+), 13 deletions(-) diff --git a/programs/start/Ko.rc b/programs/start/Ko.rc index b1ca3e9..a7f0980 100644 --- a/programs/start/Ko.rc +++ b/programs/start/Ko.rc @@ -3,7 +3,7 @@ * Korean Language Support * * Copyright 2003 Dan Kegel - * Copyright 2005 YunSong Hwang + * Copyright 2005,2010 YunSong Hwang * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -22,23 +22,25 @@ #include "resources.h" +#pragma code_page(65001) + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT STRINGTABLE { -STRING_USAGE, "Ǯ�׸�� Ű�ų� �� Ͽ� ÷��ؼ� ��Ǵ� Ǯ�׸�� \n\ +STRING_USAGE,"풀그림을 실행시키거나 보통 파일에 첨가해서 사용되는 풀그림으로 문서 열기\n\ Usage:\n\ -start [�ɼ�] Ǯ�׸��̳� �� ̸� [...]\n\ -start [�ɼ�] �� ̸�\n\ +start [옵션] 풀그림이나 파일 이름 [...]\n\ +start [옵션] 문서 파일 이름\n\ \n\ Options:\n\ -/M[inimized] Ǯ�׸� �ּ�ȭ ��·� ��.\n\ -/MAX[imized] Ǯ�׸� �ִ�ȭ ��·� ��.\n\ -/R[estored] Ǯ�׸�� ·� ��۽�Ű�� (�ּ�ȭ�� ƴϰ� �ִ�ȭ�� ƴ�).\n\ -/W[ait] ��۵� Ǯ�׸�� ٸ�, �� ڵ带 ��.\n\ -/Unix �� ͽ��÷ξ�� н� ��̸�� ؼ� ��.\n\ -/ProgIDOpen �� progID�� ؼ� �� .\n\ -/L �� ̼�� \n\ +/M[inimized] 풀그림 최소화 상태로 실행.\n\ +/MAX[imized] 풀그림 최대화 상태로 실행.\n\ +/R[estored] 풀그림을 보통상태로 시작시키기 (최소화도 아니고 최대화도 아님).\n\ +/W[ait] 시작된 풀그림이 끝날 때까지 기다림, 끝날 때 종료코드를 남김.\n\ +/Unix 윈도우 익스플로어같이 유닉스 파일이름을 사용해서 시작.\n\ +/ProgIDOpen 지정한 progID를 사용해서 문서 열기.\n\ +/L 사용자 라이센스 보여줌\n\ \n\ start.exe version 0.2 Copyright (C) 2003, Dan Kegel\n\ Start comes with ABSOLUTELY NO WARRANTY; for details run with /L option.\n\ @@ -64,7 +66,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.\n\ See the COPYING.LIB file for license information.\n\ " -STRING_EXECFAIL "��α׷�� ų�, �� Ͽ� �� α׷�� ϴ�.\nShellExecuteEx ��" +STRING_EXECFAIL "프로그램을 실행할 수 없거나, 지정된 파일에 연결된 프로그램이 없습니다.\nShellExecuteEx 실패" -STRING_UNIXFAIL "�� Unix ��ϸ�� DOS ��ϸ�� ٲ� �� ϴ�." +STRING_UNIXFAIL "지정된 Unix 파일명을 DOS 파일명으로 바꿀 수 없습니다." }

1 0