December 2010 - Wine-commits

Hwang YunSong : jscript: Update Korean resource.
by Alexandre Julliard 30 Dec '10

30 Dec '10

Module: wine Branch: master Commit: 58260b2f7f6154fefcf73dd4517c82641f3ba89c URL: http://source.winehq.org/git/wine.git/?a=commit;h=58260b2f7f6154fefcf73dd45… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Thu Dec 30 11:15:19 2010 +0900 jscript: Update Korean resource. --- dlls/jscript/jscript_Ko.rc | 25 ++++++++++++++----------- 1 files changed, 14 insertions(+), 11 deletions(-) diff --git a/dlls/jscript/jscript_Ko.rc b/dlls/jscript/jscript_Ko.rc index 1b0cf99..9e6f9c6 100644 --- a/dlls/jscript/jscript_Ko.rc +++ b/dlls/jscript/jscript_Ko.rc @@ -28,25 +28,28 @@ STRINGTABLE { IDS_TO_PRIMITIVE "객페를 기본 형식으로 변환하는 중에 에러 발생" IDS_INVALID_CALL_ARG "올바르지 않은 프로시져 호출이나 인수" - IDS_CREATE_OBJ_ERROR "자동화 서버가 객체를 만들 수 없습니다" - IDS_NO_PROPERTY "객체는 이 속성이나 메소드를 지원하지 않습니다" - IDS_UNSUPPORTED_ACTION "객체는 이 행동을 지원하지 않습니다" + IDS_SUBSCRIPT_OUT_OF_RANGE "첨자가 범위를 벗어남" + IDS_CREATE_OBJ_ERROR "자동화 서버가 객체를 만들 수 없음" + IDS_NO_PROPERTY "객체는 이 속성이나 메소드를 지원하지 않음" + IDS_UNSUPPORTED_ACTION "객체는 이 행동을 지원하지 않음" IDS_ARG_NOT_OPT "인수는 옵션이 아닙니다" IDS_SYNTAX_ERROR "문법 에러" IDS_SEMICOLON "';' 가 필요합니다" IDS_LBRACKET "'(' 가 필요합니다" IDS_RBRACKET "')' 가 필요합니다" IDS_UNTERMINATED_STR "띁나지 않은 문자열 상수" + IDS_DISABLED_CC "조건부 컴파일이 설정되어 있음" IDS_NOT_FUNC "함수가 필요합니다" - IDS_NOT_DATE "'[객체]' 는 날짜 객체가 아닙니다" + IDS_NOT_DATE "'[객체]' 는 날짜 객체가 아님" IDS_NOT_NUM "숫자가 필요합니다" IDS_OBJECT_EXPECTED "객체가 필요합니다" IDS_ILLEGAL_ASSIGN "잘못된 할당" - IDS_UNDEFINED "'|' 는 정의되지 않았습니다" - IDS_NOT_BOOL "볼린 객제가 필요합니다" - IDS_JSCRIPT_EXPECTED "JScript 객체가 필요합니다" - IDS_REGEXP_SYNTAX_ERROR "정규 표현식에 문법에러가 있습니다" - IDS_URI_INVALID_CHAR "URI 는 올바르지 않은 문자를 포함해서 인코딩되었습니다" - IDS_INVALID_LENGTH "배열 길이는 반드시 한정된 양의 정수이어야 합니다" - IDS_ARRAY_EXPECTED "배열 객체가 필요합니다" + IDS_UNDEFINED "'|' 는 정의되지 않았음" + IDS_NOT_BOOL "볼린 객제가 필요함" + IDS_NOT_VBARRAY "VBArray 갹체가 필요함" + IDS_JSCRIPT_EXPECTED "JScript 객체가 필요함" + IDS_REGEXP_SYNTAX_ERROR "정규 표현식에 문법에러가 있음" + IDS_URI_INVALID_CHAR "URI 는 올바르지 않은 문자를 포함해서 인코딩되었음" + IDS_INVALID_LENGTH "배열 길이는 반드시 한정된 양의 정수이어야 함" + IDS_ARRAY_EXPECTED "배열 객체가 필요함" }

1 0

Hwang YunSong : oleacc: Update Korean resource.
by Alexandre Julliard 30 Dec '10

30 Dec '10

