November 2005 - Wine-Commits

wine/dlls/hhctrl.ocx hhctrl.c
by Alexandre Julliard Nov. 7, 2005

Nov. 7, 2005

ChangeSet ID: 21130 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/07 05:08:47 Modified files: dlls/hhctrl.ocx: hhctrl.c Log message: James Hawkins <truiken(a)gmail.com> Free an alloc'ed string. Patch: http://cvs.winehq.org/patch.py?id=21130 Old revision New revision Changes Path 1.9 1.10 +3 -2 wine/dlls/hhctrl.ocx/hhctrl.c Index: wine/dlls/hhctrl.ocx/hhctrl.c diff -u -p wine/dlls/hhctrl.ocx/hhctrl.c:1.9 wine/dlls/hhctrl.ocx/hhctrl.c:1.10 --- wine/dlls/hhctrl.ocx/hhctrl.c:1.9 7 Nov 2005 11: 8:47 -0000 +++ wine/dlls/hhctrl.ocx/hhctrl.c 7 Nov 2005 11: 8:47 -0000 @@ -96,9 +96,10 @@ HWND WINAPI HtmlHelpW(HWND caller, LPCWS case HH_HELP_CONTEXT: FIXME("Not all HH cases handled correctly\n"); doWinMain(GetModuleHandleW(NULL), file); - default: - return 0; + break; } + HeapFree(GetProcessHeap(), 0, file); + return 0; } HWND WINAPI HtmlHelpA(HWND caller, LPCSTR filename, UINT command, DWORD data)

1 0

wine/dlls/user cursoricon.c
by Alexandre Julliard Nov. 7, 2005

Nov. 7, 2005

ChangeSet ID: 21129 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/07 05:07:43 Modified files: dlls/user : cursoricon.c Log message: Christian Costa <titan.costa(a)wanadoo.fr> When creating black & white cursor icon, handle special case where hbmColor is null and hbmMask specify a bitmap having twice the height and formatted so the upper half is the icon AND bitmask and the lower one is the OR bitmask. Patch: http://cvs.winehq.org/patch.py?id=21129 Old revision New revision Changes Path 1.17 1.18 +9 -9 wine/dlls/user/cursoricon.c Index: wine/dlls/user/cursoricon.c diff -u -p wine/dlls/user/cursoricon.c:1.17 wine/dlls/user/cursoricon.c:1.18 --- wine/dlls/user/cursoricon.c:1.17 7 Nov 2005 11: 7:43 -0000 +++ wine/dlls/user/cursoricon.c 7 Nov 2005 11: 7:43 -0000 @@ -1807,10 +1807,10 @@ HICON WINAPI CreateIconIndirect(PICONINF HICON16 hObj; int sizeXor,sizeAnd; - GetObjectA( iconinfo->hbmColor, sizeof(bmpXor), &bmpXor ); + if (iconinfo->hbmColor) GetObjectA( iconinfo->hbmColor, sizeof(bmpXor), &bmpXor ); GetObjectA( iconinfo->hbmMask, sizeof(bmpAnd), &bmpAnd ); - sizeXor = bmpXor.bmHeight * bmpXor.bmWidthBytes; + sizeXor = iconinfo->hbmColor ? (bmpXor.bmHeight * bmpXor.bmWidthBytes) : 0; sizeAnd = bmpAnd.bmHeight * bmpAnd.bmWidthBytes; hObj = GlobalAlloc16( GMEM_MOVEABLE, @@ -1833,16 +1833,16 @@ HICON WINAPI CreateIconIndirect(PICONINF info->ptHotSpot.y = iconinfo->yHotspot; } - info->nWidth = bmpXor.bmWidth; - info->nHeight = bmpXor.bmHeight; - info->nWidthBytes = bmpXor.bmWidthBytes; - info->bPlanes = bmpXor.bmPlanes; - info->bBitsPerPixel = bmpXor.bmBitsPixel; + info->nWidth = bmpAnd.bmWidth; + info->nHeight = iconinfo->hbmColor ? bmpAnd.bmHeight : (bmpAnd.bmHeight / 2); + info->nWidthBytes = bmpAnd.bmWidthBytes; + info->bPlanes = bmpAnd.bmPlanes; + info->bBitsPerPixel = bmpAnd.bmBitsPixel; /* Transfer the bitmap bits to the CURSORICONINFO structure */ - GetBitmapBits( iconinfo->hbmMask ,sizeAnd,(char*)(info + 1) ); - GetBitmapBits( iconinfo->hbmColor,sizeXor,(char*)(info + 1) +sizeAnd); + GetBitmapBits( iconinfo->hbmMask, sizeAnd, (char*)(info + 1) ); + if (iconinfo->hbmColor) GetBitmapBits( iconinfo->hbmColor, sizeXor, (char*)(info + 1) + sizeAnd ); GlobalUnlock16( hObj ); } return HICON_32(hObj);

