May 2006 - Wine-commits - list.winehq.org

Alexandre Julliard : include: Prevent internal Wine headers from being used in tests.
by Alexandre Julliard 25 May '06

25 May '06

Module: wine Branch: refs/heads/master Commit: 35e59151e94d93014f9fc88ee4b51af852a4c206 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=35e59151e94d93014f9fc88… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 25 20:07:57 2006 +0200 include: Prevent internal Wine headers from being used in tests. --- include/wine/debug.h | 4 ++++ include/wine/library.h | 4 ++++ include/wine/test.h | 16 +++++++++++++--- include/wine/unicode.h | 10 +++++++--- 4 files changed, 28 insertions(+), 6 deletions(-) diff --git a/include/wine/debug.h b/include/wine/debug.h index 8ad0f83..18de451 100644 --- a/include/wine/debug.h +++ b/include/wine/debug.h @@ -27,6 +27,10 @@ #ifndef GUID_DEFINED #include <guiddef.h> #endif +#ifdef __WINE_WINE_TEST_H +#error This file should not be used in Wine tests +#endif + #ifdef __cplusplus extern "C" { #endif diff --git a/include/wine/library.h b/include/wine/library.h index 76b19d8..c593bd2 100644 --- a/include/wine/library.h +++ b/include/wine/library.h @@ -27,6 +27,10 @@ #include <sys/types.h> #include <windef.h> #include <winbase.h> +#ifdef __WINE_WINE_TEST_H +#error This file should not be used in Wine tests +#endif + /* configuration */ extern const char *wine_get_build_dir(void); diff --git a/include/wine/test.h b/include/wine/test.h index 686040a..f3793f3 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -18,14 +18,24 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#ifndef __WINE_TEST_H -#define __WINE_TEST_H +#ifndef __WINE_WINE_TEST_H +#define __WINE_WINE_TEST_H #include <stdarg.h> #include <stdlib.h> #include <windef.h> #include <winbase.h> +#ifdef __WINE_WINE_LIBRARY_H +#error wine/library.h should not be used in Wine tests +#endif +#ifdef __WINE_WINE_UNICODE_H +#error wine/unicode.h should not be used in Wine tests +#endif +#ifdef __WINE_WINE_DEBUG_H +#error wine/debug.h should not be used in Wine tests +#endif + /* debug level */ extern int winetest_debug; @@ -403,4 +413,4 @@ int main( int argc, char **argv ) #endif /* STANDALONE */ -#endif /* __WINE_TEST_H */ +#endif /* __WINE_WINE_TEST_H */ diff --git a/include/wine/unicode.h b/include/wine/unicode.h index 34ae52b..704d88a 100644 --- a/include/wine/unicode.h +++ b/include/wine/unicode.h @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#ifndef __WINE_UNICODE_H -#define __WINE_UNICODE_H +#ifndef __WINE_WINE_UNICODE_H +#define __WINE_WINE_UNICODE_H #include <stdarg.h> @@ -27,6 +27,10 @@ #include <windef.h> #include <winbase.h> #include <winnls.h> +#ifdef __WINE_WINE_TEST_H +#error This file should not be used in Wine tests +#endif + #ifndef WINE_UNICODE_API #define WINE_UNICODE_API DECLSPEC_IMPORT #endif @@ -284,4 +288,4 @@ extern inline int atoiW( const WCHAR *st return (int)atolW( str ); } -#endif /* __WINE_UNICODE_H */ +#endif /* __WINE_WINE_UNICODE_H */

1 0

Alexandre Julliard : wined3d: Fixed a compiler warning.
by Alexandre Julliard 25 May '06

25 May '06

