June 2012 - Wine-Commits - list.winehq.org

Jacek Caban : urlmon: Added support for more error codes in handle_http_error.
by Alexandre Julliard June 1, 2012

June 1, 2012

Module: wine Branch: master Commit: 0d82c9a9c83b9f3b172c710c9c16e59812222e04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d82c9a9c83b9f3b172c710c9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 1 16:41:55 2012 +0200 urlmon: Added support for more error codes in handle_http_error. --- dlls/urlmon/http.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/http.c b/dlls/urlmon/http.c index 7ec93fc..a030d0b 100644 --- a/dlls/urlmon/http.c +++ b/dlls/urlmon/http.c @@ -103,6 +103,11 @@ static inline HRESULT internet_error_to_hres(DWORD error) case ERROR_INTERNET_SEC_CERT_CN_INVALID: case ERROR_INTERNET_INVALID_CA: case ERROR_INTERNET_CLIENT_AUTH_CERT_NEEDED: + case ERROR_INTERNET_SEC_INVALID_CERT: + case ERROR_INTERNET_SEC_CERT_ERRORS: + case ERROR_INTERNET_SEC_CERT_REV_FAILED: + case ERROR_INTERNET_SEC_CERT_NO_REV: + case ERROR_INTERNET_SEC_CERT_REVOKED: return INET_E_INVALID_CERTIFICATE; case ERROR_INTERNET_HTTP_TO_HTTPS_ON_REDIR: case ERROR_INTERNET_HTTPS_TO_HTTP_ON_REDIR: @@ -129,9 +134,14 @@ static HRESULT handle_http_error(HttpProtocol *This, DWORD error) case ERROR_INTERNET_SEC_CERT_CN_INVALID: case ERROR_INTERNET_HTTP_TO_HTTPS_ON_REDIR: case ERROR_INTERNET_HTTPS_TO_HTTP_ON_REDIR: - case ERROR_HTTP_REDIRECT_NEEDS_CONFIRMATION: case ERROR_INTERNET_INVALID_CA: case ERROR_INTERNET_CLIENT_AUTH_CERT_NEEDED: + case ERROR_INTERNET_SEC_INVALID_CERT: + case ERROR_INTERNET_SEC_CERT_ERRORS: + case ERROR_INTERNET_SEC_CERT_REV_FAILED: + case ERROR_INTERNET_SEC_CERT_NO_REV: + case ERROR_INTERNET_SEC_CERT_REVOKED: + case ERROR_HTTP_REDIRECT_NEEDS_CONFIRMATION: security_problem = TRUE; break; default:

1 0

Jacek Caban : wininet: Properly set security flags for ERROR_INTERNET_SEC_CERT_DATE_INVALID.
by Alexandre Julliard June 1, 2012

June 1, 2012

