September 2011 - Wine-commits

Alexandre Julliard : widl: Don' t output stubs for interfaces included in a typelib.
by Alexandre Julliard 06 Sep '11

06 Sep '11

Module: wine Branch: master Commit: 8e15db40a8ba15f7e43196a9a683fc5cb3595e78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e15db40a8ba15f7e43196a9a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 6 15:42:16 2011 +0200 widl: Don't output stubs for interfaces included in a typelib. --- tools/widl/client.c | 2 -- tools/widl/header.c | 2 -- tools/widl/proxy.c | 15 +++------------ tools/widl/server.c | 4 +--- tools/widl/typegen.c | 16 ++-------------- 5 files changed, 6 insertions(+), 33 deletions(-) diff --git a/tools/widl/client.c b/tools/widl/client.c index be42b1b..5c83588 100644 --- a/tools/widl/client.c +++ b/tools/widl/client.c @@ -472,8 +472,6 @@ static void write_client_ifaces(const statement_list_t *stmts, int expr_eval_rou write_stubdescriptor(iface, expr_eval_routines); } } - else if (stmt->type == STMT_LIBRARY) - write_client_ifaces(stmt->u.lib->stmts, expr_eval_routines, proc_offset); } } diff --git a/tools/widl/header.c b/tools/widl/header.c index 9d20a3e..579ef5c 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -987,8 +987,6 @@ static void write_local_stubs_stmts(FILE *local_stubs, const statement_list_t *s { if (stmt->type == STMT_TYPE && type_get_type(stmt->u.type) == TYPE_INTERFACE) write_locals(local_stubs, stmt->u.type, TRUE); - else if (stmt->type == STMT_LIBRARY) - write_local_stubs_stmts(local_stubs, stmt->u.lib->stmts); } } diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index 699e073..33ffbd3 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -754,12 +754,7 @@ static int does_any_iface(const statement_list_t *stmts, type_pred_t pred) if (stmts) LIST_FOR_EACH_ENTRY(stmt, stmts, const statement_t, entry) { - if (stmt->type == STMT_LIBRARY) - { - if (does_any_iface(stmt->u.lib->stmts, pred)) - return TRUE; - } - else if (stmt->type == STMT_TYPE && type_get_type(stmt->u.type) == TYPE_INTERFACE) + if (stmt->type == STMT_TYPE && type_get_type(stmt->u.type) == TYPE_INTERFACE) { if (pred(stmt->u.type)) return TRUE; @@ -834,9 +829,7 @@ static void write_proxy_stmts(const statement_list_t *stmts, unsigned int *proc_ const statement_t *stmt; if (stmts) LIST_FOR_EACH_ENTRY( stmt, stmts, const statement_t, entry ) { - if (stmt->type == STMT_LIBRARY) - write_proxy_stmts(stmt->u.lib->stmts, proc_offset); - else if (stmt->type == STMT_TYPE && type_get_type(stmt->u.type) == TYPE_INTERFACE) + if (stmt->type == STMT_TYPE && type_get_type(stmt->u.type) == TYPE_INTERFACE) { if (need_proxy(stmt->u.type)) write_proxy(stmt->u.type, proc_offset); @@ -860,9 +853,7 @@ static void build_iface_list( const statement_list_t *stmts, type_t **ifaces[], if (!stmts) return; LIST_FOR_EACH_ENTRY( stmt, stmts, const statement_t, entry ) { - if (stmt->type == STMT_LIBRARY) - build_iface_list(stmt->u.lib->stmts, ifaces, count); - else if (stmt->type == STMT_TYPE && type_get_type(stmt->u.type) == TYPE_INTERFACE) + if (stmt->type == STMT_TYPE && type_get_type(stmt->u.type) == TYPE_INTERFACE) { type_t *iface = stmt->u.type; if (type_iface_get_inherit(iface) && need_proxy(iface)) diff --git a/tools/widl/server.c b/tools/widl/server.c index 3a8810e..7f817b0 100644 --- a/tools/widl/server.c +++ b/tools/widl/server.c @@ -463,9 +463,7 @@ static void write_server_stmts(const statement_list_t *stmts, int expr_eval_rout const statement_t *stmt; if (stmts) LIST_FOR_EACH_ENTRY( stmt, stmts, const statement_t, entry ) { - if (stmt->type == STMT_LIBRARY) - write_server_stmts(stmt->u.lib->stmts, expr_eval_routines, proc_offset); - else if (stmt->type == STMT_TYPE && type_get_type(stmt->u.type) == TYPE_INTERFACE) + if (stmt->type == STMT_TYPE && type_get_type(stmt->u.type) == TYPE_INTERFACE) { type_t *iface = stmt->u.type; if (!need_stub(iface)) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index dfc5a50..5a22525 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1488,8 +1488,6 @@ static void write_procformatstring_stmts(FILE *file, int indent, const statement write_procformatstring_func( file, indent, iface, func, offset, count++ ); } } - else if (stmt->type == STMT_LIBRARY) - write_procformatstring_stmts(file, indent, stmt->u.lib->stmts, pred, offset); } } @@ -3624,12 +3622,7 @@ static unsigned int process_tfs_stmts(FILE *file, const statement_list_t *stmts, const type_t *iface; const statement_t *stmt_func; - if (stmt->type == STMT_LIBRARY) - { - process_tfs_stmts(file, stmt->u.lib->stmts, pred, typeformat_offset); - continue; - } - else if (stmt->type != STMT_TYPE || type_get_type(stmt->u.type) != TYPE_INTERFACE) + if (stmt->type != STMT_TYPE || type_get_type(stmt->u.type) != TYPE_INTERFACE) continue; iface = stmt->u.type; @@ -4510,12 +4503,7 @@ unsigned int get_size_procformatstring(const statement_list_t *stmts, type_pred_ const type_t *iface; const statement_t *stmt_func; - if (stmt->type == STMT_LIBRARY) - { - size += get_size_procformatstring(stmt->u.lib->stmts, pred) - 1; - continue; - } - else if (stmt->type != STMT_TYPE || type_get_type(stmt->u.type) != TYPE_INTERFACE) + if (stmt->type != STMT_TYPE || type_get_type(stmt->u.type) != TYPE_INTERFACE) continue; iface = stmt->u.type;

