wine-devel

wine-devel@winehq.org

2 participants
84469 discussions

[Take 2] Make check error
by Dustin Navea 04 Dec '05

04 Dec '05

The last error was caused by linux/capi.h being included, even though it wont compile (checked configure) This one I'm not sure about. ../../../tools/runtest -q -P wine -M gdi32.dll -T ../../.. -p gdi32_test.exe.so metafile.c && touch metafile.ok metafile.c:135: Test failed: pass 0: dx[0] (0) didn't match 6 metafile.c:135: Test failed: pass 0: dx[1] (0) didn't match 2 metafile.c:135: Test failed: pass 0: dx[2] (0) didn't match 6 metafile.c:135: Test failed: pass 0: dx[3] (0) didn't match 5 metafile.c:135: Test failed: pass 0: dx[4] (0) didn't match 2 metafile.c:135: Test failed: pass 0: dx[5] (0) didn't match 4 metafile.c:135: Test failed: pass 0: dx[6] (0) didn't match 2 metafile.c:135: Test failed: pass 0: dx[7] (0) didn't match 3 metafile.c:135: Test failed: pass 0: dx[8] (0) didn't match 4 metafile.c:135: Test failed: pass 0: dx[9] (0) didn't match 5 metafile.c:135: Test failed: pass 0: dx[10] (0) didn't match 3 metafile.c:135: Test failed: pass 0: dx[11] (0) didn't match 2 metafile.c:135: Test failed: pass 0: dx[12] (0) didn't match 3 metafile.c:135: Test failed: pass 0: dx[13] (0) didn't match 5 metafile.c:135: Test failed: pass 0: dx[14] (0) didn't match 2 metafile.c:135: Test failed: pass 0: dx[15] (0) didn't match 3 metafile.c:135: Test failed: pass 0: dx[16] (0) didn't match 4 metafile.c:135: Test failed: pass 0: dx[17] (0) didn't match 4 metafile.c:135: Test failed: pass 0: dx[18] (0) didn't match 3 metafile.c:135: Test failed: pass 0: dx[19] (0) didn't match 2 metafile.c:135: Test failed: pass 0: dx[20] (0) didn't match 6 metafile.c:135: Test failed: pass 0: dx[21] (0) didn't match 5 metafile.c:135: Test failed: pass 0: dx[22] (0) didn't match 3 metafile.c:135: Test failed: pass 0: dx[23] (0) didn't match 4 metafile.c:135: Test failed: pass 0: dx[24] (0) didn't match 4 metafile.c:135: Test failed: pass 0: dx[25] (0) didn't match 5 metafile.c:135: Test failed: pass 0: dx[26] (0) didn't match 3 metafile.c:135: Test failed: pass 0: dx[27] (0) didn't match 6 metafile.c:135: Test failed: pass 0: dx[28] (0) didn't match 4 metafile.c:135: Test failed: pass 0: dx[29] (0) didn't match 3 metafile.c:135: Test failed: pass 0: dx[30] (0) didn't match 2 metafile.c:135: Test failed: pass 0: dx[31] (0) didn't match 5 metafile.c:135: Test failed: pass 0: dx[32] (0) didn't match 5 metafile.c:135: Test failed: pass 0: dx[33] (0) didn't match 2 metafile.c:135: Test failed: pass 0: dx[34] (0) didn't match 6 metafile.c:135: Test failed: pass 0: dx[35] (0) didn't match 4 metafile.c:135: Test failed: pass 0: dx[36] (0) didn't match 3 metafile.c:135: Test failed: pass 0: dx[37] (0) didn't match 4 metafile.c:135: Test failed: pass 0: dx[38] (0) didn't match 3 metafile.c:135: Test failed: pass 0: dx[39] (0) didn't match 2 metafile.c:135: Test failed: pass 0: dx[40] (0) didn't match 2 metafile.c:135: Test failed: pass 0: dx[41] (0) didn't match 4 metafile.c:135: Test failed: pass 0: dx[42] (0) didn't match 4 fixme:dc:GdiIsMetaPrintDC (nil) fixme:dc:GdiIsPlayMetafileDC (nil) fixme:dc:GdiIsMetaPrintDC 0x358 fixme:dc:GdiIsPlayMetafileDC 0x358 fixme:dc:GdiIsMetaPrintDC 0x368 fixme:dc:GdiIsPlayMetafileDC 0x368 make[3]: *** [metafile.ok] Error 43 make[3]: Leaving directory `/home/speeddy/wine/dlls/gdi/tests' make[2]: *** [tests/__test__] Error 2 make[2]: Leaving directory `/home/speeddy/wine/dlls/gdi' make[1]: *** [gdi/__test__] Error 2 make[1]: Leaving directory `/home/speeddy/wine/dlls' make: *** [dlls/__test__] Error 2

1 0

Re: msvcrt incompatibility in Origin 6.0 when saving documents
by Olaf Leidinger 03 Dec '05

03 Dec '05

