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

Alexandre Julliard : Release 1.1.25.
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: a6beb5066884a4fdb7270d84c012ba8ef8a64342 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6beb5066884a4fdb7270d84c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 3 18:28:33 2009 +0200 Release 1.1.25. --- ANNOUNCE | 1294 ++++++++++++++++++++++++++++++++++++------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 777 insertions(+), 537 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a6beb5066884a4fdb7270…

1 0

Alexandre Julliard : transl: Also retrieve .mc sources from the makefile.
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: tools Branch: master Commit: cd74b5cfc59d16788f3cc2424ffb34aeaae5c4f2 URL: http://source.winehq.org/git/tools.git/?a=commit;h=cd74b5cfc59d16788f3cc242… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 3 18:07:01 2009 +0200 transl: Also retrieve .mc sources from the makefile. --- transl/scripts/checkmakefile.pl | 45 +++++++++++++++++++++++++------------- 1 files changed, 29 insertions(+), 16 deletions(-) diff --git a/transl/scripts/checkmakefile.pl b/transl/scripts/checkmakefile.pl index 0b98088..bdc9fcf 100755 --- a/transl/scripts/checkmakefile.pl +++ b/transl/scripts/checkmakefile.pl @@ -1,11 +1,15 @@ -#!/usr/bin/perl +#!/usr/bin/perl -w # Helper script - analyze one Makefile, run wrc --verify-translation # on resource files and call ver.pl to parse the results +use strict; use Cwd; use File::Basename; +# configuration parameters +my (%CONFIG, $srcdir, $objdir, $toolsdir, $workdir, $scriptsdir, $wrc); + sub shell($) { my $cmd = shift; @@ -29,13 +33,23 @@ sub mycheck } my @rcfiles; + my @srcs; foreach my $f (@files) { next if $f =~ m/^\s*$/; if ($f =~ m/version.rc$/) { - print "--- Ignoring ".$files[$i]."\n" unless (exists $ENV{"NOVERBOSE"}); + print "--- Ignoring $f\n" unless (exists $ENV{"NOVERBOSE"}); next; } + if ($f =~ m/.mc$/) + { + $f .= ".rc"; + push @srcs, "$objdir/$dir/$f"; + } + else + { + push @srcs, "$srcdir/$dir/$f"; + } push @rcfiles, $f; } return unless @rcfiles; @@ -50,7 +64,7 @@ sub mycheck $norm_fn =~ s/[^a-zA-Z0-9]/-/g; my $targets = join( " ", map { (my $ret = $_) =~ s/.rc$/.res/; $ret; } @rcfiles ); - my $srcs = join( " ", map { "$srcdir/$dir/$_"; } @rcfiles ); + my $srcs = join( " ", @srcs ); my $objs = join( " ", map { (my $ret = "$objdir/$dir/$_") =~ s/.rc$/.res/; $ret; } @rcfiles ); shell "make -C $objdir/$dir -s $targets"; @@ -59,7 +73,7 @@ sub mycheck if ("$dir" eq "dlls/kernel32") { shell "$scriptsdir/ver.pl \"$dir\" \"$workdir\" nonlocale $scriptsdir <$workdir/ver.txt"; - print STDERR "*** $name [$defs] (locale run)\n"; + print STDERR "*** $dir [$defs] (locale run)\n"; shell "$scriptsdir/ver.pl \"$dir\" \"$workdir\" locale $scriptsdir <$workdir/ver.txt"; } else { shell "$scriptsdir/ver.pl \"$dir\" \"$workdir\" normal $scriptsdir <$workdir/ver.txt"; @@ -117,7 +131,7 @@ if ($srcdir eq "" || $wrc eq "/tools/wrc/wrc" || $workdir eq "") die("Config entry for SOURCEROOT, WRCROOT or WORKDIR missing\n"); } -(a)makefiles = @ARGV; +my @makefiles = @ARGV; if (!@makefiles) { @makefiles = split(/\s/,`find $srcdir/ -name Makefile.in -print`); @@ -138,27 +152,26 @@ foreach my $makefile (@makefiles) } my $defs = ""; + my @files = (); open(MAKEFILE, "<$makefile") or die "cannot open $makefile"; while (<MAKEFILE>) { + while (m/\\$/) + { + chop; + chop; + $_ .= <MAKEFILE>; + } if (m/EXTRARCFLAGS\s*=\s*(.*)/) { $defs = $1; last if ($defs =~ /res16/); # 16-bit resources not supported } - if (m/^RC_SRCS *=/) + if (m/^(MC|RC)_SRCS\s*=\s*(.*)$/) { - while (m/\\$/) - { - chop; - chop; - $_ .= <MAKEFILE>; - } - m/^RC_SRCS\s*=\s*(.*)$/; - my @files = split(/\s+/, $1); - &mycheck($path,$defs,@files); - last; + push @files, split(/\s+/, $2); } } close MAKEFILE; + &mycheck($path,$defs,@files) if @files; }