Module: wine Branch: refs/heads/master Commit: e8d4c2e6741a9a89139a78a2a7d8b5a8a01269a3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e8d4c2e6741a9a89139a78a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 25 11:09:46 2006 +0200 wined3d: Fixed a compiler warning. --- dlls/wined3d/surface.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index ed9a549..301f7df 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -588,7 +588,7 @@ #endif if ((This->lockedRect.left == 0 && This->lockedRect.top == 0 && This->lockedRect.right == This->currentDesc.Width && This->lockedRect.bottom == This->currentDesc.Height)) { - char *row, *top, *bottom; + BYTE *row, *top, *bottom; int i; glReadPixels(0, 0, @@ -606,7 +606,7 @@ #endif return E_OUTOFMEMORY; } top = This->resource.allocatedMemory; - bottom = ( (char *) This->resource.allocatedMemory) + pLockedRect->Pitch * ( This->currentDesc.Height - 1); + bottom = ( (BYTE *) This->resource.allocatedMemory) + pLockedRect->Pitch * ( This->currentDesc.Height - 1); for(i = 0; i < This->currentDesc.Height / 2; i++) { memcpy(row, top, pLockedRect->Pitch); memcpy(top, bottom, pLockedRect->Pitch);

1 0

Francois Gouget : ntdll: Return FILE_DEVICE_CD_ROM_FILE_SYSTEM for supermount filesystems.
by Alexandre Julliard 25 May '06

25 May '06

Module: wine Branch: refs/heads/master Commit: 5d51d4c87b07691bc63897cf547a94ae13395aad URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5d51d4c87b07691bc63897c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu May 25 02:18:45 2006 +0200 ntdll: Return FILE_DEVICE_CD_ROM_FILE_SYSTEM for supermount filesystems. --- dlls/ntdll/file.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index a0333c3..c976794 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -1579,6 +1579,7 @@ #if defined(linux) && defined(HAVE_FSTAT switch (stfs.f_type) { case 0x9660: /* iso9660 */ + case 0x9fa1: /* supermount */ case 0x15013346: /* udf */ info->DeviceType = FILE_DEVICE_CD_ROM_FILE_SYSTEM; info->Characteristics |= FILE_REMOVABLE_MEDIA|FILE_READ_ONLY_DEVICE;

1 0

Andrew Ziem : wininet: Constify data.
by Alexandre Julliard 25 May '06

25 May '06

Module: wine Branch: refs/heads/master Commit: 70533219265482cab28cf57eb06d55f5aa608360 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=70533219265482cab28cf57… Author: Andrew Ziem <ahziem1(a)mailbolt.com> Date: Wed May 24 00:22:38 2006 -0600 wininet: Constify data. --- dlls/wininet/http.c | 2 +- dlls/wininet/urlcache.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 51d5d25..cb3c55c 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2068,7 +2068,7 @@ #endif urlComponents.nPort != INTERNET_DEFAULT_HTTPS_PORT) { int len; - static WCHAR fmt[] = {'%','s',':','%','i',0}; + static const WCHAR fmt[] = {'%','s',':','%','i',0}; len = lstrlenW(hostName); len += 7; /* 5 for strlen("65535") + 1 for ":" + 1 for '\0' */ lpwhs->lpszHostName = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR)); diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index bafd30c..033e3c3 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -1897,7 +1897,7 @@ BOOL WINAPI CreateUrlCacheEntryW( LONG lBufferSize; BOOL bFound = FALSE; int count; - static WCHAR szWWW[] = {'w','w','w',0}; + static const WCHAR szWWW[] = {'w','w','w',0}; TRACE("(%s, 0x%08lx, %s, %p, 0x%08lx)\n", debugstr_w(lpszUrlName), @@ -1990,7 +1990,7 @@ BOOL WINAPI CreateUrlCacheEntryW( for (i = 0; i < 255; i++) { - static WCHAR szFormat[] = {'[','%','u',']','%','s',0}; + static const WCHAR szFormat[] = {'[','%','u',']','%','s',0}; HANDLE hFile; wsprintfW(lpszFileNameNoPath + countnoextension, szFormat, i, szExtension); TRACE("Trying: %s\n", debugstr_w(lpszFileName));

1 0

Andrew Ziem : gdi: Constify data.
by Alexandre Julliard 25 May '06

25 May '06

