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

Juan Lang : crypt32: Pass crypto provider and appropriate flags when opening PKCS messages, and don't store a redundant copy of the crypto provider in message stores.
by Alexandre Julliard Aug. 20, 2007

Aug. 20, 2007

Module: wine Branch: master Commit: 4e1108533b98f0c50519eb7dd2227a9c0c3f214a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e1108533b98f0c50519eb7dd… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Aug 17 11:57:48 2007 -0700 crypt32: Pass crypto provider and appropriate flags when opening PKCS messages, and don't store a redundant copy of the crypto provider in message stores. --- dlls/crypt32/store.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c index 43e724f..28c8433 100644 --- a/dlls/crypt32/store.c +++ b/dlls/crypt32/store.c @@ -96,7 +96,6 @@ typedef struct _WINE_MEMSTORE typedef struct _WINE_MSGSTOREINFO { DWORD dwOpenFlags; - HCRYPTPROV cryptProv; HCERTSTORE memStore; HCRYPTMSG msg; } WINE_MSGSTOREINFO, *PWINE_MSGSTOREINFO; @@ -603,7 +602,6 @@ static PWINECRYPT_CERTSTORE CRYPT_MsgOpenStore(HCRYPTPROV hCryptProv, CERT_STORE_PROV_INFO provInfo = { 0 }; info->dwOpenFlags = dwFlags; - info->cryptProv = hCryptProv; info->memStore = memStore; info->msg = CryptMsgDuplicate(msg); provInfo.cbSize = sizeof(provInfo); @@ -631,16 +629,19 @@ static PWINECRYPT_CERTSTORE CRYPT_PKCSOpenStore(HCRYPTPROV hCryptProv, PWINECRYPT_CERTSTORE store = NULL; const CRYPT_DATA_BLOB *data = (const CRYPT_DATA_BLOB *)pvPara; BOOL ret; + DWORD msgOpenFlags = dwFlags & CERT_STORE_NO_CRYPT_RELEASE_FLAG ? 0 : + CMSG_CRYPT_RELEASE_CONTEXT_FLAG; TRACE("(%ld, %08x, %p)\n", hCryptProv, dwFlags, pvPara); - msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, CMSG_SIGNED, 0, NULL, - NULL); + msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, msgOpenFlags, CMSG_SIGNED, + hCryptProv, NULL, NULL); ret = CryptMsgUpdate(msg, data->pbData, data->cbData, TRUE); if (!ret) { CryptMsgClose(msg); - msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, 0, 0, NULL, NULL); + msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, msgOpenFlags, 0, + hCryptProv, NULL, NULL); ret = CryptMsgUpdate(msg, data->pbData, data->cbData, TRUE); if (ret) {

1 0

Roderick Colenbrander : opengl32: Fix some gl type bugs.
by Alexandre Julliard Aug. 20, 2007

Aug. 20, 2007

