December 2010 - Wine-commits

Henri Verbeet : wined3d: Pass an IWineD3DBaseTextureImpl pointer to basetexture_cleanup().
by Alexandre Julliard 17 Dec '10

17 Dec '10

Module: wine Branch: master Commit: 2438968c34f2e01bd720c64002d43f16c02eecc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2438968c34f2e01bd720c6400… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 15 21:06:25 2010 +0100 wined3d: Pass an IWineD3DBaseTextureImpl pointer to basetexture_cleanup(). --- dlls/wined3d/basetexture.c | 8 ++++---- dlls/wined3d/cubetexture.c | 2 +- dlls/wined3d/texture.c | 2 +- dlls/wined3d/volumetexture.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/basetexture.c b/dlls/wined3d/basetexture.c index b48aaf3..6db8a5d 100644 --- a/dlls/wined3d/basetexture.c +++ b/dlls/wined3d/basetexture.c @@ -74,11 +74,11 @@ HRESULT basetexture_init(IWineD3DBaseTextureImpl *texture, UINT layer_count, UIN return WINED3D_OK; } -void basetexture_cleanup(IWineD3DBaseTexture *iface) +void basetexture_cleanup(IWineD3DBaseTextureImpl *texture) { - basetexture_unload((IWineD3DBaseTextureImpl *)iface); - HeapFree(GetProcessHeap(), 0, ((IWineD3DBaseTextureImpl *)iface)->baseTexture.sub_resources); - resource_cleanup((IWineD3DResource *)iface); + basetexture_unload(texture); + HeapFree(GetProcessHeap(), 0, texture->baseTexture.sub_resources); + resource_cleanup((IWineD3DResource *)texture); } IWineD3DResourceImpl *basetexture_get_sub_resource(IWineD3DBaseTextureImpl *texture, UINT sub_resource_idx) diff --git a/dlls/wined3d/cubetexture.c b/dlls/wined3d/cubetexture.c index 66df6ba..eb92729 100644 --- a/dlls/wined3d/cubetexture.c +++ b/dlls/wined3d/cubetexture.c @@ -132,7 +132,7 @@ static void cubetexture_cleanup(IWineD3DCubeTextureImpl *This) IWineD3DSurface_Release((IWineD3DSurface *)surface); } } - basetexture_cleanup((IWineD3DBaseTexture *)This); + basetexture_cleanup((IWineD3DBaseTextureImpl *)This); } /* ******************************************* diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 86dd01a..b8b3867 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -126,7 +126,7 @@ static void texture_cleanup(IWineD3DTextureImpl *This) } TRACE("(%p) : Cleaning up base texture\n", This); - basetexture_cleanup((IWineD3DBaseTexture *)This); + basetexture_cleanup((IWineD3DBaseTextureImpl *)This); } /* ******************************************* diff --git a/dlls/wined3d/volumetexture.c b/dlls/wined3d/volumetexture.c index ae819fe..dde1f4c 100644 --- a/dlls/wined3d/volumetexture.c +++ b/dlls/wined3d/volumetexture.c @@ -95,7 +95,7 @@ static void volumetexture_cleanup(IWineD3DVolumeTextureImpl *This) IWineD3DVolume_Release((IWineD3DVolume *)volume); } } - basetexture_cleanup((IWineD3DBaseTexture *)This); + basetexture_cleanup((IWineD3DBaseTextureImpl *)This); } /* ******************************************* diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6a15f38..c63c24e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1913,7 +1913,7 @@ void basetexture_apply_state_changes(IWineD3DBaseTexture *iface, const DWORD samplerStates[WINED3D_HIGHEST_SAMPLER_STATE + 1], const struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN; HRESULT basetexture_bind(IWineD3DBaseTexture *iface, BOOL srgb, BOOL *set_surface_desc) DECLSPEC_HIDDEN; -void basetexture_cleanup(IWineD3DBaseTexture *iface) DECLSPEC_HIDDEN; +void basetexture_cleanup(IWineD3DBaseTextureImpl *texture) DECLSPEC_HIDDEN; void basetexture_generate_mipmaps(IWineD3DBaseTexture *iface) DECLSPEC_HIDDEN; WINED3DTEXTUREFILTERTYPE basetexture_get_autogen_filter_type(IWineD3DBaseTexture *iface) DECLSPEC_HIDDEN; DWORD basetexture_get_level_count(IWineD3DBaseTexture *iface) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : ntdll: Don't worry about the DOS area on non-x86.
by Alexandre Julliard 17 Dec '10

17 Dec '10

Module: wine Branch: master Commit: e39c6d0474eebea464b37dfdc557b703282129a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e39c6d0474eebea464b37dfdc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 16 10:25:14 2010 +0100 ntdll: Don't worry about the DOS area on non-x86. --- dlls/ntdll/virtual.c | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 6f8b9a3..3ce0884 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -122,6 +122,7 @@ static RTL_CRITICAL_SECTION csVirtual = { &critsect_debug, -1, 0, 0, 0, 0 }; static void *address_space_limit = (void *)0xc0000000; /* top of the total available address space */ static void *user_space_limit = (void *)0x7fff0000; /* top of the user address space */ static void *working_set_limit = (void *)0x7fff0000; /* top of the current working set */ +static void *address_space_start = (void *)0x110000; /* keep DOS area clear */ #elif defined(__x86_64__) # define page_mask 0xfff # define page_shift 12 @@ -129,6 +130,7 @@ static void *working_set_limit = (void *)0x7fff0000; /* top of the current wo static void *address_space_limit = (void *)0x7fffffff0000; static void *user_space_limit = (void *)0x7fffffff0000; static void *working_set_limit = (void *)0x7fffffff0000; +static void *address_space_start = (void *)0x10000; #else static UINT page_shift; static UINT_PTR page_size; @@ -136,8 +138,8 @@ static UINT_PTR page_mask; static void *address_space_limit; static void *user_space_limit; static void *working_set_limit; +static void *address_space_start = (void *)0x10000; #endif /* __i386__ */ -static void * const address_space_start = (void *)0x110000; #define ROUND_ADDR(addr,mask) \ ((void *)((UINT_PTR)(addr) & ~(UINT_PTR)(mask))) @@ -1071,7 +1073,7 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz server_enter_uninterrupted_section( &csVirtual, &sigset ); - if (base >= (char *)0x110000) /* make sure the DOS area remains free */ + if (base >= (char *)address_space_start) /* make sure the DOS area remains free */ status = map_view( &view, base, total_size, mask, FALSE, VPROT_COMMITTED | VPROT_READ | VPROT_EXEC | VPROT_WRITECOPY | VPROT_IMAGE ); @@ -1367,6 +1369,7 @@ void virtual_init(void) { const char *preload; void *heap_base; + size_t size; struct file_view *heap_view; #ifndef page_mask @@ -1397,9 +1400,10 @@ void virtual_init(void) VIRTUAL_HEAP_SIZE, NULL, NULL ); create_view( &heap_view, heap_base, VIRTUAL_HEAP_SIZE, VPROT_COMMITTED | VPROT_READ | VPROT_WRITE ); - /* make the DOS area accessible to hide bugs in broken apps like Excel 2003 */ - if (wine_mmap_is_in_reserved_area( (void *)0x10000, 0x100000 ) == 1) - wine_anon_mmap( (void *)0x10000, 0x100000, PROT_READ | PROT_WRITE, MAP_FIXED ); + /* make the DOS area accessible (except the low 64K) to hide bugs in broken apps like Excel 2003 */ + size = (char *)address_space_start - (char *)0x10000; + if (size && wine_mmap_is_in_reserved_area( (void*)0x10000, size ) == 1) + wine_anon_mmap( (void *)0x10000, size, PROT_READ | PROT_WRITE, MAP_FIXED ); }

