August 2007 - Wine-Devel - list.winehq.org

Re: dinput compile error

by Robert Reif

Lei Zhang wrote: >It sounds like you're missing the Linux kernel headers. > >On 8/20/07, Robert Reif <reif(a)earthlink.net> wrote: > > >>make[2]: Entering directory `/home/wine/wine/dlls/dinput' >>gcc -c -I. -I. -I../../include -I../../include -D__WINESRC__ >>-D_REENTRANT -fPIC -Wall -pipe -fno-strict-aliasing -Wwrite-strings >>-Wpointer-arith -g -O2 -o joystick_linuxinput.o joystick_linuxinput.c >>joystick_linuxinput.c:153: field `axes' has incomplete type >>joystick_linuxinput.c:154: confused by earlier errors, bailing out >>make[2]: *** [joystick_linuxinput.o] Error 1 >>make[2]: Leaving directory `/home/wine/wine/dlls/dinput' >> >>It seems struct input_absinfo is not defined. >> >> >> >> >> >> > > > The headers are there or else there would have been a missing include file error. The needed structure is just not there in older versions of the headers.

Aug. 20, 2007

Re: dinput compile error

by Lei Zhang

It sounds like you're missing the Linux kernel headers. On 8/20/07, Robert Reif <reif(a)earthlink.net> wrote: > make[2]: Entering directory `/home/wine/wine/dlls/dinput' > gcc -c -I. -I. -I../../include -I../../include -D__WINESRC__ > -D_REENTRANT -fPIC -Wall -pipe -fno-strict-aliasing -Wwrite-strings > -Wpointer-arith -g -O2 -o joystick_linuxinput.o joystick_linuxinput.c > joystick_linuxinput.c:153: field `axes' has incomplete type > joystick_linuxinput.c:154: confused by earlier errors, bailing out > make[2]: *** [joystick_linuxinput.o] Error 1 > make[2]: Leaving directory `/home/wine/wine/dlls/dinput' > > It seems struct input_absinfo is not defined. > > > >

Aug. 20, 2007

dinput compile error

by Robert Reif

make[2]: Entering directory `/home/wine/wine/dlls/dinput' gcc -c -I. -I. -I../../include -I../../include -D__WINESRC__ -D_REENTRANT -fPIC -Wall -pipe -fno-strict-aliasing -Wwrite-strings -Wpointer-arith -g -O2 -o joystick_linuxinput.o joystick_linuxinput.c joystick_linuxinput.c:153: field `axes' has incomplete type joystick_linuxinput.c:154: confused by earlier errors, bailing out make[2]: *** [joystick_linuxinput.o] Error 1 make[2]: Leaving directory `/home/wine/wine/dlls/dinput' It seems struct input_absinfo is not defined.

Aug. 20, 2007

Re: [4/5] D3D9: Some caps fixes

by Stefan Dösinger

Am Montag, 20. August 2007 19:26 schrieb H. Verbeet: > On 20/08/07, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > > /* Some functionality is implemented in d3d9.dll, not wined3d.dll. > > Add the needed caps */ pCaps->DevCaps2 |= > > D3DDEVCAPS2_CAN_STRETCHRECT_FROM_TEXTURES; > > You should move that to filter_caps() as well, or at the very least > add it to IDirect3DDevice9Impl_GetDeviceCaps(). It doesn't really belong to filter_caps, because it adds a new cap flag rather than removing wrong ones, but you're right about IDirect3DDevice9Impl_GetDeviceCaps.

Aug. 20, 2007

Re: winefile: Save font settings for registry

by Michael Stefaniuc

