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

dinput compile error
by Robert Reif 21 Aug '07

21 Aug '07

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.

3 3

Re: [4/5] D3D9: Some caps fixes
by H. Verbeet 20 Aug '07

20 Aug '07

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().

2 1

Re: winefile: Save font settings for registry
by Michael Stefaniuc 20 Aug '07

20 Aug '07

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

1 0

Re: comctl resource diff
by Maarten Lankhorst 20 Aug '07

20 Aug '07

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?

1 0

Fixing wrong prototypes in a header
by Juan Lang 20 Aug '07

20 Aug '07

Some of the function prototypes in wintrust.h have the wrong calling convention. The trouble is, PSDK gets them wrong too. So calling the functions, as declared in the PSDK header, results in a crash in Windows. Casting them to function pointers with the correct calling convention succeeds. Should I leave the prototypes incorrect in wintrust.h to match the PSDK, or should I fix them to make them more convenient for me to use? Thanks, --Juan

2 2

Re: winmm: Change default driver order to be alsa,coreaudio,oss - try2
by Vitaliy Margolen 20 Aug '07

20 Aug '07

Maarten Lankhorst wrote: > Forgot to remove the strlen check. > Isn't this a bit premature? ALSA still does not support proper sound capture, working mixer, and not stable enough on some configurations. Vitaliy

2 8

Re: setupapi: if needed create directories for fake dlls
by Alexandre Julliard 20 Aug '07

20 Aug '07

"Mikolaj Zalewski" <mikolajz(a)google.com> writes: > @@ -302,9 +302,28 @@ BOOL create_fake_dll( const WCHAR *name, > else > { > h = CreateFileW( name, GENERIC_WRITE, 0, NULL, CREATE_NEW, 0, NULL ); > + > + if (h == INVALID_HANDLE_VALUE && GetLastError() == ERROR_PATH_NOT_FOUND) > + { > + WCHAR *pathel; > + > + /* create the directory/directories */ > + pathel = strchrW(name, '\\'); > + while (pathel != NULL) > + { > + *pathel = 0; You shouldn't write to the name, it's a const pointer, even if strchrW hides the warning. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH] handle builtin regedit.exe.so
by Alexandre Julliard 20 Aug '07

20 Aug '07

Marcus Meissner <marcus(a)jet.franken.de> writes: > On my system it tries to load /usr/lib/wine/regedit.exe.so > (via symlink) and this fails. We stopped using symlinks a long time ago, it sounds like your .wine dir is out of date. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: comdlg32: printdlg: Fix number display in PrintDlgW()
by Alexandre Julliard 20 Aug '07

20 Aug '07

Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> writes: > vsprintfW and friends do not support float numbers, so we have to format an > initial string with printf() and then print it to a wide string with > vsprintfW()'s %hs format. For a simply conversion to Unicode MultiByteToWideChar is a better choice. -- Alexandre Julliard julliard(a)winehq.org

1 0

Dyne:bolic binary module
by Robert Shoemaker 20 Aug '07

20 Aug '07

I was wondering what the steps would be to put my binary build for the i686 Dyne:bolic distro on the releases page, it was no small task getting it to compile.

2 1