December 2008 - Wine-commits

Hwang YunSong(황윤성) : winecfg: Updated Korean resource.
by Alexandre Julliard 29 Dec '08

29 Dec '08

Module: wine Branch: master Commit: 7f11abc91b8e55d730a551b18a74ec1dae0ea557 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f11abc91b8e55d730a551b18… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Mon Dec 29 09:59:24 2008 +0900 winecfg: Updated Korean resource. --- programs/winecfg/Ko.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winecfg/Ko.rc b/programs/winecfg/Ko.rc index 2a60d40..ca94b5b 100644 --- a/programs/winecfg/Ko.rc +++ b/programs/winecfg/Ko.rc @@ -73,7 +73,7 @@ BEGIN CONTROL "��콺 Ŀ�� DirectX ��α׷� â�ȿ� ��Ƶα�(&M)",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,20,230,8 CONTROL "â��ڰ� Wineâ�� ٹ̵�� (&D)",IDC_ENABLE_DECORATED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,32,230,8 CONTROL "â��ڰ� Wineâ�� ϵ�� (&W)",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,44,230,8 - CONTROL "�� ũž �䳻��(&D)",IDC_ENABLE_DESKTOP,"Button", + CONTROL "�� ũž �䳻��(&E)",IDC_ENABLE_DESKTOP,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,15,56,230,8 LTEXT "��ũž ũ��(&S):",IDC_DESKTOP_SIZE,15,70,44,8,WS_DISABLED LTEXT "X",IDC_DESKTOP_BY,109,70,8,8,WS_DISABLED

1 0

Henri Verbeet : secur32: Implement schannel DecryptMessage().
by Alexandre Julliard 29 Dec '08

29 Dec '08