Module: wine Branch: master Commit: c9d4aec1ae39c3971ebfdc066cd793cffae9a935 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9d4aec1ae39c3971ebfdc066… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Fri Aug 17 19:22:12 2007 +0200 opengl32: Fix some gl type bugs. --- dlls/opengl32/make_opengl | 34 ++++++++-------------------------- dlls/opengl32/opengl_ext.c | 28 ++++++++++++++-------------- 2 files changed, 22 insertions(+), 40 deletions(-) diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl index 97a12f4..aff30fb 100755 --- a/dlls/opengl32/make_opengl +++ b/dlls/opengl32/make_opengl @@ -6,12 +6,16 @@ use strict; # make_opengl path_to_spec_file opengl_version # # - path_to_spec_file is the path to the directory where the OpenGL -# spec files are located. These files are part of the OpenGL -# sample implementation CVS tree and are located in +# spec files are located. These files are hosted in the OpenGL +# extension registry at opengl.org: +# http://www.opengl.org/registry/api/gl.spec +# http://www.opengl.org/registry/api/gl.tm +# +# The files used to be hosted and maintained by SGI. You can still find +# find them in the sample implementation CVS tree which is located at # CVS_ROOT/projects/ogl-sample/main/doc/registry/specs. -# You can find them on the web at the following URL : +# You can also find them on the web at the following URL : # http://oss.sgi.com/cgi-bin/cvsweb.cgi/projects/ogl-sample/main/doc/registry… -# You will need gl.tm and gl.spec. # # - opengl_version is the OpenGL version emulated by the library # (can be 1.0 to 1.5). @@ -324,28 +328,6 @@ while (my $line = <TYPES>) { } # This is to override the 'void' -> '*' bogus conversion $pseudo_to_opengl{"void"} = "void"; -$pseudo_to_opengl{"Int64EXT"} = "INT64"; -$pseudo_to_opengl{"UInt64EXT"} = "UINT64"; -$pseudo_to_opengl{"BufferAccessARB"} = "GLenum"; -$pseudo_to_opengl{"BufferOffsetARB"} = "GLintptr"; -$pseudo_to_opengl{"BufferOffset"} = "GLintptr"; -$pseudo_to_opengl{"BufferPNameARB"} = "GLenum"; -$pseudo_to_opengl{"BufferPointerNameARB"} = "GLenum"; -$pseudo_to_opengl{"BufferSizeARB"} = "GLsizeiptr"; -$pseudo_to_opengl{"BufferSize"} = "GLsizeiptr"; -$pseudo_to_opengl{"BufferTargetARB"} = "GLenum"; -$pseudo_to_opengl{"BufferUsageARB"} = "GLenum"; -$pseudo_to_opengl{"FramebufferAttachment"} = "GLenum"; -$pseudo_to_opengl{"FramebufferTarget"} = "GLenum"; -$pseudo_to_opengl{"ProgramParameterPName"} = "GLenum"; -$pseudo_to_opengl{"ProgramTarget"} = "GLenum"; -$pseudo_to_opengl{"RenderbufferTarget"} = "GLenum"; -$pseudo_to_opengl{"VertexAttribEnum"} = "GLenum"; -# This is a bug in the spec file... -$pseudo_to_opengl{"FfdTargetSGIX"} = "GLint"; -$pseudo_to_opengl{"FfdMaskSGIX"} = "GLint"; -$pseudo_to_opengl{"IglooFunctionSelectSGIX"} = "GLint"; -$pseudo_to_opengl{"IglooParameterSGIX"} = "GLint"; # # Then, create the list of all OpenGL functions using the 'gl.spec' diff --git a/dlls/opengl32/opengl_ext.c b/dlls/opengl32/opengl_ext.c index 1c5c39b..fc638f7 100644 --- a/dlls/opengl32/opengl_ext.c +++ b/dlls/opengl32/opengl_ext.c @@ -1173,24 +1173,24 @@ static void WINAPI wine_glCurrentPaletteMatrixARB( GLint index ) { LEAVE_GL(); } -static void WINAPI wine_glDeformSGIX( GLint mask ) { - void (*func_glDeformSGIX)( GLint ) = extension_funcs[142]; +static void WINAPI wine_glDeformSGIX( GLbitfield mask ) { + void (*func_glDeformSGIX)( GLbitfield ) = extension_funcs[142]; TRACE("(%d)\n", mask ); ENTER_GL(); func_glDeformSGIX( mask ); LEAVE_GL(); } -static void WINAPI wine_glDeformationMap3dSGIX( GLint target, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, GLdouble w1, GLdouble w2, GLint wstride, GLint worder, GLdouble* points ) { - void (*func_glDeformationMap3dSGIX)( GLint, GLdouble, GLdouble, GLint, GLint, GLdouble, GLdouble, GLint, GLint, GLdouble, GLdouble, GLint, GLint, GLdouble* ) = extension_funcs[143]; +static void WINAPI wine_glDeformationMap3dSGIX( GLenum target, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, GLdouble w1, GLdouble w2, GLint wstride, GLint worder, GLdouble* points ) { + void (*func_glDeformationMap3dSGIX)( GLenum, GLdouble, GLdouble, GLint, GLint, GLdouble, GLdouble, GLint, GLint, GLdouble, GLdouble, GLint, GLint, GLdouble* ) = extension_funcs[143]; TRACE("(%d, %f, %f, %d, %d, %f, %f, %d, %d, %f, %f, %d, %d, %p)\n", target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, w1, w2, wstride, worder, points ); ENTER_GL(); func_glDeformationMap3dSGIX( target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, w1, w2, wstride, worder, points ); LEAVE_GL(); } -static void WINAPI wine_glDeformationMap3fSGIX( GLint target, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, GLfloat w1, GLfloat w2, GLint wstride, GLint worder, GLfloat* points ) { - void (*func_glDeformationMap3fSGIX)( GLint, GLfloat, GLfloat, GLint, GLint, GLfloat, GLfloat, GLint, GLint, GLfloat, GLfloat, GLint, GLint, GLfloat* ) = extension_funcs[144]; +static void WINAPI wine_glDeformationMap3fSGIX( GLenum target, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, GLfloat w1, GLfloat w2, GLint wstride, GLint worder, GLfloat* points ) { + void (*func_glDeformationMap3fSGIX)( GLenum, GLfloat, GLfloat, GLint, GLint, GLfloat, GLfloat, GLint, GLint, GLfloat, GLfloat, GLint, GLint, GLfloat* ) = extension_funcs[144]; TRACE("(%d, %f, %f, %d, %d, %f, %f, %d, %d, %f, %f, %d, %d, %p)\n", target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, w1, w2, wstride, worder, points ); ENTER_GL(); func_glDeformationMap3fSGIX( target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, w1, w2, wstride, worder, points ); @@ -3001,8 +3001,8 @@ static void WINAPI wine_glGetProgramivNV( GLuint id, GLenum pname, GLint* params LEAVE_GL(); } -static void WINAPI wine_glGetQueryObjecti64vEXT( GLuint id, GLenum pname, INT64* params ) { - void (*func_glGetQueryObjecti64vEXT)( GLuint, GLenum, INT64* ) = extension_funcs[368]; +static void WINAPI wine_glGetQueryObjecti64vEXT( GLuint id, GLenum pname, GLint64EXT* params ) { + void (*func_glGetQueryObjecti64vEXT)( GLuint, GLenum, GLint64EXT* ) = extension_funcs[368]; TRACE("(%d, %d, %p)\n", id, pname, params ); ENTER_GL(); func_glGetQueryObjecti64vEXT( id, pname, params ); @@ -3025,8 +3025,8 @@ static void WINAPI wine_glGetQueryObjectivARB( GLuint id, GLenum pname, GLint* p LEAVE_GL(); } -static void WINAPI wine_glGetQueryObjectui64vEXT( GLuint id, GLenum pname, UINT64* params ) { - void (*func_glGetQueryObjectui64vEXT)( GLuint, GLenum, UINT64* ) = extension_funcs[371]; +static void WINAPI wine_glGetQueryObjectui64vEXT( GLuint id, GLenum pname, GLuint64EXT* params ) { + void (*func_glGetQueryObjectui64vEXT)( GLuint, GLenum, GLuint64EXT* ) = extension_funcs[371]; TRACE("(%d, %d, %p)\n", id, pname, params ); ENTER_GL(); func_glGetQueryObjectui64vEXT( id, pname, params ); @@ -3523,8 +3523,8 @@ static void WINAPI wine_glHistogramEXT( GLenum target, GLsizei width, GLenum int LEAVE_GL(); } -static void WINAPI wine_glIglooInterfaceSGIX( GLint pname, GLint* params ) { - void (*func_glIglooInterfaceSGIX)( GLint, GLint* ) = extension_funcs[432]; +static void WINAPI wine_glIglooInterfaceSGIX( GLenum pname, GLvoid* params ) { + void (*func_glIglooInterfaceSGIX)( GLenum, GLvoid* ) = extension_funcs[432]; TRACE("(%d, %p)\n", pname, params ); ENTER_GL(); func_glIglooInterfaceSGIX( pname, params ); @@ -3857,8 +3857,8 @@ static void WINAPI wine_glListParameterivSGIX( GLuint list, GLenum pname, GLint* LEAVE_GL(); } -static void WINAPI wine_glLoadIdentityDeformationMapSGIX( GLint mask ) { - void (*func_glLoadIdentityDeformationMapSGIX)( GLint ) = extension_funcs[469]; +static void WINAPI wine_glLoadIdentityDeformationMapSGIX( GLbitfield mask ) { + void (*func_glLoadIdentityDeformationMapSGIX)( GLbitfield ) = extension_funcs[469]; TRACE("(%d)\n", mask ); ENTER_GL(); func_glLoadIdentityDeformationMapSGIX( mask );

