October 2010 - Wine-commits

Hans Leidekker : msi/tests: Add tests for msidbFeatureAttributesUIDisallowAbsent.
by Alexandre Julliard 22 Oct '10

22 Oct '10

Module: wine Branch: master Commit: 5a0a53820a051f9d89042e38492feaea20097c9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a0a53820a051f9d89042e384… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Oct 22 10:36:09 2010 +0200 msi/tests: Add tests for msidbFeatureAttributesUIDisallowAbsent. --- dlls/msi/tests/package.c | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 765cd24..d19a10a 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -9524,6 +9524,10 @@ static void test_featureparents(void) r = add_feature_entry( hdb, "'orion', '', '', '', 2, 1, '', 0" ); ok( r == ERROR_SUCCESS, "cannot add feature: %d\n", r ); + /* msidbFeatureAttributesUIDisallowAbsent */ + r = add_feature_entry( hdb, "'lyra', '', '', '', 2, 1, '', 16" ); + ok( r == ERROR_SUCCESS, "cannot add feature: %d\n", r ); + /* disabled because of install level */ r = add_feature_entry( hdb, "'waters', '', '', '', 15, 101, '', 9" ); ok( r == ERROR_SUCCESS, "cannot add feature: %d\n", r ); @@ -9704,6 +9708,13 @@ static void test_featureparents(void) state = 0xdeadbee; action = 0xdeadbee; + r = MsiGetFeatureState(hpkg, "lyra", &state, &action); + ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); + ok( state == INSTALLSTATE_ABSENT, "Expected INSTALLSTATE_ABSENT, got %d\n", state); + todo_wine ok( action == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", action); + + state = 0xdeadbee; + action = 0xdeadbee; r = MsiGetFeatureState(hpkg, "waters", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); ok( state == INSTALLSTATE_ABSENT, "Expected INSTALLSTATE_ABSENT, got %d\n", state); @@ -9796,6 +9807,9 @@ static void test_featureparents(void) r = MsiSetFeatureState(hpkg, "orion", INSTALLSTATE_ABSENT); ok( r == ERROR_SUCCESS, "failed to set feature state: %d\n", r); + r = MsiSetFeatureState(hpkg, "lyra", INSTALLSTATE_ABSENT); + ok( r == ERROR_SUCCESS, "failed to set feature state: %d\n", r); + r = MsiSetFeatureState(hpkg, "nosuchfeature", INSTALLSTATE_ABSENT); ok( r == ERROR_UNKNOWN_FEATURE, "Expected ERROR_UNKNOWN_FEATURE, got %u\n", r); @@ -9822,6 +9836,13 @@ static void test_featureparents(void) state = 0xdeadbee; action = 0xdeadbee; + r = MsiGetFeatureState(hpkg, "lyra", &state, &action); + ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); + ok( state == INSTALLSTATE_ABSENT, "Expected lyra INSTALLSTATE_ABSENT, got %d\n", state); + todo_wine ok( action == INSTALLSTATE_ABSENT, "Expected lyra INSTALLSTATE_ABSENT, got %d\n", action); + + state = 0xdeadbee; + action = 0xdeadbee; r = MsiGetComponentState(hpkg, "leo", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); ok( state == INSTALLSTATE_UNKNOWN, "Expected leo INSTALLSTATE_UNKNOWN, got %d\n", state);

1 0

Yaron Shahrabani : mshtml: Added Hebrew translation.
by Alexandre Julliard 22 Oct '10

22 Oct '10

Module: wine Branch: master Commit: 081f055aa04eabaa58d9f09a2f3dd5a1cc3debf2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=081f055aa04eabaa58d9f09a2… Author: Yaron Shahrabani <sh.yaron(a)gmail.com> Date: Fri Oct 22 00:24:48 2010 +0200 mshtml: Added Hebrew translation. --- dlls/mshtml/He.rc | 80 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/Makefile.in | 1 + 2 files changed, 81 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/He.rc b/dlls/mshtml/He.rc new file mode 100644 index 0000000..abf4beb --- /dev/null +++ b/dlls/mshtml/He.rc @@ -0,0 +1,80 @@ +/* + * Copyright 2005-2006 Jacek Caban + * Copyright 2010 Yaron Shahrabani <sh.yaron(a)gmail.com> + * + * 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 "resource.h" + +#pragma code_page(65001) + +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +STRINGTABLE +{ + IDS_STATUS_DONE "הסתיימה" + IDS_STATUS_DOWNLOADINGFROM "הורדה מהכתובת %s..." +} + +STRINGTABLE +{ + IDS_HTMLDISABLED "עיבוד HTML מנוטרל כעת." + IDS_HTMLDOCUMENT "מסמך HTML" + IDS_DOWNLOADING "הורדה..." + IDS_INSTALLING "התקנה..." +} + +ID_DWL_DIALOG DIALOG 0, 0, 260, 95 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_LAYOUTRTL +CAPTION "התקנת Gecko על Wine" +FONT 8, "MS Shell Dlg" +{ + LTEXT "אין באפשרות Wine למצוא את החבילה של Gecko הדרושה לצורך פעולה תקינה של יישומים המפענחים HTML." \ + "באפשרות Wine להוריד ולהתקין אותה אוטומטית עבורך.\n\n" \ + "לתשומת לבך: מומלץ להשתמש בחבילות ההפצה במקום. ניתן לעיין בכתובת http://wiki.winehq.org/Gecko לפרטים נוספים.", + ID_DWL_STATUS, 10, 10, 240, 50, SS_LEFT + CONTROL "התקדמות", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 40, 240, 12 + DEFPUSHBUTTON "ה&תקנה", ID_DWL_INSTALL, 200, 70, 50, 15, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&ביטול", IDCANCEL, 140, 70, 50, 15, WS_GROUP | WS_TABSTOP +} + +IDD_HYPERLINK DIALOG 0, 0, 250, 65 +STYLE DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_LAYOUTRTL +CAPTION "קישור" +FONT 8, "MS Shell Dlg" +{ + GROUPBOX "פרטי הקישור", -1, 5, 5, 190, 55 + LTEXT "&סוג:", -1, 10, 22, 20, 10 + COMBOBOX IDC_TYPE, 35, 20, 45, 100, WS_TABSTOP | WS_GROUP | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_HASSTRINGS + LTEXT "&כתובת:", -1, 10, 42, 20, 10 + EDITTEXT IDC_URL, 35, 40, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + PUSHBUTTON "אישור", IDOK, 200, 10, 45, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "ביטול", IDCANCEL, 200, 28, 45, 14, WS_GROUP | WS_TABSTOP +} + +ID_PROMPT_DIALOG DIALOG 0, 0, 200, 90 +STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_LAYOUTRTL +CAPTION "" +FONT 8, "MS Shell Dlg" +{ + LTEXT "", ID_PROMPT_PROMPT, 10, 10, 180, 30 + EDITTEXT ID_PROMPT_EDIT, 10, 45, 180, 14, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + PUSHBUTTON "אישור", IDOK, 40, 65, 45, 15, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "ביטול", IDCANCEL, 115, 65, 45, 15, WS_GROUP | WS_TABSTOP +} diff --git a/dlls/mshtml/Makefile.in b/dlls/mshtml/Makefile.in index 391e20b..403514a 100644 --- a/dlls/mshtml/Makefile.in +++ b/dlls/mshtml/Makefile.in @@ -75,6 +75,7 @@ RC_SRCS = \ Es.rc \ Fi.rc \ Fr.rc \ + He.rc \ Hu.rc \ It.rc \ Ja.rc \

1 0

Yaron Shahrabani : winefile: Added Hebrew translation.
by Alexandre Julliard 22 Oct '10

22 Oct '10

Module: wine Branch: master Commit: e332f8442e6bcd3c2e46dbb50fe5c3ce51cc922a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e332f8442e6bcd3c2e46dbb50… Author: Yaron Shahrabani <sh.yaron(a)gmail.com> Date: Fri Oct 22 08:45:08 2010 +0200 winefile: Added Hebrew translation. --- programs/winefile/He.rc | 253 +++++++++++++++++++++++++++++++++++++++++ programs/winefile/Makefile.in | 1 + 2 files changed, 254 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e332f8442e6bcd3c2e46d…

1 0

Yaron Shahrabani : mapi32: Added Hebrew translation.
by Alexandre Julliard 22 Oct '10

22 Oct '10

Module: wine Branch: master Commit: 5474811fe127dff139a10a1324dbe87b704ce552 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5474811fe127dff139a10a132… Author: Yaron Shahrabani <sh.yaron(a)gmail.com> Date: Fri Oct 22 08:54:04 2010 +0200 mapi32: Added Hebrew translation. --- dlls/mapi32/He.rc | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/mapi32/He.rc b/dlls/mapi32/He.rc index 72d84e9..93fa755 100644 --- a/dlls/mapi32/He.rc +++ b/dlls/mapi32/He.rc @@ -22,10 +22,12 @@ #include "res.h" +#pragma code_page(65001) + LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT STRINGTABLE { - IDS_NO_MAPI_CLIENT, "�� MAPI ��." - IDS_SEND_MAIL, "�� " + IDS_NO_MAPI_CLIENT, "שליחת הודעת הדוא״ל נכשלה כיוון שאין לך לקוח דוא״ל MAPI מותקן." + IDS_SEND_MAIL, "שליחת דוא״ל" }

1 0

Paul Vriens : browseui: Add the Serbian (Latin and Cyrillic) translation.
by Alexandre Julliard 22 Oct '10

22 Oct '10

Module: wine Branch: master Commit: 06cc8ff6b50a94c2649fc8d74a74fd5f69129b06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06cc8ff6b50a94c2649fc8d74… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Oct 22 10:19:32 2010 +0200 browseui: Add the Serbian (Latin and Cyrillic) translation. Translation by Đorđe Vasiljević. --- dlls/browseui/Makefile.in | 1 + dlls/browseui/rsrc_Sr.rc | 63 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+), 0 deletions(-) diff --git a/dlls/browseui/Makefile.in b/dlls/browseui/Makefile.in index 1ccf833..68f9f01 100644 --- a/dlls/browseui/Makefile.in +++ b/dlls/browseui/Makefile.in @@ -29,6 +29,7 @@ RC_SRCS = \ rsrc_Ro.rc \ rsrc_Ru.rc \ rsrc_Si.rc \ + rsrc_Sr.rc \ rsrc_Sv.rc \ rsrc_Uk.rc \ rsrc_Zh.rc \ diff --git a/dlls/browseui/rsrc_Sr.rc b/dlls/browseui/rsrc_Sr.rc new file mode 100644 index 0000000..8ff45cb --- /dev/null +++ b/dlls/browseui/rsrc_Sr.rc @@ -0,0 +1,63 @@ +/* + * Copyright 2007 Mikolaj Zalewski + * Copyright 2010 Đorđe Vasiljević + * Translated by Rancher + * + * 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 "resids.h" + +#pragma code_page(65001) + +LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_CYRILLIC + +STRINGTABLE +{ + IDS_CANCELLING "Отказивање..." +} + +IDD_PROGRESS_DLG DIALOG 0, 0, 260, 85 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU +CAPTION "" +FONT 8, "MS Shell Dlg" +{ + CONTROL "", IDC_ANIMATION, ANIMATE_CLASSA, 0, 12, 10, 236, 25 /* TODO: style */ + LTEXT "", IDC_TEXT_LINE, 7, 45, 250, 10, SS_LEFT|SS_NOPREFIX + LTEXT "", IDC_TEXT_LINE + 1, 7, 55, 250, 10, SS_LEFT|SS_NOPREFIX + CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASSA, WS_BORDER, 7, 65, 190, 8 + PUSHBUTTON "&Откажи", IDCANCEL, 205, 65, 40, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE + LTEXT "", IDC_TEXT_LINE + 2, 7, 75, 190, 10, SS_LEFT|SS_NOPREFIX +} + +LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_LATIN + +STRINGTABLE +{ + IDS_CANCELLING "Otkazivanje..." +} + +IDD_PROGRESS_DLG DIALOG 0, 0, 260, 85 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU +CAPTION "" +FONT 8, "MS Shell Dlg" +{ + CONTROL "", IDC_ANIMATION, ANIMATE_CLASSA, 0, 12, 10, 236, 25 /* TODO: style */ + LTEXT "", IDC_TEXT_LINE, 7, 45, 250, 10, SS_LEFT|SS_NOPREFIX + LTEXT "", IDC_TEXT_LINE + 1, 7, 55, 250, 10, SS_LEFT|SS_NOPREFIX + CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASSA, WS_BORDER, 7, 65, 190, 8 + PUSHBUTTON "&Otkaži", IDCANCEL, 205, 65, 40, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE + LTEXT "", IDC_TEXT_LINE + 2, 7, 75, 190, 10, SS_LEFT|SS_NOPREFIX +}