1 0

wine/dlls/d3d8 d3dcore_gl.h
by Alexandre Julliard Nov. 7, 2005

Nov. 7, 2005

ChangeSet ID: 21128 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/07 05:07:19 Modified files: dlls/d3d8 : d3dcore_gl.h Log message: Vincent Béron <vberon(a)mecano.gme.usherb.ca> Remove already included headers. Patch: http://cvs.winehq.org/patch.py?id=21128 Old revision New revision Changes Path 1.18 1.19 +0 -12 wine/dlls/d3d8/d3dcore_gl.h Index: wine/dlls/d3d8/d3dcore_gl.h diff -u -p wine/dlls/d3d8/d3dcore_gl.h:1.18 wine/dlls/d3d8/d3dcore_gl.h:1.19 --- wine/dlls/d3d8/d3dcore_gl.h:1.18 7 Nov 2005 11: 7:19 -0000 +++ wine/dlls/d3d8/d3dcore_gl.h 7 Nov 2005 11: 7:19 -0000 @@ -22,18 +22,6 @@ #ifndef __WINE_D3DCORE_GL_H #define __WINE_D3DCORE_GL_H -#ifndef __WINE_CONFIG_H -# error You must include config.h to use this header -#endif - -#define XMD_H /* This is to prevent the Xmd.h inclusion bug :-/ */ -#include <GL/gl.h> -#include <GL/glx.h> -#ifdef HAVE_GL_GLEXT_H -# include <GL/glext.h> -#endif -#undef XMD_H - #undef APIENTRY #define APIENTRY

1 0

docs/en winedev-otherdebug.sgml
by Dimi Paun Nov. 6, 2005

Nov. 6, 2005

ChangeSet ID: 1131292918953472341018827 CVSROOT: /cvsroot/wine Module name: docs Changes by: dimi(a)sc8-pr-cvs1.sourceforge.net 2005/11/06 08:01:58 Modified files: en : winedev-otherdebug.sgml Log message: Jonathan Ernst <Jonathan(a)ErnstFamily.ch> - CST -> CDT Old revision New revision Changes Path 1.3 1.4 +1 -1 docs/en/winedev-otherdebug.sgml Index: docs/en/winedev-otherdebug.sgml diff -u -p docs/en/winedev-otherdebug.sgml:1.3 docs/en/winedev-otherdebug.sgml:1.4 --- docs/en/winedev-otherdebug.sgml 6 Nov 2005 16: 1:58 -0000 +++ /dev/null 6 Nov 2005 16: 1:58 -0000 @@ -428,7 +428,7 @@ cvs update -PAd -D "2004-08-23 CDT" </para> <para> The date format is <literal>YYYY-MM-DD HH:MM:SS</literal>. - Using the CST date format ensure that you will be able to + Using the CDT date format ensure that you will be able to extract patches in a way that will be compatible with the wine-cvs archive <ulink url="http://www.winehq.org/hypermail/wine-cvs">

1 0

lostwages/ news/2005110401.xml wwn/wn20051104_ ...
by WineHQ Nov. 6, 2005

Nov. 6, 2005

ChangeSet ID: 21127 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: wineowner(a)winehq.org 2005/11/05 18:07:59 Added files: news : 2005110401.xml wwn : wn20051104_298.xml Log message: WWN #298 Patch: http://cvs.winehq.org/patch.py?id=21127 Old revision New revision Changes Path Added 1.1 +0 -0 lostwages/news/2005110401.xml Added 1.1 +0 -0 lostwages/wwn/wn20051104_298.xml

1 0

wine/dlls/gdi mfdrv/init.c path.c palette.c pa ...
by Alexandre Julliard Nov. 5, 2005

Nov. 5, 2005

ChangeSet ID: 21126 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/05 04:45:03 Modified files: dlls/gdi/mfdrv : init.c dlls/gdi : path.c palette.c painting.c metafile.c font.c enhmetafile.c driver.c Log message: Markus Amsler <markus.amsler(a)oribi.org> Improve c2man Documented-Total count. Patch: http://cvs.winehq.org/patch.py?id=21126 Old revision New revision Changes Path 1.34 1.35 +2 -0 wine/dlls/gdi/mfdrv/init.c 1.9 1.10 +3 -1 wine/dlls/gdi/path.c 1.9 1.10 +2 -0 wine/dlls/gdi/palette.c 1.8 1.9 +13 -5 wine/dlls/gdi/painting.c 1.9 1.10 +17 -2 wine/dlls/gdi/metafile.c 1.22 1.23 +11 -1 wine/dlls/gdi/font.c 1.16 1.17 +10 -0 wine/dlls/gdi/enhmetafile.c 1.42 1.43 +2 -0 wine/dlls/gdi/driver.c

