November 2005 - Wine-Commits

wine/dlls/x11drv event.c
by Alexandre Julliard Nov. 23, 2005

Nov. 23, 2005

ChangeSet ID: 21410 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/23 07:43:59 Modified files: dlls/x11drv : event.c Log message: Fixed some broken code that was causing compiler warnings. Patch: http://cvs.winehq.org/patch.py?id=21410 Old revision New revision Changes Path 1.60 1.61 +9 -25 wine/dlls/x11drv/event.c Index: wine/dlls/x11drv/event.c diff -u -p wine/dlls/x11drv/event.c:1.60 wine/dlls/x11drv/event.c:1.61 --- wine/dlls/x11drv/event.c:1.60 23 Nov 2005 13:43:59 -0000 +++ wine/dlls/x11drv/event.c 23 Nov 2005 13:43:59 -0000 @@ -637,15 +637,8 @@ static void EVENT_DropFromOffiX( HWND hW unsigned long data_length; unsigned long aux_long; unsigned char* p_data = NULL; - union { - Atom atom_aux; - struct { - int x; - int y; - } pt_aux; - int i; - } u; - int x, y; + Atom atom_aux; + int x, y, dummy; BOOL bAccept; Window win, w_aux_root, w_aux_child; WND* pWnd; @@ -654,8 +647,7 @@ static void EVENT_DropFromOffiX( HWND hW win = X11DRV_get_whole_window(hWnd); wine_tsx11_lock(); XQueryPointer( event->display, win, &w_aux_root, &w_aux_child, - &x, &y, (int *) &u.pt_aux.x, (int *) &u.pt_aux.y, - (unsigned int*)&aux_long); + &x, &y, &dummy, &dummy, (unsigned int*)&aux_long); wine_tsx11_unlock(); pWnd = WIN_GetPtr(hWnd); @@ -692,25 +684,20 @@ static void EVENT_DropFromOffiX( HWND hW wine_tsx11_lock(); XGetWindowProperty( event->display, DefaultRootWindow(event->display), x11drv_atom(DndSelection), 0, 65535, FALSE, - AnyPropertyType, &u.atom_aux, (int *) &u.pt_aux.y, + AnyPropertyType, &atom_aux, &dummy, &data_length, &aux_long, &p_data); wine_tsx11_unlock(); if( !aux_long && p_data) /* don't bother if > 64K */ { - signed char *p = (signed char*) p_data; + char *p = (char *)p_data; char *p_drop; aux_long = 0; while( *p ) /* calculate buffer size */ { - p_drop = p; - if((u.i = *p) != -1 ) - { - INT len = GetShortPathNameA( p, NULL, 0 ); - if (len) aux_long += len + 1; - else *p = -1; - } + INT len = GetShortPathNameA( p, NULL, 0 ); + if (len) aux_long += len + 1; p += strlen(p) + 1; } if( aux_long && aux_long < 65535 ) @@ -736,14 +723,11 @@ static void EVENT_DropFromOffiX( HWND hW lpDrop->fWide = FALSE; WIN_ReleasePtr(pDropWnd); p_drop = (char *)(lpDrop + 1); - p = p_data; + p = (char *)p_data; while(*p) { - if( *p != -1 ) /* use only "good" entries */ - { - GetShortPathNameA( p, p_drop, 65535 ); + if (GetShortPathNameA( p, p_drop, aux_long - (p_drop - (char *)lpDrop) )) p_drop += strlen( p_drop ) + 1; - } p += strlen(p) + 1; } *p_drop = '\0';

1 0

wine/dlls/msxml3/tests domdoc.c
by Alexandre Julliard Nov. 23, 2005

Nov. 23, 2005