1 0

Alexandre Julliard : widl: Output some comments for proc format strings.
by Alexandre Julliard 22 Oct '10

22 Oct '10

Module: wine Branch: master Commit: 63d5217fd674cba049d1a6a3519ea21507067f96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63d5217fd674cba049d1a6a35… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Oct 16 12:37:39 2010 +0200 widl: Output some comments for proc format strings. --- tools/widl/typegen.c | 32 +++++++++++++++++++++----------- tools/widl/typegen.h | 1 - 2 files changed, 21 insertions(+), 12 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 717e2c8..fdc0989 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -823,7 +823,6 @@ int decl_indirect(const type_t *t) } static unsigned int write_procformatstring_type(FILE *file, int indent, - const char *name, const type_t *type, const attr_list_t *attrs, int is_return) @@ -873,13 +872,15 @@ static unsigned int write_procformatstring_type(FILE *file, int indent, print_file(file, indent, "0x4d, /* FC_IN_PARAM */\n"); print_file(file, indent, "0x01,\n"); - print_file(file, indent, "NdrFcShort(0x%hx),\n", (unsigned short)type->typestring_offset); + print_file(file, indent, "NdrFcShort(0x%x), /* type offset = %u */\n", + type->typestring_offset, type->typestring_offset); size = 4; /* includes param type prefix */ } return size; } -static void write_procformatstring_stmts(FILE *file, int indent, const statement_list_t *stmts, type_pred_t pred) +static void write_procformatstring_stmts(FILE *file, int indent, const statement_list_t *stmts, + type_pred_t pred, unsigned int *offset) { const statement_t *stmt; if (stmts) LIST_FOR_EACH_ENTRY( stmt, stmts, const statement_t, entry ) @@ -898,27 +899,36 @@ static void write_procformatstring_stmts(FILE *file, int indent, const statement { const var_t *var; LIST_FOR_EACH_ENTRY( var, type_get_function_args(func->type), const var_t, entry ) - write_procformatstring_type(file, indent, var->name, var->type, var->attrs, FALSE); + { + print_file( file, 0, "/* %u (parameter %s) */\n", *offset, var->name ); + *offset += write_procformatstring_type(file, indent, var->type, var->attrs, FALSE); + } } /* emit return value data */ if (is_void(type_function_get_rettype(func->type))) { + print_file( file, 0, "/* %u (void) */\n", *offset ); print_file(file, indent, "0x5b, /* FC_END */\n"); print_file(file, indent, "0x5c, /* FC_PAD */\n"); + *offset += 2; } else - write_procformatstring_type(file, indent, "return value", type_function_get_rettype(func->type), NULL, TRUE); + { + print_file( file, 0, "/* %u (return value) */\n", *offset ); + *offset += write_procformatstring_type(file, indent, type_function_get_rettype(func->type), NULL, TRUE); + } } } else if (stmt->type == STMT_LIBRARY) - write_procformatstring_stmts(file, indent, stmt->u.lib->stmts, pred); + write_procformatstring_stmts(file, indent, stmt->u.lib->stmts, pred, offset); } } void write_procformatstring(FILE *file, const statement_list_t *stmts, type_pred_t pred) { int indent = 0; + unsigned int offset = 0; print_file(file, indent, "static const MIDL_PROC_FORMAT_STRING __MIDL_ProcFormatString =\n"); print_file(file, indent, "{\n"); @@ -927,7 +937,7 @@ void write_procformatstring(FILE *file, const statement_list_t *stmts, type_pred print_file(file, indent, "{\n"); indent++; - write_procformatstring_stmts(file, indent, stmts, pred); + write_procformatstring_stmts(file, indent, stmts, pred, &offset); print_file(file, indent, "0x0\n"); indent--; @@ -3857,9 +3867,9 @@ void write_remoting_arguments(FILE *file, int indent, const var_t *func, const c } -unsigned int get_size_procformatstring_type(const char *name, const type_t *type, const attr_list_t *attrs) +static unsigned int get_size_procformatstring_type(const type_t *type, const attr_list_t *attrs) { - return write_procformatstring_type(NULL, 0, name, type, attrs, FALSE); + return write_procformatstring_type(NULL, 0, type, attrs, FALSE); } @@ -3871,13 +3881,13 @@ unsigned int get_size_procformatstring_func(const var_t *func) /* argument list size */ if (type_get_function_args(func->type)) LIST_FOR_EACH_ENTRY( var, type_get_function_args(func->type), const var_t, entry ) - size += get_size_procformatstring_type(var->name, var->type, var->attrs); + size += get_size_procformatstring_type(var->type, var->attrs); /* return value size */ if (is_void(type_function_get_rettype(func->type))) size += 2; /* FC_END and FC_PAD */ else - size += get_size_procformatstring_type("return value", type_function_get_rettype(func->type), NULL); + size += get_size_procformatstring_type(type_function_get_rettype(func->type), NULL); return size; } diff --git a/tools/widl/typegen.h b/tools/widl/typegen.h index 57a914a..e519ee0 100644 --- a/tools/widl/typegen.h +++ b/tools/widl/typegen.h @@ -69,7 +69,6 @@ void print_phase_basetype(FILE *file, int indent, const char *local_var_prefix, enum pass pass, const var_t *var, const char *varname); void write_remoting_arguments(FILE *file, int indent, const var_t *func, const char *local_var_prefix, enum pass pass, enum remoting_phase phase); -unsigned int get_size_procformatstring_type(const char *name, const type_t *type, const attr_list_t *attrs); unsigned int get_size_procformatstring_func(const var_t *func); unsigned int get_size_procformatstring(const statement_list_t *stmts, type_pred_t pred); unsigned int get_size_typeformatstring(const statement_list_t *stmts, type_pred_t pred);

1 0

Alexandre Julliard : widl: Add a separate function to write the proc format string for a function.
by Alexandre Julliard 22 Oct '10

22 Oct '10

Module: wine Branch: master Commit: a638c663b5aca2680c0a3ee72b54c9ed221c6111 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a638c663b5aca2680c0a3ee72… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Oct 16 13:51:50 2010 +0200 widl: Add a separate function to write the proc format string for a function. --- tools/widl/typegen.c | 78 +++++++++++++++++++++----------------------------- 1 files changed, 33 insertions(+), 45 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index fdc0989..eb305b4 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -879,6 +879,35 @@ static unsigned int write_procformatstring_type(FILE *file, int indent, return size; } +static void write_procformatstring_func( FILE *file, int indent, + const var_t *func, unsigned int *offset ) +{ + /* emit argument data */ + if (type_get_function_args(func->type)) + { + const var_t *var; + LIST_FOR_EACH_ENTRY( var, type_get_function_args(func->type), const var_t, entry ) + { + print_file( file, 0, "/* %u (parameter %s) */\n", *offset, var->name ); + *offset += write_procformatstring_type(file, indent, var->type, var->attrs, FALSE); + } + } + + /* emit return value data */ + if (is_void(type_function_get_rettype(func->type))) + { + print_file(file, 0, "/* %u (void) */\n", *offset); + print_file(file, indent, "0x5b, /* FC_END */\n"); + print_file(file, indent, "0x5c, /* FC_PAD */\n"); + *offset += 2; + } + else + { + print_file( file, 0, "/* %u (return value) */\n", *offset ); + *offset += write_procformatstring_type(file, indent, type_function_get_rettype(func->type), NULL, TRUE); + } +} + static void write_procformatstring_stmts(FILE *file, int indent, const statement_list_t *stmts, type_pred_t pred, unsigned int *offset) { @@ -894,30 +923,7 @@ static void write_procformatstring_stmts(FILE *file, int indent, const statement { const var_t *func = stmt_func->u.var; if (is_local(func->attrs)) continue; - /* emit argument data */ - if (type_get_function_args(func->type)) - { - const var_t *var; - LIST_FOR_EACH_ENTRY( var, type_get_function_args(func->type), const var_t, entry ) - { - print_file( file, 0, "/* %u (parameter %s) */\n", *offset, var->name ); - *offset += write_procformatstring_type(file, indent, var->type, var->attrs, FALSE); - } - } - - /* emit return value data */ - if (is_void(type_function_get_rettype(func->type))) - { - print_file( file, 0, "/* %u (void) */\n", *offset ); - print_file(file, indent, "0x5b, /* FC_END */\n"); - print_file(file, indent, "0x5c, /* FC_PAD */\n"); - *offset += 2; - } - else - { - print_file( file, 0, "/* %u (return value) */\n", *offset ); - *offset += write_procformatstring_type(file, indent, type_function_get_rettype(func->type), NULL, TRUE); - } + write_procformatstring_func( file, indent, func, offset ); } } else if (stmt->type == STMT_LIBRARY) @@ -3867,29 +3873,11 @@ void write_remoting_arguments(FILE *file, int indent, const var_t *func, const c } -static unsigned int get_size_procformatstring_type(const type_t *type, const attr_list_t *attrs) -{ - return write_procformatstring_type(NULL, 0, type, attrs, FALSE); -} - - unsigned int get_size_procformatstring_func(const var_t *func) { - const var_t *var; - unsigned int size = 0; - - /* argument list size */ - if (type_get_function_args(func->type)) - LIST_FOR_EACH_ENTRY( var, type_get_function_args(func->type), const var_t, entry ) - size += get_size_procformatstring_type(var->type, var->attrs); - - /* return value size */ - if (is_void(type_function_get_rettype(func->type))) - size += 2; /* FC_END and FC_PAD */ - else - size += get_size_procformatstring_type(type_function_get_rettype(func->type), NULL); - - return size; + unsigned int offset = 0; + write_procformatstring_func( NULL, 0, func, &offset ); + return offset; } unsigned int get_size_procformatstring(const statement_list_t *stmts, type_pred_t pred)

1 0

Vincent Povirk : windowscodecs: Implement CopyPixels for the TGA decoder.
by Alexandre Julliard 22 Oct '10

22 Oct '10

Module: wine Branch: master Commit: c2533f36913b7af66383ebeb772ad9abcb423bd1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2533f36913b7af66383ebeb7… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Jun 7 17:13:56 2010 -0500 windowscodecs: Implement CopyPixels for the TGA decoder. --- dlls/windowscodecs/tgaformat.c | 108 +++++++++++++++++++++++++++++++++++++++- 1 files changed, 106 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/tgaformat.c b/dlls/windowscodecs/tgaformat.c index f778cd4..57dca7d 100644 --- a/dlls/windowscodecs/tgaformat.c +++ b/dlls/windowscodecs/tgaformat.c @@ -72,6 +72,13 @@ typedef struct { BOOL initialized; IStream *stream; tga_header header; + BYTE *imagebits; + BYTE *origin; + int stride; + ULONG id_offset; + ULONG colormap_length; + ULONG colormap_offset; + ULONG image_offset; CRITICAL_SECTION lock; } TgaDecoder; @@ -125,6 +132,7 @@ static ULONG WINAPI TgaDecoder_Release(IWICBitmapDecoder *iface) DeleteCriticalSection(&This->lock); if (This->stream) IStream_Release(This->stream); + HeapFree(GetProcessHeap(), 0, This->imagebits); HeapFree(GetProcessHeap(), 0, This); } @@ -209,6 +217,15 @@ static HRESULT WINAPI TgaDecoder_Initialize(IWICBitmapDecoder *iface, IStream *p goto end; } + /* Locate data in the file based on the header. */ + This->id_offset = sizeof(tga_header); + This->colormap_offset = This->id_offset + This->header.id_length; + if (This->header.colormap_type == 1) + This->colormap_length = ((This->header.colormap_entrysize+7)/8) * This->header.colormap_length; + else + This->colormap_length = 0; + This->image_offset = This->colormap_offset + This->colormap_length; + /* FIXME: Read footer if there is one. */ IStream_AddRef(pIStream); @@ -436,11 +453,97 @@ static HRESULT WINAPI TgaDecoder_Frame_CopyPalette(IWICBitmapFrameDecode *iface, return E_NOTIMPL; } +static HRESULT TgaDecoder_ReadImage(TgaDecoder *This) +{ + HRESULT hr=S_OK; + int datasize; + LARGE_INTEGER seek; + ULONG bytesread; + + if (This->imagebits) + return S_OK; + + EnterCriticalSection(&This->lock); + + if (!This->imagebits) + { + if (This->header.image_descriptor & IMAGE_RIGHTTOLEFT) + { + FIXME("Right to left image reading not implemented\n"); + hr = E_NOTIMPL; + } + + if (SUCCEEDED(hr)) + { + datasize = This->header.width * This->header.height * (This->header.depth / 8); + This->imagebits = HeapAlloc(GetProcessHeap(), 0, datasize); + if (!This->imagebits) hr = E_OUTOFMEMORY; + } + + if (SUCCEEDED(hr)) + { + seek.QuadPart = This->image_offset; + hr = IStream_Seek(This->stream, seek, STREAM_SEEK_SET, NULL); + } + + if (SUCCEEDED(hr)) + { + if (This->header.image_type & IMAGETYPE_RLE) + { + FIXME("RLE decoding not implemented\n"); + hr = E_NOTIMPL; + } + else + { + hr = IStream_Read(This->stream, This->imagebits, datasize, &bytesread); + if (SUCCEEDED(hr) && bytesread != datasize) + hr = E_FAIL; + } + } + + if (SUCCEEDED(hr)) + { + if (This->header.image_descriptor & IMAGE_TOPTOBOTTOM) + { + This->origin = This->imagebits; + This->stride = This->header.width * (This->header.depth / 8); + } + else + { + This->stride = -This->header.width * (This->header.depth / 8); + This->origin = This->imagebits + This->header.width * (This->header.height - 1) * (This->header.depth / 8); + } + } + else + { + HeapFree(GetProcessHeap(), 0, This->imagebits); + This->imagebits = NULL; + } + } + + LeaveCriticalSection(&This->lock); + + return hr; +} + static HRESULT WINAPI TgaDecoder_Frame_CopyPixels(IWICBitmapFrameDecode *iface, const WICRect *prc, UINT cbStride, UINT cbBufferSize, BYTE *pbBuffer) { - FIXME("(%p,%p,%u,%u,%p):stub\n", iface, prc, cbStride, cbBufferSize, pbBuffer); - return E_NOTIMPL; + TgaDecoder *This = decoder_from_frame(iface); + HRESULT hr; + + TRACE("(%p,%p,%u,%u,%p)\n", iface, prc, cbStride, cbBufferSize, pbBuffer); + + hr = TgaDecoder_ReadImage(This); + + if (SUCCEEDED(hr)) + { + hr = copy_pixels(This->header.depth, This->origin, + This->header.width, This->header.height, This->stride, + prc, cbStride, cbBufferSize, pbBuffer); + } + + return hr; } static HRESULT WINAPI TgaDecoder_Frame_GetMetadataQueryReader(IWICBitmapFrameDecode *iface, @@ -497,6 +600,7 @@ HRESULT TgaDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) This->ref = 1; This->initialized = FALSE; This->stream = NULL; + This->imagebits = NULL; InitializeCriticalSection(&This->lock); This->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": TgaDecoder.lock");

