July 2006 - Wine-Commits - list.winehq.org

Mike McCormack : msi: Move version string conversions to registry.c.
by Alexandre Julliard July 14, 2006

July 14, 2006

Module: wine Branch: refs/heads/master Commit: 230af9d21f66bb08b7945f36d0de809997b54982 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=230af9d21f66bb08b7945f3… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Jul 14 15:19:08 2006 +0900 msi: Move version string conversions to registry.c. --- dlls/msi/action.c | 4 ++-- dlls/msi/action.h | 1 - dlls/msi/helpers.c | 41 ----------------------------------------- dlls/msi/msipriv.h | 3 +++ dlls/msi/registry.c | 32 ++++++++++++++++++++++++++++++++ dlls/msi/upgrade.c | 4 ++-- 6 files changed, 39 insertions(+), 46 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index a953da4..51a5872 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -3088,7 +3088,7 @@ static UINT ACTION_PublishProduct(MSIPAC buffer = msi_dup_property( package, szProductVersion ); if (buffer) { - DWORD verdword = build_version_dword(buffer); + DWORD verdword = msi_version_str_to_dword(buffer); msi_reg_set_val_dword( hkey, INSTALLPROPERTY_VERSIONW, verdword ); } msi_free(buffer); @@ -3588,7 +3588,7 @@ static UINT ACTION_RegisterProduct(MSIPA buffer = msi_dup_property( package, szProductVersion ); if (buffer) { - DWORD verdword = build_version_dword(buffer); + DWORD verdword = msi_version_str_to_dword(buffer); msi_reg_set_val_dword( hkey, INSTALLPROPERTY_VERSIONW, verdword ); msi_reg_set_val_dword( hkey, INSTALLPROPERTY_VERSIONMAJORW, verdword>>24 ); diff --git a/dlls/msi/action.h b/dlls/msi/action.h index 9c52db8..31ac28e 100644 --- a/dlls/msi/action.h +++ b/dlls/msi/action.h @@ -266,7 +266,6 @@ extern MSIFOLDER *get_loaded_folder( MSI extern int track_tempfile(MSIPACKAGE *package, LPCWSTR name, LPCWSTR path); extern UINT schedule_action(MSIPACKAGE *package, UINT script, LPCWSTR action); extern LPWSTR build_icon_path(MSIPACKAGE *, LPCWSTR); -extern DWORD build_version_dword(LPCWSTR); extern LPWSTR build_directory_name(DWORD , ...); extern BOOL create_full_pathW(const WCHAR *path); extern BOOL ACTION_VerifyComponentForAction(MSICOMPONENT*, INSTALLSTATE); diff --git a/dlls/msi/helpers.c b/dlls/msi/helpers.c index 8dd499b..c40a851 100644 --- a/dlls/msi/helpers.c +++ b/dlls/msi/helpers.c @@ -43,47 +43,6 @@ const WCHAR cszSourceDir[] = {'S','o','u const WCHAR cszRootDrive[] = {'R','O','O','T','D','R','I','V','E',0}; const WCHAR cszbs[]={'\\',0}; -DWORD build_version_dword(LPCWSTR version_string) -{ - SHORT major,minor; - WORD build; - DWORD rc = 0x00000000; - LPCWSTR ptr1; - - ptr1 = version_string; - - if (!ptr1) - return rc; - else - major = atoiW(ptr1); - - - if(ptr1) - ptr1 = strchrW(ptr1,'.'); - if (ptr1) - { - ptr1++; - minor = atoiW(ptr1); - } - else - minor = 0; - - if (ptr1) - ptr1 = strchrW(ptr1,'.'); - - if (ptr1) - { - ptr1++; - build = atoiW(ptr1); - } - else - build = 0; - - rc = MAKELONG(build,MAKEWORD(minor,major)); - TRACE("%s -> 0x%lx\n",debugstr_w(version_string),rc); - return rc; -} - LPWSTR build_icon_path(MSIPACKAGE *package, LPCWSTR icon_name ) { LPWSTR SystemFolder, dest, FilePath; diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 077603e..3f69910 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -415,6 +415,9 @@ extern UINT MSIREG_OpenUserComponentsKey extern UINT MSIREG_OpenUpgradeCodesKey(LPCWSTR szProduct, HKEY* key, BOOL create); extern UINT MSIREG_OpenUserUpgradeCodesKey(LPCWSTR szProduct, HKEY* key, BOOL create); +extern DWORD msi_version_str_to_dword(LPCWSTR p); +extern LPWSTR msi_version_dword_to_str(DWORD version); + extern LONG msi_reg_set_val_str( HKEY hkey, LPCWSTR name, LPCWSTR value ); extern LONG msi_reg_set_val_multi_str( HKEY hkey, LPCWSTR name, LPCWSTR value ); extern LONG msi_reg_set_val_dword( HKEY hkey, LPCWSTR name, DWORD val ); diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c index 006551f..c7a7e8a 100644 --- a/dlls/msi/registry.c +++ b/dlls/msi/registry.c @@ -305,6 +305,38 @@ BOOL encode_base85_guid( GUID *guid, LPW return TRUE; } +DWORD msi_version_str_to_dword(LPCWSTR p) +{ + DWORD major, minor = 0, build = 0, version = 0; + + if (!p) + return version; + + major = atoiW(p); + + p = strchrW(p, '.'); + if (p) + { + minor = atoiW(p+1); + p = strchrW(p+1, '.'); + if (p) + build = atoiW(p+1); + } + + return MAKELONG(build, MAKEWORD(minor, major)); +} + +LPWSTR msi_version_dword_to_str(DWORD version) +{ + const WCHAR fmt[] = { '%','u','.','%','u','.','%','u',0 }; + LPWSTR str = msi_alloc(20); + sprintfW(str, fmt, + (version&0xff000000)>>24, + (version&0x00ff0000)>>16, + version&0x0000ffff); + return str; +} + LONG msi_reg_set_val_str( HKEY hkey, LPCWSTR name, LPCWSTR value ) { DWORD len = value ? (lstrlenW(value) + 1) * sizeof (WCHAR) : 0; diff --git a/dlls/msi/upgrade.c b/dlls/msi/upgrade.c index f65907f..63b1d99 100644 --- a/dlls/msi/upgrade.c +++ b/dlls/msi/upgrade.c @@ -151,7 +151,7 @@ static UINT ITERATE_FindRelatedProducts( (LPBYTE)&check, &sz); /* check min */ ver = MSI_RecordGetString(rec,2); - comp_ver = build_version_dword(ver); + comp_ver = msi_version_str_to_dword(ver); r = check - comp_ver; if (r < 0 || (r == 0 && !(attributes & msidbUpgradeAttributesVersionMinInclusive))) @@ -163,7 +163,7 @@ static UINT ITERATE_FindRelatedProducts( /* check max */ ver = MSI_RecordGetString(rec,3); - comp_ver = build_version_dword(ver); + comp_ver = msi_version_str_to_dword(ver); r = check - comp_ver; if (r > 0 || (r == 0 && !(attributes & msidbUpgradeAttributesVersionMaxInclusive)))

1 0

Mike McCormack : msi: Move some registry helper functions to registry.c.
by Alexandre Julliard July 14, 2006

July 14, 2006

Module: wine Branch: refs/heads/master Commit: 9917250863068b4b8867dd6ebbba91d4c5d127f5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9917250863068b4b8867dd6… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Jul 14 15:18:35 2006 +0900 msi: Move some registry helper functions to registry.c. --- dlls/msi/classes.c | 32 -------------------------------- dlls/msi/msipriv.h | 1 + dlls/msi/registry.c | 31 +++++++++++++++++++++++++++++++ 3 files changed, 32 insertions(+), 32 deletions(-) diff --git a/dlls/msi/classes.c b/dlls/msi/classes.c index 7476f7f..e2daaf8 100644 --- a/dlls/msi/classes.c +++ b/dlls/msi/classes.c @@ -736,38 +736,6 @@ static void mark_mime_for_install( MSIMI mime->InstallMe = TRUE; } -LONG msi_reg_set_val_str( HKEY hkey, LPCWSTR name, LPCWSTR value ) -{ - DWORD len = value ? (lstrlenW(value) + 1) * sizeof (WCHAR) : 0; - return RegSetValueExW( hkey, name, 0, REG_SZ, (LPBYTE)value, len ); -} - -LONG msi_reg_set_val_multi_str( HKEY hkey, LPCWSTR name, LPCWSTR value ) -{ - LPCWSTR p = value; - while (*p) p += lstrlenW(p) + 1; - return RegSetValueExW( hkey, name, 0, REG_MULTI_SZ, - (LPBYTE)value, (p + 1 - value) * sizeof(WCHAR) ); -} - -LONG msi_reg_set_val_dword( HKEY hkey, LPCWSTR name, DWORD val ) -{ - return RegSetValueExW( hkey, name, 0, REG_DWORD, (LPBYTE)&val, sizeof (DWORD) ); -} - -LONG msi_reg_set_subkey_val( HKEY hkey, LPCWSTR path, LPCWSTR name, LPCWSTR val ) -{ - HKEY hsubkey = 0; - LONG r; - - r = RegCreateKeyW( hkey, path, &hsubkey ); - if (r != ERROR_SUCCESS) - return r; - r = msi_reg_set_val_str( hsubkey, name, val ); - RegCloseKey( hsubkey ); - return r; -} - static UINT register_appid(MSIAPPID *appid, LPCWSTR app ) { static const WCHAR szAppID[] = { 'A','p','p','I','D',0 }; diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index bdc24c6..077603e 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -418,6 +418,7 @@ extern UINT MSIREG_OpenUserUpgradeCodesK extern LONG msi_reg_set_val_str( HKEY hkey, LPCWSTR name, LPCWSTR value ); extern LONG msi_reg_set_val_multi_str( HKEY hkey, LPCWSTR name, LPCWSTR value ); extern LONG msi_reg_set_val_dword( HKEY hkey, LPCWSTR name, DWORD val ); +extern LONG msi_reg_set_subkey_val( HKEY hkey, LPCWSTR path, LPCWSTR name, LPCWSTR val ); /* msi dialog interface */ typedef UINT (*msi_dialog_event_handler)( MSIPACKAGE*, LPCWSTR, LPCWSTR, msi_dialog* ); diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c index ff73173..006551f 100644 --- a/dlls/msi/registry.c +++ b/dlls/msi/registry.c @@ -305,6 +305,37 @@ BOOL encode_base85_guid( GUID *guid, LPW return TRUE; } +LONG msi_reg_set_val_str( HKEY hkey, LPCWSTR name, LPCWSTR value ) +{ + DWORD len = value ? (lstrlenW(value) + 1) * sizeof (WCHAR) : 0; + return RegSetValueExW( hkey, name, 0, REG_SZ, (LPBYTE)value, len ); +} + +LONG msi_reg_set_val_multi_str( HKEY hkey, LPCWSTR name, LPCWSTR value ) +{ + LPCWSTR p = value; + while (*p) p += lstrlenW(p) + 1; + return RegSetValueExW( hkey, name, 0, REG_MULTI_SZ, + (LPBYTE)value, (p + 1 - value) * sizeof(WCHAR) ); +} + +LONG msi_reg_set_val_dword( HKEY hkey, LPCWSTR name, DWORD val ) +{ + return RegSetValueExW( hkey, name, 0, REG_DWORD, (LPBYTE)&val, sizeof (DWORD) ); +} + +LONG msi_reg_set_subkey_val( HKEY hkey, LPCWSTR path, LPCWSTR name, LPCWSTR val ) +{ + HKEY hsubkey = 0; + LONG r; + + r = RegCreateKeyW( hkey, path, &hsubkey ); + if (r != ERROR_SUCCESS) + return r; + r = msi_reg_set_val_str( hsubkey, name, val ); + RegCloseKey( hsubkey ); + return r; +} UINT MSIREG_OpenUninstallKey(LPCWSTR szProduct, HKEY* key, BOOL create) {

1 0

Juan Lang : crypt32: Correct self-signed cert creation.
by Alexandre Julliard July 14, 2006

July 14, 2006

Module: wine Branch: refs/heads/master Commit: 78f59dd7e970ac1bc83192ceca3020e7c50807a3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=78f59dd7e970ac1bc83192c… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Thu Jul 13 23:06:49 2006 -0700 crypt32: Correct self-signed cert creation. - use correct function names for rpcrt functions - use CryptGenRandom to create unique serial numbers --- dlls/crypt32/cert.c | 22 ++++++++++++---------- 1 files changed, 12 insertions(+), 10 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 851c8c5..b5d510d 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -1826,6 +1826,7 @@ static PCCERT_CONTEXT CRYPT_CreateSigned } /* Copies data from the parameters into info, where: + * pSerialNumber: The serial number. Must not be NULL. * pSubjectIssuerBlob: Specifies both the subject and issuer for info. * Must not be NULL * pSignatureAlgorithm: Optional. @@ -1836,23 +1837,22 @@ static PCCERT_CONTEXT CRYPT_CreateSigned * pubKey: The public key of the certificate. Must not be NULL. * pExtensions: Extensions to be included with the certificate. Optional. */ -static void CRYPT_MakeCertInfo(PCERT_INFO info, +static void CRYPT_MakeCertInfo(PCERT_INFO info, PCRYPT_DATA_BLOB pSerialNumber, PCERT_NAME_BLOB pSubjectIssuerBlob, PCRYPT_ALGORITHM_IDENTIFIER pSignatureAlgorithm, PSYSTEMTIME pStartTime, PSYSTEMTIME pEndTime, PCERT_PUBLIC_KEY_INFO pubKey, PCERT_EXTENSIONS pExtensions) { - /* FIXME: what serial number to use? */ - static const BYTE serialNum[] = { 1 }; static CHAR oid[] = szOID_RSA_SHA1RSA; assert(info); + assert(pSerialNumber); assert(pSubjectIssuerBlob); assert(pubKey); info->dwVersion = CERT_V3; - info->SerialNumber.cbData = sizeof(serialNum); - info->SerialNumber.pbData = (LPBYTE)serialNum; + info->SerialNumber.cbData = pSerialNumber->cbData; + info->SerialNumber.pbData = pSerialNumber->pbData; if (pSignatureAlgorithm) memcpy(&info->SignatureAlgorithm, pSignatureAlgorithm, sizeof(info->SignatureAlgorithm)); @@ -1910,9 +1910,9 @@ static HCRYPTPROV CRYPT_CreateKeyProv(vo UuidCreateFunc uuidCreate = (UuidCreateFunc)GetProcAddress(rpcrt, "UuidCreate"); UuidToStringFunc uuidToString = (UuidToStringFunc)GetProcAddress(rpcrt, - "UuidToString"); + "UuidToStringA"); RpcStringFreeFunc rpcStringFree = (RpcStringFreeFunc)GetProcAddress( - rpcrt, "RpcStringFree"); + rpcrt, "RpcStringFreeA"); if (uuidCreate && uuidToString && rpcStringFree) { @@ -1978,10 +1978,12 @@ PCCERT_CONTEXT WINAPI CertCreateSelfSign { CERT_INFO info = { 0 }; CRYPT_DER_BLOB blob = { 0, NULL }; - BOOL ret; + BYTE serial[16]; + CRYPT_DATA_BLOB serialBlob = { sizeof(serial), serial }; - CRYPT_MakeCertInfo(&info, pSubjectIssuerBlob, pSignatureAlgorithm, - pStartTime, pEndTime, pubKey, pExtensions); + CryptGenRandom(hProv, sizeof(serial), serial); + CRYPT_MakeCertInfo(&info, &serialBlob, pSubjectIssuerBlob, + pSignatureAlgorithm, pStartTime, pEndTime, pubKey, pExtensions); ret = CryptEncodeObjectEx(X509_ASN_ENCODING, X509_CERT_TO_BE_SIGNED, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, (BYTE *)&blob.pbData, &blob.cbData);

1 0

Dan Hipschman : widl: Support coclass forward declarations.
by Alexandre Julliard July 14, 2006

July 14, 2006

Module: wine Branch: refs/heads/master Commit: 2660b8f9c190890faf7f22054344e238f0b3edb5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2660b8f9c190890faf7f220… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Thu Jul 13 18:16:29 2006 -0700 widl: Support coclass forward declarations. --- tools/widl/parser.y | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 284f0fd..7257bd8 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -251,7 +251,7 @@ gbl_statements: { $$ = NULL; } imp_statements: {} | imp_statements interfacedec { if (!parse_only) add_interface($2); } | imp_statements interfacedef { if (!parse_only) add_interface($2); } - | imp_statements coclass ';' {} + | imp_statements coclass ';' { reg_type(NULL, $2->name, 0); if (!parse_only && do_header) write_coclass_forward($2); } | imp_statements coclassdef { if (!parse_only) add_coclass($2); } | imp_statements moduledef { if (!parse_only) add_module($2); } | imp_statements statement {}

1 0

Dan Hipschman : widl: Fix unterminated comment in generated code.
by Alexandre Julliard July 14, 2006

July 14, 2006

Module: wine Branch: refs/heads/master Commit: d68ec1d325e17b45194af58e455a567a79f45462 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d68ec1d325e17b45194af58… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Thu Jul 13 18:10:12 2006 -0700 widl: Fix unterminated comment in generated code. --- tools/widl/header.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index 546481a..d6b42ef 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -1016,5 +1016,5 @@ void write_coclass_forward(class_t *cocl fprintf(header, "#ifndef __%s_FWD_DEFINED__\n", cocl->name); fprintf(header, "#define __%s_FWD_DEFINED__\n", cocl->name); fprintf(header, "typedef struct %s %s;\n", cocl->name, cocl->name); - fprintf(header, "#endif /* defined __%s_FWD_DEFINED__\n\n", cocl->name ); + fprintf(header, "#endif /* defined __%s_FWD_DEFINED__ */\n\n", cocl->name ); }

1 0

Ivan Gyurdiev : wined3d: Fix cmp instruction for GLSL.
by Alexandre Julliard July 14, 2006

July 14, 2006

Module: wine Branch: refs/heads/master Commit: 436d700c2e58e4442bb250f72efbb3f247fffd3b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=436d700c2e58e4442bb250f… Author: Ivan Gyurdiev <ivg231(a)gmail.com> Date: Thu Jul 13 20:31:00 2006 -0600 wined3d: Fix cmp instruction for GLSL. The current GLSL cmp instruction is incorrect, because: - it ignores destination write mask - it ignores source swizzle - it ignores other source modifiers. - it works incorrectly for src0 = 0 --- dlls/wined3d/glsl_shader.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 223a8e0..23f944c 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -987,20 +987,19 @@ void shader_glsl_compare(SHADER_OPCODE_A /** Process CMP instruction in GLSL (dst = src0.x > 0.0 ? src1.x : src2.x), per channel */ void shader_glsl_cmp(SHADER_OPCODE_ARG* arg) { + char tmpLine[256]; char dst_str[100], src0_str[100], src1_str[100], src2_str[100]; char dst_reg[50], src0_reg[50], src1_reg[50], src2_reg[50]; char dst_mask[6], src0_mask[6], src1_mask[6], src2_mask[6]; - + shader_glsl_add_param(arg, arg->dst, 0, FALSE, dst_reg, dst_mask, dst_str); shader_glsl_add_param(arg, arg->src[0], arg->src_addr[0], TRUE, src0_reg, src0_mask, src0_str); shader_glsl_add_param(arg, arg->src[1], arg->src_addr[1], TRUE, src1_reg, src1_mask, src1_str); shader_glsl_add_param(arg, arg->src[2], arg->src_addr[2], TRUE, src2_reg, src2_mask, src2_str); - /* FIXME: This isn't correct - doesn't take the dst's swizzle into account. */ - shader_addline(arg->buffer, "%s.x = (%s.x > 0.0) ? %s.x : %s.x;\n", dst_reg, src0_reg, src1_reg, src2_reg); - shader_addline(arg->buffer, "%s.y = (%s.y > 0.0) ? %s.y : %s.y;\n", dst_reg, src0_reg, src1_reg, src2_reg); - shader_addline(arg->buffer, "%s.z = (%s.z > 0.0) ? %s.z : %s.z;\n", dst_reg, src0_reg, src1_reg, src2_reg); - shader_addline(arg->buffer, "%s.w = (%s.w > 0.0) ? %s.w : %s.w;\n", dst_reg, src0_reg, src1_reg, src2_reg); + shader_glsl_add_dst(arg->dst, dst_reg, dst_mask, tmpLine); + shader_addline(arg->buffer, "%smix(vec4(%s), vec4(%s), vec4(lessThan(vec4(%s), vec4(0.0)))))%s;\n", + tmpLine, src1_str, src2_str, src0_str, dst_mask); } /** Process the CND opcode in GLSL (dst = (src0 < 0.5) ? src1 : src2) */

1 0

Ivan Gyurdiev : wined3d: Fix light state bugs.
by Alexandre Julliard July 14, 2006

July 14, 2006

Module: wine Branch: refs/heads/master Commit: 07eb6531a3de7291ce319a06fec131c428376238 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=07eb6531a3de7291ce319a0… Author: Ivan Gyurdiev <ivg231(a)gmail.com> Date: Thu Jul 13 18:17:55 2006 -0600 wined3d: Fix light state bugs. --- dlls/wined3d/device.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 082f92b..630d6d4 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2832,6 +2832,10 @@ static HRESULT WINAPI IWineD3DDeviceImpl IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; TRACE("(%p) : Idx(%ld), enable? %d\n", This, Index, Enable); + /* Tests show true = 128...not clear why */ + + Enable = Enable? 128: 0; + /* If recording state block, just add to end of lights chain with changedEnable set to true */ if (This->isRecordingState) { lightInfo = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(PLIGHTINFOEL)); @@ -2841,6 +2845,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl lightInfo->OriginalIndex = Index; lightInfo->glIndex = -1; lightInfo->enabledChanged = TRUE; + lightInfo->lightEnabled = Enable; /* Add to the END of the chain of lights changes to be replayed */ if (This->updateStateBlock->lights == NULL) { @@ -2887,7 +2892,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl } else { TRACE("Nothing to do as light was not enabled\n"); } - lightInfo->lightEnabled = FALSE; + lightInfo->lightEnabled = Enable; } else { /* We are enabling it. If it is enabled, it's really simple */ @@ -2898,7 +2903,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl /* If it already has a glIndex, it's still simple */ } else if (lightInfo->glIndex != -1) { TRACE("Reusing light as already set up at gl idx %ld\n", lightInfo->glIndex); - lightInfo->lightEnabled = TRUE; + lightInfo->lightEnabled = Enable; ENTER_GL(); glEnable(GL_LIGHT0 + lightInfo->glIndex); checkGLcall("glEnable GL_LIGHT0+Index already setup"); @@ -2969,7 +2974,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl glIndex = bsf->glIndex; bsf->glIndex = -1; lightInfo->glIndex = glIndex; - lightInfo->lightEnabled = TRUE; + lightInfo->lightEnabled = Enable; /* Finally set up the light in gl itself */ TRACE("Replacing light which was set up at gl idx %ld\n", lightInfo->glIndex); @@ -2987,7 +2992,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl know the index of the next one! */ glIndex = Index; lightInfo->glIndex = glIndex; - lightInfo->lightEnabled = TRUE; + lightInfo->lightEnabled = Enable; /* In an ideal world, it's already in the right place */ if (lightInfo->prev == NULL || lightInfo->prev->glIndex!=-1) {

1 0

Robert Shearman : oleaut32: Don't execute a function in ITypeInfo:: Invoke if it has the FUNCFLAG_FRESTRICTED flag.
by Alexandre Julliard July 14, 2006

July 14, 2006

Module: wine Branch: refs/heads/master Commit: 31f640274f2187fbc5ddd3fcd12fdbcf56417a7c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=31f640274f2187fbc5ddd3f… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri Jul 14 00:03:18 2006 +0100 oleaut32: Don't execute a function in ITypeInfo::Invoke if it has the FUNCFLAG_FRESTRICTED flag. Add some more tests for ITypeInfo::Invoke. --- dlls/oleaut32/tests/typelib.c | 35 +++++++++++++++++++++++++++++------ dlls/oleaut32/typelib.c | 4 +++- 2 files changed, 32 insertions(+), 7 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 343b5d1..aa3fd00 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -425,17 +425,20 @@ static void test_TypeInfo(void) ITypeLib *pTypeLib; ITypeInfo *pTypeInfo; HRESULT hr; - static WCHAR szBogus[] = { 'b','o','g','u','s',0 }; - OLECHAR* bogus = szBogus; + static WCHAR wszBogus[] = { 'b','o','g','u','s',0 }; + static WCHAR wszGetTypeInfo[] = { 'G','e','t','T','y','p','e','I','n','f','o',0 }; + static WCHAR wszClone[] = {'C','l','o','n','e',0}; + OLECHAR* bogus = wszBogus; + OLECHAR* pwszGetTypeInfo = wszGetTypeInfo; + OLECHAR* pwszClone = wszClone; DISPID dispidMember; DISPPARAMS dispparams; hr = LoadTypeLib(wszStdOle2, &pTypeLib); ok_ole_success(hr, LoadTypeLib); - hr = ITypeLib_GetTypeInfo(pTypeLib, 1, &pTypeInfo); - ok_ole_success(hr, ITypeLib_GetTypeInfo); - ITypeLib_Release(pTypeLib); + hr = ITypeLib_GetTypeInfoOfGuid(pTypeLib, &IID_IFont, &pTypeInfo); + ok_ole_success(hr, ITypeLib_GetTypeInfoOfGuid); /* test nonexistent method name */ hr = ITypeInfo_GetIDsOfNames(pTypeInfo, &bogus, 1, &dispidMember); @@ -448,10 +451,30 @@ static void test_TypeInfo(void) dispparams.cArgs = 0; dispparams.rgdispidNamedArgs = NULL; dispparams.rgvarg = NULL; - hr = ITypeInfo_Invoke(pTypeInfo, NULL, 0xdeadbeef, DISPATCH_METHOD, &dispparams, NULL, NULL, NULL); + hr = ITypeInfo_Invoke(pTypeInfo, (void *)0xdeadbeef, 0xdeadbeef, DISPATCH_METHOD, &dispparams, NULL, NULL, NULL); + ok(hr == DISP_E_MEMBERNOTFOUND, "ITypeInfo_Invoke should have returned DISP_E_MEMBERNOTFOUND instead of 0x%08lx\n", hr); + + hr = ITypeInfo_GetIDsOfNames(pTypeInfo, &pwszClone, 1, &dispidMember); + ok_ole_success(hr, ITypeInfo_GetIDsOfNames); + + /* test correct memberid, but wrong flags */ + hr = ITypeInfo_Invoke(pTypeInfo, (void *)0xdeadbeef, dispidMember, DISPATCH_PROPERTYGET, &dispparams, NULL, NULL, NULL); + ok(hr == DISP_E_MEMBERNOTFOUND, "ITypeInfo_Invoke should have returned DISP_E_MEMBERNOTFOUND instead of 0x%08lx\n", hr); + + ITypeInfo_Release(pTypeInfo); + + hr = ITypeLib_GetTypeInfoOfGuid(pTypeLib, &IID_IDispatch, &pTypeInfo); + ok_ole_success(hr, ITypeLib_GetTypeInfoOfGuid); + + hr = ITypeInfo_GetIDsOfNames(pTypeInfo, &pwszGetTypeInfo, 1, &dispidMember); + ok_ole_success(hr, ITypeInfo_GetIDsOfNames); + + /* test invoking a method with a [restricted] keyword */ + hr = ITypeInfo_Invoke(pTypeInfo, NULL, dispidMember, DISPATCH_METHOD, &dispparams, NULL, NULL, NULL); ok(hr == DISP_E_MEMBERNOTFOUND, "ITypeInfo_Invoke should have returned DISP_E_MEMBERNOTFOUND instead of 0x%08lx\n", hr); ITypeInfo_Release(pTypeInfo); + ITypeLib_Release(pTypeLib); } START_TEST(typelib) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index d539cd6..a2aaaab 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -5223,7 +5223,9 @@ static HRESULT WINAPI ITypeInfo_fnInvoke /* we do this instead of using GetFuncDesc since it will return a fake * FUNCDESC for dispinterfaces and we want the real function description */ for (pFuncInfo = This->funclist; pFuncInfo; pFuncInfo=pFuncInfo->next) - if (memid == pFuncInfo->funcdesc.memid && (wFlags & pFuncInfo->funcdesc.invkind)) + if ((memid == pFuncInfo->funcdesc.memid) && + (wFlags & pFuncInfo->funcdesc.invkind) && + !(pFuncInfo->funcdesc.wFuncFlags & FUNCFLAG_FRESTRICTED)) break; if (pFuncInfo) {

1 0

Robert Shearman : oleaut32: Implement GetClassID for the OLE picture class.
by Alexandre Julliard July 14, 2006

July 14, 2006

Module: wine Branch: refs/heads/master Commit: ebea92739c4676e368786290c8fb19fe3e72e18b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ebea92739c4676e36878629… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri Jul 14 00:02:36 2006 +0100 oleaut32: Implement GetClassID for the OLE picture class. --- dlls/oleaut32/olepicture.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index 9130027..2349b31 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -921,9 +921,9 @@ static ULONG WINAPI OLEPictureImpl_IPers static HRESULT WINAPI OLEPictureImpl_GetClassID( IPersistStream* iface,CLSID* pClassID) { - OLEPictureImpl *This = impl_from_IPersistStream(iface); - FIXME("(%p),stub!\n",This); - return E_FAIL; + TRACE("(%p)\n", pClassID); + memcpy(pClassID, &CLSID_StdPicture, sizeof(*pClassID)); + return S_OK; } /************************************************************************

1 0

Robert Shearman : rpcrt4: Fix Variance Callback Functions.
by Alexandre Julliard July 14, 2006

July 14, 2006

Module: wine Branch: refs/heads/master Commit: 2cb3b22c26601342a5567a83abe180c8a58759de URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2cb3b22c26601342a5567a8… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri Jul 14 00:02:44 2006 +0100 rpcrt4: Fix Variance Callback Functions. A callback function for computing the variance puts the computed value into the same field as a conformance, so make sure to copy the value into pCount before returning from ComputeConformanceOrVariance. --- dlls/rpcrt4/ndr_marshall.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 1a3f401..b6ff54d 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -464,6 +464,9 @@ PFORMAT_STRING ComputeConformanceOrVaria pStubMsg->StubDesc->apfnExprEval[ofs](pStubMsg); pStubMsg->StackTop = old_stack_top; + + /* the callback function always stores the computed value in MaxCount */ + *pCount = pStubMsg->MaxCount; goto finish_conf; } default:

1 0