June 2006 - Wine-Devel - list.winehq.org

[dinput] multiple /dev/input joysticks (for test/review)
by Christoph Frick June 19, 2006

June 19, 2006

hiho, the attached patch detects _all_ joysticks of /dev/input/event%d; please have a test before i refine the patch for submission. i tried it with Il2 Sturmovik and with Live For Speed - both games worked. as neither my cougar nor my brd wheel have force feedback i was not able to test, if everything still works. details: - use a seperate struct for holding infos about the /dev/input/event devices - use the general infos about the devices instead of acquiring/unacquiring before/after infos about the device are needed - changed the dinput_main to use three states to return on create_device: -1 == dont try further, 0 == there is no such device, 1 == there we go next ideas/patches: - use a linked list for storing only the JoyDev's that there are - the guid is stored in the JoyImpl and the JoyDev - the logic in setting the guids is as "first joystick == GUID_Joystick" then use the wine default; this currently leads into the same GUID for instance and product; i saw in joystick_linux.c how this is solved there - as dmesg shows a proper name for the device we might somehow retrieve it with an ioctl-call; currently the /dev/... name is used, which is good for developers but not for users - per-device-config via registry (e.g. combine axes) this patch actually is longer than the things it really does - introducing a "sub-struct" for holding common data adds lots of ``->joydev'' so i decided instead of splitting this patch into several fragments send an "unfinished" version and then finish the job with the following small patches. please note: the patch is against ~wine/dll/dinput (i use cvs for the wine original and git where i need it for patching) -- cu diff --git a/device.c b/device.c diff --git a/dinput_main.c b/dinput_main.c index 9f93a52..d928d96 100644 --- a/dinput_main.c +++ b/dinput_main.c @@ -220,10 +220,11 @@ static HRESULT WINAPI IDirectInputAImpl_ for (i = 0; i < NB_DINPUT_DEVICES; i++) { if (!dinput_devices[i]->enum_deviceA) continue; - for (j = 0, r = -1; r != 0; j++) { + TRACE(" - checking device %d ('%s')\n", i, dinput_devices[i]->name); + for (j = 0, r = 0; r != -1; j++) { devInstance.dwSize = sizeof(devInstance); - TRACE(" - checking device %d ('%s')\n", i, dinput_devices[i]->name); - if ((r = dinput_devices[i]->enum_deviceA(dwDevType, dwFlags, &devInstance, This->dwVersion, j))) { + if (1 == (r = dinput_devices[i]->enum_deviceA(dwDevType, dwFlags, &devInstance, This->dwVersion, j))) { + TRACE(" - found id %d\n", j); if (lpCallback(&devInstance,pvRef) == DIENUM_STOP) return 0; } @@ -250,10 +251,11 @@ static HRESULT WINAPI IDirectInputWImpl_ for (i = 0; i < NB_DINPUT_DEVICES; i++) { if (!dinput_devices[i]->enum_deviceW) continue; - for (j = 0, r = -1; r != 0; j++) { + TRACE(" - checking device %d ('%s')\n", i, dinput_devices[i]->name); + for (j = 0, r = 0; r != -1; j++) { devInstance.dwSize = sizeof(devInstance); - TRACE(" - checking device %d ('%s')\n", i, dinput_devices[i]->name); - if ((r = dinput_devices[i]->enum_deviceW(dwDevType, dwFlags, &devInstance, This->dwVersion, j))) { + if (1 == (r = dinput_devices[i]->enum_deviceW(dwDevType, dwFlags, &devInstance, This->dwVersion, j))) { + TRACE(" - found id %d\n", j); if (lpCallback(&devInstance,pvRef) == DIENUM_STOP) return 0; } diff --git a/joystick_linux.c b/joystick_linux.c index d56271d..abedc5c 100644 --- a/joystick_linux.c +++ b/joystick_linux.c @@ -162,11 +162,15 @@ static int joydev_get_device(char *dev, return ret; } -static BOOL joydev_enum_deviceA(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINSTANCEA lpddi, DWORD version, int id) +static int joydev_enum_deviceA(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINSTANCEA lpddi, DWORD version, int id) { int fd = -1; char dev[32]; + if (id>0) { + return -1; + } + if (dwFlags & DIEDFL_FORCEFEEDBACK) { WARN("force feedback not supported\n"); return FALSE; @@ -209,13 +213,17 @@ static BOOL joydev_enum_deviceA(DWORD dw return FALSE; } -static BOOL joydev_enum_deviceW(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINSTANCEW lpddi, DWORD version, int id) +static int joydev_enum_deviceW(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINSTANCEW lpddi, DWORD version, int id) { int fd = -1; char name[MAX_PATH]; char dev[32]; char friendly[32]; + if (id>0) { + return -1; + } + if (dwFlags & DIEDFL_FORCEFEEDBACK) { WARN("force feedback not supported\n"); return FALSE; diff --git a/joystick_linuxinput.c b/joystick_linuxinput.c index 30f81f1..94a0383 100644 --- a/joystick_linuxinput.c +++ b/joystick_linuxinput.c @@ -85,12 +85,28 @@ HRESULT linuxinput_get_info_W(int fd, RE typedef struct JoystickImpl JoystickImpl; static const IDirectInputDevice8AVtbl JoystickAvt; static const IDirectInputDevice8WVtbl JoystickWvt; + +struct JoyDev { + int is_joystick; + char *device; + GUID guid; + + int has_ff; + int num_effects; + + /* data returned by EVIOCGBIT for caps, EV_ABS, EV_KEY, and EV_FF */ + BYTE evbits[(EV_MAX+7)/8]; + BYTE absbits[(ABS_MAX+7)/8]; + BYTE keybits[(KEY_MAX+7)/8]; + BYTE ffbits[(FF_MAX+7)/8]; +}; + struct JoystickImpl { const void *lpVtbl; LONG ref; GUID guid; - + struct JoyDev *joydev; /* The 'parent' DInput */ IDirectInputImpl *dinput; @@ -130,100 +146,115 @@ struct JoystickImpl #define AXE_ABSMAX 2 #define AXE_ABSFUZZ 3 #define AXE_ABSFLAT 4 - - - /* data returned by EVIOCGBIT for caps, EV_ABS, EV_KEY, and EV_FF */ - BYTE evbits[(EV_MAX+7)/8]; - BYTE absbits[(ABS_MAX+7)/8]; - BYTE keybits[(KEY_MAX+7)/8]; - BYTE ffbits[(FF_MAX+7)/8]; }; +static void fake_current_js_state(JoystickImpl *ji); +static int find_property_offset(JoystickImpl *This, LPCDIPROPHEADER ph); +static DWORD map_pov(int event_value, int is_x); +static void find_joydevs(void); + /* This GUID is slightly different from the linux joystick one. Take note. */ -static GUID DInput_Wine_Joystick_GUID = { /* 9e573eda-7734-11d2-8d4a-23903fb6bdf7 */ +static const GUID DInput_Wine_Joystick_Base_GUID = { /* 9e573eda-7734-11d2-8d4a-23903fb6bdf7 */ 0x9e573eda, 0x7734, 0x11d2, {0x8d, 0x4a, 0x23, 0x90, 0x3f, 0xb6, 0xbd, 0xf7} }; -static void fake_current_js_state(JoystickImpl *ji); -static int find_property_offset(JoystickImpl *This, LPCDIPROPHEADER ph); -static DWORD map_pov(int event_value, int is_x); - #define test_bit(arr,bit) (((BYTE*)(arr))[(bit)>>3]&(1<<((bit)&7))) -static int joydev_have(BOOL require_ff) +#define MAX_JOYDEV 64 + +static int have_joydevs = -1; +static int first_joydev = -1; +static struct JoyDev joydevs[MAX_JOYDEV] = {}; + +static void find_joydevs(void) { - int i, fd, flags, num_effects; - int havejoy = 0; + int i; + + if (have_joydevs!=-1) { + return; + } + + have_joydevs = 0; + + for (i=0;i<MAX_JOYDEV;i++) { + char buf[200]; + struct JoyDev *joydev = &joydevs[i]; + int fd; + int no_ff_check = 0; + + sprintf(buf,EVDEVPREFIX"%d",i); + + if ((fd=open(buf, O_RDWR))==-1) { + fd = open(buf, O_RDONLY); + no_ff_check = 1; + } + + if (fd!=-1) { + if ((-1==ioctl(fd,EVIOCGBIT(0,sizeof(joydev->evbits)),joydev->evbits))) { + perror("EVIOCGBIT 0"); + close(fd); + continue; + } + if (-1==ioctl(fd,EVIOCGBIT(EV_ABS,sizeof(joydev->absbits)),joydev->absbits)) { + perror("EVIOCGBIT EV_ABS"); + close(fd); + continue; + } + if (-1==ioctl(fd,EVIOCGBIT(EV_KEY,sizeof(joydev->keybits)),joydev->keybits)) { + perror("EVIOCGBIT EV_KEY"); + close(fd); + continue; + } + /* A true joystick has at least axis X and Y, and at least 1 + * button. copied from linux/drivers/input/joydev.c */ + if (test_bit(joydev->absbits,ABS_X) && test_bit(joydev->absbits,ABS_Y) && + ( test_bit(joydev->keybits,BTN_TRIGGER) || + test_bit(joydev->keybits,BTN_A) || + test_bit(joydev->keybits,BTN_1) + ) + ) { + TRACE("Found a joystick '%s'\n", buf); + + joydev->is_joystick = 1; + joydev->device = strdup(buf); + joydev->guid = DInput_Wine_Joystick_Base_GUID; + joydev->guid.Data1 += have_joydevs; + have_joydevs++; + if (first_joydev==-1) { + first_joydev = i; + } + +#ifdef HAVE_STRUCT_FF_EFFECT_DIRECTION + if (!no_ff_check) { + if ((!test_bit(joydev->evbits,EV_FF)) + || (-1==ioctl(fd,EVIOCGBIT(EV_FF,sizeof(joydev->ffbits)),joydev->ffbits)) + || (-1==ioctl(fd,EVIOCGEFFECTS,&joydev->num_effects)) + || (joydev->num_effects <= 0)) { + close(fd); + continue; + } - for (i=0;i<64;i++) { - char buf[200]; - BYTE absbits[(ABS_MAX+7)/8],keybits[(KEY_MAX+7)/8]; - BYTE evbits[(EV_MAX+7)/8],ffbits[(FF_MAX+7)/8]; - - sprintf(buf,EVDEVPREFIX"%d",i); - - if (require_ff) - flags = O_RDWR; - else - flags = O_RDONLY; - - if (-1!=(fd=open(buf,flags))) { - if (-1==ioctl(fd,EVIOCGBIT(EV_ABS,sizeof(absbits)),absbits)) { - perror("EVIOCGBIT EV_ABS"); - close(fd); - continue; - } - if (-1==ioctl(fd,EVIOCGBIT(EV_KEY,sizeof(keybits)),keybits)) { - perror("EVIOCGBIT EV_KEY"); - close(fd); - continue; - } - - /* test for force feedback if it's required */ - if (require_ff) { - if ((-1==ioctl(fd,EVIOCGBIT(0,sizeof(evbits)),evbits))) { - perror("EVIOCGBIT 0"); - close(fd); - continue; - } - if ( (!test_bit(evbits,EV_FF)) - || (-1==ioctl(fd,EVIOCGBIT(EV_FF,sizeof(ffbits)),ffbits)) - || (-1==ioctl(fd,EVIOCGEFFECTS,&num_effects)) - || (num_effects <= 0)) { - close(fd); - continue; - } - } - - /* A true joystick has at least axis X and Y, and at least 1 - * button. copied from linux/drivers/input/joydev.c */ - if (test_bit(absbits,ABS_X) && test_bit(absbits,ABS_Y) && - ( test_bit(keybits,BTN_TRIGGER) || - test_bit(keybits,BTN_A) || - test_bit(keybits,BTN_1) - ) - ) { - FIXME("found a joystick at %s!\n",buf); - havejoy = 1; - } - close(fd); + TRACE(" ... with force feedback\n"); + + joydev->has_ff = 1; + } +#endif } - if (havejoy || (errno==ENODEV)) - break; + + close(fd); + } } - return havejoy; } -static BOOL joydev_enum_deviceA(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINSTANCEA lpddi, DWORD version, int id) +static int joydev_enum_deviceA(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINSTANCEA lpddi, DWORD version, int id) { - int havejoy = 0; - - if (id != 0) - return FALSE; - + if (id >= MAX_JOYDEV) { + return -1; + } + if (!((dwDevType == 0) || ((dwDevType == DIDEVTYPE_JOYSTICK) && (version < 0x0800)) || (((dwDevType == DI8DEVCLASS_GAMECTRL) || (dwDevType == DI8DEVTYPE_JOYSTICK)) && (version >= 0x0800)))) @@ -234,35 +265,34 @@ static BOOL joydev_enum_deviceA(DWORD dw return FALSE; #endif - havejoy = joydev_have(dwFlags & DIEDFL_FORCEFEEDBACK); - - if (!havejoy) - return FALSE; + find_joydevs(); - TRACE("Enumerating the linuxinput Joystick device\n"); - - /* Return joystick */ - lpddi->guidInstance = GUID_Joystick; - lpddi->guidProduct = DInput_Wine_Joystick_GUID; + if (joydevs[id].is_joystick && ((!(dwFlags & DIEDFL_FORCEFEEDBACK)) || joydevs[id].has_ff)) { + if (id==first_joydev) { + lpddi->guidInstance = GUID_Joystick; + } else { + lpddi->guidInstance = joydevs[id].guid; + } + lpddi->guidProduct = joydevs[id].guid; - lpddi->guidFFDriver = GUID_NULL; - if (version >= 0x0800) - lpddi->dwDevType = DI8DEVTYPE_JOYSTICK | (DI8DEVTYPEJOYSTICK_STANDARD << 8); - else - lpddi->dwDevType = DIDEVTYPE_JOYSTICK | (DIDEVTYPEJOYSTICK_TRADITIONAL << 8); + lpddi->guidFFDriver = GUID_NULL; + if (version >= 0x0800) + lpddi->dwDevType = DI8DEVTYPE_JOYSTICK | (DI8DEVTYPEJOYSTICK_STANDARD << 8); + else + lpddi->dwDevType = DIDEVTYPE_JOYSTICK | (DIDEVTYPEJOYSTICK_TRADITIONAL << 8); - strcpy(lpddi->tszInstanceName, "Joystick"); - /* ioctl JSIOCGNAME(len) */ - strcpy(lpddi->tszProductName, "Wine Joystick"); - return TRUE; + strcpy(lpddi->tszInstanceName, "Joystick"); + strcpy(lpddi->tszProductName, joydevs[id].device); + return TRUE; + } + return FALSE; } -static BOOL joydev_enum_deviceW(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINSTANCEW lpddi, DWORD version, int id) +static int joydev_enum_deviceW(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINSTANCEW lpddi, DWORD version, int id) { - int havejoy = 0; - - if (id != 0) - return FALSE; + if (id >= MAX_JOYDEV) { + return -1; + } if (!((dwDevType == 0) || ((dwDevType == DIDEVTYPE_JOYSTICK) && (version < 0x0800)) || @@ -274,30 +304,27 @@ static BOOL joydev_enum_deviceW(DWORD dw return FALSE; #endif - havejoy = joydev_have(dwFlags & DIEDFL_FORCEFEEDBACK); - - if (!havejoy) - return FALSE; - - TRACE("Enumerating the linuxinput Joystick device\n"); - - /* Return joystick */ - lpddi->guidInstance = GUID_Joystick; - lpddi->guidProduct = DInput_Wine_Joystick_GUID; + find_joydevs(); - lpddi->guidFFDriver = GUID_NULL; - if (version >= 0x0800) - lpddi->dwDevType = DI8DEVTYPE_JOYSTICK | (DI8DEVTYPEJOYSTICK_STANDARD << 8); - else - lpddi->dwDevType = DIDEVTYPE_JOYSTICK | (DIDEVTYPEJOYSTICK_TRADITIONAL << 8); + if (joydevs[id].is_joystick && ((!(dwFlags & DIEDFL_FORCEFEEDBACK)) || joydevs[id].has_ff)) { + /* Return joystick */ + lpddi->guidInstance = GUID_Joystick; + lpddi->guidProduct = joydevs[id].guid; + + lpddi->guidFFDriver = GUID_NULL; + if (version >= 0x0800) + lpddi->dwDevType = DI8DEVTYPE_JOYSTICK | (DI8DEVTYPEJOYSTICK_STANDARD << 8); + else + lpddi->dwDevType = DIDEVTYPE_JOYSTICK | (DIDEVTYPEJOYSTICK_TRADITIONAL << 8); - MultiByteToWideChar(CP_ACP, 0, "Joystick", -1, lpddi->tszInstanceName, MAX_PATH); - /* ioctl JSIOCGNAME(len) */ - MultiByteToWideChar(CP_ACP, 0, "Wine Joystick", -1, lpddi->tszProductName, MAX_PATH); - return TRUE; + MultiByteToWideChar(CP_ACP, 0, "Joystick", -1, lpddi->tszInstanceName, MAX_PATH); + MultiByteToWideChar(CP_ACP, 0, joydevs[id].device, -1, lpddi->tszProductName, MAX_PATH); + return TRUE; + } + return FALSE; } -static JoystickImpl *alloc_device(REFGUID rguid, const void *jvt, IDirectInputImpl *dinput) +static JoystickImpl *alloc_device(REFGUID rguid, const void *jvt, IDirectInputImpl *dinput, struct JoyDev *joydev) { JoystickImpl* newDevice; int i; @@ -307,6 +334,7 @@ static JoystickImpl *alloc_device(REFGUI newDevice->ref = 1; newDevice->joyfd = -1; newDevice->dinput = dinput; + newDevice->joydev = joydev; #ifdef HAVE_STRUCT_FF_EFFECT_DIRECTION newDevice->ff_state = FF_STATUS_STOPPED; #endif @@ -327,25 +355,30 @@ static JoystickImpl *alloc_device(REFGUI static HRESULT joydev_create_deviceA(IDirectInputImpl *dinput, REFGUID rguid, REFIID riid, LPDIRECTINPUTDEVICEA* pdev) { - int havejoy = 0; + int i; - havejoy = joydev_have(FALSE); + find_joydevs(); - if (!havejoy) + if (!have_joydevs) return DIERR_DEVICENOTREG; - if ((IsEqualGUID(&GUID_Joystick,rguid)) || - (IsEqualGUID(&DInput_Wine_Joystick_GUID,rguid))) { - if ((riid == NULL) || - IsEqualGUID(&IID_IDirectInputDeviceA,riid) || - IsEqualGUID(&IID_IDirectInputDevice2A,riid) || - IsEqualGUID(&IID_IDirectInputDevice7A,riid) || - IsEqualGUID(&IID_IDirectInputDevice8A,riid)) { - *pdev = (IDirectInputDeviceA*) alloc_device(rguid, &JoystickAvt, dinput); - TRACE("Creating a Joystick device (%p)\n", *pdev); - return DI_OK; - } else - return DIERR_NOINTERFACE; + for (i=0; i<MAX_JOYDEV; i++) { + if (joydevs[i].is_joystick && ( + IsEqualGUID(&GUID_Joystick,rguid) || + IsEqualGUID(&joydevs[i].guid,rguid) + )) { + if ((riid == NULL) || + IsEqualGUID(&IID_IDirectInputDeviceA,riid) || + IsEqualGUID(&IID_IDirectInputDevice2A,riid) || + IsEqualGUID(&IID_IDirectInputDevice7A,riid) || + IsEqualGUID(&IID_IDirectInputDevice8A,riid)) { + *pdev = (IDirectInputDeviceA*) alloc_device(rguid, &JoystickAvt, dinput, &joydevs[i]); + TRACE("Creating a Joystick device (%p)\n", *pdev); + return DI_OK; + } else { + return DIERR_NOINTERFACE; + } + } } return DIERR_DEVICENOTREG; @@ -354,25 +387,30 @@ static HRESULT joydev_create_deviceA(IDi static HRESULT joydev_create_deviceW(IDirectInputImpl *dinput, REFGUID rguid, REFIID riid, LPDIRECTINPUTDEVICEW* pdev) { - int havejoy = 0; + int i; - havejoy = joydev_have(FALSE); + find_joydevs(); - if (!havejoy) + if (!have_joydevs) return DIERR_DEVICENOTREG; - if ((IsEqualGUID(&GUID_Joystick,rguid)) || - (IsEqualGUID(&DInput_Wine_Joystick_GUID,rguid))) { - if ((riid == NULL) || - IsEqualGUID(&IID_IDirectInputDeviceW,riid) || - IsEqualGUID(&IID_IDirectInputDevice2W,riid) || - IsEqualGUID(&IID_IDirectInputDevice7W,riid) || - IsEqualGUID(&IID_IDirectInputDevice8W,riid)) { - *pdev = (IDirectInputDeviceW*) alloc_device(rguid, &JoystickWvt, dinput); - TRACE("Creating a Joystick device (%p)\n", *pdev); - return DI_OK; - } else - return DIERR_NOINTERFACE; + for (i=0; i<MAX_JOYDEV; i++) { + if (joydevs[i].is_joystick && ( + IsEqualGUID(&GUID_Joystick,rguid) || + IsEqualGUID(&joydevs[i].guid,rguid) + )) { + if ((riid == NULL) || + IsEqualGUID(&IID_IDirectInputDeviceW,riid) || + IsEqualGUID(&IID_IDirectInputDevice2W,riid) || + IsEqualGUID(&IID_IDirectInputDevice7W,riid) || + IsEqualGUID(&IID_IDirectInputDevice8W,riid)) { + *pdev = (IDirectInputDeviceW*) alloc_device(rguid, &JoystickWvt, dinput, &joydevs[i]); + TRACE("Creating a Joystick device (%p)\n", *pdev); + return DI_OK; + } else { + return DIERR_NOINTERFACE; + } + } } return DIERR_DEVICENOTREG; @@ -461,9 +499,8 @@ static HRESULT WINAPI JoystickAImpl_SetD */ static HRESULT WINAPI JoystickAImpl_Acquire(LPDIRECTINPUTDEVICE8A iface) { - int i,buttons; + int i, buttons; JoystickImpl *This = (JoystickImpl *)iface; - char buf[200]; BOOL readonly = TRUE; TRACE("(this=%p)\n",This); @@ -472,68 +509,23 @@ static HRESULT WINAPI JoystickAImpl_Acqu if (This->df==NULL) { return DIERR_INVALIDPARAM; } - for (i=0;i<64;i++) { - sprintf(buf,EVDEVPREFIX"%d",i); - if (-1==(This->joyfd=open(buf,O_RDWR))) { - if (-1==(This->joyfd=open(buf,O_RDONLY))) { - /* Couldn't open the device at all */ - if (errno==ENODEV) - return DIERR_NOTFOUND; - perror(buf); - continue; - } - else { - /* Couldn't open in r/w but opened in read-only. */ - WARN("Could not open %s in read-write mode. Force feedback will be disabled.\n",buf); - } - } - else { - /* Opened device in read-write */ - readonly = FALSE; - } - if ((-1!=ioctl(This->joyfd,EVIOCGBIT(0,sizeof(This->evbits)),This->evbits)) && - (-1!=ioctl(This->joyfd,EVIOCGBIT(EV_ABS,sizeof(This->absbits)),This->absbits)) && - (-1!=ioctl(This->joyfd,EVIOCGBIT(EV_KEY,sizeof(This->keybits)),This->keybits)) && - (test_bit(This->absbits,ABS_X) && test_bit(This->absbits,ABS_Y) && - (test_bit(This->keybits,BTN_TRIGGER)|| - test_bit(This->keybits,BTN_A) || - test_bit(This->keybits,BTN_1) - ) - ) - ) - break; - close(This->joyfd); - This->joyfd = -1; - } - if (This->joyfd==-1) - return DIERR_NOTFOUND; - This->has_ff = FALSE; - This->num_effects = 0; - -#ifdef HAVE_STRUCT_FF_EFFECT_DIRECTION - if (!readonly && test_bit(This->evbits, EV_FF)) { - if (-1!=ioctl(This->joyfd,EVIOCGBIT(EV_FF,sizeof(This->ffbits)),This->ffbits)) { - if (-1!=ioctl(This->joyfd,EVIOCGEFFECTS,&This->num_effects) - && This->num_effects > 0) { - This->has_ff = TRUE; - TRACE("Joystick seems to be capable of force feedback.\n"); - } - else { - TRACE("Joystick does not support any effects, disabling force feedback.\n"); - } - } - else { - TRACE("Could not get EV_FF bits; disabling force feedback.\n"); - } - } - else { - TRACE("Force feedback disabled (device is readonly or joystick incapable).\n"); + if (-1==(This->joyfd=open(This->joydev->device,O_RDWR))) { + if (-1==(This->joyfd=open(This->joydev->device,O_RDONLY))) { + /* Couldn't open the device at all */ + perror(This->joydev->device); + return DIERR_NOTFOUND; + } else { + /* Couldn't open in r/w but opened in read-only. */ + WARN("Could not open %s in read-write mode. Force feedback will be disabled.\n", This->joydev->device); + } + } else { + /* Opened device in read-write */ + readonly = FALSE; } -#endif for (i=0;i<ABS_MAX;i++) { - if (test_bit(This->absbits,i)) { + if (test_bit(This->joydev->absbits,i)) { if (-1==ioctl(This->joyfd,EVIOCGABS(i),&(This->axes[i]))) continue; TRACE("axe %d: cur=%d, min=%d, max=%d, fuzz=%d, flat=%d\n", @@ -550,14 +542,14 @@ static HRESULT WINAPI JoystickAImpl_Acqu } buttons = 0; for (i=0;i<KEY_MAX;i++) { - if (test_bit(This->keybits,i)) { + if (test_bit(This->joydev->keybits,i)) { TRACE("button %d: %d\n", i, buttons); This->buttons[i] = 0x80 | buttons; buttons++; } } - fake_current_js_state(This); + fake_current_js_state(This); return 0; } @@ -985,7 +977,6 @@ static HRESULT WINAPI JoystickAImpl_GetC LPDIDEVCAPS lpDIDevCaps) { JoystickImpl *This = (JoystickImpl *)iface; - int xfd = This->joyfd; int i,axes,buttons; TRACE("%p->(%p)\n",iface,lpDIDevCaps); @@ -1000,11 +991,6 @@ static HRESULT WINAPI JoystickAImpl_GetC return DIERR_INVALIDPARAM; } - if (xfd==-1) { - /* yes, games assume we return something, even if unacquired */ - JoystickAImpl_Acquire(iface); - } - lpDIDevCaps->dwFlags = DIDC_ATTACHED; if (This->dinput->dwVersion >= 0x0800) lpDIDevCaps->dwDevType = DI8DEVTYPE_JOYSTICK | (DI8DEVTYPEJOYSTICK_STANDARD << 8); @@ -1012,9 +998,9 @@ static HRESULT WINAPI JoystickAImpl_GetC lpDIDevCaps->dwDevType = DIDEVTYPE_JOYSTICK | (DIDEVTYPEJOYSTICK_TRADITIONAL << 8); axes=0; - for (i=0;i<ABS_MAX;i++) if (test_bit(This->absbits,i)) axes++; + for (i=0;i<ABS_MAX;i++) if (test_bit(This->joydev->absbits,i)) axes++; buttons=0; - for (i=0;i<KEY_MAX;i++) if (test_bit(This->keybits,i)) buttons++; + for (i=0;i<KEY_MAX;i++) if (test_bit(This->joydev->keybits,i)) buttons++; if (This->has_ff) lpDIDevCaps->dwFlags |= DIDC_FORCEFEEDBACK; @@ -1022,10 +1008,6 @@ static HRESULT WINAPI JoystickAImpl_GetC lpDIDevCaps->dwAxes = axes; lpDIDevCaps->dwButtons = buttons; - if (xfd==-1) { - JoystickAImpl_Unacquire(iface); - } - return DI_OK; } @@ -1052,7 +1034,6 @@ static HRESULT WINAPI JoystickAImpl_Enum { JoystickImpl *This = (JoystickImpl *)iface; DIDEVICEOBJECTINSTANCEA ddoi; - int xfd = This->joyfd; TRACE("(this=%p,%p,%p,%08lx)\n", This, lpCallback, lpvRef, dwFlags); if (TRACE_ON(dinput)) { @@ -1061,10 +1042,6 @@ static HRESULT WINAPI JoystickAImpl_Enum TRACE("\n"); } - /* We need to work even if we're not yet acquired */ - if (xfd == -1) - IDirectInputDevice8_Acquire(iface); - /* Only the fields till dwFFMaxForce are relevant */ ddoi.dwSize = FIELD_OFFSET(DIDEVICEOBJECTINSTANCEA, dwFFMaxForce); @@ -1075,7 +1052,7 @@ static HRESULT WINAPI JoystickAImpl_Enum BYTE i; for (i = 0; i < ABS_MAX; i++) { - if (!test_bit(This->absbits,i)) continue; + if (!test_bit(This->joydev->absbits,i)) continue; switch (i) { case ABS_X: @@ -1122,9 +1099,6 @@ static HRESULT WINAPI JoystickAImpl_Enum sprintf(ddoi.tszName, "%d-Axis", i); _dump_OBJECTINSTANCEA(&ddoi); if (lpCallback(&ddoi, lpvRef) != DIENUM_CONTINUE) { - /* return to unaquired state if that's where we were */ - if (xfd == -1) - IDirectInputDevice8_Unacquire(iface); return DI_OK; } } @@ -1135,15 +1109,12 @@ static HRESULT WINAPI JoystickAImpl_Enum int i; ddoi.guidType = GUID_POV; for (i=0; i<4; i++) { - if (test_bit(This->absbits,ABS_HAT0X+(i<<1)) && test_bit(This->absbits,ABS_HAT0Y+(i<<1))) { + if (test_bit(This->joydev->absbits,ABS_HAT0X+(i<<1)) && test_bit(This->joydev->absbits,ABS_HAT0Y+(i<<1))) { ddoi.dwOfs = DIJOFS_POV(i); ddoi.dwType = DIDFT_MAKEINSTANCE(i << WINE_JOYSTICK_POV_BASE) | DIDFT_POV; sprintf(ddoi.tszName, "%d-POV", i); _dump_OBJECTINSTANCEA(&ddoi); if (lpCallback(&ddoi, lpvRef) != DIENUM_CONTINUE) { - /* return to unaquired state if that's where we were */ - if (xfd == -1) - IDirectInputDevice8_Unacquire(iface); return DI_OK; } } @@ -1159,25 +1130,18 @@ static HRESULT WINAPI JoystickAImpl_Enum ddoi.guidType = GUID_Button; for (i = 0; i < KEY_MAX; i++) { - if (!test_bit(This->keybits,i)) continue; + if (!test_bit(This->joydev->keybits,i)) continue; ddoi.dwOfs = DIJOFS_BUTTON(btncount); ddoi.dwType = DIDFT_MAKEINSTANCE(btncount << WINE_JOYSTICK_BUTTON_BASE) | DIDFT_PSHBUTTON; sprintf(ddoi.tszName, "%d-Button", btncount); btncount++; _dump_OBJECTINSTANCEA(&ddoi); if (lpCallback(&ddoi, lpvRef) != DIENUM_CONTINUE) { - /* return to unaquired state if that's where we were */ - if (xfd == -1) - IDirectInputDevice8_Unacquire(iface); return DI_OK; } } } - /* return to unaquired state if that's where we were */ - if (xfd == -1) - IDirectInputDevice8_Unacquire(iface); - return DI_OK; } @@ -1300,74 +1264,66 @@ static HRESULT WINAPI JoystickAImpl_Enum DIEFFECTINFOA dei; /* feif */ DWORD type = DIEFT_GETTYPE(dwEffType); JoystickImpl* This = (JoystickImpl*)iface; - int xfd = This->joyfd; - TRACE("(this=%p,%p,%ld) type=%ld fd=%d\n", This, pvRef, dwEffType, type, xfd); + TRACE("(this=%p,%p,%ld) type=%ld\n", This, pvRef, dwEffType, type); dei.dwSize = sizeof(DIEFFECTINFOA); - /* We need to return something even if we're not yet acquired */ - if (xfd == -1) - IDirectInputDevice8_Acquire(iface); - if ((type == DIEFT_ALL || type == DIEFT_CONSTANTFORCE) - && test_bit(This->ffbits, FF_CONSTANT)) { + && test_bit(This->joydev->ffbits, FF_CONSTANT)) { IDirectInputDevice8_GetEffectInfo(iface, &dei, &GUID_ConstantForce); (*lpCallback)(&dei, pvRef); } if ((type == DIEFT_ALL || type == DIEFT_PERIODIC) - && test_bit(This->ffbits, FF_PERIODIC)) { - if (test_bit(This->ffbits, FF_SQUARE)) { + && test_bit(This->joydev->ffbits, FF_PERIODIC)) { + if (test_bit(This->joydev->ffbits, FF_SQUARE)) { IDirectInputDevice8_GetEffectInfo(iface, &dei, &GUID_Square); (*lpCallback)(&dei, pvRef); } - if (test_bit(This->ffbits, FF_SINE)) { + if (test_bit(This->joydev->ffbits, FF_SINE)) { IDirectInputDevice8_GetEffectInfo(iface, &dei, &GUID_Sine); (*lpCallback)(&dei, pvRef); } - if (test_bit(This->ffbits, FF_TRIANGLE)) { + if (test_bit(This->joydev->ffbits, FF_TRIANGLE)) { IDirectInputDevice8_GetEffectInfo(iface, &dei, &GUID_Triangle); (*lpCallback)(&dei, pvRef); } - if (test_bit(This->ffbits, FF_SAW_UP)) { + if (test_bit(This->joydev->ffbits, FF_SAW_UP)) { IDirectInputDevice8_GetEffectInfo(iface, &dei, &GUID_SawtoothUp); (*lpCallback)(&dei, pvRef); } - if (test_bit(This->ffbits, FF_SAW_DOWN)) { + if (test_bit(This->joydev->ffbits, FF_SAW_DOWN)) { IDirectInputDevice8_GetEffectInfo(iface, &dei, &GUID_SawtoothDown); (*lpCallback)(&dei, pvRef); } } if ((type == DIEFT_ALL || type == DIEFT_RAMPFORCE) - && test_bit(This->ffbits, FF_RAMP)) { + && test_bit(This->joydev->ffbits, FF_RAMP)) { IDirectInputDevice8_GetEffectInfo(iface, &dei, &GUID_RampForce); (*lpCallback)(&dei, pvRef); } if (type == DIEFT_ALL || type == DIEFT_CONDITION) { - if (test_bit(This->ffbits, FF_SPRING)) { + if (test_bit(This->joydev->ffbits, FF_SPRING)) { IDirectInputDevice8_GetEffectInfo(iface, &dei, &GUID_Spring); (*lpCallback)(&dei, pvRef); } - if (test_bit(This->ffbits, FF_DAMPER)) { + if (test_bit(This->joydev->ffbits, FF_DAMPER)) { IDirectInputDevice8_GetEffectInfo(iface, &dei, &GUID_Damper); (*lpCallback)(&dei, pvRef); } - if (test_bit(This->ffbits, FF_INERTIA)) { + if (test_bit(This->joydev->ffbits, FF_INERTIA)) { IDirectInputDevice8_GetEffectInfo(iface, &dei, &GUID_Inertia); (*lpCallback)(&dei, pvRef); } - if (test_bit(This->ffbits, FF_FRICTION)) { + if (test_bit(This->joydev->ffbits, FF_FRICTION)) { IDirectInputDevice8_GetEffectInfo(iface, &dei, &GUID_Friction); (*lpCallback)(&dei, pvRef); } } - /* return to unaquired state if that's where it was */ - if (xfd == -1) - IDirectInputDevice8_Unacquire(iface); #endif return DI_OK; @@ -1390,60 +1346,56 @@ static HRESULT WINAPI JoystickWImpl_Enum dei.dwSize = sizeof(DIEFFECTINFOW); - /* We need to return something even if we're not yet acquired */ - if (xfd == -1) - IDirectInputDevice8_Acquire(iface); - if ((type == DIEFT_ALL || type == DIEFT_CONSTANTFORCE) - && test_bit(This->ffbits, FF_CONSTANT)) { + && test_bit(This->joydev->ffbits, FF_CONSTANT)) { IDirectInputDevice8_GetEffectInfo(iface, &dei, &GUID_ConstantForce); (*lpCallback)(&dei, pvRef); } if ((type == DIEFT_ALL || type == DIEFT_PERIODIC) - && test_bit(This->ffbits, FF_PERIODIC)) { - if (test_bit(This->ffbits, FF_SQUARE)) { + && test_bit(This->joydev->ffbits, FF_PERIODIC)) { + if (test_bit(This->joydev->ffbits, FF_SQUARE)) { IDirectInputDevice8_GetEffectInfo(iface, &dei, &GUID_Square); (*lpCallback)(&dei, pvRef); } - if (test_bit(This->ffbits, FF_SINE)) { + if (test_bit(This->joydev->ffbits, FF_SINE)) { IDirectInputDevice8_GetEffectInfo(iface, &dei, &GUID_Sine); (*lpCallback)(&dei, pvRef); } - if (test_bit(This->ffbits, FF_TRIANGLE)) { + if (test_bit(This->joydev->ffbits, FF_TRIANGLE)) { IDirectInputDevice8_GetEffectInfo(iface, &dei, &GUID_Triangle); (*lpCallback)(&dei, pvRef); } - if (test_bit(This->ffbits, FF_SAW_UP)) { + if (test_bit(This->joydev->ffbits, FF_SAW_UP)) { IDirectInputDevice8_GetEffectInfo(iface, &dei, &GUID_SawtoothUp); (*lpCallback)(&dei, pvRef); } - if (test_bit(This->ffbits, FF_SAW_DOWN)) { + if (test_bit(This->joydev->ffbits, FF_SAW_DOWN)) { IDirectInputDevice8_GetEffectInfo(iface, &dei, &GUID_SawtoothDown); (*lpCallback)(&dei, pvRef); } } if ((type == DIEFT_ALL || type == DIEFT_RAMPFORCE) - && test_bit(This->ffbits, FF_RAMP)) { + && test_bit(This->joydev->ffbits, FF_RAMP)) { IDirectInputDevice8_GetEffectInfo(iface, &dei, &GUID_RampForce); (*lpCallback)(&dei, pvRef); } if (type == DIEFT_ALL || type == DIEFT_CONDITION) { - if (test_bit(This->ffbits, FF_SPRING)) { + if (test_bit(This->joydev->ffbits, FF_SPRING)) { IDirectInputDevice8_GetEffectInfo(iface, &dei, &GUID_Spring); (*lpCallback)(&dei, pvRef); } - if (test_bit(This->ffbits, FF_DAMPER)) { + if (test_bit(This->joydev->ffbits, FF_DAMPER)) { IDirectInputDevice8_GetEffectInfo(iface, &dei, &GUID_Damper); (*lpCallback)(&dei, pvRef); } - if (test_bit(This->ffbits, FF_INERTIA)) { + if (test_bit(This->joydev->ffbits, FF_INERTIA)) { IDirectInputDevice8_GetEffectInfo(iface, &dei, &GUID_Inertia); (*lpCallback)(&dei, pvRef); } - if (test_bit(This->ffbits, FF_FRICTION)) { + if (test_bit(This->joydev->ffbits, FF_FRICTION)) { IDirectInputDevice8_GetEffectInfo(iface, &dei, &GUID_Friction); (*lpCallback)(&dei, pvRef); } diff --git a/keyboard.c b/keyboard.c index 9640db9..2cd9314 100644 --- a/keyboard.c +++ b/keyboard.c @@ -186,10 +186,10 @@ static void fill_keyboard_dideviceinstan memcpy(lpddi, &ddi, (dwSize < sizeof(ddi) ? dwSize : sizeof(ddi))); } -static BOOL keyboarddev_enum_deviceA(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINSTANCEA lpddi, DWORD version, int id) +static int keyboarddev_enum_deviceA(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINSTANCEA lpddi, DWORD version, int id) { if (id != 0) - return FALSE; + return -1; if ((dwDevType == 0) || ((dwDevType == DIDEVTYPE_KEYBOARD) && (version < 0x0800)) || @@ -204,10 +204,10 @@ static BOOL keyboarddev_enum_deviceA(DWO return FALSE; } -static BOOL keyboarddev_enum_deviceW(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINSTANCEW lpddi, DWORD version, int id) +static int keyboarddev_enum_deviceW(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINSTANCEW lpddi, DWORD version, int id) { if (id != 0) - return FALSE; + return -1; if ((dwDevType == 0) || ((dwDevType == DIDEVTYPE_KEYBOARD) && (version < 0x0800)) || diff --git a/mouse.c b/mouse.c index 8bd395e..f313b10 100644 --- a/mouse.c +++ b/mouse.c @@ -202,10 +202,10 @@ static void fill_mouse_dideviceinstanceW memcpy(lpddi, &ddi, (dwSize < sizeof(ddi) ? dwSize : sizeof(ddi))); } -static BOOL mousedev_enum_deviceA(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINSTANCEA lpddi, DWORD version, int id) +static int mousedev_enum_deviceA(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINSTANCEA lpddi, DWORD version, int id) { if (id != 0) - return FALSE; + return -1; if ((dwDevType == 0) || ((dwDevType == DIDEVTYPE_MOUSE) && (version < 0x0800)) || @@ -220,10 +220,10 @@ static BOOL mousedev_enum_deviceA(DWORD return FALSE; } -static BOOL mousedev_enum_deviceW(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINSTANCEW lpddi, DWORD version, int id) +static int mousedev_enum_deviceW(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINSTANCEW lpddi, DWORD version, int id) { if (id != 0) - return FALSE; + return -1; if ((dwDevType == 0) || ((dwDevType == DIDEVTYPE_MOUSE) && (version < 0x0800)) ||

