April 2008 - Wine-commits - list.winehq.org

Alexander Nicolaysen Sørnes : winecfg: Update Norwegian Bokmål resource.
by Alexandre Julliard 03 Apr '08

03 Apr '08

Module: wine Branch: master Commit: 9183b472ebac3fd4642655bd2e8c75713b011dee URL: http://source.winehq.org/git/wine.git/?a=commit;h=9183b472ebac3fd4642655bd2… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Thu Apr 3 00:43:09 2008 +0200 winecfg: Update Norwegian Bokmål resource. --- programs/winecfg/No.rc | 55 ++++++++++++++++++++++++++++++----------------- 1 files changed, 35 insertions(+), 20 deletions(-) diff --git a/programs/winecfg/No.rc b/programs/winecfg/No.rc index e9550d5..384a197 100644 --- a/programs/winecfg/No.rc +++ b/programs/winecfg/No.rc @@ -2,7 +2,7 @@ * WineCfg resources * Norwegian Bokm�l Language Support * - * Copyright 2005-2007 Alexander N. S�rnes <alex(a)thehandofagony.com> + * Copyright 2005-2008 Alexander N. S�rnes <alex(a)thehandofagony.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -46,7 +46,7 @@ STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN GROUPBOX " Programminnstillinger ",IDC_STATIC, 8,4,244,240 - LTEXT "Wine kan etterligne forskjellige Windows-versjoner for hvert program. Denne fanen er koblet med bibliotek- og grafikkfanene, s�nn at du kan endre innstillinger for hele systemet eller enkelte program der ogs�.", + LTEXT "Wine kan etterligne forskjellige Windows-versjoner for hvert program. Denne fanen er koblet med bibliotek- og grafikkfanene, s�nn at du kan endre innstillinger for hele systemet eller enkelte programmer der ogs�.", IDC_STATIC,15,20,227,30 CONTROL "Programmer",IDC_APP_LISTVIEW,"SysListView32",WS_BORDER | WS_TABSTOP | LVS_LIST | LVS_SINGLESEL | LVS_SHOWSELALWAYS, 15,50,230,150 @@ -62,27 +62,27 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX " Vinduinnstillinger ",IDC_STATIC,8,5,244,180 - CONTROL "Tillat DirectX-programmer � hindre musen fra � forlate vinduet",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,15,230,8 - LTEXT "Hvis vinduer kontrolleres av din standardvindusbehandler, f�r de vanlige rammer, og respekterer det virtuelle skrivebordet ditt og vises i vinduslisten.\n\nHvis de er ukontrollerte er de koblet fra vindusbehandleren. Dette betyr at de ikke integreres like godt med skrivebordet ditt, men emuleringen blir mer presis s�nn at noen programmer virker bedre.", - IDC_STATIC,15,38,228,80 - CONTROL "Tillat vindusbehandleren � kontrollere vinduene",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,112,230,8 - + CONTROL "Tillat DirectX-programmer � hindre musen fra � forlate vinduet",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,19,230,8 + + CONTROL "Tillat vindusbehandleren � kontrollere vinduene",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,40,230,8 + LTEXT "Hvis vinduer kontrolleres av din standardvindusbehandler, f�r de vanlige rammer, og respekterer det virtuelle skrivebordet ditt og vises i vinduslisten.\n\nHvis de er ukontrollerte er de koblet fra vindusbehandleren. Dette betyr at de ikke integreres like godt med skrivebordet ditt, men emuleringen blir mer presis s�nn at noen programmer virker bedre.", + IDC_STATIC,19,51,225,80 + + CONTROL "Vis et virtuelt skrivebord",IDC_ENABLE_DESKTOP,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,15,128,230,10 LTEXT "Du kan velge � emulere et Windows-skrivebord, der alle vinduene er bundet i en virtuell skjerm, eller du kan f� vinduene til � oppf�re seg som andre programmer p� skrivebordet.", - IDC_STATIC,15,126,228,28 + IDC_STATIC,19,138,225,28 LTEXT "St�rrelse:",IDC_DESKTOP_SIZE,15,168,44,8,WS_DISABLED - LTEXT "X",IDC_DESKTOP_BY,108,168,8,8,WS_DISABLED - CONTROL "Vis et virtuelt skrivebord",IDC_ENABLE_DESKTOP,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,15,153,230,10 - - EDITTEXT IDC_DESKTOP_WIDTH,64,168,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED - EDITTEXT IDC_DESKTOP_HEIGHT,117,168,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED + LTEXT "X",IDC_DESKTOP_BY,109,168,8,8,WS_DISABLED + EDITTEXT IDC_DESKTOP_WIDTH,64,166,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED + EDITTEXT IDC_DESKTOP_HEIGHT,117,166,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED - GROUPBOX " Direct3D ",IDC_STATIC,8,190,244,50 + GROUPBOX " Direct3D ",IDC_STATIC,8,190,244,48 - LTEXT "Verteks-skyggelegging: ",IDC_STATIC,15,200,80,30 - COMBOBOX IDC_D3D_VSHADER_MODE,100,198,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Verteks-skyggelegging: ",IDC_STATIC,15,203,80,32 + COMBOBOX IDC_D3D_VSHADER_MODE,100,201,145,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "Tillat piksel-skyggelegger (hvis maskinvaren st�tter det)",IDC_D3D_PSHADER_MODE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,217,230,10 + CONTROL "Tillat piksel-skyggelegger (hvis maskinvaren st�tter det)",IDC_D3D_PSHADER_MODE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,219,230,10 GROUPBOX " Skjermoppl�sning (styrer skriftst�rrelse) ",IDC_STATIC,8,242,244,25 CONTROL "", IDC_RES_TRACKBAR, "msctls_trackbar32",WS_TABSTOP,12,250,187,15 EDITTEXT IDC_RES_DPIEDIT,204,250,23,13,ES_NUMBER|WS_TABSTOP @@ -196,7 +196,7 @@ BEGIN EDITTEXT IDC_SYSPARAM_SIZE,166,74,23,13,ES_AUTOHSCROLL | WS_TABSTOP | WS_DISABLED CONTROL "",IDC_SYSPARAM_SIZE_UD,UPDOWN_CLASS,UDS_SETBUDDYINT | WS_DISABLED,187,74,15,13 PUSHBUTTON "Skrift",IDC_SYSPARAM_FONT,208,74,37,13,WS_DISABLED - GROUPBOX " Skallkatalog ",IDC_STATIC,8,114,244,100 + GROUPBOX " Spesielle mapper ",IDC_STATIC,8,114,244,100 CONTROL "Listevisning",IDC_LIST_SFPATHS,"SysListView32",LVS_REPORT | LVS_AUTOARRANGE | LVS_ALIGNLEFT | LVS_SINGLESEL | WS_BORDER | WS_TABSTOP, 15,126,230,64 CONTROL "Pek til:",IDC_LINK_SFPATH,"Button",BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED,15,195,50,13 @@ -222,7 +222,7 @@ BEGIN IDS_THEMEFILE "Temafiler" IDS_THEMEFILE_SELECT "Velg en temafil" IDS_AUDIO_MISSING "Ingen lyddriver er oppgitt i registeret.\n\nEn anbefalt driver er valgt for deg;\nbruk den eller velg en annen,\n\nog trykk �Bruk� for at endringene skal tre i kraft." - IDS_SHELL_FOLDER "Skallkatalog" + IDS_SHELL_FOLDER "Mappe" IDS_LINKS_TO "Peker til" END @@ -306,4 +306,19 @@ BEGIN IDC_SYSPARAMS_INACTIVE_TITLE "Inaktiv tittellinje" IDC_SYSPARAMS_INACTIVE_TITLE_TEXT "Inaktiv titteltekst" IDC_SYSPARAMS_MSGBOX_TEXT "Meldingsvindutekst" + IDC_SYSPARAMS_APPWORKSPACE "Arbeidsomr�de i program" + IDC_SYSPARAMS_WINDOW_FRAME "Visrusramme" + IDC_SYSPARAMS_ACTIVE_BORDER "Aktiv kant" + IDC_SYSPARAMS_INACTIVE_BORDER "Inaktiv kant" + IDC_SYSPARAMS_BUTTON_SHADOW "Kontrollerskygge" + IDC_SYSPARAMS_GRAY_TEXT "Gr� tekst" + IDC_SYSPARAMS_BUTTON_HILIGHT "Merket kontroller" + IDC_SYSPARAMS_BUTTON_DARK_SHADOW "M�rk skygge i kontroller" + IDC_SYSPARAMS_BUTTON_LIGHT "Kontrollerlys" + IDC_SYSPARAMS_BUTTON_ALTERNATE "Bakgrunn for skiftende kontroller" + IDC_SYSPARAMS_HOT_TRACKING "Merket element" + IDC_SYSPARAMS_ACTIVE_TITLE_GRADIENT "Gradient for aktiv tittellinje" + IDC_SYSPARAMS_INACTIVE_TITLE_GRADIENT "Gradient for inaktiv tittellinje" + IDC_SYSPARAMS_MENU_HILIGHT "Menymerking" + IDC_SYSPARAMS_MENUBAR "Menylinje" END