1 0

Paul Vriens : opengl32/tests: Be a bit more verbose when doing wglGetProcAddress.
by Alexandre Julliard Aug. 20, 2007

Aug. 20, 2007

Module: wine Branch: master Commit: d64424216946b8cd9f5e9488db4a456ad805f294 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d64424216946b8cd9f5e9488d… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Fri Aug 17 19:02:46 2007 +0200 opengl32/tests: Be a bit more verbose when doing wglGetProcAddress. --- dlls/opengl32/tests/opengl.c | 19 +++++++++++++------ 1 files changed, 13 insertions(+), 6 deletions(-) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index 2aca1d6..ccf5e3d 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -50,17 +50,24 @@ static const char* wgl_extensions = NULL; static void init_functions(void) { +#define GET_PROC(func) \ + p ## func = (void*)wglGetProcAddress(#func); \ + if(!p ## func) \ + trace("wglGetProcAddress(%s) failed\n", #func); + /* WGL_ARB_extensions_string */ - pwglGetExtensionsStringARB = (void*)wglGetProcAddress("wglGetExtensionsStringARB"); + GET_PROC(wglGetExtensionsStringARB) /* WGL_ARB_pixel_format */ - pwglChoosePixelFormatARB = (void*)wglGetProcAddress("wglChoosePixelFormatARB"); - pwglGetPixelFormatAttribivARB = (void*)wglGetProcAddress("wglGetPixelFormatAttribivARB"); + GET_PROC(wglChoosePixelFormatARB) + GET_PROC(wglGetPixelFormatAttribivARB) /* WGL_ARB_pbuffer */ - pwglCreatePbufferARB = (void*)wglGetProcAddress("wglCreatePbufferARB"); - pwglGetPbufferDCARB = (void*)wglGetProcAddress("wglGetPbufferDCARB"); - pwglReleasePbufferDCARB = (void*)wglGetProcAddress("wglReleasePbufferDCARB"); + GET_PROC(wglCreatePbufferARB) + GET_PROC(wglGetPbufferDCARB) + GET_PROC(wglReleasePbufferDCARB) + +#undef GET_PROC } static void test_pbuffers(HDC hdc)

1 0

Paul Vriens : oleaut32/tests: Skip VarDiv tests if there is no I8 and/ or UI8 support.
by Alexandre Julliard Aug. 20, 2007

Aug. 20, 2007

Module: wine Branch: master Commit: 7287027681615951c525730bb7dab102a0a5eebf URL: http://source.winehq.org/git/wine.git/?a=commit;h=7287027681615951c525730bb… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Fri Aug 17 16:28:57 2007 +0200 oleaut32/tests: Skip VarDiv tests if there is no I8 and/or UI8 support. --- dlls/oleaut32/tests/vartest.c | 78 ++++++++++++++++++++++++++++++---------- 1 files changed, 58 insertions(+), 20 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 9051986..5d855b6 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -6924,11 +6924,19 @@ static void test_VarDiv(void) { SKIPTESTDIV(leftvt); + /* Check if we need/have support for I8 */ + if (leftvt == VT_I8 && !HAVE_OLEAUT32_I8) + continue; + for (rightvt = 0; rightvt <= VT_BSTR_BLOB; rightvt++) { BOOL bFail = FALSE; SKIPTESTDIV(rightvt); + /* Check if we need/have support for I8 */ + if (rightvt == VT_I8 && !HAVE_OLEAUT32_I8) + continue; + /* Native crashes with VT_BYREF */ if (ExtraFlags[i] == VT_BYREF) continue; @@ -7040,7 +7048,10 @@ static void test_VarDiv(void) VARDIV(EMPTY,0,BSTR,num2_str,R8,0.0); VARDIV(EMPTY,0,BOOL,VARIANT_TRUE,R8,0.0); VARDIV(EMPTY,0,UI1,2,R8,0.0); - VARDIV(EMPTY,0,I8,2,R8,0.0); + if (HAVE_OLEAUT32_I8) + { + VARDIV(EMPTY,0,I8,2,R8,0.0); + } VARDIV(NULL,0,EMPTY,0,NULL,0); VARDIV(NULL,0,NULL,0,NULL,0); VARDIV(NULL,0,I2,2,NULL,0); @@ -7051,7 +7062,10 @@ static void test_VarDiv(void) VARDIV(NULL,0,BSTR,num2_str,NULL,0); VARDIV(NULL,0,BOOL,VARIANT_TRUE,NULL,0); VARDIV(NULL,0,UI1,2,NULL,0); - VARDIV(NULL,0,I8,2,NULL,0); + if (HAVE_OLEAUT32_I8) + { + VARDIV(NULL,0,I8,2,NULL,0); + } VARDIV(I2,2,NULL,0,NULL,0); VARDIV(I2,1,I2,2,R8,0.5); VARDIV(I2,1,I4,2,R8,0.5); @@ -7060,7 +7074,10 @@ static void test_VarDiv(void) VARDIV(I2,1,DATE,2,R8,0.5); VARDIV(I2,1,BOOL,VARIANT_TRUE,R8,-1.0); VARDIV(I2,1,UI1,2,R8,0.5); - VARDIV(I2,1,I8,2,R8,0.5); + if (HAVE_OLEAUT32_I8) + { + VARDIV(I2,1,I8,2,R8,0.5); + } VARDIV(I4,1,NULL,0,NULL,0); VARDIV(I4,1,I2,2,R8,0.5); VARDIV(I4,1,I4,2,R8,0.5); @@ -7070,7 +7087,10 @@ static void test_VarDiv(void) VARDIV(I4,1,BSTR,num2_str,R8,0.5); VARDIV(I4,1,BOOL,VARIANT_TRUE,R8,-1.0); VARDIV(I4,1,UI1,2,R8,0.5); - VARDIV(I4,1,I8,2,R8,0.5); + if (HAVE_OLEAUT32_I8) + { + VARDIV(I4,1,I8,2,R8,0.5); + } VARDIV(R4,1.0f,NULL,0,NULL,0); VARDIV(R4,1.0f,I2,2,R4,0.5f); VARDIV(R4,1.0f,I4,2,R8,0.5); @@ -7080,7 +7100,10 @@ static void test_VarDiv(void) VARDIV(R4,1.0f,BSTR,num2_str,R8,0.5); VARDIV(R4,1.0f,BOOL,VARIANT_TRUE,R4,-1); VARDIV(R4,1.0f,UI1,2,R4,0.5f); - VARDIV(R4,1.0f,I8,2,R8,0.5); + if (HAVE_OLEAUT32_I8) + { + VARDIV(R4,1.0f,I8,2,R8,0.5); + } VARDIV(R8,1.0,NULL,0,NULL,0); VARDIV(R8,1.0,I2,2,R8,0.5); VARDIV(R8,1.0,I4,2,R8,0.5); @@ -7090,7 +7113,10 @@ static void test_VarDiv(void) VARDIV(R8,1.0,BSTR,num2_str,R8,0.5); VARDIV(R8,1.0,BOOL,VARIANT_TRUE,R8,-1.0); VARDIV(R8,1.0,UI1,2,R8,0.5); - VARDIV(R8,1.0,I8,2,R8,0.5); + if (HAVE_OLEAUT32_I8) + { + VARDIV(R8,1.0,I8,2,R8,0.5); + } VARDIV(DATE,1,NULL,0,NULL,0); VARDIV(DATE,1,I2,2,R8,0.5); VARDIV(DATE,1,I4,2,R8,0.5); @@ -7100,7 +7126,10 @@ static void test_VarDiv(void) VARDIV(DATE,1,BSTR,num2_str,R8,0.5); VARDIV(DATE,1,BOOL,VARIANT_TRUE,R8,-1.0); VARDIV(DATE,1,UI1,2,R8,0.5); - VARDIV(DATE,1,I8,2,R8,0.5); + if (HAVE_OLEAUT32_I8) + { + VARDIV(DATE,1,I8,2,R8,0.5); + } VARDIV(BSTR,num1_str,NULL,0,NULL,0); VARDIV(BSTR,num1_str,I2,2,R8,0.5); VARDIV(BSTR,num1_str,I4,2,R8,0.5); @@ -7110,7 +7139,10 @@ static void test_VarDiv(void) VARDIV(BSTR,num1_str,BSTR,num2_str,R8,0.5); VARDIV(BSTR,num1_str,BOOL,VARIANT_TRUE,R8,-1); VARDIV(BSTR,num1_str,UI1,2,R8,0.5); - VARDIV(BSTR,num1_str,I8,2,R8,0.5); + if (HAVE_OLEAUT32_I8) + { + VARDIV(BSTR,num1_str,I8,2,R8,0.5); + } VARDIV(BOOL,VARIANT_TRUE,NULL,0,NULL,0); VARDIV(BOOL,VARIANT_TRUE,I2,1,R8,-1.0); VARDIV(BOOL,VARIANT_FALSE,I2,1,R8,0.0); @@ -7125,7 +7157,10 @@ static void test_VarDiv(void) VARDIV(BOOL,VARIANT_TRUE,BOOL,VARIANT_TRUE,R8,1.0); VARDIV(BOOL,VARIANT_FALSE,BOOL,VARIANT_TRUE,R8,0.0); VARDIV(BOOL,VARIANT_TRUE,UI1,1,R8,-1.0); - VARDIV(BOOL,VARIANT_TRUE,I8,1,R8,-1.0); + if (HAVE_OLEAUT32_I8) + { + VARDIV(BOOL,VARIANT_TRUE,I8,1,R8,-1.0); + } VARDIV(UI1,1,NULL,0,NULL,0); VARDIV(UI1,1,I2,2,R8,0.5); VARDIV(UI1,1,I4,2,R8,0.5); @@ -7135,17 +7170,20 @@ static void test_VarDiv(void) VARDIV(UI1,1,BSTR,num2_str,R8,0.5); VARDIV(UI1,1,BOOL,VARIANT_TRUE,R8,-1); VARDIV(UI1,1,UI1,2,R8,0.5); - VARDIV(UI1,1,I8,2,R8,0.5); - VARDIV(I8,1,NULL,0,NULL,0); - VARDIV(I8,1,I2,2,R8,0.5); - VARDIV(I8,1,I4,2,R8,0.5); - VARDIV(I8,1,R4,2.0f,R8,0.5); - VARDIV(I8,1,R8,2.0,R8,0.5); - VARDIV(I8,1,DATE,2,R8,0.5); - VARDIV(I8,1,BSTR,num2_str,R8,0.5); - VARDIV(I8,1,BOOL,VARIANT_TRUE,R8,-1); - VARDIV(I8,1,UI1,2,R8,0.5); - VARDIV(I8,1,I8,2,R8,0.5); + if (HAVE_OLEAUT32_I8) + { + VARDIV(UI1,1,I8,2,R8,0.5); + VARDIV(I8,1,NULL,0,NULL,0); + VARDIV(I8,1,I2,2,R8,0.5); + VARDIV(I8,1,I4,2,R8,0.5); + VARDIV(I8,1,R4,2.0f,R8,0.5); + VARDIV(I8,1,R8,2.0,R8,0.5); + VARDIV(I8,1,DATE,2,R8,0.5); + VARDIV(I8,1,BSTR,num2_str,R8,0.5); + VARDIV(I8,1,BOOL,VARIANT_TRUE,R8,-1); + VARDIV(I8,1,UI1,2,R8,0.5); + VARDIV(I8,1,I8,2,R8,0.5); + } /* Manually test some VT_CY, VT_DECIMAL variants */ V_VT(&cy) = VT_CY;

1 0

Paul Vriens : oleaut32/tests: Skip VarAnd tests if there is no I8 and/ or UI8 support.
by Alexandre Julliard Aug. 20, 2007

Aug. 20, 2007

Module: wine Branch: master Commit: 60819600259752f578d608632612bc18420a31bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=60819600259752f578d608632… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Fri Aug 17 15:53:50 2007 +0200 oleaut32/tests: Skip VarAnd tests if there is no I8 and/or UI8 support. --- dlls/oleaut32/tests/vartest.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 756c477..9051986 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -5470,6 +5470,12 @@ static void test_VarAnd(void) BOOL bFail = FALSE; SKIPTESTAND(rightvt); + /* Check if we need/have support for I8 and/or UI8 */ + if ((leftvt == VT_I8 || leftvt == VT_UI8 || + rightvt == VT_I8 || rightvt == VT_UI8) && + !HAVE_OLEAUT32_I8) + continue; + memset(&left, 0, sizeof(left)); memset(&right, 0, sizeof(right)); V_VT(&left) = leftvt | ExtraFlags[i];

1 0

Paul Vriens : oleaut32/tests: Skip VarCat tests if there is no I8 and/ or UI8 support.
by Alexandre Julliard Aug. 20, 2007

Aug. 20, 2007

Module: wine Branch: master Commit: c36acfce381e68bd6c263fde48e475661987a4cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=c36acfce381e68bd6c263fde4… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Fri Aug 17 15:48:22 2007 +0200 oleaut32/tests: Skip VarCat tests if there is no I8 and/or UI8 support. --- dlls/oleaut32/tests/vartest.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index be96f25..756c477 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -102,6 +102,9 @@ static void init(void) #define HAVE_FUNC(func) ((void*)GetProcAddress(hOleaut32, #func) != NULL) HAVE_OLEAUT32_I8 = HAVE_FUNC(VarI8FromI1); + if (!HAVE_OLEAUT32_I8) + skip("No support for I8 and UI8 data types\n"); + HAVE_OLEAUT32_RECORD = HAVE_FUNC(SafeArraySetRecordInfo); IS_ANCIENT = (!HAVE_FUNC(VarI1FromI2)); @@ -5150,6 +5153,12 @@ static void test_VarCat(void) leftvt == 15 || rightvt == 15 /* Undefined type */) continue; + /* Check if we need/have support for I8 and/or UI8 */ + if ((leftvt == VT_I8 || leftvt == VT_UI8 || + rightvt == VT_I8 || rightvt == VT_UI8) && + !HAVE_OLEAUT32_I8) + continue; + if (leftvt == VT_NULL && rightvt == VT_NULL) resultvt = VT_NULL; else if (leftvt == VT_VARIANT && (rightvt == VT_ERROR ||

1 0

Paul Vriens : oleaut32/tests: Fix a few typos.
by Alexandre Julliard Aug. 20, 2007

Aug. 20, 2007

Module: wine Branch: master Commit: 9226cee6e9271cb6c54327b6d9adbf74181b1c93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9226cee6e9271cb6c54327b6d… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Fri Aug 17 15:25:35 2007 +0200 oleaut32/tests: Fix a few typos. --- dlls/oleaut32/tests/vartest.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 9c5dd52..be96f25 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -6857,7 +6857,7 @@ static void test_VarPow(void) hres = pVarPow(&dec, &right, &result); ok(hres == S_OK && V_VT(&result) == VT_R8, - "VARPOW: expected coerced hres 0x%X type VT_R8, got hres 0x%X type%s!\n", + "VARPOW: expected coerced hres 0x%X type VT_R8, got hres 0x%X type %s!\n", S_OK, hres, vtstr(V_VT(&result))); ok(hres == S_OK && EQ_DOUBLE(V_R8(&result), 4.0), "VARPOW: DECIMAL value %f, expected %f\n", V_R8(&result), 4.0); @@ -7682,7 +7682,7 @@ static void test_VarIdiv(void) hres = VarIdiv(&dec, &right, &result); ok(hres == S_OK && V_VT(&result) == VT_I8, - "VARIDIV: expected coerced hres 0x%X type VT_I8, got hres 0x%X type%s!\n", + "VARIDIV: expected coerced hres 0x%X type VT_I8, got hres 0x%X type %s!\n", S_OK, hres, vtstr(V_VT(&result))); ok(hres == S_OK && V_I8(&result) == 1, "VARIDIV: DECIMAL value 0x%x%08x, expected %d\n", @@ -8200,7 +8200,7 @@ static void test_VarImp(void) hres = pVarImp(&dec, &right, &result); ok(hres == S_OK && V_VT(&result) == VT_I8, - "VARIMP: expected coerced hres 0x%X type VT_I8, got hres 0x%X type%s!\n", + "VARIMP: expected coerced hres 0x%X type VT_I8, got hres 0x%X type %s!\n", S_OK, hres, vtstr(V_VT(&result))); ok(hres == S_OK && V_I8(&result) == -3, "VARIMP: DECIMAL value 0x%x%08x, expected %d\n",

1 0

Paul Vriens : oleaut32/tests: Use GetModuleHandle and add a few skip's.
by Alexandre Julliard Aug. 20, 2007

Aug. 20, 2007

Module: wine Branch: master Commit: 9b396275ad637697815e24582f7420088a7baf83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b396275ad637697815e24582… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Fri Aug 17 14:10:32 2007 +0200 oleaut32/tests: Use GetModuleHandle and add a few skip's. --- dlls/oleaut32/tests/olefont.c | 5 ++++- dlls/oleaut32/tests/olepicture.c | 5 ++++- dlls/oleaut32/tests/safearray.c | 2 +- dlls/oleaut32/tests/varformat.c | 2 +- dlls/oleaut32/tests/vartype.c | 5 +---- 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/oleaut32/tests/olefont.c b/dlls/oleaut32/tests/olefont.c index 69621cf..1e6678b 100644 --- a/dlls/oleaut32/tests/olefont.c +++ b/dlls/oleaut32/tests/olefont.c @@ -798,10 +798,13 @@ static void test_AddRefHfont(void) START_TEST(olefont) { - hOleaut32 = LoadLibraryA("oleaut32.dll"); + hOleaut32 = GetModuleHandleA("oleaut32.dll"); pOleCreateFontIndirect = (void*)GetProcAddress(hOleaut32, "OleCreateFontIndirect"); if (!pOleCreateFontIndirect) + { + skip("OleCreateFontIndirect not available\n"); return; + } test_QueryInterface(); test_type_info(); diff --git a/dlls/oleaut32/tests/olepicture.c b/dlls/oleaut32/tests/olepicture.c index 00027de..99cefd2 100644 --- a/dlls/oleaut32/tests/olepicture.c +++ b/dlls/oleaut32/tests/olepicture.c @@ -426,11 +426,14 @@ static void test_OleCreatePictureIndirect(void) START_TEST(olepicture) { - hOleaut32 = LoadLibraryA("oleaut32.dll"); + hOleaut32 = GetModuleHandleA("oleaut32.dll"); pOleLoadPicture = (void*)GetProcAddress(hOleaut32, "OleLoadPicture"); pOleCreatePictureIndirect = (void*)GetProcAddress(hOleaut32, "OleCreatePictureIndirect"); if (!pOleLoadPicture) + { + skip("OleLoadPicture is not available\n"); return; + } /* Test regular 1x1 pixel images of gif, jpg, bmp type */ test_pic(gifimage, sizeof(gifimage)); diff --git a/dlls/oleaut32/tests/safearray.c b/dlls/oleaut32/tests/safearray.c index 429f08c..1857ab5 100644 --- a/dlls/oleaut32/tests/safearray.c +++ b/dlls/oleaut32/tests/safearray.c @@ -1682,7 +1682,7 @@ static void test_SafeArrayDestroyData (void) START_TEST(safearray) { - hOleaut32 = LoadLibraryA("oleaut32.dll"); + hOleaut32 = GetModuleHandleA("oleaut32.dll"); GETPTR(SafeArrayAllocDescriptorEx); GETPTR(SafeArrayCopyData); diff --git a/dlls/oleaut32/tests/varformat.c b/dlls/oleaut32/tests/varformat.c index afec605..f7c7c28 100644 --- a/dlls/oleaut32/tests/varformat.c +++ b/dlls/oleaut32/tests/varformat.c @@ -394,7 +394,7 @@ static void test_VarFormat(void) START_TEST(varformat) { - hOleaut32 = LoadLibraryA("oleaut32.dll"); + hOleaut32 = GetModuleHandleA("oleaut32.dll"); test_VarFormatNumber(); test_VarFormat(); diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index d6f2693..49106ff 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -5765,10 +5765,7 @@ static void test_ChangeType_keep_dst(void) START_TEST(vartype) { - hOleaut32 = LoadLibraryA("oleaut32.dll"); - ok(hOleaut32 != 0, "Failed to load oleaut32.dll\n"); - if (!hOleaut32) - return; + hOleaut32 = GetModuleHandleA("oleaut32.dll"); trace("LCID's: System=0x%08x, User=0x%08x\n", GetSystemDefaultLCID(), GetUserDefaultLCID());

1 0

Paul Vriens : oleaut32/tests: Add a few skip's to the vartype tests.
by Alexandre Julliard Aug. 20, 2007

Aug. 20, 2007

Module: wine Branch: master Commit: 7c0f0abe153b41e4baaf4dd7ae94b10b2632c5eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c0f0abe153b41e4baaf4dd7a… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Fri Aug 17 14:21:09 2007 +0200 oleaut32/tests: Add a few skip's to the vartype tests. --- dlls/oleaut32/tests/vartype.c | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index 49106ff..4558d82 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -46,7 +46,7 @@ static HMODULE hOleaut32; /* Get a conversion function ptr, return if function not available */ #define CHECKPTR(func) p##func = (void*)GetProcAddress(hOleaut32, #func); \ if (!p##func) { \ - trace("function " # func " not available, not testing it\n"); return; } + skip("function " # func " not available, not testing it\n"); return; } /* Is a given function exported from oleaut32? */ #define HAVE_FUNC(func) ((void*)GetProcAddress(hOleaut32, #func) != NULL) @@ -2347,7 +2347,10 @@ static void test_VarI8Copy(void) LONGLONG in = 1; if (!HAVE_OLEAUT32_I8) + { + skip("I8 and UI8 data types are not available\n"); return; + } VariantInit(&vSrc); VariantInit(&vDst); @@ -2374,7 +2377,10 @@ static void test_VarI8ChangeTypeEx(void) VARIANTARG vSrc, vDst; if (!HAVE_OLEAUT32_I8) + { + skip("I8 and UI8 data types are not available\n"); return; + } in = 1; @@ -2603,7 +2609,10 @@ static void test_VarUI8Copy(void) ULONGLONG in = 1; if (!HAVE_OLEAUT32_I8) + { + skip("I8 and UI8 data types are not available\n"); return; + } VariantInit(&vSrc); VariantInit(&vDst); @@ -2630,7 +2639,10 @@ static void test_VarUI8ChangeTypeEx(void) VARIANTARG vSrc, vDst; if (!HAVE_OLEAUT32_I8) + { + skip("I8 and UI8 data types are not available\n"); return; + } in = 1;

1 0

Paul Vriens : oleaut32/tests: Use GetModuleHandle and check only once for availability of some functions .
by Alexandre Julliard Aug. 17, 2007

Aug. 17, 2007

Module: wine Branch: master Commit: c31ead476827472e7895f0151ffd026ada1d3327 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c31ead476827472e7895f0151… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Fri Aug 17 11:07:43 2007 +0200 oleaut32/tests: Use GetModuleHandle and check only once for availability of some functions. --- dlls/oleaut32/tests/vartest.c | 27 ++++++++++++++++++--------- 1 files changed, 18 insertions(+), 9 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index e0d419c..9c5dd52 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -51,17 +51,12 @@ static INT (WINAPI *pVariantTimeToDosDateTime)(double,USHORT*,USHORT *); #define CHECKPTR(func) p##func = (void*)GetProcAddress(hOleaut32, #func); \ if (!p##func) { trace("function " # func " not available, not testing it\n"); return; } - /* Is a given function exported from oleaut32? */ -#define HAVE_FUNC(func) ((void*)GetProcAddress(hOleaut32, #func) != NULL) - /* Have IRecordInfo data type? */ -#define HAVE_OLEAUT32_RECORD HAVE_FUNC(SafeArraySetRecordInfo) -/* Have CY data type? */ -#define HAVE_OLEAUT32_CY HAVE_FUNC(VarCyAdd) +static int HAVE_OLEAUT32_RECORD = 0; /* Have I8/UI8 data type? */ -#define HAVE_OLEAUT32_I8 HAVE_FUNC(VarI8FromI1) +static int HAVE_OLEAUT32_I8 = 0; /* Is this an ancient version with support for only I2/I4/R4/R8/DATE? */ -#define IS_ANCIENT (!HAVE_FUNC(VarI1FromI2)) +static int IS_ANCIENT = 0; /* When comparing floating point values we cannot expect an exact match * because the rounding errors depend on the exact algorithm. @@ -99,6 +94,20 @@ static INT (WINAPI *pVariantTimeToDosDateTime)(double,USHORT*,USHORT *); #define R8_MAX DBL_MAX #define R8_MIN DBL_MIN +static void init(void) +{ + hOleaut32 = GetModuleHandle("oleaut32.dll"); + + /* Is a given function exported from oleaut32? */ +#define HAVE_FUNC(func) ((void*)GetProcAddress(hOleaut32, #func) != NULL) + + HAVE_OLEAUT32_I8 = HAVE_FUNC(VarI8FromI1); + HAVE_OLEAUT32_RECORD = HAVE_FUNC(SafeArraySetRecordInfo); + IS_ANCIENT = (!HAVE_FUNC(VarI1FromI2)); + +#undef HAVE_FUNC +} + /* Functions to set a DECIMAL */ static void setdec(DECIMAL* dec, BYTE scl, BYTE sgn, ULONG hi32, ULONG64 lo64) { @@ -8203,7 +8212,7 @@ static void test_VarImp(void) START_TEST(vartest) { - hOleaut32 = LoadLibraryA("oleaut32.dll"); + init(); test_VariantInit(); test_VariantClear();

1 0