wine-commits June 2010

wine-commits@winehq.org

3 participants
663 discussions

Sven Baars : oledlg: Fix Dutch translation.
by Alexandre Julliard 23 Jun '10

23 Jun '10

Module: wine Branch: master Commit: 9aa71a1fc664763076aadab3ace4ef39395bc558 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9aa71a1fc664763076aadab3a… Author: Sven Baars <sven.wine(a)gmail.com> Date: Tue Jun 22 21:19:43 2010 +0200 oledlg: Fix Dutch translation. --- dlls/oledlg/oledlg_Nl.rc | 40 +++++++++++++++++++++------------------- 1 files changed, 21 insertions(+), 19 deletions(-) diff --git a/dlls/oledlg/oledlg_Nl.rc b/dlls/oledlg/oledlg_Nl.rc index 58a63da..e81b010 100644 --- a/dlls/oledlg/oledlg_Nl.rc +++ b/dlls/oledlg/oledlg_Nl.rc @@ -22,6 +22,8 @@ LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL +#pragma code_page(65001) + UIINSERTOBJECT DIALOG DISCARDABLE 0, 0, 294, 151 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Object invoegen" @@ -36,12 +38,12 @@ BEGIN GROUPBOX "Resultaat",IDC_RESULT,7,103,208,41 CONTROL "Nieuw",IDC_CREATENEW,"Button",BS_AUTORADIOBUTTON | WS_GROUP,7,20,62,10 - CONTROL "Cre�ren",IDC_CREATECONTROL,"Button", + CONTROL "Creëren",IDC_CREATECONTROL,"Button", BS_AUTORADIOBUTTON | NOT WS_VISIBLE,7,54,62,10 CONTROL "Bestand gebruiken",IDC_CREATEFROMFILE,"Button", BS_AUTORADIOBUTTON,7,37,67,10 LTEXT "",IDC_RESULTDESC,49,112,159,23 - PUSHBUTTON "Toevoegen...",IDC_ADDCONTROL,81,88,63,14,NOT WS_VISIBLE + PUSHBUTTON "&Toevoegen...",IDC_ADDCONTROL,81,88,63,14,NOT WS_VISIBLE CONTROL "Als pictogram weergeven",IDC_ASICON,"Button",BS_AUTOCHECKBOX | WS_TABSTOP | NOT WS_VISIBLE,223,58,64,10 PUSHBUTTON "Bladeren...",IDC_BROWSE,83,53,50,14,NOT WS_VISIBLE @@ -51,10 +53,10 @@ END STRINGTABLE DISCARDABLE { - IDS_RESULTOBJDESC "Voeg een nieuw %s object in uw document" - IDS_RESULTFILEOBJDESC "Voeg de inhoud van het bestand als object in uw document zodat u het later kunt bewerken met het programma waarmee u het heeft gemaakt." + IDS_RESULTOBJDESC "Voeg een nieuw %s object in uw document in" + IDS_RESULTFILEOBJDESC "Voeg de inhoud van het bestand als object in uw document in, zodat u het later kunt bewerken met het programma waarmee u het heeft gemaakt." IDS_BROWSE "Bladeren" - IDS_NOTOLEMOD "Het bestand is geen geldig OLE bestand. Registratie is mislukt." + IDS_NOTOLEMOD "Het bestand is geen geldig OLE bestand. De registratie is mislukt." IDS_NOTOLEMODCAPTION "Toevoegen" } @@ -66,7 +68,7 @@ BEGIN LTEXT "Bron:", -1, 6, 9, 30, 8, WS_VISIBLE | WS_GROUP CONTROL "&Plakken", IDC_PS_PASTE, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_GROUP | WS_VISIBLE, 6, 38, 55, 10 - CONTROL "Plakken &Verwijzing", IDC_PS_PASTELINK, "Button", BS_AUTORADIOBUTTON | WS_VISIBLE, + CONTROL "Plak &verwijzing", IDC_PS_PASTELINK, "Button", BS_AUTORADIOBUTTON | WS_VISIBLE, 6, 63, 55, 10 LTEXT "&Als:", -1, 65, 25, 16, 8, WS_VISIBLE | WS_GROUP LISTBOX IDC_PS_PASTELIST, 65, 36, 153, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | NOT WS_VISIBLE @@ -75,25 +77,25 @@ BEGIN CONTROL "OK", IDOK, "Button", BS_DEFPUSHBUTTON | WS_TABSTOP | WS_GROUP | WS_VISIBLE, 224, 6, 66, 14 CONTROL "Annuleren", IDCANCEL, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 23, 66, 14 CONTROL "&Help", IDC_OLEUIHELP, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 42, 66, 14 - CONTROL "&Toon Als Icoon", IDC_PS_DISPLAYASICON, "Button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_VISIBLE, 224, 59, 66, 14 + CONTROL "Als pictogram &weergeven", IDC_PS_DISPLAYASICON, "Button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_VISIBLE, 224, 59, 66, 14 CONTROL "", IDC_PS_ICONDISPLAY, "Static", SS_ICON | WS_VISIBLE, 224, 75, 66, 44 - CONTROL "Verander &Icoon...", IDC_PS_CHANGEICON, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 123, 66, 14 + CONTROL "Wijzig p&ictogram...", IDC_PS_CHANGEICON, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 123, 66, 14 CONTROL "", IDC_PS_RESULTIMAGE, "Static", SS_ICON | WS_VISIBLE, 8, 101, 42, 34 - CONTROL "<< resultaat tekst komt hier >>", IDC_PS_RESULTTEXT, "Static", SS_NOPREFIX | WS_VISIBLE, 54, 100, 159, 35 + CONTROL "<< resultaattekst komt hier >>", IDC_PS_RESULTTEXT, "Static", SS_NOPREFIX | WS_VISIBLE, 54, 100, 159, 35 CONTROL "Resultaat", -1, "Button", BS_GROUPBOX | WS_GROUP | WS_VISIBLE, 6, 90, 212, 48 CONTROL "", IDC_PS_SOURCETEXT, "Edit", ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE, 37, 9, 180, 8 END STRINGTABLE DISCARDABLE { - IDS_PS_PASTE_DATA "Voegt de inhoud van het clipbord in uw document als %s." - IDS_PS_PASTE_OBJECT "Voegt de inhoud van het clipbord in uw document zodat u het kan activeren met %s." - IDS_PS_PASTE_OBJECT_AS_ICON "Voegt de inhoud van het clipbord in uw document zodat u het kan activeren met %s. Het zal getoond worden als een icoon." - IDS_PS_PASTE_LINK_DATA "Voegt de inhoud van het clipbord in uw document als %s. De data is verbonden met het bron bestand zodat wijzigingen in dat bestand worden getoond in uw document." - IDS_PS_PASTE_LINK_OBJECT "Voegt een afbeelding vanuit het clipbord in uw document. De afbeelding is verbonden met het bron bestand zodat wijzigingen in dat bestand worden getoond in uw document." - IDS_PS_PASTE_LINK_OBJECT_AS_ICON "Voegt een verwijzing in die wijst naar de locatie van de inhoud van het clipbord. De verwijzing is verbonden met het bron bestand zodat wijzigingen in dat bestand worden getoond in uw document." - IDS_PS_NON_OLE "Voegt de inhoud van het clipbord in uw document." - IDS_PS_UNKNOWN_TYPE "Onbekend Type" - IDS_PS_UNKNOWN_SRC "Onbekende Bron" - IDS_PS_UNKNOWN_APP "het programma die het gecre�erd heeft" + IDS_PS_PASTE_DATA "Voegt de inhoud van het klembord in uw document in als %s." + IDS_PS_PASTE_OBJECT "Voegt de inhoud van het klembord in uw document in zodat u het kan activeren met %s." + IDS_PS_PASTE_OBJECT_AS_ICON "Voegt de inhoud van het klembord in uw document in zodat u het kan activeren met %s. Het zal getoond worden als een icoon." + IDS_PS_PASTE_LINK_DATA "Voegt de inhoud van het klembord in uw document in als %s. De data is verbonden met het bron bestand zodat wijzigingen in dat bestand worden getoond in uw document." + IDS_PS_PASTE_LINK_OBJECT "Voegt een afbeelding vanuit het klembord in uw document in. De afbeelding is verbonden met het bronbestand, zodat wijzigingen in dat bestand worden getoond in uw document." + IDS_PS_PASTE_LINK_OBJECT_AS_ICON "Voegt een verwijzing in die wijst naar de locatie van de inhoud van het klembord. De verwijzing is verbonden met het bronbestand, zodat wijzigingen in dat bestand worden getoond in uw document." + IDS_PS_NON_OLE "Voegt de inhoud van het klembord in uw document." + IDS_PS_UNKNOWN_TYPE "Onbekend type" + IDS_PS_UNKNOWN_SRC "Onbekende bron" + IDS_PS_UNKNOWN_APP "het programma die het gecreëerd heeft" }