Module: wine Branch: master Commit: f5cbc9f3f267dcbd9d60dd78695c31448363d400 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5cbc9f3f267dcbd9d60dd786… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 1 16:41:44 2012 +0200 wininet: Properly set security flags for ERROR_INTERNET_SEC_CERT_DATE_INVALID. --- dlls/wininet/internet.h | 8 +++++--- dlls/wininet/netconnection.c | 11 ++++++++++- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 2e59720..a46e185 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -559,11 +559,13 @@ typedef struct } wininet_flag_info; /* Undocumented security flags */ -#define _SECURITY_FLAG_CERT_REV_FAILED 0x00800000 -#define _SECURITY_FLAG_CERT_INVALID_CN 0x02000000 +#define _SECURITY_FLAG_CERT_REV_FAILED 0x00800000 +#define _SECURITY_FLAG_CERT_INVALID_CN 0x02000000 +#define _SECURITY_FLAG_CERT_INVALID_DATE 0x04000000 #define _SECURITY_ERROR_FLAGS_MASK \ (_SECURITY_FLAG_CERT_REV_FAILED \ - |_SECURITY_FLAG_CERT_INVALID_CN) + |_SECURITY_FLAG_CERT_INVALID_CN \ + |_SECURITY_FLAG_CERT_INVALID_DATE) #endif /* _WINE_INTERNET_H_ */ diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index ceed17a..00c3513 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -247,6 +247,7 @@ static DWORD netconn_verify_cert(netconn_t *conn, PCCERT_CONTEXT cert, HCERTSTOR errors = chain->TrustStatus.dwErrorStatus; if (chain->TrustStatus.dwErrorStatus & ~supportedErrors) { + WARN("error status %x\n", chain->TrustStatus.dwErrorStatus & ~supportedErrors); if(conn->mask_errors) WARN("CERT_TRUST_IS_NOT_TIME_VALID, unknown error flags\n"); err = conn->mask_errors && err ? ERROR_INTERNET_SEC_CERT_ERRORS : ERROR_INTERNET_SEC_INVALID_CERT; @@ -254,14 +255,16 @@ static DWORD netconn_verify_cert(netconn_t *conn, PCCERT_CONTEXT cert, HCERTSTOR } if(errors & CERT_TRUST_IS_NOT_TIME_VALID) { + WARN("CERT_TRUST_IS_NOT_TIME_VALID\n"); if(conn->mask_errors) - WARN("CERT_TRUST_IS_NOT_TIME_VALID, unknown error flags\n"); + conn->security_flags |= _SECURITY_FLAG_CERT_INVALID_DATE; if(!(conn->security_flags & SECURITY_FLAG_IGNORE_CERT_DATE_INVALID)) err = conn->mask_errors && err ? ERROR_INTERNET_SEC_CERT_ERRORS : ERROR_INTERNET_SEC_CERT_DATE_INVALID; errors &= ~CERT_TRUST_IS_NOT_TIME_VALID; } if(errors & CERT_TRUST_IS_UNTRUSTED_ROOT) { + WARN("CERT_TRUST_IS_UNTRUSTED_ROOT\n"); if(conn->mask_errors) WARN("CERT_TRUST_IS_UNTRUSTED_ROOT, unknown flags\n"); if(!(conn->security_flags & SECURITY_FLAG_IGNORE_UNKNOWN_CA)) @@ -270,6 +273,7 @@ static DWORD netconn_verify_cert(netconn_t *conn, PCCERT_CONTEXT cert, HCERTSTOR } if(errors & CERT_TRUST_IS_PARTIAL_CHAIN) { + WARN("CERT_TRUST_IS_PARTIAL_CHAIN\n"); if(conn->mask_errors) conn->security_flags |= _SECURITY_FLAG_CERT_REV_FAILED; if(!(conn->security_flags & SECURITY_FLAG_IGNORE_UNKNOWN_CA)) @@ -278,6 +282,7 @@ static DWORD netconn_verify_cert(netconn_t *conn, PCCERT_CONTEXT cert, HCERTSTOR } if(errors & (CERT_TRUST_IS_OFFLINE_REVOCATION | CERT_TRUST_REVOCATION_STATUS_UNKNOWN)) { + WARN("CERT_TRUST_IS_OFFLINE_REVOCATION | CERT_TRUST_REVOCATION_STATUS_UNKNOWN\n"); if(conn->mask_errors) WARN("TRUST_IS_OFFLINE_REVOCATION | CERT_TRUST_REVOCATION_STATUS_UNKNOWN, unknown error flags\n"); if(!(conn->security_flags & SECURITY_FLAG_IGNORE_REVOCATION)) @@ -286,6 +291,7 @@ static DWORD netconn_verify_cert(netconn_t *conn, PCCERT_CONTEXT cert, HCERTSTOR } if(errors & CERT_TRUST_IS_REVOKED) { + WARN("CERT_TRUST_IS_REVOKED\n"); if(conn->mask_errors) WARN("TRUST_IS_OFFLINE_REVOCATION | CERT_TRUST_REVOCATION_STATUS_UNKNOWN, unknown error flags\n"); if(!(conn->security_flags & SECURITY_FLAG_IGNORE_REVOCATION)) @@ -294,6 +300,7 @@ static DWORD netconn_verify_cert(netconn_t *conn, PCCERT_CONTEXT cert, HCERTSTOR } if(errors & CERT_TRUST_IS_NOT_VALID_FOR_USAGE) { + WARN("CERT_TRUST_IS_NOT_VALID_FOR_USAGE\n"); if(conn->mask_errors) WARN("CERT_TRUST_IS_NOT_VALID_FOR_USAGE, unknown error flags\n"); if(!(conn->security_flags & SECURITY_FLAG_IGNORE_WRONG_USAGE)) @@ -327,10 +334,12 @@ static DWORD netconn_verify_cert(netconn_t *conn, PCCERT_CONTEXT cert, HCERTSTOR */ if(ret) { if(policyStatus.dwError == CERT_E_CN_NO_MATCH) { + WARN("CERT_E_CN_NO_MATCH\n"); if(conn->mask_errors) conn->security_flags |= _SECURITY_FLAG_CERT_INVALID_CN; err = conn->mask_errors && err ? ERROR_INTERNET_SEC_CERT_ERRORS : ERROR_INTERNET_SEC_CERT_CN_INVALID; }else if(policyStatus.dwError) { + WARN("policyStatus.dwError %x\n", policyStatus.dwError); if(conn->mask_errors) WARN("unknown error flags for policy status %x\n", policyStatus.dwError); err = conn->mask_errors && err ? ERROR_INTERNET_SEC_CERT_ERRORS : ERROR_INTERNET_SEC_INVALID_CERT;

1 0

Dmitry Timoshkov : oleaut32: Add a test for saving an icon into a stream.
by Alexandre Julliard June 1, 2012

June 1, 2012

