August 2005 - Wine-Devel - list.winehq.org

MSHTML: German resource [2nd try]

by Henning Gerhardt

with some spelling improvements by Frank Richter Changelog: Add German resources diff -Nur wine/dlls/mshtml/De.rc wine-working/dlls/mshtml/De.rc --- wine/dlls/mshtml/De.rc 1970-01-01 01:00:00.000000000 +0100 +++ wine-working/dlls/mshtml/De.rc 2005-08-27 08:56:47.000000000 +0200 @@ -0,0 +1,240 @@ +/* + * German resources for mshtml + * + * Copyright 2005 Henning Gerhardt + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + + +LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT + +/* FIXME: This should be in shdoclc.dll */ + +IDR_BROWSE_CONTEXT_MENU MENU +{ + POPUP "Standard" + { + MENUITEM "&Zurück", IDM_BACK + MENUITEM "V&orwärts", IDM_FORWARD + MENUITEM SEPARATOR + MENUITEM "&Speichere Hintergrund als...", IDM_SAVEBACKGROUNDAS + MENUITEM "Als Hintergrund", IDM_SETASBACKGROUND + MENUITEM "Hintergrund &kopieren", IDM_COPYBACKGROUND + MENUITEM "Als Desktopelement einrichten...", IDM_SETASDESKTOPITEM + MENUITEM SEPARATOR + MENUITEM "Alles &auswählen", IDM_SELECTALL + MENUITEM "Ein&fügen", IDM_PASTE + MENUITEM SEPARATOR + MENUITEM "Erzeuge &Verknüpfung", IDM_CREATESHORTCUT + MENUITEM "Zu &Favoriten hinzufügen", IDM_ADDTOFAVOURITES + MENUITEM "&Quelltextansicht", IDM_VIEWSOURCE + MENUITEM SEPARATOR + MENUITEM "&Textkodierung", IDM_ENCODING + MENUITEM SEPARATOR + MENUITEM "&Drucken", IDM_PRINT + MENUITEM "A&ktualisieren", IDM_REFRESH + MENUITEM SEPARATOR + MENUITEM SEPARATOR + MENUITEM "&Eigenschaften", IDM_PROPERTIES + } + + POPUP "Bild" + { + MENUITEM "&Öffne Verweis", IDM_OPENLINK + MENUITEM "Öffne Verweis in neuem Fenster", IDM_OPENINNEWWINDOW + MENUITEM "Speichere &Ziel als...", IDM_SAVETARGETAS + MENUITEM "&Drucke Ziel", IDM_PRINTTARGET + MENUITEM SEPARATOR + MENUITEM "Zeige B&ild", IDM_SHOWPICTURE + MENUITEM "Speichere &Bild als...", IDM_SAVEPICTUREAS + MENUITEM "&Versende Bild...", IDM_EMAILPICTURE + MENUITEM "D&rucke Bild...", IDM_PRINTPICTURE + MENUITEM "&Gehe zu Eigene Bilder", IDM_GOTOMYPICTURES + MENUITEM "Als Hintergrund", IDM_SETASBACKGROUND + MENUITEM "Als Desktopelement einrichten...", IDM_SETASDESKTOPITEM + MENUITEM SEPARATOR + MENUITEM "Aus&schneiden", IDM_CUT + MENUITEM "&Kopieren", IDM_COPY + MENUITEM "Verk&nüpfung kopieren", IDM_COPYSHORTCUT + MENUITEM "Ein&fügen", IDM_PASTE + MENUITEM SEPARATOR + MENUITEM "Zu &Favoriten hinzufügen...", IDM_ADDTOFAVOURITES + MENUITEM SEPARATOR + MENUITEM SEPARATOR + MENUITEM "&Eigenschaften", IDM_PROPERTIES + } + + POPUP "Steuerung" + { + MENUITEM "&Rückgängig", IDM_UNDO + MENUITEM SEPARATOR + MENUITEM "Aus&schneiden", IDM_CUT + MENUITEM "&Kopieren", IDM_COPY + MENUITEM "Ein&fügen", IDM_PASTE + MENUITEM "&Löschen", IDM_DELETE + MENUITEM SEPARATOR + MENUITEM SEPARATOR + MENUITEM "Alles &auswählen", IDM_SELECTALL + } + + POPUP "Tabelle" + { + POPUP "&Auswählen" + { + MENUITEM "&Zelle", IDM_CELL + MENUITEM "Zei&le", IDM_ROW + MENUITEM "&Spalte", IDM_COLUMN + MENUITEM "&Tabelle", IDM_TABLE + } + MENUITEM SEPARATOR + MENUITEM SEPARATOR + MENUITEM "&Zellen Eigenschaften", IDM_CELLPROPERTIES + MENUITEM "&Tabellen Eigenschaften", IDM_TABLEPROPERTIES + } + + POPUP "1DSeiten Auswahl" + { + MENUITEM "Aus&schneiden", IDM_CUT + MENUITEM "&Kopieren", IDM_COPY + MENUITEM "Ein&fügen", IDM_PASTE + MENUITEM "Alles &auswählen", IDM_SELECTALL + MENUITEM "&Drucken", IDM_PRINT + MENUITEM SEPARATOR + } + + POPUP "Anker" + { + MENUITEM "&Öffnen", IDM_OPENLINK + MENUITEM "Im &neuen Fenster öffnen", IDM_OPENINNEWWINDOW + MENUITEM "Speichere &Ziel als...", IDM_SAVETARGETAS + MENUITEM "&Drucke Ziel", IDM_PRINTTARGET + MENUITEM SEPARATOR + MENUITEM "Aus&schneiden", IDM_CUT + MENUITEM "&Kopieren", IDM_COPY + MENUITEM "&Verknüpfung kopieren", IDM_COPYSHORTCUT + MENUITEM "Ein&fügen", IDM_PASTE + MENUITEM SEPARATOR + MENUITEM "Zu &Favoriten hinzufügen...", IDM_ADDTOFAVOURITES + MENUITEM SEPARATOR + MENUITEM SEPARATOR + MENUITEM "&Eigenschaften", IDM_PROPERTIES + } + + POPUP "Context Unknown" + { + MENUITEM SEPARATOR + } + + POPUP "DYNSRC Bild" + { + MENUITEM "&Öffne Verweis", IDM_OPENLINK + MENUITEM "Öffne Verweis in &neuem Fenster", IDM_OPENINNEWWINDOW + MENUITEM "Speichere &Ziel als...", IDM_SAVETARGETAS + MENUITEM "&Drucke Ziel", IDM_PRINTTARGET + MENUITEM SEPARATOR + MENUITEM "Zeige B&ild", IDM_SHOWPICTURE + MENUITEM "Speichere &Video als...", IDM_SAVEPICTUREAS + MENUITEM "Als Hintergrund", IDM_SETASBACKGROUND + MENUITEM "Als Desktopelement einrichten...", IDM_SETASDESKTOPITEM + MENUITEM SEPARATOR + MENUITEM "Aus&schneiden", IDM_CUT + MENUITEM "&Kopieren", IDM_COPY + MENUITEM "&Verknüpfung kopieren", IDM_COPYSHORTCUT + MENUITEM "Ein&fügen", IDM_PASTE + MENUITEM SEPARATOR + MENUITEM "Zu &Favoriten hinzufügen...", IDM_ADDTOFAVOURITES + MENUITEM SEPARATOR + MENUITEM SEPARATOR + MENUITEM "Abspielen", IDM_PLAY + MENUITEM "Halt", IDM_STOP + MENUITEM "&Eigenschaften", IDM_PROPERTIES + } + + POPUP "ART Bild" + { + MENUITEM "&Öffne Verweis", IDM_OPENLINK + MENUITEM "Öffne Verweis in &neuem Fenster", IDM_OPENINNEWWINDOW + MENUITEM "Speichere &Ziel als...", IDM_SAVETARGETAS + MENUITEM "&Drucke Ziel", IDM_PRINTTARGET + MENUITEM SEPARATOR + MENUITEM "Zeige B&ild", IDM_SHOWPICTURE + MENUITEM "&Speichere Bild als...", IDM_SAVEPICTUREAS + MENUITEM "Als Hintergrund", IDM_SETASBACKGROUND + MENUITEM "Als Desktopelement einrichten...", IDM_SETASDESKTOPITEM + MENUITEM SEPARATOR + MENUITEM "Aus&schneiden", IDM_CUT + MENUITEM "&Kopieren", IDM_COPY + MENUITEM "&Verknüpfung kopieren", IDM_COPYSHORTCUT + MENUITEM "&Einfügen", IDM_PASTE + MENUITEM SEPARATOR + MENUITEM "Zu &Favoriten hinzufügen...", IDM_ADDTOFAVOURITES + MENUITEM SEPARATOR + MENUITEM "Abspielen", IDM_PLAY + MENUITEM "Anhalten", IDM_STOP + MENUITEM "Rückspulen", IDM_REWIND + MENUITEM SEPARATOR + MENUITEM SEPARATOR + MENUITEM "&Eigenschaften", IDM_PROPERTIES + } + + POPUP "Debug" + { + MENUITEM "Trace Tags", IDM_TRACETAGS + MENUITEM "Resource Failures", IDM_RESOURCEFAILURES + MENUITEM "Dump Tracking Info", IDM_DUMPTRACKINGINFO + MENUITEM "Debug Break", IDM_DEBUGBREAK + MENUITEM "Debug View", IDM_DEBUGVIEW + MENUITEM "Dump Tree", IDM_DUMPTREE + MENUITEM "Dump Lines", IDM_DUMPLINES + MENUITEM "Dump Displaytree", IDM_DUMPDISPLAYTREE + MENUITEM "Dump FormatCaches", IDM_DUMPFORMATCACHES + MENUITEM "Dump LayoutRects", IDM_DUMPLAYOUTRECTS + MENUITEM "Memory Monitor", IDM_MEMORYMONITOR + MENUITEM "Performance Meters", IDM_PERFORMANCEMETERS + MENUITEM "Save HTML", IDM_SAVEHTML + MENUITEM SEPARATOR + MENUITEM "&Browse View", IDM_BROWSEVIEW + MENUITEM "&Edit View", IDM_EDITVIEW + } + + POPUP "Vertikale Scrollbar" + { + MENUITEM "Scrolle hier", IDM_SCROLLHERE + MENUITEM SEPARATOR + MENUITEM "Oben", IDM_TOP + MENUITEM "Unten", IDM_BOTTOM + MENUITEM SEPARATOR + MENUITEM "Seite hoch", IDM_PAGEUP + MENUITEM "Seite runter", IDM_PAGEDOWN + MENUITEM SEPARATOR + MENUITEM "Scrolle hoch", IDM_SCROLLUP + MENUITEM "Scrolle runter", IDM_SCROLLDOWN + } + + POPUP "Horizontale Scrollbar" + { + MENUITEM "Scrolle hier", IDM_SCROLLHERE + MENUITEM SEPARATOR + MENUITEM "Linke Ecke", IDM_LEFTEDGE + MENUITEM "Rechte Ecke", IDM_RIGHTEDGE + MENUITEM SEPARATOR + MENUITEM "Seite links", IDM_PAGELEFT + MENUITEM "Seite rechts", IDM_PAGERIGHT + MENUITEM SEPARATOR + MENUITEM "Scrolle links", IDM_SCROLLLEFT + MENUITEM "Scrolle rechts", IDM_SCROLLRIGHT + } +} diff -Nur wine/dlls/mshtml/rsrc.rc wine-working/dlls/mshtml/rsrc.rc --- wine/dlls/mshtml/rsrc.rc 2005-08-27 01:19:07.000000000 +0200 +++ wine-working/dlls/mshtml/rsrc.rc 2005-08-27 01:28:36.000000000 +0200 @@ -21,6 +21,7 @@ #include "resource.h" +#include "De.rc" #include "En.rc" REGINST REGINST mshtml.inf