1 0

Re: wininet file scheme
by Mike McCormack June 19, 2006

June 19, 2006

Nick Cronin wrote: > unlike http:// etc, file:/// has 3 slashes, this patch removes the third > slash. Could you provide a test case for this please? Specifically, is "http:///foo.bar" different to "http://foo.bar"? Your code treats them equally. How about "file:///" and "file://"? Mike

3 2

Re: Allow 'wine foo.exe' to work when foo.exe is a symlink
by Jesse Allen June 19, 2006

June 19, 2006

On 6/18/06, Dan Kegel <dank(a)kegel.com> wrote: > Currently, when I install a Windows app on Ubuntu, > the apps don't show up in the system menus. > I'm doing a demo of Wine for a users' group in a few > days, so I thought "How would the average user deal with this?" > Probably they'd navigate down to the directory > where the app was installed, make a shortcut to the app, > and drag the shortcut to the desktop. So I tried > that -- and it didn't work. But it does work if I apply > the following trivial patch, which just uses readlink() to find the > target of the shortcut. I didn't really analyze the > code, just slammed the readlink in there, and was happy to > see it worked. > > Changelog: > kernel/process.c: if argv[1] is a symlink, use its target > > process.c | 14 ++++++++++++-- > 1 file changed, 12 insertions(+), 2 deletions(-) > > >From my own playing around with the issue, I believe I understand why you are making this change for shortcuts. I do have to state, that with this change, it will break the method using symlinks to pass the exe check on blizzard games logging into battle.net. It will also break my workaround for an app that expands its program path funny (symlinking again). However, you can still use a hard link to do the same thing so there's nothing wrong with this change happening. Now I have to go tell everyone to use a hard link instead. :)

