December 2008 - Wine-Commits

Christian Costa : ddraw: Display fixme only once in IDirect3DVertexBufferImpl_Optimize.
by Alexandre Julliard Dec. 24, 2008

Dec. 24, 2008

Module: wine Branch: master Commit: 9605eb5af2ba7ad64612b5b83ddd97573b0c386d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9605eb5af2ba7ad64612b5b83… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Wed Dec 24 11:22:29 2008 +0100 ddraw: Display fixme only once in IDirect3DVertexBufferImpl_Optimize. --- dlls/ddraw/vertexbuffer.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/vertexbuffer.c b/dlls/ddraw/vertexbuffer.c index caac15f..9b2694a 100644 --- a/dlls/ddraw/vertexbuffer.c +++ b/dlls/ddraw/vertexbuffer.c @@ -509,7 +509,13 @@ IDirect3DVertexBufferImpl_Optimize(IDirect3DVertexBuffer7 *iface, { ICOM_THIS_FROM(IDirect3DVertexBufferImpl, IDirect3DVertexBuffer7, iface); IDirect3DDeviceImpl *D3D = ICOM_OBJECT(IDirect3DDeviceImpl, IDirect3DDevice7, D3DDevice); - FIXME("(%p)->(%p,%08x): stub!\n", This, D3D, Flags); + static BOOL hide = FALSE; + + if (!hide) + { + FIXME("(%p)->(%p,%08x): stub!\n", This, D3D, Flags); + hide = TRUE; + } /* We could forward this call to WineD3D and take advantage * of it once we use OpenGL vertex buffers

1 0

Christian Costa : d3dxof: Small cleanup.
by Alexandre Julliard Dec. 24, 2008

Dec. 24, 2008

Module: wine Branch: master Commit: 50ace397ee010f4a5978d0171c68221db4edc534 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50ace397ee010f4a5978d0171… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Wed Dec 24 11:04:02 2008 +0100 d3dxof: Small cleanup. --- dlls/d3dxof/d3dxof.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index e0e4774..616cea5 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -1916,9 +1916,10 @@ static ULONG WINAPI IDirectXFileEnumObjectImpl_Release(IDirectXFileEnumObject* i HeapFree(GetProcessHeap(), 0, This->xobjects[i]); } if (This->source == DXFILELOAD_FROMFILE) + { HeapFree(GetProcessHeap(), 0, This->buf.buffer); - if (This->hFile != INVALID_HANDLE_VALUE) CloseHandle(This->hFile); + } HeapFree(GetProcessHeap(), 0, This); }

1 0

Henri Verbeet : d3d9: Don't crash in GetFVF() if a NULL vertex declaration is set.
by Alexandre Julliard Dec. 24, 2008

Dec. 24, 2008

Module: wine Branch: master Commit: 0fb3cb9314088f045e552fd8b93033af318b403a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fb3cb9314088f045e552fd8b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 23 23:31:17 2008 +0100 d3d9: Don't crash in GetFVF() if a NULL vertex declaration is set. --- dlls/d3d9/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 693b82f..d8c6e58 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1333,7 +1333,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetFVF(LPDIRECT3DDEVICE9EX iface, DWO return hr; } - *pFVF = ((IDirect3DVertexDeclaration9Impl *)decl)->convFVF; + *pFVF = decl ? ((IDirect3DVertexDeclaration9Impl *)decl)->convFVF : 0; TRACE("Returning FVF %#x\n", *pFVF); return hr;

1 0

Christian Costa : d3dxof: Release allocated xobjects.
by Alexandre Julliard Dec. 24, 2008

Dec. 24, 2008

Module: wine Branch: master Commit: d0e37532cae8897d4320c06483347be9dac96c78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0e37532cae8897d4320c0648… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Wed Dec 24 11:03:33 2008 +0100 d3dxof: Release allocated xobjects. --- dlls/d3dxof/d3dxof.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index 46f3db9..e0e4774 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -1911,7 +1911,10 @@ static ULONG WINAPI IDirectXFileEnumObjectImpl_Release(IDirectXFileEnumObject* i { int i; for (i = 0; i < This->nb_xobjects; i++) + { IDirectXFileData_Release(This->pRefObjects[i]); + HeapFree(GetProcessHeap(), 0, This->xobjects[i]); + } if (This->source == DXFILELOAD_FROMFILE) HeapFree(GetProcessHeap(), 0, This->buf.buffer); if (This->hFile != INVALID_HANDLE_VALUE)

1 0

Alexandre Julliard : user32: Fix SPI_SETMOUSESPEED handling, the parameter is not a pointer.
by Alexandre Julliard Dec. 24, 2008

Dec. 24, 2008

Module: wine Branch: master Commit: 77ca32cf71903c090c157f3f9707050fcfe49dcb URL: http://source.winehq.org/git/wine.git/?a=commit;h=77ca32cf71903c090c157f3f9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 24 11:19:59 2008 +0100 user32: Fix SPI_SETMOUSESPEED handling, the parameter is not a pointer. --- dlls/user32/sysparams.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 9d72688..bd1b36c 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -2170,11 +2170,10 @@ BOOL WINAPI SystemParametersInfoW( UINT uiAction, UINT uiParam, break; case SPI_SETMOUSESPEED: /* 113 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ - if (!pvParam) return FALSE; ret = set_uint_param( SPI_SETMOUSESPEED_IDX, SPI_SETMOUSESPEED_REGKEY, SPI_SETMOUSESPEED_VALNAME, - &mouse_sensitivity, *(UINT *) pvParam, fWinIni ); + &mouse_sensitivity, PtrToInt(pvParam), fWinIni ); break;

1 0

Byeongsik Jeon : gdi32: Don' t truncate the added pixels with FT_LCD_FILTER_DEFAULT.
by Alexandre Julliard Dec. 24, 2008

Dec. 24, 2008

Module: wine Branch: master Commit: 45a081f14295abf60730f2744cdeea6f0f70c39f URL: http://source.winehq.org/git/wine.git/?a=commit;h=45a081f14295abf60730f2744… Author: Byeongsik Jeon <bsjeon(a)hanmail.net> Date: Wed Dec 24 11:16:04 2008 +0900 gdi32: Don't truncate the added pixels with FT_LCD_FILTER_DEFAULT. --- dlls/gdi32/freetype.c | 61 +++++++++++++++++++++++++++++++++--------------- 1 files changed, 42 insertions(+), 19 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 9eb1d13..d011c97 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -4578,9 +4578,7 @@ DWORD WineEngGetGlyphOutline(GdiFont *incoming_font, UINT glyph, UINT format, wine_dbgstr_point(&lpgm->gmptGlyphOrigin), lpgm->gmCellIncX, lpgm->gmCellIncY); - if ((format == GGO_METRICS || format == GGO_BITMAP || format == WINE_GGO_GRAY16_BITMAP || - format == WINE_GGO_HRGB_BITMAP || format == WINE_GGO_HBGR_BITMAP || - format == WINE_GGO_VRGB_BITMAP || format == WINE_GGO_VBGR_BITMAP ) && + if ((format == GGO_METRICS || format == GGO_BITMAP || format == WINE_GGO_GRAY16_BITMAP) && (!lpmat || is_identity_MAT2(lpmat))) /* don't cache custom transforms */ { FONT_GM(font,original_index)->gm = *lpgm; @@ -4741,22 +4739,24 @@ DWORD WineEngGetGlyphOutline(GdiFont *incoming_font, UINT glyph, UINT format, case WINE_GGO_VBGR_BITMAP: #ifdef HAVE_FREETYPE_FTLCDFIL_H { - width = lpgm->gmBlackBoxX; - height = lpgm->gmBlackBoxY; - pitch = width * 4; - needed = pitch * height; - - if (!buf || !buflen) break; - - memset(buf, 0, buflen); - switch (ft_face->glyph->format) { case FT_GLYPH_FORMAT_BITMAP: { - BYTE *src = ft_face->glyph->bitmap.buffer, *dst = buf; - INT src_pitch = ft_face->glyph->bitmap.pitch; - INT x; + BYTE *src, *dst; + INT src_pitch, x; + + width = lpgm->gmBlackBoxX; + height = lpgm->gmBlackBoxY; + pitch = width * 4; + needed = pitch * height; + + if (!buf || !buflen) break; + + memset(buf, 0, buflen); + dst = buf; + src = ft_face->glyph->bitmap.buffer; + src_pitch = ft_face->glyph->bitmap.pitch; while ( height-- ) { @@ -4774,15 +4774,40 @@ DWORD WineEngGetGlyphOutline(GdiFont *incoming_font, UINT glyph, UINT format, case FT_GLYPH_FORMAT_OUTLINE: { - unsigned int *dst = (unsigned int *) buf; + unsigned int *dst; BYTE *src; INT x, src_pitch, rgb_interval, hmul, vmul; - BOOL rgb = (format == WINE_GGO_HRGB_BITMAP || format == WINE_GGO_VRGB_BITMAP); + BOOL rgb; FT_LcdFilter lcdfilter = FT_LCD_FILTER_DEFAULT; FT_Render_Mode render_mode = (format == WINE_GGO_HRGB_BITMAP || format == WINE_GGO_HBGR_BITMAP)? FT_RENDER_MODE_LCD: FT_RENDER_MODE_LCD_V; + if ( lcdfilter == FT_LCD_FILTER_DEFAULT || lcdfilter == FT_LCD_FILTER_LIGHT ) + { + if ( render_mode == FT_RENDER_MODE_LCD) + { + lpgm->gmBlackBoxX += 2; + lpgm->gmptGlyphOrigin.x -= 1; + } + else + { + lpgm->gmBlackBoxY += 2; + lpgm->gmptGlyphOrigin.y += 1; + } + } + + width = lpgm->gmBlackBoxX; + height = lpgm->gmBlackBoxY; + pitch = width * 4; + needed = pitch * height; + + if (!buf || !buflen) break; + + memset(buf, 0, buflen); + dst = (unsigned int *)buf; + rgb = (format == WINE_GGO_HRGB_BITMAP || format == WINE_GGO_VRGB_BITMAP); + if ( needsTransform ) pFT_Outline_Transform (&ft_face->glyph->outline, &transMat); pFT_Outline_Translate (&ft_face->glyph->outline, -left, -bottom ); @@ -4805,8 +4830,6 @@ DWORD WineEngGetGlyphOutline(GdiFont *incoming_font, UINT glyph, UINT format, vmul = 3; } - if ( lcdfilter == FT_LCD_FILTER_DEFAULT || lcdfilter == FT_LCD_FILTER_LIGHT ) - src += rgb_interval * 3; while ( height-- ) { for ( x = 0; x < width; x++ )

1 0

Dan Kegel : tools: Remove bashisms from wineinstall.
by Alexandre Julliard Dec. 24, 2008

Dec. 24, 2008

Module: wine Branch: master Commit: c069474e18ecbf348a50beeddb032be75f35a78a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c069474e18ecbf348a50beedd… Author: Dan Kegel <dank(a)kegel.com> Date: Tue Dec 23 19:53:27 2008 -0800 tools: Remove bashisms from wineinstall. --- tools/wineinstall | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/tools/wineinstall b/tools/wineinstall index fe48505..17e86a9 100755 --- a/tools/wineinstall +++ b/tools/wineinstall @@ -41,7 +41,7 @@ conf_yesno_answer() { echo "Wine Installer v1.0" echo -if ! [ -f configure ] +if [ ! -f configure ] then if [ -f ../configure ] then { @@ -55,7 +55,7 @@ then fi fi -if [ `whoami` = 'root' ] +if [ -w / ] then echo "You are running wineinstall as root, this is not advisable. Please rerun as a user." echo "Aborting." @@ -70,9 +70,7 @@ then fi # check whether RPM installed, and if it is, remove any old wine rpm. -hash rpm &>/dev/null -RET=$? -if [ $RET -eq 0 ]; then +if [ -x `which rpm 2>/dev/null` ]; then if [ -n "`rpm -qi wine 2>/dev/null|grep "^Name"`" ]; then echo "Warning: Old Wine RPM install detected. Do you want to remove it first?" conf_yesno_answer "(yes/no) " @@ -98,7 +96,7 @@ if [ $RET -eq 0 ]; then fi # check whether wine binary still available -if [ -n "`wine --version 2>/dev/null`" ] +if [ -x `which wine 2>/dev/null` ] && [ -n "`wine --version 2>/dev/null`" ] then echo "Warning !! wine binary (still) found, which may indicate" echo "a (conflicting) previous installation."

1 0

Alexandre Julliard : libport: Avoid including winsock2.h.
by Alexandre Julliard Dec. 24, 2008

Dec. 24, 2008

Module: wine Branch: master Commit: 1399d14e0ac5884ef00fe4aadd6b7964a288dcbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=1399d14e0ac5884ef00fe4aad… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 24 10:05:19 2008 +0100 libport: Avoid including winsock2.h. --- configure | 2 -- configure.ac | 1 - include/config.h.in | 3 --- libs/port/poll.c | 23 ++++++++++++++++++++--- 4 files changed, 20 insertions(+), 9 deletions(-) diff --git a/configure b/configure index ab27b58..ac42b9f 100755 --- a/configure +++ b/configure @@ -7438,7 +7438,6 @@ done - for ac_header in \ AudioUnit/AudioUnit.h \ Carbon/Carbon.h \ @@ -7552,7 +7551,6 @@ for ac_header in \ termios.h \ unistd.h \ utime.h \ - winsock2.h \ valgrind/memcheck.h \ valgrind/valgrind.h diff --git a/configure.ac b/configure.ac index be295a4..a84c822 100644 --- a/configure.ac +++ b/configure.ac @@ -351,7 +351,6 @@ AC_CHECK_HEADERS(\ termios.h \ unistd.h \ utime.h \ - winsock2.h \ valgrind/memcheck.h \ valgrind/valgrind.h ) diff --git a/include/config.h.in b/include/config.h.in index 7f3b888..b72a6bb 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -966,9 +966,6 @@ /* Define to 1 if you have the `waitpid' function. */ #undef HAVE_WAITPID -/* Define to 1 if you have the <winsock2.h> header file. */ -#undef HAVE_WINSOCK2_H - /* Define to 1 if you have the <X11/extensions/shape.h> header file. */ #undef HAVE_X11_EXTENSIONS_SHAPE_H diff --git a/libs/port/poll.c b/libs/port/poll.c index b633a0d..7ee5852 100644 --- a/libs/port/poll.c +++ b/libs/port/poll.c @@ -23,9 +23,6 @@ #ifndef HAVE_POLL -#ifdef HAVE_WINSOCK2_H -#include <winsock2.h> -#endif #ifdef HAVE_SYS_TIME_H #include <sys/time.h> #endif @@ -33,6 +30,26 @@ #include <unistd.h> #endif +/* we can't include winsock2.h here so we have to duplicate the definitions for Windows */ +#if defined(__MINGW32__) || defined(_MSC_VER) + +#define FD_SETSIZE 64 + +typedef struct +{ + unsigned int fd_count; + int fd_array[FD_SETSIZE]; /* an array of SOCKETs */ +} fd_set; + +#define FD_ZERO(set) ((set)->fd_count = 0) +#define FD_ISSET(fd, set) __WSAFDIsSet((fd), (set)) +#define FD_SET(fd, set) do { if ((set)->fd_count < FD_SETSIZE) (set)->fd_array[(set)->fd_count++]=(fd); } while(0) + +int __stdcall select(int,fd_set*,fd_set*,fd_set*,const struct timeval*); +int __stdcall __WSAFDIsSet(int,fd_set*); + +#endif + int poll( struct pollfd *fds, unsigned int count, int timeout ) { fd_set read_set, write_set, except_set;

1 0

Juan Lang : wintrust: Fix encoding OIDs with only two components.
by Alexandre Julliard Dec. 23, 2008

Dec. 23, 2008

Module: wine Branch: master Commit: ae133b808fca2410b95178bff00eb25c15a1d2d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae133b808fca2410b95178bff… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Dec 23 08:48:09 2008 -0800 wintrust: Fix encoding OIDs with only two components. --- dlls/wintrust/asn.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/wintrust/asn.c b/dlls/wintrust/asn.c index 4799a68..d3ac3e9 100644 --- a/dlls/wintrust/asn.c +++ b/dlls/wintrust/asn.c @@ -532,7 +532,7 @@ static BOOL WINAPI CRYPT_AsnEncodeOid(DWORD dwCertEncodingType, const char *ptr; int val1, val2; - if (sscanf(pszObjId, "%d.%d.%n", &val1, &val2, &firstPos) != 2) + if (sscanf(pszObjId, "%d.%d%n", &val1, &val2, &firstPos) != 2) { SetLastError(CRYPT_E_ASN1_ERROR); return FALSE; @@ -540,6 +540,11 @@ static BOOL WINAPI CRYPT_AsnEncodeOid(DWORD dwCertEncodingType, bytesNeeded++; firstByte = val1 * 40 + val2; ptr = pszObjId + firstPos; + if (*ptr == '.') + { + ptr++; + firstPos++; + } while (ret && *ptr) { int pos;

1 0

Austin English : itircl: Add stub functions.
by Alexandre Julliard Dec. 23, 2008

Dec. 23, 2008

Module: wine Branch: master Commit: 84d9b2c07b5d4619410e48bbf06656efd7aaa260 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84d9b2c07b5d4619410e48bbf… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Dec 23 10:11:09 2008 -0600 itircl: Add stub functions. --- dlls/itircl/itircl.spec | 6 +++--- dlls/itircl/itircl_main.c | 27 +++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 3 deletions(-) diff --git a/dlls/itircl/itircl.spec b/dlls/itircl/itircl.spec index c5fc87a..a9b7505 100644 --- a/dlls/itircl/itircl.spec +++ b/dlls/itircl/itircl.spec @@ -1,4 +1,4 @@ -@ stub DllCanUnloadNow +@ stdcall -private DllCanUnloadNow() @ stub DllGetClassObject -@ stub DllRegisterServer -@ stub DllUnregisterServer +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() diff --git a/dlls/itircl/itircl_main.c b/dlls/itircl/itircl_main.c index e8279cc..8cd4fa0 100644 --- a/dlls/itircl/itircl_main.c +++ b/dlls/itircl/itircl_main.c @@ -47,3 +47,30 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) return TRUE; } + +/*********************************************************************** + * DllRegisterServer (ITIRCL.@) + */ +HRESULT WINAPI DllRegisterServer(void) +{ + FIXME("stub\n"); + return S_FALSE; +} + +/*********************************************************************** + * DllRegisterServer (ITIRCL.@) + */ +HRESULT WINAPI DllUnregisterServer(void) +{ + FIXME("stub\n"); + return S_FALSE; +} + +/*********************************************************************** + * DllCanUnloadNow (ITIRCL.@) + */ +HRESULT WINAPI DllCanUnloadNow(void) +{ + FIXME("stub\n"); + return S_FALSE; +}

1 0