Aug. 27, 2005

Re: Need help debugging a memory corruption bug in shfldr_unixfs.c

by Robert Shearman

Andreas Mohr wrote: >Hi, > >On Fri, Aug 26, 2005 at 10:10:16PM +0200, Michael Jung wrote: > > >>3) Would valgrind be of help to debug this? >> >> >In theory it's possible, but valgrind currently doesn't work with Wine any more >(or rather the other way around), AFAIK. > > It used to as of a few months ago. Have you tried it recently and found it not to work then? -- Rob Shearman

Aug. 27, 2005

[bug 3064] Refix: Listbox fails to populate

by Ann & Jason Edmeades

>LISTBOX_RemoveItem already does pretty much the same check, you should >reuse that instead of duplicating it, you just need to remove the -1 >special case in there. OK - Done, and changed the special case use by setcount appropriately Changelog Listbox delete string handling should validate the range of the index + tests Jason

Aug. 26, 2005

Re: Need help debugging a memory corruption bug in shfldr_unixfs.c

by Andreas Mohr

Hi, On Fri, Aug 26, 2005 at 11:03:33PM +0200, Michael Jung wrote: > Thanks for your comments. The problem is that things are really dynamic here. > Every time you double click a folder, the current ShellView object is > destroyed and a new one is created. Given that I have to browse into like 30 > different folders before it crashes on me, I can't pin down the relevant > infoPtr. Then you will perhaps have to make sense of the in-memory structure right before the corruption address. Or perhaps add full logging for all related memory allocations (and check whether they're relevant by comparing the address in the log with the corruption address, i.e. whether you managed to log relevant allocations). Andreas

