December 2002 - Wine-Devel - list.winehq.org

Intel 8x0 and ALSA sound driver
by Nikolay Stefanov Dec. 10, 2002

Dec. 10, 2002

Hi, I have a SIS SI7012 (Intel 810 chipset) built-in audio card, which turns out to be capable of only 48000Hz sample rate in hardware. The ALSA winmm driver in Wine is hardcoded to use the first hardware pcm device ("hw:0") directly, and therefore fails for any wave format request with a sample rate different than 48000Hz. I have lifted some code from dsound and put together a patch which adds the option to read the device name from the Wine configuration file. As a result I have now got Winamp working (hurray for me!). HOWEVER there are still issues - the "default" ALSA device doesn't like the way Wine accesses it through mmap, and also it seems that it is not possible to set the buffer size and period size the way it is done now. Other programs that use ALSA, like aplay and mplayer, don't have this problem. My knowledge of Wine and ALSA is pretty meagre, so can anyone can provide any insight as to how to fix this issue? My config file now looks like this [alsa] ;"Device" = "hw:0" "Device" = "default" "UseMMAP" = "N" And this is the patch, not really useful for anyone else but me right now: ---- Patch start ----- diff -u -r wine-20021125-orig/dlls/winmm/winealsa/Makefile.in wine-20021125/dlls/winmm/winealsa/Makefile.in --- wine-20021125-orig/dlls/winmm/winealsa/Makefile.in 2002-06-28 19:31:01.000000000 +0100 +++ wine-20021125/dlls/winmm/winealsa/Makefile.in 2002-12-08 14:06:03.000000000 +0000 @@ -3,7 +3,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = winealsa.drv -IMPORTS = winmm user32 kernel32 ntdll +IMPORTS = winmm user32 kernel32 ntdll advapi32 EXTRALIBS = @ALSALIBS@ LDDLLFLAGS = @LDDLLFLAGS@ diff -u -r wine-20021125-orig/dlls/winmm/winealsa/alsa.c wine-20021125/dlls/winmm/winealsa/alsa.c --- wine-20021125-orig/dlls/winmm/winealsa/alsa.c 2002-07-19 01:30:16.000000000 +0100 +++ wine-20021125/dlls/winmm/winealsa/alsa.c 2002-12-08 14:52:38.000000000 +0000 @@ -25,12 +25,93 @@ #include "winbase.h" #include "wingdi.h" #include "winuser.h" +#include "winreg.h" #include "mmddk.h" #include "alsa.h" +#include "wine/debug.h" #ifdef HAVE_ALSA +WINE_DEFAULT_DEBUG_CHANNEL(wave); + static struct WINE_ALSA* alsa = NULL; + +/* configuration variables for the ALSA driver */ +#define ALSA_DEVICE_NAME_DEFAULT "hw:0" +#define ALSA_USE_MMAP_DEFAULT 1 +char alsa_device_name[MAX_PATH+1]; +int alsa_use_mmap = 1; + +/* + * Get a config key from either the app-specific or the default config + */ +inline static DWORD get_config_key( HKEY defkey, HKEY appkey, const char *name, + char *buffer, DWORD size ) +{ + if (appkey && !RegQueryValueExA( appkey, name, 0, NULL, buffer, &size )) return 0; + return RegQueryValueExA( defkey, name, 0, NULL, buffer, &size ); +} + + +/* + * Setup the alsa options. + */ +inline static void setup_alsa_options(void) +{ + char buffer[MAX_PATH+1]; + HKEY hkey, appkey = 0; + + buffer[MAX_PATH]='\0'; + + if (RegCreateKeyExA( HKEY_LOCAL_MACHINE, "Software\\Wine\\Wine\\Config\\alsa", 0, NULL, + REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &hkey, NULL )) + { + ERR("Cannot create config registry key\n" ); + ExitProcess(1); + } + + if (GetModuleFileNameA( 0, buffer, MAX_PATH )) + { + HKEY tmpkey; + + if (!RegOpenKeyA( HKEY_LOCAL_MACHINE, "Software\\Wine\\Wine\\Config\\AppDefaults", &tmpkey )) + { + char appname[MAX_PATH+16]; + char *p = strrchr( buffer, '\\' ); + if (p!=NULL) { + appname[MAX_PATH]='\0'; + strncpy(appname,p+1,MAX_PATH); + strcat(appname,"\\alsa"); + TRACE("appname = [%s] \n",appname); + if (RegOpenKeyA( tmpkey, appname, &appkey )) appkey = 0; + RegCloseKey( tmpkey ); + } + } + } + + /* get options */ + strncpy(alsa_device_name, ALSA_DEVICE_NAME_DEFAULT, MAX_PATH); + if (!get_config_key( hkey, appkey, "Device", buffer, MAX_PATH )) { + alsa_device_name[MAX_PATH] = '\0'; + strncpy(alsa_device_name, buffer, MAX_PATH); + if (strncmp(alsa_device_name, ALSA_DEVICE_NAME_DEFAULT, MAX_PATH)) { + WARN("alsa_device_name = %s (default=" ALSA_DEVICE_NAME_DEFAULT ")\n", + alsa_device_name); + } + } + + alsa_use_mmap = ALSA_USE_MMAP_DEFAULT; + if (!get_config_key( hkey, appkey, "UseMMAP", buffer, MAX_PATH )) { + alsa_use_mmap = strcmp(buffer, "N"); + if (alsa_use_mmap != ALSA_USE_MMAP_DEFAULT) { + WARN("alsa_use_mmap = %d (default=%d)\n", alsa_use_mmap, + ALSA_USE_MMAP_DEFAULT); + } + } + + if (appkey) RegCloseKey( appkey ); + RegCloseKey( hkey ); +} /************************************************************************** * ALSA_drvOpen [internal] @@ -39,7 +120,7 @@ { if (alsa) return 0; - + /* I know, this is ugly, but who cares... */ alsa = (struct WINE_ALSA*)1; return 1; @@ -71,7 +152,8 @@ switch(wMsg) { #ifdef HAVE_ALSA - case DRV_LOAD: ALSA_WaveInit(); + case DRV_LOAD: setup_alsa_options(); + ALSA_WaveInit(); return 1; case DRV_FREE: return 1; case DRV_OPEN: return ALSA_drvOpen((LPSTR)dwParam1); diff -u -r wine-20021125-orig/dlls/winmm/winealsa/alsa.h wine-20021125/dlls/winmm/winealsa/alsa.h --- wine-20021125-orig/dlls/winmm/winealsa/alsa.h 2002-08-29 02:51:32.000000000 +0100 +++ wine-20021125/dlls/winmm/winealsa/alsa.h 2002-12-08 14:19:06.000000000 +0000 @@ -29,3 +29,6 @@ #endif extern LONG ALSA_WaveInit(void); +/* config options */ +extern char alsa_device_name[]; +extern int alsa_use_mmap; Only in wine-20021125/dlls/winmm/winealsa: alsa.o diff -u -r wine-20021125-orig/dlls/winmm/winealsa/audio.c wine-20021125/dlls/winmm/winealsa/audio.c --- wine-20021125-orig/dlls/winmm/winealsa/audio.c 2002-10-25 20:09:02.000000000 +0100 +++ wine-20021125/dlls/winmm/winealsa/audio.c 2002-12-08 14:32:16.000000000 +0000 @@ -217,13 +217,13 @@ } \ } while(0) - EXIT_ON_ERROR( snd_ctl_open(&ctl,"hw:0",0) , "ctl open failed" ); + EXIT_ON_ERROR( snd_ctl_open(&ctl,alsa_device_name,0) , "ctl open failed" ); EXIT_ON_ERROR( snd_ctl_card_info(ctl, cardinfo), "card info failed"); EXIT_ON_ERROR( snd_ctl_elem_list(ctl, elemlist), "elem list failed"); nCtrls = snd_ctl_elem_list_get_count(elemlist); - EXIT_ON_ERROR( snd_hctl_open(&hctl,"hw:0",0), "hctl open failed"); + EXIT_ON_ERROR( snd_hctl_open(&hctl,alsa_device_name,0), "hctl open failed"); EXIT_ON_ERROR( snd_hctl_load(hctl), "hctl load failed" ); elem=snd_hctl_first_elem(hctl); @@ -404,8 +404,9 @@ wwo = &WOutDev[0]; + TRACE("ALSA_WaveInit device name = %s", alsa_device_name); /* FIXME: use better values */ - wwo->device = "hw:0,0"; + wwo->device = alsa_device_name; wwo->caps.wMid = 0x0002; wwo->caps.wPid = 0x0104; strcpy(wwo->caps.szPname, "SB16 Wave Out"); @@ -495,7 +496,7 @@ snd_pcm_hw_params_get_access_mask(hw_params, acmask); /* FIXME: NONITERLEAVED and COMPLEX are not supported right now */ - if ( snd_pcm_access_mask_test( acmask, SND_PCM_ACCESS_MMAP_INTERLEAVED ) ) + if ( alsa_use_mmap && snd_pcm_access_mask_test( acmask, SND_PCM_ACCESS_MMAP_INTERLEAVED ) ) wwo->caps.dwSupport |= WAVECAPS_DIRECTSOUND; } @@ -1114,7 +1115,7 @@ } while(0) access = SND_PCM_ACCESS_MMAP_INTERLEAVED; - if ( ( err = snd_pcm_hw_params_set_access(pcm, hw_params, access ) ) < 0) { + if (!alsa_use_mmap || ((err = snd_pcm_hw_params_set_access(pcm, hw_params, access)) < 0)) { WARN("mmap not available. switching to standard write.\n"); access = SND_PCM_ACCESS_RW_INTERLEAVED; EXIT_ON_ERROR( snd_pcm_hw_params_set_access(pcm, hw_params, access ), MMSYSERR_INVALPARAM, "unable to set access for playback"); @@ -1128,11 +1129,13 @@ format = (wwo->format.wBitsPerSample == 16) ? SND_PCM_FORMAT_S16_LE : SND_PCM_FORMAT_U8; EXIT_ON_ERROR( snd_pcm_hw_params_set_format(pcm, hw_params, format), MMSYSERR_INVALPARAM, "unable to set required format"); +#if 0 EXIT_ON_ERROR( snd_pcm_hw_params_set_buffer_size_near(pcm, hw_params, buffer_size), MMSYSERR_NOMEM, "unable to get required buffer"); buffer_size = snd_pcm_hw_params_get_buffer_size(hw_params); EXIT_ON_ERROR( snd_pcm_hw_params_set_period_size_near(pcm, hw_params, buffer_size/num_periods, 0), MMSYSERR_ERROR, "unable to set required period size"); period_size = snd_pcm_hw_params_get_period_size(hw_params, 0); +#endif rate = snd_pcm_hw_params_set_rate_near(pcm, hw_params, wwo->format.wf.nSamplesPerSec, 0); if (rate < 0) { @@ -1147,6 +1150,11 @@ } EXIT_ON_ERROR( snd_pcm_hw_params(pcm, hw_params), MMSYSERR_INVALPARAM, "unable to set hw params for playback"); + +#if 1 + buffer_size = snd_pcm_hw_params_get_buffer_size(hw_params); + period_size = snd_pcm_hw_params_get_period_size(hw_params, 0); +#endif snd_pcm_sw_params_current(pcm, sw_params); EXIT_ON_ERROR( snd_pcm_sw_params_set_start_threshold(pcm, sw_params, dwFlags & WAVE_DIRECTSOUND ? INT_MAX : 1 ), MMSYSERR_ERROR, "unable to set start threshold");