1 0

James Hawkins : msi: Handle the case where no files match the wildcard in MoveFiles.
by Alexandre Julliard 03 Apr '08

03 Apr '08

Module: wine Branch: master Commit: a7d02a1f08194accdd3714a82bac19298c5c9fde URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7d02a1f08194accdd3714a82… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Wed Apr 2 17:41:47 2008 -0500 msi: Handle the case where no files match the wildcard in MoveFiles. --- dlls/msi/action.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 982c9f0..b19e015 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -5413,6 +5413,10 @@ static BOOL move_files_wildcard(LPWSTR source, LPWSTR dest, int options) msi_free(path); } + /* no files match the wildcard */ + if (list_empty(&files.entry)) + goto done; + /* only the first wildcard match gets renamed to dest */ file = LIST_ENTRY(list_head(&files.entry), FILE_LIST, entry); size = (strrchrW(file->dest, '\\') - file->dest) + lstrlenW(file->destname) + 2;

1 0

James Hawkins : msi: Downgrade a few messages to WARN.
by Alexandre Julliard 03 Apr '08

03 Apr '08

Module: wine Branch: master Commit: c48daf93bb41ab8557ee822341114d1676075c69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c48daf93bb41ab8557ee82234… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Wed Apr 2 18:30:37 2008 -0500 msi: Downgrade a few messages to WARN. --- dlls/msi/action.c | 4 ++-- dlls/msi/dialog.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index b19e015..ef0e136 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1053,7 +1053,7 @@ UINT ACTION_PerformAction(MSIPACKAGE *package, const WCHAR *action, UINT script, if (!handled) { - FIXME("unhandled msi action %s\n",debugstr_w(action)); + WARN("unhandled msi action %s\n",debugstr_w(action)); rc = ERROR_FUNCTION_NOT_CALLED; } @@ -1077,7 +1077,7 @@ UINT ACTION_PerformUIAction(MSIPACKAGE *package, const WCHAR *action, UINT scrip if (!handled) { - FIXME("unhandled msi action %s\n",debugstr_w(action)); + WARN("unhandled msi action %s\n",debugstr_w(action)); rc = ERROR_FUNCTION_NOT_CALLED; } diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index e084bf8..035d7f5 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -2917,7 +2917,7 @@ static MSIRECORD *msi_get_dialog_record( msi_dialog *dialog ) rec = MSI_QueryGetRecord( package->db, query, dialog->name ); if( !rec ) - ERR("query failed for dialog %s\n", debugstr_w(dialog->name)); + WARN("query failed for dialog %s\n", debugstr_w(dialog->name)); return rec; }

1 0

James Hawkins : msi: Fix joining a nonexistent table with another table.
by Alexandre Julliard 03 Apr '08

03 Apr '08

Module: wine Branch: master Commit: 061085fa942d28031eaade9a4c511f0272e49164 URL: http://source.winehq.org/git/wine.git/?a=commit;h=061085fa942d28031eaade9a4… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Wed Apr 2 18:31:18 2008 -0500 msi: Fix joining a nonexistent table with another table. --- dlls/msi/join.c | 3 ++- dlls/msi/tests/db.c | 5 +++++ 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/msi/join.c b/dlls/msi/join.c index e24eace..756db6f 100644 --- a/dlls/msi/join.c +++ b/dlls/msi/join.c @@ -341,7 +341,8 @@ UINT JOIN_CreateView( MSIDATABASE *db, MSIVIEW **view, LPWSTR tables ) r = TABLE_CreateView( db, tables, &table->view ); if( r != ERROR_SUCCESS ) { - ERR("can't create table\n"); + WARN("can't create table: %s\n", debugstr_w(tables)); + r = ERROR_BAD_QUERY_SYNTAX; goto end; } diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index aee2e80..9be1691 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -3213,6 +3213,11 @@ static void test_join(void) MsiViewClose(hview); MsiCloseHandle(hview); + query = "SELECT * FROM `Nonexistent`, `One`"; + r = MsiDatabaseOpenView(hdb, query, &hview); + ok( r == ERROR_BAD_QUERY_SYNTAX, + "Expected ERROR_BAD_QUERY_SYNTAX, got %d\n", r ); + MsiCloseHandle(hdb); DeleteFile(msifile); }

1 0

Lei Zhang : user32: Add more edit dialog tests.
by Alexandre Julliard 03 Apr '08

03 Apr '08

Module: wine Branch: master Commit: 1d1f1373af9b0210a09add13e2c7013cbe578b40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d1f1373af9b0210a09add13e… Author: Lei Zhang <thestig(a)google.com> Date: Wed Apr 2 10:50:09 2008 -0700 user32: Add more edit dialog tests. --- dlls/user32/tests/edit.c | 34 +++++++++++++++++++++++++++++++++- 1 files changed, 33 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index 74092be..a40251c 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -90,6 +90,19 @@ static INT_PTR CALLBACK edit_dialog_proc(HWND hdlg, UINT msg, WPARAM wparam, LPA PostMessage(hdlg, WM_USER, 0xdeadbeef, 1); break; + /* multiple tab tests */ + case 9: + PostMessage(hedit, WM_KEYDOWN, VK_TAB, 0xf0001); + PostMessage(hedit, WM_KEYDOWN, VK_TAB, 0xf0001); + PostMessage(hdlg, WM_USER, 0xdeadbeef, 2); + break; + case 10: + PostMessage(hedit, WM_KEYDOWN, VK_TAB, 0xf0001); + PostMessage(hedit, WM_KEYDOWN, VK_TAB, 0xf0001); + PostMessage(hedit, WM_KEYDOWN, VK_TAB, 0xf0001); + PostMessage(hdlg, WM_USER, 0xdeadbeef, 2); + break; + default: break; } @@ -119,7 +132,9 @@ static INT_PTR CALLBACK edit_dialog_proc(HWND hdlg, UINT msg, WPARAM wparam, LPA { int len; HWND hok = GetDlgItem(hdlg, IDOK); + HWND hcancel = GetDlgItem(hdlg, IDCANCEL); HWND hedit = GetDlgItem(hdlg, 1000); + HWND hfocus = GetFocus(); if (wparam != 0xdeadbeef) break; @@ -136,12 +151,23 @@ static INT_PTR CALLBACK edit_dialog_proc(HWND hdlg, UINT msg, WPARAM wparam, LPA case 1: len = SendMessage(hedit, WM_GETTEXTLENGTH, 0, 0); - if ((GetFocus() == hok) && len == 0) + if ((hfocus == hok) && len == 0) EndDialog(hdlg, 444); else EndDialog(hdlg, 555); break; + case 2: + if (hfocus == hok) + EndDialog(hdlg, 11); + else if (hfocus == hcancel) + EndDialog(hdlg, 22); + else if (hfocus == hedit) + EndDialog(hdlg, 33); + else + EndDialog(hdlg, 44); + break; + default: EndDialog(hdlg, 555); } @@ -1307,6 +1333,12 @@ static void test_edit_dialog(void) todo_wine ok(444 == r, "Expected %d, got %d\n", 444, r); r = DialogBoxParam(hinst, "EDIT_DIALOG", NULL, (DLGPROC)edit_dialog_proc, 8); ok(444 == r, "Expected %d, got %d\n", 444, r); + + /* multiple tab tests */ + r = DialogBoxParam(hinst, "EDIT_DIALOG", NULL, (DLGPROC)edit_dialog_proc, 9); + ok(22 == r, "Expected %d, got %d\n", 22, r); + r = DialogBoxParam(hinst, "EDIT_DIALOG", NULL, (DLGPROC)edit_dialog_proc, 10); + ok(33 == r, "Expected %d, got %d\n", 33, r); } static BOOL RegisterWindowClasses (void)

1 0

Lei Zhang : user32: Dialog should ignore WM_KEYDOWN messages if it gets DLGC_WANTCHARS.
by Alexandre Julliard 03 Apr '08

03 Apr '08

Module: wine Branch: master Commit: 08a4d2afc2ddfc1e508ef8528d5332d4b915b0a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08a4d2afc2ddfc1e508ef8528… Author: Lei Zhang <thestig(a)google.com> Date: Wed Apr 2 11:04:23 2008 -0700 user32: Dialog should ignore WM_KEYDOWN messages if it gets DLGC_WANTCHARS. --- dlls/user32/dialog.c | 2 +- dlls/user32/tests/edit.c | 103 +++++++++++++++++++++++++++++++++++++++++ dlls/user32/tests/resource.rc | 10 ++++ 3 files changed, 114 insertions(+), 1 deletions(-) diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index bb0d460..243bb5a 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -1094,7 +1094,7 @@ BOOL WINAPI IsDialogMessageW( HWND hwndDlg, LPMSG msg ) { case WM_KEYDOWN: dlgCode = SendMessageW( msg->hwnd, WM_GETDLGCODE, msg->wParam, (LPARAM)msg ); - if (dlgCode & DLGC_WANTMESSAGE) break; + if (dlgCode & (DLGC_WANTCHARS|DLGC_WANTMESSAGE)) break; switch(msg->wParam) { diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index a40251c..123fd4f 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -37,6 +37,95 @@ struct edit_notify { static struct edit_notify notifications; +static INT_PTR CALLBACK multi_edit_dialog_proc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam) +{ + switch (msg) + { + case WM_INITDIALOG: + { + HWND hedit = GetDlgItem(hdlg, 1000); + SetFocus(hedit); + switch (lparam) + { + /* test cases related to bug 12319 */ + case 0: + PostMessage(hedit, WM_KEYDOWN, VK_TAB, 0xf0001); + PostMessage(hdlg, WM_USER, 0xdeadbeef, 0); + break; + case 1: + PostMessage(hedit, WM_CHAR, VK_TAB, 0xf0001); + PostMessage(hdlg, WM_USER, 0xdeadbeef, 0); + break; + case 2: + PostMessage(hedit, WM_KEYDOWN, VK_TAB, 0xf0001); + PostMessage(hedit, WM_CHAR, VK_TAB, 0xf0001); + PostMessage(hdlg, WM_USER, 0xdeadbeef, 0); + break; + + default: + break; + } + break; + } + + case WM_COMMAND: + if (HIWORD(wparam) != BN_CLICKED) + break; + + switch (LOWORD(wparam)) + { + case IDOK: + EndDialog(hdlg, 111); + break; + + case IDCANCEL: + EndDialog(hdlg, 222); + break; + + default: + break; + } + break; + + case WM_USER: + { + HWND hfocus = GetFocus(); + HWND hedit = GetDlgItem(hdlg, 1000); + HWND hedit2 = GetDlgItem(hdlg, 1001); + HWND hedit3 = GetDlgItem(hdlg, 1002); + + if (wparam != 0xdeadbeef) + break; + + switch (lparam) + { + case 0: + if (hfocus == hedit) + EndDialog(hdlg, 1111); + else if (hfocus == hedit2) + EndDialog(hdlg, 2222); + else if (hfocus == hedit3) + EndDialog(hdlg, 3333); + else + EndDialog(hdlg, 4444); + break; + default: + EndDialog(hdlg, 5555); + } + break; + } + + case WM_CLOSE: + EndDialog(hdlg, 333); + break; + + default: + break; + } + + return FALSE; +} + static INT_PTR CALLBACK edit_dialog_proc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam) { switch (msg) @@ -1341,6 +1430,19 @@ static void test_edit_dialog(void) ok(33 == r, "Expected %d, got %d\n", 33, r); } +static void test_multi_edit_dialog(void) +{ + int r; + + /* test for multiple edit dialogs (bug 12319) */ + r = DialogBoxParam(hinst, "MULTI_EDIT_DIALOG", NULL, (DLGPROC)multi_edit_dialog_proc, 0); + ok(2222 == r, "Expected %d, got %d\n", 2222, r); + r = DialogBoxParam(hinst, "MULTI_EDIT_DIALOG", NULL, (DLGPROC)multi_edit_dialog_proc, 1); + ok(1111 == r, "Expected %d, got %d\n", 1111, r); + r = DialogBoxParam(hinst, "MULTI_EDIT_DIALOG", NULL, (DLGPROC)multi_edit_dialog_proc, 2); + ok(2222 == r, "Expected %d, got %d\n", 2222, r); +} + static BOOL RegisterWindowClasses (void) { WNDCLASSA test2; @@ -1410,6 +1512,7 @@ START_TEST(edit) test_espassword(); test_undo(); test_edit_dialog(); + test_multi_edit_dialog(); UnregisterWindowClasses(); } diff --git a/dlls/user32/tests/resource.rc b/dlls/user32/tests/resource.rc index b0c4967..24c5e33 100644 --- a/dlls/user32/tests/resource.rc +++ b/dlls/user32/tests/resource.rc @@ -98,6 +98,16 @@ BEGIN PUSHBUTTON "Cancel",IDCANCEL,129,24,50,14 END +MULTI_EDIT_DIALOG DIALOG DISCARDABLE 0, 0, 160, 75 +STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | DS_CENTER +CAPTION "Multiple Edit Test" +FONT 8, "MS Shell Dlg" +{ + EDITTEXT 1000, 5, 5, 150, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + EDITTEXT 1001, 5, 25, 150, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + EDITTEXT 1002, 5, 45, 150, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +} + EDIT_DIALOG DIALOG DISCARDABLE 0, 0, 160, 80 STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | DS_CENTER CAPTION "Edit Test"

1 0

Lei Zhang : user32: Correctly handle VK_RETURN for edit controls with ES_WANTRETURN style.
by Alexandre Julliard 03 Apr '08

03 Apr '08

Module: wine Branch: master Commit: 376e45429cda0844b2106cc444a8cf7bac33de00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=376e45429cda0844b2106cc44… Author: Lei Zhang <thestig(a)google.com> Date: Wed Apr 2 11:33:19 2008 -0700 user32: Correctly handle VK_RETURN for edit controls with ES_WANTRETURN style. --- dlls/user32/edit.c | 5 ++--- dlls/user32/tests/edit.c | 22 +++++++++++++++++----- dlls/user32/tests/resource.rc | 2 +- 3 files changed, 20 insertions(+), 9 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index dd5ba0a..e6d2530 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -811,9 +811,6 @@ static LRESULT WINAPI EditWndProc_common( HWND hwnd, UINT msg, { switch (vk) { - case VK_RETURN: - SendMessageW(GetParent(hwnd), WM_COMMAND, IDOK, (LPARAM)GetDlgItem(GetParent(hwnd), IDOK)); - break; case VK_ESCAPE: SendMessageW(GetParent(hwnd), WM_CLOSE, 0, 0); break; @@ -4608,6 +4605,8 @@ static LRESULT EDIT_WM_KeyDown(EDITSTATE *es, INT key) MAKEWPARAM( LOWORD(dw), BN_CLICKED ), (LPARAM)GetDlgItem( hwndParent, LOWORD(dw) ) ); } + else + SendMessageW( hwndParent, WM_COMMAND, IDOK, (LPARAM)GetDlgItem( hwndParent, IDOK ) ); } break; } diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index 123fd4f..0e9487d 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -39,6 +39,7 @@ static struct edit_notify notifications; static INT_PTR CALLBACK multi_edit_dialog_proc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam) { + static int num_ok_commands = 0; switch (msg) { case WM_INITDIALOG: @@ -62,6 +63,13 @@ static INT_PTR CALLBACK multi_edit_dialog_proc(HWND hdlg, UINT msg, WPARAM wpara PostMessage(hdlg, WM_USER, 0xdeadbeef, 0); break; + /* test cases for pressing enter */ + case 3: + num_ok_commands = 0; + PostMessage(hedit, WM_KEYDOWN, VK_RETURN, 0x1c0001); + PostMessage(hdlg, WM_USER, 0xdeadbeef, 1); + break; + default: break; } @@ -75,11 +83,7 @@ static INT_PTR CALLBACK multi_edit_dialog_proc(HWND hdlg, UINT msg, WPARAM wpara switch (LOWORD(wparam)) { case IDOK: - EndDialog(hdlg, 111); - break; - - case IDCANCEL: - EndDialog(hdlg, 222); + num_ok_commands++; break; default: @@ -109,6 +113,12 @@ static INT_PTR CALLBACK multi_edit_dialog_proc(HWND hdlg, UINT msg, WPARAM wpara else EndDialog(hdlg, 4444); break; + case 1: + if ((hfocus == hedit) && (num_ok_commands == 0)) + EndDialog(hdlg, 11); + else + EndDialog(hdlg, 22); + break; default: EndDialog(hdlg, 5555); } @@ -1441,6 +1451,8 @@ static void test_multi_edit_dialog(void) ok(1111 == r, "Expected %d, got %d\n", 1111, r); r = DialogBoxParam(hinst, "MULTI_EDIT_DIALOG", NULL, (DLGPROC)multi_edit_dialog_proc, 2); ok(2222 == r, "Expected %d, got %d\n", 2222, r); + r = DialogBoxParam(hinst, "MULTI_EDIT_DIALOG", NULL, (DLGPROC)multi_edit_dialog_proc, 3); + ok(11 == r, "Expected %d, got %d\n", 11, r); } static BOOL RegisterWindowClasses (void) diff --git a/dlls/user32/tests/resource.rc b/dlls/user32/tests/resource.rc index 24c5e33..80abf08 100644 --- a/dlls/user32/tests/resource.rc +++ b/dlls/user32/tests/resource.rc @@ -103,7 +103,7 @@ STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | DS_CENTER CAPTION "Multiple Edit Test" FONT 8, "MS Shell Dlg" { - EDITTEXT 1000, 5, 5, 150, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + EDITTEXT 1000, 5, 5, 150, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_MULTILINE | ES_WANTRETURN EDITTEXT 1001, 5, 25, 150, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP EDITTEXT 1002, 5, 45, 150, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP }

1 0

James Hawkins : shell32: Fix and simplify the FO_COPY operation, with tests .
by Alexandre Julliard 03 Apr '08

03 Apr '08

Module: wine Branch: master Commit: 5469551f6b38950fcbc591f46d10527788633511 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5469551f6b38950fcbc591f46… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Wed Apr 2 16:13:11 2008 -0500 shell32: Fix and simplify the FO_COPY operation, with tests. --- dlls/shell32/shlfileop.c | 75 ++++++++++++------------ dlls/shell32/tests/shlfileop.c | 125 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 161 insertions(+), 39 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5469551f6b38950fcbc59…

1 0

Maarten Lankhorst : winemp3: Change a few more fprintf's to wine logs.
by Alexandre Julliard 03 Apr '08

03 Apr '08

Module: wine Branch: master Commit: f5fdb793edd20abd152b50b90ebd2eb78492cdec URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5fdb793edd20abd152b50b90… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Apr 2 14:58:23 2008 -0700 winemp3: Change a few more fprintf's to wine logs. --- dlls/winemp3.acm/interface.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/winemp3.acm/interface.c b/dlls/winemp3.acm/interface.c index 775c001..a1d09f2 100644 --- a/dlls/winemp3.acm/interface.c +++ b/dlls/winemp3.acm/interface.c @@ -24,6 +24,7 @@ #include "mpg123.h" #include "mpglib.h" +WINE_DEFAULT_DEBUG_CHANNEL(mpeg3); BOOL InitMP3(struct mpstr *mp) { @@ -72,12 +73,13 @@ static struct buf *addbuf(struct mpstr *mp,const unsigned char *buf,int size) nbuf = malloc( sizeof(struct buf) ); if(!nbuf) { - fprintf(stderr,"Out of memory!\n"); + WARN("Out of memory!\n"); return NULL; } nbuf->pnt = malloc(size); if(!nbuf->pnt) { free(nbuf); + WARN("Out of memory!\n"); return NULL; } nbuf->size = size; @@ -156,7 +158,7 @@ int decodeMP3(struct mpstr *mp,const unsigned char *in,int isize,unsigned char * int len; if(osize < 4608) { - fprintf(stderr,"To less out space\n"); + ERR("Output buffer too small\n"); return MP3_ERR; } @@ -229,7 +231,8 @@ int set_pointer(struct mpstr *mp, long backstep) { unsigned char *bsbufold; if(mp->fsizeold < 0 && backstep > 0) { - fprintf(stderr,"Can't step back %ld!\n",backstep); + /* This is not a bug if we just did seeking, the first frame is dropped then */ + WARN("Can't step back %ld!\n",backstep); return MP3_ERR; } bsbufold = mp->bsspace[mp->bsnum] + 512;

1 0

Maarten Lankhorst : quartz: Fix memory leak found by valgrind.
by Alexandre Julliard 03 Apr '08

03 Apr '08

Module: wine Branch: master Commit: cfeca053b843be495f356837b1dcfdf314717b0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfeca053b843be495f356837b… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Apr 2 23:00:57 2008 -0700 quartz: Fix memory leak found by valgrind. --- dlls/quartz/filtergraph.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 0a841d9..417ec3f 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -407,7 +407,7 @@ static HRESULT WINAPI FilterGraph2_AddFilter(IFilterGraph2 *iface, LPWSTR * pNewNames = CoTaskMemAlloc(newCapacity * sizeof(LPWSTR)); memcpy(ppNewFilters, This->ppFiltersInGraph, This->nFilters * sizeof(IBaseFilter*)); memcpy(pNewNames, This->pFilterNames, This->nFilters * sizeof(LPWSTR)); - if (!This->filterCapacity) + if (This->filterCapacity) { CoTaskMemFree(This->ppFiltersInGraph); CoTaskMemFree(This->pFilterNames);

1 0