1 0

wine/dlls/shell32 tests/shlfolder.c shfldr_uni ...
by Alexandre Julliard Nov. 5, 2005

Nov. 5, 2005

ChangeSet ID: 21125 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/05 04:44:28 Modified files: dlls/shell32/tests: shlfolder.c dlls/shell32 : shfldr_unixfs.c Log message: Michael Jung <mjung(a)iss.tu-darmstadt.de> - Move target folder initialization to a dedicated function. - Use this function in BindToObject (should be faster). - Special handling for FolderShortcut objects in Initialize method. - Removed a todo_wine from a no longer failing unit test. Patch: http://cvs.winehq.org/patch.py?id=21125 Old revision New revision Changes Path 1.41 1.42 +9 -4 wine/dlls/shell32/tests/shlfolder.c 1.59 1.60 +100 -59 wine/dlls/shell32/shfldr_unixfs.c

1 0

wine/dlls/winmm/winealsa audio.c
by Alexandre Julliard Nov. 5, 2005

Nov. 5, 2005

ChangeSet ID: 21124 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/05 04:44:10 Modified files: dlls/winmm/winealsa: audio.c Log message: Davin McCall <davmac(a)davmac.org> Avoid getting ahead of dsound mixer when using non-hw device. Also avoid using internal ALSA call to retrieve hardware play position. Patch: http://cvs.winehq.org/patch.py?id=21124 Old revision New revision Changes Path 1.97 1.98 +88 -64 wine/dlls/winmm/winealsa/audio.c

1 0

wine/dlls/ntdll thread.c
by Alexandre Julliard Nov. 5, 2005

Nov. 5, 2005

ChangeSet ID: 21123 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/05 04:43:50 Modified files: dlls/ntdll : thread.c Log message: Kevin Koltzau <kevin(a)plop.org> x86_64 references a named union, ensure unions are not nameless. Patch: http://cvs.winehq.org/patch.py?id=21123 Old revision New revision Changes Path 1.44 1.45 +1 -0 wine/dlls/ntdll/thread.c Index: wine/dlls/ntdll/thread.c diff -u -p wine/dlls/ntdll/thread.c:1.44 wine/dlls/ntdll/thread.c:1.45 --- wine/dlls/ntdll/thread.c:1.44 5 Nov 2005 10:43:50 -0000 +++ wine/dlls/ntdll/thread.c 5 Nov 2005 10:43:50 -0000 @@ -29,6 +29,7 @@ #include <sys/times.h> #endif +#define NONAMELESSUNION #include "ntstatus.h" #include "thread.h" #include "winternl.h"

1 0

wine/dlls/commdlg cdlg_De.rc
by Alexandre Julliard Nov. 5, 2005

Nov. 5, 2005

ChangeSet ID: 21122 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/05 04:43:35 Modified files: dlls/commdlg : cdlg_De.rc Log message: Henning Gerhardt <henning.gerhardt(a)web.de> Update German resource file. Patch: http://cvs.winehq.org/patch.py?id=21122 Old revision New revision Changes Path 1.25 1.26 +3 -3 wine/dlls/commdlg/cdlg_De.rc Index: wine/dlls/commdlg/cdlg_De.rc diff -u -p wine/dlls/commdlg/cdlg_De.rc:1.25 wine/dlls/commdlg/cdlg_De.rc:1.26 --- wine/dlls/commdlg/cdlg_De.rc:1.25 5 Nov 2005 10:43:35 -0000 +++ wine/dlls/commdlg/cdlg_De.rc 5 Nov 2005 10:43:35 -0000 @@ -399,9 +399,9 @@ Bitte geben sie einen Wert zwischen %d u PD32_OUT_OF_MEMORY "Kein freier Speicher mehr." PD32_GENERIC_ERROR "Ein unbekannter Fehler ist aufgetreten." PD32_DRIVER_UNKNOWN "Unbekannter Druckertreiber." - PD32_NO_DEVICES "Before you can perform printer-related tasks \ -such as page setup or printing a document, you need to install a printer. \ -Please install one and retry." + PD32_NO_DEVICES "Bevor Sie drucker-relevante Aufgaben ausführen können, \ + wie die Seiteneinrichtung oder ein Dokument zu drucken,\ + müssen Sie einen Drucker installieren. Bitte führen Sie dies zuerst aus und versuchen Sie es erneut." PD32_DEFAULT_PRINTER "Standard Drucker; " PD32_NR_OF_DOCUMENTS_IN_QUEUE "Es sind %d Dokumente in der Queue"

1 0