3 5

Conformance Test
by Tom Dec. 10, 2002

Dec. 10, 2002

Here is the test ( Win2K Advance Server ) Second half some msvcrt_test info at the bottom Tom ---- C:\internet downloads\temp2\temp>wininet_test.exe http h:\wine\wine\dlls\wininet\tests\http.c:90:Starting with flags 0x10000000 h:\wine\wine\dlls\wininet\tests\http.c:92:InternetOpenA <-- h:\wine\wine\dlls\wininet\tests\http.c:95:InternetOpenA --> h:\wine\wine\dlls\wininet\tests\http.c:101:InternetConnectA <-- h:\wine\wine\dlls\wininet\tests\http.c:78:Callback 00CC0004 0xdeadbeef INTERNET_ STATUS_HANDLE_CREATED(60) 0012E994 4 h:\wine\wine\dlls\wininet\tests\http.c:104:InternetConnectA --> h:\wine\wine\dlls\wininet\tests\http.c:108:HttpOpenRequestA <-- h:\wine\wine\dlls\wininet\tests\http.c:78:Callback 00CC0008 0xdeadbead INTERNET_ STATUS_HANDLE_CREATED(60) 0012EC04 4 h:\wine\wine\dlls\wininet\tests\http.c:122:HttpOpenRequestA --> h:\wine\wine\dlls\wininet\tests\http.c:126:HttpSendRequestA --> h:\wine\wine\dlls\wininet\tests\http.c:133:HttpSendRequestA <-- h:\wine\wine\dlls\wininet\tests\http.c:78:Callback 00CC000C 0xdeadbead ╠╠╠╠╠╠╠╠╠ ╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠ ╠╠╠╠ ╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╘²▓(80) 00000000 0 h:\wine\wine\dlls\wininet\tests\http.c:78:Callback 00CC000C 0xdeadbead INTERNET_ STATUS_RESOLVING_NAME(10) 00B2FBDC 15 h:\wine\wine\dlls\wininet\tests\http.c:78:Callback 00CC000C 0xdeadbead INTERNET_ STATUS_NAME_RESOLVED(11) 00B2FBCC 12 h:\wine\wine\dlls\wininet\tests\http.c:78:Callback 00CC000C 0xdeadbead INTERNET_ STATUS_CONNECTING_TO_SERVER(20) 00B2FC48 12 h:\wine\wine\dlls\wininet\tests\http.c:78:Callback 00CC000C 0xdeadbead INTERNET_ STATUS_CONNECTED_TO_SERVER(21) 00B2FDDC 12 h:\wine\wine\dlls\wininet\tests\http.c:78:Callback 00CC000C 0xdeadbead INTERNET_ STATUS_SENDING_REQUEST(30) 00000000 0 h:\wine\wine\dlls\wininet\tests\http.c:78:Callback 00CC000C 0xdeadbead INTERNET_ STATUS_REQUEST_SENT(31) 00B2FD84 4 h:\wine\wine\dlls\wininet\tests\http.c:78:Callback 00CC000C 0xdeadbead INTERNET_ STATUS_RECEIVING_RESPONSE(40) 00000000 0 h:\wine\wine\dlls\wininet\tests\http.c:78:Callback 00CC000C 0xdeadbead INTERNET_ STATUS_RESPONSE_RECEIVED(41) 00B2FE04 4 h:\wine\wine\dlls\wininet\tests\http.c:78:Callback 00CC000C 0xdeadbead INTERNET_ STATUS_REQUEST_COMPLETE(100) 00B2FE40 8 h:\wine\wine\dlls\wininet\tests\http.c:140:Option 0x17 -> 1 0 h:\wine\wine\dlls\wininet\tests\http.c:144:Option 0x22 -> 1 http://www.winehq.c om/about/ h:\wine\wine\dlls\wininet\tests\http.c:149:Option 0x16 -> 1 HTTP/1.1 200 OK Date: Tue, 10 Dec 2002 15:46:47 GMT Server: Apache/1.3.22 (Unix) (Red-Hat/Linux) mod_ssl/2.8.5 OpenSSL/0.9.6 PHP/4. 1.2 X-Powered-By: PHP/4.1.2 Keep-Alive: timeout=15, max=100 Connection: Keep-Alive Transfer-Encoding: chunked Content-Type: text/html h:\wine\wine\dlls\wininet\tests\http.c:154:Option 0x22 -> 1 http://www.winehq.c om/about/ h:\wine\wine\dlls\wininet\tests\http.c:158:Option 0x5 -> 0 http://www.winehq.co m/about/ (12150) h:\wine\wine\dlls\wininet\tests\http.c:163:Option 0x1 -> 1 text/html h:\wine\wine\dlls\wininet\tests\http.c:166:Entery Query loop h:\wine\wine\dlls\wininet\tests\http.c:183:ReadFile -> 1 743 h:\wine\wine\dlls\wininet\tests\http.c:183:ReadFile -> 1 4808 h:\wine\wine\dlls\wininet\tests\http.c:172: Test failed: InternetQueryDataAvaila ble failed h:\wine\wine\dlls\wininet\tests\http.c:78:Callback 00CC000C 0xdeadbead INTERNET_ STATUS_REQUEST_COMPLETE(100) 00B2FE40 8 h:\wine\wine\dlls\wininet\tests\http.c:78:Callback 00CC000C 0xdeadbead INTERNET_ STATUS_CLOSING_CONNECTION(50) 00000000 0 h:\wine\wine\dlls\wininet\tests\http.c:78:Callback 00CC000C 0xdeadbead INTERNET_ STATUS_CONNECTION_CLOSED(51) 00000000 0 h:\wine\wine\dlls\wininet\tests\http.c:78:Callback 00CC000C 0xdeadbead INTERNET_ STATUS_HANDLE_CLOSING(70) 0012EBFC 4 h:\wine\wine\dlls\wininet\tests\http.c:78:Callback 00CC0008 0xdeadbeef INTERNET_ STATUS_HANDLE_CLOSING(70) 0012EC0C 4 h:\wine\wine\dlls\wininet\tests\http.c:90:Starting with flags 0x0 h:\wine\wine\dlls\wininet\tests\http.c:92:InternetOpenA <-- h:\wine\wine\dlls\wininet\tests\http.c:95:InternetOpenA --> h:\wine\wine\dlls\wininet\tests\http.c:101:InternetConnectA <-- h:\wine\wine\dlls\wininet\tests\http.c:78:Callback 00CC0004 0xdeadbeef INTERNET_ STATUS_HANDLE_CREATED(60) 0012E994 4 h:\wine\wine\dlls\wininet\tests\http.c:104:InternetConnectA --> h:\wine\wine\dlls\wininet\tests\http.c:108:HttpOpenRequestA <-- h:\wine\wine\dlls\wininet\tests\http.c:78:Callback 00CC0008 0xdeadbead INTERNET_ STATUS_HANDLE_CREATED(60) 0012EC04 4 h:\wine\wine\dlls\wininet\tests\http.c:122:HttpOpenRequestA --> h:\wine\wine\dlls\wininet\tests\http.c:126:HttpSendRequestA --> h:\wine\wine\dlls\wininet\tests\http.c:78:Callback 00CC000C 0xdeadbead ╠╠╠╠╠╠╠╠╠ ╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠ ╠╠╠╠ ╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╪δ↕(80) 00000000 0 h:\wine\wine\dlls\wininet\tests\http.c:78:Callback 00CC000C 0xdeadbead INTERNET_ STATUS_CONNECTING_TO_SERVER(20) 0012EA4C 12 h:\wine\wine\dlls\wininet\tests\http.c:78:Callback 00CC000C 0xdeadbead INTERNET_ STATUS_CONNECTED_TO_SERVER(21) 0012EA28 12 h:\wine\wine\dlls\wininet\tests\http.c:78:Callback 00CC000C 0xdeadbead INTERNET_ STATUS_SENDING_REQUEST(30) 00000000 0 h:\wine\wine\dlls\wininet\tests\http.c:78:Callback 00CC000C 0xdeadbead INTERNET_ STATUS_REQUEST_SENT(31) 0012EB30 4 h:\wine\wine\dlls\wininet\tests\http.c:78:Callback 00CC000C 0xdeadbead INTERNET_ STATUS_RECEIVING_RESPONSE(40) 00000000 0 h:\wine\wine\dlls\wininet\tests\http.c:78:Callback 00CC000C 0xdeadbead INTERNET_ STATUS_RESPONSE_RECEIVED(41) 0012EB14 4 h:\wine\wine\dlls\wininet\tests\http.c:133:HttpSendRequestA <-- h:\wine\wine\dlls\wininet\tests\http.c:140:Option 0x17 -> 1 0 h:\wine\wine\dlls\wininet\tests\http.c:144:Option 0x22 -> 1 http://www.winehq.c om/about/ h:\wine\wine\dlls\wininet\tests\http.c:149:Option 0x16 -> 1 HTTP/1.1 200 OK Date: Tue, 10 Dec 2002 15:46:48 GMT Server: Apache/1.3.22 (Unix) (Red-Hat/Linux) mod_ssl/2.8.5 OpenSSL/0.9.6 PHP/4. 1.2 X-Powered-By: PHP/4.1.2 Keep-Alive: timeout=15, max=100 Connection: Keep-Alive Transfer-Encoding: chunked Content-Type: text/html h:\wine\wine\dlls\wininet\tests\http.c:154:Option 0x22 -> 1 http://www.winehq.c om/about/ h:\wine\wine\dlls\wininet\tests\http.c:158:Option 0x5 -> 0 http://www.winehq.co m/about/ (12150) h:\wine\wine\dlls\wininet\tests\http.c:163:Option 0x1 -> 1 text/html h:\wine\wine\dlls\wininet\tests\http.c:166:Entery Query loop h:\wine\wine\dlls\wininet\tests\http.c:183:ReadFile -> 1 743 h:\wine\wine\dlls\wininet\tests\http.c:183:ReadFile -> 1 1896 h:\wine\wine\dlls\wininet\tests\http.c:183:ReadFile -> 1 7292 h:\wine\wine\dlls\wininet\tests\http.c:183:ReadFile -> 1 1974 h:\wine\wine\dlls\wininet\tests\http.c:78:Callback 00CC000C 0xdeadbead INTERNET_ STATUS_HANDLE_CLOSING(70) 0012EBFC 4 h:\wine\wine\dlls\wininet\tests\http.c:78:Callback 00CC0008 0xdeadbeef INTERNET_ STATUS_HANDLE_CLOSING(70) 0012EC0C 4 http: 22 tests executed, 0 marked as todo, 1 failure. C:\internet downloads\temp2\temp>winmm_test.exe wave h:\wine\wine\dlls\winmm\tests\wave.c:56:found 0 WaveOut devices wave: 2 tests executed, 0 marked as todo, 0 failures. C:\internet downloads\temp2\temp>ws2_32_test.exe sock h:\wine\wine\dlls\winsock\tests\sock.c:694: **** STARTING TEST 0 **** h:\wine\wine\dlls\winsock\tests\sock.c:332:simple_server (650) starting h:\wine\wine\dlls\winsock\tests\sock.c:341:simple_server (650) ready h:\wine\wine\dlls\winsock\tests\sock.c:346:simple_server (650): waiting for clie nt h:\wine\wine\dlls\winsock\tests\sock.c:391:simple_client (5f4): starting h:\wine\wine\dlls\winsock\tests\sock.c:394:simple_client (5f4): server ready h:\wine\wine\dlls\winsock\tests\sock.c:391:simple_client (5f0): starting h:\wine\wine\dlls\winsock\tests\sock.c:394:simple_client (5f0): server ready h:\wine\wine\dlls\winsock\tests\sock.c:406:simple_client (5f4) connected h:\wine\wine\dlls\winsock\tests\sock.c:346:simple_server (650): waiting for clie nt h:\wine\wine\dlls\winsock\tests\sock.c:427:simple_client (5f4) exiting h:\wine\wine\dlls\winsock\tests\sock.c:406:simple_client (5f0) connected h:\wine\wine\dlls\winsock\tests\sock.c:374:simple_server (650) exiting h:\wine\wine\dlls\winsock\tests\sock.c:427:simple_client (5f0) exiting h:\wine\wine\dlls\winsock\tests\sock.c:696: **** TEST 0 COMPLETE **** h:\wine\wine\dlls\winsock\tests\sock.c:694: **** STARTING TEST 1 **** h:\wine\wine\dlls\winsock\tests\sock.c:332:simple_server (1e4) starting h:\wine\wine\dlls\winsock\tests\sock.c:341:simple_server (1e4) ready h:\wine\wine\dlls\winsock\tests\sock.c:346:simple_server (1e4): waiting for clie nt h:\wine\wine\dlls\winsock\tests\sock.c:445:event_client (608): starting h:\wine\wine\dlls\winsock\tests\sock.c:445:event_client (618): starting h:\wine\wine\dlls\winsock\tests\sock.c:447:event_client (608): server ready h:\wine\wine\dlls\winsock\tests\sock.c:467:event_client (608) connected h:\wine\wine\dlls\winsock\tests\sock.c:505:event_client (608): all data sent - s hutdown h:\wine\wine\dlls\winsock\tests\sock.c:346:simple_server (1e4): waiting for clie nt h:\wine\wine\dlls\winsock\tests\sock.c:526:event_client (608): all data received h:\wine\wine\dlls\winsock\tests\sock.c:538:event_client (608): close event h:\wine\wine\dlls\winsock\tests\sock.c:556:event_client (608) exiting h:\wine\wine\dlls\winsock\tests\sock.c:447:event_client (618): server ready h:\wine\wine\dlls\winsock\tests\sock.c:467:event_client (618) connected h:\wine\wine\dlls\winsock\tests\sock.c:505:event_client (618): all data sent - s hutdown h:\wine\wine\dlls\winsock\tests\sock.c:374:simple_server (1e4) exiting h:\wine\wine\dlls\winsock\tests\sock.c:526:event_client (618): all data received h:\wine\wine\dlls\winsock\tests\sock.c:538:event_client (618): close event h:\wine\wine\dlls\winsock\tests\sock.c:556:event_client (618) exiting h:\wine\wine\dlls\winsock\tests\sock.c:696: **** TEST 1 COMPLETE **** sock: 196 tests executed, 0 marked as todo, 0 failures. ----------------------- In msvcrt_test.exe I get this The instruction at "0x77f8ed61" refernced at "0x700bbae". The memory could not be "written". Then on bebug I get this -- Unhandled exception in msvcrt_test.exe (NTDLL.DLL):0xC000005:Acess Violation The pointer in the debug points to this -- 77F8ED61 inc dword ptr [eax+10h]