ChangeSet ID: 21409 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/23 07:43:51 Modified files: dlls/msxml3/tests: domdoc.c Log message: Huw Davies <huw(a)codeweavers.com> Release a stray node. Patch: http://cvs.winehq.org/patch.py?id=21409 Old revision New revision Changes Path 1.12 1.13 +2 -1 wine/dlls/msxml3/tests/domdoc.c Index: wine/dlls/msxml3/tests/domdoc.c diff -u -p wine/dlls/msxml3/tests/domdoc.c:1.12 wine/dlls/msxml3/tests/domdoc.c:1.13 --- wine/dlls/msxml3/tests/domdoc.c:1.12 23 Nov 2005 13:43:51 -0000 +++ wine/dlls/msxml3/tests/domdoc.c 23 Nov 2005 13:43:51 -0000 @@ -168,7 +168,7 @@ void test_domdoc( void ) SysFreeString( str ); - /* check that there's no document element */ + /* check that there's a document element */ element = NULL; r = IXMLDOMDocument_get_documentElement( doc, &element ); ok( r == S_OK, "should be a document element\n"); @@ -335,6 +335,7 @@ void test_domnode( void ) r = IXMLDOMNamedNodeMap_getNamedItem( map, str, &node ); ok( r == S_OK, "getNamedItem returned wrong code\n"); ok( node != NULL, "should be attributes\n"); + IXMLDOMNode_Release(node); SysFreeString( str ); /* test indexed access of attributes */

1 0

lostwages/ include/winehq.conf news/2005112201.xml
by WineHQ Nov. 22, 2005

Nov. 22, 2005

ChangeSet ID: 21408 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: wineowner(a)winehq.org 2005/11/22 12:36:27 Modified files: include : winehq.conf Added files: news : 2005112201.xml Log message: News about wine 0.9.2 Patch: http://cvs.winehq.org/patch.py?id=21408 Old revision New revision Changes Path 1.24 1.25 +1 -1 lostwages/include/winehq.conf Added 1.1 +0 -0 lostwages/news/2005112201.xml Index: lostwages/include/winehq.conf diff -u -p lostwages/include/winehq.conf:1.24 lostwages/include/winehq.conf:1.25 --- lostwages/include/winehq.conf:1.24 22 Nov 2005 18:36:27 -0000 +++ lostwages/include/winehq.conf 22 Nov 2005 18:36:27 -0000 @@ -29,7 +29,7 @@ news_xml_path: news wwn_xml_path: wwn # Snapshot Date -snapshot_date: 0.9.1 +snapshot_date: 0.9.2 # Current RH Packages Snapshot Date snapshot_date_rh: 0.9.1 Index: lostwages/news/2005112201.xml diff -u -p /dev/null lostwages/news/2005112201.xml:1.1 --- /dev/null 22 Nov 2005 18:36:27 -0000 +++ lostwages/news/2005112201.xml 22 Nov 2005 18:36:27 -0000 @@ -0,0 +1,25 @@ +<news> + <date>November 22, 2005</date> + <title>Wine 0.9.2 Released</title> + <body> + +We had a second drop from CVS for the month, wine-0.9.2. The +announcement noted the following changes: +<ul> + <li> Winelib Explorer app (just a wrapper around winefile for now).</li> + <li> Debugger cleanups and improvements.</li> + <li> Many wininet fixes.</li> + <li> Better autogenerated API manpages.</li> + <li> A bunch of Korean translations.</li> + <li> Lots of bug fixes.</li> +</ul> + + Binary packages are in the process of being built, but the source is + <a href="http://prdownloads.sourceforge.net/wine/wine-0.9.2.tar.bz2">available + now</a>. You can find out more about this release in the + <a href="?announce=1.106">announcement</a>. Check out our + <a href="/site/download">download page</a> for packages for your favorite + distribution. + + </body> +</news>

1 0

wine/. ANNOUNCE ChangeLog VERSION configure
by Alexandre Julliard Nov. 22, 2005

Nov. 22, 2005

ChangeSet ID: 21407 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/22 11:01:25 Modified files: . : ANNOUNCE ChangeLog VERSION configure Log message: Release 0.9.2. Patch: http://cvs.winehq.org/patch.py?id=21407 Old revision New revision Changes Path 1.105 1.106 +8 -8 wine/ANNOUNCE 1.101 1.102 +1339 -0 wine/ChangeLog 1.47 1.48 +1 -1 wine/VERSION 1.718 1.719 +9 -9 wine/configure