1 0

Bernhard Loos : widl: Also create proxies/ stubs for interfaces marked with oleautomation.
by Alexandre Julliard 06 Sep '11

06 Sep '11

Module: wine Branch: master Commit: 00ab883644380fa4249948b38b5a30c117aa8046 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00ab883644380fa4249948b38… Author: Bernhard Loos <bernhardloos(a)googlemail.com> Date: Tue Sep 6 09:51:25 2011 +0200 widl: Also create proxies/stubs for interfaces marked with oleautomation. --- tools/widl/proxy.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index 33ffbd3..820e263 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -768,7 +768,6 @@ int need_proxy(const type_t *iface) { if (!is_object( iface )) return 0; if (is_local( iface->attrs )) return 0; - if (is_attr( iface->attrs, ATTR_OLEAUTOMATION )) return 0; if (is_attr( iface->attrs, ATTR_DISPINTERFACE )) return 0; return 1; }

1 0

Jacek Caban : vbscript: Added beginning parser implementation.
by Alexandre Julliard 06 Sep '11

06 Sep '11

Module: wine Branch: master Commit: 80bcaf8d7ba68aea7090cac2a18e4e7a13147e88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80bcaf8d7ba68aea7090cac2a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 6 15:18:40 2011 +0200 vbscript: Added beginning parser implementation. --- .gitignore | 2 + dlls/vbscript/Makefile.in | 3 ++ dlls/vbscript/parse.h | 28 ++++++++++++++ dlls/vbscript/parser.y | 87 +++++++++++++++++++++++++++++++++++++++++++++ dlls/vbscript/vbscript.c | 13 ++++++- 5 files changed, 132 insertions(+), 1 deletions(-) diff --git a/.gitignore b/.gitignore index 416de9a..40b3697 100644 --- a/.gitignore +++ b/.gitignore @@ -121,6 +121,8 @@ dlls/sti/sti_wia.h dlls/sti/sti_wia_p.c dlls/urlmon/urlmon_urlmon.h dlls/urlmon/urlmon_urlmon_p.c +dlls/vbscript/parser.tab.c +dlls/vbscript/parser.tab.h dlls/vbscript/vbscript_classes.h dlls/windowscodecs/windowscodecs_wincodec.h dlls/windowscodecs/windowscodecs_wincodec_p.c diff --git a/dlls/vbscript/Makefile.in b/dlls/vbscript/Makefile.in index 40e489a..83a490d 100644 --- a/dlls/vbscript/Makefile.in +++ b/dlls/vbscript/Makefile.in @@ -5,6 +5,9 @@ C_SRCS = \ vbscript.c \ vbscript_main.c +BISON_SRCS = \ + parser.y + RC_SRCS = vbscript.rc IDL_H_SRCS = vbscript_classes.idl diff --git a/dlls/vbscript/parse.h b/dlls/vbscript/parse.h new file mode 100644 index 0000000..4c3abba --- /dev/null +++ b/dlls/vbscript/parse.h @@ -0,0 +1,28 @@ +/* + * Copyright 2011 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +typedef struct { + const WCHAR *code; + const WCHAR *ptr; + const WCHAR *end; + + BOOL parse_complete; + HRESULT hres; +} parser_ctx_t; + +HRESULT parse_script(parser_ctx_t*,const WCHAR*); diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y new file mode 100644 index 0000000..3871b62 --- /dev/null +++ b/dlls/vbscript/parser.y @@ -0,0 +1,87 @@ +/* + * Copyright 2011 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +%{ + +#include "vbscript.h" +#include "parse.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(vbscript); + + +#define YYLEX_PARAM ctx +#define YYPARSE_PARAM ctx + +static int parser_error(const char*); + +static void parse_complete(parser_ctx_t*); + +static int parser_lex(void *lval, parser_ctx_t *ctx) +{ + FIXME("\n"); + return 0; +} + +%} + +%pure_parser +%start Program + +%token tEOF + +%union { + const WCHAR *string; +} + +%% + +Program : tEOF { parse_complete(ctx); } + +%% + +static int parser_error(const char *str) +{ + return 0; +} + +static void parse_complete(parser_ctx_t *ctx) +{ + ctx->parse_complete = TRUE; +} + +HRESULT parse_script(parser_ctx_t *ctx, const WCHAR *code) +{ + ctx->code = ctx->ptr = code; + ctx->end = ctx->code + strlenW(ctx->code); + + ctx->parse_complete = FALSE; + ctx->hres = S_OK; + + parser_parse(ctx); + + if(FAILED(ctx->hres)) + return ctx->hres; + if(!ctx->parse_complete) { + FIXME("parser failed on parsing %s\n", debugstr_w(ctx->ptr)); + return E_FAIL; + } + + return S_OK; +} diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index 77ccaee..53e90eb 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -20,6 +20,8 @@ #include <assert.h> #include "vbscript.h" +#include "parse.h" + #include "objsafe.h" #include "wine/debug.h" @@ -512,9 +514,18 @@ static HRESULT WINAPI VBScriptParse_ParseScriptText(IActiveScriptParse *iface, DWORD dwFlags, VARIANT *pvarResult, EXCEPINFO *pexcepinfo) { VBScript *This = impl_from_IActiveScriptParse(iface); - FIXME("(%p)->(%s %s %p %s %s %u %x %p %p)\n", This, debugstr_w(pstrCode), + parser_ctx_t parser; + HRESULT hres; + + TRACE("(%p)->(%s %s %p %s %s %u %x %p %p)\n", This, debugstr_w(pstrCode), debugstr_w(pstrItemName), punkContext, debugstr_w(pstrDelimiter), wine_dbgstr_longlong(dwSourceContextCookie), ulStartingLine, dwFlags, pvarResult, pexcepinfo); + + hres = parse_script(&parser, pstrCode); + if(FAILED(hres)) + return hres; + + FIXME("compiling script not implemented\n"); return E_NOTIMPL; }

1 0

Jacek Caban : vbscript: Added beginning lexer implementation.
by Alexandre Julliard 06 Sep '11

06 Sep '11

Module: wine Branch: master Commit: f8e72b295c2b5c3aa4783d753d9b15d649ac1460 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8e72b295c2b5c3aa4783d753… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 6 15:18:55 2011 +0200 vbscript: Added beginning lexer implementation. --- dlls/vbscript/Makefile.in | 1 + dlls/vbscript/lex.c | 56 +++++++++++++++++++++++++++++++++++++++++++++ dlls/vbscript/parse.h | 6 ++++- dlls/vbscript/parser.y | 11 ++++----- 4 files changed, 67 insertions(+), 7 deletions(-) diff --git a/dlls/vbscript/Makefile.in b/dlls/vbscript/Makefile.in index 83a490d..ba267f4 100644 --- a/dlls/vbscript/Makefile.in +++ b/dlls/vbscript/Makefile.in @@ -1,6 +1,7 @@ MODULE = vbscript.dll C_SRCS = \ + lex.c \ vbdisp.c \ vbscript.c \ vbscript_main.c diff --git a/dlls/vbscript/lex.c b/dlls/vbscript/lex.c new file mode 100644 index 0000000..0e7ecce --- /dev/null +++ b/dlls/vbscript/lex.c @@ -0,0 +1,56 @@ +/* + * Copyright 2011 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <assert.h> + +#include "vbscript.h" +#include "parse.h" +#include "parser.tab.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(vbscript); + +static int parse_next_token(void *lval, parser_ctx_t *ctx) +{ + WCHAR c; + + while(*ctx->ptr == ' ' || *ctx->ptr == '\t' || *ctx->ptr == '\r') + ctx->ptr++; + if(ctx->ptr == ctx->end) + return ctx->last_token == tNL ? tEOF : tNL; + + c = *ctx->ptr; + FIXME("Unhandled char %c in %s\n", *ctx->ptr, debugstr_w(ctx->ptr)); + return c; +} + +int parser_lex(void *lval, parser_ctx_t *ctx) +{ + int ret; + + while(1) { + ret = parse_next_token(lval, ctx); + if(ret != tNL || ctx->last_token != tNL) + break; + + ctx->last_nl = ctx->ptr-ctx->code; + } + + return (ctx->last_token = ret); +} diff --git a/dlls/vbscript/parse.h b/dlls/vbscript/parse.h index 4c3abba..d6dfbbc 100644 --- a/dlls/vbscript/parse.h +++ b/dlls/vbscript/parse.h @@ -23,6 +23,10 @@ typedef struct { BOOL parse_complete; HRESULT hres; + + int last_token; + unsigned last_nl; } parser_ctx_t; -HRESULT parse_script(parser_ctx_t*,const WCHAR*); +HRESULT parse_script(parser_ctx_t*,const WCHAR*) DECLSPEC_HIDDEN; +int parser_lex(void*,parser_ctx_t*) DECLSPEC_HIDDEN; diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 3871b62..e895cfd 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -33,12 +33,6 @@ static int parser_error(const char*); static void parse_complete(parser_ctx_t*); -static int parser_lex(void *lval, parser_ctx_t *ctx) -{ - FIXME("\n"); - return 0; -} - %} %pure_parser @@ -50,6 +44,8 @@ static int parser_lex(void *lval, parser_ctx_t *ctx) const WCHAR *string; } +%token tNL + %% Program : tEOF { parse_complete(ctx); } @@ -74,6 +70,9 @@ HRESULT parse_script(parser_ctx_t *ctx, const WCHAR *code) ctx->parse_complete = FALSE; ctx->hres = S_OK; + ctx->last_token = tNL; + ctx->last_nl = 0; + parser_parse(ctx); if(FAILED(ctx->hres))

1 0

Francois Gouget : po: Remove English strings from the Czech translation.
by Alexandre Julliard 06 Sep '11

06 Sep '11

Module: wine Branch: master Commit: 7ca20b191ec5b9cf2bf7bed237ed6c3c32ce9dc2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ca20b191ec5b9cf2bf7bed23… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Sep 6 10:53:46 2011 +0200 po: Remove English strings from the Czech translation. --- po/cs.po | 174 ++++++++++++++++++------------------------------------------- 1 files changed, 52 insertions(+), 122 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7ca20b191ec5b9cf2bf7b…

1 0

Francois Gouget : po: Remove English strings from the Greek translation.
by Alexandre Julliard 06 Sep '11

06 Sep '11

Module: wine Branch: master Commit: fee93e20aac0ec4c839bf24ddbb29b52f479f9e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fee93e20aac0ec4c839bf24dd… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Sep 6 15:11:07 2011 +0200 po: Remove English strings from the Greek translation. --- po/el.po | 132 ++++++++++++++++++++++++-------------------------------------- 1 files changed, 51 insertions(+), 81 deletions(-) diff --git a/po/el.po b/po/el.po index 7ca3d10..16a70c7 100644 --- a/po/el.po +++ b/po/el.po @@ -141,11 +141,11 @@ msgstr "Μετάβαση στα σημερινά" #: comdlg32.rc:29 msgid "&About FolderPicker Test" -msgstr "&About FolderPicker Test" +msgstr "" #: comdlg32.rc:30 msgid "Document Folders" -msgstr "Document Folders" +msgstr "" #: comdlg32.rc:31 shell32.rc:199 msgid "My Documents" @@ -157,7 +157,7 @@ msgstr "Τα Αγαπημένα μου" #: comdlg32.rc:33 msgid "System Path" -msgstr "System Path" +msgstr "" #: comdlg32.rc:34 shell32.rc:153 winecfg.rc:97 winefile.rc:103 #, fuzzy @@ -244,7 +244,7 @@ msgstr "Λεπτομέρειες" #: comdlg32.rc:59 msgid "Browse to Desktop" -msgstr "Browse to Desktop" +msgstr "" #: comdlg32.rc:123 msgid "Regular" @@ -268,7 +268,7 @@ msgstr "Μαύρο" #: comdlg32.rc:132 wordpad.rc:115 msgid "Maroon" -msgstr "Maroon" +msgstr "" #: comdlg32.rc:133 wordpad.rc:116 msgid "Green" @@ -276,11 +276,11 @@ msgstr "Πράσινο" #: comdlg32.rc:134 wordpad.rc:117 msgid "Olive" -msgstr "Olive" +msgstr "" #: comdlg32.rc:135 wordpad.rc:118 msgid "Navy" -msgstr "Navy" +msgstr "" #: comdlg32.rc:136 wordpad.rc:119 msgid "Purple" @@ -288,7 +288,7 @@ msgstr "Μωβ" #: comdlg32.rc:137 wordpad.rc:120 msgid "Teal" -msgstr "Teal" +msgstr "" #: comdlg32.rc:138 wordpad.rc:121 msgid "Gray" @@ -304,7 +304,7 @@ msgstr "Κόκκινο" #: comdlg32.rc:141 wordpad.rc:124 msgid "Lime" -msgstr "Lime" +msgstr "" #: comdlg32.rc:142 wordpad.rc:125 msgid "Yellow" @@ -316,11 +316,11 @@ msgstr "Μπλε" #: comdlg32.rc:144 wordpad.rc:127 msgid "Fuchsia" -msgstr "Fuchsia" +msgstr "" #: comdlg32.rc:145 wordpad.rc:128 msgid "Aqua" -msgstr "Aqua" +msgstr "" #: comdlg32.rc:146 wordpad.rc:129 msgid "White" @@ -335,33 +335,26 @@ msgid "" "This value does not lie within the page range.\n" "Please enter a value between %d and %d." msgstr "" -"This value does not lie within the page range.\n" -"Please enter a value between %d and %d." #: comdlg32.rc:70 msgid "The 'from' entry cannot exceed the 'to' entry." -msgstr "The 'from' entry cannot exceed the 'to' entry." +msgstr "" #: comdlg32.rc:72 msgid "" "Margins overlap or fall outside Paper boundaries.\n" "Please reenter margins." msgstr "" -"Margins overlap or fall outside Paper boundaries.\n" -"Please reenter margins." #: comdlg32.rc:74 -#, fuzzy msgid "The 'Number of copies' field cannot be empty." -msgstr "The number of 'Number of copies' value cannot be empty." +msgstr "" #: comdlg32.rc:76 msgid "" "This large number of copies is not supported by your printer.\n" "Please enter a value between 1 and %d." msgstr "" -"This large number of copies is not supported by your printer.\n" -"Please enter a value between 1 and %d." #: comdlg32.rc:77 msgid "A printer error occurred." @@ -377,7 +370,7 @@ msgstr "Δεν ήταν δυνατή η εύρεση του εκτυπωτή." #: comdlg32.rc:80 progman.rc:73 msgid "Out of memory." -msgstr "Out of memory." +msgstr "" #: comdlg32.rc:81 msgid "An error occurred." @@ -392,8 +385,6 @@ msgid "" "Before you can perform printer-related tasks such as page setup or printing " "a document, you need to install a printer. Please install one and retry." msgstr "" -"Before you can perform printer-related tasks such as page setup or printing " -"a document, you need to install a printer. Please install one and retry." #: comdlg32.rc:151 msgid "Select a font size between %d and %d points." @@ -433,11 +424,11 @@ msgstr "Σφάλμα; " #: comdlg32.rc:96 msgid "Pending deletion; " -msgstr "Pending deletion; " +msgstr "" #: comdlg32.rc:97 msgid "Paper jam; " -msgstr "Paper jam; " +msgstr "" #: comdlg32.rc:98 msgid "Out of paper; " @@ -445,7 +436,7 @@ msgstr "Τέλος χαρτιού; " #: comdlg32.rc:99 msgid "Feed paper manual; " -msgstr "Feed paper manual; " +msgstr "" #: comdlg32.rc:100 msgid "Paper problem; " @@ -457,7 +448,7 @@ msgstr "Εκτυπωτής αποσυνδεδεμένος; " #: comdlg32.rc:102 msgid "I/O Active; " -msgstr "I/O Active; " +msgstr "" #: comdlg32.rc:103 msgid "Busy; " @@ -469,7 +460,7 @@ msgstr "Γίνεται εκτύπωση; " #: comdlg32.rc:105 msgid "Output tray is full; " -msgstr "Output tray is full; " +msgstr "" #: comdlg32.rc:106 msgid "Not available; " @@ -481,7 +472,7 @@ msgstr "Αναμονή; " #: comdlg32.rc:108 msgid "Processing; " -msgstr "Processing; " +msgstr "" #: comdlg32.rc:109 msgid "Initialising; " @@ -501,27 +492,27 @@ msgstr "Δεν υπάρχει τόνερ; " #: comdlg32.rc:113 msgid "Page punt; " -msgstr "Page punt; " +msgstr "" #: comdlg32.rc:114 msgid "Interrupted by user; " -msgstr "Interrupted by user; " +msgstr "" #: comdlg32.rc:115 msgid "Out of memory; " -msgstr "Out of memory; " +msgstr "" #: comdlg32.rc:116 msgid "The printer door is open; " -msgstr "The printer door is open; " +msgstr "" #: comdlg32.rc:117 msgid "Print server unknown; " -msgstr "Print server unknown; " +msgstr "" #: comdlg32.rc:118 msgid "Power save mode; " -msgstr "Power save mode; " +msgstr "" #: comdlg32.rc:87 msgid "Default Printer; " @@ -533,11 +524,11 @@ msgstr "Υπάρχουν %d έγγραφα στην ουρά" #: comdlg32.rc:89 msgid "Margins [inches]" -msgstr "Margins [inches]" +msgstr "" #: comdlg32.rc:90 msgid "Margins [mm]" -msgstr "Margins [mm]" +msgstr "" #: comdlg32.rc:91 sane.rc:33 #, fuzzy @@ -1872,9 +1863,8 @@ msgid "Certificate Export Wizard" msgstr "" #: cryptui.rc:148 -#, fuzzy msgid "Export Format" -msgstr "Forward" +msgstr "" #: cryptui.rc:149 msgid "Choose the format in which the content will be saved." @@ -1913,9 +1903,8 @@ msgid "Serialized Certificate Store (*.sst)" msgstr "" #: cryptui.rc:160 -#, fuzzy msgid "File Format" -msgstr "Forward" +msgstr "" #: cryptui.rc:161 msgid "Include all certificates in certificate path" @@ -2006,15 +1995,13 @@ msgid "&Back" msgstr "Πίσω" #: hhctrl.rc:58 -#, fuzzy msgid "&Forward" -msgstr "Forward" +msgstr "" #: hhctrl.rc:59 -#, fuzzy msgctxt "table of contents" msgid "&Home" -msgstr "Home" +msgstr "" #: hhctrl.rc:60 #, fuzzy @@ -2037,7 +2024,7 @@ msgstr "&Περιεχόμενα" #: hhctrl.rc:29 msgid "I&ndex" -msgstr "I&ndex" +msgstr "" #: hhctrl.rc:30 notepad.rc:52 msgid "&Search" @@ -2076,10 +2063,9 @@ msgid "Back" msgstr "Πίσω" #: hhctrl.rc:44 -#, fuzzy msgctxt "table of contents" msgid "Home" -msgstr "Home" +msgstr "" #: hhctrl.rc:45 msgid "Sync" @@ -2091,7 +2077,7 @@ msgstr "Επιλογές" #: hhctrl.rc:48 ieframe.rc:64 msgid "Forward" -msgstr "Forward" +msgstr "" #: iccvid.rc:25 iccvid.rc:26 msgid "Cinepak Video codec" @@ -2180,10 +2166,9 @@ msgid "&About Internet Explorer" msgstr "" #: ieframe.rc:67 -#, fuzzy msgctxt "home page" msgid "Home" -msgstr "Home" +msgstr "" #: ieframe.rc:68 winhlp32.rc:66 #, fuzzy @@ -2207,9 +2192,8 @@ msgid "Security settings for zone: " msgstr "" #: inetcpl.rc:31 -#, fuzzy msgid "Custom" -msgstr "Customize" +msgstr "" #: inetcpl.rc:32 msgid "Very Low" @@ -2374,9 +2358,8 @@ msgid "Memory trashed\n" msgstr "" #: winerror.mc:66 -#, fuzzy msgid "Not enough memory\n" -msgstr "Out of memory." +msgstr "" #: winerror.mc:71 msgid "Invalid block\n" @@ -2399,9 +2382,8 @@ msgid "Invalid data\n" msgstr "" #: winerror.mc:96 -#, fuzzy msgid "Out of memory\n" -msgstr "Out of memory." +msgstr "" #: winerror.mc:101 msgid "Invalid drive\n" @@ -3550,9 +3532,8 @@ msgid "DLL not found\n" msgstr "Το αρχείο δε βρέθηκε" #: winerror.mc:1516 -#, fuzzy msgid "Out of user handles\n" -msgstr "Out of memory." +msgstr "" #: winerror.mc:1521 msgid "Message can only be used in synchronous calls\n" @@ -3583,9 +3564,8 @@ msgid "The device requires cleaning\n" msgstr "" #: winerror.mc:1556 -#, fuzzy msgid "The device door is open\n" -msgstr "The printer door is open; " +msgstr "" #: winerror.mc:1561 #, fuzzy @@ -4540,9 +4520,8 @@ msgid "Installer service failed.\n" msgstr "" #: winerror.mc:2731 -#, fuzzy msgid "Installation aborted by user\n" -msgstr "Interrupted by user; " +msgstr "" #: winerror.mc:2736 msgid "Installation failure\n" @@ -4805,9 +4784,8 @@ msgid "Can't create endpoint\n" msgstr "" #: winerror.mc:3036 -#, fuzzy msgid "Out of resources\n" -msgstr "Out of memory." +msgstr "" #: winerror.mc:3041 msgid "RPC server unavailable\n" @@ -5911,9 +5889,8 @@ msgid "Type the path where the file is located, and then click OK." msgstr "" #: shdoclc.rc:39 -#, fuzzy msgid "F&orward" -msgstr "Forward" +msgstr "" #: shdoclc.rc:41 msgid "&Save Background As..." @@ -6682,9 +6659,8 @@ msgid "Are you sure you wish to permanently delete these %1 items?" msgstr "" #: shell32.rc:257 -#, fuzzy msgid "Confirm deletion" -msgstr "Pending deletion; " +msgstr "" #: shell32.rc:258 #, fuzzy @@ -6707,9 +6683,8 @@ msgstr "" "Θέλετε να το αντικαταστήσετε;" #: shell32.rc:260 -#, fuzzy msgid "Confirm overwrite" -msgstr "Pending deletion; " +msgstr "" #: shell32.rc:277 msgid "" @@ -10520,9 +10495,8 @@ msgid "&Expert" msgstr "" #: winemine.rc:42 -#, fuzzy msgid "&Custom..." -msgstr "Customize" +msgstr "" #: winemine.rc:44 msgid "&Fastest Times" @@ -10609,9 +10583,8 @@ msgid "Summary" msgstr "" #: winhlp32.rc:84 -#, fuzzy msgid "&Index" -msgstr "I&ndex" +msgstr "" #: winhlp32.rc:88 msgid "Help files (*.hlp)" @@ -10707,9 +10680,8 @@ msgid "&Date and time..." msgstr "" #: wordpad.rc:79 -#, fuzzy msgid "F&ormat" -msgstr "Forward" +msgstr "" #: wordpad.rc:82 wordpad.rc:105 msgid "&Bullet points" @@ -10813,14 +10785,12 @@ msgid "One page" msgstr "" #: wordpad.rc:167 -#, fuzzy msgid "Zoom in" -msgstr "Zoom" +msgstr "" #: wordpad.rc:168 -#, fuzzy msgid "Zoom out" -msgstr "Zoom" +msgstr "" #: wordpad.rc:170 msgid "Page"

1 0

Francois Gouget : po: Remove English strings from the Spanish translation.
by Alexandre Julliard 06 Sep '11

06 Sep '11

Module: wine Branch: master Commit: 06bdd386984ac2e7adcacc705b22fd23b06b6eed URL: http://source.winehq.org/git/wine.git/?a=commit;h=06bdd386984ac2e7adcacc705… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Sep 6 15:13:40 2011 +0200 po: Remove English strings from the Spanish translation. --- po/es.po | 52 +++------------------------------------------------- 1 files changed, 3 insertions(+), 49 deletions(-) diff --git a/po/es.po b/po/es.po index 9d4f6cf..d91d2d6 100644 --- a/po/es.po +++ b/po/es.po @@ -1126,9 +1126,8 @@ msgid "Smart Card Logon" msgstr "" #: crypt32.rc:156 cryptui.rc:139 -#, fuzzy msgid "Digital Rights" -msgstr "&Digital" +msgstr "" #: crypt32.rc:157 cryptui.rc:135 msgid "Qualified Subordination" @@ -5717,7 +5716,6 @@ msgid "insert disk %s" msgstr "inserte el disco %s" #: msi.rc:30 -#, fuzzy msgid "" "Windows Installer %s\n" "\n" @@ -5749,35 +5747,6 @@ msgid "" "\t/help\n" "\t/?\n" msgstr "" -"Windows Installer %s\n" -"\n" -"Usage:\n" -"msiexec command {required parameter} [optional parammeter]\n" -"\n" -"Install a product:\n" -"\t/i {package|productcode} [property]\n" -"\t/package {package|productcode} [property]\n" -"\t/a package [property]\n" -"Repair an installation:\n" -"\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\n" -"Uninstall a product:\n" -"\t/uninstall {package|productcode} [property]\n" -"\t/x {package|productcode} [property]\n" -"Advertise a product:\n" -"\t/j[u|m] package [/t transform] [/g languageid]\n" -"Apply a patch:\n" -"\t/p patchpackage [property]\n" -"\t/p patchpackage /a package [property]\n" -"Log and UI Modifiers for above commands:\n" -"\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] logfile\n" -"\t/q{|n|b|r|f|n+|b+|b-}\n" -"Register MSI Service:\n" -"\t/y\n" -"Unregister MSI Service:\n" -"\t/z\n" -"Display this help:\n" -"\t/help\n" -"\t/?\n" #: msi.rc:57 msgid "enter which folder contains %s" @@ -7104,19 +7073,6 @@ msgid "" "along with Wine; if not, write to the Free Software Foundation, Inc., 51 " "Franklin St, Fifth Floor, Boston, MA 02110-1301, USA." msgstr "" -"Wine is free software; you can redistribute it and/or modify it under the " -"terms of the GNU Lesser General Public License as published by the Free " -"Software Foundation; either version 2.1 of the License, or (at your option) " -"any later version.\n" -"\n" -"Wine is distributed in the hope that it will be useful, but WITHOUT ANY " -"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " -"FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for " -"more details.\n" -"\n" -"You should have received a copy of the GNU Lesser General Public License " -"along with Wine; if not, write to the Free Software Foundation, Inc., 51 " -"Franklin St, Fifth Floor, Boston, MA 02110-1301, USA." #: shell32.rc:265 msgid "Wine License" @@ -11745,14 +11701,12 @@ msgid "One page" msgstr "" #: wordpad.rc:167 -#, fuzzy msgid "Zoom in" -msgstr "Zoom" +msgstr "" #: wordpad.rc:168 -#, fuzzy msgid "Zoom out" -msgstr "Zoom" +msgstr "" #: wordpad.rc:170 #, fuzzy

1 0

Alistair Leslie-Hughes : msxml3: Correct MSXML object safety tests.
by Alexandre Julliard 06 Sep '11

06 Sep '11

Module: wine Branch: master Commit: 33736bb871f503f0163699e657987681384942e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33736bb871f503f0163699e65… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Aug 30 22:27:02 2011 +1000 msxml3: Correct MSXML object safety tests. --- dlls/msxml3/domdoc.c | 3 ++- dlls/msxml3/httprequest.c | 3 ++- dlls/msxml3/tests/domdoc.c | 21 +++++++++++---------- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 2b2416d..d4fcc1c 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -3430,7 +3430,8 @@ static HRESULT WINAPI domdoc_Safety_SetInterfaceSafetyOptions(IObjectSafety *ifa if ((mask & ~SAFETY_SUPPORTED_OPTIONS) != 0) return E_FAIL; - This->safeopt = enabled & mask & SAFETY_SUPPORTED_OPTIONS; + This->safeopt = (This->safeopt & ~mask) | (mask & enabled); + return S_OK; } diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index 436380c..8203129 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -1131,7 +1131,8 @@ static HRESULT WINAPI httprequest_Safety_SetInterfaceSafetyOptions(IObjectSafety if ((mask & ~SAFETY_SUPPORTED_OPTIONS) != 0) return E_FAIL; - This->safeopt = enabled & mask & SAFETY_SUPPORTED_OPTIONS; + This->safeopt = (This->safeopt & ~mask) | (mask & enabled); + return S_OK; } diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 2c3de42..42b3b05 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -4457,11 +4457,11 @@ static void _test_IObjectSafety_common(unsigned line, IObjectSafety *safety) ok_(__FILE__,line)(hr == S_OK, "ret %08x\n", hr ); hr = IObjectSafety_GetInterfaceSafetyOptions(safety, NULL, &supported, &enabled); ok_(__FILE__,line)(hr == S_OK, "ret %08x\n", hr ); - todo_wine - ok_(__FILE__,line)(broken(enabled == INTERFACESAFE_FOR_UNTRUSTED_CALLER) || - enabled == (INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACE_USES_SECURITY_MANAGER) /* msxml3 SP8+ */, - "Expected (INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACE_USES_SECURITY_MANAGER), " - "got %08x\n", enabled); + ok_(__FILE__,line)(enabled == INTERFACESAFE_FOR_UNTRUSTED_CALLER, "Expected INTERFACESAFE_FOR_UNTRUSTED_CALLER got %08x\n", enabled); + ok_(__FILE__,line)(broken(supported == INTERFACESAFE_FOR_UNTRUSTED_CALLER) || + supported == (INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACESAFE_FOR_UNTRUSTED_DATA | INTERFACE_USES_SECURITY_MANAGER) /* msxml3 SP8+ */, + "Expected (INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACESAFE_FOR_UNTRUSTED_DATA | INTERFACE_USES_SECURITY_MANAGER), " + "got %08x\n", supported); hr = IObjectSafety_SetInterfaceSafetyOptions(safety, NULL, INTERFACESAFE_FOR_UNTRUSTED_DATA, @@ -4469,11 +4469,12 @@ static void _test_IObjectSafety_common(unsigned line, IObjectSafety *safety) ok_(__FILE__,line)(hr == S_OK, "ret %08x\n", hr ); hr = IObjectSafety_GetInterfaceSafetyOptions(safety, NULL, &supported, &enabled); ok_(__FILE__,line)(hr == S_OK, "ret %08x\n", hr ); - todo_wine - ok_(__FILE__,line)(broken(enabled == INTERFACESAFE_FOR_UNTRUSTED_DATA) || - enabled == (INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACESAFE_FOR_UNTRUSTED_DATA) /* msxml3 SP8+ */, - "Expected (INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACESAFE_FOR_UNTRUSTED_DATA), " - "got %08x\n", enabled); + ok_(__FILE__,line)(enabled == (INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACESAFE_FOR_UNTRUSTED_DATA), + "expected INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACESAFE_FOR_UNTRUSTED_DATA got %08x\n", enabled); + ok_(__FILE__,line)(broken(supported == INTERFACESAFE_FOR_UNTRUSTED_DATA) || + supported == (INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACESAFE_FOR_UNTRUSTED_DATA | INTERFACE_USES_SECURITY_MANAGER) /* msxml3 SP8+ */, + "Expected (INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACESAFE_FOR_UNTRUSTED_DATA | INTERFACE_USES_SECURITY_MANAGER), " + "got %08x\n", supported); } static void test_XMLHTTP(void)