1 0

André Hentschel : winemaker: Don' t use deprecated -mcpu option.
by Alexandre Julliard 23 Jun '10

23 Jun '10

Module: wine Branch: master Commit: f10513b2f822291d03cdcb2ebe43cdf316ed76a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f10513b2f822291d03cdcb2eb… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jun 22 18:01:20 2010 +0200 winemaker: Don't use deprecated -mcpu option. --- tools/winemaker | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/winemaker b/tools/winemaker index 0e34245..64cf54b 100755 --- a/tools/winemaker +++ b/tools/winemaker @@ -691,19 +691,19 @@ sub source_scan_project_file($$$) # this option is always present and is already specified in the suffix rules } elsif (/^GB$/) { # Blend Optimization - $prj_target_cflags.="-mcpu=pentiumpro -D_M_IX86=500 "; + $prj_target_cflags.="-march=pentiumpro -D_M_IX86=500 "; } elsif (/^G6$/) { # Pentium Pro Optimization $prj_target_cflags.="-march=pentiumpro -D_M_IX86=600 "; } elsif (/^G5$/) { # Pentium Optimization - $prj_target_cflags.="-mcpu=pentium -D_M_IX86=500 "; + $prj_target_cflags.="-march=pentium -D_M_IX86=500 "; } elsif (/^G3$/) { # 80386 Optimization - $prj_target_cflags.="-mcpu=i386 -D_M_IX86=300 "; + $prj_target_cflags.="-march=i386 -D_M_IX86=300 "; } elsif (/^G4$/) { # 80486 Optimization - $prj_target_cflags.="-mcpu=i486 -D_M_IX86=400 "; + $prj_target_cflags.="-march=i486 -D_M_IX86=400 "; } elsif (/^Yc/) { # Create Precompiled Header } elsif (/^Yu/) {

