wine-commits October 2007

wine-commits@winehq.org

4 participants
996 discussions

Daniel Nylander : uninstaller: Add Swedish translation.
by Alexandre Julliard 16 Oct '07

16 Oct '07

Module: wine Branch: master Commit: 135a005fff42a2a502e31f313dbc422e44975412 URL: http://source.winehq.org/git/wine.git/?a=commit;h=135a005fff42a2a502e31f313… Author: Daniel Nylander <po(a)danielnylander.se> Date: Mon Oct 15 22:12:39 2007 +0200 uninstaller: Add Swedish translation. --- programs/uninstaller/Sv.rc | 44 ++++++++++++++++++++++++++++++++++++++++++ programs/uninstaller/rsrc.rc | 1 + 2 files changed, 45 insertions(+), 0 deletions(-) diff --git a/programs/uninstaller/Sv.rc b/programs/uninstaller/Sv.rc new file mode 100644 index 0000000..64ae0c6 --- /dev/null +++ b/programs/uninstaller/Sv.rc @@ -0,0 +1,44 @@ +/* + * Uninstaller (Swedish Resources) + * + * Copyright 2007 Daniel Nylander + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT + +IDD_UNINSTALLER DIALOG DISCARDABLE 0, 0, 330, 160 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Avinstallera Wine-program" +FONT 10, "MS Sans Serif" +BEGIN + LTEXT "V�lj programmet som du vill avinstallera:",IDC_PLEASESELECT,10,10,250,14 + EDITTEXT IDC_FILTER,10,25,250,14,ES_AUTOHSCROLL + LISTBOX IDC_LIST,10,43,250,106,LBS_NOINTEGRALHEIGHT | + LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "&Avinstallera",IDC_UNINSTALL,270,48,50,14 + PUSHBUTTON "&Om",IDC_ABOUT,270,65,50,14 + PUSHBUTTON "A&vsluta",IDC_EXIT,270,81,50,14 +END + + +STRINGTABLE DISCARDABLE { + IDS_APPNAME, "Avinstallera Wine-program" + IDS_ABOUT, "Wine Application Uninstaller (C) 2005 Andreas Mohr, Hannu Valtonen och Jonathan Ernst." + IDS_ABOUTTITLE, "Om Uninstaller" + IDS_REGISTRYKEYNOTAVAILABLE, "Uninstall registry key not available (yet), nothing to do !" + IDS_UNINSTALLFAILED, "Execution of uninstall command '%s' failed, perhaps due to missing executable.\r\nDo you want to remove the uninstall entry from the registry ?" +} diff --git a/programs/uninstaller/rsrc.rc b/programs/uninstaller/rsrc.rc index 5c1c946..728cba1 100644 --- a/programs/uninstaller/rsrc.rc +++ b/programs/uninstaller/rsrc.rc @@ -42,6 +42,7 @@ #include "Pl.rc" #include "Pt.rc" #include "Ru.rc" +#include "Sv.rc" #include "Tr.rc" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL

1 0

Daniel Nylander : notepad: Update Swedish translation.
by Alexandre Julliard 16 Oct '07

16 Oct '07