Module: wine Branch: master Commit: e4505389ad92e63e481bad039144ca6458ea01ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4505389ad92e63e481bad039… Author: Henri Verbeet <hverbeet(a)gmail.com> Date: Sun Dec 28 22:21:36 2008 +0100 secur32: Implement schannel DecryptMessage(). --- dlls/secur32/schannel.c | 86 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 84 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 9f5a285..ff60f54 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -61,6 +61,7 @@ MAKE_FUNCPTR(gnutls_mac_get); MAKE_FUNCPTR(gnutls_mac_get_key_size); MAKE_FUNCPTR(gnutls_perror); MAKE_FUNCPTR(gnutls_set_default_priority); +MAKE_FUNCPTR(gnutls_record_recv); MAKE_FUNCPTR(gnutls_record_send); MAKE_FUNCPTR(gnutls_transport_set_errno); MAKE_FUNCPTR(gnutls_transport_set_ptr); @@ -1002,6 +1003,86 @@ static SECURITY_STATUS SEC_ENTRY schan_EncryptMessage(PCtxtHandle context_handle return SEC_E_OK; } +static int schan_decrypt_message_get_next_buffer(const struct schan_transport *t, struct schan_buffers *s) +{ + if (s->current_buffer_idx == -1) + return schan_find_sec_buffer_idx(s->desc, 0, SECBUFFER_DATA); + + return -1; +} + +static SECURITY_STATUS SEC_ENTRY schan_DecryptMessage(PCtxtHandle context_handle, + PSecBufferDesc message, ULONG message_seq_no, PULONG quality) +{ + struct schan_transport transport; + struct schan_context *ctx; + SecBuffer *buffer; + SIZE_T data_size; + char *data; + ssize_t received = 0; + ssize_t ret; + int idx; + + TRACE("context_handle %p, message %p, message_seq_no %d, quality %p\n", + context_handle, message, message_seq_no, quality); + + if (!context_handle) return SEC_E_INVALID_HANDLE; + ctx = schan_get_object(context_handle->dwLower, SCHAN_HANDLE_CTX); + + dump_buffer_desc(message); + + idx = schan_find_sec_buffer_idx(message, 0, SECBUFFER_DATA); + if (idx == -1) + { + WARN("No data buffer passed\n"); + return SEC_E_INTERNAL_ERROR; + } + buffer = &message->pBuffers[idx]; + + data_size = buffer->cbBuffer; + data = HeapAlloc(GetProcessHeap(), 0, data_size); + + transport.ctx = ctx; + init_schan_buffers(&transport.in, message, schan_decrypt_message_get_next_buffer); + init_schan_buffers(&transport.out, NULL, NULL); + pgnutls_transport_set_ptr(ctx->session, (gnutls_transport_ptr_t)&transport); + + while (received < data_size) + { + ret = pgnutls_record_recv(ctx->session, data + received, data_size - received); + if (ret < 0) + { + if (ret == GNUTLS_E_AGAIN) + { + if (!received) + { + pgnutls_perror(ret); + HeapFree(GetProcessHeap(), 0, data); + TRACE("Returning SEC_E_INCOMPLETE_MESSAGE\n"); + return SEC_E_INCOMPLETE_MESSAGE; + } + break; + } + else + { + pgnutls_perror(ret); + HeapFree(GetProcessHeap(), 0, data); + ERR("Returning SEC_E_INTERNAL_ERROR\n"); + return SEC_E_INTERNAL_ERROR; + } + } + received += ret; + } + + TRACE("Received %zd bytes\n", received); + + memcpy(buffer->pvBuffer, data, received); + buffer->cbBuffer = received; + HeapFree(GetProcessHeap(), 0, data); + + return SEC_E_OK; +} + static SECURITY_STATUS SEC_ENTRY schan_DeleteSecurityContext(PCtxtHandle context_handle) { struct schan_context *ctx; @@ -1051,7 +1132,7 @@ static const SecurityFunctionTableA schanTableA = { NULL, /* Reserved8 */ NULL, /* QuerySecurityContextToken */ schan_EncryptMessage, - NULL, /* DecryptMessage */ + schan_DecryptMessage, NULL, /* SetContextAttributesA */ }; @@ -1082,7 +1163,7 @@ static const SecurityFunctionTableW schanTableW = { NULL, /* Reserved8 */ NULL, /* QuerySecurityContextToken */ schan_EncryptMessage, - NULL, /* DecryptMessage */ + schan_DecryptMessage, NULL, /* SetContextAttributesW */ }; @@ -1148,6 +1229,7 @@ void SECUR32_initSchannelSP(void) LOAD_FUNCPTR(gnutls_mac_get_key_size) LOAD_FUNCPTR(gnutls_perror) LOAD_FUNCPTR(gnutls_set_default_priority) + LOAD_FUNCPTR(gnutls_record_recv); LOAD_FUNCPTR(gnutls_record_send); LOAD_FUNCPTR(gnutls_transport_set_errno) LOAD_FUNCPTR(gnutls_transport_set_ptr)

1 0

Henri Verbeet : secur32: Implement schannel EncryptMessage().
by Alexandre Julliard 29 Dec '08

29 Dec '08

Module: wine Branch: master Commit: 3954c4ec659a04dbb17591b5e901815ef2eef0c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3954c4ec659a04dbb17591b5e… Author: Henri Verbeet <hverbeet(a)gmail.com> Date: Sun Dec 28 22:21:35 2008 +0100 secur32: Implement schannel EncryptMessage(). --- dlls/secur32/schannel.c | 118 ++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 116 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index ed583d4..9f5a285 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -61,6 +61,7 @@ MAKE_FUNCPTR(gnutls_mac_get); MAKE_FUNCPTR(gnutls_mac_get_key_size); MAKE_FUNCPTR(gnutls_perror); MAKE_FUNCPTR(gnutls_set_default_priority); +MAKE_FUNCPTR(gnutls_record_send); MAKE_FUNCPTR(gnutls_transport_set_errno); MAKE_FUNCPTR(gnutls_transport_set_ptr); MAKE_FUNCPTR(gnutls_transport_set_pull_function); @@ -889,6 +890,118 @@ static SECURITY_STATUS SEC_ENTRY schan_QueryContextAttributesA( } } +static int schan_encrypt_message_get_next_buffer(const struct schan_transport *t, struct schan_buffers *s) +{ + SecBuffer *b; + + if (s->current_buffer_idx == -1) + return schan_find_sec_buffer_idx(s->desc, 0, SECBUFFER_STREAM_HEADER); + + b = &s->desc->pBuffers[s->current_buffer_idx]; + + if (b->BufferType == SECBUFFER_STREAM_HEADER) + return schan_find_sec_buffer_idx(s->desc, 0, SECBUFFER_DATA); + + if (b->BufferType == SECBUFFER_DATA) + return schan_find_sec_buffer_idx(s->desc, 0, SECBUFFER_STREAM_TRAILER); + + return -1; +} + +static int schan_encrypt_message_get_next_buffer_token(const struct schan_transport *t, struct schan_buffers *s) +{ + SecBuffer *b; + + if (s->current_buffer_idx == -1) + return schan_find_sec_buffer_idx(s->desc, 0, SECBUFFER_TOKEN); + + b = &s->desc->pBuffers[s->current_buffer_idx]; + + if (b->BufferType == SECBUFFER_TOKEN) + { + int idx = schan_find_sec_buffer_idx(s->desc, 0, SECBUFFER_TOKEN); + if (idx != s->current_buffer_idx) return -1; + return schan_find_sec_buffer_idx(s->desc, 0, SECBUFFER_DATA); + } + + if (b->BufferType == SECBUFFER_DATA) + { + int idx = schan_find_sec_buffer_idx(s->desc, 0, SECBUFFER_TOKEN); + if (idx != -1) + idx = schan_find_sec_buffer_idx(s->desc, idx + 1, SECBUFFER_TOKEN); + return idx; + } + + return -1; +} + +static SECURITY_STATUS SEC_ENTRY schan_EncryptMessage(PCtxtHandle context_handle, + ULONG quality, PSecBufferDesc message, ULONG message_seq_no) +{ + struct schan_transport transport; + struct schan_context *ctx; + struct schan_buffers *b; + SecBuffer *buffer; + SIZE_T data_size; + char *data; + ssize_t sent = 0; + ssize_t ret; + int idx; + + TRACE("context_handle %p, quality %d, message %p, message_seq_no %d\n", + context_handle, quality, message, message_seq_no); + + if (!context_handle) return SEC_E_INVALID_HANDLE; + ctx = schan_get_object(context_handle->dwLower, SCHAN_HANDLE_CTX); + + dump_buffer_desc(message); + + idx = schan_find_sec_buffer_idx(message, 0, SECBUFFER_DATA); + if (idx == -1) + { + WARN("No data buffer passed\n"); + return SEC_E_INTERNAL_ERROR; + } + buffer = &message->pBuffers[idx]; + + data_size = buffer->cbBuffer; + data = HeapAlloc(GetProcessHeap(), 0, data_size); + memcpy(data, buffer->pvBuffer, data_size); + + transport.ctx = ctx; + init_schan_buffers(&transport.in, NULL, NULL); + if (schan_find_sec_buffer_idx(message, 0, SECBUFFER_STREAM_HEADER) != -1) + init_schan_buffers(&transport.out, message, schan_encrypt_message_get_next_buffer); + else + init_schan_buffers(&transport.out, message, schan_encrypt_message_get_next_buffer_token); + pgnutls_transport_set_ptr(ctx->session, &transport); + + while (sent < data_size) + { + ret = pgnutls_record_send(ctx->session, data + sent, data_size - sent); + if (ret < 0) + { + if (ret != GNUTLS_E_AGAIN) + { + pgnutls_perror(ret); + HeapFree(GetProcessHeap(), 0, data); + ERR("Returning SEC_E_INTERNAL_ERROR\n"); + return SEC_E_INTERNAL_ERROR; + } + else break; + } + sent += ret; + } + + TRACE("Sent %zd bytes\n", sent); + + b = &transport.out; + b->desc->pBuffers[b->current_buffer_idx].cbBuffer = b->offset; + HeapFree(GetProcessHeap(), 0, data); + + return SEC_E_OK; +} + static SECURITY_STATUS SEC_ENTRY schan_DeleteSecurityContext(PCtxtHandle context_handle) { struct schan_context *ctx; @@ -937,7 +1050,7 @@ static const SecurityFunctionTableA schanTableA = { NULL, /* AddCredentialsA */ NULL, /* Reserved8 */ NULL, /* QuerySecurityContextToken */ - NULL, /* EncryptMessage */ + schan_EncryptMessage, NULL, /* DecryptMessage */ NULL, /* SetContextAttributesA */ }; @@ -968,7 +1081,7 @@ static const SecurityFunctionTableW schanTableW = { NULL, /* AddCredentialsW */ NULL, /* Reserved8 */ NULL, /* QuerySecurityContextToken */ - NULL, /* EncryptMessage */ + schan_EncryptMessage, NULL, /* DecryptMessage */ NULL, /* SetContextAttributesW */ }; @@ -1035,6 +1148,7 @@ void SECUR32_initSchannelSP(void) LOAD_FUNCPTR(gnutls_mac_get_key_size) LOAD_FUNCPTR(gnutls_perror) LOAD_FUNCPTR(gnutls_set_default_priority) + LOAD_FUNCPTR(gnutls_record_send); LOAD_FUNCPTR(gnutls_transport_set_errno) LOAD_FUNCPTR(gnutls_transport_set_ptr) LOAD_FUNCPTR(gnutls_transport_set_pull_function)

1 0

Henri Verbeet : secur32: Add stubs for schannel QueryContextAttributesA() and QueryContextAttributesW().
by Alexandre Julliard 29 Dec '08

29 Dec '08

Module: wine Branch: master Commit: 3c114a88ca1752ac07fe039d0471f89384ea4704 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c114a88ca1752ac07fe039d0… Author: Henri Verbeet <hverbeet(a)gmail.com> Date: Sun Dec 28 22:21:35 2008 +0100 secur32: Add stubs for schannel QueryContextAttributesA() and QueryContextAttributesW(). --- dlls/secur32/schannel.c | 32 ++++++++++++++++++++++++++++++-- 1 files changed, 30 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index c0c1726..df5d56a 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -800,6 +800,34 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextA( return ret; } +static SECURITY_STATUS SEC_ENTRY schan_QueryContextAttributesW( + PCtxtHandle context_handle, ULONG attribute, PVOID buffer) +{ + TRACE("context_handle %p, attribute %#x, buffer %p\n", + context_handle, attribute, buffer); + + switch(attribute) + { + default: + FIXME("Unhandled attribute %#x\n", attribute); + return SEC_E_UNSUPPORTED_FUNCTION; + } +} + +static SECURITY_STATUS SEC_ENTRY schan_QueryContextAttributesA( + PCtxtHandle context_handle, ULONG attribute, PVOID buffer) +{ + TRACE("context_handle %p, attribute %#x, buffer %p\n", + context_handle, attribute, buffer); + + switch(attribute) + { + default: + FIXME("Unhandled attribute %#x\n", attribute); + return SEC_E_UNSUPPORTED_FUNCTION; + } +} + static SECURITY_STATUS SEC_ENTRY schan_DeleteSecurityContext(PCtxtHandle context_handle) { struct schan_context *ctx; @@ -834,7 +862,7 @@ static const SecurityFunctionTableA schanTableA = { NULL, /* CompleteAuthToken */ schan_DeleteSecurityContext, NULL, /* ApplyControlToken */ - NULL, /* QueryContextAttributesA */ + schan_QueryContextAttributesA, NULL, /* ImpersonateSecurityContext */ NULL, /* RevertSecurityContext */ NULL, /* MakeSignature */ @@ -865,7 +893,7 @@ static const SecurityFunctionTableW schanTableW = { NULL, /* CompleteAuthToken */ schan_DeleteSecurityContext, NULL, /* ApplyControlToken */ - NULL, /* QueryContextAttributesW */ + schan_QueryContextAttributesW, NULL, /* ImpersonateSecurityContext */ NULL, /* RevertSecurityContext */ NULL, /* MakeSignature */

1 0

Henri Verbeet : secur32: Handle SECPKG_ATTR_STREAM_SIZES in schan_QueryContextAttributesW().
by Alexandre Julliard 29 Dec '08

29 Dec '08

Module: wine Branch: master Commit: 95fd8762665e65fedf7e2ede43e657f123dc4535 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95fd8762665e65fedf7e2ede4… Author: Henri Verbeet <hverbeet(a)gmail.com> Date: Sun Dec 28 22:21:35 2008 +0100 secur32: Handle SECPKG_ATTR_STREAM_SIZES in schan_QueryContextAttributesW(). --- dlls/secur32/schannel.c | 64 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 64 insertions(+), 0 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index df5d56a..ed583d4 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -48,6 +48,7 @@ MAKE_FUNCPTR(gnutls_alert_get); MAKE_FUNCPTR(gnutls_alert_get_name); MAKE_FUNCPTR(gnutls_certificate_allocate_credentials); MAKE_FUNCPTR(gnutls_certificate_free_credentials); +MAKE_FUNCPTR(gnutls_cipher_get); MAKE_FUNCPTR(gnutls_credentials_set); MAKE_FUNCPTR(gnutls_deinit); MAKE_FUNCPTR(gnutls_global_deinit); @@ -56,6 +57,8 @@ MAKE_FUNCPTR(gnutls_global_set_log_function); MAKE_FUNCPTR(gnutls_global_set_log_level); MAKE_FUNCPTR(gnutls_handshake); MAKE_FUNCPTR(gnutls_init); +MAKE_FUNCPTR(gnutls_mac_get); +MAKE_FUNCPTR(gnutls_mac_get_key_size); MAKE_FUNCPTR(gnutls_perror); MAKE_FUNCPTR(gnutls_set_default_priority); MAKE_FUNCPTR(gnutls_transport_set_errno); @@ -800,14 +803,69 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextA( return ret; } +static unsigned int schannel_get_cipher_block_size(gnutls_cipher_algorithm_t cipher) +{ + const struct + { + gnutls_cipher_algorithm_t cipher; + unsigned int block_size; + } + algorithms[] = + { + {GNUTLS_CIPHER_3DES_CBC, 8}, + {GNUTLS_CIPHER_AES_128_CBC, 16}, + {GNUTLS_CIPHER_AES_256_CBC, 16}, + {GNUTLS_CIPHER_ARCFOUR_128, 1}, + {GNUTLS_CIPHER_ARCFOUR_40, 1}, + {GNUTLS_CIPHER_DES_CBC, 8}, + {GNUTLS_CIPHER_NULL, 1}, + {GNUTLS_CIPHER_RC2_40_CBC, 8}, + }; + unsigned int i; + + for (i = 0; i < sizeof(algorithms) / sizeof(*algorithms); ++i) + { + if (algorithms[i].cipher == cipher) + return algorithms[i].block_size; + } + + FIXME("Unknown cipher %#x, returning 1\n", cipher); + + return 1; +} + static SECURITY_STATUS SEC_ENTRY schan_QueryContextAttributesW( PCtxtHandle context_handle, ULONG attribute, PVOID buffer) { + struct schan_context *ctx; + TRACE("context_handle %p, attribute %#x, buffer %p\n", context_handle, attribute, buffer); + if (!context_handle) return SEC_E_INVALID_HANDLE; + ctx = schan_get_object(context_handle->dwLower, SCHAN_HANDLE_CTX); + switch(attribute) { + case SECPKG_ATTR_STREAM_SIZES: + { + SecPkgContext_StreamSizes *stream_sizes = (SecPkgContext_StreamSizes *)buffer; + gnutls_mac_algorithm_t mac = pgnutls_mac_get(ctx->session); + size_t mac_size = pgnutls_mac_get_key_size(mac); + gnutls_cipher_algorithm_t cipher = pgnutls_cipher_get(ctx->session); + unsigned int block_size = schannel_get_cipher_block_size(cipher); + + TRACE("Using %zu mac bytes, block size %u\n", mac_size, block_size); + + /* These are defined by the TLS RFC */ + stream_sizes->cbHeader = 5; + stream_sizes->cbTrailer = mac_size + 256; /* Max 255 bytes padding + 1 for padding size */ + stream_sizes->cbMaximumMessage = 1 << 14; + stream_sizes->cbBuffers = 4; + stream_sizes->cbBlockSize = block_size; + return SEC_E_OK; + } + default: FIXME("Unhandled attribute %#x\n", attribute); return SEC_E_UNSUPPORTED_FUNCTION; @@ -822,6 +880,9 @@ static SECURITY_STATUS SEC_ENTRY schan_QueryContextAttributesA( switch(attribute) { + case SECPKG_ATTR_STREAM_SIZES: + return schan_QueryContextAttributesW(context_handle, attribute, buffer); + default: FIXME("Unhandled attribute %#x\n", attribute); return SEC_E_UNSUPPORTED_FUNCTION; @@ -961,6 +1022,7 @@ void SECUR32_initSchannelSP(void) LOAD_FUNCPTR(gnutls_alert_get_name) LOAD_FUNCPTR(gnutls_certificate_allocate_credentials) LOAD_FUNCPTR(gnutls_certificate_free_credentials) + LOAD_FUNCPTR(gnutls_cipher_get) LOAD_FUNCPTR(gnutls_credentials_set) LOAD_FUNCPTR(gnutls_deinit) LOAD_FUNCPTR(gnutls_global_deinit) @@ -969,6 +1031,8 @@ void SECUR32_initSchannelSP(void) LOAD_FUNCPTR(gnutls_global_set_log_level) LOAD_FUNCPTR(gnutls_handshake) LOAD_FUNCPTR(gnutls_init) + LOAD_FUNCPTR(gnutls_mac_get) + LOAD_FUNCPTR(gnutls_mac_get_key_size) LOAD_FUNCPTR(gnutls_perror) LOAD_FUNCPTR(gnutls_set_default_priority) LOAD_FUNCPTR(gnutls_transport_set_errno)

1 0

Vitaliy Margolen : dxdiagn: Fix DxDiag_DirectXFiles container to have child sub containers.
by Alexandre Julliard 29 Dec '08

29 Dec '08

Module: wine Branch: master Commit: f816708b621f69631a0732d6e3a6db3950551d10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f816708b621f69631a0732d6e… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Dec 28 13:42:00 2008 -0700 dxdiagn: Fix DxDiag_DirectXFiles container to have child sub containers. --- dlls/dxdiagn/provider.c | 98 ++++++++++++++++++++++++----------------------- 1 files changed, 50 insertions(+), 48 deletions(-) diff --git a/dlls/dxdiagn/provider.c b/dlls/dxdiagn/provider.c index bc4d1a6..4fc84b7 100644 --- a/dlls/dxdiagn/provider.c +++ b/dlls/dxdiagn/provider.c @@ -377,54 +377,56 @@ static HRESULT DXDiag_InitDXDiagLogicalDisksContainer(IDxDiagContainer* pSubCont */ return hr; } -static HRESULT DXDiag_InitDXDiagDirectXFilesContainer(IDxDiagContainer* pSubCont) { - HRESULT hr = S_OK; - /**/ - static const WCHAR ddraw_dll[] = {'d','d','r','a','w','.','d','l','l',0}; - static const WCHAR dplayx_dll[] = {'d','p','l','a','y','x','.','d','l','l',0}; - static const WCHAR dpnet_dll[] = {'d','p','n','e','t','.','d','l','l',0}; - static const WCHAR dinput_dll[] = {'d','i','n','p','u','t','.','d','l','l',0}; - static const WCHAR dinput8_dll[] = {'d','i','n','p','u','t','8','.','d','l','l',0}; - static const WCHAR dsound_dll[] = {'d','s','o','u','n','d','.','d','l','l',0}; - static const WCHAR dswave_dll[] = {'d','s','w','a','v','e','.','d','l','l',0}; - static const WCHAR d3d8_dll[] = {'d','3','d','8','.','d','l','l',0}; - static const WCHAR d3d9_dll[] = {'d','3','d','9','.','d','l','l',0}; - static const WCHAR dmband_dll[] = {'d','m','b','a','n','d','.','d','l','l',0}; - static const WCHAR dmcompos_dll[] = {'d','m','c','o','m','p','o','s','.','d','l','l',0}; - static const WCHAR dmime_dll[] = {'d','m','i','m','e','.','d','l','l',0}; - static const WCHAR dmloader_dll[] = {'d','m','l','o','a','d','e','r','.','d','l','l',0}; - static const WCHAR dmscript_dll[] = {'d','m','s','c','r','i','p','t','.','d','l','l',0}; - static const WCHAR dmstyle_dll[] = {'d','m','s','t','y','l','e','.','d','l','l',0}; - static const WCHAR dmsynth_dll[] = {'d','m','s','y','n','t','h','.','d','l','l',0}; - static const WCHAR dmusic_dll[] = {'d','m','u','s','i','c','.','d','l','l',0}; - static const WCHAR devenum_dll[] = {'d','e','v','e','n','u','m','.','d','l','l',0}; - static const WCHAR quartz_dll[] = {'q','u','a','r','t','z','.','d','l','l',0}; - WCHAR szFilePath[512]; - - hr = GetSystemDirectoryW(szFilePath, MAX_PATH); - if (FAILED(hr)) { return hr; } - szFilePath[MAX_PATH-1]=0; - - hr = DXDiag_AddFileDescContainer(pSubCont, szFilePath, ddraw_dll); - hr = DXDiag_AddFileDescContainer(pSubCont, szFilePath, dplayx_dll); - hr = DXDiag_AddFileDescContainer(pSubCont, szFilePath, dpnet_dll); - hr = DXDiag_AddFileDescContainer(pSubCont, szFilePath, dinput_dll); - hr = DXDiag_AddFileDescContainer(pSubCont, szFilePath, dinput8_dll); - hr = DXDiag_AddFileDescContainer(pSubCont, szFilePath, dsound_dll); - hr = DXDiag_AddFileDescContainer(pSubCont, szFilePath, dswave_dll); - hr = DXDiag_AddFileDescContainer(pSubCont, szFilePath, d3d8_dll); - hr = DXDiag_AddFileDescContainer(pSubCont, szFilePath, d3d9_dll); - hr = DXDiag_AddFileDescContainer(pSubCont, szFilePath, dmband_dll); - hr = DXDiag_AddFileDescContainer(pSubCont, szFilePath, dmcompos_dll); - hr = DXDiag_AddFileDescContainer(pSubCont, szFilePath, dmime_dll); - hr = DXDiag_AddFileDescContainer(pSubCont, szFilePath, dmloader_dll); - hr = DXDiag_AddFileDescContainer(pSubCont, szFilePath, dmscript_dll); - hr = DXDiag_AddFileDescContainer(pSubCont, szFilePath, dmstyle_dll); - hr = DXDiag_AddFileDescContainer(pSubCont, szFilePath, dmsynth_dll); - hr = DXDiag_AddFileDescContainer(pSubCont, szFilePath, dmusic_dll); - hr = DXDiag_AddFileDescContainer(pSubCont, szFilePath, devenum_dll); - hr = DXDiag_AddFileDescContainer(pSubCont, szFilePath, quartz_dll); - return hr; + +static HRESULT DXDiag_InitDXDiagDirectXFilesContainer(IDxDiagContainer* pSubCont) +{ + HRESULT hr = S_OK; + static const WCHAR dlls[][15] = + { + {'d','3','d','8','.','d','l','l',0}, + {'d','3','d','9','.','d','l','l',0}, + {'d','d','r','a','w','.','d','l','l',0}, + {'d','e','v','e','n','u','m','.','d','l','l',0}, + {'d','i','n','p','u','t','8','.','d','l','l',0}, + {'d','i','n','p','u','t','.','d','l','l',0}, + {'d','m','b','a','n','d','.','d','l','l',0}, + {'d','m','c','o','m','p','o','s','.','d','l','l',0}, + {'d','m','i','m','e','.','d','l','l',0}, + {'d','m','l','o','a','d','e','r','.','d','l','l',0}, + {'d','m','s','c','r','i','p','t','.','d','l','l',0}, + {'d','m','s','t','y','l','e','.','d','l','l',0}, + {'d','m','s','y','n','t','h','.','d','l','l',0}, + {'d','m','u','s','i','c','.','d','l','l',0}, + {'d','p','l','a','y','x','.','d','l','l',0}, + {'d','p','n','e','t','.','d','l','l',0}, + {'d','s','o','u','n','d','.','d','l','l',0}, + {'d','s','w','a','v','e','.','d','l','l',0}, + {'q','u','a','r','t','z','.','d','l','l',0} + }; + WCHAR szFilePath[MAX_PATH]; + INT i; + + GetSystemDirectoryW(szFilePath, MAX_PATH); + + for (i = 0; i < sizeof(dlls) / sizeof(dlls[0]); i++) + { + static const WCHAR szFormat[] = {'%','d',0}; + WCHAR szFileID[5]; + IDxDiagContainer *pDXFileSubCont; + + snprintfW(szFileID, sizeof(szFileID)/sizeof(szFileID[0]), szFormat, i); + + hr = DXDiag_CreateDXDiagContainer(&IID_IDxDiagContainer, (void**) &pDXFileSubCont); + if (FAILED(hr)) continue; + + if (FAILED(DXDiag_AddFileDescContainer(pDXFileSubCont, szFilePath, dlls[i])) || + FAILED(IDxDiagContainerImpl_AddChildContainer(pSubCont, szFileID, pDXFileSubCont))) + { + IUnknown_Release(pDXFileSubCont); + continue; + } + } + return hr; } static HRESULT DXDiag_InitDXDiagDisplayContainer(IDxDiagContainer* pSubCont)

1 0

Vitaliy Margolen : dxdiagn: Add dxdiagn. dll to DxDiag_DirectXFiles container. Create fake dll for it as well.
by Alexandre Julliard 29 Dec '08

29 Dec '08

Module: wine Branch: master Commit: 8a0318c0b48fe5aa7152b85f0f9acbd86c40df5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a0318c0b48fe5aa7152b85f0… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Dec 28 13:42:09 2008 -0700 dxdiagn: Add dxdiagn.dll to DxDiag_DirectXFiles container. Create fake dll for it as well. --- dlls/dxdiagn/provider.c | 1 + tools/wine.inf.in | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/dxdiagn/provider.c b/dlls/dxdiagn/provider.c index 4fc84b7..7a32da4 100644 --- a/dlls/dxdiagn/provider.c +++ b/dlls/dxdiagn/provider.c @@ -401,6 +401,7 @@ static HRESULT DXDiag_InitDXDiagDirectXFilesContainer(IDxDiagContainer* pSubCont {'d','p','n','e','t','.','d','l','l',0}, {'d','s','o','u','n','d','.','d','l','l',0}, {'d','s','w','a','v','e','.','d','l','l',0}, + {'d','x','d','i','a','g','n','.','d','l','l',0}, {'q','u','a','r','t','z','.','d','l','l',0} }; WCHAR szFilePath[MAX_PATH]; diff --git a/tools/wine.inf.in b/tools/wine.inf.in index a95f1a8..5b1d990 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -2262,6 +2262,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,dosx.exe 11,,dsound.dll 11,,dsound.vxd +11,,dxdiagn.dll 11,,gdi32.dll 11,,glu32.dll 11,,hal.dll

1 0

Henri Verbeet : secur32: Try an EMPTY buffer if we can' t find one of type TOKEN.
by Alexandre Julliard 29 Dec '08

29 Dec '08

Module: wine Branch: master Commit: 7bf267624d3562743e9e020c421b9f29f8cdb62f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bf267624d3562743e9e020c4… Author: Henri Verbeet <hverbeet(a)gmail.com> Date: Sun Dec 28 22:21:35 2008 +0100 secur32: Try an EMPTY buffer if we can't find one of type TOKEN. --- dlls/secur32/schannel.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 5ba4dfc..1c99c84 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -607,9 +607,15 @@ static int schan_init_sec_ctx_get_next_buffer(const struct schan_transport *t, s if (s->current_buffer_idx == -1) { int idx = schan_find_sec_buffer_idx(s->desc, 0, SECBUFFER_TOKEN); - if (idx != -1 && !s->desc->pBuffers[idx].pvBuffer - && (t->ctx->req_ctx_attr & ISC_REQ_ALLOCATE_MEMORY)) - s->allow_buffer_resize = TRUE; + if (t->ctx->req_ctx_attr & ISC_REQ_ALLOCATE_MEMORY) + { + if (idx == -1) + { + idx = schan_find_sec_buffer_idx(s->desc, 0, SECBUFFER_EMPTY); + if (idx != -1) s->desc->pBuffers[idx].BufferType = SECBUFFER_TOKEN; + } + if (idx != -1 && !s->desc->pBuffers[idx].pvBuffer) s->allow_buffer_resize = TRUE; + } return idx; }

1 0

Henri Verbeet : secur32: Dump the buffer descs in schan_InitializeSecurityContextW().
by Alexandre Julliard 29 Dec '08

29 Dec '08

Module: wine Branch: master Commit: 24c5e6edbf1b5cbf02f415ae74e75da473d20b88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24c5e6edbf1b5cbf02f415ae7… Author: Henri Verbeet <hverbeet(a)gmail.com> Date: Sun Dec 28 22:21:35 2008 +0100 secur32: Dump the buffer descs in schan_InitializeSecurityContextW(). --- dlls/secur32/schannel.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 1c99c84..c0c1726 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -622,6 +622,19 @@ static int schan_init_sec_ctx_get_next_buffer(const struct schan_transport *t, s return -1; } +static void dump_buffer_desc(SecBufferDesc *desc) +{ + unsigned int i; + + if (!desc) return; + TRACE("Buffer desc %p:\n", desc); + for (i = 0; i < desc->cBuffers; ++i) + { + SecBuffer *b = &desc->pBuffers[i]; + TRACE("\tbuffer %u: cbBuffer %ld, BufferType %#lx pvBuffer %p\n", i, b->cbBuffer, b->BufferType, b->pvBuffer); + } +} + /*********************************************************************** * InitializeSecurityContextW */ @@ -641,6 +654,9 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW( debugstr_w(pszTargetName), fContextReq, Reserved1, TargetDataRep, pInput, Reserved1, phNewContext, pOutput, pfContextAttr, ptsExpiry); + dump_buffer_desc(pInput); + dump_buffer_desc(pOutput); + if (!phContext) { ULONG_PTR handle;

1 0

Vitaliy Margolen : dinput: Fix usage of HeapReAlloc.
by Alexandre Julliard 29 Dec '08

29 Dec '08

Module: wine Branch: master Commit: a610cfb64c16179b718a0559932375fc83571c65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a610cfb64c16179b718a05599… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Dec 28 13:40:47 2008 -0700 dinput: Fix usage of HeapReAlloc. --- dlls/dinput/joystick_linuxinput.c | 19 +++++++++++++------ 1 files changed, 13 insertions(+), 6 deletions(-) diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index a08a5b7..b07166c 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -228,6 +228,7 @@ static void find_joydevs(void) int fd; int no_ff_check = 0; int j; + struct JoyDev *new_joydevs; snprintf(buf, sizeof(buf), EVDEVPREFIX"%d", i); @@ -319,12 +320,18 @@ static void find_joydevs(void) } } - if (have_joydevs==0) { - joydevs = HeapAlloc(GetProcessHeap(), 0, sizeof(struct JoyDev)); - } else { - HeapReAlloc(GetProcessHeap(), 0, joydevs, (1+have_joydevs) * sizeof(struct JoyDev)); - } - memcpy(joydevs+have_joydevs, &joydev, sizeof(struct JoyDev)); + if (!have_joydevs) + new_joydevs = HeapAlloc(GetProcessHeap(), 0, sizeof(struct JoyDev)); + else + new_joydevs = HeapReAlloc(GetProcessHeap(), 0, joydevs, (1 + have_joydevs) * sizeof(struct JoyDev)); + + if (!new_joydevs) + { + close(fd); + continue; + } + joydevs = new_joydevs; + memcpy(joydevs + have_joydevs, &joydev, sizeof(joydev)); have_joydevs++; }

1 0