1 0

Alexander Morozov : wincrypt.h: Define PFN_CMSG_IMPORT_KEY_TRANS callback function.
by Alexandre Julliard 17 Dec '10

17 Dec '10

Module: wine Branch: master Commit: 60be01f16d142fd88371cb3e45eca50b6d50b81f URL: http://source.winehq.org/git/wine.git/?a=commit;h=60be01f16d142fd88371cb3e4… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Wed Dec 15 16:40:01 2010 +0300 wincrypt.h: Define PFN_CMSG_IMPORT_KEY_TRANS callback function. --- include/wincrypt.h | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/include/wincrypt.h b/include/wincrypt.h index 7d5a87c..8834561 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -2281,6 +2281,7 @@ static const WCHAR CERT_TRUST_PUB_AUTHENTICODE_FLAGS_VALUE_NAME[] = #define TIME_VALID_OID_GET_OBJECT_FUNC "TimeValidDllGetObject" #define CMSG_OID_GEN_CONTENT_ENCRYPT_KEY_FUNC "CryptMsgDllGenContentEncryptKey" #define CMSG_OID_EXPORT_KEY_TRANS_FUNC "CryptMsgDllExportKeyTrans" +#define CMSG_OID_IMPORT_KEY_TRANS_FUNC "CryptMsgDllImportKeyTrans" #define CRYPT_OID_REGPATH "Software\\Microsoft\\Cryptography\\OID" #define CRYPT_OID_REG_ENCODING_TYPE_PREFIX "EncodingType " @@ -3805,6 +3806,14 @@ typedef struct _CMSG_KEY_TRANS_ENCRYPT_INFO { DWORD dwFlags; } CMSG_KEY_TRANS_ENCRYPT_INFO, *PCMSG_KEY_TRANS_ENCRYPT_INFO; +typedef struct _CMSG_CTRL_KEY_TRANS_DECRYPT_PARA { + DWORD cbSize; + HCRYPTPROV hCryptProv; + DWORD dwKeySpec; + PCMSG_KEY_TRANS_RECIPIENT_INFO pKeyTrans; + DWORD dwRecipientIndex; +} CMSG_CTRL_KEY_TRANS_DECRYPT_PARA, *PCMSG_CTRL_KEY_TRANS_DECRYPT_PARA; + typedef BOOL (WINAPI *PFN_CMSG_GEN_CONTENT_ENCRYPT_KEY)( PCMSG_CONTENT_ENCRYPT_INFO pContentEncryptInfo, DWORD dwFlags, void *pvReserved); @@ -3815,6 +3824,11 @@ typedef BOOL (WINAPI *PFN_CMSG_EXPORT_KEY_TRANS)( PCMSG_KEY_TRANS_ENCRYPT_INFO pKeyTransEncryptInfo, DWORD dwFlags, void *pvReserved); +typedef BOOL (WINAPI *PFN_CMSG_IMPORT_KEY_TRANS)( + PCRYPT_ALGORITHM_IDENTIFIER pContentEncryptionAlgorithm, + PCMSG_CTRL_KEY_TRANS_DECRYPT_PARA pKeyTransDecryptPara, DWORD dwFlags, + void *pvReserved, HCRYPTKEY *phContentEncryptKey); + /* CryptMsgGetAndVerifySigner flags */ #define CMSG_TRUSTED_SIGNER_FLAG 0x1 #define CMSG_SIGNER_ONLY_FLAG 0x2

