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

Jens Albretsen : cmd: Added Danish translation.
by Alexandre Julliard 05 May '08

05 May '08

Module: wine Branch: master Commit: 5307fecc448d727e2b77da8d440fcfb69c4113dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=5307fecc448d727e2b77da8d4… Author: Jens Albretsen <jens(a)albretsen.dk> Date: Sun May 4 16:23:26 2008 +0200 cmd: Added Danish translation. --- programs/cmd/Da.rc | 257 ++++++++++++++++++++++++++++++++++++++++++++++++ programs/cmd/wcmdrc.rc | 1 + 2 files changed, 258 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5307fecc448d727e2b77d…

1 0

Jens Albretsen : net: Added Danish translation.
by Alexandre Julliard 05 May '08

05 May '08

Module: wine Branch: master Commit: 7a57c23fc4bad45f49953743a583219f22d564af URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a57c23fc4bad45f49953743a… Author: Jens Albretsen <jens(a)albretsen.dk> Date: Sun May 4 16:52:04 2008 +0200 net: Added Danish translation. --- programs/net/Da.rc | 43 +++++++++++++++++++++++++++++++++++++++++++ programs/net/rsrc.rc | 1 + 2 files changed, 44 insertions(+), 0 deletions(-) diff --git a/programs/net/Da.rc b/programs/net/Da.rc new file mode 100644 index 0000000..592d5cd --- /dev/null +++ b/programs/net/Da.rc @@ -0,0 +1,43 @@ +/* + * NET.EXE - Wine-compatible net program + * Danish language support + * + * Copyright (C) 2008 Jens Albretsen <jens(a)albretsen.dk> + * + * 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_DANISH, SUBLANG_DEFAULT + +STRINGTABLE +{ + STRING_USAGE, "S�dan bruges programmet:\n\nNET [ HELP | START | STOP ]\n" + STRING_START_USAGE, "Angiv navnet p� servicen som skal startes.\n" + STRING_STOP_USAGE, "Angiv navnet p� servicen som skal stoppes.\n" + STRING_STOP_DEP, "Stopper afh�ngig tjeneste: %s\n" + STRING_CANT_STOP, "Kunne ikke stoppe tjenesten �%s�\n" + STRING_NO_SCM, "Kunne ikke kontakte tjenestebehandleren.\n" + STRING_NO_SVCHANDLE, "Kunne ikke kontakte tjenesten.\n" + STRING_START_SVC, "Tjenesten �%s� starter.\n" + STRING_START_SVC_SUCCESS, "Tjenesten �%s� startede vellykket.\n" + STRING_START_SVC_FAIL, "Tjenesten �%s� kunne ikke starte.\n" + STRING_STOP_SVC, "Tjenesten �%s� stopper.\n" + STRING_STOP_SVC_SUCCESS, "Tjenesten �%s� stoppede vellykket.\n" + STRING_STOP_SVC_FAIL, "Kunne ikke stoppe tjenesten �%s�.\n" + STRING_HELP_USAGE, "S�dan for du hj�lp:\n\nNET HELP kommando\n -eller-\nNET kommando /HELP\n\n Tilg�ngelige kommandoer:\n NET HELP NET START NET STOP\n" + STRING_NO_ENTRIES, "Det er ingen indskrivning i listen.\n" + STRING_USE_HEADER, "\nStatus Lokal Remote\n---------------------------------------------------------------\n" + STRING_USE_ENTRY, "%s %S %S �bne resourser: %lu\n" +} diff --git a/programs/net/rsrc.rc b/programs/net/rsrc.rc index 777c4d1..2d79cf1 100644 --- a/programs/net/rsrc.rc +++ b/programs/net/rsrc.rc @@ -22,6 +22,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL +#include "Da.rc" #include "En.rc" #include "Fr.rc" #include "Ko.rc"

1 0

Jens Albretsen : winecfg: Added Danish translation.
by Alexandre Julliard 05 May '08

05 May '08

Module: wine Branch: master Commit: 226a75435a801a794a79e86136a211f36fe4e9e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=226a75435a801a794a79e8613… Author: Jens Albretsen <jens(a)albretsen.dk> Date: Sun May 4 09:48:12 2008 +0200 winecfg: Added Danish translation. --- programs/winecfg/Da.rc | 318 +++++++++++++++++++++++++++++++++++++++++++ programs/winecfg/winecfg.rc | 1 + 2 files changed, 319 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=226a75435a801a794a79e…

1 0

Jens Albretsen : xcopy: Added Danish translation.
by Alexandre Julliard 05 May '08

05 May '08

Module: wine Branch: master Commit: e29fe86a0e2998a7f9ded6efd64db81f9e7503e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e29fe86a0e2998a7f9ded6efd… Author: Jens Albretsen <jens(a)albretsen.dk> Date: Sun May 4 13:37:00 2008 +0200 xcopy: Added Danish translation. --- programs/xcopy/Da.rc | 78 ++++++++++++++++++++++++++++++++++++++++++++++++ programs/xcopy/rsrc.rc | 1 + 2 files changed, 79 insertions(+), 0 deletions(-) diff --git a/programs/xcopy/Da.rc b/programs/xcopy/Da.rc new file mode 100644 index 0000000..16443ec --- /dev/null +++ b/programs/xcopy/Da.rc @@ -0,0 +1,78 @@ +/* + * XCOPY - Wine-compatible xcopy program + * Danish language support + * + * Copyright (C) 2008 Jens Albretsen <jens(a)albretsen.dk> + * + * 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_DANISH, SUBLANG_DEFAULT + +STRINGTABLE +{ + STRING_INVPARMS, "Ugyldigt antal parametere; brug �xcopy /?� for hjelp\n" + STRING_INVPARM, "Ugyldigt parameter �%s�; brug �xcopy /?� for hjelp\n" + STRING_PAUSE, "Tryk Enter for at begynde at kopiere\n" + STRING_SIMCOPY, "%d fil(er) vil blive kopieret\n" + STRING_COPY, "%d fil(er) kopieret\n" + STRING_QISDIR, "Er �%s� et filnavn eller katalog\n" \ + "p� destinationen?\n" \ + "(F - Fil, K - Katalog)\n" + STRING_SRCPROMPT,"%s? (Ja|Nei)\n" + STRING_OVERWRITE,"Overskrive �%s�? (Ja|Nei|Alle)\n" + STRING_COPYFAIL, "Kunne ikke kopiere �%s� til �%s�; fejlet med r/c %d\n" + STRING_OPENFAIL, "Kunne ikke �bne �%s�\n" + STRING_READFAIL, "Kunne ikke l�se �%s�\n" + STRING_YES_CHAR, "J" + STRING_NO_CHAR, "N" + STRING_ALL_CHAR, "A" + STRING_FILE_CHAR,"F" + STRING_DIR_CHAR, "K" + + STRING_HELP, +"XCOPY - Kopierer filer eller katalogtre til en m�lplassering\n\ +\n\ +Syntaks:\n\ +XCOPY kilde [m�l] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U] \n\ +\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\ +\n\ +hvor:\n\ +[/I] Antag at destinationen er et katalog hvis destinationen ikke\n\ + \tfindes og 2 eller flere filer bliver kopieret\n\ +[/S] Kopier kataloger og underkataloger\n\ +[/E] Kopier kataloger og underkataloger, ogs� tomme kataloger\n\ +[/Q] V�r stille : vis ikke filnavne under kopiering\n\ +[/F] Fil hele kilde- og m�lnavn under kopiering\n\ +[/L] Simul�r operationen; vis kun, g�r intet\n\ +[/W] Sp�rg f�r koperingen starter\n\ +[/T] Lav tom katalogstruktur; kopier ikke filer\n\ +[/Y] Sp�rg ikke om filer skal overskrives\n\ +[/-Y] Sp�rg f�r om filer skal overskrives\n\ +[/P] Sp�rg om hver enkelt fil der skal kopieres\n\ +[/N] Kopier som korte filnavn (8.3 tegn)\n\ +[/U] Kopier kun filer som allerede findes p� destinationen\n\ +[/R] Overskriv filer som er skrivebeskyttet\n\ +[/H] Kopier skjulte filer og systemfiler\n\ +[/C] Forts�t selv om det opst�r fejl under kopieringen\n\ +[/A] Kopier ikke filer som er markeret som arkiv\n\ +[/M] Kopier kun filer som er markeret som akriv; fjerner denne markering \n\ +[/D | /D:m-d-�] Kopier kun nye filer eller dem som er �ndret efter\n\ + \t\tden opgivne dato.\n\ + \t\tHvis ingen dato opgives kopieres kun de filer hvor\n\ + \t\tdestinationen er �ldre end kilden\n\n" + +} diff --git a/programs/xcopy/rsrc.rc b/programs/xcopy/rsrc.rc index 3087216..3bb61e7 100644 --- a/programs/xcopy/rsrc.rc +++ b/programs/xcopy/rsrc.rc @@ -22,6 +22,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL +#include "Da.rc" #include "En.rc" #include "Fr.rc" #include "Ko.rc"

1 0

Gerald Pfeifer : winecfg: Add variable initialization in get_registry_version().
by Alexandre Julliard 05 May '08

05 May '08

Module: wine Branch: master Commit: ac24472aaa093607f00a799361dc83820f906c0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac24472aaa093607f00a79936… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Fri May 2 19:08:09 2008 +0200 winecfg: Add variable initialization in get_registry_version(). --- programs/winecfg/appdefaults.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winecfg/appdefaults.c b/programs/winecfg/appdefaults.c index 53e912a..f6495a9 100644 --- a/programs/winecfg/appdefaults.c +++ b/programs/winecfg/appdefaults.c @@ -70,7 +70,7 @@ static const char szKeyNT[] = "Software\\Microsoft\\Windows NT\\CurrentVersion"; static int get_registry_version(void) { - int i, best = -1, platform, major, minor, build = 0; + int i, best = -1, platform, major, minor = 0, build = 0; char *p, *ver; if ((ver = get_reg_key( HKEY_LOCAL_MACHINE, szKeyNT, "CurrentVersion", NULL )))

1 0

Andrew Talbot : cabinet: Indentation fix.
by Alexandre Julliard 05 May '08

05 May '08

Module: wine Branch: master Commit: 938150d01f82bc1df10a9a2ca2c1c09adcf94a80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=938150d01f82bc1df10a9a2ca… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sun May 4 21:48:44 2008 +0100 cabinet: Indentation fix. --- dlls/cabinet/fdi.c | 42 +++++++++++++++++++++--------------------- 1 files changed, 21 insertions(+), 21 deletions(-) diff --git a/dlls/cabinet/fdi.c b/dlls/cabinet/fdi.c index 468a68d..8b7500f 100644 --- a/dlls/cabinet/fdi.c +++ b/dlls/cabinet/fdi.c @@ -160,21 +160,21 @@ void QTMupdatemodel(struct QTMmodel *model, int sym) { if (model->syms[0].cumfreq > 3800) { if (--model->shiftsleft) { for (i = model->entries - 1; i >= 0; i--) { - /* -1, not -2; the 0 entry saves this */ - model->syms[i].cumfreq >>= 1; - if (model->syms[i].cumfreq <= model->syms[i+1].cumfreq) { - model->syms[i].cumfreq = model->syms[i+1].cumfreq + 1; - } + /* -1, not -2; the 0 entry saves this */ + model->syms[i].cumfreq >>= 1; + if (model->syms[i].cumfreq <= model->syms[i+1].cumfreq) { + model->syms[i].cumfreq = model->syms[i+1].cumfreq + 1; + } } } else { model->shiftsleft = 50; for (i = 0; i < model->entries ; i++) { - /* no -1, want to include the 0 entry */ - /* this converts cumfreqs into frequencies, then shifts right */ - model->syms[i].cumfreq -= model->syms[i+1].cumfreq; - model->syms[i].cumfreq++; /* avoid losing things entirely */ - model->syms[i].cumfreq >>= 1; + /* no -1, want to include the 0 entry */ + /* this converts cumfreqs into frequencies, then shifts right */ + model->syms[i].cumfreq -= model->syms[i+1].cumfreq; + model->syms[i].cumfreq++; /* avoid losing things entirely */ + model->syms[i].cumfreq >>= 1; } /* now sort by frequencies, decreasing order -- this must be an @@ -182,22 +182,22 @@ void QTMupdatemodel(struct QTMmodel *model, int sym) { * characteristics */ for (i = 0; i < model->entries - 1; i++) { - for (j = i + 1; j < model->entries; j++) { - if (model->syms[i].cumfreq < model->syms[j].cumfreq) { - temp = model->syms[i]; - model->syms[i] = model->syms[j]; - model->syms[j] = temp; - } - } + for (j = i + 1; j < model->entries; j++) { + if (model->syms[i].cumfreq < model->syms[j].cumfreq) { + temp = model->syms[i]; + model->syms[i] = model->syms[j]; + model->syms[j] = temp; + } + } } - + /* then convert frequencies back to cumfreq */ for (i = model->entries - 1; i >= 0; i--) { - model->syms[i].cumfreq += model->syms[i+1].cumfreq; + model->syms[i].cumfreq += model->syms[i+1].cumfreq; } /* then update the other part of the table */ for (i = 0; i < model->entries; i++) { - model->tabloc[model->syms[i].sym] = i; + model->tabloc[model->syms[i].sym] = i; } } } @@ -882,7 +882,7 @@ static int LZXfdi_init(int window, fdi_decomp_state *decomp_state) { memcpy(CAB(lzx_position_base), base, sizeof(base)); /* calculate required position slots */ - if (window == 20) posn_slots = 42; + if (window == 20) posn_slots = 42; else if (window == 21) posn_slots = 50; else posn_slots = window << 1;

1 0

James Hawkins : fusion: Add the missing assembly table structs.
by Alexandre Julliard 05 May '08

05 May '08

Module: wine Branch: master Commit: f52ecfe0411ce891d378169f5543bc9c06753693 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f52ecfe0411ce891d378169f5… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Sat May 3 21:16:24 2008 -0500 fusion: Add the missing assembly table structs. --- dlls/fusion/assembly.c | 67 +++++++------- dlls/fusion/fusionpriv.h | 226 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 259 insertions(+), 34 deletions(-) diff --git a/dlls/fusion/assembly.c b/dlls/fusion/assembly.c index eee889a..efffcca 100644 --- a/dlls/fusion/assembly.c +++ b/dlls/fusion/assembly.c @@ -64,54 +64,53 @@ struct tagASSEMBLY BYTE *blobs; }; -/* FIXME: fill in */ const DWORD COR_TABLE_SIZES[64] = { sizeof(MODULETABLE), sizeof(TYPEREFTABLE), sizeof(TYPEDEFTABLE), 0, + sizeof(FIELDTABLE), 0, + sizeof(METHODDEFTABLE), 0, + sizeof(PARAMTABLE), + sizeof(INTERFACEIMPLTABLE), + sizeof(MEMBERREFTABLE), + sizeof(CONSTANTTABLE), + sizeof(CUSTOMATTRIBUTETABLE), + sizeof(FIELDMARSHALTABLE), + sizeof(DECLSECURITYTABLE), + sizeof(CLASSLAYOUTTABLE), + sizeof(FIELDLAYOUTTABLE), + sizeof(STANDALONESIGTABLE), + sizeof(EVENTMAPTABLE), 0, + sizeof(EVENTTABLE), + sizeof(PROPERTYMAPTABLE), 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, + sizeof(PROPERTYTABLE), + sizeof(METHODSEMANTICSTABLE), + sizeof(METHODIMPLTABLE), + sizeof(MODULEREFTABLE), + sizeof(TYPESPECTABLE), + sizeof(IMPLMAPTABLE), + sizeof(FIELDRVATABLE), 0, 0, sizeof(ASSEMBLYTABLE), - 0, - 0, - 0, - 0, - 0, - 0, - 0, + sizeof(ASSEMBLYPROCESSORTABLE), + sizeof(ASSEMBLYOSTABLE), + sizeof(ASSEMBLYREFTABLE), + sizeof(ASSEMBLYREFPROCESSORTABLE), + sizeof(ASSEMBLYREFOSTABLE), + sizeof(FILETABLE), + sizeof(EXPORTEDTYPETABLE), sizeof(MANIFESTRESTABLE), - 0, - 0, - 0, - 0, + sizeof(NESTEDCLASSTABLE), + sizeof(GENERICPARAMTABLE), + sizeof(METHODSPECTABLE), + sizeof(GENERICPARAMCONSTRAINTTABLE), 0, 0, 0, diff --git a/dlls/fusion/fusionpriv.h b/dlls/fusion/fusionpriv.h index 829a6b7..08a2d5c 100644 --- a/dlls/fusion/fusionpriv.h +++ b/dlls/fusion/fusionpriv.h @@ -86,6 +86,13 @@ typedef struct typedef struct { + WORD Flags; + WORD Name; + WORD Signature; +} FIELDTABLE; + +typedef struct +{ DWORD HashAlgId; WORD MajorVersion; WORD MinorVersion; @@ -107,6 +114,225 @@ typedef struct typedef struct { + DWORD RVA; + WORD ImplFlags; + WORD Flags; + WORD Name; + WORD Signature; + WORD ParamList; +} METHODDEFTABLE; + +typedef struct +{ + WORD Flags; + WORD Sequence; + WORD Name; +} PARAMTABLE; + +typedef struct +{ + WORD Class; + WORD Interface; +} INTERFACEIMPLTABLE; + +typedef struct +{ + WORD Class; + WORD Name; + WORD Signature; +} MEMBERREFTABLE; + +typedef struct +{ + BYTE Type; + BYTE Reserved; + WORD Parent; + WORD Value; +} CONSTANTTABLE; + +typedef struct +{ + WORD Parent; + WORD Type; + WORD Value; +} CUSTOMATTRIBUTETABLE; + +typedef struct +{ + WORD Parent; + WORD NativeType; +} FIELDMARSHALTABLE; + +typedef struct +{ + WORD Action; + WORD Parent; + WORD PermissionSet; +} DECLSECURITYTABLE; + +typedef struct +{ + WORD PackingSize; + DWORD ClassSize; + WORD Parent; +} CLASSLAYOUTTABLE; + +typedef struct +{ + DWORD Offset; + WORD Field; +} FIELDLAYOUTTABLE; + +typedef struct +{ + WORD Signature; +} STANDALONESIGTABLE; + +typedef struct +{ + WORD Parent; + WORD EventList; +} EVENTMAPTABLE; + +typedef struct +{ + WORD EventFlags; + WORD Name; + WORD EventType; +} EVENTTABLE; + +typedef struct +{ + WORD Parent; + WORD PropertyList; +} PROPERTYMAPTABLE; + +typedef struct +{ + WORD Flags; + WORD Name; + WORD Type; +} PROPERTYTABLE; + +typedef struct +{ + WORD Semantics; + WORD Method; + WORD Association; +} METHODSEMANTICSTABLE; + +typedef struct +{ + WORD Class; + WORD MethodBody; + WORD MethodDeclaration; +} METHODIMPLTABLE; + +typedef struct +{ + WORD Name; +} MODULEREFTABLE; + +typedef struct +{ + WORD Signature; +} TYPESPECTABLE; + +typedef struct +{ + WORD MappingFlags; + WORD MemberForwarded; + WORD ImportName; + WORD ImportScope; +} IMPLMAPTABLE; + +typedef struct +{ + DWORD RVA; + WORD Field; +} FIELDRVATABLE; + +typedef struct +{ + DWORD Processor; +} ASSEMBLYPROCESSORTABLE; + +typedef struct +{ + DWORD OSPlatformID; + DWORD OSMajorVersion; + DWORD OSMinorVersion; +} ASSEMBLYOSTABLE; + +typedef struct +{ + WORD MajorVersion; + WORD MinorVersion; + WORD BuildNumber; + WORD RevisionNumber; + DWORD Flags; + WORD PublickKeyOrToken; + WORD Name; + WORD Culture; + WORD HashValue; +} ASSEMBLYREFTABLE; + +typedef struct +{ + DWORD Processor; + WORD AssemblyRef; +} ASSEMBLYREFPROCESSORTABLE; + +typedef struct +{ + DWORD OSPlatformId; + DWORD OSMajorVersion; + DWORD OSMinorVersion; + WORD AssemblyRef; +} ASSEMBLYREFOSTABLE; + +typedef struct +{ + DWORD Flags; + WORD Name; + WORD HashValue; +} FILETABLE; + +typedef struct +{ + DWORD Flags; + DWORD TypeDefId; + WORD TypeName; + WORD TypeNameSpace; + WORD Implementation; +} EXPORTEDTYPETABLE; + +typedef struct +{ + WORD NestedClass; + WORD EnclosingClass; +} NESTEDCLASSTABLE; + +typedef struct +{ + WORD Number; + WORD Flags; +} GENERICPARAMTABLE; + +typedef struct +{ + WORD MethodDef; + WORD Instantiation; +} METHODSPECTABLE; + +typedef struct +{ + WORD Owner; + WORD Constraint; +} GENERICPARAMCONSTRAINTTABLE; + +typedef struct +{ DWORD ImportLookupTable; DWORD DateTimeStamp; DWORD ForwarderChain;

1 0

James Hawkins : fusion: The Strings stream can be without a #.
by Alexandre Julliard 05 May '08

05 May '08

Module: wine Branch: master Commit: 56bfe2972fccc12430baa3f8750135960f0054e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56bfe2972fccc12430baa3f87… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Sat May 3 21:17:17 2008 -0500 fusion: The Strings stream can be without a #. --- dlls/fusion/assembly.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/fusion/assembly.c b/dlls/fusion/assembly.c index efffcca..2110ba5 100644 --- a/dlls/fusion/assembly.c +++ b/dlls/fusion/assembly.c @@ -297,7 +297,7 @@ static HRESULT parse_clr_metadata(ASSEMBLY *assembly) if (FAILED(hr)) return hr; } - else if (!lstrcmpA(stream, "#Strings")) + else if (!lstrcmpA(stream, "#Strings") || !lstrcmpA(stream, "Strings")) assembly->strings = (BYTE *)assembly_data_offset(assembly, ofs); else if (!lstrcmpA(stream, "#Blob")) assembly->blobs = (BYTE *)assembly_data_offset(assembly, ofs);

1 0

James Hawkins : msi: Use the handle to the treeview item if the item text is not returned.
by Alexandre Julliard 05 May '08

05 May '08

Module: wine Branch: master Commit: 6d91fd8ce622fb66440b92714275177a010c99bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d91fd8ce622fb66440b92714… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Sun May 4 02:06:37 2008 -0500 msi: Use the handle to the treeview item if the item text is not returned. --- dlls/msi/dialog.c | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 035d7f5..b83ae48 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -2055,7 +2055,8 @@ static UINT msi_dialog_seltree_handler( msi_dialog *dialog, LPNMTREEVIEWW tv = (LPNMTREEVIEWW)param; MSIRECORD *row, *rec; MSIFOLDER *folder; - LPCWSTR dir; + MSIFEATURE *feature; + LPCWSTR dir, title = NULL; UINT r = ERROR_SUCCESS; static const WCHAR select[] = { @@ -2069,7 +2070,16 @@ static UINT msi_dialog_seltree_handler( msi_dialog *dialog, info->selected = tv->itemNew.hItem; - row = MSI_QueryGetRecord( dialog->package->db, select, tv->itemNew.pszText ); + if (!(tv->itemNew.mask & TVIF_TEXT)) + { + feature = msi_seltree_feature_from_item( control->hwnd, tv->itemNew.hItem ); + if (feature) + title = feature->Title; + } + else + title = tv->itemNew.pszText; + + row = MSI_QueryGetRecord( dialog->package->db, select, title ); if (!row) return ERROR_FUNCTION_FAILED;

1 0

Gerald Pfeifer : winhelp: Remove extraneous positiveness check for unsigned variable in WINHELP_HandleTextMouse ().
by Alexandre Julliard 05 May '08

05 May '08

Module: wine Branch: master Commit: 49799ccb01ef7d6c8c0ffc32f0574acb869b2934 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49799ccb01ef7d6c8c0ffc32f… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat May 3 10:23:24 2008 +0200 winhelp: Remove extraneous positiveness check for unsigned variable in WINHELP_HandleTextMouse(). --- programs/winhelp/winhelp.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winhelp/winhelp.c b/programs/winhelp/winhelp.c index 51cebf7..ee21053 100644 --- a/programs/winhelp/winhelp.c +++ b/programs/winhelp/winhelp.c @@ -782,7 +782,7 @@ static BOOL WINHELP_HandleTextMouse(WINHELP_WINDOW* win, UINT msg, LPARAM lParam { if (link->window == -1) wi = win->info; - else if ((link->window >= 0) && (link->window < hlpfile->numWindows)) + else if (link->window < hlpfile->numWindows) wi = &hlpfile->windows[link->window]; else {

1 0