Module: wine Branch: master Commit: 78d6a8ca04968362aba41b49fab3e5dfb039632a URL: http://source.winehq.org/git/wine.git/?a=commit;h=78d6a8ca04968362aba41b49f… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jun 1 15:37:47 2012 +0900 oleaut32: Add a test for saving an icon into a stream. --- dlls/oleaut32/tests/olepicture.c | 56 +++++++++++++++++++++++++++++++++++++- 1 files changed, 55 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/tests/olepicture.c b/dlls/oleaut32/tests/olepicture.c index 353334c..b214d76 100644 --- a/dlls/oleaut32/tests/olepicture.c +++ b/dlls/oleaut32/tests/olepicture.c @@ -2,7 +2,7 @@ * OLEPICTURE test program * * Copyright 2005 Marcus Meissner - * + * Copyright 2012 Dmitry Timoshkov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -1006,6 +1006,59 @@ static void test_load_save_bmp(void) IPicture_Release(pic); } +static void test_load_save_icon(void) +{ + IPicture *pic; + PICTDESC desc; + short type; + OLE_HANDLE handle; + HGLOBAL hmem; + DWORD *mem; + IPersistStream *src_stream; + IStream *dst_stream; + HRESULT hr; + + desc.cbSizeofstruct = sizeof(desc); + desc.picType = PICTYPE_ICON; + desc.u.icon.hicon = LoadIcon(0, IDI_APPLICATION); + hr = OleCreatePictureIndirect(&desc, &IID_IPicture, FALSE, (void**)&pic); + ok(hr == S_OK, "OleCreatePictureIndirect error %#x\n", hr); + + type = -1; + hr = IPicture_get_Type(pic, &type); + ok(hr == S_OK,"get_Type error %#8x\n", hr); + ok(type == PICTYPE_ICON,"expected picture type PICTYPE_ICON, got %d\n", type); + + hr = IPicture_get_Handle(pic, &handle); + ok(hr == S_OK,"get_Handle error %#8x\n", hr); + ok(IntToPtr(handle) == desc.u.icon.hicon, "get_Handle returned wrong handle %#x\n", handle); + + hmem = GlobalAlloc(GMEM_ZEROINIT, 8192); + hr = CreateStreamOnHGlobal(hmem, FALSE, &dst_stream); + ok(hr == S_OK, "CreateStreamOnHGlobal error %#x\n", hr); + + hr = IPicture_QueryInterface(pic, &IID_IPersistStream, (void **)&src_stream); + ok(hr == S_OK, "QueryInterface error %#x\n", hr); + + hr = IPersistStream_Save(src_stream, dst_stream, TRUE); + ok(hr == S_OK, "Saveerror %#x\n", hr); + + IPersistStream_Release(src_stream); + IStream_Release(dst_stream); + + mem = GlobalLock(hmem); + ok(!memcmp(mem, "lt\0\0", 4), "got wrong stream header %04x\n", mem[0]); +todo_wine + ok(mem[1] == 766, "expected stream size 766, got %u\n", mem[1]); + ok(mem[2] == 0x00010000, "got wrong icon header %04x\n", mem[2]); + + GlobalUnlock(hmem); + GlobalFree(hmem); + + DeleteObject(desc.u.bmp.hbitmap); + IPicture_Release(pic); +} + START_TEST(olepicture) { hOleaut32 = GetModuleHandleA("oleaut32.dll"); @@ -1043,6 +1096,7 @@ START_TEST(olepicture) test_OleLoadPicturePath(); test_himetric(); test_load_save_bmp(); + test_load_save_icon(); }

1 0

Francois Gouget : wined3d: We must include Wine's port.h before using NAN.
by Alexandre Julliard June 1, 2012

June 1, 2012