1 0

wine/dlls/commdlg fontdlg16.c
by Alexandre Julliard Nov. 22, 2005

Nov. 22, 2005

ChangeSet ID: 21406 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/22 10:18:55 Modified files: dlls/commdlg : fontdlg16.c Log message: Rein Klazes <wijn(a)wanadoo.nl> Fixes for FormatCharDlgProc16: - properly store the ChooseFont pointer, use a window property as the A and W functions do; - handle other messages then WM_INITDIALOG and WM_MEASUREITEM as well. Patch: http://cvs.winehq.org/patch.py?id=21406 Old revision New revision Changes Path 1.18 1.19 +17 -9 wine/dlls/commdlg/fontdlg16.c Index: wine/dlls/commdlg/fontdlg16.c diff -u -p wine/dlls/commdlg/fontdlg16.c:1.18 wine/dlls/commdlg/fontdlg16.c:1.19 --- wine/dlls/commdlg/fontdlg16.c:1.18 22 Nov 2005 16:18:55 -0000 +++ wine/dlls/commdlg/fontdlg16.c 22 Nov 2005 16:18:55 -0000 @@ -41,6 +41,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(commdlg); #include "cdlg.h" #include "cdlg16.h" +static const WCHAR strWineFontData16[] = + {'_','_','W','I','N','E','_','F','O','N','T','D','L','G','D','A','T','A','1','6',0}; + static void FONT_LogFont16To32W( const LPLOGFONT16 font16, LPLOGFONTW font32 ) { font32->lfHeight = font16->lfHeight; @@ -120,11 +123,13 @@ INT16 WINAPI FontFamilyEnumProc16( SEGPT { HWND hwnd=HWND_32(LOWORD(lParam)); HWND hDlg=GetParent(hwnd); - LPCHOOSEFONT16 lpcf=(LPCHOOSEFONT16)GetWindowLongPtrW(hDlg, DWLP_USER); + LPCHOOSEFONT16 lpcf; LOGFONT16 *lplf = MapSL( logfont ); TEXTMETRIC16 *lpmtrx16 = MapSL(metrics); ENUMLOGFONTEXW elf32w; NEWTEXTMETRICEXW nmtrx32w; + + lpcf = (LPCHOOSEFONT16)GetPropW(hDlg, strWineFontData16); FONT_LogFont16To32W(lplf, &(elf32w.elfLogFont)); FONT_Metrics16To32W(lpmtrx16, &nmtrx32w); return AddFontFamily(&elf32w, &nmtrx32w, nFontType, @@ -140,11 +145,13 @@ INT16 WINAPI FontStyleEnumProc16( SEGPTR HWND hcmb2=HWND_32(LOWORD(lParam)); HWND hcmb3=HWND_32(HIWORD(lParam)); HWND hDlg=GetParent(hcmb3); - LPCHOOSEFONT16 lpcf=(LPCHOOSEFONT16)GetWindowLongPtrW(hDlg, DWLP_USER); + LPCHOOSEFONT16 lpcf; LOGFONT16 *lplf = MapSL(logfont); TEXTMETRIC16 *lpmtrx16 = MapSL(metrics); ENUMLOGFONTEXW elf32w; NEWTEXTMETRICEXW nmtrx32w; + + lpcf = (LPCHOOSEFONT16)GetPropW(hDlg, strWineFontData16); FONT_LogFont16To32W(lplf, &(elf32w.elfLogFont)); FONT_Metrics16To32W(lpmtrx16, &nmtrx32w); return AddFontStyle(&elf32w, &nmtrx32w, nFontType, @@ -298,13 +305,13 @@ BOOL16 CALLBACK FormatCharDlgProc16(HWND BOOL16 res=0; if (message!=WM_INITDIALOG) { - lpcf=(LPCHOOSEFONT16)GetWindowLongPtrW(hDlg, DWLP_USER); - if (!lpcf && message != WM_MEASUREITEM) - return FALSE; - if (CFn_HookCallChk(lpcf)) - res=CallWindowProc16((WNDPROC16)lpcf->lpfnHook,hDlg16,message,wParam,lParam); - if (res) - return res; + lpcf = (LPCHOOSEFONT16)GetPropW(hDlg, strWineFontData16); + if (!lpcf) + return FALSE; + if (CFn_HookCallChk(lpcf)) + res=CallWindowProc16((WNDPROC16)lpcf->lpfnHook,hDlg16,message,wParam,lParam); + if (res) + return res; } else { @@ -314,6 +321,7 @@ BOOL16 CALLBACK FormatCharDlgProc16(HWND TRACE("CFn_WMInitDialog returned FALSE\n"); return FALSE; } + SetPropW(hDlg, strWineFontData16, (HANDLE)lParam); if (CFn_HookCallChk(lpcf)) return CallWindowProc16((WNDPROC16)lpcf->lpfnHook,hDlg16,WM_INITDIALOG,wParam,lParam); }