1 0

Alexander Morozov : crypt32: Implement decoding enveloped messages.
by Alexandre Julliard 17 Dec '10

17 Dec '10

Module: wine Branch: master Commit: dd75ab38c640e0be5a513f3051b0bdaccc7cc668 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd75ab38c640e0be5a513f305… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Wed Dec 15 17:35:29 2010 +0300 crypt32: Implement decoding enveloped messages. --- dlls/crypt32/crypt32_private.h | 4 + dlls/crypt32/decode.c | 118 +++++++++++++++++++++++++++ dlls/crypt32/msg.c | 174 +++++++++++++++++++++++++++++++++++++++- dlls/crypt32/tests/msg.c | 7 -- 4 files changed, 292 insertions(+), 11 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dd75ab38c640e0be5a513…

1 0

Alexander Morozov : crypt32: Implement getting content and some parameters from a decoded enveloped message .
by Alexandre Julliard 17 Dec '10

17 Dec '10

Module: wine Branch: master Commit: f44ae748c0015c144f6a08702cda9b5f3b2bed8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f44ae748c0015c144f6a08702… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Wed Dec 15 17:51:37 2010 +0300 crypt32: Implement getting content and some parameters from a decoded enveloped message. --- dlls/crypt32/msg.c | 87 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/crypt32/tests/msg.c | 15 -------- 2 files changed, 87 insertions(+), 15 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index d85d2a0..b083d26 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -2881,6 +2881,89 @@ static BOOL CRYPT_CopySignerCertInfo(void *pvData, DWORD *pcbData, return ret; } +static BOOL CRYPT_CopyRecipientInfo(void *pvData, DWORD *pcbData, + const CERT_ISSUER_SERIAL_NUMBER *in) +{ + DWORD size = sizeof(CERT_INFO); + BOOL ret; + + TRACE("(%p, %d, %p)\n", pvData, pvData ? *pcbData : 0, in); + + size += in->SerialNumber.cbData; + size += in->Issuer.cbData; + if (!pvData) + { + *pcbData = size; + ret = TRUE; + } + else if (*pcbData < size) + { + *pcbData = size; + SetLastError(ERROR_MORE_DATA); + ret = FALSE; + } + else + { + LPBYTE nextData = (BYTE *)pvData + sizeof(CERT_INFO); + CERT_INFO *out = pvData; + + CRYPT_CopyBlob(&out->SerialNumber, &in->SerialNumber, &nextData); + CRYPT_CopyBlob(&out->Issuer, &in->Issuer, &nextData); + ret = TRUE; + } + TRACE("returning %d\n", ret); + return ret; +} + +static BOOL CDecodeEnvelopedMsg_GetParam(CDecodeMsg *msg, DWORD dwParamType, + DWORD dwIndex, void *pvData, DWORD *pcbData) +{ + BOOL ret = FALSE; + + switch (dwParamType) + { + case CMSG_TYPE_PARAM: + ret = CRYPT_CopyParam(pvData, pcbData, &msg->type, sizeof(msg->type)); + break; + case CMSG_CONTENT_PARAM: + if (msg->u.enveloped_data.data) + ret = CRYPT_CopyParam(pvData, pcbData, + msg->u.enveloped_data.content.pbData, + msg->u.enveloped_data.content.cbData); + else + SetLastError(CRYPT_E_INVALID_MSG_TYPE); + break; + case CMSG_RECIPIENT_COUNT_PARAM: + if (msg->u.enveloped_data.data) + ret = CRYPT_CopyParam(pvData, pcbData, + &msg->u.enveloped_data.data->cRecipientInfo, sizeof(DWORD)); + else + SetLastError(CRYPT_E_INVALID_MSG_TYPE); + break; + case CMSG_RECIPIENT_INFO_PARAM: + if (msg->u.enveloped_data.data) + { + if (dwIndex < msg->u.enveloped_data.data->cRecipientInfo) + { + PCMSG_KEY_TRANS_RECIPIENT_INFO recipientInfo = + &msg->u.enveloped_data.data->rgRecipientInfo[dwIndex]; + + ret = CRYPT_CopyRecipientInfo(pvData, pcbData, + &recipientInfo->RecipientId.u.IssuerSerialNumber); + } + else + SetLastError(CRYPT_E_INVALID_INDEX); + } + else + SetLastError(CRYPT_E_INVALID_MSG_TYPE); + break; + default: + FIXME("unimplemented for %d\n", dwParamType); + SetLastError(CRYPT_E_INVALID_MSG_TYPE); + } + return ret; +} + static BOOL CDecodeSignedMsg_GetParam(CDecodeMsg *msg, DWORD dwParamType, DWORD dwIndex, void *pvData, DWORD *pcbData) { @@ -3073,6 +3156,10 @@ static BOOL CDecodeMsg_GetParam(HCRYPTMSG hCryptMsg, DWORD dwParamType, ret = CDecodeHashMsg_GetParam(msg, dwParamType, dwIndex, pvData, pcbData); break; + case CMSG_ENVELOPED: + ret = CDecodeEnvelopedMsg_GetParam(msg, dwParamType, dwIndex, pvData, + pcbData); + break; case CMSG_SIGNED: ret = CDecodeSignedMsg_GetParam(msg, dwParamType, dwIndex, pvData, pcbData); diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index 20ad5c9..77b468c 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -3057,7 +3057,6 @@ static void test_decode_msg_get_param(void) NULL); CryptMsgUpdate(msg, envelopedEmptyBareContent, sizeof(envelopedEmptyBareContent), TRUE); - todo_wine check_param("enveloped empty bare content", msg, CMSG_CONTENT_PARAM, NULL, 0); CryptMsgClose(msg); @@ -3065,7 +3064,6 @@ static void test_decode_msg_get_param(void) msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, 0, 0, NULL, NULL); CryptMsgUpdate(msg, envelopedEmptyContent, sizeof(envelopedEmptyContent), TRUE); - todo_wine check_param("enveloped empty content", msg, CMSG_CONTENT_PARAM, NULL, 0); CryptMsgClose(msg); @@ -3080,7 +3078,6 @@ static void test_decode_msg_get_param(void) msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, 0, 0, NULL, NULL); CryptMsgUpdate(msg, envelopedMessage, sizeof(envelopedMessage), TRUE); - todo_wine check_param("enveloped message before decrypting", msg, CMSG_CONTENT_PARAM, envelopedMessage + sizeof(envelopedMessage) - 4, 4); if (key) @@ -3094,7 +3091,6 @@ static void test_decode_msg_get_param(void) ret = CryptMsgControl(msg, 0, CMSG_CTRL_DECRYPT, &decryptPara); ok(!ret && GetLastError() == CRYPT_E_ALREADY_DECRYPTED, "expected CRYPT_E_ALREADY_DECRYPTED, got %08x\n", GetLastError()); - todo_wine check_param("enveloped message", msg, CMSG_CONTENT_PARAM, msgData, sizeof(msgData)); } @@ -3106,7 +3102,6 @@ static void test_decode_msg_get_param(void) NULL); CryptMsgUpdate(msg, envelopedBareMessage, sizeof(envelopedBareMessage), TRUE); - todo_wine check_param("enveloped bare message before decrypting", msg, CMSG_CONTENT_PARAM, envelopedBareMessage + sizeof(envelopedBareMessage) - 4, 4); @@ -3116,7 +3111,6 @@ static void test_decode_msg_get_param(void) SetLastError(0xdeadbeef); ret = CryptMsgControl(msg, 0, CMSG_CTRL_DECRYPT, &decryptPara); ok(ret, "CryptMsgControl failed: %08x\n", GetLastError()); - todo_wine check_param("enveloped bare message", msg, CMSG_CONTENT_PARAM, msgData, sizeof(msgData)); } @@ -3132,21 +3126,17 @@ static void test_decode_msg_get_param(void) CryptMsgUpdate(msg, envelopedMessageWith3Recps, sizeof(envelopedMessageWith3Recps), TRUE); value = 3; - todo_wine check_param("recipient count", msg, CMSG_RECIPIENT_COUNT_PARAM, (const BYTE *)&value, sizeof(value)); size = 0; SetLastError(0xdeadbeef); ret = CryptMsgGetParam(msg, CMSG_RECIPIENT_INFO_PARAM, 3, NULL, &size); - todo_wine ok(!ret && GetLastError() == CRYPT_E_INVALID_INDEX, "expected CRYPT_E_INVALID_INDEX, got %08x\n", GetLastError()); size = 0; SetLastError(0xdeadbeef); ret = CryptMsgGetParam(msg, CMSG_RECIPIENT_INFO_PARAM, 2, NULL, &size); - todo_wine ok(ret, "CryptMsgGetParam failed: %08x\n", GetLastError()); - todo_wine ok(size >= 142, "unexpected size: %u\n", size); if (ret) buf = CryptMemAlloc(size); @@ -3158,18 +3148,13 @@ static void test_decode_msg_get_param(void) SetLastError(0xdeadbeef); ret = CryptMsgGetParam(msg, CMSG_RECIPIENT_INFO_PARAM, 2, buf, &size); - todo_wine ok(ret, "CryptMsgGetParam failed: %08x\n", GetLastError()); - todo_wine ok(certInfo->SerialNumber.cbData == sizeof(serialNumber), "unexpected serial number size: %u\n", certInfo->SerialNumber.cbData); - todo_wine ok(!memcmp(certInfo->SerialNumber.pbData, serialNumber, sizeof(serialNumber)), "unexpected serial number\n"); - todo_wine ok(certInfo->Issuer.cbData == sizeof(issuer), "unexpected issuer size: %u\n", certInfo->Issuer.cbData); - todo_wine ok(!memcmp(certInfo->Issuer.pbData, issuer, sizeof(issuer)), "unexpected issuer\n"); CryptMemFree(buf);

