- Wine-Devel - list.winehq.org

Re: [dinput/linux input] two fixes/added missing axis and button polling
by Christoph Frick March 24, 2004

March 24, 2004

On Wed, Mar 24, 2004 at 12:58:21AM +0100, Christoph Frick wrote: hi, im terribly sorry and hope this patch is not yet submited. > - changed the mapping of the axis to a simplier formula, that ignores > the middle of an axis this code lacked the "shifting" of the result by ``wanted min'' also not stated on the first posting: this patch is LGPL licensed below you find the complete patch again with the fixed part. -- cu Index: joystick_linuxinput.c =================================================================== RCS file: /home/wine/wine/dlls/dinput/joystick_linuxinput.c,v retrieving revision 1.1 diff -u -r1.1 joystick_linuxinput.c --- joystick_linuxinput.c 12 Feb 2004 23:28:00 -0000 1.1 +++ joystick_linuxinput.c 24 Mar 2004 07:23:15 -0000 @@ -239,7 +239,12 @@ for (i=0;i<ABS_MAX;i++) { newDevice->wantmin[i] = -32768; newDevice->wantmax[i] = 32767; - newDevice->deadz[i] = 1024; /* guessing */ + /* TODO: + * direct input defines a default for the deadzone somewhere; but as long + * as in map_axis the code for the dead zone is commented out its no + * problem + */ + newDevice->deadz[i] = 0; } return newDevice; } @@ -412,8 +417,8 @@ This->axes[i][AXE_ABSFUZZ], This->axes[i][AXE_ABSFLAT] ); - This->havemax[i] = This->axes[i][AXE_ABSMIN]; - This->havemin[i] = This->axes[i][AXE_ABSMAX]; + This->havemin[i] = This->axes[i][AXE_ABSMIN]; + This->havemax[i] = This->axes[i][AXE_ABSMAX]; } } MESSAGE("\n"); @@ -460,12 +465,8 @@ if (xmin == xmax) return val; if ((hmin == hmax) || (hmax==xmid) || (hmin==xmid)) return val; - /* don't assume total linearity, but linearity starting from a zeropoint */ - if (val > xmid) { - ret = (val-xmid)*((wmax-wmin)/2)/(hmax-xmid)+0; - } else { - ret = (xmid-val)*((wmax-wmin)/2)/(hmin-xmid)+0; - } + /* map the value from the hmin-hmax range into the wmin-wmax range */ + ret = (val * (wmax-wmin)) / (hmax-hmin) + wmin; #if 0 /* deadzone doesn't work comfortably enough right now. needs more testing*/ @@ -519,8 +520,54 @@ GEN_EVENT(DIJOFS_BUTTON(2),ie.value?0x80:0x0,ie.time.tv_usec,(This->dinput->evsequence)++); This->js.rgbButtons[2] = ie.value?0x80:0x00; break; + case BTN_TOP: + case BTN_X: + case BTN_4: + GEN_EVENT(DIJOFS_BUTTON(3),ie.value?0x80:0x0,ie.time.tv_usec,(This->dinput->evsequence)++); + This->js.rgbButtons[3] = ie.value?0x80:0x00; + break; + case BTN_TOP2: + case BTN_Y: + case BTN_5: + GEN_EVENT(DIJOFS_BUTTON(4),ie.value?0x80:0x0,ie.time.tv_usec,(This->dinput->evsequence)++); + This->js.rgbButtons[4] = ie.value?0x80:0x00; + break; + case BTN_PINKIE: + case BTN_Z: + case BTN_6: + GEN_EVENT(DIJOFS_BUTTON(5),ie.value?0x80:0x0,ie.time.tv_usec,(This->dinput->evsequence)++); + This->js.rgbButtons[5] = ie.value?0x80:0x00; + break; + case BTN_BASE: + case BTN_TL: + case BTN_7: + GEN_EVENT(DIJOFS_BUTTON(6),ie.value?0x80:0x0,ie.time.tv_usec,(This->dinput->evsequence)++); + This->js.rgbButtons[6] = ie.value?0x80:0x00; + break; + case BTN_BASE2: + case BTN_TR: + case BTN_8: + GEN_EVENT(DIJOFS_BUTTON(7),ie.value?0x80:0x0,ie.time.tv_usec,(This->dinput->evsequence)++); + This->js.rgbButtons[7] = ie.value?0x80:0x00; + break; + case BTN_BASE3: + case BTN_TL2: + case BTN_9: + GEN_EVENT(DIJOFS_BUTTON(8),ie.value?0x80:0x0,ie.time.tv_usec,(This->dinput->evsequence)++); + This->js.rgbButtons[8] = ie.value?0x80:0x00; + break; + case BTN_BASE4: + case BTN_TR2: + GEN_EVENT(DIJOFS_BUTTON(9),ie.value?0x80:0x0,ie.time.tv_usec,(This->dinput->evsequence)++); + This->js.rgbButtons[9] = ie.value?0x80:0x00; + break; + case BTN_BASE5: + case BTN_SELECT: + GEN_EVENT(DIJOFS_BUTTON(10),ie.value?0x80:0x0,ie.time.tv_usec,(This->dinput->evsequence)++); + This->js.rgbButtons[10] = ie.value?0x80:0x00; + break; default: - FIXME("unhandled joystick axe %x, value %d\n",ie.code,ie.value); + FIXME("unhandled joystick button %x, value %d\n",ie.code,ie.value); break; } break; @@ -533,9 +580,22 @@ case ABS_Y: GEN_EVENT(DIJOFS_Y,ie.value,ie.time.tv_usec,(This->dinput->evsequence)++); This->js.lY = map_axis(This,1,ie.value); + break; case ABS_Z: GEN_EVENT(DIJOFS_Z,ie.value,ie.time.tv_usec,(This->dinput->evsequence)++); This->js.lZ = map_axis(This,2,ie.value); + break; + case ABS_RX: + GEN_EVENT(DIJOFS_RX,ie.value,ie.time.tv_usec,(This->dinput->evsequence)++); + This->js.lRx = map_axis(This,3,ie.value); + break; + case ABS_RY: + GEN_EVENT(DIJOFS_RY,ie.value,ie.time.tv_usec,(This->dinput->evsequence)++); + This->js.lRy = map_axis(This,4,ie.value); + break; + case ABS_RZ: + GEN_EVENT(DIJOFS_RZ,ie.value,ie.time.tv_usec,(This->dinput->evsequence)++); + This->js.lRz = map_axis(This,5,ie.value); break; default: FIXME("unhandled joystick axe event (code %d, value %d)\n",ie.code,ie.value);