Aug. 26, 2005

Re: Need help debugging a memory corruption bug in shfldr_unixfs.c

by Michael Jung

Hi Andy, On Friday 26 August 2005 22:26, Andreas Mohr wrote: > Why not use a watchpoint on that location? > Choose some significant function call a while before the crash, > have a breakpoint on that function (a DPA related function probably is > best), check out which infoPtr is the relevant one, then watch on the > hdpaItems location, i.e. watch *0xsomewhere > then continue execution until it triggers and you know where the value got > overwritten. Thanks for your comments. The problem is that things are really dynamic here. Every time you double click a folder, the current ShellView object is destroyed and a new one is created. Given that I have to browse into like 30 different folders before it crashes on me, I can't pin down the relevant infoPtr. Thanks, -- Michael Jung mjung(a)iss.tu-darmstadt.de

Aug. 26, 2005

Re: Need help debugging a memory corruption bug in shfldr_unixfs.c

by Andreas Mohr

Hi, On Fri, Aug 26, 2005 at 10:10:16PM +0200, Michael Jung wrote: > 1) Can someone give me some advice on how to debug such a problem? Why not use a watchpoint on that location? Choose some significant function call a while before the crash, have a breakpoint on that function (a DPA related function probably is best), check out which infoPtr is the relevant one, then watch on the hdpaItems location, i.e. watch *0xsomewhere then continue execution until it triggers and you know where the value got overwritten. > 2) Did other people see this bug already? Not me. > 3) Would valgrind be of help to debug this? In theory it's possible, but valgrind currently doesn't work with Wine any more (or rather the other way around), AFAIK. Andreas