1 0

André Hentschel : winemaker: Warn on include path starting with drive letter.
by Alexandre Julliard 23 Jun '10

23 Jun '10

Module: wine Branch: master Commit: 02efd5a7c0092fa48c0ce49c0e7352ec33fc1c7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=02efd5a7c0092fa48c0ce49c0… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jun 22 18:01:13 2010 +0200 winemaker: Warn on include path starting with drive letter. --- tools/winemaker | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/tools/winemaker b/tools/winemaker index 78034fa..0e34245 100755 --- a/tools/winemaker +++ b/tools/winemaker @@ -670,7 +670,11 @@ sub source_scan_project_file($$$) # Additional Include Directories $sfilet=$1; $sfilet=~s/\\/\//g; - push @{@$project_settings[$T_INCLUDE_PATH]},"-I".$sfilet." "; + if ($sfilet=~/^\w:/) { + print STDERR "warning: Can't fix path $sfilet\n" + } else { + push @{@$project_settings[$T_INCLUDE_PATH]},"-I".$sfilet." "; + } } elsif (/^U\s*\"(.*)\"/) { # Undefines a previously defined symbol $prj_target_cflags.="-U".$1." ";

1 0

André Hentschel : winemaker: Ignore files not found by the search function.
by Alexandre Julliard 23 Jun '10

23 Jun '10