1 0

RFC - Program to schedule download of winetest.exe
by Jakob Eriksson March 24, 2004

March 24, 2004

I have hacked together a little program to download winetest.exe and run it every 24h. Here is the URL: http://vmlinux.org/jakov/Wine/testloader/ There are more binaries and stuff there too. I know this is not a windows service, but at least it is something. Keep this console aplication open and it will download winetest.exe every 24h, with some randomness, to go easy on the server. .----------------------------------. What the code looks like: #include <string> #include <stdlib.h> #include <stdio.h> #include <time.h> #include <windows.h> #include <io.h> #include <process.h> using namespace std; static void await(int hour) { int right_time = 0; do { time_t now = time(NULL); struct tm comp = *gmtime(&now); if (comp.tm_hour == hour) { Sleep((rand()%60) * 60000); // Introduce randomness right_time = 1; } else { Sleep(10000); } } while(!right_time); } #define WINETESTS "winetests.exe" #define TESTCOPY "testcopy.exe" static void runtest() { SetCurrentDirectory(getenv("TEMP")); _unlink(WINETESTS); system("wget --no-clobber http://vmlinux.org/jakov/Wine/" WINETESTS); // Validate GPG signature for winetest.exe -- TODO // silly wget makes file not executable if (!CopyFile(WINETESTS, TESTCOPY, FALSE)) { printf("Problem with file " WINETESTS "\n"); return; } _unlink(WINETESTS); rename(TESTCOPY, WINETESTS); printf("execl %s returns: %d\n", WINETESTS, _execl(WINETESTS, WINETESTS, NULL)); } int main(int argc, char **argv) { int run_once = 0; if (argc != 2) { printf("Usage:\n%s < hour_of_download | once >\n", argv[0]); return 0; } srand((unsigned int)time(NULL)); if (2 == argc) { if (string(argv[1]) == "once") { run_once = 1; } } if (run_once) { runtest(); return 0; } while (1) { await(atoi(argv[1])); runtest(); } return 0; }

1 0

winegcc: don't mess with the DLL ext
by Dimitrie O. Paun March 23, 2004

March 23, 2004