1 0

wine/dlls/wininet http.c
by Alexandre Julliard Nov. 22, 2005

Nov. 22, 2005

ChangeSet ID: 21405 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/22 10:18:48 Modified files: dlls/wininet : http.c Log message: Aric Stewart <aric(a)codeweavers.com> HttpEndRequest does not actually send an extra NULL byte at the end of the request. Help from Rob Shearman on this one. Patch: http://cvs.winehq.org/patch.py?id=21405 Old revision New revision Changes Path 1.113 1.114 +0 -5 wine/dlls/wininet/http.c Index: wine/dlls/wininet/http.c diff -u -p wine/dlls/wininet/http.c:1.113 wine/dlls/wininet/http.c:1.114 --- wine/dlls/wininet/http.c:1.113 22 Nov 2005 16:18:48 -0000 +++ wine/dlls/wininet/http.c 22 Nov 2005 16:18:48 -0000 @@ -596,8 +596,6 @@ BOOL WINAPI HttpEndRequestW(HINTERNET hR BOOL rc = FALSE; LPWININETHTTPREQW lpwhr; INT responseLen; - INT cnt; - static const char nullbuff[] = "\0"; TRACE("-->\n"); lpwhr = (LPWININETHTTPREQW) WININET_GetObject( hRequest ); @@ -611,9 +609,6 @@ BOOL WINAPI HttpEndRequestW(HINTERNET hR lpwhr->hdr.dwFlags |= dwFlags; lpwhr->hdr.dwContext = dwContext; - /* End the request by sending a NULL byte */ - rc = NETCON_send(&lpwhr->netConnection, nullbuff, 1, 0, &cnt); - SendAsyncCallback(&lpwhr->hdr, lpwhr->hdr.dwContext, INTERNET_STATUS_RECEIVING_RESPONSE, NULL, 0);

1 0

wine/dlls/kernel volume.c
by Alexandre Julliard Nov. 22, 2005

Nov. 22, 2005