1 0

Paul Vriens : notepad: Add Dutch translations.
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: 44da9ba361cbdca040e756fce2e6e22638107415 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44da9ba361cbdca040e756fce… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Jul 3 15:27:40 2009 +0200 notepad: Add Dutch translations. --- programs/notepad/Nl.rc | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/programs/notepad/Nl.rc b/programs/notepad/Nl.rc index 77ee3e1..f543b13 100644 --- a/programs/notepad/Nl.rc +++ b/programs/notepad/Nl.rc @@ -91,6 +91,14 @@ PUSHBUTTON "Annuleren", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP PUSHBUTTON "&Help", IDHELP, 180, 39, 40, 15, WS_TABSTOP } +IDD_OFN_TEMPLATE DIALOG DISCARDABLE 50,50,300,15 +STYLE DS_3DLOOK | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_BORDER +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Codering:", -1, 5,0, 50,12 + COMBOBOX IDC_OFN_ENCCOMBO, 53,0, 156,48, WS_CHILD | WS_VSCROLL | CBS_DROPDOWNLIST +END + STRINGTABLE DISCARDABLE { STRING_PAGESETUP_HEADERVALUE, "&f" @@ -117,4 +125,14 @@ Wilt u de wijzigingen opslaan?" STRING_NOTFOUND, "'%s' kan niet worden gevonden." STRING_OUT_OF_MEMORY, "Onvoldoende geheugen. \ \nSluit een of meer applicaties om de hoeveelheid\nbeschikbaar geheugen te vergroten." + +STRING_UNICODE_LE, "Unicode (UTF-16)" +STRING_UNICODE_BE, "Unicode (UTF-16 big-endian)" + +STRING_LOSS_OF_UNICODE_CHARACTERS, "%s\n\ +Dit bestand bevat Unicode tekens welke verloren zullen gaan\n\ +als dit bestand wordt opgeslagen in de %s codering.\n\ +Om deze tekens te behouden, klikt u op Annuleren en selecteert\n\ +daarna een van de Unicode-opties in de Codering keuzelijst.\n\ +Wilt u doorgaan?" }

1 0

