May 2007 - Wine-commits - list.winehq.org

Frank Richter : shell32: Update German resources.
by Alexandre Julliard 14 May '07

14 May '07

Module: wine Branch: master Commit: 7108412a5383e024f407ee72bc5ce82805112e5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7108412a5383e024f407ee72b… Author: Frank Richter <frank.richter(a)gmail.com> Date: Sun May 13 16:01:24 2007 +0200 shell32: Update German resources. --- dlls/shell32/shell32_De.rc | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/shell32_De.rc b/dlls/shell32/shell32_De.rc index d6cb815..4ea7a21 100644 --- a/dlls/shell32/shell32_De.rc +++ b/dlls/shell32/shell32_De.rc @@ -105,6 +105,19 @@ FONT 8, "MS Shell Dlg" 4, 40, 180, 120 } +SHELL_YESTOALL_MSGBOX DIALOG 200, 100, 280, 90 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Meldung" +FONT 8, "MS Shell Dlg" +{ + DEFPUSHBUTTON "&Ja", IDYES, 34, 69, 53, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Ja zu &allen", IDD_YESTOALL, 92, 69, 65, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Nein", IDNO, 162, 69, 53, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Abbrechen", IDCANCEL, 220, 69, 53, 14, WS_GROUP | WS_TABSTOP + ICON "", IDD_ICON, 10, 10, 16, 16 + LTEXT "", IDD_MESSAGE, 40, 10, 238, 52, 0 +} + SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Informationen �ber %s"

1 0

Frank Richter : cmd: Updated German translation.
by Alexandre Julliard 14 May '07

14 May '07

Module: wine Branch: master Commit: 0fa2cbab76af5eab1c7827d2fafeca061b74988e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fa2cbab76af5eab1c7827d2f… Author: Frank Richter <frank.richter(a)gmail.com> Date: Sun May 13 16:13:18 2007 +0200 cmd: Updated German translation. --- programs/cmd/De.rc | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 deletions(-) diff --git a/programs/cmd/De.rc b/programs/cmd/De.rc index 05c4326..9d2802d 100644 --- a/programs/cmd/De.rc +++ b/programs/cmd/De.rc @@ -215,6 +215,13 @@ Das Verify Flag hat keine Funktion in Wine.\n" WCMD_VOL, "Hilfe f�r VOL\n" + WCMD_PUSHD, "PUSHD <Verzeichnisname> speichert das aktuelle\n\ +Verzeichnis auf einem Stack und wecheselt das Arbeitsverzeichnis\n\ +zu dem angegebenen.\n" + + WCMD_POPD, "POPD wechselt das Arbeitsverzeichnis zu dem zuletzt\n\ +mit PUSHD gespeicherten.\n" + WCMD_MORE, "MORE displays output of files or piped input in pages.\n" WCMD_EXIT, @@ -251,11 +258,11 @@ EXIT\t\tBeendet den CMD\n\n\ Geben Sie HELP <Befehl> ein, damit Sie weitere Informationen f�r einen der\n\ obigen Befehle erhalten.\n" - WCMD_CONFIRM, "Are you sure" - WCMD_YES, "Y" + WCMD_CONFIRM, "Sind sie sicher" + WCMD_YES, "J" WCMD_NO, "N" - WCMD_NOASSOC, "File association missing for extension %s\n" - WCMD_NOFTYPE, "No open command associated with file type '%s'\n" + WCMD_NOASSOC, "Verkn�pfung f�r Dateiendung %s fehlt\n" + WCMD_NOFTYPE, "Kein Befehl zum �ffnen f�r Dateityp '%s'\n" WCMD_OVERWRITE, "Overwrite" WCMD_MORESTR, "More..." }

1 0

Frank Richter : wordpad: Update German translation.
by Alexandre Julliard 14 May '07

14 May '07

Module: wine Branch: master Commit: 8cdfff10f4eb7e5ce2831c72480cf91a8fcc02fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cdfff10f4eb7e5ce2831c724… Author: Frank Richter <frank.richter(a)gmail.com> Date: Sun May 13 16:29:08 2007 +0200 wordpad: Update German translation. --- programs/wordpad/De.rc | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/programs/wordpad/De.rc b/programs/wordpad/De.rc index 1d58b7b..6d973ab 100644 --- a/programs/wordpad/De.rc +++ b/programs/wordpad/De.rc @@ -66,3 +66,10 @@ BEGIN END END END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_RICHTEXT_FILES_RTF, "Rich-Text-Format (*.rtf)" + STRING_TEXT_FILES_TXT, "Textdateien (*.txt)" + STRING_ALL_FILES, "Alle Dokumente (*.*)" +END