ChangeSet ID: 21404 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/22 09:03:27 Modified files: dlls/kernel : volume.c Log message: Don't try to set the label in the superblock of FAT filesystems, that doesn't do the right thing anyway. Patch: http://cvs.winehq.org/patch.py?id=21404 Old revision New revision Changes Path 1.34 1.35 +9 -48 wine/dlls/kernel/volume.c Index: wine/dlls/kernel/volume.c diff -u -p wine/dlls/kernel/volume.c:1.34 wine/dlls/kernel/volume.c:1.35 --- wine/dlls/kernel/volume.c:1.34 22 Nov 2005 15: 3:27 -0000 +++ wine/dlls/kernel/volume.c 22 Nov 2005 15: 3:27 -0000 @@ -382,36 +382,6 @@ static void VOLUME_GetSuperblockLabel( e /************************************************************************** - * VOLUME_SetSuperblockLabel - */ -static BOOL VOLUME_SetSuperblockLabel( enum fs_type type, HANDLE handle, const WCHAR *label ) -{ - CHAR label_data[11]; - DWORD offset, len; - - switch(type) - { - case FS_FAT1216: - offset = 0x2b; - break; - case FS_FAT32: - offset = 0x47; - break; - default: - SetLastError( ERROR_ACCESS_DENIED ); - return FALSE; - } - RtlUnicodeToMultiByteN( label_data, sizeof(label_data), &len, - label, strlenW(label) * sizeof(WCHAR) ); - if (len < sizeof(label_data)) - memset( label_data + len, ' ', sizeof(label_data) - len ); - - return (SetFilePointer( handle, offset, NULL, FILE_BEGIN ) == offset && - WriteFile( handle, label_data, sizeof(label_data), &len, NULL )); -} - - -/************************************************************************** * VOLUME_GetSuperblockSerial */ static DWORD VOLUME_GetSuperblockSerial( enum fs_type type, const BYTE *superblock ) @@ -699,31 +669,22 @@ BOOL WINAPI SetVolumeLabelW( LPCWSTR roo /* try to open the device */ - handle = CreateFileW( device, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, + handle = CreateFileW( device, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0 ); - if (handle == INVALID_HANDLE_VALUE) - { - /* try read-only */ - handle = CreateFileW( device, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, - NULL, OPEN_EXISTING, 0, 0 ); - if (handle != INVALID_HANDLE_VALUE) - { - /* device can be read but not written, return error */ - CloseHandle( handle ); - SetLastError( ERROR_ACCESS_DENIED ); - return FALSE; - } - } - if (handle != INVALID_HANDLE_VALUE) { BYTE superblock[SUPERBLOCK_SIZE]; - BOOL ret; type = VOLUME_ReadFATSuperblock( handle, superblock ); - ret = VOLUME_SetSuperblockLabel( type, handle, label ); + if (type == FS_UNKNOWN) type = VOLUME_ReadCDSuperblock( handle, superblock ); CloseHandle( handle ); - return ret; + if (type != FS_UNKNOWN) + { + /* we can't set the label on FAT or CDROM file systems */ + TRACE( "cannot set label on device %s type %d\n", debugstr_w(device), type ); + SetLastError( ERROR_ACCESS_DENIED ); + return FALSE; + } } else {

1 0

wine/dlls/wined3d vertexshader.c pixelshader.c
by Alexandre Julliard Nov. 22, 2005

Nov. 22, 2005

