December 2007 - Wine-Commits

Alexandre Julliard : winhelp: Use system colors instead of hardcoded colors .
by Alexandre Julliard Dec. 6, 2007

Dec. 6, 2007

Module: wine Branch: master Commit: 5393b7a675bfb0181e7888c0415e929d5d3e4a37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5393b7a675bfb0181e7888c04… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 6 12:06:47 2007 +0100 winhelp: Use system colors instead of hardcoded colors. --- programs/winhelp/winhelp.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/winhelp/winhelp.c b/programs/winhelp/winhelp.c index 0b7e2dc..fa0014a 100644 --- a/programs/winhelp/winhelp.c +++ b/programs/winhelp/winhelp.c @@ -326,13 +326,13 @@ static BOOL WINHELP_RegisterWinClasses(void) class_main.hInstance = Globals.hInstance; class_main.hIcon = LoadIcon(0, IDI_APPLICATION); class_main.hCursor = LoadCursor(0, IDC_ARROW); - class_main.hbrBackground = GetStockObject(WHITE_BRUSH); + class_main.hbrBackground = (HBRUSH)(COLOR_WINDOW+1); class_main.lpszMenuName = 0; class_main.lpszClassName = MAIN_WIN_CLASS_NAME; class_button_box = class_main; class_button_box.lpfnWndProc = WINHELP_ButtonBoxWndProc; - class_button_box.hbrBackground = GetStockObject(GRAY_BRUSH); + class_button_box.hbrBackground = (HBRUSH)(COLOR_BTNFACE+1); class_button_box.lpszClassName = BUTTON_BOX_WIN_CLASS_NAME; class_text = class_main; @@ -342,7 +342,7 @@ static BOOL WINHELP_RegisterWinClasses(void) class_shadow = class_main; class_shadow.lpfnWndProc = WINHELP_ShadowWndProc; - class_shadow.hbrBackground = GetStockObject(GRAY_BRUSH); + class_shadow.hbrBackground = (HBRUSH)(COLOR_3DDKSHADOW+1); class_shadow.lpszClassName = SHADOW_WIN_CLASS_NAME; class_history = class_main;

1 0

Rob Shearman : ole32: Initialise object variable in RunningObjectTableImpl_GetObject.
by Alexandre Julliard Dec. 6, 2007

Dec. 6, 2007