1 0

Dan Hipschman : widl: Remove an unnecessary assignment in write_pointers.
by Alexandre Julliard 14 May '07

14 May '07

Module: wine Branch: master Commit: faf50715493df83b38e43176cb2d13c4149a0ed9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=faf50715493df83b38e43176c… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Fri May 11 17:26:43 2007 -0700 widl: Remove an unnecessary assignment in write_pointers. --- tools/widl/typegen.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index e8385ec..3bd133b 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -728,8 +728,7 @@ static int write_pointers(FILE *file, const attr_list_t *attrs, } else { - pointers_written = write_pointers(file, attrs, type->ref, array, - level + 1, typestring_offset); + write_pointers(file, attrs, type->ref, array, level + 1, typestring_offset); if (1 < level) {

1 0

Dan Hipschman : widl: Handle pointers fields that point to structures.
by Alexandre Julliard 14 May '07

14 May '07

Module: wine Branch: master Commit: d9c120490fbea62f5696ed99c7f4d8390f9dfef4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9c120490fbea62f5696ed99c… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Fri May 11 17:27:40 2007 -0700 widl: Handle pointers fields that point to structures. --- dlls/rpcrt4/tests/server.c | 9 +++++++++ dlls/rpcrt4/tests/server.idl | 7 +++++++ tools/widl/typegen.c | 9 +++++++-- 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index 0086b97..8fd107b 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -126,6 +126,12 @@ s_ptypes_sum(ptypes_t *pt) return *pt->pc + *pt->ps + *pt->pl + *pt->pf + *pt->pd; } +int +s_dot_pvectors(pvectors_t *p) +{ + return p->pu->x * (*p->pv)->x + p->pu->y * (*p->pv)->y + p->pu->z * (*p->pv)->z; +} + void s_stop(void) { @@ -167,6 +173,8 @@ basic_tests(void) static char string[] = "I am a string"; static int f[5] = {1, 3, 0, -2, -4}; static vector_t a = {1, 3, 7}; + static vector_t vec1 = {4, -2, 1}, vec2 = {-5, 2, 3}, *pvec2 = &vec2; + static pvectors_t pvecs = {&vec1, &pvec2}; pints_t pints; ptypes_t ptypes; int i1, i2, i3, *pi2, *pi3, **ppi3; @@ -231,6 +239,7 @@ basic_tests(void) ptypes.pd = &u; ok(ptypes_sum(&ptypes) == 33.0, "RPC ptypes_sum\n"); + ok(dot_pvectors(&pvecs) == -21, "RPC dot_pvectors\n"); ok(sum_fixed_array(f) == -2, "RPC sum_fixed_array\n"); } diff --git a/dlls/rpcrt4/tests/server.idl b/dlls/rpcrt4/tests/server.idl index 4830e8c..e087f1e 100644 --- a/dlls/rpcrt4/tests/server.idl +++ b/dlls/rpcrt4/tests/server.idl @@ -47,6 +47,12 @@ interface IServer double *pd; } ptypes_t; + typedef struct + { + vector_t *pu; + vector_t **pv; + } pvectors_t; + int int_return(void); int square(int x); int sum(int x, int y); @@ -60,5 +66,6 @@ interface IServer int sum_fixed_array(int a[5]); int pints_sum(pints_t *pints); double ptypes_sum(ptypes_t *ptypes); + int dot_pvectors(pvectors_t *pvectors); void stop(void); } diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 3bd133b..d2597b3 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -675,8 +675,10 @@ static size_t write_nonsimple_pointer(FILE *file, const type_t *type, size_t off { short absoff = type->ref->typestring_offset; short reloff = absoff - (offset + 2); - print_file(file, 2, "0x%02x, 0x10,\t/* %s */\n", - type->type, string_of_type(type->type)); + int ptr_attr = is_ptr(type->ref) ? 0x10 : 0x0; + + print_file(file, 2, "0x%02x, 0x%x,\t/* %s */\n", + type->type, ptr_attr, string_of_type(type->type)); print_file(file, 2, "NdrFcShort(0x%hx),\t/* Offset= %hd (%hd) */\n", reloff, reloff, absoff); return 4; @@ -1207,6 +1209,7 @@ static size_t write_struct_tfs(FILE *file, type_t *type, write_pointers(file, NULL, type, NULL, 0, typestring_offset); start_offset = *typestring_offset; + type->typestring_offset = start_offset; if (type->type == RPC_FC_STRUCT) WRITE_FCTYPE(file, FC_STRUCT, *typestring_offset); else @@ -1249,6 +1252,7 @@ static size_t write_struct_tfs(FILE *file, type_t *type, write_pointers(file, NULL, type, NULL, 0, typestring_offset); start_offset = *typestring_offset; + type->typestring_offset = start_offset; if (type->type == RPC_FC_CSTRUCT) WRITE_FCTYPE(file, FC_CSTRUCT, *typestring_offset); else @@ -1300,6 +1304,7 @@ static size_t write_struct_tfs(FILE *file, type_t *type, has_pointers = write_pointers(file, NULL, type, NULL, 0, typestring_offset); start_offset = *typestring_offset; + type->typestring_offset = start_offset; WRITE_FCTYPE(file, FC_CVSTRUCT, *typestring_offset); /* alignment */ print_file(file, 2, "0x%02x,\n", align - 1);

1 0

Marcus Meissner : wined3d: Fixed swapchain context NULL ptr checks.
by Alexandre Julliard 14 May '07

14 May '07

Module: wine Branch: master Commit: 4b9fedbb067ca484a0e04c447cf18be6b415c49e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b9fedbb067ca484a0e04c447… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat May 12 10:22:42 2007 +0200 wined3d: Fixed swapchain context NULL ptr checks. --- dlls/wined3d/device.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 16df8a5..223cdb4 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1366,15 +1366,15 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateAdditionalSwapChain(IWineD3DDevic /** FIXME: Handle stencil appropriately via EnableAutoDepthStencil / AutoDepthStencilFormat **/ object->context = HeapAlloc(GetProcessHeap(), 0, sizeof(object->context)); - if(!object->context) { - } + if(!object->context) + return E_OUTOFMEMORY; object->num_contexts = 1; ENTER_GL(); object->context[0] = CreateContext(This, (IWineD3DSurfaceImpl *) object->frontBuffer, display, object->win); LEAVE_GL(); - if (!object->context) { + if (!object->context[0]) { ERR("Failed to create a new context\n"); hr = WINED3DERR_NOTAVAILABLE; goto error; @@ -1517,9 +1517,8 @@ error: HeapFree(GetProcessHeap(), 0, object->backBuffer); object->backBuffer = NULL; } - if(object->context) { + if(object->context[0]) DestroyContext(This, object->context[0]); - } if(object->frontBuffer) { IWineD3DSurface_GetParent(object->frontBuffer, &bufferParent); IUnknown_Release(bufferParent); /* once for the get parent */

1 0

Francois Gouget : ddraw/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard 14 May '07

14 May '07

Module: wine Branch: master Commit: 72ed2149326f7570f41b9efa3b4cad1bfd44651c URL: http://source.winehq.org/git/wine.git/?a=commit;h=72ed2149326f7570f41b9efa3… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat May 12 23:06:51 2007 +0200 ddraw/tests: Fix compilation on systems that don't support nameless unions. --- dlls/ddraw/tests/dsurface.c | 64 +++++++++++++++++++++--------------------- 1 files changed, 32 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=72ed2149326f7570f41b9…

1 0

Andrew Talbot : advapi32: Fix a typo.
by Alexandre Julliard 14 May '07

14 May '07

Module: wine Branch: master Commit: eb48a472602cb232a6513f0d3085ddd2d78efe59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb48a472602cb232a6513f0d3… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat May 12 23:09:58 2007 +0100 advapi32: Fix a typo. --- dlls/advapi32/advapi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/advapi.c b/dlls/advapi32/advapi.c index 126f8d1..b92d3de 100644 --- a/dlls/advapi32/advapi.c +++ b/dlls/advapi32/advapi.c @@ -120,7 +120,7 @@ BOOL WINAPI GetCurrentHwProfileA(LPHW_PROFILE_INFOA pInfo) { FIXME("(%p) semi-stub\n", pInfo); pInfo->dwDockInfo = DOCKINFO_DOCKED; - strcpy(pInfo->szHwProfileGuid,"{12340001-1234-1234-1234-1233456789012}"); + strcpy(pInfo->szHwProfileGuid,"{12340001-1234-1234-1234-123456789012}"); strcpy(pInfo->szHwProfileName,"Wine Profile"); return 1; }

1 0

José Manuel Ferrer Ortiz : winecfg: Updated Spanish translation.
by Alexandre Julliard 14 May '07

14 May '07

Module: wine Branch: master Commit: d1c56cb44aa3c7ef1630a2ea08103785796ffed9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1c56cb44aa3c7ef1630a2ea0… Author: José Manuel Ferrer Ortiz <jmfo1982(a)yahoo.es> Date: Sat May 12 17:06:25 2007 -0700 winecfg: Updated Spanish translation. --- programs/winecfg/Es.rc | 204 +++++++++++++++++++++++++++--------------------- 1 files changed, 114 insertions(+), 90 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d1c56cb44aa3c7ef1630a…

1 0

Mikołaj Zalewski : localui: Add Polish translation.
by Alexandre Julliard 14 May '07

14 May '07

Module: wine Branch: master Commit: 918ee77d1ca618c40aa6972992ffdfb9038bd579 URL: http://source.winehq.org/git/wine.git/?a=commit;h=918ee77d1ca618c40aa697299… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Tue May 8 22:08:37 2007 +0200 localui: Add Polish translation. --- dlls/localui/localui.rc | 1 + dlls/localui/ui_Pl.rc | 55 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+), 0 deletions(-) diff --git a/dlls/localui/localui.rc b/dlls/localui/localui.rc index 4841708..2486342 100644 --- a/dlls/localui/localui.rc +++ b/dlls/localui/localui.rc @@ -40,3 +40,4 @@ #include "ui_De.rc" #include "ui_En.rc" +#include "ui_Pl.rc" diff --git a/dlls/localui/ui_Pl.rc b/dlls/localui/ui_Pl.rc new file mode 100644 index 0000000..74a5015 --- /dev/null +++ b/dlls/localui/ui_Pl.rc @@ -0,0 +1,55 @@ +/* + * Polish resources for localui + * + * Copyright 2007 Detlef Riekenberg + * Copyright 2007 Mikolaj Zalewski + * + * 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_POLISH, SUBLANG_DEFAULT + +ADDPORT_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 245, 47 +STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Dodaj port lokalny" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Nazwa nowego portu:", -1, 7, 13, 194, 13, WS_VISIBLE + EDITTEXT ADDPORT_EDIT, 6, 28, 174, 12, WS_VISIBLE | ES_AUTOHSCROLL + DEFPUSHBUTTON "&OK", IDOK, 199, 10, 40, 14, WS_VISIBLE + PUSHBUTTON "&Anuluj", IDCANCEL, 199, 27, 40, 14, WS_VISIBLE +END + + +LPTCONFIG_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 220, 47 +STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Konfiguracja portu LPT" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Czasy oczekiwania (sekundy)", LPTCONFIG_GROUP, 6, 6, 150, 35, BS_GROUPBOX + LTEXT "&Ponowienie transmisji:", -1, 14, 22, 90, 13, WS_VISIBLE + EDITTEXT LPTCONFIG_EDIT, 112, 20, 32, 13, WS_VISIBLE | ES_NUMBER + DEFPUSHBUTTON "&OK", IDOK, 164, 10, 50, 14, WS_VISIBLE + PUSHBUTTON "&Anuluj", IDCANCEL, 164, 27, 50, 14, WS_VISIBLE +END + + +STRINGTABLE DISCARDABLE +{ + IDS_LOCALPORT "Port lokalny" + IDS_INVALIDNAME "'%s' nie jest poprawn� nazw� portu" + IDS_PORTEXISTS "Port %s ju� istnieje" + IDS_NOTHINGTOCONFIG "Ten port nie ma opcji do skonfigurowania" +}

1 0