ChangeSet ID: 21403 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/22 09:01:55 Modified files: dlls/wined3d : vertexshader.c pixelshader.c Log message: Oliver Stieber <oliver_stieber(a)yahoo.co.uk> Corrects an error in the _m3xm3 shader function in pixel and vertex shaders. Patch: http://cvs.winehq.org/patch.py?id=21403 Old revision New revision Changes Path 1.16 1.17 +2 -2 wine/dlls/wined3d/vertexshader.c 1.2 1.3 +2 -2 wine/dlls/wined3d/pixelshader.c Index: wine/dlls/wined3d/vertexshader.c diff -u -p wine/dlls/wined3d/vertexshader.c:1.16 wine/dlls/wined3d/vertexshader.c:1.17 --- wine/dlls/wined3d/vertexshader.c:1.16 22 Nov 2005 15: 1:55 -0000 +++ wine/dlls/wined3d/vertexshader.c 22 Nov 2005 15: 1:55 -0000 @@ -325,8 +325,8 @@ void vshader_m3x4(WINED3DSHADERVECTOR* d } void vshader_m3x3(WINED3DSHADERVECTOR* d, WINED3DSHADERVECTOR* s0, D3DMATRIX33 mat) { - d->x = mat[0][0] * s0->x + mat[0][1] * s0->y + mat[2][2] * s0->z; - d->y = mat[1][0] * s0->x + mat[1][1] * s0->y + mat[2][2] * s0->z; + d->x = mat[0][0] * s0->x + mat[0][1] * s0->y + mat[0][2] * s0->z; + d->y = mat[1][0] * s0->x + mat[1][1] * s0->y + mat[1][2] * s0->z; d->z = mat[2][0] * s0->x + mat[2][1] * s0->y + mat[2][2] * s0->z; d->w = 1.0f; VSTRACE(("executing m3x3(1): mat=(%f, %f, %f) s0=(%f) d=(%f) \n", mat[0][0], mat[0][1], mat[0][2], s0->x, d->x)); Index: wine/dlls/wined3d/pixelshader.c diff -u -p wine/dlls/wined3d/pixelshader.c:1.2 wine/dlls/wined3d/pixelshader.c:1.3 --- wine/dlls/wined3d/pixelshader.c:1.2 22 Nov 2005 15: 1:55 -0000 +++ wine/dlls/wined3d/pixelshader.c 22 Nov 2005 15: 1:55 -0000 @@ -373,8 +373,8 @@ void pshader_m3x4(WINED3DSHADERVECTOR* d } void pshader_m3x3(WINED3DSHADERVECTOR* d, WINED3DSHADERVECTOR* s0, D3DMATRIX33 mat) { - d->x = mat[0][0] * s0->x + mat[0][1] * s0->y + mat[2][2] * s0->z; - d->y = mat[1][0] * s0->x + mat[1][1] * s0->y + mat[2][2] * s0->z; + d->x = mat[0][0] * s0->x + mat[0][1] * s0->y + mat[0][2] * s0->z; + d->y = mat[1][0] * s0->x + mat[1][1] * s0->y + mat[1][2] * s0->z; d->z = mat[2][0] * s0->x + mat[2][1] * s0->y + mat[2][2] * s0->z; d->w = 1.0f; PSTRACE(("executing m3x3(1): mat=(%f, %f, %f) s0=(%f) d=(%f) \n", mat[0][0], mat[0][1], mat[0][2], s0->x, d->x));

1 0

wine/dlls/msvideo msvideo_private.h msvideo_ma ...
by Alexandre Julliard Nov. 22, 2005

Nov. 22, 2005

ChangeSet ID: 21402 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/22 08:56:40 Modified files: dlls/msvideo : msvideo_private.h msvideo_main.c msvideo16.c drawdib.c Makefile.in .cvsignore Added files: dlls/msvideo : rsrc.rc msvfw32_En.rc Log message: Dmitry Timoshkov <dmitry(a)codeweavers.com> Add a semi-functional ICCompressorChoose implementation. Patch: http://cvs.winehq.org/patch.py?id=21402 Old revision New revision Changes Path 1.8 1.9 +3 -8 wine/dlls/msvideo/msvideo_private.h 1.67 1.68 +169 -25 wine/dlls/msvideo/msvideo_main.c 1.18 1.19 +5 -1 wine/dlls/msvideo/msvideo16.c 1.25 1.26 +5 -1 wine/dlls/msvideo/drawdib.c 1.31 1.32 +2 -0 wine/dlls/msvideo/Makefile.in 1.15 1.16 +1 -0 wine/dlls/msvideo/.cvsignore Added 1.1 +0 -0 wine/dlls/msvideo/rsrc.rc Added 1.1 +0 -0 wine/dlls/msvideo/msvfw32_En.rc

1 0

wine/dlls/user tests/sysparams.c sysparams.c
by Alexandre Julliard Nov. 22, 2005

Nov. 22, 2005

ChangeSet ID: 21401 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/22 08:56:11 Modified files: dlls/user/tests: sysparams.c dlls/user : sysparams.c Log message: Rein Klazes <wijn(a)wanadoo.nl> GetSystemMetrics fixes with corresponding tests. Patch: http://cvs.winehq.org/patch.py?id=21401 Old revision New revision Changes Path 1.43 1.44 +224 -1 wine/dlls/user/tests/sysparams.c 1.41 1.42 +56 -19 wine/dlls/user/sysparams.c

1 0