- Wine-Devel - list.winehq.org

Re: Spanish translation of winemine
by Marcelo Duarte Aug. 17, 2003

Aug. 17, 2003

Please, see http://www.winehq.com/site/sending_patches especially: "cvs diff will always ignore newly added files, so you'll need to do something like: diff -u /dev/null newfile.c >> patch.diff to make a patch for newly added files. " Do you plan to translate other programs and dlls that still they lack? ----- Original Message ----- From: "José Manuel Ferrer Ortiz" <jmfo1982(a)yahoo.es> To: <wine-patches(a)winehq.com> Sent: Friday, August 15, 2003 3:40 PM Subject: Spanish translation of winemine > Hi, I've translated the winemine program into Spanish, > since it was only translated into English and > Portuguese. > > You can find the translation in the file Es.rc and you > should apply too the patch in the other file in order > to include that translation (and maybe something in > the Makefile.in to inform about the new file in the > tree). > > Regards, > José Manuel > > ___________________________________________________ > Yahoo! Messenger - Nueva versión GRATIS > Super Webcam, voz, caritas animadas, y más... > http://messenger.yahoo.es ---------------------------------------------------------------------------- ---- > Only in .: Es.rc > Only in .: Makefile > diff -u /home/jose/wine-20030813/programs/winemine/rsrc.rc ./rsrc.rc > --- /home/jose/wine-20030813/programs/winemine/rsrc.rc Mon Jun 23 20:15:15 2003 > +++ ./rsrc.rc Fri Aug 15 18:32:40 2003 > @@ -23,6 +23,7 @@ > #include "resource.h" > > #include "En.rc" > +#include "Es.rc" > #include "Pt.rc" > > LANGUAGE LANG_NEUTRAL,SUBLANG_NEUTRAL > ---------------------------------------------------------------------------- ---- > /* > * WineMine > * Spanish Language Support > * > * Copyright 2003 José Manuel Ferrer Ortiz <jmfo1982(a)yahoo.es> > * > * 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_SPANISH, SUBLANG_DEFAULT > > STRINGTABLE { > IDS_APPNAME, "WineMine" > > } > > MENU_WINEMINE MENU DISCARDABLE > { > POPUP "&Opciones" { > MENUITEM "&Nuevo", IDM_NEW > MENUITEM SEPARATOR > MENUITEM "&Interrogación", IDM_MARKQ > MENUITEM SEPARATOR > MENUITEM "&Principiante", IDM_BEGINNER > MENUITEM "&Avanzado", IDM_ADVANCED > MENUITEM "&Experto", IDM_EXPERT > MENUITEM "P&ersonalizado", IDM_CUSTOM > MENUITEM SEPARATOR > MENUITEM "&Salir", IDM_EXIT > } > POPUP "&Ayuda" { > MENUITEM "&Mejores tiempos", IDM_TIMES > MENUITEM "&Acerca de", IDM_ABOUT > } > } > > DLG_TIMES DIALOG DISCARDABLE 0, 0, 160, 80 > STYLE DS_MODALFRAME | DS_3DLOOK | > WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP > CAPTION "Mejores tiempos" > { > GROUPBOX "Mejores tiempos", IDIGNORE, 10, 10, 140, 45 > LTEXT "Principiante", IDIGNORE, 20, 20, 40, 8 > LTEXT "Avanzado", IDIGNORE, 20, 30, 40, 8 > LTEXT "Experto", IDIGNORE, 20, 40, 40, 8 > LTEXT "999", IDC_TIME1, 70, 20, 15, 8 > LTEXT "999", IDC_TIME2, 70, 30, 15, 8 > LTEXT "999", IDC_TIME3, 70, 40, 15, 8 > LTEXT "", IDC_NAME1, 90, 20, 55, 8 > LTEXT "", IDC_NAME2, 90, 30, 55, 8 > LTEXT "", IDC_NAME3, 90, 40, 55, 8 > DEFPUSHBUTTON "Aceptar", IDOK, 55, 60, 50, 15 > } > > DLG_CONGRATS DIALOG DISCARDABLE 0, 0, 160, 60 > STYLE DS_MODALFRAME | DS_3DLOOK | > WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP > CAPTION "¡Enhorabuena!" > { > LTEXT "Por favor, introduzca su nombre", IDIGNORE, 10, 10, 150, 10 > EDITTEXT IDC_EDITNAME, 25, 20, 110, 12 > DEFPUSHBUTTON "Aceptar", IDOK, 60, 40, 40, 15 > } > > DLG_CUSTOM DIALOG DISCARDABLE 0, 0, 100, 100 > STYLE DS_MODALFRAME | DS_3DLOOK | > WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP > CAPTION "Juego personalizado" > { > LTEXT "Filas", IDIGNORE, 5, 5, 30, 10 > LTEXT "Columnas", IDIGNORE, 5, 35, 30, 10 > LTEXT "Minas", IDIGNORE, 5, 65, 30, 10 > EDITTEXT IDC_EDITROWS, 5, 15, 20, 12, ES_NUMBER > EDITTEXT IDC_EDITCOLS, 5, 45, 20, 12, ES_NUMBER > EDITTEXT IDC_EDITMINES, 5, 75, 20, 12, ES_NUMBER > DEFPUSHBUTTON "Aceptar", IDOK, 40, 30, 50, 15 > PUSHBUTTON "Cancelar", IDCANCEL, 40, 50, 50, 15 > } > > DLG_ABOUT DIALOG DISCARDABLE 0, 0, 145, 80 > STYLE DS_MODALFRAME | DS_3DLOOK | > WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP > CAPTION "Acerca de" > { > LTEXT "Winemine", IDIGNORE, 10, 10, 35, 10 > LTEXT "Copyright 2000, Joshua Thielen", IDIGNORE, 35, 25, 100, 10 > LTEXT "bajo la licencia de Wine", IDIGNORE, 35, 35, 100, 10 > ICON "WINEMINE", IDIGNORE, 10, 25, 20, 20 > DEFPUSHBUTTON "Aceptar", IDOK, 50, 60, 55, 15 > } >