Alexander Nicolaysen Sørnes : wordpad: Update Norwegian Bokmål translation.
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: 0bb5ab6355d22474dfe5ba61670c6ef7d2e993c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bb5ab6355d22474dfe5ba616… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Fri Jul 3 02:15:16 2009 +0200 wordpad: Update Norwegian Bokmål translation. --- programs/wordpad/No.rc | 46 +++++++++++++++++++++++++--------------------- 1 files changed, 25 insertions(+), 21 deletions(-) diff --git a/programs/wordpad/No.rc b/programs/wordpad/No.rc index 392b9d6..5a4fdbf 100644 --- a/programs/wordpad/No.rc +++ b/programs/wordpad/No.rc @@ -1,5 +1,5 @@ /* - * Copyright 2006-2008 by Alexander N. S�rnes <alex(a)thehandofagony.com> + * Copyright 2006-2009 by 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 @@ -18,6 +18,8 @@ #include "wordpad.h" +#pragma code_page(65001) + LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL IDM_MAINMENU MENU DISCARDABLE @@ -25,12 +27,12 @@ BEGIN POPUP "&Fil" BEGIN MENUITEM "&Ny...\tCtrl+N", ID_FILE_NEW - MENUITEM "&�pne...\tCtrl+O", ID_FILE_OPEN + MENUITEM "&Åpne...\tCtrl+O", ID_FILE_OPEN MENUITEM "&Lagre\tCtrl+S", ID_FILE_SAVE MENUITEM "Lagre &som...", ID_FILE_SAVEAS MENUITEM SEPARATOR MENUITEM "&Skriv ut...\tCtrl+P", ID_PRINT - MENUITEM "&Forh�ndsvisning...", ID_PREVIEW + MENUITEM "&Forhåndsvisning...", ID_PREVIEW MENUITEM "&Utskriftformat...", ID_PRINTSETUP MENUITEM SEPARATOR MENUITEM "&Avslutt", ID_FILE_EXIT @@ -46,8 +48,8 @@ BEGIN MENUITEM "&Fjern\tDEL", ID_EDIT_CLEAR MENUITEM "&Merk alt\tCtrl+A", ID_EDIT_SELECTALL MENUITEM SEPARATOR - MENUITEM "&S�k etter...\tCrtl+F", ID_FIND - MENUITEM "S�k etter &neste\tF3", ID_FIND_NEXT + MENUITEM "&Søk etter...\tCrtl+F", ID_FIND + MENUITEM "Søk etter &neste\tF3", ID_FIND_NEXT MENUITEM "E&rstatt...\tCtrl+H", ID_REPLACE MENUITEM SEPARATOR MENUITEM "S&krivebeskyttet", ID_EDIT_READONLY @@ -55,7 +57,7 @@ BEGIN MENUITEM SEPARATOR POPUP "&Ekstra" BEGIN - MENUITEM "&Info om merket omr�de", ID_EDIT_SELECTIONINFO + MENUITEM "&Info om merket område", ID_EDIT_SELECTIONINFO MENUITEM "Tegn&format", ID_EDIT_CHARFORMAT MENUITEM "Stan&dard tegnformat", ID_EDIT_DEFCHARFORMAT MENUITEM "&Avsnittformat", ID_EDIT_PARAFORMAT @@ -64,7 +66,7 @@ BEGIN END POPUP "&Vis" BEGIN - MENUITEM "Verk&t�ylinje", ID_TOGGLE_TOOLBAR + MENUITEM "Verk&tøylinje", ID_TOGGLE_TOOLBAR MENUITEM "&Formatlinje", ID_TOGGLE_FORMATBAR MENUITEM "&Linjal", ID_TOGGLE_RULER MENUITEM "&Statuslinje", ID_TOGGLE_STATUSBAR @@ -136,9 +138,9 @@ BEGIN GROUPBOX "Innrykk", -1, 10, 10, 120, 68 LTEXT "Venstre", -1, 15, 22, 40, 13 EDITTEXT IDC_PARA_LEFT, 55, 20, 60, 13 - LTEXT "H�yre", -1, 15, 40, 40, 13 + LTEXT "Høyre", -1, 15, 40, 40, 13 EDITTEXT IDC_PARA_RIGHT, 55, 38, 60, 13 - LTEXT "F�rste linje", -1, 15, 58, 40, 13 + LTEXT "Første linje", -1, 15, 58, 40, 13 EDITTEXT IDC_PARA_FIRST, 55, 56, 60, 13 LTEXT "Justering", -1, 15, 87, 40, 13 COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 60, CBS_DROPDOWNLIST @@ -169,8 +171,8 @@ BEGIN RADIOBUTTON "No line wrapping", IDC_PAGEFMT_WN, 18, 25, 117, 15 RADIOBUTTON "Bryt tekst etter v&indusbredden", IDC_PAGEFMT_WW, 18, 45, 117, 15 RADIOBUTTON "Bryt tekst etter &margen", IDC_PAGEFMT_WM, 18, 65, 117, 15 - GROUPBOX "Verkt�ylinjer", -1, 150, 10, 120, 85 - CHECKBOX "&Verkt�ylinje", IDC_PAGEFMT_TB, 160, 20, 80, 15 + GROUPBOX "Verktøylinjer", -1, 150, 10, 120, 85 + CHECKBOX "&Verktøylinje", IDC_PAGEFMT_TB, 160, 20, 80, 15 CHECKBOX "&Formatlinje", IDC_PAGEFMT_FB, 160, 38, 80, 15 CHECKBOX "&Linjal", IDC_PAGEFMT_RU, 160, 56, 80, 15 CHECKBOX "&Statuslinje", IDC_PAGEFMT_SB, 160, 74, 80, 15 @@ -195,7 +197,7 @@ END STRINGTABLE DISCARDABLE BEGIN STRING_ALIGN_LEFT, "Venstrestilt" - STRING_ALIGN_RIGHT, "H�yrestilt" + STRING_ALIGN_RIGHT, "Høyrestilt" STRING_ALIGN_CENTER, "Midtstilt" END @@ -217,7 +219,7 @@ BEGIN STRING_PREVIEW_NEXTPAGE, "Neste side" STRING_PREVIEW_PREVPAGE, "Forrige side" STRING_PREVIEW_TWOPAGES, "To sider" - STRING_PREVIEW_ONEPAGE, "�n side" + STRING_PREVIEW_ONEPAGE, "Én side" STRING_PREVIEW_CLOSE, "Lukk" END @@ -229,16 +231,18 @@ END STRINGTABLE DISCARDABLE BEGIN STRING_DEFAULT_FILENAME, "Dokument" - STRING_PROMPT_SAVE_CHANGES, "Lagre endringer i �%s�?" - STRING_SEARCH_FINISHED, "Ferdig med � s�ke i dokumentet." + STRING_PROMPT_SAVE_CHANGES, "Lagre endringer i «%s»?" + STRING_SEARCH_FINISHED, "Ferdig med å søke i dokumentet." STRING_LOAD_RICHED_FAILED, "Klarte ikke laste RichEdit-biblioteket." - STRING_SAVE_LOSEFORMATTING, "Du har valgt � lagre i rent tekstformat, noe som " \ - "vil f�re til at all formatering g�r tapt. Er du " \ - "sikker p� at du vil fortsette?" + STRING_SAVE_LOSEFORMATTING, "Du har valgt å lagre i rent tekstformat, noe som " \ + "vil føre til at all formatering går tapt. Er du " \ + "sikker på at du vil fortsette?" STRING_INVALID_NUMBER, "Ugyldig tallformat" STRING_OLE_STORAGE_NOT_SUPPORTED, "OLE storage documents are not supported" STRING_WRITE_FAILED, "Klarte ikke lagre filen." - STRING_WRITE_ACCESS_DENIED, "Du har ikke tilgang til � lagre filen." - STRING_OPEN_FAILED, "Klarte ikke �pne filen." - STRING_OPEN_ACCESS_DENIED, "Du har ikke tilgang til � �pne filen." + STRING_WRITE_ACCESS_DENIED, "Du har ikke tilgang til å lagre filen." + STRING_OPEN_FAILED, "Klarte ikke åpne filen." + STRING_OPEN_ACCESS_DENIED, "Du har ikke tilgang til å åpne filen." + STRING_PRINTING_NOT_IMPLEMENTED, "Utskriftfunksjonen er ikke laget ennå." + STRING_MAX_TAB_STOPS, "Kan ikke legge til mer enn 32 tabulatorstopp." END

1 0

Nikolay Sivov : oleacc: Add ObjectFromLresult stub.
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: b2f6b44b25a48d67467fbe3df558882af2061f68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2f6b44b25a48d67467fbe3df… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Jul 3 17:00:12 2009 +0400 oleacc: Add ObjectFromLresult stub. --- dlls/oleacc/main.c | 6 ++++++ dlls/oleacc/oleacc.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/oleacc/main.c b/dlls/oleacc/main.c index 0e7b78e..34bdb61 100644 --- a/dlls/oleacc/main.c +++ b/dlls/oleacc/main.c @@ -40,6 +40,12 @@ HRESULT WINAPI CreateStdAccessibleObject( HWND hwnd, LONG idObject, return E_NOTIMPL; } +HRESULT WINAPI ObjectFromLresult( LRESULT result, REFIID riid, WPARAM wParam, void **ppObject ) +{ + FIXME("%ld %s %ld %p\n", result, debugstr_guid(riid), wParam, ppObject ); + return E_NOTIMPL; +} + LRESULT WINAPI LresultFromObject( REFIID riid, WPARAM wParam, LPUNKNOWN pAcc ) { FIXME("%s %ld %p\n", debugstr_guid(riid), wParam, pAcc ); diff --git a/dlls/oleacc/oleacc.spec b/dlls/oleacc/oleacc.spec index 2736a3d..6ace542 100644 --- a/dlls/oleacc/oleacc.spec +++ b/dlls/oleacc/oleacc.spec @@ -16,5 +16,5 @@ @ stub IID_IAccessibleHandler @ stub LIBID_Accessibility @ stdcall LresultFromObject(ptr long ptr) -@ stub ObjectFromLresult +@ stdcall ObjectFromLresult(long ptr long ptr) @ stub WindowFromAccessibleObject

1 0

Paul Vriens : mlang/tests: Prevent messing up the codepages on Win98.
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: d61f18ef06e6c7d4a444b9ba66652e0cf4dc30eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=d61f18ef06e6c7d4a444b9ba6… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Jul 3 13:18:45 2009 +0200 mlang/tests: Prevent messing up the codepages on Win98. --- dlls/mlang/tests/mlang.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index 7a1290d..26e89a0 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -1962,6 +1962,20 @@ static void test_IsCodePageInstallable(IMultiLanguage2 *ml2) UINT i; HRESULT hr; + SetLastError(0xdeadbeef); + lstrcmpW(NULL, NULL); + if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { + /* This corruption leads (sometimes) to test failures in oleaut32 but also + * to the inability to use the Regional Settings. + * This only seems to be an issue with Win98 and IE6 (mlang version 6.0.2800.1106). + * + * A reboot restores the codepages again. + */ + win_skip("IsCodePageInstallable could mess up the codepages on Win98\n"); + return; + } + for (i = 0; i < 0xffff; i++) { hr = IMultiLanguage2_IsCodePageInstallable(ml2, i); @@ -2033,6 +2047,7 @@ START_TEST(mlang) test_multibyte_to_unicode_translations(iML2); test_IMultiLanguage2_ConvertStringFromUnicode(iML2); + test_IsCodePageInstallable(iML2); IMultiLanguage2_Release(iML2);

1 0

Alexandre Julliard : kernel32: Compile . mc files to resources as independent files.
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: d6cc6ca2c104bbddc35e0f8b5c23f873665ea6b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6cc6ca2c104bbddc35e0f8b5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 3 15:47:43 2009 +0200 kernel32: Compile .mc files to resources as independent files. --- Make.rules.in | 5 +++-- dlls/kernel32/Makefile.in | 6 +++--- dlls/kernel32/kernel.rc | 29 ----------------------------- 3 files changed, 6 insertions(+), 34 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index 7f72099..2b83943 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -118,7 +118,8 @@ IDL_GEN_HEADERS = $(IDL_H_SRCS:.idl=.h) $(IDL_C_SRCS:.idl=.h) $(IDL_I_SRCS:.idl= CLEAN_TARGETS = $(IDL_GEN_C_SRCS) $(IDL_GEN_HEADERS) $(IDL_TLB_SRCS:.idl=.tlb) $(IDL_P_SRCS:%=dlldata.c) \ $(BISON_SRCS:.y=.tab.c) $(BISON_SRCS:.y=.tab.h) $(LEX_SRCS:.l=.yy.c) $(MC_SRCS:.mc=.mc.rc) -OBJS = $(C_SRCS:.c=.o) $(BISON_SRCS:.y=.tab.o) $(LEX_SRCS:.l=.yy.o) $(IDL_GEN_C_SRCS:.c=.o) $(RC_SRCS:.rc=.res) $(EXTRA_OBJS) +OBJS = $(C_SRCS:.c=.o) $(BISON_SRCS:.y=.tab.o) $(LEX_SRCS:.l=.yy.o) $(IDL_GEN_C_SRCS:.c=.o) \ + $(RC_SRCS:.rc=.res) $(MC_SRCS:.mc=.mc.res) $(EXTRA_OBJS) LINTS = $(C_SRCS:.c=.ln) @@ -318,7 +319,7 @@ $(MC_SRCS:.mc=.mc.rc): $(WMC) $(IDL_GEN_HEADERS) $(IDL_GEN_C_SRCS) $(IDL_TLB_SRCS:.idl=.tlb): $(WIDL) -$(RC_SRCS:.rc=.res) $(RC_SRCS16:.rc=.res): $(WRC) +$(RC_SRCS:.rc=.res) $(MC_SRCS:.mc=.mc.res) $(RC_SRCS16:.rc=.res): $(WRC) $(SUBDIRS): dummy @cd $@ && $(MAKE) diff --git a/dlls/kernel32/Makefile.in b/dlls/kernel32/Makefile.in index d299df9..30fddb6 100644 --- a/dlls/kernel32/Makefile.in +++ b/dlls/kernel32/Makefile.in @@ -76,7 +76,9 @@ C_SRCS16 = \ registry16.c \ toolhelp16.c -RC_SRCS = kernel.rc +RC_SRCS = \ + locale_rc.rc \ + version.rc RC_SRCS16 = \ version16.rc @@ -95,8 +97,6 @@ EXTRASUBDIRS = nls @MAKE_DLL_RULES@ -kernel.res: $(MC_SRCS:.mc=.mc.rc) - relay16asm.o: $(WINEBUILD) $(WINEBUILD) $(WINEBUILDFLAGS) -o $@ --relay16 diff --git a/dlls/kernel32/kernel.rc b/dlls/kernel32/kernel.rc deleted file mode 100644 index 30d1dca..0000000 --- a/dlls/kernel32/kernel.rc +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright 2000 Dave Pickles - * - * 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 - */ - -#include "locale_rc.rc" - -#include "nls/winerr_deu.mc.rc" -#include "nls/winerr_enu.mc.rc" -#include "nls/winerr_fra.mc.rc" -#include "nls/winerr_kor.mc.rc" -#include "nls/winerr_nld.mc.rc" -#include "nls/winerr_nor.mc.rc" -#include "nls/winerr_plk.mc.rc" - -#include "version.rc"

1 0

Alexander Nicolaysen Sørnes : regedit: Update Norwegian Bokmål translation.
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: 55b21c404a7f32748f260971a96fb3a788d822d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55b21c404a7f32748f260971a… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Fri Jul 3 02:07:41 2009 +0200 regedit: Update Norwegian Bokmål translation. --- programs/regedit/No.rc | 67 +++++++++++++++++++++++++----------------------- 1 files changed, 35 insertions(+), 32 deletions(-) diff --git a/programs/regedit/No.rc b/programs/regedit/No.rc index 7421a03..055252f 100644 --- a/programs/regedit/No.rc +++ b/programs/regedit/No.rc @@ -1,7 +1,7 @@ /* - * Regedit Norwegian Bokm�l resources + * Regedit Norwegian Bokmål resources * - * Copyright 2005-2008 Alexander N. S�rnes <alex(a)thehandofagony.com> + * Copyright 2005-2009 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 @@ -20,6 +20,8 @@ #include "resource.h" +#pragma code_page(65001) + LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL /* @@ -46,10 +48,10 @@ BEGIN MENUITEM SEPARATOR POPUP "&Ny" BEGIN - MENUITEM "N�&kkel", ID_EDIT_NEW_KEY + MENUITEM "Nø&kkel", ID_EDIT_NEW_KEY MENUITEM SEPARATOR MENUITEM "&Strengverdi", ID_EDIT_NEW_STRINGVALUE - MENUITEM "&Bin�rverdi", ID_EDIT_NEW_BINARYVALUE + MENUITEM "&Binærverdi", ID_EDIT_NEW_BINARYVALUE MENUITEM "&DWORD-verdi", ID_EDIT_NEW_DWORDVALUE MENUITEM "&Flerstrengverdi", ID_EDIT_NEW_MULTI_STRINGVALUE END @@ -57,7 +59,7 @@ BEGIN MENUITEM "&Slett\tDel", ID_EDIT_DELETE MENUITEM "&Gi nytt navn\tF2", ID_EDIT_RENAME MENUITEM SEPARATOR - MENUITEM "&Kopier n�kkelnavn", ID_EDIT_COPYKEYNAME + MENUITEM "&Kopier nøkkelnavn", ID_EDIT_COPYKEYNAME MENUITEM SEPARATOR MENUITEM "&Finn\tCtrl+F", ID_EDIT_FIND, GRAYED MENUITEM "Finn &neste\tF3", ID_EDIT_FINDNEXT, GRAYED @@ -88,7 +90,7 @@ BEGIN POPUP "" BEGIN MENUITEM "&Endre", ID_EDIT_MODIFY - MENUITEM "Endre bin�rdata", ID_EDIT_MODIFY_BIN + MENUITEM "Endre binærdata", ID_EDIT_MODIFY_BIN MENUITEM SEPARATOR MENUITEM "&Slett\tDel", ID_EDIT_DELETE MENUITEM "&Gi nytt navn", ID_EDIT_RENAME @@ -97,10 +99,10 @@ BEGIN BEGIN POPUP "&Ny" BEGIN - MENUITEM "N�&kkel", ID_EDIT_NEW_KEY + MENUITEM "Nø&kkel", ID_EDIT_NEW_KEY MENUITEM SEPARATOR MENUITEM "&Strengverdi", ID_EDIT_NEW_STRINGVALUE - MENUITEM "&Bin�rverdi", ID_EDIT_NEW_BINARYVALUE + MENUITEM "&Binærverdi", ID_EDIT_NEW_BINARYVALUE MENUITEM "&DWORD-verdi", ID_EDIT_NEW_DWORDVALUE MENUITEM "&Flerstrengverdi", ID_EDIT_NEW_MULTI_STRINGVALUE END @@ -109,7 +111,7 @@ BEGIN MENUITEM "&Gi nytt navn\tF2", ID_EDIT_RENAME MENUITEM SEPARATOR MENUITEM "&Eksporter...", ID_EDIT_EXPORT - MENUITEM "&Kopier n�kkelnavn", ID_EDIT_COPYKEYNAME + MENUITEM "&Kopier nøkkelnavn", ID_EDIT_COPYKEYNAME MENUITEM SEPARATOR MENUITEM "&Finn\tCtrl+F", ID_EDIT_FIND, GRAYED END @@ -139,7 +141,7 @@ BEGIN LTEXT "Finn:",IDC_STATIC,5,7,119,8 EDITTEXT IDC_VALUE_NAME,40,5,125,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL LTEXT "Finn i:",IDC_STATIC,5, 22, 119, 8 -CHECKBOX "N�kler", IDC_FIND_KEYS, 5, 34, 90, 10, WS_TABSTOP | WS_GROUP | BS_AUTOCHECKBOX +CHECKBOX "Nøkler", IDC_FIND_KEYS, 5, 34, 90, 10, WS_TABSTOP | WS_GROUP | BS_AUTOCHECKBOX CHECKBOX "Verdinavn", IDC_FIND_VALUES, 5, 46, 90, 10, WS_TABSTOP | BS_AUTOCHECKBOX CHECKBOX "Verdiinnhold", IDC_FIND_CONTENT, 5, 58, 90, 10, WS_TABSTOP | BS_AUTOCHECKBOX CHECKBOX "Kun hele strenger", IDC_FIND_WHOLE, 5, 70, 90, 10, WS_TABSTOP | BS_AUTOCHECKBOX @@ -200,7 +202,7 @@ END IDD_EDIT_BINARY DIALOG DISCARDABLE 22, 17, 170, 100 STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU -CAPTION "Rediger bin�r" +CAPTION "Rediger binær" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Verdinavn:",IDC_STATIC,5,5,119,8 @@ -242,29 +244,29 @@ END STRINGTABLE DISCARDABLE BEGIN - ID_REGISTRY_MENU "Inneholder kommandoer for � arbeide med hele registeret" - ID_EDIT_MENU "Inneholder kommandoer for � redigere verdier og n�kler" - ID_VIEW_MENU "Inneholder kommanoder for � tilpasse registervinduet" - ID_FAVORITES_MENU "Inneholder kommandoer for � f� tilgang til n�kler som brukes ofte" - ID_HELP_MENU "Inneholder kommandoer for � vise hjelp og informasjon om Registerredigering" - ID_EDIT_NEW_MENU "Inneholder kommandoer for � opprette nye n�kler eller verdier" + ID_REGISTRY_MENU "Inneholder kommandoer for å arbeide med hele registeret" + ID_EDIT_MENU "Inneholder kommandoer for å redigere verdier og nøkler" + ID_VIEW_MENU "Inneholder kommanoder for å tilpasse registervinduet" + ID_FAVORITES_MENU "Inneholder kommandoer for å få tilgang til nøkler som brukes ofte" + ID_HELP_MENU "Inneholder kommandoer for å vise hjelp og informasjon om Registerredigering" + ID_EDIT_NEW_MENU "Inneholder kommandoer for å opprette nye nøkler eller verdier" END STRINGTABLE DISCARDABLE BEGIN ID_EDIT_MODIFY "Endrer verdiens data" - ID_EDIT_NEW_KEY "Legger til en ny n�kkel" + ID_EDIT_NEW_KEY "Legger til en ny nøkkel" ID_EDIT_NEW_STRINGVALUE "Legger til en ny strengverdi" - ID_EDIT_NEW_BINARYVALUE "Legger til en ny bin�rverdis" + ID_EDIT_NEW_BINARYVALUE "Legger til en ny binærverdis" ID_EDIT_NEW_DWORDVALUE "Legger til en ny dobbeltord-verdi" ID_EDIT_NEW_MULTI_STRINGVALUE "Legger til en ny flerstrengverdi" ID_REGISTRY_IMPORTREGISTRYFILE "Importerer en tekstfil inn i registeret" ID_REGISTRY_EXPORTREGISTRYFILE "Eksporterer hele eller deler av registeret til en tekstfil" ID_REGISTRY_CONNECTNETWORKREGISTRY - "Kobler til registeret p� en annen maskin" + "Kobler til registeret på en annen maskin" ID_REGISTRY_DISCONNECTNETWORKREGISTRY - "Kobler fra registeret p� en annen maskin" + "Kobler fra registeret på en annen maskin" ID_REGISTRY_PRINT "Skriver ut hele eller deler av registeret" /* ID_HELP_HELPTOPICS "Viser hjelp til Registerredigering" */ ID_HELP_ABOUT "Viser programinformasjon, versjonnummer og kopirett" @@ -273,31 +275,32 @@ END STRINGTABLE DISCARDABLE BEGIN ID_REGISTRY_EXIT "Avslutter Registerredigering" - ID_FAVORITES_ADDTOFAVORITES "Legger n�kler til i favorittlisten" - ID_FAVORITES_REMOVEFAVORITE "Fjerner n�kler fra favorittlisten" + ID_FAVORITES_ADDTOFAVORITES "Legger nøkler til i favorittlisten" + ID_FAVORITES_REMOVEFAVORITE "Fjerner nøkler fra favorittlisten" ID_VIEW_STATUSBAR "Viser eller skjuler statuslinjens" ID_VIEW_SPLIT "Endrer posisjonen til delingslinjen mellom to ruter" ID_VIEW_REFRESH "Oppdaterer vinduet" ID_EDIT_DELETE "Sletter utvalget" ID_EDIT_RENAME "Gir nytt navn til utvalget" - ID_EDIT_COPYKEYNAME "Kopierer navnet til den valgte n�kkelen til utklippstavlen" - ID_EDIT_FIND "Finner en tekststreng i en n�kkel, verdi eller data" - ID_EDIT_FINDNEXT "Finner neste treff til teksten spesifisert i forrige s�k" + ID_EDIT_COPYKEYNAME "Kopierer navnet til den valgte nøkkelen til utklippstavlen" + ID_EDIT_FIND "Finner en tekststreng i en nøkkel, verdi eller data" + ID_EDIT_FINDNEXT "Finner neste treff til teksten spesifisert i forrige søk" + ID_EDIT_EXPORT "Eksporterer den valgte greinen av registeret til en tekstfil" END STRINGTABLE DISCARDABLE BEGIN IDS_ERROR "Feil" - IDS_BAD_KEY "Klarte ikke lese n�kkelen �%s�" - IDS_BAD_VALUE "Klarte ikke lese verdien �%s�" - IDS_UNSUPPORTED_TYPE "Kan ikke redigere n�kler av typen �%u�" + IDS_BAD_KEY "Klarte ikke lese nøkkelen «%s»" + IDS_BAD_VALUE "Klarte ikke lese verdien «%s»" + IDS_UNSUPPORTED_TYPE "Kan ikke redigere nøkler av typen «%u»" IDS_TOO_BIG_VALUE "Verdien er for stor (%u)" IDS_DELETE_BOX_TITLE "Bekreft sletting av verdi" - IDS_DELETE_BOX_TEXT "Virkelig slette verdien �%s�?" + IDS_DELETE_BOX_TEXT "Virkelig slette verdien «%s»?" IDS_DELETE_BOX_TEXT_MULTIPLE "Virkelig slette disse verdiene?" - IDS_NEWKEY "Ny n�kkel #%d" + IDS_NEWKEY "Ny nøkkel #%d" IDS_NEWVALUE "Ny verdi #%d" - IDS_NOTFOUND "Fant ikke s�kestrengen �%s�" + IDS_NOTFOUND "Fant ikke søkestrengen «%s»" END STRINGTABLE DISCARDABLE

1 0

Alexandre Julliard : ntdll: Fix the formatting of the get_token_groups request for 64-bit.
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: 2e2f6af0dec4075795709d906de06efa7c5e8975 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e2f6af0dec4075795709d906… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 3 13:58:09 2009 +0200 ntdll: Fix the formatting of the get_token_groups request for 64-bit. --- dlls/ntdll/nt.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 89d796d..c457028 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -321,7 +321,7 @@ NTSTATUS WINAPI NtQueryInformationToken( struct token_groups *tg = buffer; unsigned int *attr = (unsigned int *)(tg + 1); ULONG i; - const int non_sid_portion = (sizeof(struct token_groups) + tg->count * sizeof(unsigned long)); + const int non_sid_portion = (sizeof(struct token_groups) + tg->count * sizeof(unsigned int)); SID *sids = (SID *)((char *)tokeninfo + FIELD_OFFSET( TOKEN_GROUPS, Groups[tg->count] )); ULONG needed_bytes = FIELD_OFFSET( TOKEN_GROUPS, Groups[tg->count] ) + reply->user_len - non_sid_portion;

1 0

Alexandre Julliard : oleaut32: Replace long and unsigned long by more appropriate types.
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: 8fce9369b8609664a63b8d30a8b3791f93412ce3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fce9369b8609664a63b8d30a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 3 13:48:54 2009 +0200 oleaut32: Replace long and unsigned long by more appropriate types. --- dlls/oleaut32/olefont.c | 4 ++-- dlls/oleaut32/typelib.c | 6 +++--- dlls/oleaut32/typelib2.c | 2 +- dlls/oleaut32/variant.c | 4 +++- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/oleaut32/olefont.c b/dlls/oleaut32/olefont.c index 3e00844..a9b2c04 100644 --- a/dlls/oleaut32/olefont.c +++ b/dlls/oleaut32/olefont.c @@ -132,8 +132,8 @@ struct OLEFontImpl /* * Size ratio */ - long cyLogical; - long cyHimetric; + LONG cyLogical; + LONG cyHimetric; IConnectionPoint *pPropertyNotifyCP; IConnectionPoint *pFontEventsCP; diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 10f5e23..1f104f8 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -938,7 +938,7 @@ typedef struct tagITypeLibImpl BSTR DocString; BSTR HelpFile; BSTR HelpStringDll; - unsigned long dwHelpContext; + DWORD dwHelpContext; int TypeInfoCount; /* nr of typeinfo's in librarry */ struct tagITypeInfoImpl *pTypeInfo; /* linked list of type info data */ int ctCustData; /* number of items in cust data list */ @@ -1058,8 +1058,8 @@ typedef struct tagITypeInfoImpl BSTR Name; BSTR DocString; BSTR DllName; - unsigned long dwHelpContext; - unsigned long dwHelpStringContext; + DWORD dwHelpContext; + DWORD dwHelpStringContext; /* functions */ TLBFuncDesc * funclist; /* linked list with function descriptions */ diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index b011342..0f641d4 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -760,7 +760,7 @@ static int ctl2_alloc_custdata( if (offset == -1) return offset; *((unsigned short *)&This->typelib_segment_data[MSFT_SEG_CUSTDATA][offset]) = VT_UI4; - *((unsigned long *)&This->typelib_segment_data[MSFT_SEG_CUSTDATA][offset+2]) = V_UI4(pVarVal); + *((unsigned int *)&This->typelib_segment_data[MSFT_SEG_CUSTDATA][offset+2]) = V_UI4(pVarVal); break; default: diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 7a5f325..e92a63d 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -5571,7 +5571,9 @@ HRESULT WINAPI VarMod(LPVARIANT left, LPVARIANT right, LPVARIANT result) V_VT(result) = VT_I8; V_I8(result) = V_I8(&lv) % V_I8(&rv); - TRACE("V_I8(left) == %ld, V_I8(right) == %ld, V_I8(result) == %ld\n", (long)V_I8(&lv), (long)V_I8(&rv), (long)V_I8(result)); + TRACE("V_I8(left) == %s, V_I8(right) == %s, V_I8(result) == %s\n", + wine_dbgstr_longlong(V_I8(&lv)), wine_dbgstr_longlong(V_I8(&rv)), + wine_dbgstr_longlong(V_I8(result))); /* convert left and right to the destination type */ rc = VariantChangeType(result, result, 0, resT);

1 0