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

Francois Gouget : wined3d: We must include Wine's port.h before using NAN.
by Alexandre Julliard 01 Jun '12

01 Jun '12

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

Jacek Caban : wininet: Properly set security flags for ERROR_INTERNET_SEC_CERT_DATE_INVALID.
by Alexandre Julliard 01 Jun '12

01 Jun '12

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

Jacek Caban : urlmon: Added support for more error codes in handle_http_error.
by Alexandre Julliard 01 Jun '12

01 Jun '12

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: Set correct security flags in InternetErrorDlg for ERROR_INTERNET_SEC_CERT_ERRORS .
by Alexandre Julliard 01 Jun '12

01 Jun '12

Module: wine Branch: master Commit: 2ef0676042767e470923e83496e335aca13057f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ef0676042767e470923e8349… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 1 16:42:09 2012 +0200 wininet: Set correct security flags in InternetErrorDlg for ERROR_INTERNET_SEC_CERT_ERRORS. --- dlls/wininet/dialogs.c | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/wininet/dialogs.c b/dlls/wininet/dialogs.c index 9674718..68c668e 100644 --- a/dlls/wininet/dialogs.c +++ b/dlls/wininet/dialogs.c @@ -539,13 +539,12 @@ static INT_PTR WINAPI WININET_InvalidCertificateDialog( flags |= SECURITY_FLAG_IGNORE_CERT_CN_INVALID; break; case ERROR_INTERNET_SEC_CERT_ERRORS: - FIXME("Should only add ignore flags as needed.\n"); - flags |= SECURITY_FLAG_IGNORE_CERT_CN_INVALID | - SECURITY_FLAG_IGNORE_CERT_DATE_INVALID | - SECURITY_FLAG_IGNORE_UNKNOWN_CA; - /* FIXME: ERROR_INTERNET_SEC_CERT_ERRORS also - * seems to set the corresponding DLG_* flags. - */ + if(flags & _SECURITY_FLAG_CERT_REV_FAILED) + flags |= SECURITY_FLAG_IGNORE_UNKNOWN_CA; + if(flags & _SECURITY_FLAG_CERT_INVALID_CN) + flags |= SECURITY_FLAG_IGNORE_CERT_CN_INVALID; + if(flags & _SECURITY_FLAG_CERT_INVALID_DATE) + flags |= SECURITY_FLAG_IGNORE_CERT_DATE_INVALID; break; } res = InternetSetOptionW( params->hRequest, INTERNET_OPTION_SECURITY_FLAGS, &flags, size );

1 0

Piotr Caban : msvcp90: Added partial basic_ostream<char> implementation.
by Alexandre Julliard 01 Jun '12

01 Jun '12

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 01 Jun '12

01 Jun '12

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

Henri Verbeet : ddraw/tests: Add test_coop_level_mode_set() for older ddraw versions.
by Alexandre Julliard 01 Jun '12

01 Jun '12

Module: wine Branch: master Commit: 4f85b3772d87a2ec894fc78dbb56bbaebb704fc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f85b3772d87a2ec894fc78db… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 1 17:22:47 2012 +0200 ddraw/tests: Add test_coop_level_mode_set() for older ddraw versions. --- dlls/ddraw/tests/ddraw1.c | 441 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 441 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 432 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 1314 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4f85b3772d87a2ec894fc…

1 0