1 0

make crosstest broken?
by Jakob Eriksson Aug. 17, 2003

Aug. 17, 2003

"make crosstest" seems broken on Debian 3.0 Or is it me? Please give some feedback if you have any. There is a bug filed on http://bugs.winehq.com/show_bug.cgi?id=1602 Tried it on wine-20030813. regards, Jakob ----------------------------------------------- i586-mingw32msvc-dlltool -k -l libwintrust.a -d wintrust/wintrust.spec.def i586-mingw32msvc-dlltool -k -l libwnaspi32.a -d winaspi/wnaspi32.spec.def i586-mingw32msvc-dlltool -k -l libwow32.a -d wow32/wow32.spec.def i586-mingw32msvc-dlltool -k -l libws2_32.a -d winsock/ws2_32.spec.def i586-mingw32msvc-dlltool -k -l libwsock32.a -d wsock32/wsock32.spec.def i586-mingw32msvc-dlltool -k -l libx11drv.a -d x11drv/x11drv.spec.def make[2]: Entering directory `/home/jakov/src/Wine/wine-20030813/dlls/advapi32' make[3]: Entering directory `/home/jakov/src/Wine/wine-20030813/dlls/advapi32/tests' i586-mingw32msvc-gcc -c -I. -I. -I../../../include -I../../../include -D_REENTRANT -fPIC -Wall -mpreferred-stack-boundary=2 -fno-strict-aliasing -gstabs+ -Wpointer-arith -g -O2 -o registry.cross.o registry.c cc1: warning: -fPIC ignored for target (all code is position independent) i586-mingw32msvc-gcc -c -I. -I. -I../../../include -I../../../include -D_REENTRANT -fPIC -Wall -mpreferred-stack-boundary=2 -fno-strict-aliasing -gstabs+ -Wpointer-arith -g -O2 -o testlist.cross.o testlist.c cc1: warning: -fPIC ignored for target (all code is position independent) i586-mingw32msvc-gcc registry.cross.o testlist.cross.o -o advapi32_crosstest.exe -ladvapi32 -lkernel32 -lntdll -lm /usr/lib/gcc-lib/i586-mingw32msvc/2.95.3-7/../../../../i586-mingw32msvc/bin/ld: cannot find -lntdll make[3]: *** [advapi32_crosstest.exe] Error 1 make[3]: Leaving directory `/home/jakov/src/Wine/wine-20030813/dlls/advapi32/tests' make[2]: *** [tests/__crosstest__] Error 2 make[2]: Leaving directory `/home/jakov/src/Wine/wine-20030813/dlls/advapi32' make[1]: *** [advapi32/__crosstest__] Error 2 make[1]: Leaving directory `/home/jakov/src/Wine/wine-20030813/dlls' make: *** [dlls/__crosstest__] Error 2 jakov(a)vmlinux:~/src/Wine/wine-20030813

1 0

API DB - import / export tables by dll
by Dave Miller Aug. 16, 2003

Aug. 16, 2003