Module: wine Branch: master Commit: 19ba80e7c2c9ef054ef5faa921616a5d43f6578d URL: http://source.winehq.org/git/wine.git/?a=commit;h=19ba80e7c2c9ef054ef5faa92… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Jun 1 16:56:21 2012 +0200 wined3d: We must include Wine's port.h before using NAN. --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/ati_fragment_shader.c | 1 + dlls/wined3d/context.c | 3 +++ dlls/wined3d/device.c | 3 +++ dlls/wined3d/directx.c | 3 +++ dlls/wined3d/gl_compat.c | 3 +++ dlls/wined3d/glsl_shader.c | 3 +++ dlls/wined3d/nvidia_texture_shader.c | 1 + dlls/wined3d/palette.c | 1 + dlls/wined3d/query.c | 1 + dlls/wined3d/resource.c | 1 + dlls/wined3d/shader.c | 1 + dlls/wined3d/state.c | 3 +++ dlls/wined3d/stateblock.c | 1 + dlls/wined3d/swapchain.c | 1 + dlls/wined3d/texture.c | 1 + dlls/wined3d/vertexdeclaration.c | 1 + dlls/wined3d/volume.c | 1 + dlls/wined3d/wined3d_main.c | 1 + 19 files changed, 31 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 468dfba..99d5e43 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -28,6 +28,7 @@ */ #include "config.h" +#include "wine/port.h" #include <math.h> #include <stdio.h> diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c index f1bf231..680367a 100644 --- a/dlls/wined3d/ati_fragment_shader.c +++ b/dlls/wined3d/ati_fragment_shader.c @@ -19,6 +19,7 @@ */ #include "config.h" +#include "wine/port.h" #include <math.h> #include <stdio.h> diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 4037c41..b5db3e1 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -20,10 +20,13 @@ */ #include "config.h" +#include "wine/port.h" + #include <stdio.h> #ifdef HAVE_FLOAT_H # include <float.h> #endif + #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a0fbe86..be22421 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -25,10 +25,13 @@ */ #include "config.h" +#include "wine/port.h" + #include <stdio.h> #ifdef HAVE_FLOAT_H # include <float.h> #endif + #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index f7e62a7..5183904 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -22,7 +22,10 @@ */ #include "config.h" +#include "wine/port.h" + #include <stdio.h> + #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); diff --git a/dlls/wined3d/gl_compat.c b/dlls/wined3d/gl_compat.c index 7ba2157..5a1a15a 100644 --- a/dlls/wined3d/gl_compat.c +++ b/dlls/wined3d/gl_compat.c @@ -19,10 +19,13 @@ */ #include "config.h" +#include "wine/port.h" + #include <stdio.h> #ifdef HAVE_FLOAT_H # include <float.h> #endif + #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(gl_compat); diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index d66522f..f27b118 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -30,8 +30,11 @@ */ #include "config.h" +#include "wine/port.h" + #include <limits.h> #include <stdio.h> + #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader); diff --git a/dlls/wined3d/nvidia_texture_shader.c b/dlls/wined3d/nvidia_texture_shader.c index 1fef980..48eacd5 100644 --- a/dlls/wined3d/nvidia_texture_shader.c +++ b/dlls/wined3d/nvidia_texture_shader.c @@ -20,6 +20,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include "config.h" +#include "wine/port.h" #include <math.h> #include <stdio.h> diff --git a/dlls/wined3d/palette.c b/dlls/wined3d/palette.c index 780c6a9..1e85be2 100644 --- a/dlls/wined3d/palette.c +++ b/dlls/wined3d/palette.c @@ -19,6 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include "config.h" +#include "wine/port.h" #include "winerror.h" #include "wine/debug.h" diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 8298058..4a3d7a7 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -20,6 +20,7 @@ #include "config.h" +#include "wine/port.h" #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 3e1914d..d784622 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -21,6 +21,7 @@ */ #include "config.h" +#include "wine/port.h" #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index d047269..1abafbb 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -23,6 +23,7 @@ */ #include "config.h" +#include "wine/port.h" #include <math.h> #include <stdio.h> diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 8904aaa..f2da77c 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -26,10 +26,13 @@ */ #include "config.h" +#include "wine/port.h" + #include <stdio.h> #ifdef HAVE_FLOAT_H # include <float.h> #endif + #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 276c1a8..a09c2f9 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -23,6 +23,7 @@ */ #include "config.h" +#include "wine/port.h" #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 14796d2..6600806 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -21,6 +21,7 @@ */ #include "config.h" +#include "wine/port.h" #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 94589ae..5a78700 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -21,6 +21,7 @@ */ #include "config.h" +#include "wine/port.h" #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d_texture); diff --git a/dlls/wined3d/vertexdeclaration.c b/dlls/wined3d/vertexdeclaration.c index af6ac92..f3b42ff 100644 --- a/dlls/wined3d/vertexdeclaration.c +++ b/dlls/wined3d/vertexdeclaration.c @@ -23,6 +23,7 @@ */ #include "config.h" +#include "wine/port.h" #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d_decl); diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 05bb4e5..6403b53 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -20,6 +20,7 @@ */ #include "config.h" +#include "wine/port.h" #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d_surface); diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 4e2226e..08d1554 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -23,6 +23,7 @@ */ #include "config.h" +#include "wine/port.h" #include "initguid.h" #include "wined3d_private.h"

1 0

Piotr Caban : msvcp90: Added partial basic_ostream<char> implementation.
by Alexandre Julliard June 1, 2012

June 1, 2012

Module: wine Branch: master Commit: 3c980ffa01918304f6954013909794231c68ff1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c980ffa01918304f69540139… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jun 1 17:03:36 2012 +0200 msvcp90: Added partial basic_ostream<char> implementation. --- dlls/msvcp90/ios.c | 380 +++++++++++++++++++++++++++++++++------------ dlls/msvcp90/msvcp90.h | 1 + dlls/msvcp90/msvcp90.spec | 12 +- 3 files changed, 284 insertions(+), 109 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3c980ffa01918304f6954…

1 0

Aric Stewart : usp10: Insert dotted circle (U+25CC) for invalid combining sequences in Arabic.
by Alexandre Julliard June 1, 2012

June 1, 2012