ChangeLog Dimitrie O. Paun <dpaun(a)rogers.com> Don't adjust the extension for DLLs. Index: tools/winegcc/winegcc.c =================================================================== RCS file: /var/cvs/wine/tools/winegcc/winegcc.c,v retrieving revision 1.21 diff -u -r1.21 winegcc.c --- tools/winegcc/winegcc.c 23 Mar 2004 00:14:54 -0000 1.21 +++ tools/winegcc/winegcc.c 23 Mar 2004 18:00:24 -0000 @@ -348,7 +348,7 @@ strarray *spec_args, *comp_args, *link_args; char *output_file; const char *spec_c_name, *spec_o_name; - const char *output_name, *spec_file, *def_ext; + const char *output_name, *spec_file; const char* winebuild = getenv("WINEBUILD"); int generate_app_loader = 1; int j; @@ -378,11 +378,10 @@ generate_app_loader = 0; /* normalize the filename a bit: strip .so, ensure it has proper ext */ - def_ext = opts->shared ? ".dll" : ".exe"; if (strendswith(output_file, ".so")) output_file[strlen(output_file) - 3] = 0; - if(!strendswith(output_file, def_ext)) - output_file = strmake("%s%s", output_file, def_ext); + if (!opts->shared && !strendswith(output_file, ".exe")) + output_file = strmake("%s.exe", output_file); /* get the filename by the path, if present */ if ((output_name = strrchr(output_file, '/'))) output_name++; -- Dimi.

1 0

compile errors with glibc 2.3.3
by Nerijus Baliunas March 23, 2004

March 23, 2004

Hello, trying to build wine-20040309 in separate build directory. ../wine-20040309/configure completed correctly, but running make depend gives me: cd ./tools && make `basename tools/makedep` make[1]: Entering directory `/usr/src/wine-build/tools' gcc -c -I../../wine-20040309/tools -I. -I../../wine-20040309/include -I../include -DLEX_OUTPUT_ROOT="\"lex.yy\"" -Wall -pipe -mpreferred-stack-boundary=2 -fno-strict-aliasing -gstabs+ -Wpointer-arith -g -O2 -o makedep.o ../../wine-20040309/tools/makedep.c In file included from ../../wine-20040309/tools/makedep.c:21: ../include/config.h:871:27: missing terminating " character config.h line 871 is: #define SONAME_LIBNCURSES "libncurses.so.5 (really missing terminating " here) configure output was: checking ncurses.h usability... yes checking ncurses.h presence... yes checking for ncurses.h... yes checking for waddch in -lncurses... yes ... checking for -lncurses soname... libncurses.so.5 libncurses.so.4 checking for -lcurses soname... libcurses.so I have both libncurses.so.4 and libncurses.so.5 on my system: # rpm -qf libncurses.so.4.0 libncurses.so.5.3 ncurses4-5.0-12 ncurses-5.3-9 After adding missing " I get the next error: In file included from ../../wine-20040309/tools/makedep.c:23: ../../wine-20040309/include/wine/port.h:53: error: conflicting types for `mode_t' /usr/include/sys/types.h:72: error: previous declaration of `mode_t' # rpm -qf /usr/include/sys/types.h glibc-headers-2.3.3-17 (from Fedora devel) types.h 71 line: #ifndef __mode_t_defined typedef __mode_t mode_t; # define __mode_t_defined #endif After commenting out lines 52-72 of include/wine/port.h make depend completed successfully, but make failed with more errors: In file included from ../../../wine-20040309/libs/port/getpagesize.c:22: ../../../wine-20040309/include/wine/port.h:251: error: conflicting types for `getpagesize' /usr/include/unistd.h:872: error: previous declaration of `getpagesize' ../../../wine-20040309/include/wine/port.h:259: error: conflicting types for `lstat' /usr/include/sys/stat.h:365: error: previous declaration of `lstat' ... After fixing these by commenting out more lines I got more errors and stopped here. Regards, Nerijus

1 0

Audit of comctl32 for the PSDK - listview.c
by Steven Edwards March 22, 2004

March 22, 2004