Aug. 26, 2005

Need help debugging a memory corruption bug in shfldr_unixfs.c

by Michael Jung

Hi, Sometimes while browsing the unixfs namespace in the file dialog wine crashes with the following console output: ============================================================================= wine: Unhandled exception (thread 0009), starting debugger... WineDbg starting on pid 0x8 Unhandled exception: page fault on read access to 0x00004005 in 32-bit code (0x7b24fbf2). In 32 bit mode. Register dump: CS:0073 SS:007b DS:007b ES:007b FS:003b GS:0033 EIP:7b24fbf2 ESP:7b8af188 EBP:7b8af1ac EFLAGS:00210202( - 00 - -RI1) EAX:00000000 EBX:7b2e8b70 ECX:78560110 EDX:7b8af258 ESI:7b2e88f6 EDI:00004001 Stack dump: 0x7b8af188: 00000000 000007d0 7b8af298 00000000 0x7b8af198: 00000008 00000001 7b2e8b70 00000000 0x7b8af1a8: 7b8af1f8 7b8af244 7b2696a2 00004001 0x7b8af1b8: 00000015 00000040 00000000 78561a78 0x7b8af1c8: 78561a78 7b4e8448 7b8af298 00000000 0x7b8af1d8: 7b8af204 7b47bfd1 0036003e 0000004e Backtrace: =>1 0x7b24fbf2 DPA_GetPtr+0x32(hdpa=0x4001, nIndex=0x15) [dpa.c:479] in comctl32 (0x7b8af1ac) 2 0x7b2696a2 LISTVIEW_GetItemT(infoPtr=0x78560110, lpLVItem=0x7b8af258, isW=0x1) [/home/mjung/compile/wine/dlls/comctl32/listview.c:5225] in comctl32 (0x7b8af244) 3 0x7b273e7a notify_itemactivate+0x6a(infoPtr=0x78560110, htInfo=0x7b8af308) [/home/mjung/compile/wine/dlls/comctl32/listview.c:791] in comctl32 (0x7b8af2d4) 4 0x7b26fd5f LISTVIEW_LButtonDblClk+0x8f(infoPtr=0x78560110, wKey=0x1, x=0xad, y=0x39) [/home/mjung/compile/wine/dlls/comctl32/listview.c:8103] in comctl32 (0x7b8af334) ... =============================================================================== As you see, the hdpa parameter to DPA_GetPtr is invalid. The relevant code in LISTVIEW_GetItemT is (dlls/comctl32/listview.c, line 5126): /* find the item and subitem structures before we proceed */ hdpaSubItems = (HDPA)DPA_GetPtr(infoPtr->hdpaItems, lpLVItem->iItem); lpItem = (ITEM_INFO *)DPA_GetPtr(hdpaSubItems, 0); assert (lpItem); It's the first call to DPA_GetPtr that crashes. So the structure pointed to by infoPtr seems to be corrupted (infoPtr is a LISTVIEW_INFO *, which represents the listview item and which given as the first parameter to LISTVIEW_GetItemT). As I never saw this with the original shfldr_fs.c code, I assume that shfldr_unixfs.c has a memory corruption bug somewhere. I've tried to figure the problem for some time now, but to now avail. So my questions are: 1) Can someone give me some advice on how to debug such a problem? 2) Did other people see this bug already? 3) Would valgrind be of help to debug this? Thanks, -- Michael Jung mjung(a)iss.tu-darmstadt.de