1 0

Forcing Wine process to use a specific IP address
by Keshav Attrey June 18, 2006

June 18, 2006

I want to make a process running under Wine believe that its machine's IP address is whatever IP address I specify. More specifically: I have set up several virtual interfaces on my machine. When I run a process under Wine, it by default uses the actual IP address of the machine, which is normal. But I want to force the process to be able to see and use only the virtual IP address that I specify, and not the real IP address of the machine. Do you have any ideas on how to do this? I have been trying to go through the Wine source code, and have been looking in socket.c and iphlpapi_main.c, but I have not been able to find the right places to change to force Wine to use only one particular IP address. The big idea is to run many copies of a Windows app on the same machine and make each copy think that it is running on a separate machine, each with its own IP address. Although VMWare or QEMU would make this possible, Wine is so much lighter that I could have many more copies of Wine running than VMWare. I imagine Wine would also be lighter than using Wine over Linux VServer or FreeBSD Jail... but I'm not quite sure. Any ideas? Thanks, Keshav

1 0

re: how to debug a segfault in wine-preloader?
by Dan Kegel June 18, 2006

June 18, 2006

paul wrote: > when i run the result with wine, i get a segfault long before control > has been transferred to my code. it appears to be in wine-preloader > i cannot see how to debug this without endless printf's Don't pooh-pooh print statements as a debugging technique. It's like the duct tape of the debugging world. wine-preloader is a special environment, though; you'll have to use wld_printf rather than normal printf. - Dan