1 0

Conformance Test
by Tom Dec. 10, 2002

Dec. 10, 2002

Here is the test ( Win2K Advance Server ) First half Tom ---- C:\internet downloads\temp2\temp3>netapi32_test.exe access h:\wine\wine\dlls\netapi32\tests\access.c:95: Test failed: Bad Network Path access: 23 tests executed, 0 marked as todo, 1 failure. C:\internet downloads\temp2\temp3>netapi32_test.exe apibuf apibuf: 15 tests executed, 0 marked as todo, 0 failures. C:\internet downloads\temp2\temp3>netapi32_test.exe wksta wksta: 14 tests executed, 0 marked as todo, 0 failures. C:\internet downloads\temp2\temp2>advapi32_test.exe registry registry: 56 tests executed, 0 marked as todo, 0 failures. C:\internet downloads\temp2\temp2>kernel32_test.exe alloc alloc: 58 tests executed, 0 marked as todo, 0 failures. C:\internet downloads\temp2\temp2>kernel32_test.exe atom atom: 229398 tests executed, 0 marked as todo, 0 failures. C:\internet downloads\temp2\temp2>kernel32_test.exe codepage codepage: 2 tests executed, 0 marked as todo, 0 failures. C:\internet downloads\temp2\temp2>kernel32_test.exe directory directory: 48 tests executed, 0 marked as todo, 0 failures. C:\internet downloads\temp2\temp2>kernel32_test.exe drive drive: 160 tests executed, 0 marked as todo, 0 failures. C:\internet downloads\temp2\temp2>kernel32_test.exe environ environ: 39 tests executed, 0 marked as todo, 0 failures. C:\internet downloads\temp2\temp2>kernel32_test.exe file h:\wine\wine\dlls\kernel\tests\file.c:578: Test failed: DeleteFile should fail w ith an empty path, and last error value should be ERROR_FILE_NOT_FOUND h:\wine\wine\dlls\kernel\tests\file.c:610:Current offset = 0015 h:\wine\wine\dlls\kernel\tests\file.c:635:Current offset = 0015 file: 487238 tests executed, 0 marked as todo, 1 failure. C:\internet downloads\temp2\temp2>kernel32_test.exe format_msg format_msg: 58 tests executed, 0 marked as todo, 0 failures. C:\internet downloads\temp2\temp2>kernel32_test.exe locale locale: 54 tests executed, 0 marked as todo, 0 failures. C:\internet downloads\temp2\temp2>kernel32_test.exe path h:\wine\wine\dlls\kernel\tests\path.c:517: Test failed: GetLongPathNameA: wrong return code, 106 instead of 46 h:\wine\wine\dlls\kernel\tests\path.c:252: Test failed: check-1: GetShortPathA r eturned 123 and not 2 h:\wine\wine\dlls\kernel\tests\path.c:280: Test failed: check-1: GetLongPathA re turned 123 and not 2 h:\wine\wine\dlls\kernel\tests\path.c:252: Test failed: check-2: GetShortPathA r eturned 123 and not 2 h:\wine\wine\dlls\kernel\tests\path.c:280: Test failed: check-2: GetLongPathA re turned 123 and not 2 h:\wine\wine\dlls\kernel\tests\path.c:252: Test failed: check-4: GetShortPathA r eturned 123 and not 2 h:\wine\wine\dlls\kernel\tests\path.c:280: Test failed: check-4: GetLongPathA re turned 123 and not 2 h:\wine\wine\dlls\kernel\tests\path.c:257: Test failed: check-5: GetShortPathA r eturned 123 and not 2 h:\wine\wine\dlls\kernel\tests\path.c:280: Test failed: check-5: GetLongPathA re turned 123 and not 2 h:\wine\wine\dlls\kernel\tests\path.c:927:TMP=C:\DOCUME~1\ADMINI~1\LOCALS~1\Temp h:\wine\wine\dlls\kernel\tests\path.c:935:TMP=C:\WINNT h:\wine\wine\dlls\kernel\tests\path.c:944:TMP=C:\ h:\wine\wine\dlls\kernel\tests\path.c:954:TMP=C: h:\wine\wine\dlls\kernel\tests\path.c:822: Test failed: win2000 BUG: expected 10 , got 11 h:\wine\wine\dlls\kernel\tests\path.c:834: Test failed: win2000 BUG: expected 10 , got 11 h:\wine\wine\dlls\kernel\tests\path.c:848: Test failed: win2000 BUG: expected 10 , got 11 h:\wine\wine\dlls\kernel\tests\path.c:879: Test failed: win2000 BUG: expected 10 , got 11 h:\wine\wine\dlls\kernel\tests\path.c:892: Test failed: win2000 BUG: expected 10 , got 11 h:\wine\wine\dlls\kernel\tests\path.c:898: Test failed: win2000 BUG: should retu rn path without terminating back slash path: 2083 tests executed, 0 marked as todo, 15 failures. C:\internet downloads\temp2\temp2>kernel32_test.exe process tests/process.c: 1 tests executed, 0 marked as todo, 0 failures. h:\wine\wine\dlls\kernel\tests\process.c:374: Test failed: StartupInfoA:lpDeskto p expected (null), got WinSta0\Default h:\wine\wine\dlls\kernel\tests\process.c:375: Test failed: StartupInfoA:lpTitle expected (null), got C:\internet downloads\temp2\temp2\kernel32_test.exe tests/process.c: 1 tests executed, 0 marked as todo, 0 failures. tests/process.c: 1 tests executed, 0 marked as todo, 0 failures. h:\wine\wine\dlls\kernel\tests\process.c:450: Test failed: StartupInfoA:lpDeskto p expected (null), got WinSta0\Default tests/process.c: 1 tests executed, 0 marked as todo, 0 failures. tests/process.c: 1 tests executed, 0 marked as todo, 0 failures. h:\wine\wine\dlls\kernel\tests\process.c:527: Test failed: StartupInfoA:lpTitle expected (null), got C:\internet downloads\temp2\temp2\kernel32_test.exe tests/process.c: 1 tests executed, 0 marked as todo, 0 failures. tests/process.c: 1 tests executed, 0 marked as todo, 0 failures. tests/process.c: 1 tests executed, 0 marked as todo, 0 failures. tests/process.c: 1 tests executed, 0 marked as todo, 0 failures. tests/process.c: 1 tests executed, 0 marked as todo, 0 failures. process: 116 tests executed, 0 marked as todo, 4 failures. C:\internet downloads\temp2\temp2>kernel32_test.exe thread thread: 112 tests executed, 0 marked as todo, 0 failures. C:\internet downloads\temp2\temp2>netapi32_test.exe access 'netapi32_test.exe' is not recognized as an internal or external command, operable program or batch file. C:\internet downloads\temp2\temp2>netapi32_test.exe apibuf 'netapi32_test.exe' is not recognized as an internal or external command, operable program or batch file. C:\internet downloads\temp2\temp2>netapi32_test.exe wksta 'netapi32_test.exe' is not recognized as an internal or external command, operable program or batch file. C:\internet downloads\temp2\temp2>Rem These don't compile with the MSVC headers C:\internet downloads\temp2\temp2>ntdll_test.exe error 'ntdll_test.exe' is not recognized as an internal or external command, operable program or batch file. C:\internet downloads\temp2\temp2>ntdll_test.exe rtlbitmap 'ntdll_test.exe' is not recognized as an internal or external command, operable program or batch file. C:\internet downloads\temp2\temp2>ntdll_test.exe rtlstr 'ntdll_test.exe' is not recognized as an internal or external command, operable program or batch file. C:\internet downloads\temp2\temp>Rem These don't compile with the MSVC headers C:\internet downloads\temp2\temp>ntdll_test.exe error 'ntdll_test.exe' is not recognized as an internal or external command, operable program or batch file. C:\internet downloads\temp2\temp>ntdll_test.exe rtlbitmap 'ntdll_test.exe' is not recognized as an internal or external command, operable program or batch file. C:\internet downloads\temp2\temp>ntdll_test.exe rtlstr 'ntdll_test.exe' is not recognized as an internal or external command, operable program or batch file. C:\internet downloads\temp2\temp>rpcrt4_test.exe rpc h:\wine\wine\dlls\rpcrt4\tests\rpc.c:124: ** Uuid Conversion and Comparison Test s ** rpc: 901 tests executed, 0 marked as todo, 0 failures. C:\internet downloads\temp2\temp>shell32_test.exe shlfileop h:\wine\wine\dlls\shell32\tests\shlfileop.c:286: Test failed: Files are copied t o other directory h:\wine\wine\dlls\shell32\tests\shlfileop.c:287: Test failed: The file is copied shlfileop: 121 tests executed, 0 marked as todo, 2 failures. C:\internet downloads\temp2\temp>shlwapi_test.exe clist clist: 236 tests executed, 0 marked as todo, 0 failures. C:\internet downloads\temp2\temp>shlwapi_test.exe shreg h:\wine\wine\dlls\shlwapi\tests\shreg.c:79: Test failed: RegCreateKeyA failed h:\wine\wine\dlls\shlwapi\tests\shreg.c:105: Test failed: SHGetValueA failed h:\wine\wine\dlls\shlwapi\tests\shreg.c:106: Test failed: (0123456789,bar\subdir 1) h:\wine\wine\dlls\shlwapi\tests\shreg.c:107: Test failed: (ffffffff) h:\wine\wine\dlls\shlwapi\tests\shreg.c:112: Test failed: SHGetValueA failed h:\wine\wine\dlls\shlwapi\tests\shreg.c:113: Test failed: (0123456789) h:\wine\wine\dlls\shlwapi\tests\shreg.c:114: Test failed: (ffffffff) h:\wine\wine\dlls\shlwapi\tests\shreg.c:140: Test failed: test4 RegOpenKey h:\wine\wine\dlls\shlwapi\tests\shreg.c:150: Test failed: SHQueryValueExA failed h:\wine\wine\dlls\shlwapi\tests\shreg.c:156: Test failed: SHQueryValueExA failed h:\wine\wine\dlls\shlwapi\tests\shreg.c:157: Test failed: (3435973836) h:\wine\wine\dlls\shlwapi\tests\shreg.c:164: Test failed: SHQueryValueExA failed h:\wine\wine\dlls\shlwapi\tests\shreg.c:165: Test failed: (6,24) h:\wine\wine\dlls\shlwapi\tests\shreg.c:171: Test failed: SHQueryValueExA failed h:\wine\wine\dlls\shlwapi\tests\shreg.c:172: Test failed: (6,43) h:\wine\wine\dlls\shlwapi\tests\shreg.c:182: Test failed: (6) h:\wine\wine\dlls\shlwapi\tests\shreg.c:184: Test failed: (3435973836) h:\wine\wine\dlls\shlwapi\tests\shreg.c:185: Test failed: (6,24) h:\wine\wine\dlls\shlwapi\tests\shreg.c:194: Test failed: ERROR_MORE_DATA h:\wine\wine\dlls\shlwapi\tests\shreg.c:196: Test failed: (6,43) h:\wine\wine\dlls\shlwapi\tests\shreg.c:197: Test failed: (3435973836) h:\wine\wine\dlls\shlwapi\tests\shreg.c:205: Test failed: Expected ERROR_MORE_DA TA h:\wine\wine\dlls\shlwapi\tests\shreg.c:206: Test failed: (0123456789) h:\wine\wine\dlls\shlwapi\tests\shreg.c:207: Test failed: (0123456789) h:\wine\wine\dlls\shlwapi\tests\shreg.c:208: Test failed: (39,43) h:\wine\wine\dlls\shlwapi\tests\shreg.c:209: Test failed: (3435973836) h:\wine\wine\dlls\shlwapi\tests\shreg.c:218: Test failed: (6) h:\wine\wine\dlls\shlwapi\tests\shreg.c:219: Test failed: (6,43) h:\wine\wine\dlls\shlwapi\tests\shreg.c:220: Test failed: (3435973836) h:\wine\wine\dlls\shlwapi\tests\shreg.c:125: Test failed: SHRegGetPathA failed h:\wine\wine\dlls\shlwapi\tests\shreg.c:126: Test failed: () h:\wine\wine\dlls\shlwapi\tests\shreg.c:241: Test failed: didn't open dest shreg: 36 tests executed, 0 marked as todo, 32 failures. C:\internet downloads\temp2\temp>user32_test.exe class class: 80 tests executed, 0 marked as todo, 0 failures. C:\internet downloads\temp2\temp>rem Comment out the following test because it m esses the environment C:\internet downloads\temp2\temp>rem dlls\user\\user32_test.exe sysparams C:\internet downloads\temp2\temp>user32_test.exe win h:\wine\wine\dlls\user\tests\win.c:91:main window 00300244 main2 001B01A8 deskto p 0001000C child 001F0182 h:\wine\wine\dlls\user\tests\win.c:107:created child 0022018A h:\wine\wine\dlls\user\tests\win.c:120:created child of desktop 0023018A h:\wine\wine\dlls\user\tests\win.c:130:created child of child 0024018A h:\wine\wine\dlls\user\tests\win.c:140:created top-level 0025018A h:\wine\wine\dlls\user\tests\win.c:150:created owned top-level 0026018A h:\wine\wine\dlls\user\tests\win.c:160:created popup 0027018A h:\wine\wine\dlls\user\tests\win.c:170:created owned popup 0028018A h:\wine\wine\dlls\user\tests\win.c:180:created top-level owned by child 0029018A h:\wine\wine\dlls\user\tests\win.c:186:created popup owned by desktop 002A018A h:\wine\wine\dlls\user\tests\win.c:192:created popup owned by child 002B018A h:\wine\wine\dlls\user\tests\win.c:198:created WS_CHILD popup 002C018A h:\wine\wine\dlls\user\tests\win.c:204:created owned WS_CHILD popup 002D018A h:\wine\wine\dlls\user\tests\win.c:209:testing parent changes h:\wine\wine\dlls\user\tests\win.c:221:created child 002E018A h:\wine\wine\dlls\user\tests\win.c:247:created top-level 002F018A h:\wine\wine\dlls\user\tests\win.c:264:created popup 0030018A h:\wine\wine\dlls\user\tests\win.c:281:created child 0031018A h:\wine\wine\dlls\user\tests\win.c:298:created top-level 0032018A h:\wine\wine\dlls\user\tests\win.c:307:created owned popup 0033018A h:\wine\wine\dlls\user\tests\win.c:323:created owner 0034018A and popup 00150204 h:\wine\wine\dlls\user\tests\win.c:337:created owner 00160204 and popup 0035018A h:\wine\wine\dlls\user\tests\win.c:345:created owner 00170204 and popup 0036018A win: 373 tests executed, 0 marked as todo, 0 failures. C:\internet downloads\temp2\temp>user32_test.exe wsprintf wsprintf: 4 tests executed, 0 marked as todo, 0 failures.