Module: wine Branch: master Commit: 9fd7f07ed98739f29d06cb62b577f3687793095c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fd7f07ed98739f29d06cb62b… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Thu Dec 30 11:16:59 2010 +0900 oleacc: Update Korean resource. --- dlls/oleacc/oleacc_Ko.rc | 134 +++++++++++++++++++++++---------------------- 1 files changed, 68 insertions(+), 66 deletions(-) diff --git a/dlls/oleacc/oleacc_Ko.rc b/dlls/oleacc/oleacc_Ko.rc index 19d5d38..26e10e7 100644 --- a/dlls/oleacc/oleacc_Ko.rc +++ b/dlls/oleacc/oleacc_Ko.rc @@ -2,7 +2,7 @@ * Korean resources for oleacc * * Copyright 2008 Nikolay Sivov - * Copyright 2008 YunSong Hwang + * Copyright 2008,2010 YunSong Hwang * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -21,73 +21,75 @@ #include "oleacc.h" +#pragma code_page(65001) + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT STRINGTABLE { - 0 "�� ü" /* undocumented */ - ROLE_SYSTEM_TITLEBAR "��" - ROLE_SYSTEM_MENUBAR "�޴��" - ROLE_SYSTEM_SCROLLBAR "��ũ�ѹ�" - ROLE_SYSTEM_GRIP "�׸�" - ROLE_SYSTEM_SOUND "��" - ROLE_SYSTEM_CURSOR "Ŀ��" - ROLE_SYSTEM_CARET "��Ա�ȣ" - ROLE_SYSTEM_ALERT "��" - ROLE_SYSTEM_WINDOW "â" - ROLE_SYSTEM_CLIENT "Ŭ��̾�Ʈ" - ROLE_SYSTEM_MENUPOPUP "�˾� �޴�" - ROLE_SYSTEM_MENUITEM "�޴� ��" - ROLE_SYSTEM_TOOLTIP "�� " - ROLE_SYSTEM_APPLICATION "��α׷�" - ROLE_SYSTEM_DOCUMENT "��" - ROLE_SYSTEM_PANE "Ʋ(pane)" - ROLE_SYSTEM_CHART "��Ʈ" - ROLE_SYSTEM_DIALOG "��ȭ��" - ROLE_SYSTEM_BORDER "��ڸ�" - ROLE_SYSTEM_GROUPING "��ȭ" - ROLE_SYSTEM_SEPARATOR "�и��" - ROLE_SYSTEM_TOOLBAR "��" - ROLE_SYSTEM_STATUSBAR "��¹�" - ROLE_SYSTEM_TABLE "��̺�" - ROLE_SYSTEM_COLUMNHEADER "�� " - ROLE_SYSTEM_ROWHEADER "�� " - ROLE_SYSTEM_COLUMN "��" - ROLE_SYSTEM_ROW "��" - ROLE_SYSTEM_CELL "��" - ROLE_SYSTEM_LINK "��ũ" - ROLE_SYSTEM_HELPBALLOON "ǳ�� " - ROLE_SYSTEM_CHARACTER "��" - ROLE_SYSTEM_LIST "��" - ROLE_SYSTEM_LISTITEM "�� " - ROLE_SYSTEM_OUTLINE "�ܰ��" - ROLE_SYSTEM_OUTLINEITEM "�ܰ�� " - ROLE_SYSTEM_PAGETAB "�� " - ROLE_SYSTEM_PROPERTYPAGE "�Ӽ� ��" - ROLE_SYSTEM_INDICATOR "��" - ROLE_SYSTEM_GRAPHIC "�׸�" - ROLE_SYSTEM_STATICTEXT "�� " - ROLE_SYSTEM_TEXT "��" - ROLE_SYSTEM_PUSHBUTTON "�� ư" - ROLE_SYSTEM_CHECKBUTTON "üũ ��ư" - ROLE_SYSTEM_RADIOBUTTON "�� ư" - ROLE_SYSTEM_COMBOBOX "�޺� ��" - ROLE_SYSTEM_DROPLIST "�� ٿ�" - ROLE_SYSTEM_PROGRESSBAR "��" - ROLE_SYSTEM_DIAL "��̾�" - ROLE_SYSTEM_HOTKEYFIELD "��Ű ��" - ROLE_SYSTEM_SLIDER "��̴�" - ROLE_SYSTEM_SPINBUTTON "�� " - ROLE_SYSTEM_DIAGRAM "��" - ROLE_SYSTEM_ANIMATION "�ִϸ��̼�" - ROLE_SYSTEM_EQUATION "��" - ROLE_SYSTEM_BUTTONDROPDOWN "�� ٿ� ��ư" - ROLE_SYSTEM_BUTTONMENU "�޴� ��ư" - ROLE_SYSTEM_BUTTONDROPDOWNGRID "�׸� �� ٿ� ��" - ROLE_SYSTEM_WHITESPACE "�� " - ROLE_SYSTEM_PAGETABLIST "�� " - ROLE_SYSTEM_CLOCK "�ð�" - ROLE_SYSTEM_SPLITBUTTON "�� " - ROLE_SYSTEM_IPADDRESS "IP �ּ�" - ROLE_SYSTEM_OUTLINEBUTTON "�ܰ�� " + 0 "알 수 없는 객체" /* undocumented */ + ROLE_SYSTEM_TITLEBAR "제목바" + ROLE_SYSTEM_MENUBAR "메뉴바" + ROLE_SYSTEM_SCROLLBAR "스크롤바" + ROLE_SYSTEM_GRIP "그립" + ROLE_SYSTEM_SOUND "사운드" + ROLE_SYSTEM_CURSOR "커서" + ROLE_SYSTEM_CARET "삽입기호" + ROLE_SYSTEM_ALERT "경고" + ROLE_SYSTEM_WINDOW "창" + ROLE_SYSTEM_CLIENT "클라이언트" + ROLE_SYSTEM_MENUPOPUP "팝업 메뉴" + ROLE_SYSTEM_MENUITEM "메뉴 아이템" + ROLE_SYSTEM_TOOLTIP "도구 팁" + ROLE_SYSTEM_APPLICATION "프로그램" + ROLE_SYSTEM_DOCUMENT "문서" + ROLE_SYSTEM_PANE "틀(pane)" + ROLE_SYSTEM_CHART "차트" + ROLE_SYSTEM_DIALOG "대화상자" + ROLE_SYSTEM_BORDER "가장자리" + ROLE_SYSTEM_GROUPING "집단화" + ROLE_SYSTEM_SEPARATOR "분리자" + ROLE_SYSTEM_TOOLBAR "도구바" + ROLE_SYSTEM_STATUSBAR "상태바" + ROLE_SYSTEM_TABLE "테이블" + ROLE_SYSTEM_COLUMNHEADER "세로줄 헤더" + ROLE_SYSTEM_ROWHEADER "가로줄 헤더" + ROLE_SYSTEM_COLUMN "열" + ROLE_SYSTEM_ROW "가로줄" + ROLE_SYSTEM_CELL "셀" + ROLE_SYSTEM_LINK "링크" + ROLE_SYSTEM_HELPBALLOON "풍선 도움말" + ROLE_SYSTEM_CHARACTER "문자" + ROLE_SYSTEM_LIST "목록" + ROLE_SYSTEM_LISTITEM "목록 아이템" + ROLE_SYSTEM_OUTLINE "외곽선" + ROLE_SYSTEM_OUTLINEITEM "외곽선 아이템" + ROLE_SYSTEM_PAGETAB "페이지 탭" + ROLE_SYSTEM_PROPERTYPAGE "속성 페이지" + ROLE_SYSTEM_INDICATOR "지시자" + ROLE_SYSTEM_GRAPHIC "그림" + ROLE_SYSTEM_STATICTEXT "정적 문자" + ROLE_SYSTEM_TEXT "문자" + ROLE_SYSTEM_PUSHBUTTON "누르기 버튼" + ROLE_SYSTEM_CHECKBUTTON "체크 버튼" + ROLE_SYSTEM_RADIOBUTTON "라디오 버튼" + ROLE_SYSTEM_COMBOBOX "콤보 상자" + ROLE_SYSTEM_DROPLIST "드룹 다운" + ROLE_SYSTEM_PROGRESSBAR "진행바" + ROLE_SYSTEM_DIAL "다이얼" + ROLE_SYSTEM_HOTKEYFIELD "단축키 모음" + ROLE_SYSTEM_SLIDER "슬라이더" + ROLE_SYSTEM_SPINBUTTON "스핀 상자" + ROLE_SYSTEM_DIAGRAM "도형" + ROLE_SYSTEM_ANIMATION "애니매이션" + ROLE_SYSTEM_EQUATION "수식" + ROLE_SYSTEM_BUTTONDROPDOWN "드룹 다운 버튼" + ROLE_SYSTEM_BUTTONMENU "메뉴 버튼" + ROLE_SYSTEM_BUTTONDROPDOWNGRID "그립 드룹 다운 단추" + ROLE_SYSTEM_WHITESPACE "빈 공간" + ROLE_SYSTEM_PAGETABLIST "페이지 탭 목록" + ROLE_SYSTEM_CLOCK "시계" + ROLE_SYSTEM_SPLITBUTTON "나누기 단추" + ROLE_SYSTEM_IPADDRESS "IP 주소" + ROLE_SYSTEM_OUTLINEBUTTON "외곽선 단추" }