Hello, Its time for another round of PSDK porting fixes. I am going to start on comctl32. Most of if builds fine except for some internal or non-documented defines that we need to figure out how to handle. The only big issue we have is listview... Compiling... listview.c C:\source\wine\dlls\comctl32\listview.c(503) : warning C4018: '<' : signed/unsigned mismatch C:\source\wine\dlls\comctl32\listview.c(503) : warning C4018: '<' : signed/unsigned mismatch C:\source\wine\dlls\comctl32\listview.c(1620) : warning C4018: '<' : signed/unsigned mismatch C:\source\wine\dlls\comctl32\listview.c(1655) : warning C4018: '<' : signed/unsigned mismatch C:\source\wine\dlls\comctl32\listview.c(2593) : error C2065: '__FUNCTION__' : undeclared identifier C:\source\wine\dlls\comctl32\listview.c(2593) : warning C4047: 'function' : 'const char *' differs in levels of indirection from 'int ' C:\source\wine\dlls\comctl32\listview.c(2593) : warning C4024: 'ranges_assert' : different types for formal and actual parameter 3 C:\source\wine\dlls\comctl32\listview.c(2635) : warning C4047: 'function' : 'const char *' differs in levels of indirection from 'int ' C:\source\wine\dlls\comctl32\listview.c(2635) : warning C4024: 'ranges_assert' : different types for formal and actual parameter 3 C:\source\wine\dlls\comctl32\listview.c(2704) : warning C4047: 'function' : 'const char *' differs in levels of indirection from 'int ' C:\source\wine\dlls\comctl32\listview.c(2704) : warning C4024: 'ranges_assert' : different types for formal and actual parameter 3 C:\source\wine\dlls\comctl32\listview.c(2708) : warning C4047: 'function' : 'const char *' differs in levels of indirection from 'int ' C:\source\wine\dlls\comctl32\listview.c(2708) : warning C4024: 'ranges_assert' : different types for formal and actual parameter 3 C:\source\wine\dlls\comctl32\listview.c(2718) : warning C4047: 'function' : 'const char *' differs in levels of indirection from 'int ' C:\source\wine\dlls\comctl32\listview.c(2718) : warning C4024: 'ranges_assert' : different types for formal and actual parameter 3 C:\source\wine\dlls\comctl32\listview.c(2776) : warning C4047: 'function' : 'const char *' differs in levels of indirection from 'int ' C:\source\wine\dlls\comctl32\listview.c(2776) : warning C4024: 'ranges_assert' : different types for formal and actual parameter 3 C:\source\wine\dlls\comctl32\listview.c(2780) : warning C4047: 'function' : 'const char *' differs in levels of indirection from 'int ' C:\source\wine\dlls\comctl32\listview.c(2780) : warning C4024: 'ranges_assert' : different types for formal and actual parameter 3 C:\source\wine\dlls\comctl32\listview.c(3974) : warning C4244: '=' : conversion from 'long ' to 'unsigned short ', possible loss of data C:\source\wine\dlls\comctl32\listview.c(4008) : warning C4244: '=' : conversion from 'long ' to 'unsigned short ', possible loss of data C:\source\wine\dlls\comctl32\listview.c(4015) : warning C4244: '=' : conversion from 'long ' to 'unsigned short ', possible loss of data C:\source\wine\dlls\comctl32\listview.c(4017) : warning C4244: '=' : conversion from 'long ' to 'unsigned short ', possible loss of data C:\source\wine\dlls\comctl32\listview.c(5061) : warning C4013: 'offsetof' undefined; assuming extern returning int C:\source\wine\dlls\comctl32\listview.c(5061) : error C2143: syntax error : missing ')' before 'type' C:\source\wine\dlls\comctl32\listview.c(5066) : error C2143: syntax error : missing ')' before 'type' C:\source\wine\dlls\comctl32\listview.c(5242) : error C2061: syntax error : identifier 'LISTVIEW_GetItemExtT' C:\source\wine\dlls\comctl32\listview.c(5242) : error C2059: syntax error : ';' C:\source\wine\dlls\comctl32\listview.c(5242) : error C2059: syntax error : 'type' C:\source\wine\dlls\comctl32\listview.c(5600) : warning C4013: 'LISTVIEW_GetItemExtT' undefined; assuming extern returning int C:\source\wine\dlls\comctl32\listview.c(5648) : warning C4018: '==' : signed/unsigned mismatch C:\source\wine\dlls\comctl32\listview.c(5680) : warning C4013: 'ListView_FindItemW' undefined; assuming extern returning int C:\source\wine\dlls\comctl32\listview.c(6102) : error C2143: syntax error : missing ')' before 'type' C:\source\wine\dlls\comctl32\listview.c(6107) : error C2143: syntax error : missing ')' before 'type' C:\source\wine\dlls\comctl32\listview.c(6180) : error C2061: syntax error : identifier 'LISTVIEW_RedrawItems' C:\source\wine\dlls\comctl32\listview.c(6180) : error C2059: syntax error : ';' C:\source\wine\dlls\comctl32\listview.c(6180) : error C2059: syntax error : 'type' C:\source\wine\dlls\comctl32\listview.c(6458) : warning C4013: 'Header_GetItemW' undefined; assuming extern returning int C:\source\wine\dlls\comctl32\listview.c(6618) : warning C4013: 'Header_SetItemW' undefined; assuming extern returning int C:\source\wine\dlls\comctl32\listview.c(7389) : warning C4244: '=' : conversion from 'long ' to 'short ', possible loss of data C:\source\wine\dlls\comctl32\listview.c(7568) : warning C4146: unary minus operator applied to unsigned type, result still unsigned C:\source\wine\dlls\comctl32\listview.c(7671) : warning C4146: unary minus operator applied to unsigned type, result still unsigned C:\source\wine\dlls\comctl32\listview.c(7753) : warning C4018: '<' : signed/unsigned mismatch C:\source\wine\dlls\comctl32\listview.c(8293) : warning C4244: '=' : conversion from 'long ' to 'short ', possible loss of data C:\source\wine\dlls\comctl32\listview.c(8822) : error C2065: 'LPLVFINDINFOW' : undeclared identifier C:\source\wine\dlls\comctl32\listview.c(8822) : warning C4047: 'function' : 'const struct tagLVFINDINFOW *' differs in levels of indirection from 'int ' C:\source\wine\dlls\comctl32\listview.c(8822) : warning C4024: 'LISTVIEW_FindItemW' : different types for formal and actual parameter 3 C:\source\wine\dlls\comctl32\listview.c(8822) : error C2146: syntax error : missing ')' before identifier 'lParam' C:\source\wine\dlls\comctl32\listview.c(8822) : error C2059: syntax error : ')' C:\source\wine\dlls\comctl32\listview.c(8825) : error C2065: 'LPLVFINDINFOA' : undeclared identifier C:\source\wine\dlls\comctl32\listview.c(8825) : warning C4047: 'function' : 'const struct tagLVFINDINFOA *' differs in levels of indirection from 'int ' C:\source\wine\dlls\comctl32\listview.c(8825) : warning C4024: 'LISTVIEW_FindItemA' : different types for formal and actual parameter 3 C:\source\wine\dlls\comctl32\listview.c(8825) : error C2146: syntax error : missing ')' before identifier 'lParam' C:\source\wine\dlls\comctl32\listview.c(8825) : error C2059: syntax error : ')' C:\source\wine\dlls\comctl32\listview.c(9007) : warning C4013: 'LISTVIEW_RedrawItems' undefined; assuming extern returning int __________________________________ Do you Yahoo!? Yahoo! Finance Tax Center - File online. File on time. http://taxes.yahoo.com/filing.html