I am making tables which show all APIs exported / imported by a given dll in each version of windows. They are on the same page as the form which does the queries. http://24.229.94.2 Is there anything in the wine spec or source files I can parse to find out what APIs a wine dll imports? Right now in my tables wine dlls don't import anything. :(

1 0

some questions (required for my dmusic work)
by Rok Mandeljc Aug. 16, 2003

Aug. 16, 2003

I think I've finally figured how dmusic work (especially loading, object and track interfaces). I'll send all my work next week or one after it, but there are still some big flaws I'd like to fix before. 1. I've splitted dmusic debug channel into dmusic, dmusic32, dmband, dmstyle, dmime, etc. and now I'd like to have debug channel dmusicall which will turn all dm* debug channel on (something like debugchannel "all"). Can someone tell me how "all" is defined? 2. I still can't figure how to implement interface that consist of two interfaces (I have IDirectMusicLoaderStream which should consist of IStream and IDirectMusicGetLoader). Can someone send me detailed instructions how to do it? (I can't find any examples) -- Rok Mandeljc <rok.mandeljc(a)gimb.org> "Hold your position! Leave doubt for the dying!" -- Tahngarth of the Weatherlight

1 0

Re: Another problem wih Charlie's Angels
by Dominik.Strasser＠t-online.de Aug. 16, 2003

Aug. 16, 2003

Hi, attached you find a patch which imporves the compiled-in loadorder detection a little bit. It adds a "win16" flag which states whether the module under scrutiny is a reserved name under Win16, only. Surely some more of the names in the default_loadorder should be marked alike. I am not sure which ones should be changed here. Who can help ? Dominik ChangeLog: Dominik Strasser: add a flag to distinguish reserved names between Win16 and Win32 in default loadorder Index: loader/loadorder.c =================================================================== RCS file: /home/wine/wine/loader/loadorder.c,v retrieving revision 1.63 diff -u -3 -p -u -r1.63 loadorder.c --- loader/loadorder.c 27 Apr 2003 00:40:23 -0000 1.63 +++ loader/loadorder.c 16 Aug 2003 08:38:04 -0000 @@ -41,6 +41,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(module); typedef struct module_loadorder { const char *modulename; + int win16_flag; enum loadorder_type loadorder[LOADORDER_NTYPES]; } module_loadorder_t; @@ -55,36 +56,36 @@ struct loadorder_list /* the list must remain sorted by dll name */ static module_loadorder_t default_order_list[] = { - { "display", { LOADORDER_BI, 0, 0 } }, - { "gdi.exe", { LOADORDER_BI, 0, 0 } }, - { "gdi32", { LOADORDER_BI, 0, 0 } }, - { "icmp", { LOADORDER_BI, 0, 0 } }, - { "kernel", { LOADORDER_BI, 0, 0 } }, - { "kernel32", { LOADORDER_BI, 0, 0 } }, - { "keyboard", { LOADORDER_BI, 0, 0 } }, - { "krnl386.exe", { LOADORDER_BI, 0, 0 } }, - { "mmsystem", { LOADORDER_BI, 0, 0 } }, - { "mouse", { LOADORDER_BI, 0, 0 } }, - { "ntdll", { LOADORDER_BI, 0, 0 } }, - { "odbc32", { LOADORDER_BI, 0, 0 } }, - { "system", { LOADORDER_BI, 0, 0 } }, - { "toolhelp", { LOADORDER_BI, 0, 0 } }, - { "ttydrv", { LOADORDER_BI, 0, 0 } }, - { "user.exe", { LOADORDER_BI, 0, 0 } }, - { "user32", { LOADORDER_BI, 0, 0 } }, - { "w32skrnl", { LOADORDER_BI, 0, 0 } }, - { "winaspi", { LOADORDER_BI, 0, 0 } }, - { "winedos", { LOADORDER_BI, 0, 0 } }, - { "wineps", { LOADORDER_BI, 0, 0 } }, - { "wing", { LOADORDER_BI, 0, 0 } }, - { "winmm", { LOADORDER_BI, 0, 0 } }, - { "winsock", { LOADORDER_BI, 0, 0 } }, - { "wnaspi32", { LOADORDER_BI, 0, 0 } }, - { "wow32", { LOADORDER_BI, 0, 0 } }, - { "wprocs", { LOADORDER_BI, 0, 0 } }, - { "ws2_32", { LOADORDER_BI, 0, 0 } }, - { "wsock32", { LOADORDER_BI, 0, 0 } }, - { "x11drv", { LOADORDER_BI, 0, 0 } } + { "display", 0, { LOADORDER_BI, 0, 0 } }, + { "gdi.exe", 0, { LOADORDER_BI, 0, 0 } }, + { "gdi32", 0, { LOADORDER_BI, 0, 0 } }, + { "icmp", 0, { LOADORDER_BI, 0, 0 } }, + { "kernel", 0, { LOADORDER_BI, 0, 0 } }, + { "kernel32", 0, { LOADORDER_BI, 0, 0 } }, + { "keyboard", 0, { LOADORDER_BI, 0, 0 } }, + { "krnl386.exe", 0, { LOADORDER_BI, 0, 0 } }, + { "mmsystem", 0, { LOADORDER_BI, 0, 0 } }, + { "mouse", 0, { LOADORDER_BI, 0, 0 } }, + { "ntdll", 0, { LOADORDER_BI, 0, 0 } }, + { "odbc32", 0, { LOADORDER_BI, 0, 0 } }, + { "system", 1, { LOADORDER_BI, 0, 0 } }, + { "toolhelp", 0, { LOADORDER_BI, 0, 0 } }, + { "ttydrv", 0, { LOADORDER_BI, 0, 0 } }, + { "user.exe", 0, { LOADORDER_BI, 0, 0 } }, + { "user32", 0, { LOADORDER_BI, 0, 0 } }, + { "w32skrnl", 0, { LOADORDER_BI, 0, 0 } }, + { "winaspi", 0, { LOADORDER_BI, 0, 0 } }, + { "winedos", 0, { LOADORDER_BI, 0, 0 } }, + { "wineps", 0, { LOADORDER_BI, 0, 0 } }, + { "wing", 0, { LOADORDER_BI, 0, 0 } }, + { "winmm", 0, { LOADORDER_BI, 0, 0 } }, + { "winsock", 0, { LOADORDER_BI, 0, 0 } }, + { "wnaspi32", 0, { LOADORDER_BI, 0, 0 } }, + { "wow32", 0, { LOADORDER_BI, 0, 0 } }, + { "wprocs", 0, { LOADORDER_BI, 0, 0 } }, + { "ws2_32", 0, { LOADORDER_BI, 0, 0 } }, + { "wsock32", 0, { LOADORDER_BI, 0, 0 } }, + { "x11drv", 0, { LOADORDER_BI, 0, 0 } } }; static const struct loadorder_list default_list = @@ -300,7 +301,7 @@ static BOOL AddLoadOrder(module_loadorde */ static BOOL AddLoadOrderSet(char *key, char *order) { - module_loadorder_t ldo; + module_loadorder_t ldo = { 0 }; char *cptr; /* Parse the loadorder before the rest because strtok is not reentrant */ @@ -362,7 +363,7 @@ void MODULE_AddLoadOrderOption( const ch * default lists. */ static BOOL get_list_load_order( const char *module, const struct loadorder_list *list, - enum loadorder_type lo[] ) + enum loadorder_type lo[], int win32_flag ) { module_loadorder_t tmp, *res = NULL; @@ -370,7 +371,7 @@ static BOOL get_list_load_order( const c /* some bsearch implementations (Solaris) are buggy when the number of items is 0 */ if (list->count && (res = bsearch(&tmp, list->order, list->count, sizeof(list->order[0]), cmp_sort_func))) memcpy( lo, res->loadorder, sizeof(res->loadorder) ); - return (res != NULL); + return (res != NULL) && !(win32_flag && res->win16_flag); } @@ -591,7 +592,7 @@ void MODULE_GetLoadOrder( enum loadorder } /* check command-line first */ - if (get_list_load_order( module+1, &cmdline_list, loadorder )) + if (get_list_load_order( module+1, &cmdline_list, loadorder, 0 )) { TRACE( "got cmdline %s for %s\n", debugstr_loadorder(loadorder), debugstr_a(path) ); @@ -650,7 +651,7 @@ void MODULE_GetLoadOrder( enum loadorder } /* then base name matching compiled-in defaults */ - if (get_list_load_order( basename, &default_list, loadorder )) + if (get_list_load_order( basename, &default_list, loadorder, win32 )) { TRACE( "got compiled-in default %s for %s\n", debugstr_loadorder(loadorder), debugstr_a(path) );

1 0

Re: Sync(1): include/winerror.h
by Alexandre Julliard Aug. 16, 2003

Aug. 16, 2003

Jon Griffiths <jon_p_griffiths(a)yahoo.com> writes: > This patch casts hresult errors into HRESULTs as per the native > headers. The native headers don't have a _HR_() macro, so we shouldn't have one either. Please do normal casts instead. -- Alexandre Julliard julliard(a)winehq.com

2 1

Translating wine programs
by puoti＠inwind.it Aug. 16, 2003

Aug. 16, 2003

I've started with an easy thing, the wine clock, please let me know if I've done this properly.

2 1

Translating wine programs
by puoti＠inwind.it Aug. 15, 2003

Aug. 15, 2003

I would like to add an italian translation to the wine programs that lack it, can I write it.rc and add # include it.rc to the rc file that contains the language includes? Let me know if this is the correct thing to do, and if yes I'll send in a few diffs.

1 0

[D3D] New errors on gta3
by root Aug. 15, 2003

Aug. 15, 2003

Hi everyone, The latest CVS shows this error on GTA3. Although it is an improvement since it doesn't crash into the debugger, but instead it just stops. It generated (after a long list of IDirect3D8Impl_CheckDeviceFormat fixme's) this output: fixme:d3d:IDirect3D8Impl_CheckDeviceFormat (0x405b21a0)->(Adptr:0, DevType:(1,D3DDEVTYPE_HAL), AdptFmt:(23,D3DFMT_R5G6B5), Use:(0,none), ResTyp:(3,D3DRTYPE_TEXTURE), CheckFmt:(41,D3DFMT_P8)) fixme:d3d:IDirect3D8Impl_CheckDeviceFormat (0x405b21a0)->(Adptr:0, DevType:(1,D3DDEVTYPE_HAL), AdptFmt:(23,D3DFMT_R5G6B5), Use:(0,none), ResTyp:(3,D3DRTYPE_TEXTURE), CheckFmt:(41,D3DFMT_P8)) fixme:d3d:IDirect3DDevice8Impl_SetPaletteEntries (0x40660b10) : setting p[40] <= RGBA(f8,b1,00,ff) fixme:system:SystemParametersInfoA Unimplemented action: 86 (SPI_SETPOWEROFFACTIVE) fixme:system:SystemParametersInfoA Unimplemented action: 85 (SPI_SETLOWPOWERACTIVE) fixme:system:SystemParametersInfoA Unimplemented action: 59 (SPI_SETSTICKYKEYS) I'm now looking for a game that shows the same output but has a demo for download. -- E. C. F. Wolff

1 0

Re: 5 Wine-Tests fail on FreeBSD 5.1
by Eric Pouech Aug. 15, 2003

Aug. 15, 2003

>>I think more that's a discrepency in OSS handling between linux & *BSD >>(or a more subtle bug somewhere) >>could you rerun with WINEOPTIONS="-debugmsg +wave,+dsound,+wavemap" back from vacation... the trace only shows a decent startup and a wait for incoming audio packets, which never show up. > Let's take this further. I wrote to you/this list, about winedbg > crashing on startup _every_time_. And I suspect it's this TEB thingy (I > have no clue what a TEB is, but I really think something is broken > there). a TEB is a thread environment block: a user land structure describing a thread status. TEB is usually stored in a page, which is pointer by the fs register. there's a field in the TEB which holds its linear address. Hence, getting the linear address of a TEB is written fs:0x18. Thread commutation (from a scheduler point of view) is (almost as simple as) changing the value of fs (there's also stack switching, context switching...). Anyway, your back trace information don't absolutely show that the TEB get screwed up. Since getting the TEB linear address is inlined, gdb sure has a hard time getting the value from the stack (as it may get overwritten by upper calls). It doesn't mean however that TEB doesn't get overwritten. In gdb, you should check: 1/ at thread startup, where TEB is located, and which is the value of fs. 2/ on each lookup, check if fs value changed, and if TEB struct at address gotten from 1/ is still ok. You would want also to check that LDT entry for fs is still correct. > Now back to "wine winedbg winemine". it should be run as winedbg winemine > wait4: Interrupted system call > wait4: Interrupted system call <this line gets repeated every 1-4 seconds> does this help ? Index: ptrace.c =================================================================== RCS file: /home/cvs/cvsroot/wine/wine/server/ptrace.c,v retrieving revision 1.26 diff -u -u -r1.26 ptrace.c --- ptrace.c 6 May 2003 00:21:21 -0000 1.26 +++ ptrace.c 15 Aug 2003 12:38:14 -0000 @@ -149,6 +149,7 @@ thread->unix_tid = -1; thread->attached = 0; } + else if (errno == EINTR) continue; else perror( "wait4" ); return 0; } A+ -- Eric Pouech

1 0