1 0

Jacek Caban : msxml3: Don' t forward put_nodeTypedValue and put_dataType calls to node IXMLDOMNode iface .
by Alexandre Julliard 30 Dec '10

30 Dec '10

Module: wine Branch: master Commit: 9a16f796f2dab991a70973aef4f9de00d2759b0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a16f796f2dab991a70973aef… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 30 13:07:50 2010 +0100 msxml3: Don't forward put_nodeTypedValue and put_dataType calls to node IXMLDOMNode iface. --- dlls/msxml3/attribute.c | 13 ++++++++++--- dlls/msxml3/cdata.c | 13 ++++++++++--- dlls/msxml3/comment.c | 13 ++++++++++--- dlls/msxml3/docfrag.c | 13 ++++++++++--- dlls/msxml3/domdoc.c | 11 +++++++++-- dlls/msxml3/entityref.c | 13 ++++++++++--- dlls/msxml3/main.c | 27 +++++++++++++++++++++++++++ dlls/msxml3/msxml_private.h | 2 ++ dlls/msxml3/node.c | 42 ++++++++++++------------------------------ dlls/msxml3/pi.c | 13 ++++++++++--- 10 files changed, 110 insertions(+), 50 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9a16f796f2dab991a7097…

1 0

Alexandre Julliard : wrc: Explicitly define structure creation functions instead of playing with macros .
by Alexandre Julliard 30 Dec '10