Hello again! Running Origin6.0 with WINEDEBUG="+snoop,+relay" with and without native msvcrt, tailing, cutting and wc-ing and finally diffing the output I found the following: First of all using the native version I get some msvcrt._EH_prolog calls I can't find in the builtin version. all window-procs have such calls: native: ret kernel32.94() retval=00000009 ret=7f6c5a5c call window proc 0x6c231b81 (hwnd=0x1003a,msg=wm_settext,wp=00000000,lp=7fadedd4) call msvcrt._eh_prolog(7f6cf147,0001003a,0000000c,00000000,7fadedd4 "microcal origin - i ret msvcrt._eh_prolog() retval=7db10190 ret=6c231b8b call msvcrt._eh_prolog(6c231b9c,6c23b419,6c231b81,6c231b81,7fadf8ec,6c2c2cfe,ffffffff0009 ret ntdll.rtlentercriticalsection() retval=00000000 ret=7e6563d2 call ntdll.rtlleavecriticalsection(7e69a888) ret=7e656412 ret ntdll.rtlleavecriticalsection() retval=00000000 ret=7e656412 \\mnt\\privat\\origin6\\untitled",7f6ee620,0001003a,0000000c, ...) ret=6c2310b5 ret msvcrt._eh_prolog() retval=7db10190 ret=6c2310b5 call kernel32.tlsgetvalue(00000003) ret=6c231018 ret kernel32.tlsgetvalue() retval=7fdd7a88 ret=6c231018 call msvcrt._eh_prolog(6c23138a,00000000,6c231be9,0001003a,7fadeba8,6c231bba,0001003a,0000000c,00000000,7fadedd4 "microcal origin - i ret msvcrt._eh_prolog() retval=7db10190 ret=6c23112a call kernel32.tlsgetvalue(00000003) ret=6c231018 ret kernel32.tlsgetvalue() retval=7fdd7a88 ret=6c231018 call kernel32.tlsgetvalue(00000003) ret=6c231018 ret kernel32.tlsgetvalue() retval=7fdd7a88 ret=6c231018 call msvcrt._eh_prolog(6c231bfb,7d9366c0,0001003a,0000000c,00000000,7fadedd4 "microcal origin - i ret msvcrt._eh_prolog() retval=7db10190 ret=6c231c09 call kernel32.tlsgetvalue(00000003) ret=6c231018 builtin: call window proc 0x6c231b81 (hwnd=0x1003a,msg=wm_settext,wp=00000000,lp=7fadedd4) call kernel32.tlsgetvalue(00000003) ret=6c231018 This is another example not concerting window procs: native: call kernel32.lstrlena(7fadecc0 "microcal origin") ret=6c2338d7 ret kernel32.lstrlena() retval=0000000f ret=6c2338d7 call msvcrt._eh_prolog(6c2319c6,0000000f,7fadedd0,7fd299fc,6c23393c,0000000f,0000000f,7fadedd0,6c2338f9,0000000f,7fadecc0 "microcal origin",7fadedd0,6c2338e0,0000000f,7fadecc0 "microcal origin",0000000f, ...) ret=6c231aeb ret msvcrt._eh_prolog() retval=7db101a9 ret=6c231aeb call ntdll.rtlentercriticalsection(6c300088) ret=6c231b03 same as builtin: call kernel32.lstrlena(7fadecc0 "microcal origin") ret=6c2338d7 ret kernel32.lstrlena() retval=0000000f ret=6c2338d7 call ntdll.rtlentercriticalsection(6c300088) ret=6c231b03 >From mfc there is also such a call: native: call mfc42.6374(0000000c,00000000,7fadedd4 "microcal origin - i call mfc42.5163(0000000c,00000000,7fadedd4 "microcal origin - i call msvcrt._eh_prolog(7db101db,0000000c,00000000,7fadedd4 "microcal origin - i ret msvcrt._eh_prolog() retval=7db101f4 ret=6c231d16 call ntdll.rtlentercriticalsection(6c300220) ret=6c23178e builtin: call mfc42.6374(0000000c,00000000,7fadedd4 "microcal origin - i call mfc42.5163(0000000c,00000000,7fadedd4 "microcal origin - i call ntdll.rtlentercriticalsection(6c300220) ret=6c23178e Then there is also a difference when calling ftime(): native: (line 16240) call msvcrt.memcpy(7d945558 "untitled",7fe5e27a "untitled",00000008) ret=6c233905 ret msvcrt.memcpy() retval=7d945558 ret=6c233905 ret mfc42.860() retval=7d943dc0 ret=7f81a080 call outl60.labutil_str2date(00000000,00000003,00000000) ret=7f81a0fe call msvcrt._ftime() ret=7f74100d call kernel32.getsystemtimeasfiletime(7fadedf0) ret=78026aad call ntdll.ntquerysystemtime(7fadec80) ret=7fd08e30 ret kernel32.getsystemtimeasfiletime() retval=01c5f531 ret=78026aad ret msvcrt._ftime() retval=438cd1d8 ret=7f74100d call msvcrt.localtime() ret=7f74103e call kernel32.getlasterror() ret=78002699 ret kernel32.getlasterror() retval=00000000 ret=78002699 call kernel32.tlsgetvalue(00000002) ret=780026a7 ret kernel32.tlsgetvalue() retval=7d930088 ret=780026a7 call kernel32.setlasterror(00000000) ret=780026b8 ret kernel32.setlasterror() retval=00000000 ret=780026b8 ret msvcrt.localtime() retval=7d9306f8 ret=7f74103e builtin: (line 16632) call msvcrt.memcpy(7fe7dff8,7fe637e2,00000008) ret=6c233905 ret msvcrt.memcpy() retval=7fe7dff8 ret=6c233905 ret mfc42.860() retval=7fe7aac0 ret=7f81a080 call outl60.labutil_str2date(00000000,00000003,00000000) ret=7f81a0fe call msvcrt._ftime(7f75b778) ret=7f74100d call kernel32.gettimezoneinformation(7fadec9c) ret=7e886be4 call ntdll.rtlquerytimezoneinformation(7fadec9c) ret=7fd09bce ret ntdll.rtlquerytimezoneinformation() retval=00000000 ret=7fd09bce call ntdll.ntquerysystemtime(7fadebc0) ret=7fd08e30 ret kernel32.gettimezoneinformation() retval=00000000 ret=7e886be4 call kernel32.getsystemtimeasfiletime(7faded48) ret=7e886bf3 call ntdll.ntquerysystemtime(7fadebe0) ret=7fd08e30 ret ntdll.ntquerysystemtime() retval=00000000 ret=7fd08e30 ret kernel32.getsystemtimeasfiletime() retval=01c5f530 ret=7e886bf3 ret msvcrt._ftime() retval=00000000 ret=7f74100d call msvcrt.localtime(7f75b748) ret=7f74103e call kernel32.filetimetolocalfiletime(7faded48,7faded40) ret=7e886e9a call ntdll.rtlsystemtimetolocaltime(7fadeba4,7fadebac) ret=7fd09f03 ret ntdll.rtlsystemtimetolocaltime() retval=00000000 ret=7fd09f03 ret kernel32.filetimetolocalfiletime() retval=00000001 ret=7e886e9a call kernel32.filetimetosystemtime(7faded40,7faded30) ret=7e886ea4 call ntdll.rtltimetotimefields(7fadebb0,7fadeba0) ret=7fd09572 ret ntdll.rtltimetotimefields() retval=0000016f ret=7fd09572 ret kernel32.filetimetosystemtime() retval=00000001 ret=7e886ea4 call kernel32.gettimezoneinformation(7fadec84) ret=7e886fd1 call ntdll.rtlquerytimezoneinformation(7fadec84) ret=7fd09bce ret ntdll.rtlquerytimezoneinformation() retval=00000000 ret=7fd09bce call ntdll.ntquerysystemtime(7fadeb98) ret=7fd08e30 ret ntdll.ntquerysystemtime() retval=00000000 ret=7fd08e30 ret kernel32.gettimezoneinformation() retval=00000000 ret=7e886fd1 ret msvcrt.localtime() retval=7e8ae660 ret=7f74103e And the native msvcrt seems to use an internal _ftol native: call msvcrt._cipow() ret=7f82aaf9 ret msvcrt._cipow() retval=40f00020 ret=7f82aaf9 call msvcrt._ftol() ret=7f82a67a ret msvcrt._ftol() retval=00000001 ret=7f82a67a builtin: call msvcrt._cipow() ret=7f82aaf9 ret msvcrt._cipow() retval=00000001 ret=7f82aaf9 call ntdll._ftol() ret=7f82a67a ret ntdll._ftol() retval=0000000000000001 ret=7f82a67a By the way... what is the difference between "retval" and "ret"? It sounds the same. There are still some megs in front of me... Perhaps you could comment my discoveries so far. Personally I think they aren't very important, but I really don't know much about the win32 api, so I can't tell... Ciao, Olaf Leidinger