Module: wine Branch: refs/heads/master Commit: 122b80030f9115da738b7fbfb47dde3d80d22923 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=122b80030f9115da738b7fb… Author: Andrew Ziem <ahziem1(a)mailbolt.com> Date: Wed May 24 07:58:57 2006 -0600 gdi: Constify data. --- dlls/gdi/dib.c | 8 ++++---- dlls/gdi/freetype.c | 2 +- dlls/gdi/tests/palette.c | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/gdi/dib.c b/dlls/gdi/dib.c index 3ba389a..547159a 100644 --- a/dlls/gdi/dib.c +++ b/dlls/gdi/dib.c @@ -421,7 +421,7 @@ UINT WINAPI GetDIBColorTable( HDC hdc, U NB. RGBQUAD and PALETTEENTRY have different orderings of red, green and blue - sigh */ -static RGBQUAD EGAColorsQuads[16] = { +static const RGBQUAD EGAColorsQuads[16] = { /* rgbBlue, rgbGreen, rgbRed, rgbReserved */ { 0x00, 0x00, 0x00, 0x00 }, { 0x00, 0x00, 0x80, 0x00 }, @@ -441,7 +441,7 @@ static RGBQUAD EGAColorsQuads[16] = { { 0xff, 0xff, 0xff, 0x00 } }; -static RGBTRIPLE EGAColorsTriples[16] = { +static const RGBTRIPLE EGAColorsTriples[16] = { /* rgbBlue, rgbGreen, rgbRed */ { 0x00, 0x00, 0x00 }, { 0x00, 0x00, 0x80 }, @@ -461,7 +461,7 @@ static RGBTRIPLE EGAColorsTriples[16] = { 0xff, 0xff, 0xff } }; -static RGBQUAD DefLogPaletteQuads[20] = { /* Copy of Default Logical Palette */ +static const RGBQUAD DefLogPaletteQuads[20] = { /* Copy of Default Logical Palette */ /* rgbBlue, rgbGreen, rgbRed, rgbReserved */ { 0x00, 0x00, 0x00, 0x00 }, { 0x00, 0x00, 0x80, 0x00 }, @@ -485,7 +485,7 @@ static RGBQUAD DefLogPaletteQuads[20] = { 0xff, 0xff, 0xff, 0x00 } }; -static RGBTRIPLE DefLogPaletteTriples[20] = { /* Copy of Default Logical Palette */ +static const RGBTRIPLE DefLogPaletteTriples[20] = { /* Copy of Default Logical Palette */ /* rgbBlue, rgbGreen, rgbRed */ { 0x00, 0x00, 0x00 }, { 0x00, 0x00, 0x80 }, diff --git a/dlls/gdi/freetype.c b/dlls/gdi/freetype.c index 62b55ce..6bbf4f8 100644 --- a/dlls/gdi/freetype.c +++ b/dlls/gdi/freetype.c @@ -319,7 +319,7 @@ static const WCHAR FixedSys_Value[] = {' static const WCHAR System_Value[] = {'F','O','N','T','S','.','F','O','N','\0'}; static const WCHAR OEMFont_Value[] = {'O','E','M','F','O','N','T','.','F','O','N','\0'}; -static const WCHAR *SystemFontValues[4] = { +static const WCHAR const *SystemFontValues[4] = { System_Value, OEMFont_Value, FixedSys_Value, diff --git a/dlls/gdi/tests/palette.c b/dlls/gdi/tests/palette.c index eb3f809..9947639 100644 --- a/dlls/gdi/tests/palette.c +++ b/dlls/gdi/tests/palette.c @@ -29,7 +29,7 @@ #include "mmsystem.h" #include "wine/test.h" -static PALETTEENTRY logpalettedata[8] = { +static const PALETTEENTRY logpalettedata[8] = { { 0x10, 0x20, 0x30, PC_NOCOLLAPSE }, { 0x20, 0x30, 0x40, PC_NOCOLLAPSE }, { 0x30, 0x40, 0x50, PC_NOCOLLAPSE },

1 0

qingdoa daoo : gdi: Get correct horizontal spacing value in the presence of ETO_PDY flag.
by Alexandre Julliard 25 May '06

25 May '06

Module: wine Branch: refs/heads/master Commit: f77a28ee91bd73204977e0358068019f7448e7ed URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f77a28ee91bd73204977e03… Author: qingdoa daoo <qingdao33122(a)yahoo.com> Date: Thu May 25 09:10:08 2006 +0800 gdi: Get correct horizontal spacing value in the presence of ETO_PDY flag. --- dlls/gdi/font.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/gdi/font.c b/dlls/gdi/font.c index 40e308e..ed482af 100644 --- a/dlls/gdi/font.c +++ b/dlls/gdi/font.c @@ -1847,7 +1847,9 @@ BOOL WINAPI ExtTextOutW( HDC hdc, INT x, deltas = HeapAlloc(GetProcessHeap(), 0, count * sizeof(INT)); for(i = 0; i < count; i++) { - if(lpDx) + if(lpDx && (flags & ETO_PDY)) + deltas[i] = lpDx[i*2] + char_extra; + else if(lpDx) deltas[i] = lpDx[i] + char_extra; else {

1 0

Jason Green : wined3d: Add some more GLSL defines.
by Alexandre Julliard 25 May '06

25 May '06

Module: wine Branch: refs/heads/master Commit: 35ba7fb5247aa895a9c77abeffb05485c4b5ab2f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=35ba7fb5247aa895a9c77ab… Author: Jason Green <jave27(a)gmail.com> Date: Wed May 24 15:50:20 2006 -0400 wined3d: Add some more GLSL defines. --- include/wine/wined3d_gl.h | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/include/wine/wined3d_gl.h b/include/wine/wined3d_gl.h index c054f1a..528d895 100644 --- a/include/wine/wined3d_gl.h +++ b/include/wine/wined3d_gl.h @@ -606,6 +606,19 @@ #ifndef GL_ARB_shader_objects #define GL_ARB_shader_objects 1 typedef char GLcharARB; typedef unsigned int GLhandleARB; +#define GL_OBJECT_DELETE_STATUS_ARB 0x8B80 +#define GL_OBJECT_COMPILE_STATUS_ARB 0x8B81 +#define GL_OBJECT_LINK_STATUS_ARB 0x8B82 +#define GL_OBJECT_VALIDATE_STATUS_ARB 0x8B83 +#define GL_OBJECT_INFO_LOG_LENGTH_ARB 0x8B84 +#define GL_OBJECT_ATTACHED_OBJECTS_ARB 0x8B85 +#define GL_OBJECT_ACTIVE_UNIFORMS_ARB 0x8B86 +#define GL_OBJECT_ACTIVE_UNIFORM_MAX_LENGTH_ARB 0x8B87 +#define GL_OBJECT_SHADER_SOURCE_LENGTH_ARB 0x8B88 +#endif +#ifndef GL_ARB_shading_language_100 +#define GL_ARB_shading_language_100 1 +#define GL_SHADING_LANGUAGE_VERSION_ARB 0x8B8C #endif #ifndef GL_ARB_fragment_shader #define GL_ARB_fragment_shader 1 @@ -677,6 +690,8 @@ typedef void (APIENTRY * WINED3D_PFNGLVA typedef void (APIENTRY * WINED3D_PFNGLGETATTACHEDOBJECTSARBPROC) (GLhandleARB containerObj, GLsizei maxCount, GLsizei *count, GLhandleARB *obj); typedef GLhandleARB (APIENTRY * WINED3D_PFNGLGETHANDLEARBPROC) (GLenum pname); typedef void (APIENTRY * WINED3D_PFNGLGETSHADERSOURCEARBPROC) (GLhandleARB obj, GLsizei maxLength, GLsizei *length, GLcharARB *source); +typedef void (APIENTRY * WINED3D_PFNGLBINDATTRIBLOCATIONARBPROC) (GLhandleARB programObj, GLuint index, const GLcharARB *name); +typedef GLint (APIENTRY * WINED3D_PFNGLGETATTRIBLOCATIONARBPROC) (GLhandleARB programObj, const GLcharARB *name); /* GL_EXT_texture_compression_s3tc */ #ifndef GL_EXT_texture_compression_s3tc #define GL_EXT_texture_compression_s3tc 1 @@ -1433,6 +1448,8 @@ #define GL_EXT_FUNCS_GEN \ USE_GL_FUNC(WINED3D_PFNGLGETATTACHEDOBJECTSARBPROC, glGetAttachedObjectsARB); \ USE_GL_FUNC(WINED3D_PFNGLGETHANDLEARBPROC, glGetHandleARB); \ USE_GL_FUNC(WINED3D_PFNGLGETSHADERSOURCEARBPROC, glGetShaderSourceARB); \ + USE_GL_FUNC(WINED3D_PFNGLBINDATTRIBLOCATIONARBPROC, glBindAttribLocationARB); \ + USE_GL_FUNC(WINED3D_PFNGLGETATTRIBLOCATIONARBPROC, glGetAttribLocationARB); \ /* GL_EXT_stencil_two_side */ \ USE_GL_FUNC(PGLFNACTIVESTENCILFACEEXTPROC, glActiveStencilFaceEXT); \ /* GL_ATI_separate_stencil */ \

1 0

Mike McCormack : rpcrt4: Stub implementations for NDRS marshalling functions.
by Alexandre Julliard 25 May '06

25 May '06

Module: wine Branch: refs/heads/master Commit: 42bf8254c09dc48aa86d0c0ee57164c651d19adf URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=42bf8254c09dc48aa86d0c0… Author: Mike McCormack <mike(a)codeweavers.com> Date: Thu May 25 13:46:45 2006 +0900 rpcrt4: Stub implementations for NDRS marshalling functions. --- dlls/rpcrt4/ndr_marshall.c | 52 ++++++++++++++++++++++++++++++++++++++++++++ dlls/rpcrt4/rpcrt4.spec | 12 +++++----- 2 files changed, 58 insertions(+), 6 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index e7e1ff9..06ce04a 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -4369,3 +4369,55 @@ void WINAPI NDRCContextUnmarshall(NDR_CC { FIXME("(%p %p %p %08lx): stub\n", CContext, hBinding, pBuff, DataRepresentation); } + +void WINAPI NDRSContextMarshall(NDR_SCONTEXT CContext, + void *pBuff, + NDR_RUNDOWN userRunDownIn) +{ + FIXME("(%p %p %p): stub\n", CContext, pBuff, userRunDownIn); +} + +void WINAPI NDRSContextMarshallEx(RPC_BINDING_HANDLE hBinding, + NDR_SCONTEXT CContext, + void *pBuff, + NDR_RUNDOWN userRunDownIn) +{ + FIXME("(%p %p %p %p): stub\n", hBinding, CContext, pBuff, userRunDownIn); +} + +void WINAPI NDRSContextMarshall2(RPC_BINDING_HANDLE hBinding, + NDR_SCONTEXT CContext, + void *pBuff, + NDR_RUNDOWN userRunDownIn, + void *CtxGuard, + unsigned long Flags) +{ + FIXME("(%p %p %p %p %p %lu): stub\n", + hBinding, CContext, pBuff, userRunDownIn, CtxGuard, Flags); +} + +NDR_SCONTEXT WINAPI NDRSContextUnmarshall(void *pBuff, + unsigned long DataRepresentation) +{ + FIXME("(%p %08lx): stub\n", pBuff, DataRepresentation); + return NULL; +} + +NDR_SCONTEXT WINAPI NDRSContextUnmarshallEx(RPC_BINDING_HANDLE hBinding, + void *pBuff, + unsigned long DataRepresentation) +{ + FIXME("(%p %p %08lx): stub\n", hBinding, pBuff, DataRepresentation); + return NULL; +} + +NDR_SCONTEXT WINAPI NDRSContextUnmarshall2(RPC_BINDING_HANDLE hBinding, + void *pBuff, + unsigned long DataRepresentation, + void *CtxGuard, + unsigned long Flags) +{ + FIXME("(%p %p %08lx %p %lu): stub\n", + hBinding, pBuff, DataRepresentation, CtxGuard, Flags); + return NULL; +} diff --git a/dlls/rpcrt4/rpcrt4.spec b/dlls/rpcrt4/rpcrt4.spec index 5099c9e..2a76670 100644 --- a/dlls/rpcrt4/rpcrt4.spec +++ b/dlls/rpcrt4/rpcrt4.spec @@ -140,12 +140,12 @@ # 9x version of I_RpcBindingSetAsync has @ stdcall NDRCContextBinding(ptr) @ stdcall NDRCContextMarshall(ptr ptr) @ stdcall NDRCContextUnmarshall(ptr ptr ptr long) -@ stub NDRSContextMarshall2 -@ stub NDRSContextMarshall -@ stub NDRSContextMarshallEx -@ stub NDRSContextUnmarshall2 -@ stub NDRSContextUnmarshall -@ stub NDRSContextUnmarshallEx +@ stdcall NDRSContextMarshall2(ptr ptr ptr ptr ptr long) +@ stdcall NDRSContextMarshall(ptr ptr ptr) +@ stdcall NDRSContextMarshallEx(ptr ptr ptr ptr) +@ stdcall NDRSContextUnmarshall2(ptr ptr ptr ptr long) +@ stdcall NDRSContextUnmarshall(ptr ptr) +@ stdcall NDRSContextUnmarshallEx(ptr ptr ptr) @ stub NDRcopy @ stdcall NdrAllocate(ptr long) @ stub NdrAsyncClientCall

1 0

Mike McCormack : crypt32: Fix a integer to pointer cast.
by Alexandre Julliard 25 May '06

25 May '06

Module: wine Branch: refs/heads/master Commit: 136804de7e1b1a03585e66ea38df5f2056d3dd33 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=136804de7e1b1a03585e66e… Author: Mike McCormack <mike(a)codeweavers.com> Date: Thu May 25 13:46:14 2006 +0900 crypt32: Fix a integer to pointer cast. --- dlls/crypt32/oid.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/oid.c b/dlls/crypt32/oid.c index 78eab97..7e5b0fa 100644 --- a/dlls/crypt32/oid.c +++ b/dlls/crypt32/oid.c @@ -951,7 +951,7 @@ static void init_oid_info(HINSTANCE hins } else { - int len = LoadStringW(hinst, (UINT)oidInfoConstructors[i].pwszName, + int len = LoadStringW(hinst, (UINT_PTR)oidInfoConstructors[i].pwszName, NULL, 0); if (len)

1 0

Mike McCormack : msi: Fix some pointer to integer casts.
by Alexandre Julliard 25 May '06

25 May '06

Module: wine Branch: refs/heads/master Commit: 2acf800fd49a99f2f7ce8847a55f259bc10a6fea URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2acf800fd49a99f2f7ce884… Author: Mike McCormack <mike(a)codeweavers.com> Date: Thu May 25 11:41:39 2006 +0900 msi: Fix some pointer to integer casts. --- dlls/msi/action.c | 2 +- dlls/msi/database.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index aaa5886..bf4e2b0 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -2671,7 +2671,7 @@ static BOOL CALLBACK Typelib_EnumResName sz = strlenW(tl_struct->source)+4; sz *= sizeof(WCHAR); - if ((INT)lpszName == 1) + if ((INT_PTR)lpszName == 1) tl_struct->path = strdupW(tl_struct->source); else { diff --git a/dlls/msi/database.c b/dlls/msi/database.c index fbe1041..5ac7f48 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -208,7 +208,7 @@ UINT WINAPI MsiOpenDatabaseA(LPCSTR szDB goto end; } else - szwPersist = (LPWSTR)(DWORD)szPersist; + szwPersist = (LPWSTR)(DWORD_PTR)szPersist; r = MsiOpenDatabaseW( szwDBPath, szwPersist, phDB );

1 0