Module: wine Branch: master Commit: a2c1bd1ff51aad5c0169e47355cd5d995170d230 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2c1bd1ff51aad5c0169e4735… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Jun 1 10:22:38 2012 -0500 usp10: Insert dotted circle (U+25CC) for invalid combining sequences in Arabic. --- dlls/usp10/shape.c | 88 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 88 insertions(+), 0 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index d582fc7..84953fb 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -114,6 +114,8 @@ typedef struct tagConsonantComponents typedef void (*second_reorder_function)(LPWSTR pwChar, IndicSyllable *syllable,WORD* pwGlyphs, IndicSyllable* glyph_index, lexical_function lex); +typedef int (*combining_lexical_function)(WCHAR c); + /* the orders of joined_forms and contextual_features need to line up */ static const char* contextual_features[] = { @@ -784,6 +786,45 @@ static inline BOOL get_GSUB_Indic2(SCRIPT_ANALYSIS *psa, ScriptCache *psc) return(SUCCEEDED(hr)); } +static void insert_glyph(WORD *pwGlyphs, INT *pcGlyphs, INT cChars, INT write_dir, WORD glyph, INT index, WORD *pwLogClust) +{ + int i; + for (i = *pcGlyphs; i>=index; i--) + pwGlyphs[i+1] = pwGlyphs[i]; + pwGlyphs[index] = glyph; + *pcGlyphs = *pcGlyphs+1; + if (write_dir < 0) + UpdateClusters(index-3, 1, write_dir, cChars, pwLogClust); + else + UpdateClusters(index, 1, write_dir, cChars, pwLogClust); +} + +static void mark_invalid_combinations(HDC hdc, const WCHAR* pwcChars, INT cChars, WORD *pwGlyphs, INT *pcGlyphs, INT write_dir, WORD *pwLogClust, combining_lexical_function lex) +{ + CHAR *context_type; + int i,g; + WCHAR invalid = 0x25cc; + WORD invalid_glyph; + + context_type = HeapAlloc(GetProcessHeap(),0,cChars); + + /* Mark invalid combinations */ + for (i = 0; i < cChars; i++) + context_type[i] = lex(pwcChars[i]); + + GetGlyphIndicesW(hdc, &invalid, 1, &invalid_glyph, 0); + for (i = 1, g=1; i < cChars; i++, g++) + { + if (context_type[i] != 0 && context_type[i+write_dir]==context_type[i]) + { + insert_glyph(pwGlyphs, pcGlyphs, cChars, write_dir, invalid_glyph, g, pwLogClust); + g++; + } + } + + HeapFree(GetProcessHeap(),0,context_type); +} + static WCHAR neighbour_char(int i, int delta, const WCHAR* chars, INT cchLen) { if (i + delta < 0) @@ -839,6 +880,51 @@ static inline BOOL word_break_causing(WCHAR chr) return (chr == 0 || chr == 0x20 ); } +static int combining_lexical_Arabic(WCHAR c) +{ + enum {Arab_Norm = 0, Arab_DIAC1, Arab_DIAC2, Arab_DIAC3, Arab_DIAC4, Arab_DIAC5, Arab_DIAC6, Arab_DIAC7, Arab_DIAC8}; + + switch(c) + { + case 0x064B: + case 0x064C: + case 0x064E: + case 0x064F: + case 0x0652: + case 0x0657: + case 0x0658: + case 0x06E1: return Arab_DIAC1; break; + case 0x064D: + case 0x0650: + case 0x0656: return Arab_DIAC2; break; + case 0x0651: return Arab_DIAC3; break; + case 0x0610: + case 0x0611: + case 0x0612: + case 0x0613: + case 0x0614: + case 0x0659: + case 0x06D6: + case 0x06DC: + case 0x06DF: + case 0x06E0: + case 0x06E2: + case 0x06E4: + case 0x06E7: + case 0x06E8: + case 0x06EB: + case 0x06EC: return Arab_DIAC4; break; + case 0x06E3: + case 0x06EA: + case 0x06ED: return Arab_DIAC5; break; + case 0x0670: return Arab_DIAC6; break; + case 0x0653: return Arab_DIAC7; break; + case 0x0655: + case 0x0654: return Arab_DIAC8; break; + default: return Arab_Norm; + } +} + /* * ContextualShape_Arabic */ @@ -929,6 +1015,8 @@ static void ContextualShape_Arabic(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *p HeapFree(GetProcessHeap(),0,context_shape); HeapFree(GetProcessHeap(),0,context_type); + + mark_invalid_combinations(hdc, pwcChars, cChars, pwOutGlyphs, pcGlyphs, dirL, pwLogClust, combining_lexical_Arabic); } /*

1 0

Christian Costa : d3drm: Handle material list in mesh.
by Alexandre Julliard June 1, 2012

June 1, 2012

Module: wine Branch: master Commit: 84f2e0e9ac30fbd2ca2bf9ea3ebca24789908490 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84f2e0e9ac30fbd2ca2bf9ea3… Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu May 31 18:47:50 2012 +0200 d3drm: Handle material list in mesh. --- dlls/d3drm/meshbuilder.c | 85 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 84 insertions(+), 1 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 22aec7e..146450c 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -74,6 +74,7 @@ typedef struct { LPVOID pFaceData; DWORD nb_coords2d; Coords2d* pCoords2d; + IDirect3DRMMaterial2* material; } IDirect3DRMMeshBuilderImpl; char templates[] = { @@ -361,6 +362,8 @@ static ULONG WINAPI IDirect3DRMMeshBuilder2Impl_Release(IDirect3DRMMeshBuilder2* if (!ref) { + if (This->material) + IDirect3DRMMaterial2_Release(This->material); HeapFree(GetProcessHeap(), 0, This->name); HeapFree(GetProcessHeap(), 0, This->pVertices); HeapFree(GetProcessHeap(), 0, This->pNormals); @@ -1202,7 +1205,87 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3* iface, LPDIRECTXFILEDATA pData) } else if (IsEqualGUID(pGuid, &TID_D3DRMMeshMaterialList)) { - FIXME("MeshMaterialList not supported yet, ignoring...\n"); + DWORD nb_materials; + DWORD nb_face_indices; + DWORD data_size; + LPDIRECTXFILEOBJECT child; + DWORD i = 0; + float* values; + + TRACE("Process MeshMaterialList\n"); + + hr = IDirectXFileData_GetData(pData2, NULL, &size, (void**)&ptr); + if (hr != DXFILE_OK) + goto end; + + nb_materials = *(DWORD*)ptr; + nb_face_indices = *(DWORD*)(ptr + sizeof(DWORD)); + data_size = 2 * sizeof(DWORD) + nb_face_indices * sizeof(DWORD); + + TRACE("nMaterials = %u, nFaceIndexes = %u\n", nb_materials, nb_face_indices); + + if (size != data_size) + WARN("Returned size %u does not match expected one %u\n", size, data_size); + + if (nb_materials > 2) + { + FIXME("Only one material per mesh supported, first one applies to all faces\n"); + nb_materials = 1; + } + + while (SUCCEEDED(hr = IDirectXFileData_GetNextObject(pData2, &child)) && (i < nb_materials)) + { + LPDIRECTXFILEDATA data; + LPDIRECTXFILEDATAREFERENCE reference; + LPDIRECT3DRMMATERIAL2 material; + + hr = IDirectXFileObject_QueryInterface(child, &IID_IDirectXFileData, (void **)&data); + if (FAILED(hr)) + { + hr = IDirectXFileObject_QueryInterface(child, &IID_IDirectXFileDataReference, (void **)&reference); + if (FAILED(hr)) + goto end; + + hr = IDirectXFileDataReference_Resolve(reference, &data); + IDirectXFileDataReference_Release(reference); + if (FAILED(hr)) + goto end; + } + + hr = Direct3DRMMaterial_create(&material); + if (FAILED(hr)) + { + IDirectXFileData_Release(data); + goto end; + } + + hr = IDirectXFileData_GetData(data, NULL, &size, (void**)&ptr); + if (hr != DXFILE_OK) + { + IDirectXFileData_Release(data); + goto end; + } + + if (size != 44) + WARN("Material size %u does not match expected one %u\n", size, 44); + + values = (float*)ptr; + + IDirect3DRMMaterial2_SetAmbient(material, values[0], values [1], values[2]); /* Alpha ignored */ + IDirect3DRMMaterial2_SetPower(material, values[4]); + IDirect3DRMMaterial2_SetSpecular(material, values[5], values[6], values[7]); + IDirect3DRMMaterial2_SetEmissive(material, values[8], values[9], values[10]); + + This->material = material; + + IDirectXFileData_Release(data); + i++; + } + if (hr == S_OK) + WARN("Found more sub-objects than expected\n"); + else if (hr != DXFILEERR_NOMOREOBJECTS) + goto end; + hr = S_OK; } else {

1 0

Eric Pouech : dbghelp: Use build-id information to locate debug information (and prefer it over . debug_link when both are present).
by Alexandre Julliard June 1, 2012

June 1, 2012

Module: wine Branch: master Commit: d647bd108c5fa5350887b66353b8d2305f1d38b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d647bd108c5fa5350887b6635… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Thu May 31 21:41:23 2012 +0200 dbghelp: Use build-id information to locate debug information (and prefer it over .debug_link when both are present). --- dlls/dbghelp/elf_module.c | 163 ++++++++++++++++++++++++++++++++++++--------- 1 files changed, 132 insertions(+), 31 deletions(-) diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index e18c9ef..80352bc 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -890,25 +890,140 @@ found: } /****************************************************************** - * elf_debuglink_parse + * elf_locate_build_id_target * - * Parses a .gnu_debuglink section and loads the debug info from - * the external file specified there. + * Try to find the .so file containing the debug info out of the build-id note information */ -static BOOL elf_debuglink_parse(struct image_file_map* fmap, const struct module* module, - const BYTE* debuglink) +static BOOL elf_locate_build_id_target(struct image_file_map* fmap, const BYTE* id, unsigned idlen) { - /* The content of a debug link section is: - * 1/ a NULL terminated string, containing the file name for the - * debug info - * 2/ padding on 4 byte boundary - * 3/ CRC of the linked ELF file - */ - const char* dbg_link = (const char*)debuglink; - DWORD crc; + static const WCHAR globalDebugDirW[] = {'/','u','s','r','/','l','i','b','/','d','e','b','u','g','/'}; + static const WCHAR buildidW[] = {'.','b','u','i','l','d','-','i','d','/'}; + static const WCHAR dotDebug0W[] = {'.','d','e','b','u','g',0}; + struct image_file_map* fmap_link = NULL; + WCHAR* p; + WCHAR* z; + const BYTE* idend = id + idlen; + struct elf_map_file_data emfd; + + fmap_link = HeapAlloc(GetProcessHeap(), 0, sizeof(*fmap_link)); + if (!fmap_link) return FALSE; + + p = HeapAlloc(GetProcessHeap(), 0, + sizeof(globalDebugDirW) + sizeof(buildidW) + + (idlen * 2 + 1) * sizeof(WCHAR) + sizeof(dotDebug0W)); + z = p; + memcpy(z, globalDebugDirW, sizeof(globalDebugDirW)); + z += sizeof(globalDebugDirW) / sizeof(WCHAR); + memcpy(z, buildidW, sizeof(buildidW)); + z += sizeof(buildidW) / sizeof(WCHAR); + + if (id < idend) + { + *z++ = "0123456789abcdef"[*id >> 4 ]; + *z++ = "0123456789abcdef"[*id & 0x0F]; + id++; + } + if (id < idend) + *z++ = '/'; + while (id < idend) + { + *z++ = "0123456789abcdef"[*id >> 4 ]; + *z++ = "0123456789abcdef"[*id & 0x0F]; + id++; + } + memcpy(z, dotDebug0W, sizeof(dotDebug0W)); + TRACE("checking %s\n", wine_dbgstr_w(p)); + + emfd.kind = from_file; + emfd.u.file.filename = p; + if (elf_map_file(&emfd, fmap_link)) + { + struct image_section_map buildid_sect; + if (elf_find_section(fmap_link, ".note.gnu.build-id", SHT_NULL, &buildid_sect)) + { + const uint32_t* note; - crc = *(const DWORD*)(dbg_link + ((DWORD_PTR)(strlen(dbg_link) + 4) & ~3)); - return elf_locate_debug_link(fmap, dbg_link, module->module.LoadedImageName, crc); + note = (const uint32_t*)image_map_section(&buildid_sect); + if (note != IMAGE_NO_MAP) + { + /* the usual ELF note structure: name-size desc-size type <name> <desc> */ + if (note[2] == NT_GNU_BUILD_ID) + { + if (note[1] == idlen && + !memcmp(note + 3 + ((note[0] + 3) >> 2), idend - idlen, idlen)) + { + TRACE("Located debug information file at %s\n", debugstr_w(p)); + HeapFree(GetProcessHeap(), 0, p); + fmap->u.elf.alternate = fmap_link; + return TRUE; + } + WARN("mismatch in buildid information for %s\n", wine_dbgstr_w(p)); + } + } + image_unmap_section(&buildid_sect); + } + elf_unmap_file(fmap_link); + } + + TRACE("not found\n"); + HeapFree(GetProcessHeap(), 0, p); + HeapFree(GetProcessHeap(), 0, fmap_link); + return FALSE; +} + +/****************************************************************** + * elf_check_alternate + * + * Load alternate files for a given ELF file, looking at either .note.gnu_build-id + * or .gnu_debuglink sections. + */ +static BOOL elf_check_alternate(struct image_file_map* fmap, const struct module* module) +{ + BOOL ret = FALSE; + BOOL found = FALSE; + struct image_section_map buildid_sect, debuglink_sect; + + /* if present, add the .gnu_debuglink file as an alternate to current one */ + if (elf_find_section(fmap, ".note.gnu.build-id", SHT_NULL, &buildid_sect)) + { + const uint32_t* note; + + found = TRUE; + note = (const uint32_t*)image_map_section(&buildid_sect); + if (note != IMAGE_NO_MAP) + { + /* the usual ELF note structure: name-size desc-size type <name> <desc> */ + if (note[2] == NT_GNU_BUILD_ID) + { + ret = elf_locate_build_id_target(fmap, (const BYTE*)(note + 3 + ((note[0] + 3) >> 2)), note[1]); + } + } + image_unmap_section(&buildid_sect); + } + /* if present, add the .gnu_debuglink file as an alternate to current one */ + if (!ret && elf_find_section(fmap, ".gnu_debuglink", SHT_NULL, &debuglink_sect)) + { + const char* dbg_link; + + found = TRUE; + dbg_link = (const char*)image_map_section(&debuglink_sect); + if (dbg_link != IMAGE_NO_MAP) + { + /* The content of a debug link section is: + * 1/ a NULL terminated string, containing the file name for the + * debug info + * 2/ padding on 4 byte boundary + * 3/ CRC of the linked ELF file + */ + DWORD crc = *(const DWORD*)(dbg_link + ((DWORD_PTR)(strlen(dbg_link) + 4) & ~3)); + ret = elf_locate_debug_link(fmap, dbg_link, module->module.LoadedImageName, crc); + if (!ret) + WARN("Couldn't load linked debug file for %s\n", + debugstr_w(module->module.ModuleName)); + } + image_unmap_section(&debuglink_sect); + } + return found ? ret : TRUE; } /****************************************************************** @@ -949,24 +1064,10 @@ static BOOL elf_load_debug_info_from_map(struct module* module, if (!(dbghelp_options & SYMOPT_PUBLICS_ONLY)) { struct image_section_map stab_sect, stabstr_sect; - struct image_section_map debuglink_sect; - /* if present, add the .gnu_debuglink file as an alternate to current one */ - if (elf_find_section(fmap, ".gnu_debuglink", SHT_NULL, &debuglink_sect)) - { - const BYTE* dbg_link; + /* check if we need an alternate file (from debuglink or build-id) */ + ret = elf_check_alternate(fmap, module); - dbg_link = (const BYTE*)image_map_section(&debuglink_sect); - if (dbg_link != IMAGE_NO_MAP) - { - lret = elf_debuglink_parse(fmap, module, dbg_link); - if (!lret) - WARN("Couldn't load linked debug file for %s\n", - debugstr_w(module->module.ModuleName)); - ret = ret || lret; - } - image_unmap_section(&debuglink_sect); - } if (elf_find_section(fmap, ".stab", SHT_NULL, &stab_sect) && elf_find_section(fmap, ".stabstr", SHT_NULL, &stabstr_sect)) {

1 0

Alexandre Julliard : winex11: Use XGetKeyboardMapping instead of XKeycodeToKeysym.
by Alexandre Julliard June 1, 2012

June 1, 2012

Module: wine Branch: master Commit: c8a22a4d1f13c9b4f91084a2eed5b60083c82c58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8a22a4d1f13c9b4f91084a2e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 1 14:29:02 2012 +0200 winex11: Use XGetKeyboardMapping instead of XKeycodeToKeysym. --- dlls/winex11.drv/keyboard.c | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 7e49ffb..82fd26a 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -61,6 +61,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(keyboard); WINE_DECLARE_DEBUG_CHANNEL(key); static int min_keycode, max_keycode, keysyms_per_keycode; +static KeySym *key_mapping; static WORD keyc2vkey[256], keyc2scan[256]; static int NumLockMask, ScrollLockMask, AltGrMask; /* mask in the XKeyEvent state */ @@ -1106,7 +1107,7 @@ static inline KeySym keycode_to_keysym( Display *display, KeyCode keycode, int i #ifdef HAVE_XKB if (use_xkb) return XkbKeycodeToKeysym(display, keycode, 0, index); #endif - return XKeycodeToKeysym(display, keycode, index); + return key_mapping[(keycode - min_keycode) * keysyms_per_keycode + index]; } /* Returns the Windows virtual key code associated with the X event <e> */ @@ -1612,7 +1613,6 @@ static void set_kbd_layout_preload_key(void) */ void X11DRV_InitKeyboard( Display *display ) { - KeySym *ksp; XModifierKeymap *mmp; KeySym keysym; KeyCode *kcp; @@ -1645,11 +1645,9 @@ void X11DRV_InitKeyboard( Display *display ) wine_tsx11_lock(); XDisplayKeycodes(display, &min_keycode, &max_keycode); - ksp = XGetKeyboardMapping(display, min_keycode, - max_keycode + 1 - min_keycode, &keysyms_per_keycode); - /* We are only interested in keysyms_per_keycode. - There is no need to hold a local copy of the keysyms table */ - XFree(ksp); + if (key_mapping) XFree( key_mapping ); + key_mapping = XGetKeyboardMapping(display, min_keycode, + max_keycode + 1 - min_keycode, &keysyms_per_keycode); mmp = XGetModifierMapping(display); kcp = mmp->modifiermap;

1 0

Ken Thomases : winex11: Be more conservative when matching keys from built-in layout tables.
by Alexandre Julliard June 1, 2012

June 1, 2012

Module: wine Branch: master Commit: 43984f355a2905e16075a9df3d7fbe463761e853 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43984f355a2905e16075a9df3… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu May 31 15:33:23 2012 -0500 winex11: Be more conservative when matching keys from built-in layout tables. --- dlls/winex11.drv/keyboard.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 82fd26a..a2237e2 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -1729,7 +1729,7 @@ void X11DRV_InitKeyboard( Display *display ) * with appropriate ShiftMask and Mode_switch, use XLookupString * to get character in the local encoding. */ - ckey[i] = keysym & 0xFF; + ckey[i] = (keysym <= 0x7F) ? keysym : 0; } } else { ckey[i] = KEYBOARD_MapDeadKeysym(keysym);

1 0