wine-commits October 2010

wine-commits@winehq.org

2 participants
1174 discussions

Nikolay Sivov : comctl32/treeview: Fix TVN_DELETEITEM to use item that is about to be deleted.
by Alexandre Julliard 25 Oct '10

25 Oct '10

Module: wine Branch: master Commit: 4633fc5c03a2aff20d3b50a5b80dcaff8274dcc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4633fc5c03a2aff20d3b50a5b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Oct 23 22:15:04 2010 +0400 comctl32/treeview: Fix TVN_DELETEITEM to use item that is about to be deleted. --- dlls/comctl32/tests/treeview.c | 6 ++---- dlls/comctl32/treeview.c | 6 +++--- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 7238bd0..5088d91 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -1359,10 +1359,8 @@ static void test_delete_items(void) if (item_sequence[0]->count == 2) { -todo_wine { - ok(msg[0].lParam == (LPARAM)hChild, "expected %p, got %lx\n", hChild, msg[0].lParam); - ok(msg[1].lParam == (LPARAM)hRoot, "expected %p, got %lx\n", hRoot, msg[1].lParam); -} + ok(msg[0].lParam == (LPARAM)hChild, "expected %p, got 0x%lx\n", hChild, msg[0].lParam); + ok(msg[1].lParam == (LPARAM)hRoot, "expected %p, got 0x%lx\n", hRoot, msg[1].lParam); } ret = SendMessageA(hTree, TVM_GETCOUNT, 0, 0); diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 1ca5639..f8c28de 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -1479,12 +1479,12 @@ TREEVIEW_RemoveItem(TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *wineItem) { TRACE("%p, (%s)\n", wineItem, TREEVIEW_ItemName(wineItem)); - TREEVIEW_SendTreeviewNotify(infoPtr, TVN_DELETEITEMW, TVC_UNKNOWN, - TVIF_HANDLE | TVIF_PARAM, wineItem, 0); - if (wineItem->firstChild) TREEVIEW_RemoveAllChildren(infoPtr, wineItem); + TREEVIEW_SendTreeviewNotify(infoPtr, TVN_DELETEITEMW, TVC_UNKNOWN, + TVIF_HANDLE | TVIF_PARAM, wineItem, 0); + TREEVIEW_UnlinkItem(wineItem); infoPtr->uNumItems--;

1 0

Nikolay Sivov : comctl32/treeview: Accept null item handle as a root for TVM_DELETEITEM.
by Alexandre Julliard 25 Oct '10

25 Oct '10

Module: wine Branch: master Commit: 04e5e9cfa0ef77db99c46ecf0f8e63e105d4a38f URL: http://source.winehq.org/git/wine.git/?a=commit;h=04e5e9cfa0ef77db99c46ecf0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Oct 23 20:18:51 2010 +0400 comctl32/treeview: Accept null item handle as a root for TVM_DELETEITEM. --- dlls/comctl32/tests/treeview.c | 49 ++++++++++++++++++++++++++++++++++++++++ dlls/comctl32/treeview.c | 2 +- 2 files changed, 50 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 1de63c6..7238bd0 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -42,6 +42,7 @@ static const char *TEST_CALLBACK_TEXT = "callback_text"; #define expect(expected, got) ok(got == expected, "Expected %d, got %d\n", expected, got) static struct msg_sequence *sequences[NUM_MSG_SEQUENCES]; +static struct msg_sequence *item_sequence[1]; static const struct message FillRootSeq[] = { { TVM_INSERTITEM, sent }, @@ -958,6 +959,21 @@ static LRESULT CALLBACK parent_wnd_proc(HWND hWnd, UINT message, WPARAM wParam, ok(SendMessage(pHdr->hwndFrom, TVM_GETITEMRECT, TRUE, (LPARAM)&rect), "Failed to get rect for second visible item.\n"); } break; + case TVN_DELETEITEMA: + { + struct message item; + + ok(pTreeView->itemNew.mask == 0, "got wrong mask 0x%x\n", pTreeView->itemNew.mask); + + ok(pTreeView->itemOld.mask == (TVIF_HANDLE | TVIF_PARAM), "got wrong mask 0x%x\n", pTreeView->itemOld.mask); + ok(pTreeView->itemOld.hItem != NULL, "got %p\n", pTreeView->itemOld.hItem); + + memset(&item, 0, sizeof(item)); + item.lParam = (LPARAM)pTreeView->itemOld.hItem; + add_message(item_sequence, 0, &item); + + break; + } } } } @@ -1324,6 +1340,37 @@ static void test_WM_PAINT(void) DestroyWindow(hTree); } +static void test_delete_items(void) +{ + const struct message *msg; + HWND hTree; + INT ret; + + hTree = create_treeview_control(); + fill_tree(hTree); + + /* check delete order */ + flush_sequences(item_sequence, 1); + ret = SendMessage(hTree, TVM_DELETEITEM, 0, 0); + ok(ret == TRUE, "got %d\n", ret); + + msg = item_sequence[0]->sequence; + ok(item_sequence[0]->count == 2, "expected 2 items, got %d\n", item_sequence[0]->count); + + if (item_sequence[0]->count == 2) + { +todo_wine { + ok(msg[0].lParam == (LPARAM)hChild, "expected %p, got %lx\n", hChild, msg[0].lParam); + ok(msg[1].lParam == (LPARAM)hRoot, "expected %p, got %lx\n", hRoot, msg[1].lParam); +} + } + + ret = SendMessageA(hTree, TVM_GETCOUNT, 0, 0); + ok(ret == 0, "got %d\n", ret); + + DestroyWindow(hTree); +} + START_TEST(treeview) { HMODULE hComctl32; @@ -1348,6 +1395,7 @@ START_TEST(treeview) InitCommonControls(); init_msg_sequences(sequences, NUM_MSG_SEQUENCES); + init_msg_sequences(item_sequence, 1); wc.style = CS_HREDRAW | CS_VREDRAW; wc.cbClsExtra = 0; @@ -1390,6 +1438,7 @@ START_TEST(treeview) test_expandnotify(); test_TVS_SINGLEEXPAND(); test_WM_PAINT(); + test_delete_items(); if (!load_v6_module(&ctx_cookie, &hCtx)) { diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 1ffcf64..1ca5639 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -1513,7 +1513,7 @@ TREEVIEW_DeleteItem(TREEVIEW_INFO *infoPtr, HTREEITEM wineItem) TREEVIEW_ITEM *parent, *prev = NULL; BOOL visible = FALSE; - if (wineItem == TVI_ROOT) + if (wineItem == TVI_ROOT || !wineItem) { TRACE("TVI_ROOT\n"); parent = infoPtr->root;

1 0

Nikolay Sivov : mshtml: Remove useless initialization.
by Alexandre Julliard 25 Oct '10

25 Oct '10

Module: wine Branch: master Commit: 198f6e75ee6d901e750ee0e8b110ec307c2d4a23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=198f6e75ee6d901e750ee0e8b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Oct 23 17:49:33 2010 +0400 mshtml: Remove useless initialization. --- dlls/mshtml/conpoint.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/conpoint.c b/dlls/mshtml/conpoint.c index da775ad..c316685 100644 --- a/dlls/mshtml/conpoint.c +++ b/dlls/mshtml/conpoint.c @@ -208,7 +208,6 @@ void ConnectionPoint_Init(ConnectionPoint *cp, ConnectionPointContainer *contain cp->sinks = NULL; cp->sinks_size = 0; cp->iid = riid; - cp->next = NULL; cp->data = data; cp->next = container->cp_list;

1 0

Jacek Caban : jscript: Pass script_ctx_t instead of exec_ctx_t to eval functions.
by Alexandre Julliard 25 Oct '10

25 Oct '10

Module: wine Branch: master Commit: faf9be0267ae02dcb6ba37086480be91f07e6370 URL: http://source.winehq.org/git/wine.git/?a=commit;h=faf9be0267ae02dcb6ba37086… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Oct 23 16:41:55 2010 +0200 jscript: Pass script_ctx_t instead of exec_ctx_t to eval functions. --- dlls/jscript/engine.c | 479 ++++++++++++++++++++++++------------------------- dlls/jscript/engine.h | 154 ++++++++-------- 2 files changed, 315 insertions(+), 318 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=faf9be0267ae02dcb6ba3…

1 0

Anders Jonsson : kernel32: Add Swedish translation.
by Alexandre Julliard 25 Oct '10

25 Oct '10

Module: wine Branch: master Commit: 7665d27b95311b20083d19e4d048c80c61f89212 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7665d27b95311b20083d19e4d… Author: Anders Jonsson <anders.jonsson(a)norsjonet.se> Date: Sat Oct 23 13:11:51 2010 +0200 kernel32: Add Swedish translation. --- .gitignore | 1 + dlls/kernel32/Makefile.in | 1 + dlls/kernel32/nls/winerr_sve.mc | 3741 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 3743 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7665d27b95311b20083d1…

1 0

Anders Jonsson : cryptui: Fix typo in Swedish translation.
by Alexandre Julliard 25 Oct '10

25 Oct '10

Module: wine Branch: master Commit: 952ef503d754304855f0e9b17fc7a12be0be6b30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=952ef503d754304855f0e9b17… Author: Anders Jonsson <anders.jonsson(a)norsjonet.se> Date: Sat Oct 23 13:09:49 2010 +0200 cryptui: Fix typo in Swedish translation. --- dlls/cryptui/cryptui_Sv.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/cryptui/cryptui_Sv.rc b/dlls/cryptui/cryptui_Sv.rc index aa1db6a..f0be60b 100644 --- a/dlls/cryptui/cryptui_Sv.rc +++ b/dlls/cryptui/cryptui_Sv.rc @@ -134,7 +134,7 @@ STRINGTABLE IDS_PURPOSE_OEM_WHQL "Verifiering av OEM Windows-systemkomponent" IDS_PURPOSE_EMBEDDED_NT "Verifiering av inbäddad Windows-systemkomponent" IDS_PURPOSE_ROOT_LIST_SIGNER "Signerare av rotlista" - IDS_PURPOSE_QUALIFIED_SUBORDINATION "Kvalifierad underordning" + IDS_PURPOSE_QUALIFIED_SUBORDINATION "Kvalificerad underordning" IDS_PURPOSE_KEY_RECOVERY "Nyckelåterställning" IDS_PURPOSE_DOCUMENT_SIGNING "Dokumentsignering" IDS_PURPOSE_LIFETIME_SIGNING "Livstidssignering"

1 0

Anders Jonsson : progman: Fix typos in Swedish translation.
by Alexandre Julliard 25 Oct '10

25 Oct '10

Module: wine Branch: master Commit: 3e532d52d78d1680ca70d033c2645d98138a3861 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e532d52d78d1680ca70d033c… Author: Anders Jonsson <anders.jonsson(a)norsjonet.se> Date: Sat Oct 23 13:07:05 2010 +0200 progman: Fix typos in Swedish translation. --- programs/progman/Sv.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/progman/Sv.rc b/programs/progman/Sv.rc index c227359..9d074fb 100644 --- a/programs/progman/Sv.rc +++ b/programs/progman/Sv.rc @@ -196,7 +196,7 @@ IDS_DELETE_GROUP_s, "Ta bort gruppen '%s'?" IDS_DELETE_PROGRAM_s, "Ta bort programmet '%s'?" IDS_NOT_IMPLEMENTED, "Ej implementerat" IDS_FILE_READ_ERROR_s, "Fel vid läsning av '%s'." -IDS_FILE_WRITE_ERROR_s, "Fel vid skrivning til '%s'." +IDS_FILE_WRITE_ERROR_s, "Fel vid skrivning till '%s'." IDS_GRPFILE_READ_ERROR_s, "\ Kunde inte öppna gruppfilen '%s'.\n\ Ska vidare försök göras?" @@ -204,7 +204,7 @@ IDS_OUT_OF_MEMORY, "För lite minne." IDS_WINHELP_ERROR, "Ingen hjälp finns tillgänglig." IDS_UNKNOWN_FEATURE_s, "Okänd egenskap i '%s'" IDS_FILE_NOT_OVERWRITTEN_s, "Filen '%s' fanns redan, och skrevs ej över." -IDS_SAVE_GROUP_AS_s, "Spara grupp som '%s' för å undvika att skriva över filer." +IDS_SAVE_GROUP_AS_s, "Spara grupp som '%s' för att undvika att skriva över filer." IDS_NO_HOT_KEY, "Ingen" IDS_ALL_FILES, "Alla filer (*.*)" IDS_PROGRAMS, "Program"

1 0

Amine Khaldi : comdlg32: Fix translations.
by Alexandre Julliard 25 Oct '10

25 Oct '10

Module: wine Branch: master Commit: f0ea473b2aa7cc65a66ce8b7143387a0a05f4048 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0ea473b2aa7cc65a66ce8b71… Author: Amine Khaldi <amine.khaldi(a)reactos.org> Date: Sat Oct 23 10:09:27 2010 +0100 comdlg32: Fix translations. --- dlls/comdlg32/cdlg_Da.rc | 2 +- dlls/comdlg32/cdlg_No.rc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/cdlg_Da.rc b/dlls/comdlg32/cdlg_Da.rc index 2d92bef..509cc7b 100644 --- a/dlls/comdlg32/cdlg_Da.rc +++ b/dlls/comdlg32/cdlg_Da.rc @@ -258,7 +258,7 @@ FONT 8, "MS Shell Dlg" EDITTEXT edt3, 237,106, 35,12, WS_GROUP | ES_NUMBER GROUPBOX "Udskriv område", grp1, 8,92, 144,64, WS_GROUP - CONTROL "&Alle" rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,106,64,12 + CONTROL "&Alle", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,106,64,12 CONTROL "Si&der", rad3,"Button",BS_AUTORADIOBUTTON,16,122,36,12 CONTROL "&Markeret", rad2,"Button",BS_AUTORADIOBUTTON,16,138,64,12 EDITTEXT edt1, 74,122, 26,12, WS_GROUP | ES_NUMBER diff --git a/dlls/comdlg32/cdlg_No.rc b/dlls/comdlg32/cdlg_No.rc index d18a2a7..5e0f94f 100644 --- a/dlls/comdlg32/cdlg_No.rc +++ b/dlls/comdlg32/cdlg_No.rc @@ -405,7 +405,7 @@ Oppgi en verdi mellom %d og %d." PD32_GENERIC_ERROR "En feil har oppst�tt." PD32_DRIVER_UNKNOWN "Ukjent skriverdriver." PD32_NO_DEVICES "Du m� installere en skriver f�r du \ - kan gj�re skriver-relaterte oppgaver som � endre \ sideoppsettet og skrive ut et dokument. \ + kan gj�re skriver-relaterte oppgaver som � endre sideoppsettet og skrive ut et dokument. \ Installer en og pr�v p� nytt." PD32_DEFAULT_PRINTER "Standardskriver; "

1 0

Yaron Shahrabani : comdlg32: Added Hebrew translation.
by Alexandre Julliard 25 Oct '10

25 Oct '10

Module: wine Branch: master Commit: bf948338ae0d22c37dbbde4275f810584447a6d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf948338ae0d22c37dbbde427… Author: Yaron Shahrabani <sh.yaron(a)gmail.com> Date: Thu Oct 7 16:21:43 2010 +0200 comdlg32: Added Hebrew translation. --- dlls/comdlg32/Makefile.in | 1 + dlls/comdlg32/cdlg_He.rc | 501 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 502 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bf948338ae0d22c37dbbd…

1 0

Aric Stewart : qcap: Make use of a few more strmbase implementations.
by Alexandre Julliard 25 Oct '10

25 Oct '10

Module: wine Branch: master Commit: ae7e5b145f28caa32afb9e30a69ee51488ce9dbc URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae7e5b145f28caa32afb9e30a… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Oct 22 16:21:10 2010 -0500 qcap: Make use of a few more strmbase implementations. --- dlls/qcap/vfwcapture.c | 36 ++++-------------------------------- 1 files changed, 4 insertions(+), 32 deletions(-) diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index 1dc2e0f..93542f4 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -753,16 +753,6 @@ static HRESULT WINAPI VfwPin_QueryInterface(IPin * iface, REFIID riid, LPVOID * return E_NOINTERFACE; } -static ULONG WINAPI VfwPin_AddRef(IPin * iface) -{ - VfwPinImpl *This = (VfwPinImpl *)iface; - ULONG refCount = InterlockedIncrement(&This->pin.pin.refCount); - - TRACE("() -> new refcount: %u\n", refCount); - - return refCount; -} - static ULONG WINAPI VfwPin_Release(IPin * iface) { @@ -802,24 +792,6 @@ VfwPin_QueryInternalConnections(IPin * iface, IPin ** apPin, ULONG * cPin) return E_NOTIMPL; } -static HRESULT WINAPI VfwPin_EndOfStream(IPin * iface) -{ - TRACE("()\n"); - return E_UNEXPECTED; -} - -static HRESULT WINAPI VfwPin_BeginFlush(IPin * iface) -{ - TRACE("(%p)->()\n", iface); - return E_UNEXPECTED; -} - -static HRESULT WINAPI VfwPin_EndFlush(IPin * iface) -{ - TRACE("(%p)->()\n", iface); - return E_UNEXPECTED; -} - static HRESULT WINAPI VfwPin_NewSegment(IPin * iface, REFERENCE_TIME tStart, REFERENCE_TIME tStop, double dRate) @@ -832,7 +804,7 @@ VfwPin_NewSegment(IPin * iface, REFERENCE_TIME tStart, static const IPinVtbl VfwPin_Vtbl = { VfwPin_QueryInterface, - VfwPin_AddRef, + BasePinImpl_AddRef, VfwPin_Release, BaseOutputPinImpl_Connect, BaseOutputPinImpl_ReceiveConnection, @@ -845,8 +817,8 @@ static const IPinVtbl VfwPin_Vtbl = BasePinImpl_QueryAccept, VfwPin_EnumMediaTypes, VfwPin_QueryInternalConnections, - VfwPin_EndOfStream, - VfwPin_BeginFlush, - VfwPin_EndFlush, + BaseOutputPinImpl_EndOfStream, + BaseOutputPinImpl_BeginFlush, + BaseOutputPinImpl_EndFlush, VfwPin_NewSegment };

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2010