1 0

Jacek Caban : mshtml: Removed undocumented, internal stubs exported only by old IEs.
by Alexandre Julliard 17 Dec '10

17 Dec '10

Module: wine Branch: master Commit: 11b310b50127f8505d9da652e8df5751fafb2b29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11b310b50127f8505d9da652e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 15 18:37:41 2010 +0100 mshtml: Removed undocumented, internal stubs exported only by old IEs. --- dlls/mshtml/mshtml.spec | 7 ------- 1 files changed, 0 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/mshtml.spec b/dlls/mshtml/mshtml.spec index 81f9f0e..8fd737a 100644 --- a/dlls/mshtml/mshtml.spec +++ b/dlls/mshtml/mshtml.spec @@ -12,13 +12,6 @@ @ stdcall ShowHTMLDialog(ptr ptr ptr wstr ptr) @ stub ShowModalDialog @ stub ShowModelessHTMLDialog -@ stub SvrTri_ClearCache -@ stub SvrTri_GetDLText -@ stub SvrTri_NormalizeUA -@ stub com_ms_osp_ospmrshl_classInit -@ stub com_ms_osp_ospmrshl_copyToExternal -@ stub com_ms_osp_ospmrshl_releaseByValExternal -@ stub com_ms_osp_ospmrshl_toJava #Wine extension for Mozilla plugin support @ stdcall NP_GetEntryPoints(ptr)