Module: wine Branch: master Commit: d5264ed519ba0b5eea8d812283e47397d915986d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5264ed519ba0b5eea8d81228… Author: Daniel Nylander <po(a)danielnylander.se> Date: Mon Oct 15 22:12:00 2007 +0200 notepad: Update Swedish translation. --- programs/notepad/{Sw.rc => Sv.rc} | 40 ++++++++++++++++++------------------ programs/notepad/rsrc.rc | 2 +- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/programs/notepad/Sw.rc b/programs/notepad/Sv.rc similarity index 80% rename from programs/notepad/Sw.rc rename to programs/notepad/Sv.rc index 1744c17..d69b466 100644 --- a/programs/notepad/Sw.rc +++ b/programs/notepad/Sv.rc @@ -28,19 +28,19 @@ MAIN_MENU MENU MENUITEM "&Ny\tCtrl+N", CMD_NEW MENUITEM "�&ppna...\tCtrl+O", CMD_OPEN MENUITEM "&Spara\tCtrl+S", CMD_SAVE - MENUITEM "Spara &som...", CMD_SAVE_AS + MENUITEM "Spara s&om...", CMD_SAVE_AS MENUITEM "&Skriv ut...\tCtrl+P", CMD_PRINT - MENUITEM "Sid La&yout...", CMD_PAGE_SETUP - MENUITEM "Skrivar &inst�llningar...", CMD_PRINTER_SETUP + MENUITEM "Sidla&yout...", CMD_PAGE_SETUP + MENUITEM "Skrivar&konfiguration...", CMD_PRINTER_SETUP MENUITEM SEPARATOR MENUITEM "&Avsluta", CMD_EXIT } POPUP "&Redigera" { - MENUITEM "&Undo\tCtrl+Z", CMD_UNDO + MENUITEM "&�ngra\tCtrl+Z", CMD_UNDO MENUITEM SEPARATOR - MENUITEM "Klippa\tCtrl+X", CMD_CUT + MENUITEM "Klipp &ut\tCtrl+X", CMD_CUT MENUITEM "&Kopiera\tCtrl+C", CMD_COPY - MENUITEM "&Klistra in\tCtrl+V", CMD_PASTE + MENUITEM "Klistra &in\tCtrl+V", CMD_PASTE MENUITEM "&Ta bort\tDel", CMD_DELETE MENUITEM SEPARATOR MENUITEM "Markera &allt", CMD_SELECT_ALL @@ -55,7 +55,7 @@ POPUP "&S�k" { POPUP "&Hj�lp" { MENUITEM "&Inneh�ll", CMD_HELP_CONTENTS MENUITEM "&S�k...", CMD_HELP_SEARCH - MENUITEM "Anv�ndningen &av hj�lp", CMD_HELP_ON_HELP + MENUITEM "Anv�ndning &av hj�lp", CMD_HELP_ON_HELP MENUITEM SEPARATOR POPUP "Inf&ormation" { MENUITEM "&Licens...", CMD_LICENSE @@ -70,11 +70,11 @@ POPUP "&Hj�lp" { DIALOG_PAGESETUP DIALOG 0, 0, 225, 95 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" -CAPTION "Sid Layout" +CAPTION "Sidlayout" { -LTEXT "&Huvudnot:", 0x140, 10, 07, 40, 15 +LTEXT "&Sidhuvud:", 0x140, 10, 07, 40, 15 EDITTEXT IDC_PAGESETUP_HEADERVALUE, 60, 05,110, 12, WS_BORDER | WS_TABSTOP -LTEXT "&Fotnot:", 0x142, 10, 24, 40, 15 +LTEXT "&Sidfot:", 0x142, 10, 24, 40, 15 EDITTEXT IDC_PAGESETUP_FOOTERVALUE, 60, 22,110, 12, WS_BORDER | WS_TABSTOP GROUPBOX "Kanter:", 0x144, 10, 43,160, 45 @@ -95,29 +95,29 @@ PUSHBUTTON "&Hj�lp", IDHELP, 180, 39, 40, 15, WS_TABSTOP STRINGTABLE DISCARDABLE { STRING_PAGESETUP_HEADERVALUE, "&f" -STRING_PAGESETUP_FOOTERVALUE, "Page &p" +STRING_PAGESETUP_FOOTERVALUE, "Sida &p" STRING_NOTEPAD, "Anteckningar" STRING_ERROR, "FEL" STRING_WARNING, "WARNING" STRING_INFO, "Information" -STRING_UNTITLED, "(untitled)" +STRING_UNTITLED, "(namnl�s)" STRING_ALL_FILES, "Alla filer (*.*)" -STRING_TEXT_FILES_TXT, "Text filer (*.txt)" +STRING_TEXT_FILES_TXT, "Textfiler (*.txt)" STRING_TOOLARGE, "Filen '%s' �r f�r stor f�r notepad.\n \ -Anv�nd en annan editor." +Anv�nd en annan redigerare." STRING_NOTEXT, "Du skrev inte in n�gon text. \ \nSkriv n�got och f�rs�k sedan igen" -STRING_DOESNOTEXIST, "File '%s'\ndoes not exist\n\n \ -Do you want to create a new file ?" -STRING_NOTSAVED, "File '%s'\nhas been modified\n\n \ -Would you like to save the changes ?" +STRING_DOESNOTEXIST, "Filen '%s'\nfinns inte\n\n \ +Vill du skapa en ny fil?" +STRING_NOTSAVED, "Filen '%s'\nhar �ndrats\n\n \ +Vill du spara �ndringarna?" STRING_NOTFOUND, "'%s' hittades inte." -STRING_OUT_OF_MEMORY, "Inte tillr�kligt med minne f�r att slutf�ra \ -den h�r uppgiften. \nAvsluta ett eller flera program f�r att �ka m�ngden \nfritt \ +STRING_OUT_OF_MEMORY, "Inte tillr�ckligt med minne f�r att slutf�ra \ +den h�r uppgiften. \nAvsluta ett eller flera program f�r att �ka m�ngden \nledigt \ minne." } diff --git a/programs/notepad/rsrc.rc b/programs/notepad/rsrc.rc index 119ede1..f737178 100644 --- a/programs/notepad/rsrc.rc +++ b/programs/notepad/rsrc.rc @@ -67,7 +67,7 @@ IDI_NOTEPAD ICON "notepad.ico" #include "Ru.rc" #include "Si.rc" #include "Sk.rc" -#include "Sw.rc" +#include "Sv.rc" #include "Th.rc" #include "Tr.rc" #include "Wa.rc"

1 0

Dan Hipschman : widl: Use new functions need_proxy and need_stub to clean up code and avoid generating unnecessary files .
by Alexandre Julliard 16 Oct '07

16 Oct '07

Module: wine Branch: master Commit: f173addbef6759a5782023a5ac5da843e0b790fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=f173addbef6759a5782023a5a… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Mon Oct 15 18:06:33 2007 -0700 widl: Use new functions need_proxy and need_stub to clean up code and avoid generating unnecessary files. --- tools/widl/client.c | 10 ++++---- tools/widl/header.h | 4 +++ tools/widl/proxy.c | 51 +++++++++++++++++++++++++++++++++++++++---------- tools/widl/server.c | 10 ++++---- tools/widl/typegen.c | 26 ++++++++++++------------ tools/widl/typegen.h | 12 ++++++---- 6 files changed, 74 insertions(+), 39 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f173addbef6759a578202…

1 0

Andrew Talbot : msiexec: Fix a memory leak.
by Alexandre Julliard 16 Oct '07

16 Oct '07

Module: wine Branch: master Commit: 691dc735fdcbf89f463a0ec0a346ba65cfc4402e URL: http://source.winehq.org/git/wine.git/?a=commit;h=691dc735fdcbf89f463a0ec0a… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Oct 15 20:29:19 2007 +0100 msiexec: Fix a memory leak. --- programs/msiexec/msiexec.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/msiexec/msiexec.c b/programs/msiexec/msiexec.c index 71e81c8..bdb1b90 100644 --- a/programs/msiexec/msiexec.c +++ b/programs/msiexec/msiexec.c @@ -487,6 +487,7 @@ static BOOL process_args_from_reg( LPWSTR ident, int *pargc, WCHAR ***pargv ) process_args(buf, pargc, pargv); ret = TRUE; } + HeapFree(GetProcessHeap(), 0, buf); } RegCloseKey(hkeyArgs); return ret;

1 0

Lei Zhang : comctl32: Monthcal should send notifications when today link gets clicked.
by Alexandre Julliard 16 Oct '07

16 Oct '07

Module: wine Branch: master Commit: d81b6fa8c765926fd13977e2ff5bd65115432914 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d81b6fa8c765926fd13977e2f… Author: Lei Zhang <thestig(a)google.com> Date: Sun Oct 14 18:25:45 2007 -0700 comctl32: Monthcal should send notifications when today link gets clicked. --- dlls/comctl32/monthcal.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 8a43352..8a92d42 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -1475,6 +1475,8 @@ MONTHCAL_LButtonDown(MONTHCAL_INFO *infoPtr, LPARAM lParam) } if(hit == MCHT_TODAYLINK) { + NMSELCHANGE nmsc; + infoPtr->curSelDay = infoPtr->todaysDate.wDay; infoPtr->firstSelDay = infoPtr->todaysDate.wDay; infoPtr->currentMonth=infoPtr->todaysDate.wMonth; @@ -1482,6 +1484,16 @@ MONTHCAL_LButtonDown(MONTHCAL_INFO *infoPtr, LPARAM lParam) MONTHCAL_CopyTime(&infoPtr->todaysDate, &infoPtr->minSel); MONTHCAL_CopyTime(&infoPtr->todaysDate, &infoPtr->maxSel); InvalidateRect(infoPtr->hwndSelf, NULL, FALSE); + + nmsc.nmhdr.hwndFrom = infoPtr->hwndSelf; + nmsc.nmhdr.idFrom = GetWindowLongPtrW(infoPtr->hwndSelf, GWLP_ID); + nmsc.nmhdr.code = MCN_SELCHANGE; + MONTHCAL_CopyTime(&infoPtr->minSel, &nmsc.stSelStart); + MONTHCAL_CopyTime(&infoPtr->maxSel, &nmsc.stSelEnd); + SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, (WPARAM)nmsc.nmhdr.idFrom, (LPARAM)&nmsc); + + nmsc.nmhdr.code = MCN_SELECT; + SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, (WPARAM)nmsc.nmhdr.idFrom,(LPARAM)&nmsc); return 0; } if(hit == MCHT_CALENDARDATE) {

1 0

Lei Zhang : comctl32: Correct monthcal WM_LBUTTONDOWN return values.
by Alexandre Julliard 16 Oct '07

16 Oct '07

Module: wine Branch: master Commit: 76949d377838e0fabe553b321043226eca65c21f URL: http://source.winehq.org/git/wine.git/?a=commit;h=76949d377838e0fabe553b321… Author: Lei Zhang <thestig(a)google.com> Date: Sun Oct 14 17:45:37 2007 -0700 comctl32: Correct monthcal WM_LBUTTONDOWN return values. --- dlls/comctl32/monthcal.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 7d40a71..8a43352 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -1415,14 +1415,14 @@ MONTHCAL_LButtonDown(MONTHCAL_INFO *infoPtr, LPARAM lParam) infoPtr->status = MC_NEXTPRESSED; SetTimer(infoPtr->hwndSelf, MC_NEXTMONTHTIMER, MC_NEXTMONTHDELAY, 0); InvalidateRect(infoPtr->hwndSelf, NULL, FALSE); - return TRUE; + return 0; } if(hit == MCHT_TITLEBTNPREV){ MONTHCAL_GoToPrevMonth(infoPtr); infoPtr->status = MC_PREVPRESSED; SetTimer(infoPtr->hwndSelf, MC_PREVMONTHTIMER, MC_NEXTMONTHDELAY, 0); InvalidateRect(infoPtr->hwndSelf, NULL, FALSE); - return TRUE; + return 0; } if(hit == MCHT_TITLEMONTH) { @@ -1471,7 +1471,7 @@ MONTHCAL_LButtonDown(MONTHCAL_INFO *infoPtr, LPARAM lParam) SendMessageW( infoPtr->hWndYearUpDown, UDM_SETRANGE, (WPARAM) 0, MAKELONG (9999, 1753)); SendMessageW( infoPtr->hWndYearUpDown, UDM_SETBUDDY, (WPARAM) infoPtr->hWndYearEdit, (LPARAM)0 ); SendMessageW( infoPtr->hWndYearUpDown, UDM_SETPOS, (WPARAM) 0,(LPARAM)infoPtr->currentYear ); - return TRUE; + return 0; } if(hit == MCHT_TODAYLINK) { @@ -1482,7 +1482,7 @@ MONTHCAL_LButtonDown(MONTHCAL_INFO *infoPtr, LPARAM lParam) MONTHCAL_CopyTime(&infoPtr->todaysDate, &infoPtr->minSel); MONTHCAL_CopyTime(&infoPtr->todaysDate, &infoPtr->maxSel); InvalidateRect(infoPtr->hwndSelf, NULL, FALSE); - return TRUE; + return 0; } if(hit == MCHT_CALENDARDATE) { SYSTEMTIME selArray[2]; @@ -1515,10 +1515,10 @@ MONTHCAL_LButtonDown(MONTHCAL_INFO *infoPtr, LPARAM lParam) infoPtr->firstSelDay = ht.st.wDay; infoPtr->curSelDay = ht.st.wDay; infoPtr->status = MC_SEL_LBUTDOWN; - return TRUE; + return 0; } - return 0; + return 1; }

1 0

Lei Zhang : comctl32: Select today's date when the today link is clicked.
by Alexandre Julliard 16 Oct '07

16 Oct '07

Module: wine Branch: master Commit: e58e4679b5c745f4d4c450088fe617d28306ea3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e58e4679b5c745f4d4c450088… Author: Lei Zhang <thestig(a)google.com> Date: Sun Oct 14 17:44:15 2007 -0700 comctl32: Select today's date when the today link is clicked. --- dlls/comctl32/monthcal.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 83da9ad..7d40a71 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -1475,8 +1475,12 @@ MONTHCAL_LButtonDown(MONTHCAL_INFO *infoPtr, LPARAM lParam) } if(hit == MCHT_TODAYLINK) { + infoPtr->curSelDay = infoPtr->todaysDate.wDay; + infoPtr->firstSelDay = infoPtr->todaysDate.wDay; infoPtr->currentMonth=infoPtr->todaysDate.wMonth; infoPtr->currentYear=infoPtr->todaysDate.wYear; + MONTHCAL_CopyTime(&infoPtr->todaysDate, &infoPtr->minSel); + MONTHCAL_CopyTime(&infoPtr->todaysDate, &infoPtr->maxSel); InvalidateRect(infoPtr->hwndSelf, NULL, FALSE); return TRUE; }

1 0

Lei Zhang : comctl32: Monthcal today link test.
by Alexandre Julliard 16 Oct '07

16 Oct '07

Module: wine Branch: master Commit: 734600e272efddb9153df425269814e2ae4a2cf9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=734600e272efddb9153df4252… Author: Lei Zhang <thestig(a)google.com> Date: Sun Oct 14 17:04:08 2007 -0700 comctl32: Monthcal today link test. --- dlls/comctl32/tests/monthcal.c | 71 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 71 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index 9deef21..a495919 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -221,6 +221,18 @@ static const struct message monthcal_hit_test_seq[] = { { 0 } }; +static const struct message monthcal_todaylink_seq[] = { + { MCM_HITTEST, sent|wparam, 0}, + { MCM_SETTODAY, sent|wparam, 0}, + { WM_PAINT, sent|wparam|lparam|defwinproc, 0, 0}, + { MCM_GETTODAY, sent|wparam, 0}, + { WM_LBUTTONDOWN, sent|wparam|lparam, MK_LBUTTON, MAKELONG(70, 370)}, + { WM_CAPTURECHANGED, sent|wparam|lparam|defwinproc, 0, 0}, + { WM_PAINT, sent|wparam|lparam|defwinproc, 0, 0}, + { MCM_GETCURSEL, sent|wparam, 0}, + { 0 } +}; + static const struct message monthcal_today_seq[] = { { MCM_SETTODAY, sent|wparam, 0}, { WM_PAINT, sent|wparam|lparam|defwinproc, 0, 0}, @@ -896,6 +908,64 @@ static void test_monthcal_HitTest(HWND hwnd) ok_sequence(sequences, MONTHCAL_SEQ_INDEX, monthcal_hit_test_seq, "monthcal hit test", TRUE); } +static void test_monthcal_todaylink(HWND hwnd) +{ + MCHITTESTINFO mchit; + SYSTEMTIME st_test, st_new; + BOOL error = FALSE; + int res; + + memset(&mchit, 0, sizeof(MCHITTESTINFO)); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + /* (70, 370) is in active area - today link */ + mchit.cbSize = sizeof(MCHITTESTINFO); + mchit.pt.x = 70; + mchit.pt.y = 370; + res = SendMessage(hwnd, MCM_HITTEST, 0, (LPARAM) & mchit); + expect(70, mchit.pt.x); + expect(370, mchit.pt.y); + expect(mchit.uHit, res); + todo_wine {expect(MCHT_TODAYLINK, res);} + if (70 != mchit.pt.x || 370 != mchit.pt.y || mchit.uHit != res + || MCHT_TODAYLINK != res) + error = TRUE; + + st_test.wDay = 1; + st_test.wMonth = 1; + st_test.wYear = 2005; + memset(&st_new, 0, sizeof(SYSTEMTIME)); + + SendMessage(hwnd, MCM_SETTODAY, 0, (LPARAM)&st_test); + + res = SendMessage(hwnd, MCM_GETTODAY, 0, (LPARAM)&st_new); + expect(1, res); + expect(1, st_new.wDay); + expect(1, st_new.wMonth); + expect(2005, st_new.wYear); + if (1 != res || 1 != st_new.wDay || 1 != st_new.wMonth + || 2005 != st_new.wYear) + error = TRUE; + + if (error) { + skip("cannot perform today link test\n"); + return; + } + + res = SendMessage(hwnd, WM_LBUTTONDOWN, MK_LBUTTON, MAKELONG(70, 370)); + expect(0, res); + + memset(&st_new, 0, sizeof(SYSTEMTIME)); + res = SendMessage(hwnd, MCM_GETCURSEL, 0, (LPARAM)&st_new); + expect(1, res); + expect(1, st_new.wDay); + expect(1, st_new.wMonth); + expect(2005, st_new.wYear); + + ok_sequence(sequences, MONTHCAL_SEQ_INDEX, monthcal_todaylink_seq, "monthcal hit test", TRUE); +} + static void test_monthcal_today(HWND hwnd) { SYSTEMTIME st_test, st_new; @@ -1063,6 +1133,7 @@ START_TEST(monthcal) test_monthcal_scroll(hwnd); test_monthcal_monthrange(hwnd); test_monthcal_HitTest(hwnd); + test_monthcal_todaylink(hwnd); flush_sequences(sequences, NUM_MSG_SEQUENCES); DestroyWindow(hwnd);

1 0

Lei Zhang : comctl32: Simplify monthcal test.
by Alexandre Julliard 16 Oct '07

16 Oct '07

Module: wine Branch: master Commit: 3accf13ec0882ca66820d00c77f9892ae6cd0d17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3accf13ec0882ca66820d00c7… Author: Lei Zhang <thestig(a)google.com> Date: Sun Oct 14 15:32:29 2007 -0700 comctl32: Simplify monthcal test. --- dlls/comctl32/tests/monthcal.c | 21 ++++----------------- 1 files changed, 4 insertions(+), 17 deletions(-) diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index b78f70e..9deef21 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -124,7 +124,6 @@ static const struct message monthcal_color_seq[] = { static const struct message monthcal_curr_date_seq[] = { { MCM_SETCURSEL, sent|wparam, 0}, { WM_PAINT, sent|wparam|lparam|defwinproc, 0, 0}, - { WM_NCPAINT, sent|wparam|lparam|defwinproc, 1, 0}, { WM_ERASEBKGND, sent|lparam|defwinproc, 0}, { MCM_SETCURSEL, sent|wparam, 0}, { MCM_SETCURSEL, sent|wparam, 0}, @@ -202,11 +201,6 @@ static const struct message monthcal_unicode_seq[] = { static const struct message monthcal_hit_test_seq[] = { { MCM_SETCURSEL, sent|wparam, 0}, { WM_PAINT, sent|wparam|lparam|defwinproc, 0, 0}, - { WM_NCPAINT, sent|wparam|lparam|defwinproc, 1, 0}, - { WM_ERASEBKGND, sent|lparam|defwinproc, 0}, - { WM_SETFONT, sent|lparam, 0, 0}, - { WM_PAINT, sent|wparam|lparam|defwinproc, 0, 0}, - { WM_ERASEBKGND, sent|lparam|defwinproc, 0}, { MCM_HITTEST, sent|wparam, 0}, { MCM_HITTEST, sent|wparam, 0}, { MCM_HITTEST, sent|wparam, 0}, @@ -230,8 +224,6 @@ static const struct message monthcal_hit_test_seq[] = { static const struct message monthcal_today_seq[] = { { MCM_SETTODAY, sent|wparam, 0}, { WM_PAINT, sent|wparam|lparam|defwinproc, 0, 0}, - { WM_NCPAINT, sent|wparam|lparam|defwinproc, 1, 0}, - { WM_ERASEBKGND, sent|lparam|defwinproc, 0}, { MCM_GETTODAY, sent|wparam, 0}, { MCM_SETTODAY, sent|wparam, 0}, { WM_PAINT, sent|wparam|lparam|defwinproc, 0, 0}, @@ -714,15 +706,12 @@ static void test_monthcal_unicode(HWND hwnd) ok_sequence(sequences, MONTHCAL_SEQ_INDEX, monthcal_unicode_seq, "monthcal unicode", FALSE); } -static void test_monthcal_HitTest(HWND parent_wnd) +static void test_monthcal_HitTest(HWND hwnd) { MCHITTESTINFO mchit; int res; - HWND hwnd; SYSTEMTIME st; - hwnd = create_monthcal_control(WS_CHILD | WS_BORDER | WS_VISIBLE, parent_wnd); - assert(hwnd); memset(&mchit, 0, sizeof(MCHITTESTINFO)); flush_sequences(sequences, NUM_MSG_SEQUENCES); @@ -739,8 +728,6 @@ static void test_monthcal_HitTest(HWND parent_wnd) res = SendMessage(hwnd, MCM_SETCURSEL, 0, (LPARAM)&st); expect(1,res); - SendMessage(hwnd, WM_SETFONT, (WPARAM)GetStockObject(SYSTEM_FONT), 0); - /* (0, 0) is the top left of the control and should not be active */ mchit.cbSize = sizeof(MCHITTESTINFO); mchit.pt.x = 0; @@ -907,8 +894,6 @@ static void test_monthcal_HitTest(HWND parent_wnd) todo_wine {expect(MCHT_TODAYLINK, res);} ok_sequence(sequences, MONTHCAL_SEQ_INDEX, monthcal_hit_test_seq, "monthcal hit test", TRUE); - - DestroyWindow(hwnd); } static void test_monthcal_today(HWND hwnd) @@ -1068,14 +1053,16 @@ START_TEST(monthcal) assert(hwnd); ok_sequence(sequences, PARENT_SEQ_INDEX, create_monthcal_control_seq, "create monthcal control", TRUE); + SendMessage(hwnd, WM_SETFONT, (WPARAM)GetStockObject(SYSTEM_FONT), 0); + test_monthcal_color(hwnd); test_monthcal_currDate(hwnd); test_monthcal_firstDay(hwnd); test_monthcal_unicode(hwnd); - test_monthcal_HitTest(parent_wnd); test_monthcal_today(hwnd); test_monthcal_scroll(hwnd); test_monthcal_monthrange(hwnd); + test_monthcal_HitTest(hwnd); flush_sequences(sequences, NUM_MSG_SEQUENCES); DestroyWindow(hwnd);

1 0

Bang Jun-young : version: Use the official NT macro rather than obsolete one.
by Alexandre Julliard 16 Oct '07

16 Oct '07

Module: wine Branch: master Commit: a290263860ccb747cfe1f8cab7ff9c91c953117b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a290263860ccb747cfe1f8cab… Author: Bang Jun-young <junyoung(a)mogua.com> Date: Mon Oct 15 17:56:57 2007 +0900 version: Use the official NT macro rather than obsolete one. --- dlls/version/resource.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/version/resource.c b/dlls/version/resource.c index 08e4098..03076d8 100644 --- a/dlls/version/resource.c +++ b/dlls/version/resource.c @@ -289,7 +289,7 @@ static BOOL find_pe_resource( HFILE lzfd, LPCSTR typeid, LPCSTR resid, pehdoffset = LZSeek( lzfd, 0, SEEK_CUR ); if ( sizeof(pehd) != LZRead( lzfd, (LPSTR)&pehd, sizeof(pehd) ) ) return 0; - resDataDir = pehd.OptionalHeader.DataDirectory+IMAGE_FILE_RESOURCE_DIRECTORY; + resDataDir = pehd.OptionalHeader.DataDirectory+IMAGE_DIRECTORY_ENTRY_RESOURCE; if ( !resDataDir->Size ) { TRACE("No resources in PE dll\n" );

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 2007