1 0

Alistair Leslie-Hughes : rasapi32: Return error on invalid parameters.
by Alexandre Julliard 06 Sep '11

06 Sep '11

Module: wine Branch: master Commit: 7025db431b8086a1ca5156fe0bb2e290f824a999 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7025db431b8086a1ca5156fe0… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Sep 6 22:51:44 2011 +1000 rasapi32: Return error on invalid parameters. --- dlls/rasapi32/rasapi.c | 4 ++++ dlls/rasapi32/tests/rasapi.c | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/rasapi32/rasapi.c b/dlls/rasapi32/rasapi.c index 704a8bc..2184a22 100644 --- a/dlls/rasapi32/rasapi.c +++ b/dlls/rasapi32/rasapi.c @@ -250,6 +250,10 @@ DWORD WINAPI RasEnumDevicesA(LPRASDEVINFOA lpRasDevinfo, LPDWORD lpcb, LPDWORD l return ERROR_INVALID_PARAMETER; FIXME("(%p,%p,%p),stub!\n",lpRasDevinfo,lpcb,lpcDevices); + + if(lpRasDevinfo && lpRasDevinfo->dwSize != sizeof(RASDEVINFOA)) + return ERROR_INVALID_SIZE; + if (!lpRasDevinfo || (*lpcb < sizeof(RASDEVINFOA))) { *lpcb = sizeof(RASDEVINFOA); return ERROR_BUFFER_TOO_SMALL; diff --git a/dlls/rasapi32/tests/rasapi.c b/dlls/rasapi32/tests/rasapi.c index d25c741..e0ff25f 100644 --- a/dlls/rasapi32/tests/rasapi.c +++ b/dlls/rasapi32/tests/rasapi.c @@ -85,7 +85,6 @@ static void test_rasenum(void) rasDevInfo[0].dwSize = 0; cb = bufsize; result = pRasEnumDevicesA(rasDevInfo, &cb, &cDevices); - todo_wine ok(result == ERROR_INVALID_SIZE || result == ERROR_INVALID_USER_BUFFER, /* win98 */ "Expected ERROR_INVALID_SIZE, got %08d\n", result); @@ -93,7 +92,6 @@ static void test_rasenum(void) rasDevInfo[0].dwSize = sizeof(RASDEVINFOA) -1; cb = bufsize; result = pRasEnumDevicesA(rasDevInfo, &cb, &cDevices); - todo_wine ok(result == ERROR_INVALID_SIZE || result == ERROR_INVALID_USER_BUFFER, /* win98 */ "Expected ERROR_INVALID_SIZE, got %08d\n", result); @@ -101,7 +99,6 @@ static void test_rasenum(void) rasDevInfo[0].dwSize = sizeof(RASDEVINFOA) +1; cb = bufsize; result = pRasEnumDevicesA(rasDevInfo, &cb, &cDevices); - todo_wine ok(result == ERROR_INVALID_SIZE || result == ERROR_INVALID_USER_BUFFER, /* win98 */ "Expected ERROR_INVALID_SIZE, got %08d\n", result); @@ -151,7 +148,6 @@ static void test_rasenum(void) cb = 0; rasDevInfo[0].dwSize = 0; result = pRasEnumDevicesA(rasDevInfo, &cb, &cDevices); - todo_wine ok(result == ERROR_INVALID_SIZE || broken(result == ERROR_BUFFER_TOO_SMALL), /* win98 */ "Expected ERROR_INVALID_SIZE, got %08d\n", result);

1 0

Aric Stewart : usp10: Disable glyph indexes for Symbol, non-TrueType, and device fonts.
by Alexandre Julliard 06 Sep '11

06 Sep '11

Module: wine Branch: master Commit: 4e760d89142eabae3f1704174b3040642d2d9d73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e760d89142eabae3f1704174… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Sep 6 07:17:59 2011 -0500 usp10: Disable glyph indexes for Symbol, non-TrueType, and device fonts. --- dlls/usp10/usp10.c | 19 ++++++++++--------- 1 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 61f65e4..873d10b 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -1050,9 +1050,6 @@ static HRESULT SS_ItemOut( SCRIPT_STRING_ANALYSIS ssa, (cEnd >= 0 && analysis->pItem[iItem].iCharPos >= cEnd)) return S_OK; - uOptions |= ETO_GLYPH_INDEX; - analysis->pItem[0].a.fNoGlyphIndex = FALSE; /* say that we have glyphs */ - if (fSelected) { BkMode = GetBkMode(analysis->hdc); @@ -1728,6 +1725,13 @@ HRESULT WINAPI ScriptShapeOpenType( HDC hdc, SCRIPT_CACHE *psc, ((ScriptCache *)*psc)->userScript = tagScript; ((ScriptCache *)*psc)->userLang = tagLangSys; + /* set fNoGlyphIndex for symbolic, and device fonts or non truetype fonts */ + if (!psa->fNoGlyphIndex && + (!(get_cache_pitch_family(psc) & TMPF_TRUETYPE) || + (get_cache_pitch_family(psc) & TMPF_DEVICE) || + (((ScriptCache *)*psc)->tm.tmCharSet == SYMBOL_CHARSET))) + psa->fNoGlyphIndex = TRUE; + /* Initialize a SCRIPT_VISATTR and LogClust for each char in this run */ for (i = 0; i < cChars; i++) { @@ -1773,12 +1777,9 @@ HRESULT WINAPI ScriptShapeOpenType( HDC hdc, SCRIPT_CACHE *psc, rChars[i] = chInput; } - if (get_cache_pitch_family(psc) & TMPF_TRUETYPE) - { - SHAPE_ContextualShaping(hdc, (ScriptCache *)*psc, psa, rChars, cChars, pwOutGlyphs, pcGlyphs, cMaxGlyphs, pwLogClust); - SHAPE_ApplyDefaultOpentypeFeatures(hdc, (ScriptCache *)*psc, psa, pwOutGlyphs, pcGlyphs, cMaxGlyphs, cChars, pwLogClust); - SHAPE_CharGlyphProp(hdc, (ScriptCache *)*psc, psa, pwcChars, cChars, pwOutGlyphs, *pcGlyphs, pwLogClust, pCharProps, pOutGlyphProps); - } + SHAPE_ContextualShaping(hdc, (ScriptCache *)*psc, psa, rChars, cChars, pwOutGlyphs, pcGlyphs, cMaxGlyphs, pwLogClust); + SHAPE_ApplyDefaultOpentypeFeatures(hdc, (ScriptCache *)*psc, psa, pwOutGlyphs, pcGlyphs, cMaxGlyphs, cChars, pwLogClust); + SHAPE_CharGlyphProp(hdc, (ScriptCache *)*psc, psa, pwcChars, cChars, pwOutGlyphs, *pcGlyphs, pwLogClust, pCharProps, pOutGlyphProps); heap_free(rChars); } else

1 0