30 Dec '10

Module: wine Branch: master Commit: d0a6c806a9d1e55838afec2e2da521996f675ad3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0a6c806a9d1e55838afec2e2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 30 12:30:36 2010 +0100 wrc: Explicitly define structure creation functions instead of playing with macros. --- tools/wrc/newstruc.c | 155 +++++++++++++++++++++++++++++++++++++++++++------- tools/wrc/newstruc.h | 49 ++++++---------- 2 files changed, 153 insertions(+), 51 deletions(-) diff --git a/tools/wrc/newstruc.c b/tools/wrc/newstruc.c index 603eb0c..c157cb4 100644 --- a/tools/wrc/newstruc.c +++ b/tools/wrc/newstruc.c @@ -45,31 +45,144 @@ typedef struct } BITMAPOS2HEADER; #include <poppack.h> -/* Generate new_* functions that have no parameters (NOTE: no ';') */ -__NEW_STRUCT_FUNC(dialog) -__NEW_STRUCT_FUNC(name_id) -__NEW_STRUCT_FUNC(menu) -__NEW_STRUCT_FUNC(menu_item) -__NEW_STRUCT_FUNC(control) -__NEW_STRUCT_FUNC(icon) -__NEW_STRUCT_FUNC(cursor) -__NEW_STRUCT_FUNC(versioninfo) -__NEW_STRUCT_FUNC(ver_value) -__NEW_STRUCT_FUNC(ver_block) -__NEW_STRUCT_FUNC(stt_entry) -__NEW_STRUCT_FUNC(accelerator) -__NEW_STRUCT_FUNC(event) -__NEW_STRUCT_FUNC(raw_data) -__NEW_STRUCT_FUNC(lvc) -__NEW_STRUCT_FUNC(res_count) -__NEW_STRUCT_FUNC(string) -__NEW_STRUCT_FUNC(toolbar_item) -__NEW_STRUCT_FUNC(ani_any) - /* New instances for all types of structures */ /* Very inefficient (in size), but very functional :-] * Especially for type-checking. */ + +dialog_t *new_dialog(void) +{ + dialog_t *ret = xmalloc( sizeof(*ret) ); + memset( ret, 0, sizeof(*ret) ); + return ret; +} + +name_id_t *new_name_id(void) +{ + name_id_t *ret = xmalloc( sizeof(*ret) ); + memset( ret, 0, sizeof(*ret) ); + return ret; +} + +menu_t *new_menu(void) +{ + menu_t *ret = xmalloc( sizeof(*ret) ); + memset( ret, 0, sizeof(*ret) ); + return ret; +} + +menu_item_t *new_menu_item(void) +{ + menu_item_t *ret = xmalloc( sizeof(*ret) ); + memset( ret, 0, sizeof(*ret) ); + return ret; +} + +control_t *new_control(void) +{ + control_t *ret = xmalloc( sizeof(*ret) ); + memset( ret, 0, sizeof(*ret) ); + return ret; +} + +icon_t *new_icon(void) +{ + icon_t *ret = xmalloc( sizeof(*ret) ); + memset( ret, 0, sizeof(*ret) ); + return ret; +} + +cursor_t *new_cursor(void) +{ + cursor_t *ret = xmalloc( sizeof(*ret) ); + memset( ret, 0, sizeof(*ret) ); + return ret; +} + +versioninfo_t *new_versioninfo(void) +{ + versioninfo_t *ret = xmalloc( sizeof(*ret) ); + memset( ret, 0, sizeof(*ret) ); + return ret; +} + +ver_value_t *new_ver_value(void) +{ + ver_value_t *ret = xmalloc( sizeof(*ret) ); + memset( ret, 0, sizeof(*ret) ); + return ret; +} + +ver_block_t *new_ver_block(void) +{ + ver_block_t *ret = xmalloc( sizeof(*ret) ); + memset( ret, 0, sizeof(*ret) ); + return ret; +} + +stt_entry_t *new_stt_entry(void) +{ + stt_entry_t *ret = xmalloc( sizeof(*ret) ); + memset( ret, 0, sizeof(*ret) ); + return ret; +} + +accelerator_t *new_accelerator(void) +{ + accelerator_t *ret = xmalloc( sizeof(*ret) ); + memset( ret, 0, sizeof(*ret) ); + return ret; +} + +event_t *new_event(void) +{ + event_t *ret = xmalloc( sizeof(*ret) ); + memset( ret, 0, sizeof(*ret) ); + return ret; +} + +raw_data_t *new_raw_data(void) +{ + raw_data_t *ret = xmalloc( sizeof(*ret) ); + memset( ret, 0, sizeof(*ret) ); + return ret; +} + +lvc_t *new_lvc(void) +{ + lvc_t *ret = xmalloc( sizeof(*ret) ); + memset( ret, 0, sizeof(*ret) ); + return ret; +} + +res_count_t *new_res_count(void) +{ + res_count_t *ret = xmalloc( sizeof(*ret) ); + memset( ret, 0, sizeof(*ret) ); + return ret; +} + +string_t *new_string(void) +{ + string_t *ret = xmalloc( sizeof(*ret) ); + memset( ret, 0, sizeof(*ret) ); + return ret; +} + +toolbar_item_t *new_toolbar_item(void) +{ + toolbar_item_t *ret = xmalloc( sizeof(*ret) ); + memset( ret, 0, sizeof(*ret) ); + return ret; +} + +ani_any_t *new_ani_any(void) +{ + ani_any_t *ret = xmalloc( sizeof(*ret) ); + memset( ret, 0, sizeof(*ret) ); + return ret; +} + resource_t *new_resource(enum res_e t, void *res, int memopt, language_t *lan) { resource_t *r = xmalloc(sizeof(resource_t)); diff --git a/tools/wrc/newstruc.h b/tools/wrc/newstruc.h index 3bd4c29..c7a74eb 100644 --- a/tools/wrc/newstruc.h +++ b/tools/wrc/newstruc.h @@ -23,36 +23,25 @@ #include "wrctypes.h" -#define __NEW_STRUCT_FUNC(p) \ - p##_t *new_##p(void)\ - {\ - p##_t * ret = xmalloc(sizeof(*ret)); \ - memset( ret, 0, sizeof(*ret) ); \ - return ret; \ - } - -#define __NEW_STRUCT_PROTO(p) p##_t *new_##p(void) - -__NEW_STRUCT_PROTO(dialog); -__NEW_STRUCT_PROTO(name_id); -__NEW_STRUCT_PROTO(menu); -__NEW_STRUCT_PROTO(menu_item); -__NEW_STRUCT_PROTO(control); -__NEW_STRUCT_PROTO(icon); -__NEW_STRUCT_PROTO(cursor); -__NEW_STRUCT_PROTO(versioninfo); -__NEW_STRUCT_PROTO(ver_value); -__NEW_STRUCT_PROTO(ver_block); -__NEW_STRUCT_PROTO(stt_entry); -__NEW_STRUCT_PROTO(accelerator); -__NEW_STRUCT_PROTO(event); -__NEW_STRUCT_PROTO(raw_data); -__NEW_STRUCT_PROTO(lvc); -__NEW_STRUCT_PROTO(res_count); -__NEW_STRUCT_PROTO(string); -__NEW_STRUCT_PROTO(toolbar_item); -__NEW_STRUCT_PROTO(ani_any); - +dialog_t *new_dialog(void); +name_id_t *new_name_id(void); +menu_t *new_menu(void); +menu_item_t *new_menu_item(void); +control_t *new_control(void); +icon_t *new_icon(void); +cursor_t *new_cursor(void); +versioninfo_t *new_versioninfo(void); +ver_value_t *new_ver_value(void); +ver_block_t *new_ver_block(void); +stt_entry_t *new_stt_entry(void); +accelerator_t *new_accelerator(void); +event_t *new_event(void); +raw_data_t *new_raw_data(void); +lvc_t *new_lvc(void); +res_count_t *new_res_count(void); +string_t *new_string(void); +toolbar_item_t *new_toolbar_item(void); +ani_any_t *new_ani_any(void); resource_t *new_resource(enum res_e t, void *res, int memopt, language_t *lan); version_t *new_version(DWORD v); characts_t *new_characts(DWORD c);