1 0

Alexandre Julliard : wineboot: Relaunch the 64-bit version of wineboot on Wow64.
by Alexandre Julliard 17 Dec '10

17 Dec '10

Module: wine Branch: master Commit: 9b3483899225a0232b6ebc22597a1d1d836ab7dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b3483899225a0232b6ebc225… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 15 22:29:25 2010 +0100 wineboot: Relaunch the 64-bit version of wineboot on Wow64. --- programs/wineboot/wineboot.c | 25 +++++++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 deletions(-) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 804528f..28292ad 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -1133,11 +1133,36 @@ int main( int argc, char *argv[] ) int end_session = 0, force = 0, init = 0, kill = 0, restart = 0, shutdown = 0, update = 0; HANDLE event; SECURITY_ATTRIBUTES sa; + BOOL is_wow64; GetWindowsDirectoryW( windowsdir, MAX_PATH ); if( !SetCurrentDirectoryW( windowsdir ) ) WINE_ERR("Cannot set the dir to %s (%d)\n", wine_dbgstr_w(windowsdir), GetLastError() ); + if (IsWow64Process( GetCurrentProcess(), &is_wow64 ) && is_wow64) + { + STARTUPINFOW si; + PROCESS_INFORMATION pi; + WCHAR filename[MAX_PATH]; + void *redir; + DWORD exit_code; + + memset( &si, 0, sizeof(si) ); + si.cb = sizeof(si); + GetModuleFileNameW( 0, filename, MAX_PATH ); + + Wow64DisableWow64FsRedirection( &redir ); + if (CreateProcessW( filename, GetCommandLineW(), NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi )) + { + WINE_TRACE( "restarting %s\n", wine_dbgstr_w(filename) ); + WaitForSingleObject( pi.hProcess, INFINITE ); + GetExitCodeProcess( pi.hProcess, &exit_code ); + ExitProcess( exit_code ); + } + else WINE_ERR( "failed to restart 64-bit %s, err %d\n", wine_dbgstr_w(filename), GetLastError() ); + Wow64RevertWow64FsRedirection( redir ); + } + while ((optc = getopt_long(argc, argv, short_options, long_options, NULL )) != -1) { switch(optc)

1 0

Alexandre Julliard : winecfg: Relaunch the 64-bit version of winecfg on Wow64.
by Alexandre Julliard 17 Dec '10

17 Dec '10

Module: wine Branch: master Commit: fb929be9a423d47683d49d1ba63c14ff57679a60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb929be9a423d47683d49d1ba… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 15 22:29:49 2010 +0100 winecfg: Relaunch the 64-bit version of winecfg on Wow64. --- programs/winecfg/main.c | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/programs/winecfg/main.c b/programs/winecfg/main.c index fdefefb..7376309 100644 --- a/programs/winecfg/main.c +++ b/programs/winecfg/main.c @@ -214,6 +214,32 @@ ProcessCmdLine(LPSTR lpCmdLine) int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrev, LPSTR szCmdLine, int nShow) { + BOOL is_wow64; + + if (IsWow64Process( GetCurrentProcess(), &is_wow64 ) && is_wow64) + { + STARTUPINFOW si; + PROCESS_INFORMATION pi; + WCHAR filename[MAX_PATH]; + void *redir; + DWORD exit_code; + + memset( &si, 0, sizeof(si) ); + si.cb = sizeof(si); + GetModuleFileNameW( 0, filename, MAX_PATH ); + + Wow64DisableWow64FsRedirection( &redir ); + if (CreateProcessW( filename, GetCommandLineW(), NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi )) + { + WINE_TRACE( "restarting %s\n", wine_dbgstr_w(filename) ); + WaitForSingleObject( pi.hProcess, INFINITE ); + GetExitCodeProcess( pi.hProcess, &exit_code ); + ExitProcess( exit_code ); + } + else WINE_ERR( "failed to restart 64-bit %s, err %d\n", wine_dbgstr_w(filename), GetLastError() ); + Wow64RevertWow64FsRedirection( redir ); + } + if (ProcessCmdLine(szCmdLine)) { return 0; }

1 0

Alexandre Julliard : winecfg: Set Wow64 registry keys as well as the 64-bit ones for version information .
by Alexandre Julliard 17 Dec '10

17 Dec '10

Module: wine Branch: master Commit: d15d52ddab95d246cf20f4fbc0f1674d1b777b83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d15d52ddab95d246cf20f4fbc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 15 22:30:18 2010 +0100 winecfg: Set Wow64 registry keys as well as the 64-bit ones for version information. --- programs/winecfg/winecfg.c | 62 ++++++++++++++++++++++++++----------------- 1 files changed, 37 insertions(+), 25 deletions(-) diff --git a/programs/winecfg/winecfg.c b/programs/winecfg/winecfg.c index 1abf8ed..c41d2ba 100644 --- a/programs/winecfg/winecfg.c +++ b/programs/winecfg/winecfg.c @@ -34,6 +34,7 @@ #include <limits.h> #include <windows.h> #include <winreg.h> +#include <wine/unicode.h> #include <wine/debug.h> #include <wine/list.h> @@ -42,6 +43,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(winecfg); #include "winecfg.h" #include "resource.h" +static const int is_win64 = (sizeof(void *) > sizeof(int)); + HKEY config_key = NULL; HMENU hPopupMenus = 0; @@ -159,7 +162,8 @@ end: * * If valueName or value is NULL, an empty section will be created */ -static int set_config_key(HKEY root, const WCHAR *subkey, const WCHAR *name, const void *value, DWORD type) { +static int set_config_key(HKEY root, const WCHAR *subkey, REGSAM access, const WCHAR *name, const void *value, DWORD type) +{ DWORD res = 1; HKEY key = NULL; @@ -170,7 +174,8 @@ static int set_config_key(HKEY root, const WCHAR *subkey, const WCHAR *name, con if (subkey[0]) { - res = RegCreateKeyW(root, subkey, &key); + res = RegCreateKeyExW( root, subkey, 0, NULL, REG_OPTION_NON_VOLATILE, + access, NULL, &key, NULL ); if (res != ERROR_SUCCESS) goto end; } else key = root; @@ -192,25 +197,6 @@ end: return res; } -/* removes the requested value from the registry, however, does not - * remove the section if empty. Returns S_OK (0) on success. - */ -static HRESULT remove_value(HKEY root, const WCHAR *subkey, const WCHAR *name) -{ - HRESULT hr; - HKEY key; - - WINE_TRACE("subkey=%s, name=%s\n", wine_dbgstr_w(subkey), wine_dbgstr_w(name)); - - hr = RegOpenKeyW(root, subkey, &key); - if (hr != S_OK) return hr; - - hr = RegDeleteValueW(key, name); - if (hr != ERROR_SUCCESS) return hr; - - return S_OK; -} - /* ========================================================================= */ /* This code exists for the following reasons: @@ -635,17 +621,43 @@ BOOL reg_key_exists(HKEY root, const char *path, const char *name) static void process_setting(struct setting *s) { + static const WCHAR softwareW[] = {'S','o','f','t','w','a','r','e','\\'}; + HKEY key; + BOOL needs_wow64 = (is_win64 && s->root == HKEY_LOCAL_MACHINE && s->path && + !strncmpiW( s->path, softwareW, sizeof(softwareW)/sizeof(WCHAR) )); + if (s->value) { WINE_TRACE("Setting %s:%s to '%s'\n", wine_dbgstr_w(s->path), wine_dbgstr_w(s->name), wine_dbgstr_w(s->value)); - set_config_key(s->root, s->path, s->name, s->value, s->type); + set_config_key(s->root, s->path, MAXIMUM_ALLOWED, s->name, s->value, s->type); + if (needs_wow64) + { + WINE_TRACE("Setting 32-bit %s:%s to '%s'\n", wine_dbgstr_w(s->path), + wine_dbgstr_w(s->name), wine_dbgstr_w(s->value)); + set_config_key(s->root, s->path, MAXIMUM_ALLOWED | KEY_WOW64_32KEY, s->name, s->value, s->type); + } } else { - /* NULL name means remove that path/section entirely */ - if (s->path && s->name) remove_value(s->root, s->path, s->name); - else if (s->path && !s->name) RegDeleteTreeW(s->root, s->path); + WINE_TRACE("Removing %s:%s\n", wine_dbgstr_w(s->path), wine_dbgstr_w(s->name)); + if (!RegOpenKeyW( s->root, s->path, &key )) + { + /* NULL name means remove that path/section entirely */ + if (s->name) RegDeleteValueW( key, s->name ); + else RegDeleteTreeW( key, NULL ); + RegCloseKey( key ); + } + if (needs_wow64) + { + WINE_TRACE("Removing 32-bit %s:%s\n", wine_dbgstr_w(s->path), wine_dbgstr_w(s->name)); + if (!RegOpenKeyExW( s->root, s->path, 0, MAXIMUM_ALLOWED | KEY_WOW64_32KEY, &key )) + { + if (s->name) RegDeleteValueW( key, s->name ); + else RegDeleteTreeW( key, NULL ); + RegCloseKey( key ); + } + } } }

1 0

Alexandre Julliard : winex11: Potentially update the system tray notification position when any foreign window is moved .
by Alexandre Julliard 15 Dec '10

15 Dec '10

Module: wine Branch: master Commit: 477c085e4d8764b9b29ceb86c56a4249af3345c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=477c085e4d8764b9b29ceb86c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 15 16:25:38 2010 +0100 winex11: Potentially update the system tray notification position when any foreign window is moved. --- dlls/winex11.drv/systray.c | 8 ++++---- dlls/winex11.drv/window.c | 3 +++ dlls/winex11.drv/x11drv.h | 1 + 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/winex11.drv/systray.c b/dlls/winex11.drv/systray.c index 20f6d35..7d5a0e9 100644 --- a/dlls/winex11.drv/systray.c +++ b/dlls/winex11.drv/systray.c @@ -150,7 +150,7 @@ static void create_tooltip(struct tray_icon *icon) } } -static void update_balloon_position(void) +void update_systray_balloon_position(void) { RECT rect; POINT pos; @@ -187,7 +187,7 @@ static void balloon_create_timer( struct tray_icon *icon ) SendMessageW( balloon_window, TTM_SETTITLEW, icon->info_flags, (LPARAM)icon->info_title ); balloon_icon = icon; balloon_pos.x = balloon_pos.y = MAXLONG; - update_balloon_position(); + update_systray_balloon_position(); SendMessageW( balloon_window, TTM_TRACKACTIVATE, TRUE, (LPARAM)&ti ); KillTimer( icon->window, BALLOON_CREATE_TIMER ); SetTimer( icon->window, BALLOON_SHOW_TIMER, icon->info_timeout, NULL ); @@ -292,7 +292,7 @@ static LRESULT WINAPI standalone_tray_wndproc( HWND hwnd, UINT msg, WPARAM wpara switch (msg) { case WM_MOVE: - update_balloon_position(); + update_systray_balloon_position(); break; case WM_CLOSE: ShowWindow( hwnd, SW_HIDE ); @@ -419,7 +419,7 @@ static LRESULT WINAPI tray_icon_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPAR return 0; case WM_WINDOWPOSCHANGED: - update_balloon_position(); + update_systray_balloon_position(); break; case WM_TIMER: diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 2447a5f..3803efd 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2061,6 +2061,9 @@ static LRESULT WINAPI foreign_window_proc( HWND hwnd, UINT msg, WPARAM wparam, L { switch(msg) { + case WM_WINDOWPOSCHANGED: + update_systray_balloon_position(); + break; case WM_PARENTNOTIFY: if (LOWORD(wparam) == WM_DESTROY) { diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index f48b51f..062d077 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -784,6 +784,7 @@ extern void update_user_time( Time time ); extern void update_net_wm_states( Display *display, struct x11drv_win_data *data ); extern void make_window_embedded( Display *display, struct x11drv_win_data *data ); extern void change_systray_owner( Display *display, Window systray_window ); +extern void update_systray_balloon_position(void); extern HWND create_foreign_window( Display *display, Window window ); static inline void mirror_rect( const RECT *window_rect, RECT *rect )

1 0