Aug. 26, 2005

Missing "#define AVISTREAMREAD_CONVENIENT"

by Peter Lemenkov

Hello, All! Subj. VirtualDub library, called vdremote, wants it, so I propose to include next line anywhere in file "vfv.h": #define AVISTREAMREAD_CONVENIENT (-1L) -- With best regards, Peter Lemenkov.

Aug. 26, 2005

Re: [d3d8] use wined3dformat when calling wined3d

by Juan Lang

Hi again Oliver, > Common subdirectories: clean/wine/CVS and small-patches/wine/CVS Wrong patch I think. --Juan ____________________________________________________ Start your day with Yahoo! - make it your home page http://www.yahoo.com/r/hs

Aug. 26, 2005

Re: [wined3d] dxt2 and dxt4 texture support

by Juan Lang

Hi Oliver, diff -Nru -x ignore clean/wine/dlls/Makeimplib.rules small-patches/wine/dlls/Makeimplib.rules --- clean/wine/dlls/Makeimplib.rules 1970-01-01 01:00:00.000000000 +0100 +++ small-patches/wine/dlls/Makeimplib.rules 2005-08-26 15:53:11.888455392 +0100 @ This shows up in a couple of your patches and is noise. @@ -334,7 +335,9 @@ TRACE("(%p) glGetTexImage level(%d), fmt(%d), typ(%d), mem(%p) \n" , This, This->glDescription.level, This->glDescription.glFormat, This->glDescription.glType, This->resource.allocatedMemory); /* TODO: DXT2 and DXT4 formats */ if (This->resource.format == WINED3DFMT_DXT1 || + This->resource.format == WINED3DFMT_DXT2 || This->resource.format == WINED3DFMT_DXT3 || + This->resource.format == WINED3DFMT_DXT4 || This->resource.format == WINED3DFMT_DXT5) { TRACE("Locking a compressed texture\n"); if (GL_SUPPORT(EXT_TEXTURE_COMPRESSION_S3TC)) { /* we can assume this as the texture would not have been created otherwise */ Shouldn't that TODO be removed? --Juan __________________________________________________ Do You Yahoo!? Tired of spam? Yahoo! Mail has the best spam protection around http://mail.yahoo.com

Aug. 26, 2005