1 0

Vincent Povirk : d3dx9_36: Check for the TGA container format.
by Alexandre Julliard 22 Oct '10

22 Oct '10

Module: wine Branch: master Commit: a2e5321b0135f176ab8ef2d3d271ce001e55f8f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2e5321b0135f176ab8ef2d3d… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Aug 24 14:29:38 2010 -0500 d3dx9_36: Check for the TGA container format. --- dlls/d3dx9_36/surface.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index f82f1b1..221e5f7 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -27,6 +27,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3dx); +/* Wine-specific WIC GUIDs */ + +DEFINE_GUID(GUID_WineContainerFormatTga, 0x0c44fda1,0xa5c5,0x4298,0x96,0x85,0x47,0x3f,0xc1,0x7c,0xd3,0x22); + /************************************************************ * D3DXGetImageInfoFromFileInMemory * @@ -93,6 +97,9 @@ HRESULT WINAPI D3DXGetImageInfoFromFileInMemory(LPCVOID data, UINT datasize, D3D } else if(IsEqualGUID(&container_format, &GUID_ContainerFormatJpeg)) { TRACE("File type is JPG\n"); info->ImageFileFormat = D3DXIFF_JPG; + } else if(IsEqualGUID(&container_format, &GUID_WineContainerFormatTga)) { + TRACE("File type is TGA\n"); + info->ImageFileFormat = D3DXIFF_TGA; } else { WARN("Unsupported image file format %s\n", debugstr_guid(&container_format)); hr = D3DXERR_INVALIDDATA;

1 0

Vincent Povirk : windowscodecs: Handle TGA attribute bits.
by Alexandre Julliard 22 Oct '10

22 Oct '10

Module: wine Branch: master Commit: 6ecb81976ffabc852e63d1b3130f8288cf03f175 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ecb81976ffabc852e63d1b31… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Oct 20 14:59:12 2010 -0500 windowscodecs: Handle TGA attribute bits. --- dlls/windowscodecs/tgaformat.c | 123 +++++++++++++++++++++++++++++++++++++--- include/wincodec.idl | 1 + 2 files changed, 115 insertions(+), 9 deletions(-) diff --git a/dlls/windowscodecs/tgaformat.c b/dlls/windowscodecs/tgaformat.c index 57dca7d..9de35c2 100644 --- a/dlls/windowscodecs/tgaformat.c +++ b/dlls/windowscodecs/tgaformat.c @@ -63,6 +63,41 @@ typedef struct { #define IMAGE_RIGHTTOLEFT 0x10 #define IMAGE_TOPTOBOTTOM 0x20 +typedef struct { + DWORD extension_area_offset; + DWORD developer_directory_offset; + char magic[18]; +} tga_footer; + +static const BYTE tga_footer_magic[18] = "TRUEVISION-XFILE."; + +typedef struct { + WORD size; + char author_name[41]; + char author_comments[324]; + WORD timestamp[6]; + char job_name[41]; + WORD job_timestamp[6]; + char software_id[41]; + WORD software_version; + char software_version_letter; + DWORD key_color; + WORD pixel_width; + WORD pixel_height; + WORD gamma_numerator; + WORD gamma_denominator; + DWORD color_correction_offset; + DWORD thumbnail_offset; + DWORD scanline_offset; + BYTE attributes_type; +} tga_extension_area; + +#define ATTRIBUTE_NO_ALPHA 0 +#define ATTRIBUTE_UNDEFINED 1 +#define ATTRIBUTE_UNDEFINED_PRESERVE 2 +#define ATTRIBUTE_ALPHA 3 +#define ATTRIBUTE_PALPHA 4 + #include "poppack.h" typedef struct { @@ -72,6 +107,7 @@ typedef struct { BOOL initialized; IStream *stream; tga_header header; + tga_extension_area extension_area; BYTE *imagebits; BYTE *origin; int stride; @@ -79,6 +115,8 @@ typedef struct { ULONG colormap_length; ULONG colormap_offset; ULONG image_offset; + ULONG extension_area_offset; + ULONG developer_directory_offset; CRITICAL_SECTION lock; } TgaDecoder; @@ -153,6 +191,8 @@ static HRESULT WINAPI TgaDecoder_Initialize(IWICBitmapDecoder *iface, IStream *p HRESULT hr=S_OK; DWORD bytesread; LARGE_INTEGER seek; + tga_footer footer; + int attribute_bitcount; TRACE("(%p,%p,%u)\n", iface, pIStream, cacheOptions); @@ -207,8 +247,15 @@ static HRESULT WINAPI TgaDecoder_Initialize(IWICBitmapDecoder *iface, IStream *p This->header.depth != 24 && This->header.depth != 32) hr = E_FAIL; - if ((This->header.image_descriptor & IMAGE_ATTRIBUTE_BITCOUNT_MASK) > 8 || - (This->header.image_descriptor & 0xc0) != 0) + if ((This->header.image_descriptor & 0xc0) != 0) + hr = E_FAIL; + + attribute_bitcount = This->header.image_descriptor & IMAGE_ATTRIBUTE_BITCOUNT_MASK; + + if (attribute_bitcount && + !((This->header.image_type & IMAGETYPE_TRUECOLOR) && + ((This->header.depth == 32 && attribute_bitcount == 8) || + (This->header.depth == 16 && attribute_bitcount == 1)))) hr = E_FAIL; if (FAILED(hr)) @@ -226,7 +273,49 @@ static HRESULT WINAPI TgaDecoder_Initialize(IWICBitmapDecoder *iface, IStream *p This->colormap_length = 0; This->image_offset = This->colormap_offset + This->colormap_length; - /* FIXME: Read footer if there is one. */ + /* Read footer if there is one */ + seek.QuadPart = -sizeof(tga_footer); + hr = IStream_Seek(pIStream, seek, STREAM_SEEK_END, NULL); + if (FAILED(hr)) goto end; + + hr = IStream_Read(pIStream, &footer, sizeof(tga_footer), &bytesread); + if (SUCCEEDED(hr) && bytesread != sizeof(tga_footer)) + { + TRACE("got only %u footer bytes\n", bytesread); + hr = E_FAIL; + } + if (FAILED(hr)) goto end; + + if (memcmp(footer.magic, tga_footer_magic, sizeof(tga_footer_magic)) == 0) + { + This->extension_area_offset = footer.extension_area_offset; + This->developer_directory_offset = footer.developer_directory_offset; + } + else + { + This->extension_area_offset = 0; + This->developer_directory_offset = 0; + } + + if (This->extension_area_offset) + { + seek.QuadPart = This->extension_area_offset; + hr = IStream_Seek(pIStream, seek, STREAM_SEEK_SET, NULL); + if (FAILED(hr)) goto end; + + hr = IStream_Read(pIStream, &This->extension_area, sizeof(tga_extension_area), &bytesread); + if (SUCCEEDED(hr) && bytesread != sizeof(tga_extension_area)) + { + TRACE("got only %u extension area bytes\n", bytesread); + hr = E_FAIL; + } + if (SUCCEEDED(hr) && This->extension_area.size < 495) + { + TRACE("extension area is only %u bytes long\n", This->extension_area.size); + hr = E_FAIL; + } + if (FAILED(hr)) goto end; + } IStream_AddRef(pIStream); This->stream = pIStream; @@ -379,16 +468,18 @@ static HRESULT WINAPI TgaDecoder_Frame_GetPixelFormat(IWICBitmapFrameDecode *ifa { TgaDecoder *This = decoder_from_frame(iface); int attribute_bitcount; + byte attribute_type; TRACE("(%p,%p)\n", iface, pPixelFormat); attribute_bitcount = This->header.image_descriptor & IMAGE_ATTRIBUTE_BITCOUNT_MASK; - if (attribute_bitcount) - { - FIXME("Need to read footer to find meaning of attribute bits\n"); - return E_NOTIMPL; - } + if (attribute_bitcount && This->extension_area_offset) + attribute_type = This->extension_area.attributes_type; + else if (attribute_bitcount) + attribute_type = ATTRIBUTE_ALPHA; + else + attribute_type = ATTRIBUTE_NO_ALPHA; switch (This->header.image_type & ~IMAGETYPE_RLE) { @@ -407,7 +498,21 @@ static HRESULT WINAPI TgaDecoder_Frame_GetPixelFormat(IWICBitmapFrameDecode *ifa switch (This->header.depth) { case 16: - memcpy(pPixelFormat, &GUID_WICPixelFormat16bppBGR555, sizeof(GUID)); + switch (attribute_type) + { + case ATTRIBUTE_NO_ALPHA: + case ATTRIBUTE_UNDEFINED: + case ATTRIBUTE_UNDEFINED_PRESERVE: + memcpy(pPixelFormat, &GUID_WICPixelFormat16bppBGR555, sizeof(GUID)); + break; + case ATTRIBUTE_ALPHA: + case ATTRIBUTE_PALPHA: + memcpy(pPixelFormat, &GUID_WICPixelFormat16bppBGRA5551, sizeof(GUID)); + break; + default: + FIXME("Unhandled 16-bit attribute type %u\n", attribute_type); + return E_NOTIMPL; + } break; case 24: memcpy(pPixelFormat, &GUID_WICPixelFormat24bppBGR, sizeof(GUID)); diff --git a/include/wincodec.idl b/include/wincodec.idl index 8cc6500..6343350 100644 --- a/include/wincodec.idl +++ b/include/wincodec.idl @@ -158,6 +158,7 @@ cpp_quote("DEFINE_GUID(GUID_WICPixelFormat16bppGray, 0x6fddc324,0x4e03,0x4bfe,0x cpp_quote("DEFINE_GUID(GUID_WICPixelFormat16bppBGR555, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x09);") cpp_quote("DEFINE_GUID(GUID_WICPixelFormat16bppBGR565, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x0a);") +cpp_quote("DEFINE_GUID(GUID_WICPixelFormat16bppBGRA5551, 0x05ec7c2b,0xf1e6,0x4961,0xad,0x46,0xe1,0xcc,0x81,0x0a,0x87,0xd2);") cpp_quote("DEFINE_GUID(GUID_WICPixelFormat24bppBGR, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x0c);") cpp_quote("DEFINE_GUID(GUID_WICPixelFormat32bppBGR, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x0e);") cpp_quote("DEFINE_GUID(GUID_WICPixelFormat32bppBGRA, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x0f);")

1 0