1 0

MSI (MS Installer)
by Scott Cote Dec. 10, 2002

Dec. 10, 2002

I've found that many of the test applications I've tried installing failed due to the lack of MSIEXEC. If it is implemented, could you tell me where to find it? If not, I'd like to contribute, could you tell me if any work has been done and who to coordinate with? Thanks, -Scott

10 12

test
by Tom Dec. 10, 2002

Dec. 10, 2002

I sent two emails about 15 min ago and they have not shown up.. So this is just a test.. Sorry Tom

1 0

Warning fix in msvcrt_test
by Vincent Béron Dec. 10, 2002

Dec. 10, 2002

Another thing noticed while compiling the tests on MSVC... In the msvcrt_test project, the link finishes with this warning: LINK : warning LNK4098: defaultlib "LIBCMTD" conflicts with use of other libs; use /NODEFAULTLIB:library It's pretty easy to fix it manually (and the warning doesn't seem to cause harm), but it would be nice of Patrik to incorporate what this patch does (the project's file is a generated file, so the patch cannot be directly applied to CVS). Vincent --- wine/dlls/msvcrt/tests/msvcrt_test.dsp 2002-12-10 09:33:46.000000000 -0500 +++ wine/dlls/msvcrt/tests/msvcrt_test.dsp 2002-12-10 11:06:21.000000000 -0500 @@ -38,6 +38,7 @@ # PROP Use_Debug_Libraries 1 # PROP Output_Dir "Output\Win32_MSVC_Headers" # PROP Intermediate_Dir "Output\Win32_MSVC_Headers" +# PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c # ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I ..\..\..\Output\\Win32_MSVC_Headers /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_MSVCRT_TEST_" /D "__WINE_USE_MSVCRT" /D __WINETEST_OUTPUT_DIR=\"Output\\Win32_MSVC_Headers\" /D "__i386__" /D "_X86_" /D inline=__inline /FR /FD /GZ /c @@ -48,7 +48,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 /nologo msvcrt.lib /subsystem:console /debug /machine:I386 /pdbtype:sept +# ADD LINK32 msvcrt.lib /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libcmtd.lib" /pdbtype:sept !ELSEIF "$(CFG)" == "msvcrt_test - Win32 Wine Headers" @@ -61,6 +62,7 @@ # PROP Use_Debug_Libraries 1 # PROP Output_Dir "Output\Win32_Wine_Headers" # PROP Intermediate_Dir "Output\Win32_Wine_Headers" +# PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c # ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I ..\..\..\Output\\Win32_Wine_Headers /I ..\..\..\include /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_MSVCRT_TEST_" /D "__WINE_USE_MSVCRT" /D __WINETEST_OUTPUT_DIR=\"Output\\Win32_Wine_Headers\" /D "__i386__" /D "_X86_" /D inline=__inline /FR /FD /GZ /c @@ -71,7 +71,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 /nologo msvcrt.lib /subsystem:console /debug /machine:I386 /pdbtype:sept +# ADD LINK32 msvcrt.lib /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libcmtd.lib" /pdbtype:sept !ENDIF

1 0

Recent wrc changes break mingw
by Steven Edwards Dec. 10, 2002

Dec. 10, 2002

Mingw lacks getopt.h so we are now broken on mingw. Should I rip the needed support and add it to libwine or is there a better way? gcc -c -I. -I. -I../../include -I../../include -D__MINGW__ -D_WINDOWS -DWINE_NO WINSOCK -Wall -mpreferred-stack-boundary=2 -D__WINE__ -D_REENTRANT -o wrc.o wrc .c wrc.c:62:20: getopt.h: No such file or directory wrc.c:287: elements of array `long_options' have incomplete type wrc.c:288: warning: excess elements in struct initializer wrc.c:288: warning: (near initialization for `long_options[0]') wrc.c:288: warning: excess elements in struct initializer wrc.c:288: warning: (near initialization for `long_options[0]') wrc.c:288: warning: excess elements in struct initializer wrc.c:288: warning: (near initialization for `long_options[0]') wrc.c:288: warning: excess elements in struct initializer wrc.c:288: warning: (near initialization for `long_options[0]') wrc.c:289: warning: excess elements in struct initializer wrc.c:289: warning: (near initialization for `long_options[1]') wrc.c:289: warning: excess elements in struct initializer wrc.c:289: warning: (near initialization for `long_options[1]') wrc.c:289: warning: excess elements in struct initializer wrc.c:289: warning: (near initialization for `long_options[1]') wrc.c:289: warning: excess elements in struct initializer wrc.c:289: warning: (near initialization for `long_options[1]') wrc.c:290: warning: excess elements in struct initializer wrc.c:290: warning: (near initialization for `long_options[2]') wrc.c:290: warning: excess elements in struct initializer wrc.c:290: warning: (near initialization for `long_options[2]') wrc.c:290: warning: excess elements in struct initializer wrc.c:290: warning: (near initialization for `long_options[2]') wrc.c:290: warning: excess elements in struct initializer wrc.c:290: warning: (near initialization for `long_options[2]') wrc.c:291: warning: excess elements in struct initializer wrc.c:291: warning: (near initialization for `long_options[3]') wrc.c:291: warning: excess elements in struct initializer wrc.c:291: warning: (near initialization for `long_options[3]') wrc.c:291: warning: excess elements in struct initializer wrc.c:291: warning: (near initialization for `long_options[3]') wrc.c:291: warning: excess elements in struct initializer wrc.c:291: warning: (near initialization for `long_options[3]') wrc.c:292: warning: excess elements in struct initializer wrc.c:292: warning: (near initialization for `long_options[4]') wrc.c:292: warning: excess elements in struct initializer wrc.c:292: warning: (near initialization for `long_options[4]') wrc.c:292: warning: excess elements in struct initializer wrc.c:292: warning: (near initialization for `long_options[4]') wrc.c:292: warning: excess elements in struct initializer wrc.c:292: warning: (near initialization for `long_options[4]') wrc.c:293: warning: excess elements in struct initializer wrc.c:293: warning: (near initialization for `long_options[5]') wrc.c:293: warning: excess elements in struct initializer wrc.c:293: warning: (near initialization for `long_options[5]') wrc.c:293: warning: excess elements in struct initializer wrc.c:293: warning: (near initialization for `long_options[5]') wrc.c:293: warning: excess elements in struct initializer wrc.c:293: warning: (near initialization for `long_options[5]') wrc.c:294: warning: excess elements in struct initializer wrc.c:294: warning: (near initialization for `long_options[6]') wrc.c:294: warning: excess elements in struct initializer wrc.c:294: warning: (near initialization for `long_options[6]') wrc.c:294: warning: excess elements in struct initializer wrc.c:294: warning: (near initialization for `long_options[6]') wrc.c:294: warning: excess elements in struct initializer wrc.c:294: warning: (near initialization for `long_options[6]') wrc.c:295: warning: excess elements in struct initializer wrc.c:295: warning: (near initialization for `long_options[7]') wrc.c:295: warning: excess elements in struct initializer wrc.c:295: warning: (near initialization for `long_options[7]') wrc.c:295: warning: excess elements in struct initializer wrc.c:295: warning: (near initialization for `long_options[7]') wrc.c:295: warning: excess elements in struct initializer wrc.c:295: warning: (near initialization for `long_options[7]') wrc.c:296: warning: excess elements in struct initializer wrc.c:296: warning: (near initialization for `long_options[8]') wrc.c:296: warning: excess elements in struct initializer wrc.c:296: warning: (near initialization for `long_options[8]') wrc.c:296: warning: excess elements in struct initializer wrc.c:296: warning: (near initialization for `long_options[8]') wrc.c:296: warning: excess elements in struct initializer wrc.c:296: warning: (near initialization for `long_options[8]') wrc.c:297: warning: excess elements in struct initializer wrc.c:297: warning: (near initialization for `long_options[9]') wrc.c:297: warning: excess elements in struct initializer wrc.c:297: warning: (near initialization for `long_options[9]') wrc.c:297: warning: excess elements in struct initializer wrc.c:297: warning: (near initialization for `long_options[9]') wrc.c:297: warning: excess elements in struct initializer wrc.c:297: warning: (near initialization for `long_options[9]') wrc.c:298: warning: excess elements in struct initializer wrc.c:298: warning: (near initialization for `long_options[10]') wrc.c:298: warning: excess elements in struct initializer wrc.c:298: warning: (near initialization for `long_options[10]') wrc.c:298: warning: excess elements in struct initializer wrc.c:298: warning: (near initialization for `long_options[10]') wrc.c:298: warning: excess elements in struct initializer wrc.c:298: warning: (near initialization for `long_options[10]') wrc.c: In function `main': wrc.c:330: warning: implicit declaration of function `getopt_long' make[2]: *** [wrc.o] Error 1 make[2]: Leaving directory `/g/src/wine-dev/wine/tools/wrc' make[1]: *** [wrc] Error 2 make[1]: Leaving directory `/g/src/wine-dev/wine/tools' make: *** [tools] Error 2 isolation(a)PH33R /g/src/wine-dev/wine $ __________________________________________________ Do you Yahoo!? Yahoo! Mail Plus - Powerful. Affordable. Sign up now. http://mailplus.yahoo.com

2 2

Accented Characters
by Richard Allen Dec. 10, 2002

Dec. 10, 2002

Hello all. I've been trying to get accented characters to work propperly in wine. For those who dont know, accented characters are beasts like "áéýúíó" We obtain them by pressing the dead key (mute_acute in my case) and then the key we want accented. I'm using CVS as of yesterday. [ra(a)xo winecvs]$ cat wine/VERSION Wine version 20021125 As far as I can tell, dlls/x11drv/keyboard.c seems to be where my problem is. [ra(a)xo ra]$ wine /home/ra/.wine/c_drive/Program\ Files/mIRC/mirc.exe fixme:keyboard:X11DRV_KEYBOARD_DetectLayout Your keyboard layout was not found! Using closest match instead (Icelandic keyboard layout) for scancode mapping. Please define your layout in windows/x11drv/keyboard.c and submit them to us for inclusion into future Wine releases. See the Wine User Guide, chapter "Keyboard" for more information. Now, keyboard.c does have a definition for the Icelandic keyboard, but as far as I can tell it's only used to recognize what keymap is in action, and not to define it ?. I've experimented with it, things like changing the "2" key to a "b" but it did not change the keyboard layout. The warning above is just because the definition in wine for the IS keymap doesnt match the one thats shipping with XFRee86 completely ? Anyway. my battle for the accented characters continues. The keyboard handling in wine is unlike anything I've ever seen before. Can anyone give me a quick runthru on how keyboard handling really works in wine, and prehaps help fix this ? Also, how are accented characters (dead keys) working in other languages ? Is this a problem limited to Icelandic or to accented characters in general ? Thanks in advance for any help :) -- Rikki. -- RHCE, RHCX, HP-UX Certified Administrator. -- Solaris 7 Certified Systems and Network Administrator. Bell Labs Unix -- Reach out and grep someone. Those who do not understand Unix are condemned to reinvent it, poorly.

2 1

Conformance tests --MSVC Headers 2 of 2
by Tom Dec. 10, 2002

Dec. 10, 2002

Build Log --------------------Configuration: ntdll_test - Win32 MSVC Headers-------------------- Command Lines Creating temporary file "C:\DOCUME~1\ADMINI~1\LOCALS~1\Temp\RSP2C.tmp" with contents [ /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\..\..\Output\\Win32_MSVC_Headers" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_NTDLL_TEST_" /D "__WINE_USE_MSVCRT" /D __WINETEST_OUTPUT_DIR=\"Output\\Win32_MSVC_Headers\" /D "__i386__" /D "_X86_" /D inline=__inline /FR"Output\Win32_MSVC_Headers/" /Fo"Output\Win32_MSVC_Headers/" /Fd"Output\Win32_MSVC_Headers/" /FD /GZ /c "C:\include\wine\dlls\ntdll\tests\error.c" "C:\include\wine\dlls\ntdll\tests\rtlbitmap.c" "C:\include\wine\dlls\ntdll\tests\rtlstr.c" ] Creating command line "cl.exe @C:\DOCUME~1\ADMINI~1\LOCALS~1\Temp\RSP2C.tmp" Creating temporary file "C:\DOCUME~1\ADMINI~1\LOCALS~1\Temp\RSP2D.tmp" with contents [ /nologo /subsystem:console /incremental:yes /pdb:"Output\Win32_MSVC_Headers/ntdll_test.pdb" /debug /machine:I386 /out:"Output\Win32_MSVC_Headers/ntdll_test.exe" /pdbtype:sept .\Output\Win32_MSVC_Headers\error.obj .\Output\Win32_MSVC_Headers\generated.obj .\Output\Win32_MSVC_Headers\rtlbitmap.obj .\Output\Win32_MSVC_Headers\rtlstr.obj .\Output\Win32_MSVC_Headers\testlist.obj ] Creating command line "link.exe @C:\DOCUME~1\ADMINI~1\LOCALS~1\Temp\RSP2D.tmp" Output Window Build Log --------------------Configuration: oleaut32_test - Win32 MSVC Headers-------------------- Command Lines Creating temporary file "C:\DOCUME~1\ADMINI~1\LOCALS~1\Temp\RSP2E.tmp" with contents [ /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\..\..\Output\\Win32_MSVC_Headers" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_OLEAUT32_TEST_" /D "__WINE_USE_MSVCRT" /D __WINETEST_OUTPUT_DIR=\"Output\\Win32_MSVC_Headers\" /D "__i386__" /D "_X86_" /D inline=__inline /FR"Output\Win32_MSVC_Headers/" /Fo"Output\Win32_MSVC_Headers/" /Fd"Output\Win32_MSVC_Headers/" /FD /GZ /c "C:\include\wine\dlls\oleaut32\tests\vartest.c" ] Creating command line "cl.exe @C:\DOCUME~1\ADMINI~1\LOCALS~1\Temp\RSP2E.tmp" Creating temporary file "C:\DOCUME~1\ADMINI~1\LOCALS~1\Temp\RSP2F.tmp" with contents [ oleaut32.lib /nologo /subsystem:console /incremental:yes /pdb:"Output\Win32_MSVC_Headers/oleaut32_test.pdb" /debug /machine:I386 /out:"Output\Win32_MSVC_Headers/oleaut32_test.exe" /pdbtype:sept .\Output\Win32_MSVC_Headers\vartest.obj .\Output\Win32_MSVC_Headers\testlist.obj ] Creating command line "link.exe @C:\DOCUME~1\ADMINI~1\LOCALS~1\Temp\RSP2F.tmp" Output Window Build Log --------------------Configuration: ntdll_test - Win32 MSVC Headers-------------------- Command Lines Creating temporary file "C:\DOCUME~1\ADMINI~1\LOCALS~1\Temp\RSP2C.tmp" with contents [ /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\..\..\Output\\Win32_MSVC_Headers" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_NTDLL_TEST_" /D "__WINE_USE_MSVCRT" /D __WINETEST_OUTPUT_DIR=\"Output\\Win32_MSVC_Headers\" /D "__i386__" /D "_X86_" /D inline=__inline /FR"Output\Win32_MSVC_Headers/" /Fo"Output\Win32_MSVC_Headers/" /Fd"Output\Win32_MSVC_Headers/" /FD /GZ /c "C:\include\wine\dlls\ntdll\tests\error.c" "C:\include\wine\dlls\ntdll\tests\rtlbitmap.c" "C:\include\wine\dlls\ntdll\tests\rtlstr.c" ] Creating command line "cl.exe @C:\DOCUME~1\ADMINI~1\LOCALS~1\Temp\RSP2C.tmp" Creating temporary file "C:\DOCUME~1\ADMINI~1\LOCALS~1\Temp\RSP2D.tmp" with contents [ /nologo /subsystem:console /incremental:yes /pdb:"Output\Win32_MSVC_Headers/ntdll_test.pdb" /debug /machine:I386 /out:"Output\Win32_MSVC_Headers/ntdll_test.exe" /pdbtype:sept .\Output\Win32_MSVC_Headers\error.obj .\Output\Win32_MSVC_Headers\generated.obj .\Output\Win32_MSVC_Headers\rtlbitmap.obj .\Output\Win32_MSVC_Headers\rtlstr.obj .\Output\Win32_MSVC_Headers\testlist.obj ] Creating command line "link.exe @C:\DOCUME~1\ADMINI~1\LOCALS~1\Temp\RSP2D.tmp" Output Window

1 0

what to do with include/wine/obj_base.h?
by Ove Kaaven Dec. 10, 2002

Dec. 10, 2002

I've submitted a patch to move the API prototypes out of obj_base.h, and I'd now be ready to submit unknwn.idl and unknwn.h, which would also supersede the interfaces defined in there, but I'm unsure about what to do with the remainder of it, namely the ICOM_* macros in there. Note that there's a shortcoming of those macros, they don't handle array arguments. Such arguments are binary-compatible with pointer arguments though, so it's not a serious shortcoming for Wine and widl (which could easily convert array args in IDL to pointer args in C), but it's a little ugly and may have source-compatibility issues if widl is used by Winelib code that implements interfaces with such method args. There are standard COM interfaces with this problem too, e.g. IPropertyStorage, but since such interfaces are implemented by Wine and not by app code, there's unlikely to be source-compatibility issues there. So the options include 1) keep using obj_base.h as it is, let widl use those macros as is (and convert array args to pointer args), include it into unknwn.h 2) move ICOM macros to include/objbase.h, and dispose of obj_base.h 3) make widl use the MS-style macros in objbase.h (but I'm not sure what to do about ICOM_MSVTABLE_COMPAT and ICOM_USE_COM_INTERFACE_ATTRIBUTE in this case) 4) make widl not use macros at all, but emit full C and C++ definitions directly (this is what midl.exe does, it seems) 5) make widl support any of the above with a command-line option, so that Wine headers uses 1 or 2, while Winelib apps get to use 3 or 4. 6) redesign the ICOM macros (but I doubt anyone's going to volunteer for that unless tied to a chair supervised by an ancient master of torture with a cat-o'-nine-tails in his toolbox, there's too much code to change)

4 5