Ivan Sinitsin wrote: > this is corrected patch for winefile. You want to use the explicit RegQueryValueExW and RegSetValueExW functions. bye michael > > This patch adds an opportunity to keep adjustments of a font between sessions, > if menu "Save settings on exit" is checked. > > > Changelog: > this patch add opportunity to save font option to the regestry, and load font > option from regestry in the winefile program > > > > ------------------------------------------------------------------------ > > Index: programs/winefile/winefile.c > =================================================================== > RCS file: /home/wine/wine/programs/winefile/winefile.c,v > retrieving revision 1.75 > diff -u -p -u -r1.75 winefile.c > --- programs/winefile/winefile.c 25 Oct 2006 18:31:13 -0000 1.75 > +++ programs/winefile/winefile.c 14 Jun 2007 07:22:19 -0000 > @@ -66,6 +66,20 @@ static const WCHAR reg_start_x[] = { 's' > static const WCHAR reg_start_y[] = { 's','t','a','r','t','Y','\0'}; > static const WCHAR reg_width[] = { 'w','i','d','t','h','\0'}; > static const WCHAR reg_height[] = { 'h','e','i','g','h','t','\0'}; > +static const WCHAR reg_font_height[] = { 'f','o','n','t','_','h','e','i','g','h','t','\0'}; > +static const WCHAR reg_font_width[] = { 'f','o','n','t','_','w','i','d','t','h','\0'}; > +static const WCHAR reg_font_escapement[] = { 'f','o','n','t','_','E','s','c','a','p','e','m','e','n','t','\0'}; > +static const WCHAR reg_font_orientation[] = { 'f','o','n','t','_','O','r','i','e','n','t','a','t','i','o','n','\0'}; > +static const WCHAR reg_font_weight[] = { 'f','o','n','t','_','W','e','i','g','h','t','\0'}; > +static const WCHAR reg_font_italic[] = { 'f','o','n','t','_','I','t','a','l','i','c','\0'}; > +static const WCHAR reg_font_underline[] = { 'f','o','n','t','_','U','n','d','e','r','l','i','n','e','\0'}; > +static const WCHAR reg_font_strikeout[] = { 'f','o','n','t','_','S','t','r','i','k','e','O','u','t','\0'}; > +static const WCHAR reg_font_charset[] = { 'f','o','n','t','_','C','h','a','r','S','e','t','\0'}; > +static const WCHAR reg_font_outprecision[] = { 'f','o','n','t','_','O','u','t','P','r','e','c','i','s','i','o','n','\0'}; > +static const WCHAR reg_font_clipprecision[] = { 'f','o','n','t','_','C','l','i','p','P','r','e','c','i','s','i','o','n','\0'}; > +static const WCHAR reg_font_quality[] = { 'f','o','n','t','_','Q','u','a','l','i','t','y','\0'}; > +static const WCHAR reg_font_pitchandfamily[] = { 'f','o','n','t','_','P','i','t','c','h','A','n','d','F','a','m','i','l','y','\0'}; > +static const WCHAR reg_font_facename[] = { 'f','o','n','t','_','F','a','c','e','N','a','m','e','\0'}; > > enum ENTRY_TYPE { > ET_WINDOWS, > @@ -1588,15 +1602,20 @@ static void get_path(Entry* dir, PTSTR p > > static windowOptions load_registry_settings(void) > { > - DWORD size; > + DWORD size, sizeW; > DWORD type; > HKEY hKey; > windowOptions opts; > + LOGFONT logfont; > + HFONT hFont; > > RegOpenKeyEx( HKEY_CURRENT_USER, registry_key, > 0, KEY_QUERY_VALUE, &hKey ); > > + hFont=GetStockObject(DEFAULT_GUI_FONT); > + GetObject(hFont,sizeof(logfont),&logfont); > size = sizeof(DWORD); > + sizeW = sizeof(logfont.lfFaceName); > > if( RegQueryValueEx( hKey, reg_start_x, NULL, &type, > (LPBYTE) &opts.start_x, &size ) != ERROR_SUCCESS ) > @@ -1614,8 +1633,51 @@ static windowOptions load_registry_setti > (LPBYTE) &opts.height, &size ) != ERROR_SUCCESS ) > opts.height = CW_USEDEFAULT; > > + RegQueryValueEx( hKey, reg_font_height, NULL, &type, > + (LPBYTE) &logfont.lfHeight, &size ); > + > + RegQueryValueEx( hKey, reg_font_width, NULL, &type, > + (LPBYTE) &logfont.lfWidth, &size ); > + > + RegQueryValueEx( hKey, reg_font_escapement, NULL, &type, > + (LPBYTE) &logfont.lfEscapement, &size ); > + > + RegQueryValueEx( hKey, reg_font_orientation, NULL, &type, > + (LPBYTE) &logfont.lfOrientation, &size ); > + > + RegQueryValueEx( hKey, reg_font_weight, NULL, &type, > + (LPBYTE) &logfont.lfWeight, &size ); > + > + RegQueryValueEx( hKey, reg_font_italic, NULL, &type, > + (LPBYTE) &logfont.lfItalic, &size ); > + > + RegQueryValueEx( hKey, reg_font_underline, NULL, &type, > + (LPBYTE) &logfont.lfUnderline, &size ); > + > + RegQueryValueEx( hKey, reg_font_strikeout, NULL, &type, > + (LPBYTE) &logfont.lfStrikeOut, &size ); > + > + RegQueryValueEx( hKey, reg_font_charset, NULL, &type, > + (LPBYTE) &logfont.lfCharSet, &size ); > + > + RegQueryValueEx( hKey, reg_font_outprecision, NULL, &type, > + (LPBYTE) &logfont.lfOutPrecision, &size ); > + > + RegQueryValueEx( hKey, reg_font_clipprecision, NULL, &type, > + (LPBYTE) &logfont.lfClipPrecision, &size ); > + > + RegQueryValueEx( hKey, reg_font_quality, NULL, &type, > + (LPBYTE) &logfont.lfQuality, &size ); > + > + RegQueryValueEx( hKey, reg_font_pitchandfamily, NULL, &type, > + (LPBYTE) &logfont.lfPitchAndFamily, &size ); > + > + RegQueryValueEx( hKey, reg_font_facename, NULL, &type, > + (LPBYTE) &logfont.lfFaceName, &sizeW); > + > RegCloseKey( hKey ); > > + Globals.hfont = CreateFontIndirect(&logfont); > return opts; > } > > @@ -1624,11 +1686,13 @@ static void save_registry_settings(void) > WINDOWINFO wi; > HKEY hKey; > INT width, height; > + LOGFONT logfont; > > wi.cbSize = sizeof( WINDOWINFO ); > GetWindowInfo(Globals.hMainWnd, &wi); > width = wi.rcWindow.right - wi.rcWindow.left; > height = wi.rcWindow.bottom - wi.rcWindow.top; > + GetObject(Globals.hfont, sizeof(logfont), &logfont); > > if ( RegOpenKeyEx( HKEY_CURRENT_USER, registry_key, > 0, KEY_SET_VALUE, &hKey ) != ERROR_SUCCESS ) > @@ -1651,6 +1715,34 @@ static void save_registry_settings(void) > (LPBYTE) &width, sizeof(DWORD) ); > RegSetValueEx( hKey, reg_height, 0, REG_DWORD, > (LPBYTE) &height, sizeof(DWORD) ); > + RegSetValueEx( hKey, reg_font_height, 0, REG_DWORD, > + (LPBYTE) &logfont.lfHeight, sizeof(DWORD) ); > + RegSetValueEx( hKey, reg_font_width, 0, REG_DWORD, > + (LPBYTE) &logfont.lfWidth, sizeof(DWORD) ); > + RegSetValueEx( hKey, reg_font_escapement, 0, REG_DWORD, > + (LPBYTE) &logfont.lfEscapement, sizeof(DWORD) ); > + RegSetValueEx( hKey, reg_font_orientation, 0, REG_DWORD, > + (LPBYTE) &logfont.lfOrientation, sizeof(DWORD) ); > + RegSetValueEx( hKey, reg_font_weight, 0, REG_DWORD, > + (LPBYTE) &logfont.lfWeight, sizeof(DWORD) ); > + RegSetValueEx( hKey, reg_font_italic, 0, REG_DWORD, > + (LPBYTE) &logfont.lfItalic, sizeof(DWORD) ); > + RegSetValueEx( hKey, reg_font_underline, 0, REG_DWORD, > + (LPBYTE) &logfont.lfUnderline, sizeof(DWORD) ); > + RegSetValueEx( hKey, reg_font_strikeout, 0, REG_DWORD, > + (LPBYTE) &logfont.lfStrikeOut, sizeof(DWORD) ); > + RegSetValueEx( hKey, reg_font_charset, 0, REG_DWORD, > + (LPBYTE) &logfont.lfCharSet, sizeof(DWORD) ); > + RegSetValueEx( hKey, reg_font_outprecision, 0, REG_DWORD, > + (LPBYTE) &logfont.lfOutPrecision, sizeof(DWORD) ); > + RegSetValueEx( hKey, reg_font_clipprecision, 0, REG_DWORD, > + (LPBYTE) &logfont.lfClipPrecision, sizeof(DWORD) ); > + RegSetValueEx( hKey, reg_font_quality, 0, REG_DWORD, > + (LPBYTE) &logfont.lfQuality, sizeof(DWORD) ); > + RegSetValueEx( hKey, reg_font_pitchandfamily, 0, REG_DWORD, > + (LPBYTE) &logfont.lfPitchAndFamily, sizeof(DWORD) ); > + RegSetValueEx( hKey, reg_font_facename, 0, REG_SZ, > + (LPBYTE) &logfont.lfFaceName,(strlenW(&logfont.lfFaceName) + 1)*sizeof(WCHAR)); > > /* TODO: Save more settings here (List vs. Detailed View, etc.) */ > RegCloseKey( hKey ); > > > ------------------------------------------------------------------------ > > -- Michael Stefaniuc Tel.: +49-711-96437-199 Sr. Network Engineer Fax.: +49-711-96437-111