Module: wine Branch: master Commit: f4679761b7a6385452bba6a12db9b1e3eae5ed06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4679761b7a6385452bba6a12… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jun 22 18:01:07 2010 +0200 winemaker: Ignore files not found by the search function. --- tools/winemaker | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/winemaker b/tools/winemaker index bed499d..78034fa 100755 --- a/tools/winemaker +++ b/tools/winemaker @@ -782,6 +782,7 @@ sub source_scan_project_file($$$) } elsif (/^SOURCE=(.*)$/) { my @components=split /[\/\\]+/, $1; $sfilet=search_from($path, \@components); + if (!defined $sfilet) { next; } if ($sfilet =~ /\.c$/i and $sfilet !~ /\.(dbg|spec)\.c$/) { push @sources_c,$sfilet; } elsif ($sfilet =~ /\.(cpp|cxx)$/i) {

1 0

André Hentschel : winemaker: Ignore the Global section .
by Alexandre Julliard 23 Jun '10

23 Jun '10

Module: wine Branch: master Commit: 61622fe8d1804e2fba8a7a57fda1650195411bd5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61622fe8d1804e2fba8a7a57f… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jun 22 18:01:03 2010 +0200 winemaker: Ignore the Global section. --- tools/winemaker | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tools/winemaker b/tools/winemaker index 23f800f..bed499d 100755 --- a/tools/winemaker +++ b/tools/winemaker @@ -1163,6 +1163,8 @@ sub source_scan_workspace_file($) next; } elsif (/^#/) { # ignore Comments + } elsif (/^Global:/) { + # ignore the Global section } elsif (/\w:/) { print STDERR "unknown section $_\n"; } elsif (/^Microsoft(.*)Studio(.*)File,\sFormat Version\s(.*)/) {

1 0

Francois Gouget : msvcr100: The msvcr100 debug channel is unused so remove it.
by Alexandre Julliard 23 Jun '10

23 Jun '10

Module: wine Branch: master Commit: 7735f024eabd6fa0f32df8fce2a0efdc4451cdcd URL: http://source.winehq.org/git/wine.git/?a=commit;h=7735f024eabd6fa0f32df8fce… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jun 22 17:54:19 2010 +0200 msvcr100: The msvcr100 debug channel is unused so remove it. --- dlls/msvcr100/msvcr100.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/msvcr100/msvcr100.c b/dlls/msvcr100/msvcr100.c index 735092e..274d4c7 100644 --- a/dlls/msvcr100/msvcr100.c +++ b/dlls/msvcr100/msvcr100.c @@ -23,9 +23,7 @@ #include "stdlib.h" #include "windef.h" #include "winbase.h" -#include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(msvcr100); /********************************************************************* * DllMain (MSVCR100.@)

1 0

Francois Gouget : winemenubuilder: Add a trailing '\n' to a FIXME() call.
by Alexandre Julliard 23 Jun '10

23 Jun '10

Module: wine Branch: master Commit: 4a9b52549e3d7dcb1de8ea7b97a30cf8b04d979f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a9b52549e3d7dcb1de8ea7b9… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jun 22 17:54:28 2010 +0200 winemenubuilder: Add a trailing '\n' to a FIXME() call. --- programs/winemenubuilder/winemenubuilder.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 3abfc39..c027dad 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -514,7 +514,7 @@ static BOOL SaveIconResAsPNG(const BITMAPINFO *pIcon, const char *png_filename, case 32: return SaveTrueColorIconResAsPNG(pIcon, png_filename, commentW); default: - WINE_FIXME("unsupported bpp %d, please report", pIcon->bmiHeader.biBitCount); + WINE_FIXME("unsupported bpp %d, please report\n", pIcon->bmiHeader.biBitCount); return FALSE; } }

1 0

Francois Gouget : msvcr90/tests: Make test_invalid_parameter_handler() static.
by Alexandre Julliard 23 Jun '10

23 Jun '10

Module: wine Branch: master Commit: 31f7eb790fc2f10888bbffa482051367d2ab3d33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31f7eb790fc2f10888bbffa48… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jun 22 17:52:23 2010 +0200 msvcr90/tests: Make test_invalid_parameter_handler() static. --- dlls/msvcr90/tests/msvcr90.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c index 2b4fae4..9f6e47b 100644 --- a/dlls/msvcr90/tests/msvcr90.c +++ b/dlls/msvcr90/tests/msvcr90.c @@ -44,7 +44,7 @@ int cb_called[4]; /* ########## */ -void __cdecl test_invalid_parameter_handler(const wchar_t *expression, +static void __cdecl test_invalid_parameter_handler(const wchar_t *expression, const wchar_t *function, const wchar_t *file, unsigned line, uintptr_t arg) {

1 0

Francois Gouget : ws2_32/tests: Fix a typo in a variable name.
by Alexandre Julliard 23 Jun '10

23 Jun '10

Module: wine Branch: master Commit: 1a1f1aa58865c19882b308083292f93c7c907523 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a1f1aa58865c19882b308083… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jun 22 17:52:12 2010 +0200 ws2_32/tests: Fix a typo in a variable name. --- dlls/ws2_32/tests/sock.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index c405053..9217913 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2564,7 +2564,7 @@ typedef struct async_message struct async_message *next; } async_message; -static struct async_message *messages_recieved; +static struct async_message *messages_received; #define WM_SOCKET (WM_USER+100) static LRESULT CALLBACK ws2_test_WndProc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) @@ -2579,14 +2579,14 @@ static LRESULT CALLBACK ws2_test_WndProc(HWND hwnd, UINT msg, WPARAM wparam, LPA message->lparam = lparam; message->next = NULL; - if (messages_recieved) + if (messages_received) { - struct async_message *last = messages_recieved; + struct async_message *last = messages_received; while (last->next) last = last->next; last->next = message; } else - messages_recieved = message; + messages_received = message; return 0; } @@ -2650,7 +2650,7 @@ static char *dbgstr_event_seq(const LPARAM *seq) static char *dbgstr_event_seq_result(SOCKET s, WSANETWORKEVENTS *netEvents) { static char message[1024]; - struct async_message *curr = messages_recieved; + struct async_message *curr = messages_received; int index, error, bit = 0; char name[10]; @@ -2693,7 +2693,7 @@ static char *dbgstr_event_seq_result(SOCKET s, WSANETWORKEVENTS *netEvents) static void flush_events(SOCKET s, HANDLE hEvent) { WSANETWORKEVENTS netEvents; - struct async_message *prev = NULL, *curr = messages_recieved; + struct async_message *prev = NULL, *curr = messages_received; int ret; DWORD dwRet; @@ -2714,12 +2714,12 @@ static void flush_events(SOCKET s, HANDLE hEvent) if (curr->socket == s) { if (prev) prev->next = curr->next; - else messages_recieved = curr->next; + else messages_received = curr->next; HeapFree(GetProcessHeap(), 0, curr); if (prev) curr = prev->next; - else curr = messages_recieved; + else curr = messages_received; } else { @@ -2759,7 +2759,7 @@ static int match_event_sequence(SOCKET s, WSANETWORKEVENTS *netEvents, const LPA } else { - curr = messages_recieved; + curr = messages_received; while (curr) { if (curr->socket == s)

1 0

Francois Gouget : ntdll: Fix a typo in a parameter name.
by Alexandre Julliard 23 Jun '10

23 Jun '10

Module: wine Branch: master Commit: 4c8b3b0f3db867957df46371796c58752297778c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c8b3b0f3db867957df463717… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jun 22 17:51:43 2010 +0200 ntdll: Fix a typo in a parameter name. --- dlls/ntdll/error.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/error.c b/dlls/ntdll/error.c index 5537c87..80bf787 100644 --- a/dlls/ntdll/error.c +++ b/dlls/ntdll/error.c @@ -132,7 +132,7 @@ DWORD WINAPI RtlGetLastWin32Error(void) * NtRaiseHardError (NTDLL.@) */ NTSTATUS WINAPI NtRaiseHardError( NTSTATUS ErrorStatus, ULONG NumberOfParameters, - PUNICODE_STRING UnicodeStringParameterMask, PVOID *Paramaters, + PUNICODE_STRING UnicodeStringParameterMask, PVOID *Parameters, HARDERROR_RESPONSE_OPTION ResponseOption, PHARDERROR_RESPONSE Response ) { FIXME(": stub. Errorstatus was %08x\n", ErrorStatus);

1 0

← Newer
1
...
18
19
20
21
22
23
24
...
67
Older →

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 June 2010