1 0

Alexandre Julliard : wrc: Store location information in strings.
by Alexandre Julliard 30 Dec '10

30 Dec '10

Module: wine Branch: master Commit: df45a347acc7f352df5ccef529f14601fc1fa806 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df45a347acc7f352df5ccef52… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 30 13:08:30 2010 +0100 wrc: Store location information in strings. --- tools/wrc/genres.c | 6 ++++++ tools/wrc/newstruc.c | 1 + tools/wrc/utils.c | 2 ++ tools/wrc/wrc.h | 12 ++++++++++++ tools/wrc/wrctypes.h | 8 ++++++++ 5 files changed, 29 insertions(+), 0 deletions(-) diff --git a/tools/wrc/genres.c b/tools/wrc/genres.c index 3d40180..6b2d7ed 100644 --- a/tools/wrc/genres.c +++ b/tools/wrc/genres.c @@ -312,11 +312,17 @@ static void put_string(res_t *res, const string_t *str, enum str_e type, int ist if (str->type == str_char) { if (!check_unicode_conversion( str, newstr, codepage )) + { + print_location( &str->loc ); error( "String %s does not convert identically to Unicode and back in codepage %d. " "Try using a Unicode string instead\n", str->str.cstr, codepage ); + } if (check_valid_utf8( str, codepage )) + { + print_location( &str->loc ); warning( "string \"%s\" seems to be UTF-8 but codepage %u is in use.\n", str->str.cstr, codepage ); + } } if (!isterm) put_word(res, newstr->size); for(cnt = 0; cnt < newstr->size; cnt++) diff --git a/tools/wrc/newstruc.c b/tools/wrc/newstruc.c index c157cb4..4651617 100644 --- a/tools/wrc/newstruc.c +++ b/tools/wrc/newstruc.c @@ -166,6 +166,7 @@ string_t *new_string(void) { string_t *ret = xmalloc( sizeof(*ret) ); memset( ret, 0, sizeof(*ret) ); + set_location( &ret->loc ); return ret; } diff --git a/tools/wrc/utils.c b/tools/wrc/utils.c index 5adebba..397c252 100644 --- a/tools/wrc/utils.c +++ b/tools/wrc/utils.c @@ -271,6 +271,8 @@ string_t *convert_string(const string_t *str, enum str_e type, int codepage) string_t *ret = xmalloc(sizeof(*ret)); int res; + ret->loc = str->loc; + if (!codepage && str->type != type) parser_error( "Current language is Unicode only, cannot convert string" ); diff --git a/tools/wrc/wrc.h b/tools/wrc/wrc.h index 0283546..4b90fd1 100644 --- a/tools/wrc/wrc.h +++ b/tools/wrc/wrc.h @@ -59,4 +59,16 @@ extern language_t *currentlanguage; void verify_translations(resource_t *top); void write_resfile(char *outname, resource_t *top); +static inline void set_location( location_t *loc ) +{ + loc->file = input_name; + loc->line = line_number; + loc->col = char_number; +} + +static inline void print_location( const location_t *loc ) +{ + if (loc->file) fprintf(stderr, "%s:%d:%d: ", loc->file, loc->line, loc->col ); +} + #endif diff --git a/tools/wrc/wrctypes.h b/tools/wrc/wrctypes.h index 5644d9d..4df9279 100644 --- a/tools/wrc/wrctypes.h +++ b/tools/wrc/wrctypes.h @@ -83,6 +83,13 @@ #define BYTESWAP_WORD(w) ((WORD)(((WORD)WRC_LOBYTE(w) << 8) + (WORD)WRC_HIBYTE(w))) #define BYTESWAP_DWORD(d) ((DWORD)(((DWORD)BYTESWAP_WORD(WRC_LOWORD(d)) << 16) + ((DWORD)BYTESWAP_WORD(WRC_HIWORD(d))))) +typedef struct +{ + const char *file; + int line; + int col; +} location_t; + /* Binary resource structure */ #define RES_BLOCKSIZE 512 @@ -103,6 +110,7 @@ typedef struct string { char *cstr; WCHAR *wstr; } str; + location_t loc; } string_t; /* Resources are identified either by name or by number */

1 0

Alexandre Julliard : wpp: Line and column numbers must start at one.
by Alexandre Julliard 30 Dec '10

30 Dec '10

Module: wine Branch: master Commit: b9b0bcbf3fb3adf05929880f3d6f94c170bafbd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9b0bcbf3fb3adf05929880f3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 30 13:08:43 2010 +0100 wpp: Line and column numbers must start at one. --- libs/wpp/wpp.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/wpp/wpp.c b/libs/wpp/wpp.c index 582ad6f..41ac54f 100644 --- a/libs/wpp/wpp.c +++ b/libs/wpp/wpp.c @@ -168,8 +168,8 @@ int wpp_parse( const char *input, FILE *output ) int ret; pp_status.input = NULL; - pp_status.line_number = 0; - pp_status.char_number = 0; + pp_status.line_number = 1; + pp_status.char_number = 1; pp_status.state = 0; ret = pp_push_define_state();

1 0

André Hentschel : setupapi/tests: Don' t test function directly when reporting GetLastError().
by Alexandre Julliard 30 Dec '10

30 Dec '10

Module: wine Branch: master Commit: c7cb92f1f2d26ea2a626d7cc2d6c917da0c0eabc URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7cb92f1f2d26ea2a626d7cc2… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Dec 29 18:52:36 2010 +0100 setupapi/tests: Don't test function directly when reporting GetLastError(). --- dlls/setupapi/tests/devinst.c | 18 +++++++++--------- dlls/setupapi/tests/install.c | 15 +++++++++++---- 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 6177668..f1d3965 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -132,7 +132,7 @@ static BOOL remove_device(void) { HDEVINFO set; SP_DEVINFO_DATA devInfo = { sizeof(devInfo), { 0 } }; - BOOL ret; + BOOL ret, retval; SetLastError(0xdeadbeef); set = pSetupDiGetClassDevsA(&guid, NULL, 0, 0); @@ -140,23 +140,23 @@ static BOOL remove_device(void) GetLastError()); SetLastError(0xdeadbeef); - ok(pSetupDiEnumDeviceInfo(set, 0, &devInfo), - "SetupDiEnumDeviceInfo failed: %08x\n", GetLastError()); + ret = pSetupDiEnumDeviceInfo(set, 0, &devInfo); + ok(ret, "SetupDiEnumDeviceInfo failed: %08x\n", GetLastError()); SetLastError(0xdeadbeef); - ret = pSetupDiCallClassInstaller(DIF_REMOVE, set, &devInfo); + retval = pSetupDiCallClassInstaller(DIF_REMOVE, set, &devInfo); if(is_wow64) - todo_wine ok(!ret && GetLastError() == ERROR_IN_WOW64, + todo_wine ok(!retval && GetLastError() == ERROR_IN_WOW64, "SetupDiCallClassInstaller(DIF_REMOVE...) succeeded: %08x\n", GetLastError()); else - todo_wine ok(ret, + todo_wine ok(retval, "SetupDiCallClassInstaller(DIF_REMOVE...) failed: %08x\n", GetLastError()); SetLastError(0xdeadbeef); - ok(pSetupDiDestroyDeviceInfoList(set), - "SetupDiDestroyDeviceInfoList failed: %08x\n", GetLastError()); + ret = pSetupDiDestroyDeviceInfoList(set); + ok(ret, "SetupDiDestroyDeviceInfoList failed: %08x\n", GetLastError()); - return ret; + return retval; } /* RegDeleteTreeW from dlls/advapi32/registry.c */ diff --git a/dlls/setupapi/tests/install.c b/dlls/setupapi/tests/install.c index f5df3df..1c204b5 100644 --- a/dlls/setupapi/tests/install.c +++ b/dlls/setupapi/tests/install.c @@ -120,12 +120,14 @@ static void test_cmdline(void) { static const char infwithspaces[] = "test file.inf"; char path[MAX_PATH]; + BOOL ret; create_inf_file(inffile, cmdline_inf); sprintf(path, "%s\\%s", CURR_DIR, inffile); run_cmdline("DefaultInstall", 128, path); ok_registry(TRUE); - ok(DeleteFile(inffile), "Expected source inf to exist, last error was %d\n", GetLastError()); + ret = DeleteFile(inffile); + ok(ret, "Expected source inf to exist, last error was %d\n", GetLastError()); /* Test handling of spaces in path, unquoted and quoted */ create_inf_file(infwithspaces, cmdline_inf); @@ -138,7 +140,8 @@ static void test_cmdline(void) run_cmdline("DefaultInstall", 128, path); ok_registry(FALSE); - ok(DeleteFile(infwithspaces), "Expected source inf to exist, last error was %d\n", GetLastError()); + ret = DeleteFile(infwithspaces); + ok(ret, "Expected source inf to exist, last error was %d\n", GetLastError()); } static const char *cmdline_inf_reg = "[Version]\n" @@ -153,6 +156,7 @@ static void test_registry(void) HKEY key; LONG res; char path[MAX_PATH]; + BOOL ret; /* First create a registry structure we would like to be deleted */ ok(!RegCreateKeyA(HKEY_CURRENT_USER, "Software\\Wine\\setupapitest\\setupapitest", &key), @@ -176,7 +180,8 @@ static void test_registry(void) RegDeleteKeyA(HKEY_CURRENT_USER, "Software\\Wine\\setupapitest\\setupapitest"); RegDeleteKeyA(HKEY_CURRENT_USER, "Software\\Wine\\setupapitest"); } - ok(DeleteFile(inffile), "Expected source inf to exist, last error was %d\n", GetLastError()); + ret = DeleteFile(inffile); + ok(ret, "Expected source inf to exist, last error was %d\n", GetLastError()); } static void test_install_svc_from(void) @@ -724,6 +729,7 @@ START_TEST(install) /* Check if pInstallHinfSectionA sets last error or is a stub (as on WinXP) */ static const char *minimal_inf = "[Version]\nSignature=\"$Chicago$\"\n"; char cmdline[MAX_PATH*2]; + BOOL ret; create_inf_file(inffile, minimal_inf); sprintf(cmdline, "DefaultInstall 128 %s\\%s", CURR_DIR, inffile); SetLastError(0xdeadbeef); @@ -733,7 +739,8 @@ START_TEST(install) skip("InstallHinfSectionA is broken (stub)\n"); pInstallHinfSectionA = NULL; } - ok(DeleteFile(inffile), "Expected source inf to exist, last error was %d\n", GetLastError()); + ret = DeleteFile(inffile); + ok(ret, "Expected source inf to exist, last error was %d\n", GetLastError()); } if (!pInstallHinfSectionW && !pInstallHinfSectionA) win_skip("InstallHinfSectionA and InstallHinfSectionW are not available\n");

1 0

André Hentschel : dsound/tests: Don' t test function directly when reporting GetLastError().
by Alexandre Julliard 30 Dec '10

30 Dec '10

Module: wine Branch: master Commit: 046bcb7c7e7fb799691342cad1ab9a4bfe13d0c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=046bcb7c7e7fb799691342cad… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Dec 29 19:41:17 2010 +0100 dsound/tests: Don't test function directly when reporting GetLastError(). --- dlls/dsound/tests/dsound.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/dsound/tests/dsound.c b/dlls/dsound/tests/dsound.c index 02d93fd..3b5a1bd 100644 --- a/dlls/dsound/tests/dsound.c +++ b/dlls/dsound/tests/dsound.c @@ -1077,7 +1077,8 @@ START_TEST(dsound) { BOOL ret; - ok( FreeLibrary(hDsound), "FreeLibrary(1) returned %d\n", GetLastError()); + ret = FreeLibrary(hDsound); + ok( ret, "FreeLibrary(1) returned %d\n", GetLastError()); SetLastError(0xdeadbeef); ret = FreeLibrary(hDsound); ok( ret ||

1 0

André Hentschel : shell32/tests: Don' t test function directly when reporting GetLastError().
by Alexandre Julliard 30 Dec '10

30 Dec '10

Module: wine Branch: master Commit: f0b9d9fce611d0a1552fbe64d374774784e8417c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0b9d9fce611d0a1552fbe64d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Dec 29 19:41:27 2010 +0100 shell32/tests: Don't test function directly when reporting GetLastError(). --- dlls/shell32/tests/shlfileop.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index a58b4fd..810a745 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -820,6 +820,7 @@ static void test_copy(void) DWORD retval; LPSTR ptr; BOOL on_nt4 = FALSE; + BOOL ret; if (old_shell32) { @@ -973,16 +974,16 @@ static void test_copy(void) shfo.pTo = "test2.txt\0"; /* suppress the error-dialog in win9x here */ shfo.fFlags = FOF_NOERRORUI | FOF_NOCONFIRMATION | FOF_SILENT; - ok(SetFileAttributesA(shfo.pTo, FILE_ATTRIBUTE_READONLY), - "Failure to set file attributes (error %x)\n", GetLastError()); + ret = SetFileAttributesA(shfo.pTo, FILE_ATTRIBUTE_READONLY); + ok(ret, "Failure to set file attributes (error %x)\n", GetLastError()); retval = CopyFileA(shfo.pFrom, shfo.pTo, FALSE); ok(!retval && GetLastError() == ERROR_ACCESS_DENIED, "CopyFileA should have fail with ERROR_ACCESS_DENIED\n"); retval = SHFileOperationA(&shfo); /* Does not work on Win95, Win95B, NT4WS and NT4SRV */ ok(!retval || broken(retval == DE_OPCANCELLED), "SHFileOperationA failed to copy (error %x)\n", retval); /* Set back normal attributes to make the file deletion succeed */ - ok(SetFileAttributesA(shfo.pTo, FILE_ATTRIBUTE_NORMAL), - "Failure to set file attributes (error %x)\n", GetLastError()); + ret = SetFileAttributesA(shfo.pTo, FILE_ATTRIBUTE_NORMAL); + ok(ret, "Failure to set file attributes (error %x)\n", GetLastError()); shfo.fFlags = tmp_flags; /* try to copy files to a file */

1 0

André Hentschel : comdlg32/tests: Don' t test function directly when reporting GetLastError().
by Alexandre Julliard 30 Dec '10

30 Dec '10

Module: wine Branch: master Commit: a608fe9328acdb484d38f185064f8dd086e534c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a608fe9328acdb484d38f1850… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Dec 29 19:41:39 2010 +0100 comdlg32/tests: Don't test function directly when reporting GetLastError(). --- dlls/comdlg32/tests/filedlg.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/comdlg32/tests/filedlg.c b/dlls/comdlg32/tests/filedlg.c index 24c663e..3b4a92f 100644 --- a/dlls/comdlg32/tests/filedlg.c +++ b/dlls/comdlg32/tests/filedlg.c @@ -647,8 +647,10 @@ static void test_ok(void) char curdir[MAX_PATH]; int i; DWORD ret; + BOOL cdret; - ok(GetCurrentDirectoryA(sizeof(curdir), curdir) != 0, "Failed to get current dir err %d\n", GetLastError()); + cdret = GetCurrentDirectoryA(sizeof(curdir), curdir); + ok(cdret, "Failed to get current dir err %d\n", GetLastError()); if (!GetTempFileNameA(".", "txt", 0, tmpfilename)) { skip("Failed to create a temporary file name\n"); return; @@ -671,7 +673,8 @@ static void test_ok(void) ok(ret == ok_testcases[i].expclose, "testid %d: GetOpenFileName returned %#x\n", i, ret); ret = CommDlgExtendedError(); ok(!ret, "CommDlgExtendedError returned %#x\n", ret); - ok(SetCurrentDirectoryA(curdir), "Failed to restore current dir err %d\n", GetLastError()); + cdret = SetCurrentDirectoryA(curdir); + ok(cdret, "Failed to restore current dir err %d\n", GetLastError()); } ret = DeleteFileA( tmpfilename); ok( ret, "Failed to delete temporary file %s err %d\n", tmpfilename, GetLastError()); @@ -1057,8 +1060,10 @@ static void test_extension(void) char *filename_ptr; const char *test_file_name = "deadbeef"; DWORD ret; + BOOL cdret; - ok(GetCurrentDirectoryA(sizeof(curdir), curdir) != 0, "Failed to get current dir err %d\n", GetLastError()); + cdret = GetCurrentDirectoryA(sizeof(curdir), curdir); + ok(cdret, "Failed to get current dir err %d\n", GetLastError()); /* Ignore .* extension */ ofn.lStructSize = sizeof(ofn);

1 0