1 0

Re: Pipe Tests corrected[Resent]
by Alexandre Julliard March 22, 2004

March 22, 2004

Uwe Bonnes <bon(a)elektron.ikp.physik.tu-darmstadt.de> writes: > +void test_CreatePipe(void) > +{ > + /* Adapted from the MSDN SDK example > + * "Creating a Child Process with Redirected Input and Output" > + */ You can't do that, MSDN examples are copyright Microsoft. You have to write your own code from scratch. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: Some DirectDraw stubs
by Alexandre Julliard March 22, 2004

March 22, 2004

Mike Hearn <mh(a)codeweavers.com> writes: > The parameters for these functions have not been verified as in native ddraw.dll > they are some kind of circular forward, it's rather confusing. The proper way to determine the number of parameters is to check what the caller does. And if nobody calls them there's no point in adding them. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: wine/dlls/d3d8/device.c cleanup
by Dimitrie O. Paun March 22, 2004

March 22, 2004

On March 20, 2004 3:42 pm, hatky wrote: > tabs -> spaces (the cause of the bloated file) You got to be kindin', right? -- Dimi.

3 4

OFC ( MFC-like classes )
by Jakob Eriksson March 22, 2004

March 22, 2004

I thought I should mention: http://cvs.sourceforge.net/viewcvs.py/ofc/ofc/test/ The OFC project actually has a few classes now. Might be of use to somebody porting stuff to Linux. Jakob

1 0

Link with ICU in documentation
by Boaz Harrosh March 22, 2004

March 22, 2004

- Where is the official place to download the ICU library for support of BIDI? - Should we not have a BIDI section in documentation? - Is there a place on winehq with links to extra needed downloads? should ICU be there 2? Free Life Boaz

2 1