1 0

acad 2004 license file bug
by Jaap Stolk June 18, 2006

June 18, 2006

Hi, I'm new to wine, but I have used the wine source in the past as "unofficial" windows api documentation, to write decompilers etc. I would like to thank all the developers, I'm very impressed! I'm trying to install/run autocad 2004, or at least see where possible problems are. I first uninstalled the old rpm wine package in redhat, then I compiled from CVS and it al worked (apart from the waring about freetype not being detected) Compiling took almost 1.5 hours on an AMD Athlon 1200 Mhz 640Mb. The autocad installer indicated that I needed internet explorer 6.0, so I installed that using winetools. (can wine fake internet explorer, so i don't need to install the real thing?) The winetools RPM failed because i installed wine from CVS, so i installed winetools from source. winetools failed to detect my existing ~/.wine/drive_c/ and it seems to have overwritten everything i had in there. :-( anyway, the autocad installer now complains that the licence file could not be found, but this bug report indicates that this problem is supposed to be fixed: http://bugs.winehq.org/show_bug.cgi?id=3226 is it possible that it's fixed but the patch is not yet in CVS ? Should I try the suggested "fix": copy the bin/acadfeui/eula directory from the cd-rom to the c:\ root ? I would like to avoid native software if at all possible (like native MSI), and rather fix wine instead. Linux 2.4.20, RedHat 9, GCC 3.2.2, CVS 1.11.2, Wine 0.9.14 (today's cvs) Jaap.

4 8

Dogfood report: Firefox autoupdate works
by Dan Kegel June 18, 2006

June 18, 2006

Windows Firefox just happily updated itself under Wine to 1.5.0.3. Nice that an uncommon code path worked fine. Firefox is solid for my uses lately. Performance could use some work (reading the wine-devel archive index gets annoying towards the end of the month when it's long, as firefox takes a long time to fetch it (?)). - Dan -- Wine for Windows ISVs: http://kegel.com/wine/isv

8 16

Re: Add support for full screen window state using the NETWM protocol
by Mike Hearn June 17, 2006

June 17, 2006

On Fri, 16 Jun 2006 18:24:34 +0900, Dmitry Timoshkov wrote: > Hello, > > this patch works for me with Internet Explorer and Diablo II demo. I think for full IE support we need more; if you start IE, set it to fullscreen then quit and restart it the window will now be created unmanaged. Or at least this is how it used to work. Still this is fine for the usual case of having it temporarily full screen. It is most instructive to compare this with my own patch. I can see how you have simplified some of the logic there. So, thankyou for that. thanks -mike

2 1

Re: [PATCH 1/3] user: extend conformance test for remote-menu accesses
by Dmitry Timoshkov June 16, 2006

June 16, 2006

<tkho(a)ucla.edu> wrote: > + ok (CreateProcess(NULL, "notepad.exe", NULL, NULL, FALSE, 0, NULL, NULL, > + &si, &pi), > + "CreateProcess error=%ld\n", GetLastError()); > + > + while (elapsed < timeout) > + { > + Sleep(50); > + elapsed += 50; > + > + hNotepad = GetForegroundWindow(); > + if (!hNotepad) > + continue; > + if (GetWindowText(hNotepad, wndTitle, 30) == 0) > + continue; > + if (strstr(wndTitle, "Notepad")) > + break; > + } WaitForInputIdle is supposed to be used instead of the while loop above. -- Dmitry.

1 0

Build on kubuntu 6.06,amd_64 works
by David Anderson June 16, 2006

June 16, 2006

AMD_64 cpu, Kubuntu 6.06 (Dapper Drake), on HP laptop. I finally got around to finishing a build, with current cvs sources. First one must install the necessary libraries: Finding the correct set may take a few minutes and several tries. configure will find several omissions, but a few will only be noticed by the 'make' steps. # The following is links that the library install does not make: # Do this by hand, it won't work as a script as written. sudo sh cd /usr/lib32 ln -s libX11.so.6 libX11.so ln -s libXext.so.6 libXext.so LDFLAGS="-L/lib32 -L/usr/lib32 -Wl,-rpath,/lib32 -Wl,-rpath,/usr/lib32" \ ./configure make depend make all sudo make install If all needed libraries are present there will be no missing-library warnings or errors anywhere. wine seems to work (installed in /usr/local) Hope this is of some interest. David Anderson

3 2

Re: [WINED3D 7/7] Fix lookup for LOOP register
by Ivan Gyurdiev June 16, 2006

June 16, 2006

Jason Green wrote: > - The LOOP register is an extended register and wasn't being checked > for in the current code. This moves the check up a level and checks > against the instruction code which is more efficient anyway. It's important to also correct the reason why it wasn't being detected where it was - instead of using the REGTYPE mask, we should call the shader_get_regtype function, which takes into account extended registers.

1 0

MS-Announced: Bill Gates will transition out of a day-to-day role in the company
by Detlef Riekenberg June 16, 2006

June 16, 2006

15. June 2006: --- quote --- Microsoft Corp. today announced that effective July 2008 Bill Gates, chairman, will transition out of a day-to-day role in the company --- quote --- http://www.microsoft.com/presspass/press/2006/jun06/06-15CorpNewsPR.mspx Just for info. -- By By ... ... Detlef

1 0

Re: [dbghelp] improve dwarf support
by Eric Pouech June 16, 2006

June 16, 2006

2006/6/16, Raphael <fenix(a)club-internet.fr>: > > Hi, > > Changelog: > - map lines section > - better robustness > - support of unamed syms > - better traces > - ref hash table to stabilize model > > TODO: > - find a clean way to handle forward declarations (some assertions can > happen) > - debug lines parsing I did (in parallel) some work on the dwarf2 support. I have 20+ patches to make it really work. Those patches bring : - type support, including forward declarations (which really requires a two pass parser, hence a major rewrite of the code) - function's variables & parameter support - line information is ok (except for inlined functions) - a couple of bug fixes from current code I'd suggest hence not to apply this patch and to wait for the full solution (likely sometimes this week-end). -- Eric Pouech

2 1

slight modification to debug issue
by Paul Davis June 16, 2006

June 16, 2006

seg fault is in wine-pthread, not wine-preloader, which is even tougher - two exec boundaries to cross.

3 2

Re:gdiplus.dll
by Vijay Kiran Kamuju June 16, 2006

June 16, 2006

Hi, I think we rather use mono project's libgdiplus(gdiplus.dll implementation) than a stub implementation. This will help in later implementing the .Net Compatibility Layer to Wine. Thanks, Vijay

3 5

Re: Added initial version of OleView (part 1/8)
by Piotr Caban June 16, 2006

June 16, 2006

Is there anything wrong with my patches?

1 0

Re: setupapi.dll: partially implement SetupDiGetClassDevsExA
by Mike McCormack June 16, 2006

June 16, 2006

Christian Gmeiner wrote: > Partially implement SetupDiGetClassDevsExA. This patch bases on reactos > setupapi.dll. Don't be suprised if your patch isn't accepted. ReactOS is considered a dirty reverse engineering project by many, and Alexandre has rejected patches using their code before. The fact that some developers work both on tinykrnl (a self-admitted 'dirty' reverse engineering effort) and ReactOS at the same time should be enough to show you that they're walking close to, or maybe over the fine line. Please don't post ReactOS code to wine-patches again. Mike

7 26

Shell integration
by Mikołaj Zalewski June 16, 2006

June 16, 2006

I've changed the code not to use COM. Now it loads a DLL and searches for a GetIntegrationObject entry point. That function returns structures with a pointer to the ops structure. This is similar to how GDI objects are implemented. One could also export all the function from the DLL and build the ops structs on the client side (like it is done in GDI/User drivers) but that would require more code to be written and make it harder to forward all the unhandler objects from e.g. the kde driver to the freedesktop driver - we would need to add entry point forwarding every time we add a new functions to the freedesktop driver. Is this approach good? Mikolaj Zalewski

4 4

Re: [uxtheme] Added test for IsAppThemed and grouped it with IsThemeActive
by Alexandre Julliard June 16, 2006

June 16, 2006

Paul Vriens <Paul.Vriens(a)xs4all.nl> writes: > + SetLastError(0xdeadbeef); > + bAppThemed = pIsAppThemed(); > + todo_wine > + { > + ok( bAppThemed == FALSE, "Expected FALSE as this test executable is not (yet) themed.\n"); > + ok( GetLastError() == S_OK, > + "Expected S_OK, got 0x%08lx\n", > + GetLastError()); > + } This won't work right if theming is disabled, since IsAppThemed returns FALSE in that case. Also note that GetLastError doesn't return an HRESULT, so ERROR_SUCCESS is a better name than S_OK. -- Alexandre Julliard julliard(a)winehq.org

2 2

Re: PATCH: sane.ds / DECLSPEC hidden
by Alexandre Julliard June 16, 2006

June 16, 2006

Marcus Meissner <marcus(a)jet.franken.de> writes: > Hi, > > Alexandre, is this how to reduce exports? ;) No, that's only hiding them. It's not a bad thing to do in a second step for functions that really need to be global, but the first step should be to make functions static as much as possible. If we need to have a lot of global functions, it's a sign that the code is not split into files along logical boundaries. -- Alexandre Julliard julliard(a)winehq.org

3 6

Broken FC5 packages - stay clear.
by Vitaliy Margolen June 16, 2006

June 16, 2006

It seems that FC5 packager created a broken Wine distribution. Instead of being 1-3 packages it's 15 (from what user told me on #winehq. And it doesn't work at all: "Application tried to create a window, but no driver could be loaded." Which tells me it's compiled without X headers. I didn't even new Wine could compile without X, since we don't have tty driver. Vitaliy

9 23

Re: add stub for Direct3DShaderValidatorCreate9 (d3d9)
by Dmitry Timoshkov June 16, 2006

June 16, 2006

"Louis. Lenders" <xerox_xerox2000(a)yahoo.co.uk> wrote: > It's not really possible to test this function on windows , but > i think this is quite a good guess for the function's prototype. > I've tested with quite some samples from www.codesampler.com. Other > implementations make the samples crash . > > (http://www.codesampler.com/source/dx9_cg_simple.zip is an example > of an app that calls this function) You're must be doing something not usual, but the .exe pointed out above doesn't contain Direct3DShaderValidatorCreate9 in its imports. -- Dmitry.

1 0

Re: Remove an assert in StgStreamImpl_Write()
by Robert Shearman June 16, 2006

June 16, 2006

Francois Gouget wrote: > > Changelog: > > * dlls/ole32/stg_stream.c > > Aric Stewart <aric(a)codeweavers.com> > Remove an assert and instead just fail. > This allows iTunes to finish installing with the reboot. > A better fix would be to check the result of IStream_SetSize in this function, although I think the original problem may well be fixed after the STG_E_REVERTED checks. -- Rob Shearman

2 1

Re: Quartz: Improve a stub
by Robert Shearman June 16, 2006

June 16, 2006

ivanleo(a)gmail.com wrote: > It looks like someone was implementing some stuff and left it half way > through, That was me. I didn't have any documentation on how the extensions processing was meant to work. > so the result is GetClassMediaFile was hard coded to fail > because process_extensions always fails. Err, no. Did you read the code? The fallback is the more common method of recognising a byte sequence at the start of the file. > This patch is needed by the > IAMMultiMediaStreamImpl_OpenFile which will follow. The two together > allow Crimson Skies to start and get to the menu instead of crashing. >--- winenew/dlls/quartz/filesource.c 2006-05-23 13:48:29.000000000 +0100 >+++ wine/dlls/quartz/filesource.c 2006-06-15 22:50:40.000000000 +0100 >@@ -65,7 +65,10 @@ > static HRESULT process_extensions(HKEY hkeyExtensions, LPCOLESTR pszFileName, GUID * majorType, GUID * minorType) > { > /* FIXME: implement */ >- return E_NOTIMPL; >+ >+ FIXME("(%p, %s, %p, %p), stub!\n", hkeyExtensions, debugstr_w(pszFileName), majorType, minorType); >+ >+ return S_OK; > } > > Great. Now majorType and minorType will be left uninitialised, causing weird and hard-to-debug problems later on. -- Rob Shearman

1 0

wined3d compile failure
by James Hawkins June 16, 2006

June 16, 2006

Hi, I'm getting this compile failure as of today: make[2]: Entering directory `/home/jhawkins/wine/dlls/wined3d' gcc -c -I. -I. -I../../include -I../../include -I/usr/X11R6/include -D__WINESRC__ -D_REENTRANT -fPIC -Wall -pipe -fno-strict-aliasing -gstabs+ -Wpointer-arith -g -O2 -o device.o device.c device.c: In function `IWineD3DDeviceImpl_SetRenderState': device.c:3833: `GL_FOG_COORD_SRC' undeclared (first use in this function) device.c:3833: (Each undeclared identifier is reported only once device.c:3833: for each function it appears in.) device.c:3873: `GL_FOG_COORD' undeclared (first use in this function) make[2]: *** [device.o] Error 1 make[2]: Leaving directory `/home/jhawkins/wine/dlls/wined3d' make[1]: *** [wined3d] Error 2 make[1]: Leaving directory `/home/jhawkins/wine/dlls' make: *** [dlls] Error 2 -- James Hawkins

4 4

how to debug a segfault in wine-preloader?
by Paul Davis June 15, 2006

June 15, 2006

i am building ardour (http://ardour.org) as a win32 executable to allow us to continue using win32 DLL's as plugins. when i run the result with wine, i get a segfault long before control has been transferred to my code. it appears to be in wine-preloader (based on what "file core.NNNN" says). i cannot see how to debug this without endless printf's - wine-preloader appears to need wine to run before it, and gdb cannot cross exec boundaries. any hints on how to debug this sort of issue? btw, wine in general works fine, of course. --p

1 0

Re: Will pay $$ for fix of Magic: The Gathering Online bug
by Kyle Winkler June 15, 2006

June 15, 2006

---------- Forwarded message ---------- From: Kyle Winkler <kylewinkler(a)gmail.com> Date: Jun 15, 2006 6:47 PM Subject: Re: Will pay $$ for fix of Magic: The Gathering Online bug To: EA Durbin <ead1234(a)hotmail.com> I'm currently using Kanotix 2005.04, 32 bit. However, according to my own experience and the info on wine's bug list (its bug 5404), this problem is universal to all distros. On 6/15/06, EA Durbin <ead1234(a)hotmail.com> wrote: > > > >On 6/14/06, Mike McCormack <mike(a)codeweavers.com> wrote: > >>hehe. If you're compiling Wine yourself, do I get $200 for telling you > >>to install the latest version of Fontforge, and make sure recent > >>freetype libraries are on your system? > > Which distro are you using, and is it 64 bit or 32 bit? > > I ran in to a similar problem on my 64 bit gentoo box. If you have 64 bit > linux make sure you copy freetype over to a directory containing your 32 > compatibility libraries. > > cp /usr/lib/libfreetype.* /emul/linux/x86/usr/lib/ > > ./configure --x-libraries=/emul/linux/x86/usr/lib ; make clean ; make > depend > ; make > > > > >

1 0

Will pay $$ for fix of Magic: The Gathering Online bug
by Kyle Winkler June 15, 2006

June 15, 2006

Currently, Magic: the Gathering Online almost works, except that the fonts are either absent or illegible. I am willing the pay US $200 (via PayPal) for this bug to be fixed. If any of you are willing to give it a try, let me know. I will pay up front.

4 5

Re: secur32: Implement QueryContextAttributes. Add tests. cbMaxToken is 1904 not 2010.
by Kai Blin June 15, 2006

June 15, 2006

* Kai Blin <kai.blin(a)gmail.com> [15/06/06, 20:50:47]: Please disregard this patch. I sent this out to wine-patches by accident. It still has some errors. > + case SECPKG_ATTR_LOCAL_CRED: > + TRACE("MSDN claims SECPKG_ATTR_LOCAL_CRED is obsolete\n"); > + /* fall through */ > + case SECPKG_ATTR_LOCAL_CERT_CONTEXT: > + FIXME("SECPKG_ATTR_LOCAL_CERT_CONTEXT.stub\n"); > + break; > + case SECPKG_ATTR_ROOT_STORE: > + FIXME("SECPKG_ATTR_ROOT_STORE stub\n"); > + break; Those only exist for SCHANNEL, not NTLM. > + case SECPKG_ATTR_SIZES: > + { > + PSecPkgContext_Sizes spcs = > + SECUR32_ALLOC(sizeof(SecPkgContext_Sizes)); > + spcs->cbMaxToken = NTLM_MAX_BUF; > + spcs->cbMaxSignature = 16; > + spcs->cbBlockSize = 1; > + spcs->cbSecurityTrailer = 16; > + pBuffer = spcs; > + return SEC_E_OK; > + } This doesn't seem to set pBuffer to spcs. What did I miss here? > + switch(sec_pkg_name) > + { > + case "NTLM": This doesn't work, of course. -- Kai Blin, (blin at gmx dot net) "Let us condemn to hellfire all those who disagree with us." -- militant religionists everywhere

2 1

Re: Re: [WineD3D] fix bug 4872
by fenix＠club-internet.fr June 15, 2006

June 15, 2006

----Message d'origine---- >Date: Wed, 14 Jun 2006 22:03:58 -0600 >De: Vitaliy Margolen <wine-devel(a)kievinfo.com> >A: Raphael <fenix(a)club-internet.fr> >Copie à: wine-devel(a)winehq.org >Sujet: Re: [WineD3D] fix bug 4872 > >Wednesday, June 14, 2006, 6:51:21 PM, Raphael wrote: >> On Thursday 15 June 2006 02:34, Raphael wrote: >>> Hi, >>> >>> first patch since a long time :) >>> >>> Changelog: >>> - rename WineD3D_(Create|Release)FakeGLContext to WineD3D_(Create| >>> Release)FakeGLContextOnNeed >>> - and if a GL context is already active (and was not a fake context) >>> returns simili fake context with current GL context infos >>> - cleanup not more needed checks >>> >>> fix #4872: make IWineD3DImpl_CheckDeviceType working if a GL context is >>> already active >>> >>> Regards, >>> Raphael > >> Use this patch instead, i let some stupid (and buggy) debug code > >> Regards, >> Raphael > >I think I counted at least 5 indentation stiles in your patch. I understand >staying consistent with the code's style and using your own stile. But 5?! No i only see two problems, and made by use of xemacs (as i have broken my kate install). Anyway i plan to cleanup code in file in a next patch See http://marc.theaimsgroup.com/?l=wine-patches&m=115033272215006&w=2 >> } >You forgot LEAVE_GL(); NO, LEAVE_GL() is done on ReleaseFakeGLContextOnNeed. to permit between two calls to can make X/GLX calls safely >> + case WINED3DFMT_A4R4G4B4: >> + if (4 == rb && 4 == gb && 4 == bb && 4 == ab) return TRUE; >> + break; >Has nothing to do with context. ?? >> + case WINED3DFMT_A8: >> + if (8 == ab) return TRUE; >> + break; >Same here ?? >> if (Adapter >= IWineD3D_GetAdapterCount(iface)) { >> - TRACE("(%p) Failed: Atapter (%u) higher than supported adapters (%u) returning WINED3DERR_INVALIDCALL\n", This, Adapter, IWineD3D_GetAdapterCount(iface)); >> + TRACE_(d3d_caps)("[FAILED: Atapter (%u) higher than supported adapters (%u)]\n", Adapter, IWineD3D_GetAdapterCount(iface)); >> return WINED3DERR_INVALIDCALL; >> } >This one as well. And I haven't seen any traces so far that used square >brackets. Now we will! Have you ever seen D3D traces ? I only made same as IWineD3DImpl_CheckDeviceFormat (for coherency) see http://source.winehq.org/source/dlls/wined3d/directx.c#L1425 Anyway displaying [OK] or [FAILED] for checks results seems a good idea (and easy to find in logs) > >Vitaliy Margolen Regards, Raphael PS: before many complains, my ISP webmail is buggy, sorry :)

5 4

Re: comctl32: Add a short test for the listview.
by Detlef Riekenberg June 15, 2006

June 15, 2006

Am Donnerstag, den 15.06.2006, 17:30 +0900 schrieb Mike McCormack: > + * License along with this library; if not, write to the Free > Software > + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA > 02111-1307 The old Address slipped in. -- By By ... ... Detlef

1 0

Re: Alexandre Julliard : winedbg: Avoid a crash when there' s no backtrace to print.
by Eric Pouech June 15, 2006

June 15, 2006

Alexandre Julliard wrote: >Module: wine >Branch: refs/heads/master >Commit: d47dcbf05a0159a87234ac6e41ae011150019f09 >URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d47dcbf05a0159a87234ac6… > >Author: Alexandre Julliard <julliard(a)winehq.org> >Date: Thu Jun 15 11:38:43 2006 +0200 > >winedbg: Avoid a crash when there's no backtrace to print. > > I wonder if it's the right fix. It would be better in the case where we cannot fetch any frame to set a dummy frame from current registers (even if the frame isn't 100% valid) A+

1 0

Re: msi: Cast the total memory to an unsigned int to avoid overflow in machines with more than 2Gb of RAM [resend]
by Alexandre Julliard June 15, 2006

June 15, 2006

"James Hawkins" <truiken(a)gmail.com> writes: > Is there anything wrong with this patch? I have a machine with 3gb of > ram and a lot of installers complain that I don't have enough memory. > 3gb should certainly satisfy a 32mb condition, but we return "-1303" > etc. The existing code should work fine, and yours will return 0 for a 4Gb box... It sounds like the problem is in GlobalMemoryStatusEx. -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: configure: Fix test for ability to link with ICU libraries.
by Alexandre Julliard June 15, 2006

June 15, 2006

Scott Bambrough <scottb(a)xandros.com> writes: > In the worst case this code will run through 9 tests searching for the > ICU library. In the default case (no environment variables set) it > will run through 4 tests at worst before giving up. > > In your case, (assuming you have libicuuc.so and libicudata.so in > /usr/lib) it will take two tests, as the code will test in > /usr/local/lib first. In the unpatched version it would have taken 1 > test. In my case it takes 4 tests. I'm not so worried about the number of tests, but about the complexity of the code. You are turning a simple 10-line check in a 90-line monster, that's really too much for such an obscure feature that pretty much nobody uses. I'd suggest something along these lines: for i in ${ICU_LIB_DIR-/usr/lib}/libicu \ ${ICU_LIB_DIR-/usr/lib}/libsicu do LIBS="${i}uc.a ${i}data.a $LIBS" AC_TRY_LINK etc. done You can add /usr/local/lib to the mix if you like, but I don't think that's really necessary. -- Alexandre Julliard julliard(a)winehq.org

1 0

Parallels Virtualization Software does not work with Wine
by Benjamin Arai June 15, 2006

June 15, 2006

Hi, Just a quick note to any body using VMware or the like for testing Wine, as of Parallels version 2.1 Wine would not run under any guest operating system that I tested (in all cases Wine caused a segmentation fault upon starting). I was using Parallels (Host: Windows XP, Guest: Centos OS 4.3, Ubuntu 6.06, and Fedora Core 5), none worked in Parallels and all worked running native. I am pretty sure this is not a Wine problem, I think it is a trapping issue on Parallels side. Benjamin Arai me(a)benjaminarai.com http://www.benjaminarai.com <http://www.benjaminarai.com/>

1 0

Re: wineuser.h [do NOT apply]
by Vitaly Lipatov June 15, 2006

June 15, 2006

Sorry for incompetence, please do not aplly it. В сообщении от 15 июня 2006 20:17 Vitaly Lipatov написал(a): > Changelog > Add some WM_ message defines. -- Vitaly Lipatov, ALT Linux Team Russia, Saint-Petersburg, www.etersoft.ru

1 0

Re: [Bug 5409] ie6setup fails with "The download location information is damaged"
by Peter Åstrand June 15, 2006

June 15, 2006

On Tue, 13 Jun 2006, Wine Bugs wrote: > http://bugs.winehq.org/show_bug.cgi?id=5409 > truiken(a)gmail.com changed: > > What |Removed |Added > ---------------------------------------------------------------------------- > Status|UNCONFIRMED |RESOLVED > Resolution| |DUPLICATE Since you obviously doesn't believe this is a bug, let's take this discussion on the devel list, instead of ping-ponging between RESOLVED/REOPENED. > ------- Additional Comments From truiken(a)gmail.com 2006-13-06 03:21 ------- > Either way, the bug is: wine does not provide inseng.dll, which ie6setup.exe > requires. You don't need to tell me that over and over; I did understand the first time. But again, I *have* installed inseng.dll. I've tried the same version that comes with the IE download package. I've tried the version from Windows XP. I've tried the version from Windows 2000. I've also registered the DLL with: $ wine regsvr32 inseng.dll which gave me: "Successfully registered DLL inseng.dll" So I have a hard time believing that inseng.dll is the cause of my problems. > If you're having problems with native dlls, that's not wine's bug. Strange comment. > Marking as a duplicate, but it really should be invalid, worksforme, etc. If you don't think this is a duplicate, why mark it as that? > *** This bug has been marked as a duplicate of 1293 *** I don't believe this is a duplicate of 1293. A comment on that bug says, which you have written yourself, says: "ie6setup.exe claims that it can't download the setup files because inseng.dll is not registered." Again, it doesn't look like this is my problem. Also, the error message is different. Regards, -- Peter Åstrand ThinLinc Chief Developer Cendio http://www.cendio.se Teknikringen 3 583 30 Linköping Phone: +46-13-21 46 00

2 1

Re: [WineD3D] fix bug 4872
by Raphael June 14, 2006

June 14, 2006

On Thursday 15 June 2006 02:34, Raphael wrote: > Hi, > > first patch since a long time :) > > Changelog: > - rename WineD3D_(Create|Release)FakeGLContext to WineD3D_(Create| > Release)FakeGLContextOnNeed > - and if a GL context is already active (and was not a fake context) > returns simili fake context with current GL context infos > - cleanup not more needed checks > > fix #4872: make IWineD3DImpl_CheckDeviceType working if a GL context is > already active > > Regards, > Raphael Use this patch instead, i let some stupid (and buggy) debug code Regards, Raphael

2 1

Wine on ppc/linux.
by Mike Mestnik June 14, 2006

June 14, 2006

I'm trying/working to get x86 windows programs to run under linux on a ppc and eventualy a sparc. After reading the Darwine list, I'm not sure where the best place for this. Will the current move by Apple to x86 hardware replace this project? What about alpha, ARM, MIPS and sparc? -- /**************************************************************** * Mike Mestnik: Junior Admin 612-395-8932 * * mmestnik(a)visi.com VISI/Digital North * ****************************************************************/ Alt address: collections(a)spam.visi.com

3 3

More evidence Wine is important...
by Dan Kegel June 14, 2006

June 14, 2006

http://whatjapanthinks.com/2006/06/15/over-a-third-of-japanese-engineers-wo… is one more survey showing that users who don't want to switch to Linux base their opinion primarily on a perceived lack of apps on linux.

1 0

Re: configure: Fix test for ability to link with ICU libraries.
by Alexandre Julliard June 14, 2006

June 14, 2006

Scott Bambrough <scottb(a)xandros.com> writes: > @@ -603,8 +603,8 @@ if test "$ac_cv_header_unicode_ubidi_h" > then > saved_libs="$LIBS" > ICU_LIB_DIR="${ICU_LIB_DIR-/usr/lib}" > - ICUUC_LIB="${ICUUC_LIB-$ICU_LIB_DIR/libsicuuc.a}" > - ICUDATA_LIB="${ICUDATA_LIB-$ICU_LIB_DIR/libsicudata.a}" > + ICUUC_LIB="${ICUUC_LIB-$ICU_LIB_DIR/libicuuc.a}" > + ICUDATA_LIB="${ICUDATA_LIB-$ICU_LIB_DIR/libicudata.a}" The libraries have different names on different setups, that's why there are environment variables you can set. If you want a better fix you need to make configure probe for the various names. -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: [Setuapi] implement SetupDiCreateDeviceInfoListExW - try 3
by Juan Lang June 14, 2006

June 14, 2006

Hi Christian, > I want to make a generic setupapi.dll and I will remove old serial > device list, but as too big patches wont get accepted, I will do this in > one of my next patches. I put that hacky serial device list in there. I don't actually use the app that fixed under Wine, as 1) Wine's serial code never worked for the app, and 2) I no longer have the device it used. So, I don't know if that'll convince AJ or not, but I'm fine with you axing it. Leaving half-working code in there is more likely to get rejected than a big patch, IMO, so I'd suggest you remove it. --Juan __________________________________________________ Do You Yahoo!? Tired of spam? Yahoo! Mail has the best spam protection around http://mail.yahoo.com

2 1

Duplicate message by configure
by Gerald Pfeifer June 14, 2006

June 14, 2006

Disclaimer: I am aware that the system I tested this on is lacking a required library, this is not what I'm trying to describe. When running configure, I get the following message twice: checking for xmlParseMemory in -lxml2... yes checking for xmlReadMemory in -lxml2... yes Package libxslt was not found in the pkg-config search path. Perhaps you should add the directory containing `libxslt.pc' to the PKG_CONFIG_PATH environment variable No package 'libxslt' found -> Package libxslt was not found in the pkg-config search path. -> Perhaps you should add the directory containing `libxslt.pc' -> to the PKG_CONFIG_PATH environment variable -> No package 'libxslt' found checking for libxslt/pattern.h... no checking for libxslt/transform.h... no Where does this come from? Can we fix this somehow? Gerald

2 1

How are we doing?
by Mike Hearn June 14, 2006

June 14, 2006

As the Summer Of Code begins and new blood joins us all at once, I thought it'd be a good time to open a discussion on how we are doing as a project. Questions to consider: * Is Wine improving or is the regression rate matching the improvement rate? * Are we producing a quality product, from the perspective of non-technical end users? (I appreciate this isn't a goal for everyone) * Are we turning away potential developers for any reason? Could we do more to attract new hackers? * Are the projects fundamental processes serving us well? * Any other thoughts for improvement? In case it's not clear, I'm talking about the project as a community adventure here rather than technical aspects of the codebase. >From my own perspective I think Wine is doing better than ever before. What prompted this email is the realisation that in the past few days I've used Wine nearly every day to run a variety of apps - from games to utilities - and it's succeeded with every single one. Not always perfect but always good enough. I am no longer surprised when Wine runs an app correctly as I was when I first came to the project, these days I nearly take it for granted. Though this may be due to having developed a feel for what will work and what won't :) So clearly we're doing something right ... I also think we are doing OK with attracting and keeping new hackers. The influx of new Direct3D talent lately is fabulous for instance. The experiences of our SoC students will be useful in assessing how to improve the learning curve and we need to tap this resource better than we did last year. In other words, I think we're doing pretty well. I feel more positive about the project that I have done for a long time. It seems like as Win32 stagnated and slowed down over the past 6 years we've been able to turn the tide and add our own code faster than Microsoft can, which is the tipping point. So areas for improvement? * We seem to be doing very well in recruiting hackers who work on one particular DLL or area and solidly improve that, but a less well when it comes to 'general purpose' hackers who just take random apps and make them work. It might just be that I'm out of touch but I don't see as much patch traffic these days along the lines of "This patch set fixes XYZ app" followed by 6 patches to 6 different DLLs. Discussion on IRC/wine-devel is * No clear roadmap to 1.0 - for 0.9 we had Dimis TODO list and it was quite satisfying to see them go green as tasks were completed. I guess we have a 1.0 TODO list too but I never see any updates to it :( * Integration with other projects is still a weak area. Desktop/kernel/X integration could all use some work. I know I know, I'm guilty in not doing my bit here too .... maybe I will find my hack-fu returning sometime soon and work on the fullscreen patch again :) * App specific patches. Well I don't expect policy here to change anytime soon but extreme cases like the WoW VMA layout problem which affects tons of users do highlight the issue. * A few random things I already got into arguments about (forums, libwine api etc) :) What do you guys think? thanks -mike

34 69

Re: msvcrt[2/3]: add initial tests for dlls/msvcrt/data.c [try 2]
by Uwe Bonnes June 14, 2006

June 14, 2006

>>>>> "Andrew" == Andrew Ziem <ahziem1(a)mailbolt.com> writes: Andrew> because tests yield inconsistent results */ +#if 0 + /* address #if 0 in a patch is depreciated. If the test fails on wine, butt succeeds in windows, use todo_wine(). If there are other conditions that must be met, tell these conditions, perhaps like #define SOME_SPECIAL_TEST 0 #ifdef SOME_SPECIAL_TEST so that others can decipher what you mean. Bye -- Uwe Bonnes bon(a)elektron.ikp.physik.tu-darmstadt.de Institut fuer Kernphysik Schlossgartenstrasse 9 64289 Darmstadt --------- Tel. 06151 162516 -------- Fax. 06151 164321 ----------

3 2

Re: [Setuapi] implement SetupDiCreateDeviceInfoListExW - try 3
by Detlef Riekenberg June 14, 2006

June 14, 2006

Hi Christian Gmeiner: > Sorry for the new version, but i got rid of the whitspace stuff and also > added a check if Reserved != NULL. > > I hope that this patch is ready to commit now. + if (MachineName != NULL) + { + FIXME("remote support is not implemented"); + goto cleanup; + } A failure should always set an error. You should add a test for this in the testsuite. (winspool as example uses an empty servername the same way as NULL). For external Servers, ERROR_ACCESS_DENIED is a very common Result. + if (Reserved != NULL) + { + SetLastError(ERROR_INVALID_PARAMETER); + goto cleanup; + } Same here. This is simple to test in the testsuite. - SerialPortList *list = (SerialPortList *)devinfo; + struct DeviceInfoSet *list = (struct DeviceInfoSet *)devinfo; - if (list->magic == SETUP_SERIAL_PORT_MAGIC) + if (list->magic == SETUP_DEVICE_INFO_SET_MAGIC) { This is wrong. Read: static HDEVINFO SETUP_CreateSerialDeviceList(void) (line 904) --------------- In your test: + // create empty DeviceInfoList C++ comments are not allow (not supported by some compiler) + devlist = SetupDiCreateDeviceInfoListExW(NULL, NULL, NULL, NULL); + + ok(devlist && devlist != INVALID_HANDLE_VALUE, "SetupDiCreateDeviceInfoListExW failed : %p %ld\n", devlist, GetLastError()); - You missed the "SetLastError(0xdeadbeef);" before the tested function. - The first Part of your "ok()" - message ("SetupDiCreateDeviceInfoListExW failed :") has no additional infos. When a test fails, you will already get: "__FILE__:__LINE__: Test failed:" You know the dll, file and line of the failing "ok()" - statement. Example: info.c:932: Test failed: returned 0 with 1801 (expected '!=0' or '0' with ERROR_INVALID_PARAMETER) You may want to look at my recent Tests / Implementations for GetPrintProcessorDirectory or AddMonitor/DeleteMonitor (winspool.drv), but do not use the macro "MAGIC_DEAD" in the tests (it works, but 0xdeadbeef has more advantages). As an Example, that we really need tests for every API-Function: The second Parameter of "DeleteMonitor" is ignored in all tested Windows-Versions. -- By By ... ... Detlef

2 1

Re: wine XShm problem on remote display
by Benjamin Fabricius June 14, 2006

June 14, 2006

Am Dienstag, den 13.06.2006, 16:22 +0200 schrieb Alexandre Julliard: > Benjamin Fabricius <benjamin.fabricius(a)lawo.de> writes: > > > vst:/opt/fst # ./fst /mnt/testsuite/oberon4/Oberon-8.dll > > yo... lets see... > > The program 'fst.exe.so' received an X Window System error. > > This probably reflects a bug in the program. > > The error was 'BadAccess (attempt to access private resource denied)'. > > (Details: serial 114 error_code 10 request_code 144 minor_code 1) > > (Note to programmers: normally, X errors are reported asynchronously; > > that is, you will receive the error a while after causing it. > > To debug your program, run it with the --sync command line > > option to change this behavior. You can then get a meaningful > > backtrace from your debugger if you break on the gdk_x_error() > > function.) > > Wine will handle that error properly, but here it sounds like fst (or > more likely Gtk) has replaced the Wine error handler with its own, so > Wine doesn't get a chance to handle it. > thanks for the hint, isn't there a possibility in wine to turn of the use of the xshm extension globally? i read that there used to be wine.conf with [x11drv] ...... ; Use XFree86 DGA extension if present UseDGA = Y ; Use XShm extension if present UseXShm = Y ...... is there a mechanism to do this in my wine version (20050725) or current builds? or do you see a way different way to workaround this, i. e. to write an own error handler. i'm not to deep into the x matter though... thanks again bf -- ------------------- Benjamin Fabricius German Student Lawo AG

2 1

Re: Implement more GLSL instructions
by Ivan Gyurdiev June 14, 2006

June 14, 2006

> As of this patch, Wine now supports more opcodes in GLSL than > ARB_vp/fp and we can handle many of the shader 2.0+ instructions not > available before. There are a few missing texture operations compared > to ARB still, and we're not properly handling textures for any shaders > <2.0, but that's true in ARB as well. Yes, the missing texture operations are kind of important, I think [ but they are valid in SM 1.x only ]. Other suggestions I have: - fix swizzle, make it work consistently across all instructions (see cmp). - may be a good idea to centralize casting in one place to avoid failures [ yes, I probably should have done that when adding casting in my patch :) - merge the rest of the SHADER_ARB code, and organize it the same as the SHADER_GLSL code (in arb_shader.c or something like that). Then go through and compare the two and make sure modifiers and other such things work the same way. ===== For 1.x texture support we could delay compilation until we know what kind of textures will be bound, and then recompile if textures change their dimensionality [ which hopefully they won't ].

1 0

One more shot at ntoskrl implementation
by Vitaliy Margolen June 14, 2006

June 14, 2006

Here is last instalment of safedisc support in Wine. The major change from last version is the way user space talks to ntoskrnl. Now I'm passing the information through wineserver with a help of 4 server calls. There are still some areas that require work. I will appreciate any input that you guys might have about any part of this code. It's been on my lap for way too long. It would be really cool to finally get it in. PS: Diffed against 1d40bf0141b7f67b1188555962698f5dab631bc3. Need to run tools/make_reqwests. -- Best regards, Vitaliy

2 2

Re: msi: Add tests for MsiInstallProduct
by James Hawkins June 13, 2006

June 13, 2006

On 6/12/06, James Hawkins <truiken(a)gmail.com> wrote: > Hi, > > Changelog: > * Add tests for MsiInstallProduct. > Ignore this patch for now. Eclipse changed necessary tabs to spaces, and I forgot to include module imports for Makefile.in. I'll resend it tonight. -- James Hawkins

1 0