2 2

wine alsa impelmentation
by Tomas Carnecky 03 Dec '05

03 Dec '05

I have a Envy24PT sound chip, without hardware mixing, so I had to setup dmix (in ~/.asoundrc). That works fine when I try to play two sound files with any combination of mplayer, alsaplayer and mpg123). But when I start any of those a then wine, I get this: ALSA lib pcm_dmix.c:788:(snd_pcm_dmix_open) unable to create IPC shm instance and I get no sound. If I start wine first and then mplayer I get this: pcm_params.c:187: snd_pcm_hw_param_get_min: Assertion `!snd_interval_empty(i)' failed. In which way does the wine alsa implementation differ from the one of mplayer, alsaplayer or mpg123? Or what could cause this problem.. Also I get lots of fixme:dsound:DSOUND_MixOne problem with underrun detection (mixlen=16384 < primary_done=21168) err:dsound:DSOUND_MixOne underrun on sound buffer 0x55952bf8 err:wave:wodPlayer_ProcessMessages pcm_pause failed: Input/output error and rarely fixme:wave:ALSA_AddRingMessage two fast messages in the queue!!!! toget = 11(WINE_WM_RESTARTING), tosave=12(UNKNOWN(0x00000000)) messages. How can I improve my sound quality? My asoundrc is in the attachment. thanks tom pcm.!dmix { type dmix ipc_key 5678293 slave { pcm "hw:0,0" period_size 1024 buffer_size 16384 format S32_LE } } pcm.!dsnoop { type dsnoop ipc_key 5778293 slave { pcm "hw:0,0" format S32_LE } } pcm.duplex { type asym playback.pcm "dmix" capture.pcm "dsnoop" } pcm.!default { type plug slave.pcm "duplex" } pcm.default { type plug slave.pcm "duplex" } pcm.!dsp { type plug slave.pcm "duplex" } ctl.!mixer { type hw card 0 }

1 0

Re: advpack: Handle dwFlags for DelNode with tests
by James Hawkins 03 Dec '05

03 Dec '05

On 12/1/05, James Hawkins <truiken(a)gmail.com> wrote: > Hi, > > I changed the invalid CharPrev != "\\" comparison to string[len] != '\\'. > > Changelog > * Use DelNode itself for the directory recursion. > * Handle the dwFlags parameter. > * Factor out file creation and deletion. > * Add test cases for DelNode and make them pass. > Anything wrong with this? -- James Hawkins

1 0

Re: [MSI] DllCanUnloadNow
by James Hawkins 03 Dec '05

03 Dec '05

On 12/3/05, Christian Gmeiner <christian.gmeiner(a)students.fh-vorarlberg.ac.at> wrote: > It also fixes some spacing stuff. Whitespace changes need to go in a separate patch, if at all. -- James Hawkins

1 0

Norweigan Bokmaal resources
by "Alexander N. Sørnes" 02 Dec '05

02 Dec '05

Update or add Norwegian Bokmål resources for the following parts dlls/commdlg dlls/iccvid dlls/msvidc32 dlls/msvideo programs/notepad programs/regedit programs/winecfg Regards, Alexander N. Sørnes Index: dlls/commdlg/cdlg_No.rc =================================================================== RCS file: /home/wine/wine/dlls/commdlg/cdlg_No.rc,v retrieving revision 1.12 diff -u -p -r1.12 cdlg_No.rc --- dlls/commdlg/cdlg_No.rc 2 Dec 2005 10:31:01 -0000 1.12 +++ dlls/commdlg/cdlg_No.rc 2 Dec 2005 21:03:10 -0000 @@ -401,9 +401,9 @@ Oppgi en verdi mellom %d og %d." PD32_OUT_OF_MEMORY "Ikke mer minne." PD32_GENERIC_ERROR "En feil har oppstått." PD32_DRIVER_UNKNOWN "Ukjent skriverdriver." - PD32_NO_DEVICES "Before you can perform printer-related tasks \ -such as page setup or printing a document, you need to install a printer. \ -Please install one and retry." + PD32_NO_DEVICES "Du må installere en skriver før du \ + kan gjøre skriver-relaterte oppgaver som å endre \ sideoppsettet og skrive ut et dokument. \ + Installer en og prøv på nytt." PD32_DEFAULT_PRINTER "Standardskriver; " PD32_NR_OF_DOCUMENTS_IN_QUEUE "Det er %d dokumenter i køen" --- /dev/null 2005-09-03 13:32:59.000000000 +0000 +++ dlls/iccvid/iccvid_No.rc 2005-12-02 21:55:21.543181552 +0000 @@ -0,0 +1,25 @@ +/* + * Copyright 2005 Alexander N. Sørnes <alex(a)thehandofagony.com> + * + * 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_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL + +STRINGTABLE DISCARDABLE +{ + IDS_NAME "Cinepak-videokodek" + IDS_DESCRIPTION "Cinepak-videokodek" +} Index: dlls/iccvid/rsrc.rc =================================================================== RCS file: /home/wine/wine/dlls/iccvid/rsrc.rc,v retrieving revision 1.3 diff -u -p -r1.3 rsrc.rc --- dlls/iccvid/rsrc.rc 29 Nov 2005 16:42:51 -0000 1.3 +++ dlls/iccvid/rsrc.rc 2 Dec 2005 20:53:48 -0000 @@ -22,3 +22,4 @@ #include "iccvid_De.rc" #include "iccvid_En.rc" #include "iccvid_Ko.rc" +#include "iccvid_No.rc" --- /dev/null 2005-09-03 13:32:59.000000000 +0000 +++ dlls/msvidc32/msvidc32_No.rc 2005-12-02 21:51:45.685996832 +0000 @@ -0,0 +1,25 @@ +/* + * Copyright 2005 Alexander N. Sørnes <alex(a)thehandofagony.com> + * + * 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_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL + +STRINGTABLE DISCARDABLE +{ + IDS_NAME "WINE-MS-CRAM" + IDS_DESCRIPTION "Wine Video 1-videokodek" +} Index: dlls/msvidc32/rsrc.rc =================================================================== RCS file: /home/wine/wine/dlls/msvidc32/rsrc.rc,v retrieving revision 1.3 diff -u -p -r1.3 rsrc.rc --- dlls/msvidc32/rsrc.rc 29 Nov 2005 16:42:51 -0000 1.3 +++ dlls/msvidc32/rsrc.rc 2 Dec 2005 20:55:51 -0000 @@ -22,3 +22,4 @@ #include "msvidc32_De.rc" #include "msvidc32_En.rc" #include "msvidc32_Ko.rc" +#include "msvidc32_No.rc" --- /dev/null 2005-09-03 13:32:59.000000000 +0000 +++ dlls/msvideo/msvfw32_No.rc 2005-12-02 21:54:14.742336824 +0000 @@ -0,0 +1,51 @@ +/* + * Copyright 2005 Alexander N. Sørnes <alex(a)thehandofagony.com> + * + * 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_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL + +ICM_CHOOSE_COMPRESSOR DIALOG DISCARDABLE 36, 24, 187, 95 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Videokomprimering" +FONT 8, "MS Shell Dlg" +{ + DEFPUSHBUTTON "OK",IDOK,129,2,49,14 + PUSHBUTTON "Avbryt",IDCANCEL,129,18,49,14 + + LTEXT "&Komprimerer:",-1,9,6,105,8 + COMBOBOX 880,9,16,111,67,CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP + + PUSHBUTTON "&Oppsett . . .",882,129,36,49,14 + PUSHBUTTON "O&m . . .",883,129,52,49,14 + + SCROLLBAR 884,9,44,111,9,WS_TABSTOP + + LTEXT "Komprimeringskvalite&t:",886,9,34,80,8 + + CONTROL "Nø&kkelbilde for hvert",887,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,60,66,12 + EDITTEXT 888,78,60,22,12 + LTEXT "bilde",889,103,62,26,10 + + CONTROL "&Datahastighet",894,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,76,66,12 + EDITTEXT 895,78,76,22,12 + LTEXT "KB/s",896,102,78,26,10 +} + +STRINGTABLE DISCARDABLE +{ + IDS_FULLFRAMES "Fulle bilder (ukomprimert)" +} Index: dlls/msvideo/rsrc.rc =================================================================== RCS file: /home/wine/wine/dlls/msvideo/rsrc.rc,v retrieving revision 1.3 diff -u -p -r1.3 rsrc.rc --- dlls/msvideo/rsrc.rc 23 Nov 2005 19:26:23 -0000 1.3 +++ dlls/msvideo/rsrc.rc 2 Dec 2005 20:52:29 -0000 @@ -23,3 +23,4 @@ #include "msvfw32_De.rc" #include "msvfw32_En.rc" #include "msvfw32_Ko.rc" +#include "msvfw32_No.rc" Index: programs/notepad/No.rc =================================================================== RCS file: /home/wine/wine/programs/notepad/No.rc,v retrieving revision 1.2 diff -u -p -r1.2 No.rc --- programs/notepad/No.rc 7 Oct 2005 15:02:03 -0000 1.2 +++ programs/notepad/No.rc 2 Dec 2005 20:35:22 -0000 @@ -22,7 +22,7 @@ LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGI MAIN_MENU MENU { - POPUP "&FIl" { + POPUP "&Fil" { MENUITEM "&Ny . . .\tCtrl+N", CMD_NEW MENUITEM "&Åpne\tCtrl+O", CMD_OPEN MENUITEM "&Lagre\tCtrl+S", CMD_SAVE Index: programs/regedit/No.rc =================================================================== RCS file: /home/wine/wine/programs/regedit/No.rc,v retrieving revision 1.1 diff -u -p -r1.1 No.rc --- programs/regedit/No.rc 26 Sep 2005 11:03:32 -0000 1.1 +++ programs/regedit/No.rc 2 Dec 2005 21:17:49 -0000 @@ -82,9 +82,7 @@ BEGIN POPUP "&Favoritters" BEGIN MENUITEM "Legg til i f&avoritter", ID_FAVORITES_ADDTOFAVORITES - , GRAYED MENUITEM "Fje&rn favoritt", ID_FAVORITES_REMOVEFAVORITE - , GRAYED END POPUP "&Hjelp" BEGIN @@ -141,6 +139,44 @@ BEGIN DEFPUSHBUTTON "OK",IDOK,195,6,30,11,WS_GROUP END +IDD_FIND DIALOG DISCARDABLE 22, 17, 210, 85 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Finn" +FONT 8, "MS Shell Dlg" +BEGIN +LTEXT "Finn:",IDC_STATIC,5,7,119,8 +EDITTEXT IDC_VALUE_NAME,40,5,125,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL +LTEXT "Finn i:",IDC_STATIC,5, 22, 119, 8 +CHECKBOX "Nøkler", IDC_FIND_KEYS, 5, 34, 90, 10, WS_TABSTOP | WS_GROUP | BS_AUTOCHECKBOX +CHECKBOX "Verdinavn", IDC_FIND_VALUES, 5, 46, 90, 10, WS_TABSTOP | BS_AUTOCHECKBOX +CHECKBOX "Verdiinnhold", IDC_FIND_CONTENT, 5, 58, 90, 10, WS_TABSTOP | BS_AUTOCHECKBOX +CHECKBOX "Kun hele strenger", IDC_FIND_WHOLE, 5, 70, 90, 10, WS_TABSTOP | BS_AUTOCHECKBOX +DEFPUSHBUTTON "Finn",IDOK,175,5,30,11,WS_GROUP +PUSHBUTTON "Lukk",IDCANCEL,175,22,30,11, WS_GROUP +END + +IDD_ADDFAVORITE DIALOG DISCARDABLE 22, 17, 210, 55 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Legg til favoritt" +FONT 8, "MS Shell Dlg" +BEGIN +LTEXT "Navn:",IDC_STATIC,5,5,119,8 +EDITTEXT IDC_VALUE_NAME,5,15,200,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL +DEFPUSHBUTTON "OK",IDOK,140,40,30,11,WS_GROUP +PUSHBUTTON "Avbryt",IDCANCEL,175,40,30,11, WS_GROUP +END + +IDD_DELFAVORITE DIALOG DISCARDABLE 22, 17, 210, 90 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Fjern favoritt" +FONT 8, "MS Shell Dlg" +BEGIN +LTEXT "Navn:",IDC_STATIC,5,5,119,8 +LISTBOX IDC_NAME_LIST,5,15,200,52, WS_BORDER | WS_TABSTOP | LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL +DEFPUSHBUTTON "OK",IDOK,140,73,30,11,WS_GROUP +PUSHBUTTON "Avbryt",IDCANCEL,175,73,30,11, WS_GROUP +END + IDD_EDIT_STRING DIALOG DISCARDABLE 22, 17, 210, 75 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Rediger streng" @@ -256,6 +292,7 @@ BEGIN IDS_DELETE_BOX_TEXT "Virkelig slette verdien '%s'?" IDS_NEWKEY "Ny nøkkel #%d" IDS_NEWVALUE "Ny verdi #%d" + IDS_NOTFOUND "Fant ikke søkestrengen «%s»" END /*****************************************************************/ Index: programs/winecfg/No.rc =================================================================== RCS file: /home/wine/wine/programs/winecfg/No.rc,v retrieving revision 1.4 diff -u -p -r1.4 No.rc --- programs/winecfg/No.rc 27 Oct 2005 11:24:02 -0000 1.4 +++ programs/winecfg/No.rc 2 Dec 2005 21:28:18 -0000 @@ -62,6 +62,8 @@ BEGIN LTEXT "Du kan velge å emulere et Windows-skrivebord, sånn at alle Windows-programmer samles i ett vindu, eller at Windows-programmer oppfrer seg som vanlige programmer.", IDC_STATIC,15,73,228,28 + LTEXT "Du kan velge å emulere et Windows-skrivebord, der alle vinduene er bundet i en virtuell skjerm, eller du kan få vinduene til å oppføre seg som andre programmer på skrivebordet.", + IDC_STATIC,15,73,228,28 LTEXT "Skrivebordsstrrelse:",IDC_DESKTOP_SIZE,15,115,44,8,WS_DISABLED LTEXT "X",IDC_DESKTOP_BY,108,115,8,8,WS_DISABLED CONTROL "Virtuelt skrivebord",IDC_ENABLE_DESKTOP,"Button", @@ -192,4 +194,6 @@ BEGIN IDS_TAB_AUDIO "Lyd" IDS_TAB_ABOUT "Om" IDS_WINECFG_TITLE "Wine-konfigurasjon" + IDS_THEMEFILE "Temafiler" + IDS_THEMEFILE_SELECT "Velg en temafil" END

1 0

Re: [OLE #155] Fix Invoking dispinterface Functions
by Robert Shearman 02 Dec '05

02 Dec '05

Robert Shearman wrote: > ChangeLog: > Fix invoking dispinterface functions by using the internal > representation of the function, not the one returned to applications. I've just noticed that this function now has some duplicated code, so don't use this patch. I'll send a replacement one with a correction. -- Rob Shearman

1 0

wglGetPixelFormatAttribivARB unexpected RenderType(100)
by Toan T Nguyen 02 Dec '05

02 Dec '05

Hi, I compile and run Quake2Evolved in linux using winelib. Although every seems fine, there's this error printed out when Q2E scans for the best pixel format: err:opengl:wglGetPixelFormatAttribivARB unexpected RenderType(100) I look up my /usr/include/GL/glxATI.h and found these lines: #ifndef GLX_ATI_pixel_format_float #define GLX_ATI_pixel_format_float 1 #define GLX_RGBA_FLOAT_ATI_BIT 0x00000100 #endif // GLX_ATI_pixel_format_float Bests, Toan

1 0

DBGRID32.OCX fix - RFC
by Alex Villacís Lasso 02 Dec '05

02 Dec '05

I would like to know if the attached patch (which prevents DBGRID32.OCX from crashing, as well as adding additional debugging information when a reference is not found) would step on anybody's toes (especially Robert Shearman, since he is sending several oleaut32 patches himself). As of 2005-12-01 CVS, any VisualBasic application that tries to use DBGRID32.OCX will systematically crash unless the patch is applied. However, since Robert Shearman is sending oleaut32 fixes, I think he might implement some functionality that will, as a side effect, fix the DBGRID32.OCX bug. Alex Villacís Lasso

2 3

Steam regression of the day
by Ivan Gyurdiev 02 Dec '05

02 Dec '05

The networking bug has been fixed, but another problem is that I can't see any of the text. Appdb mentions something about installing tahoma.ttf from a Windows installation, which makes no sense to me, since I could see Steam displayed fine earlier, making this a regression. Any suggestions as to what might have caused this (or maybe it was a Steam upgrade?). Also - Steam has a keyboard focus bug, with a documented patch here (from Stefan Dosinger): http://www.winehq.org/hypermail/wine-patches/2005/03/0504.html Previously he reported that the patch might break other apps, but if it fixes Steam, then it must be on the right track - surely it can be changed so it's acceptable for Wine CVS. I don't understand why a known bug with a known patch remains unfixed.

2 4

Re: msvidc32: Remove unused DllMain() function
by Dmitry Timoshkov 02 Dec '05

02 Dec '05

"Francois Gouget" <fgouget(a)free.fr> wrote: > msvideo1.c defines a DllMain() function but: > * it is not exported in the spec file > * it is not referenced in any way anywhere else > * the native dll does not export a DllMain function either DllMain does not need to be exported to define an entry point of the DLL. Moreover, DllMain of msvidc32 initializes MSVIDC32_hModule which is used later on. -- Dmitry.

1 0

Unnormal slowness in Heroes 4 (X11DRV_BitBlt?)
by Marinescu-Ghetau Iulian 02 Dec '05

02 Dec '05

See http://bugs.winehq.org/show_bug.cgi?id=3902 Hey guys, a bit of help here! I did the following changes: -added member to X_PHYSBITMAP: XRectangle modified_rect; -added 2 functions: /*********************************************************************** * X11DRV_SetBoundRect */ void X11DRV_SetBoundRect(X_PHYSBITMAP *physBitmap, INT x, INT y, INT width, INT height) { XRectangle *t; INT xMin,yMin,xMax,yMax; if (!physBitmap) return; t = &(physBitmap->modified_rect); if ( t->width && t->height && /*already a valid rect inside*/ width && height ) /*not trying to invalidate rect*/ { //calculate the union of the two rectangles xMin = ((t->x < x)?t->x:x); yMin = ((t->y < y)?t->y:y); xMax = ((t->x + t->width > x + width)?(t->x + t->width):(x + width)); yMax = ((t->y + t->height > y + height)?(t->y + t->height):(y + height)); t->x = xMin; t->y = yMin; t->width = xMax - xMin; t->height = yMax - yMin; } else { t->x = x; t->y = y; t->width = width; t->height = height; } TRACE("(%p,%d,%d,%d,%d)\n", physBitmap->hbitmap, t->x, t->y, t->width, t->height); } /*********************************************************************** * X11DRV_GetBoundRect */ UINT X11DRV_GetBoundRect(X_PHYSBITMAP *physBitmap, INT *x, INT *y, INT *width, INT *height) { DIBSECTION dib; XRectangle *t; if (!physBitmap || GetObjectW( physBitmap->hbitmap, sizeof(dib), &dib ) != sizeof(dib)) { ERR("called for non-DIBSection!?\n"); return 1; } t = &(physBitmap->modified_rect); /* we should check for oversize values */ if ( (t->width > 0) && (t->height > 0) && (t->x < dib.dsBm.bmWidth) && (t->y < dib.dsBm.bmHeight) ) { *x = t->x; *y = t->y; if (t->x + t->width > dib.dsBm.bmWidth) *width = dib.dsBm.bmWidth - t->x; else *width = t->width; if (t->y + t->height > dib.dsBm.bmHeight) *height = dib.dsBm.bmHeight - t->y; else *height = t->height; } else { *x = 0; *y = 0; *width = dib.dsBm.bmWidth; *height = dib.dsBm.bmHeight; } TRACE("(%p,%d,%d,%d,%d)\n", physBitmap->hbitmap, *x, *y, *width, *height); return 0; } -changed X11DRV_DIB_DoUpdateDIBSection like this: static void X11DRV_DIB_DoUpdateDIBSection(X_PHYSBITMAP *physBitmap, BOOL toDIB) { INT x,y,width,height; if ( X11DRV_GetBoundRect(physBitmap,&x,&y,&width,&height) ) return; /*invalidate bound rect*/ X11DRV_SetBoundRect(physBitmap,0,0,0,0); X11DRV_DIB_DoCopyDIBSection(physBitmap, toDIB, physBitmap->colorMap, physBitmap->nColorMap, physBitmap->pixmap, x, y, x, y, width, height); } - and finally, a GDI function calls it like this (for example bitblt): X11DRV_SetBoundRect(physDevDst->bitmap,xDst,yDst,width,height); X11DRV_CoerceDIBSection( physDevDst, DIB_Status_GdiMod, FALSE ); if (physDevDst != physDevSrc) { X11DRV_SetBoundRect(physDevSrc->bitmap,xSrc,ySrc,width,height); X11DRV_CoerceDIBSection( physDevSrc, DIB_Status_GdiMod, FALSE ); } result = BITBLT_InternalStretchBlt( physDevDst, xDst, yDst, width, height, physDevSrc, xSrc, ySrc, width, height, rop ); END: if (physDevDst != physDevSrc) X11DRV_UnlockDIBSection( physDevSrc, FALSE ); X11DRV_UnlockDIBSection( physDevDst, TRUE ); What am i doing wrong, i mean is my logic correct ?

1 0

Re: [msxml] libuuid
by Huw D M Davies 02 Dec '05

02 Dec '05

On Thu, Dec 01, 2005 at 10:02:25PM +0100, Raphael wrote: > Hi, > > Changelog: > - add needed uuid generation I don't think libuuid should contain the msxml2 uuids; at least the version I have doesn't. Huw.

2 2

D3D7 & WineD3D success
by Stefan Dösinger 02 Dec '05

02 Dec '05

Hello! Today I have finally managed to get some useable graphics with D3D7 and WineD3D. The Tomb Raider 3 Demo is running. :) The only visible problem I can see are textures: They only have a solid color, all other things seem to work. I've uploaded a screenshot to http://doesi.gmxhome.de/tomb3-2.png , if anyone wants to have a look. I'll try to fix the textures and get some more games running, then I'll upload a beta patch somewhere for others to try. (Well, if anyone is interested, I can mail the current code too). Greetings, Stefan

6 7

state of wine on amd64 with ia32
by Christoph Frick 02 Dec '05

02 Dec '05

hiho can someone enlightenme, what the current state of this is? i run a dual opteron with ubuntu linux on it. after some symlinking with the ia32-libs and a change in wine (SYS_sigaction -> SYS_rt_sigaction (read this in a very old post from 2004 or so) it finally compiled (using gcc-4.0 -m32). but as soon as i start either wine app i end up on the comand-line. i have not investigated this further - i just want to have a pointer if this works ok or if i am better off with running 32bit linux for wine on the box. -- cu

4 4

Re: [dib.c] 3. Remove identity colormap changing for monochrome bitmaps
by Alexandre Julliard 02 Dec '05

02 Dec '05

Oldrich Jedlicka <oldium.pro(a)seznam.cz> writes: > This fixes colors in monochrome bitmaps that were overwritten by identity > colormap every time. > > Changelog: > > * Remove the identity color map overwriting on all monochrome bitmaps This breaks the tests: bitmap.c:399: Test failed: lower left pixel is 00ff00ff bitmap.c:400: Test failed: bottom but one, left pixel is 0000ff00 -- Alexandre Julliard julliard(a)winehq.org

2 3

winspool: GetPrinterDriverDirectory updated to NT/win9x (resend)
by Detlef Riekenberg 02 Dec '05

02 Dec '05

Resend with suggestions from Alexandre: GetVersion() was used to often. - We do not Check for WIN32S. - For Win9x, we use the same Path as NT is using for "Windows 4.0" (%winsysdir%\spool\drivers\win40) Changelog: - Add Function "validate_envW" to validate the user-supplied Printing Environment (respect "Windows Version" - Setting) - Change GetPrinterDriverDirectoryW on top of "validate_envW" to Report the native Path for NT and Win9x - Fix 2 Bugs in GetPrinterDriverDirectoryA - 2 Tests are now working in Wine "validate_envW" will be used by more Functions later. (WINSPOOL_OpenDriverReg as Example) -- By By ... ... Detlef

1 0

Compilation also fails on old RH
by Paul Millar 01 Dec '05

01 Dec '05

Hi, Just to say that a fairly recent patch to wldap32 causes compilation to fail under an old RedHat 7.3 machine (yeah, I'm just waiting on installing debian :-) Anyhow, I guess some extra autoconf tests might fix it, but it is an old version of openssl (openssl-0.9.6b-35.7). HTH, Paul misc.o: In function `WLDAP32_ldap_count_references': /home/paul/Production/wine-source/dlls/wldap32/misc.c:123: undefined reference to `ldap_count_references' misc.o: In function `WLDAP32_ldap_first_reference': /home/paul/Production/wine-source/dlls/wldap32/misc.c:258: undefined reference to `ldap_first_reference' misc.o: In function `WLDAP32_ldap_next_reference': /home/paul/Production/wine-source/dlls/wldap32/misc.c:346: undefined reference to `ldap_next_reference' collect2: ld returned 1 exit status

1 0

Re: SHDOCVW: Added implementation of IConnectionPoint::Advise and Unadvise.
by Robert Shearman 01 Dec '05

01 Dec '05

Jacek Caban wrote: >@@ -181,15 +184,52 @@ static HRESULT WINAPI ConnectionPoint_Ad > DWORD *pdwCookie) > { > ConnectionPoint *This = CONPOINT_THIS(iface); >- FIXME("(%p)->(%p %p)\n", This, pUnkSink, pdwCookie); >- return E_NOTIMPL; >+ IDispatch *disp; >+ DWORD i; >+ HRESULT hres; >+ >+ TRACE("(%p)->(%p %p)\n", This, pUnkSink, pdwCookie); >+ >+ hres = IUnknown_QueryInterface(pUnkSink, &This->iid, (void**)&disp); >+ if(FAILED(hres)) { >+ hres = IUnknown_QueryInterface(pUnkSink, &IID_IDispatch, (void**)&disp); >+ if(FAILED(hres)) >+ return CONNECT_E_CANNOTCONNECT; >+ } >+ >+ if(This->sinks) { >+ for(i=0; i<This->sinks_size; i++) { >+ if(!This->sinks[i]) >+ break; >+ } >+ >+ if(i == This->sinks_size) >+ This->sinks = HeapReAlloc(GetProcessHeap(), 0, This->sinks, >+ (++This->sinks_size)*sizeof(*This->sinks)); >+ }else { >+ This->sinks = HeapAlloc(GetProcessHeap(), 0, sizeof(*This->sinks)); >+ This->sinks_size = 1; >+ i = 0; >+ } >+ >+ This->sinks[i] = disp; >+ *pdwCookie = i+1; >+ >+ return S_OK; > } > > I think you need to AddRef disp here and release it appropriately in both Unadvise and on the final release. -- Rob Shearman

2 1

Re: [NDR] Implement NdrClientCall2 and NdrServerCall2
by Alexandre Julliard 01 Dec '05

01 Dec '05

Robert Shearman <rob(a)codeweavers.com> writes: > + "shrl $2, %ecx\n\t" /* divide by 4 */ > + "rep movsl\n\t" /* Copy dword blocks */ > + "movl %eax, %ecx\n\t" > + "andl $3, %ecx\n\t" /* modulus 4 */ > + "rep movsb\n\t" /* Copy remainder */ If the argument size is not a multiple of 4 you are in serious trouble... Instead of reinventing it I'd suggest copying the call_entry_point function from dlls/ntdll/relay.c, it will also get the stack alignment right (plus it saves ebp at the right place ;-) -- Alexandre Julliard julliard(a)winehq.org

2 1

A working winelib application
by Toan T Nguyen 01 Dec '05

01 Dec '05

Hi, This is to let you know that I'm porting Quake 2 Evolved (Q2E) program to Linux using winelib. It compiles and works beautifully, at least on my PentiumM laptop (I actually link with native linux libjpeg, zlib, openal and dl at the compile time, winelib is used for opengl, winmm and wsock32). The author has allowed my linux commit to the CVS. More information on Q2E can be found at www.quake2evolved.com. The specific discussions about linux Q2E can be found here: http://www.quake2evolved.com/blurforum/showthread.php?s=4d42894a75fed08e372… http://www.quake2evolved.com/blurforum/showthread.php?s=4d42894a75fed08e372… There are two small problems left that I hope the wine developer can test and help. Browsing the save or load games menu is quite sluggish. I don't know why. Also, I don't have an AMD64 system to test this on. If someone here would like to help out, I'm grateful. Bests, Toan

1 0

Re: [wined3d] update hw support
by Roderick Colenbrander 01 Dec '05

01 Dec '05

The way I would recommend for pci bus scanning is to parse /proc/bus/pci/devices the only problem is that this is linux specific. Something similar can be done on other OSes though. Another way which is more portable is to use libpci but it isn't installed on all systems. Guess something like this would need to be added to some 'kernel' dll... Roderick > > PS: if one of you know a way to implement pci bus scanning on wine i'll be > happy > -- 10 GB Mailbox, 100 FreeSMS/Monat http://www.gmx.net/de/go/topmail +++ GMX - die erste Adresse f�r Mail, Message, More +++

4 4

Re: [x11drv] fix bug 3956: correct behavior of ChoosePixelFormat
by Raphael 01 Dec '05

01 Dec '05

On Wednesday 30 November 2005 09:32, Raphael wrote: > Hi, > > Changelog: > - handle DONTCARE flags on ChoosePixelFormat > - DOUBLEBUFFER and STEREO are non-mandatorie options (ie if not available > find a compatible pixel format without). So try without if we cannot find a > valid fbconfig with this options > > Regards, > Raphael Hi Alexandre Anything wrong with this patch ? Thx Regards, Raphael

1 0

Compile error in dlls/wininet/netconnection.c
by Pavel Roskin 01 Dec '05

01 Dec '05

Hello, Robert! Your last change in dlls/wininet/netconnection.c breaks compilation without openssl: netconnection.c:246: error: syntax error before '*' token make: *** [netconnection.o] Error 1 It happens because check_hostname() uses an argument of unknown type X509. Also, check_hostname() is unused. The simplest fix would be to define check_hostname() only when it's used. Proposed patch: --- dlls/wininet/netconnection.c +++ dlls/wininet/netconnection.c @@ -243,11 +243,13 @@ BOOL NETCON_close(WININET_NETCONNECTION return TRUE; } +#if defined HAVE_OPENSSL_SSL_H && defined HAVE_OPENSSL_ERR_H static BOOL check_hostname(X509 *cert, char *hostname) { /* FIXME: implement */ return TRUE; } +#endif /****************************************************************************** * NETCON_secure_connect -- Regards, Pavel Roskin

2 1

wine-faq: Macintel?
by Frankie 01 Dec '05

01 Dec '05

Please please please update your FAQ to tell us the dev status of Wine on OSX x86. -- http://spamreaper.org/frankie -F .

1 0

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-devel