Aug. 20, 2007

Re: [Winetest RFI] What do you want out of the test suite?

by Stefan Leichter

Hello Paul, Am Monday 20 August 2007 11:42 schrieb Paul Vriens: > > OK, I gave it a try. > [snip] > > http://www.xs4all.nl/~pvriens/200708181000_with_todo_yellow_border_and_grou… > is the same but also shows that are are todo's for a group in the > summary. > I like the version above. > (The yellow border will clash with the mixed results). > > > Let me know your thoughts on this. > > Cheers, > > Paul. Bye Stefan

Aug. 20, 2007

Re: [4/5] D3D9: Some caps fixes

by H. Verbeet

On 20/08/07, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > /* Some functionality is implemented in d3d9.dll, not wined3d.dll. Add the needed caps */ > pCaps->DevCaps2 |= D3DDEVCAPS2_CAN_STRETCHRECT_FROM_TEXTURES; You should move that to filter_caps() as well, or at the very least add it to IDirect3DDevice9Impl_GetDeviceCaps().

Aug. 20, 2007

Re: comctl resource diff

by Maarten Lankhorst

Dj Apal [GR] schreef: > Hope this is the one you want. PLease commit it! > > TIA! > ------------------------------------------------------------------------ > > --- ./dlls/comctl32/rsrc.rc 2007-08-20 19:52:26.000000000 +0300 > +++ ./dlls/comctl32/rsrc1.rc 2007-08-20 19:50:03.000000000 +0300 > @@ -1196,6 +1196,7 @@ IDI_TT_ERROR_SM ICON LOADONCALL DISCARDA > #include "comctl_Cn.rc" > #include "comctl_Cs.rc" > #include "comctl_De.rc" > +#include "comctl_El.rc" > #include "comctl_En.rc" > #include "comctl_Eo.rc" > #include "comctl_Es.rc" > I'm missing a comctl_El.rc here?

