- Wine-Devel - list.winehq.org

Bug in menu.c
by Dan Timis July 30, 2004

July 30, 2004

Hi, The MS documentation on the structure MENUITEMINFO says that the field fMask indicates what fields to retrieve or set. Here is what it says about the value MIIM_TYPE: > Retrieves or sets the fType and dwTypeData members. Windows 98/Me, > Windows 2000/XP: MIIM_TYPE is replaced by MIIM_BITMAP, MIIM_FTYPE, > and MIIM_STRING. So if one wants to specify a text menu item in XP, one would use MIIM_STRING, not MIIM_TYPE. fType would also need to be MFT_STRING. In menu.c in GetMenuItemInfo_common(): /* copy the text string */ if ((lpmii->fMask & (MIIM_TYPE|MIIM_STRING)) && (MENU_ITEM_TYPE(menu->fType) == MF_STRING) && menu->text) { and so on... This works fine. It retrieves the text if either MIIM_TYPE or MIIM_STRING are set. But, in GetMenuItemInfo_common(): if (lpmii->fMask & MIIM_TYPE) { /* Get rid of old string. */ if (IS_STRING_ITEM(menu->fType) && menu->text) { HeapFree(GetProcessHeap(), 0, menu->text); menu->text = NULL; } /* make only MENU_ITEM_TYPE bits in menu->fType equal lpmii->fType */ menu->fType &= ~MENU_ITEM_TYPE(menu->fType); menu->fType |= MENU_ITEM_TYPE(lpmii->fType); menu->text = lpmii->dwTypeData; and so on... This sets the text only if MIIM_TYPE is set. I changed the first line to: if (lpmii->fMask & (MIIM_TYPE|MIIM_STRING)) { and menus that were drawing before as a long thin vertical line, started to show correctly. I'm not sure if this is the right way to fix this, but it works for me. I am using a wine version from 2004-04-08. BTW, I reported earlier a crash in menu.c. I did not hear anything back. Should I log this into Bugzilla? Thanks, Dan Timis Muse Research, Inc.

2 1

Re: cleanup a->w cross calls in advapi32/crypt.c
by Dmitry Timoshkov July 30, 2004

July 30, 2004

"James Hawkins" <truiken(a)gmail.com> wrote: > This is a resubmit of my original patch that cleans up a->w cross > calls in crypt. > > Changelog > * cleanup a->w cross calls in advapi32/crypt.c > + static const WCHAR KEYSTR[] = { > + 'S','o','f','t','w','a','r','e','\\','\\', > + 'M','i','c','r','o','s','o','f','t','\\','\\', > + 'C','r','y','p','t','o','g','r','a','p','h','y','\\','\\', > + 'D','e','f','a','u','l','t','s','\\','\\', > + 'P','r','o','v','i','d','e','r','\\','\\',0 > + }; Remove double backslashes here and everywhere else. > - keyname = CRYPT_Alloc(strlen(KEYSTR) + strlen(pProvName) +1); > + keyname = CRYPT_Alloc(strlenW(KEYSTR) + strlenW(pProvName) + 1); Add '* sizeof(WCHAR)' and everywhere else where storage for unicode strings is allocated. > - keyname = CRYPT_Alloc( (user ? strlen(USERSTR) : strlen(MACHINESTR)) +1); > + keyname = CRYPT_Alloc( (user ? strlenW(USERSTR) : strlenW(MACHINESTR)) +1); Add '* sizeof(WCHAR)' > + static WCHAR nameW[] = {'N','a','m','e',0}; > + static WCHAR typeW[] = {'T','y','p','e',0}; > + static WCHAR imagePathW[] = {'I','m','a','g','e',' ','P','a','t','h',0}; > + static WCHAR signatureW[] = {'S','i','g','n','a','t','u','r','e',0}; > + static WCHAR sigInFileW[] = {'S','i','g','I','n','F','i','l','e',0}; Add 'const'. > - if ( !(provname = CRYPT_Alloc(strlen(pszProvider) +1)) ) > + if ( !(provname = CRYPT_Alloc(strlenW(pszProvider) +1)) ) Add '* sizeof(WCHAR)' > - len = ExpandEnvironmentStringsA(temp, NULL, 0); > + len = ExpandEnvironmentStringsW(temp, NULL, 0); > if ( !(imagepath = CRYPT_Alloc(len)) ) Add '* sizeof(WCHAR)' ... And lots of similar bugs. -- Dmitry.

1 0

Re: change the nt service pack version from 6 to 6a, correct win2k3 name
by Ivan Leo Puoti July 30, 2004

July 30, 2004

>Easy, take several W2K3 system DLLs and kick them through winedump with what command line?

1 0

Re: add autodetect audio driver capability to winmm, second try
by Alexandre Julliard July 29, 2004

July 29, 2004

James Hawkins <truiken(a)gmail.com> writes: > + /* try to detect arts */ > + argv_new[2] = "ps awx|grep artsd|grep -v grep|grep artsd > /dev/null"; > + if(!spawnvp(_P_WAIT, "/bin/sh", argv_new)) > + { > + driversFound[numFound] = "winearts.drv"; > + name[numFound] = "aRts"; > + numFound++; > + } This code does not belong in winmm. Autodetection in winmm should be done by having the drivers themselves fail to load if the corresponding support is missing. -- Alexandre Julliard julliard(a)winehq.org

1 0

Test drive error
by sergio ojalvo July 29, 2004

July 29, 2004

Hi I'm working on Debian Linux. I just install the wine packages and download sources for trying the test driver. Running Winemaker to winemine test project I note: that configure script was not created and Makefile is created instead of Makefile.in. (like wrote in the web page) I think is a new feature... I'm wrong? Anyway, I try to run make after that and that is the output: winebuild -o winemine.exe.dbg.c --debug -C. dialog.c main.c winegcc -c -mno-cygwin -I. -o winemine.exe.dbg.o winemine.exe.dbg.c winegcc -c -mno-cygwin -I. -o dialog.o dialog.c winegcc -c -mno-cygwin -I. -o main.o main.c wrc -I. -foEn.res En.rc En.rc:23:22: Error: syntax error make: *** [En.res] Error 1 After that I try with another 2 projects (win32 code) and I receive a lot of compilation errors like: In file included from /usr/include/c++/3.3/iosfwd:46, from /usr/include/c++/3.3/ios:44, from /usr/include/c++/3.3/ostream:45, from /usr/include/c++/3.3/iostream:45, from midi2nokia.cpp:4: /usr/include/c++/3.3/i486-linux/bits/c++locale.h:53: error: `uselocale' was not declared in this scope In file included from /usr/include/c++/3.3/i486-linux/bits/c++io.h:35, from /usr/include/c++/3.3/bits/fpos.h:44, from /usr/include/c++/3.3/iosfwd:49, from /usr/include/c++/3.3/ios:44, from /usr/include/c++/3.3/ostream:45, from /usr/include/c++/3.3/iostream:45, from midi2nokia.cpp:4: /usr/include/c++/3.3/cstdio:167: error: `snprintf' not declared /usr/include/c++/3.3/cstdio:168: error: `vfscanf' not declared /usr/include/c++/3.3/cstdio:169: error: `vscanf' not declared /usr/include/c++/3.3/cstdio:171: error: `vsscanf' not declared /usr/include/c++/3.3/cstdio:177: error: `snprintf' not declared /usr/include/c++/3.3/cstdio:178: error: `vfscanf' not declared /usr/include/c++/3.3/cstdio:179: error: `vscanf' not declared /usr/include/c++/3.3/cstdio:181: error: `vsscanf' not declared In file included from /usr/include/c++/3.3/i486-linux/bits/gthr-default.h:37, from /usr/include/c++/3.3/i486-linux/bits/gthr.h:98, from /usr/include/c++/3.3/i486-linux/bits/c++io.h:37, from /usr/include/c++/3.3/bits/fpos.h:44, from /usr/include/c++/3.3/iosfwd:49, from /usr/include/c++/3.3/ios:44, from /usr/include/c++/3.3/ostream:45, from /usr/include/c++/3.3/iostream:45, from midi2nokia.cpp:4: /usr/include/pthread.h:651: error: type specifier omitted for parameter `clockid_t' /usr/include/pthread.h:651: error: parse error before `*' token In file included from /usr/include/c++/3.3/bits/fpos.h:45, from /usr/include/c++/3.3/iosfwd:49, from /usr/include/c++/3.3/ios:44, from /usr/include/c++/3.3/ostream:45, from /usr/include/c++/3.3/iostream:45, from midi2nokia.cpp:4: /usr/include/c++/3.3/cwchar:142: error: `fwide' not declared /usr/include/c++/3.3/cwchar:149: error: `mbsinit' not declared /usr/include/c++/3.3/cwchar:157: error: `vfwscanf' not declared /usr/include/c++/3.3/cwchar:159: error: `vswscanf' not declared /usr/include/c++/3.3/cwchar:161: error: `vwscanf' not declared /usr/include/c++/3.3/cwchar:176: error: `wcstof' not declared /usr/include/c++/3.3/cwchar:182: error: `wmemcmp' not declared /usr/include/c++/3.3/cwchar:183: error: `wmemcpy' not declared /usr/include/c++/3.3/cwchar:184: error: `wmemmove' not declared /usr/include/c++/3.3/cwchar:185: error: `wmemset' not declared /usr/include/c++/3.3/cwchar:213: error: `wmemchr' not declared /usr/include/c++/3.3/cwchar: In function `wchar_t* std::wmemchr(wchar_t*, wchar_t, unsigned int)': /usr/include/c++/3.3/cwchar:217: error: invalid conversion from `const wchar_t* ' to `wchar_t*' /usr/include/c++/3.3/cwchar: At global scope: /usr/include/c++/3.3/cwchar:233: error: `wcstold' not declared /usr/include/c++/3.3/cwchar:242: error: `wcstoll' not declared /usr/include/c++/3.3/cwchar:243: error: `wcstoull' not declared /usr/include/c++/3.3/cwchar:249: error: `wcstold' not declared /usr/include/c++/3.3/cwchar:250: error: `wcstoll' not declared /usr/include/c++/3.3/cwchar:251: error: `wcstoull' not declared etc, etc, etc.... I send you my gcc configuration: gcc -v Reading specs from /usr/lib/gcc-lib/i486-linux/3.3.4/specs Configured with: ../src/configure -v --enable-languages=c,c++,java,f77,pascal,objc,ada,treelang --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info --with-gxx-include-dir=/usr/include/c++/3.3 --enable-shared --with-system-zlib --enable-nls --without-included-gettext --enable-__cxa_atexit --enable-clocale=gnu --enable-debug --enable-java-gc=boehm --enable-java-awt=xlib --enable-objc-gc i486-linux Thread model: posix gcc version 3.3.4 (Debian 1:3.3.4-4) Any suggestion? Thanks a lot for your help. -- ____________________________ ________ _______________________________ | Sergio Ojalvo \ \ / | | Senior System Analyst \ \/ To bring IN-OVATION turn to | | mailto:sergio(a)ximpo.com /\ \ your open source of solutions | | Phone: +972-545-558586 / \ \ | | Fax: +972-151-545-558586 -------- http://www.ximpo.com/ | |__________________________ Ximpo Group _____________________________|

3 4

Re: [D3D] Added native and emulated S3TC support
by Lionel Ulmer July 29, 2004

July 29, 2004

I have just a few comments on the patch (yeah, it would not have been fun if I had commented on wine-d3d first :-) ). But anyway, great work ! > +static BOOL DDRAW_bind_to_s3tc( void ) > +{ > + const char *s3tcname = SONAME_LIBS3TC; > + > + s3tc_handle = wine_dlopen(s3tcname, RTLD_NOW, NULL, 0); > + if (!s3tc_handle) { > + printf("Wine cannot find the S3TC software decompression library (%s).\n",s3tcname); Why did you use 'printf' here instead of WARN or ERR ? Moreover, with this, we will print an error at DirectX loading when the users do not have this library installed ... even if the game does never request any compressed mode textures. Would it not be better to somehow print the error message when the application wants to create a DXTN texture (ie somehow remember that we do not support this feature and keep the error message for later). > + return FALSE; > + } > + > +#define API_FUNCTION(f) \ > + if((f = wine_dlsym(s3tc_handle, #f, NULL, 0)) == NULL) \ > + { \ > + printf("Can't find symbol %s\n", #f); \ Same printf comment here (but this one can be kept here :-) ). > + goto sym_not_found; \ > + } > + API_FUNCTION(fetch_2d_texel_rgba_dxt1); > + API_FUNCTION(fetch_2d_texel_rgba_dxt3); > + API_FUNCTION(fetch_2d_texel_rgba_dxt5); > +#undef API_FUNCTION > + > + return TRUE; > + > +sym_not_found: > + WARN("Wine cannot find functions that are necessary for S3TC decompression\n"); > + wine_dlclose(s3tc_handle, NULL, 0); > + s3tc_handle = NULL; > + return FALSE; > +} > + (...) > > + if (src_pf->dwFlags & DDPF_FOURCC) { > + GLenum retVal; > + int size = surf_ptr->surface_desc.u1.dwLinearSize; > + int width = surf_ptr->surface_desc.dwWidth; > + int height = surf_ptr->surface_desc.dwHeight; > + LPVOID buffer = surf_ptr->surface_desc.lpSurface; > + > + switch (src_pf->dwFourCC) { > + case MAKE_FOURCC('D','X','T','1'): retVal = GL_COMPRESSED_RGBA_S3TC_DXT1_EXT; break; > + case MAKE_FOURCC('D','X','T','3'): retVal = GL_COMPRESSED_RGBA_S3TC_DXT3_EXT; break; > + case MAKE_FOURCC('D','X','T','5'): retVal = GL_COMPRESSED_RGBA_S3TC_DXT5_EXT; break; > + default: > + FIXME("FourCC Not supported\n"); > + return DD_OK; > + break; > + } > + GL_extensions.glCompressedTexImage2D(GL_TEXTURE_2D, current_level, retVal, width, height, 0, size, buffer); How are we sure that this code will never be called with the 'glCompressedTexImage2D' unset ? I.e. when we are in emulation mode, what happens here ? Is this because when we are in emulation mode, we do not advertise support for DTXN textures, this means that the application can create such textures, but will be automagically converted to RGB ones at Loading ? Anyway, I would still prefer a test here to prevent crashes for application which do not behave well :-) (...) > + if (current_surface->surface_desc.u4.ddpfPixelFormat.dwFlags & DDPF_FOURCC) { > + GLint retVal; > + int size = current_surface->surface_desc.u1.dwLinearSize; > + int width_ = current_surface->surface_desc.dwWidth; > + int height_ = current_surface->surface_desc.dwHeight; > + LPVOID buffer = current_surface->surface_desc.lpSurface; > + > + switch (current_surface->surface_desc.u4.ddpfPixelFormat.dwFourCC) { > + case MAKE_FOURCC('D','X','T','1'): retVal = GL_COMPRESSED_RGBA_S3TC_DXT1_EXT; break; > + case MAKE_FOURCC('D','X','T','3'): retVal = GL_COMPRESSED_RGBA_S3TC_DXT3_EXT; break; > + case MAKE_FOURCC('D','X','T','5'): retVal = GL_COMPRESSED_RGBA_S3TC_DXT5_EXT; break; > + default: > + FIXME("Not supported\n"); > + return DD_OK; > + break; > + } > + /* GL_extensions.glCompressedTexSubImage2D(GL_TEXTURE_2D, current_level, xoffset, yoffset, width, height, retVal, (unsigned char*)temp_buffer); */ > + GL_extensions.glCompressedTexImage2D(GL_TEXTURE_2D, current_level, retVal, width_, height_, 0, size, buffer); Same here. > + } > + > + if (strstr(glExtensions, "GL_EXT_texture_compression_s3tc")) { > + TRACE(" - S3TC compression supported\n"); > + GL_extensions.s3tc_compressed_texture = TRUE; > + GL_extensions.glCompressedTexImage2D = pglXGetProcAddressARB("glCompressedTexImage2D"); > + GL_extensions.glCompressedTexSubImage2D = pglXGetProcAddressARB("glCompressedTexSubImage2D"); > } If I were pedantic, you should test for 'GL_ARB_texture_compression' to be able to get the 'glCompressedTexImage2DARB' and 'glCompressedTexSubImage2DARB' functions (which may be better than using the non-ARB versions which are, AFAIK, the ones in GL 1.4). And then to get 'GL_EXT_texture_compression_s3tc' to set 'GL_extensions.s3tc_compressed_texture' to TRUE. But as 'GL_EXT_texture_compression_s3tc' depends on 'GL_ARB_texture_compression', I will let you do this shortcut :-) > - /* We do not support for now compressed texture formats... */ > - if (ddsd.u4.ddpfPixelFormat.dwFlags & DDPF_FOURCC) > + /* We support for now only DXT1, DXT3 & DXT5 compressed texture formats... */ > + if ((ddsd.u4.ddpfPixelFormat.dwFlags & DDPF_FOURCC) && > + (ddsd.u4.ddpfPixelFormat.dwFourCC != MAKE_FOURCC('D','X','T','1')) && > + (ddsd.u4.ddpfPixelFormat.dwFourCC != MAKE_FOURCC('D','X','T','3')) && > + (ddsd.u4.ddpfPixelFormat.dwFourCC != MAKE_FOURCC('D','X','T','5')) ) > { > return DDERR_INVALIDPIXELFORMAT; > } What to do here when neither hardware nor emulated support is present ? Maybe we should print an error (cf previous comment) and return INVALIDPIXELFORMAT, no ? Lionel (who goes testing NOFL :-) ) -- Lionel Ulmer - http://www.bbrox.org/

3 5

Re: Fix crash in dsound test
by Robert Reif July 29, 2004

July 29, 2004

How did this fail in windows. Since it doesn't crash with wine, wine is doing something wrong. Lets try to figure out what is wrong and correct wine to have the same behavior as windows or at least notify someone that something is wrong. Is anyone working on getting direct sound into the windows port of our regression tests? Francois Gouget wrote: > > Changelog: > > * dlls/dsound/tests/dsound.c > > Francois Gouget <fgouget(a)codeweavers.com> > Call IDirectSound::Initialize() as per MSDN before using the > DirectSound object. Fixes a crash on Windows. > >------------------------------------------------------------------------ > >Index: dlls/dsound/tests/dsound.c >=================================================================== >RCS file: /var/cvs/wine/dlls/dsound/tests/dsound.c,v >retrieving revision 1.24 >diff -u -r1.24 dsound.c >--- dlls/dsound/tests/dsound.c 13 Jul 2004 23:35:09 -0000 1.24 >+++ dlls/dsound/tests/dsound.c 16 Jul 2004 16:23:51 -0000 >@@ -69,6 +69,9 @@ > if (rc==DS_OK) > IDirectSound8_Release(ds8); > >+ rc=IDirectSound_Initialize(dso,NULL); >+ ok(rc==DS_OK,"IDirectSound_Initialize(NULL) failed: %s\n",DXGetErrorString9(rc)); >+ > /* DSOUND: Error: Invalid caps buffer */ > rc=IDirectSound_GetCaps(dso,0); > ok(rc==DSERR_INVALIDPARAM,"GetCaps should have failed: %s\n",DXGetErrorString9(rc)); >@@ -168,6 +171,9 @@ > if (rc==DS_OK) > IDirectSound8_Release(ds8); > >+ rc=IDirectSound8_Initialize(dso,NULL); >+ ok(rc==DS_OK,"IDirectSound_Initialize(NULL) failed: %s\n",DXGetErrorString9(rc)); >+ > /* DSOUND: Error: Invalid caps buffer */ > rc=IDirectSound8_GetCaps(dso,0); > ok(rc==DSERR_INVALIDPARAM,"GetCaps should have failed: %s\n",DXGetErrorString9(rc)); > >

5 7

Question about mmap issues on FreeBSD/NetBSD
by Yorick Hardy July 29, 2004

July 29, 2004

Just a question about the mmap issues experienced on FreeBSD, i.e. http://www.winehq.org/?issue=230#Wine%20on%20FreeBSD I encountered the same on NetBSD. It seems the error message is set from ld.elf_so in NetBSD and ld-elf.so.1 in FreeBSD, when the address space is mapped for the run time linking? Since MAP_NORESERVE is not documented (and not supported?) for mmap on FreeBSD and NetBSD, it would appear that wine and the ld.elf_so together require too much memory for all the mmap calls. Am I correct? Kind regards, -- Yorick Hardy

2 1

Re: Is bugzilla worth keeping?
by Dan Kegel July 29, 2004

July 29, 2004

Mike Hearn wrote: > So are we misleading users by having a bugzilla into thinking that if > they file a bug there, it'll be fixed when it probably won't? Not at all. Just because not enough people are doing bug triage or fixing doesn't mean we should drop bugzilla. Somebody will eventually go through the bug reports, I think. > If we were to simply drop bugzilla, how would it impact the project? It would deprive us of long-term memory. For instance, I filed the bug report http://bugs.winehq.org/show_bug.cgi?id=1404 in January 2003 with a nice test case (but one that's hard to translate into a unit test). Without Bugzilla, we'd have a harder time remembering problems like that. (Unless cxtest really takes off, I suppose...) - Dan -- My technical stuff: http://kegel.com My politics: see http://www.misleader.org for examples of why I'm for regime change

3 3

Re: Wine and locales
by Filip Navara July 29, 2004

July 29, 2004

1 0