Module: wine Branch: master Commit: 3328ad6eb977b5e0d0208d71f4cbca7ea4400138 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3328ad6eb977b5e0d0208d71f… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Dec 5 16:09:58 2007 +0000 ole32: Initialise object variable in RunningObjectTableImpl_GetObject. As per the rules for memory in RPC, the memory pointer to by object will be used during unmarshalling and previously it was uninitialised. (Thanks to Dan Kegel and his Valgrind runs for reporting this.) --- dlls/ole32/moniker.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/moniker.c b/dlls/ole32/moniker.c index c4975b9..cbb89e5 100644 --- a/dlls/ole32/moniker.c +++ b/dlls/ole32/moniker.c @@ -693,7 +693,7 @@ RunningObjectTableImpl_GetObject( IRunningObjectTable* iface, { RunningObjectTableImpl *This = (RunningObjectTableImpl *)iface; MonikerComparisonData *moniker_data; - InterfaceData *object; + InterfaceData *object = NULL; IrotCookie cookie; HRESULT hr; struct rot_entry *rot_entry;

1 0

Alexandre Julliard : clock: Use system colors instead of hardcoded RGB values.
by Alexandre Julliard Dec. 6, 2007

Dec. 6, 2007

Module: wine Branch: master Commit: b966b451ff0e371198cbcbb1e1a5a58e3709eff5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b966b451ff0e371198cbcbb1e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 6 12:06:31 2007 +0100 clock: Use system colors instead of hardcoded RGB values. --- programs/clock/main.c | 2 +- programs/clock/winclock.c | 15 +++++---------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/programs/clock/main.c b/programs/clock/main.c index e1d2288..55a9676 100644 --- a/programs/clock/main.c +++ b/programs/clock/main.c @@ -309,7 +309,7 @@ static VOID CLOCK_Paint(HWND hWnd) SetViewportOrgEx(dcMem, -ps.rcPaint.left, -ps.rcPaint.top, NULL); /* Erase the background */ - FillRect(dcMem, &ps.rcPaint, GetStockObject(LTGRAY_BRUSH)); + FillRect(dcMem, &ps.rcPaint, GetSysColorBrush(COLOR_3DFACE)); if(Globals.bAnalog) AnalogClock(dcMem, Globals.MaxX, Globals.MaxY, Globals.bSeconds, Globals.bWithoutTitle); diff --git a/programs/clock/winclock.c b/programs/clock/winclock.c index eb31eb1..5b53457 100644 --- a/programs/clock/winclock.c +++ b/programs/clock/winclock.c @@ -32,16 +32,11 @@ #include "windows.h" #include "winclock.h" -#define Black RGB(0,0,0) -#define Gray RGB(128,128,128) -#define LtGray RGB(192,192,192) -#define White RGB(255,255,255) - -static const COLORREF FaceColor = LtGray; -static const COLORREF HandColor = White; -static const COLORREF TickColor = White; -static const COLORREF ShadowColor = Black; -static const COLORREF BackgroundColor = LtGray; +#define FaceColor (GetSysColor(COLOR_3DFACE)) +#define HandColor (GetSysColor(COLOR_3DHIGHLIGHT)) +#define TickColor (GetSysColor(COLOR_3DHIGHLIGHT)) +#define ShadowColor (GetSysColor(COLOR_3DDKSHADOW)) +#define BackgroundColor (GetSysColor(COLOR_3DFACE)) static const int SHADOW_DEPTH = 2;

1 0

Alexander Nicolaysen Sørnes : write: Add Norwegian resources.
by Alexandre Julliard Dec. 6, 2007

Dec. 6, 2007

Module: wine Branch: master Commit: 5ca358469567237d13d61f3b5ab0012f11474419 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ca358469567237d13d61f3b5… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Dec 5 15:07:26 2007 +0100 write: Add Norwegian resources. --- programs/write/No.rc | 26 ++++++++++++++++++++++++++ programs/write/rsrc.rc | 1 + 2 files changed, 27 insertions(+), 0 deletions(-) diff --git a/programs/write/No.rc b/programs/write/No.rc new file mode 100644 index 0000000..9b5a4bd --- /dev/null +++ b/programs/write/No.rc @@ -0,0 +1,26 @@ +/* + * Norwegian Bokm�l language support + * + * Copyright (C) 2007 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 + * 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_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL + +STRINGTABLE +{ + IDS_FAILED, "Klarte ikke starte Wordpad" +} diff --git a/programs/write/rsrc.rc b/programs/write/rsrc.rc index dd7caa6..a854b1a 100644 --- a/programs/write/rsrc.rc +++ b/programs/write/rsrc.rc @@ -25,3 +25,4 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #include "En.rc" #include "Fr.rc" #include "Ko.rc" +#include "No.rc"

1 0

Alexander Nicolaysen Sørnes : mshtml: Update Norwegian resources.
by Alexandre Julliard Dec. 6, 2007

Dec. 6, 2007

Module: wine Branch: master Commit: b25bc9220ba3b8d2bcf99303b510aa570e101375 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b25bc9220ba3b8d2bcf99303b… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Dec 5 15:32:00 2007 +0100 mshtml: Update Norwegian resources. --- dlls/mshtml/No.rc | 30 +++++++++++++++++++++++------- 1 files changed, 23 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/No.rc b/dlls/mshtml/No.rc index e354820..731459e 100644 --- a/dlls/mshtml/No.rc +++ b/dlls/mshtml/No.rc @@ -1,5 +1,7 @@ /* - * Copyright 2005 Alexander N. S�rnes <alex(a)thehandofagony.com> + * Norwegian Bokm�l language support + * + * Copyright 2005-2007 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 @@ -25,13 +27,13 @@ STRINGTABLE DISCARDABLE IDS_HTMLDOCUMENT "HTML-dokument" IDS_DOWNLOADING "Laster ned . . ." IDS_INSTALLING "Installerer . . ." - } +} - ID_DWL_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 260, 85 - STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU - CAPTION "Installere Wine Gecko" - FONT 8, "MS Shell Dlg" - { +ID_DWL_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 260, 85 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Installere Wine Gecko" +FONT 8, "MS Shell Dlg" +{ LTEXT "Dette programmer pr�ver � vise en HTML-side. Wine trenger Gecko " \ "(Mozillas HTML-motor) for � vise denne siden. Velg �Installer� hvis " \ "du vil at Wine skal laste ned og installere Gecko automatisk.", ID_DWL_STATUS, 10, 10, 240, 30, SS_LEFT @@ -39,3 +41,17 @@ STRINGTABLE DISCARDABLE DEFPUSHBUTTON "&Installer", ID_DWL_INSTALL, 200, 60, 50, 15, WS_GROUP | WS_TABSTOP PUSHBUTTON "&Avbryt", IDCANCEL, 140, 60, 50, 15, WS_GROUP | WS_TABSTOP } + +IDD_HYPERLINK DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 250, 65 +STYLE DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Hyperkobling" +FONT 8, "MS Shell Dlg" +{ + GROUPBOX "Informasjon om koblingen", IDC_STATIC, 5, 5, 190, 55 + LTEXT "&Type:", IDC_STATIC, 10, 22, 20, 10 + COMBOBOX IDC_TYPE, 35, 20, 45, 100, WS_TABSTOP | WS_GROUP | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_HASSTRINGS + LTEXT "&URL:", IDC_STATIC, 10, 42, 20, 10 + EDITTEXT IDC_URL, 35, 40, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + PUSHBUTTON "OK", IDOK, 200, 10, 45, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Avbryt", IDCANCEL, 200, 28, 45, 14, WS_GROUP | WS_TABSTOP +}

1 0

Alexander Nicolaysen Sørnes : credui: Update Norwegian resources.
by Alexandre Julliard Dec. 6, 2007

Dec. 6, 2007

Module: wine Branch: master Commit: 68953bc5b31bcd5d40f9c0d6abac2076aa191c83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68953bc5b31bcd5d40f9c0d6a… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Dec 5 15:32:54 2007 +0100 credui: Update Norwegian resources. --- dlls/credui/credui_No.rc | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/credui/credui_No.rc b/dlls/credui/credui_No.rc index 8e7be89..fc7fdc3 100644 --- a/dlls/credui/credui_No.rc +++ b/dlls/credui/credui_No.rc @@ -38,3 +38,13 @@ BEGIN DEFPUSHBUTTON "OK",IDOK,97,128,50,14 PUSHBUTTON "Avbryt",IDCANCEL,156,128,50,14 END + +STRINGTABLE DISCARDABLE +{ + IDS_TITLEFORMAT "Koble til %s" + IDS_MESSAGEFORMAT "Kobler til %s" + IDS_INCORRECTPASSWORDTITLE "Klarte ikke logge p�" + IDS_INCORRECTPASSWORD "S�rg for at du oppga riktig\nbrukernavn og passord." + IDS_CAPSLOCKONTITLE "Caps Lock er p�" + IDS_CAPSLOCKON "� ha Caps Lock p� kan f�re til at du skriver inn passordet p� feil m�te.\n\nTrykk p� Caps Lock-knappen p� tastaturet for � sl� av Caps Lock f�r du\nskriver inn passordet p� nytt." +}

1 0

Alexander Nicolaysen Sørnes : browseui: Add Norwegian resources.
by Alexandre Julliard Dec. 6, 2007

Dec. 6, 2007

Module: wine Branch: master Commit: 8a00cb7be554597540c589239d20638c4bc07de3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a00cb7be554597540c589239… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Dec 5 15:11:58 2007 +0100 browseui: Add Norwegian resources. --- dlls/browseui/rsrc.rc | 1 + dlls/browseui/rsrc_No.rc | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 0 deletions(-) diff --git a/dlls/browseui/rsrc.rc b/dlls/browseui/rsrc.rc index 9bc248c..5d367bd 100644 --- a/dlls/browseui/rsrc.rc +++ b/dlls/browseui/rsrc.rc @@ -27,3 +27,4 @@ #include "rsrc_En.rc" #include "rsrc_Fr.rc" #include "rsrc_Ko.rc" +#include "rsrc_No.rc" diff --git a/dlls/browseui/rsrc_No.rc b/dlls/browseui/rsrc_No.rc new file mode 100644 index 0000000..a2eecdf --- /dev/null +++ b/dlls/browseui/rsrc_No.rc @@ -0,0 +1,40 @@ +/* + * Norwegian Bokm�l language support + * + * Copyright 2007 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 + * 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_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL + +STRINGTABLE +{ + IDS_CANCELLING "Avbryter . . ." +} + +IDD_PROGRESS_DLG DIALOG 0, 0, 260, 85 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU +CAPTION "" +FONT 8, "MS Shell Dlg" +{ + CONTROL "", IDC_ANIMATION, ANIMATE_CLASSA, 0, 12, 10, 236, 25 /* TODO: style */ + LTEXT "", IDC_TEXT_LINE, 7, 45, 250, 10, SS_LEFT|SS_NOPREFIX + LTEXT "", IDC_TEXT_LINE + 1, 7, 55, 250, 10, SS_LEFT|SS_NOPREFIX + CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASSA, WS_BORDER, 7, 65, 190, 8 + PUSHBUTTON "&Avbryt", IDCANCEL, 205, 65, 40, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE + LTEXT "", IDC_TEXT_LINE + 2, 7, 75, 190, 10, SS_LEFT|SS_NOPREFIX +}

1 0

Alexander Nicolaysen Sørnes : wineboot: Add Norwegian resources.
by Alexandre Julliard Dec. 6, 2007

Dec. 6, 2007

Module: wine Branch: master Commit: 74379bea7bc07253ee6282c130f011b050deffdf URL: http://source.winehq.org/git/wine.git/?a=commit;h=74379bea7bc07253ee6282c13… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Dec 5 15:04:30 2007 +0100 wineboot: Add Norwegian resources. --- programs/wineboot/wineboot.rc | 1 + programs/wineboot/wineboot_No.rc | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 0 deletions(-) diff --git a/programs/wineboot/wineboot.rc b/programs/wineboot/wineboot.rc index 9623c45..369eace 100644 --- a/programs/wineboot/wineboot.rc +++ b/programs/wineboot/wineboot.rc @@ -30,4 +30,5 @@ #include "wineboot_En.rc" #include "wineboot_Fr.rc" #include "wineboot_Ko.rc" +#include "wineboot_No.rc" #include "wineboot_Sv.rc" diff --git a/programs/wineboot/wineboot_No.rc b/programs/wineboot/wineboot_No.rc new file mode 100644 index 0000000..b8ce1f5 --- /dev/null +++ b/programs/wineboot/wineboot_No.rc @@ -0,0 +1,35 @@ +/* + * WineBoot Norwegian Bokm�l resources + * + * Copyright (C) 2007 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 + * 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_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL + +IDD_ENDTASK DIALOG DISCARDABLE 0, 0, 186, 71 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Venter p� program" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "Avbryt",IDCANCEL,129,49,50,15 + PUSHBUTTON "Avslutt programmet",IDOK,51,49,71,15 + LTEXT "En simulert avlogging eller avslutting har startet, men dette programmet svarer ikke.", + IDC_STATIC,7,7,172,19 + LTEXT "Hvis du avslutter programmet kan all ulagret data g� tapt.", + IDC_STATIC,7,28,172,15 +END

1 0

Alexandre Julliard : server: Partial implementation of NtQueryDirectoryObject.
by Alexandre Julliard Dec. 6, 2007

Dec. 6, 2007

Module: wine Branch: master Commit: a5e38b332df0417e748f461a6946c0dad5cd293d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5e38b332df0417e748f461a6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 5 16:57:41 2007 +0100 server: Partial implementation of NtQueryDirectoryObject. --- dlls/ntdll/om.c | 62 +++++++++++++++++++++++++++++++-------- include/wine/server_protocol.h | 21 +++++++++++++- server/directory.c | 35 ++++++++++++++++++++++ server/object.c | 18 +++++++++++ server/object.h | 1 + server/protocol.def | 11 +++++++ server/request.h | 2 + server/trace.c | 19 ++++++++++++ 8 files changed, 155 insertions(+), 14 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a5e38b332df0417e748f4…

1 0

Alexandre Julliard : server: Return correct object types in the get_directory_entry request.
by Alexandre Julliard Dec. 6, 2007

Dec. 6, 2007

1 0