Aug. 20, 2007

Re: Fixing wrong prototypes in a header

by Juan Lang

> I think that's a case where we could diverge from the PSDK (with a > comment explaining why). Otherwise the header is completely useless: we > could not even make sure its prototypes match those of our > implementation. Thanks Francois, I was hoping you'd check in. > Btw, did you check this against the very latest PSDK? Well, I checked against a PSDK I installed a month ago. If there's a newer one, I haven't checked it. > Could you provide the name of one of these functions? They're function pointers, actually. All the function pointer members of CRYPT_PROVIDER_FUNCTIONS in wintrust.h are declared without a calling convention. They need to be declared __stdcall. Is the default calling convention for VC++ __stdcall? If so, that'd explain the difference. Thanks, --Juan

Aug. 20, 2007

Re: How to Calling PE Dlls on linux??

by Damjan Jovanovic

On 8/20/07, trulyliu <trulyliu(a)gmail.com> wrote: > hi: > > I am sorry to disturb you with a question about calling PE Dll on linux. > This is really an old question. > I found the sameness issues in mail list. > > http://www.winehq.org/pipermail/wine-devel/2003-December/thread.html > http://www.winehq.org/pipermail/wine-devel/2005-November/thread.html#41917 > http://www.winehq.org/pipermail/wine-users/2004-August/014685.html > http://www.winehq.org/pipermail/wine-devel/2006-August/050619.html > > I have tried the ways discussed in these threads。 > But it's not clear enough how to do this. > So I send this mail to you for some help. > > I have a PE Dll named Arithmetic.dll which exports a function, > it's prototype is: > void sort(unsigned int*, int num) > > I want to call the function in my Linux App. You can't, it's not supported (yet), but what you want is the Wine plugin API (http://wiki.winehq.org/WinePluginApi) At the moment you have 2 options: * Make a Windows application instead of a Linux application. * Make a winelib application which will require wine to run but can access Linux libraries as well (with some restrictions, eg. you have to use Windows synchronization primitives instead of the pthreads ones). > I used winedump to generate a spec file > > winedump spec Arithmetic.dll > > This comand generated three files: Arithmetic_dll.h Arithmetic_main.c and > Arithmeticspec. > What's the next exactly step I should do? > What's the usage of the three files? > And wow could I use them? #include <windows.h> int main(int argc, char **argv) { HANDLE h; void (/*WINAPI?*/ *sort)(unsigned int,int); unsigned int *nums = malloc(sizeof(unsigned int) * 4); nums[0] = 3; nums[1] = 2; nums[2] = 1; nums[3] = 0; h = LoadLibrary("Arithmetic.dll"); sort = GetProcAddress(h, "sort"); sort(nums, 4); } winegcc main.c -o main ./main > > I made reference to mplayer's implementation, > It's code is a little clutter， and I don't have experience on MS D-Show. > Could you give me some simple sample codes ?? MPlayer's code is GPL, so if you use it your code will be GPL too. > Best Regards. > > -- > trulyliu(a)gmail.com Good luck Damjan

Aug. 20, 2007