wine-commits July 2008

wine-commits@winehq.org

3 participants
1114 discussions

Hwang YunSong(=?UTF-8?Q?=ED=99=A9=EC=9C=A4=EC=84=B1?=) : taskmgr: Updated Korean resource.
by Alexandre Julliard 02 Jul '08

02 Jul '08

Module: wine Branch: master Commit: a617634e2eea1e72c00d6b0c36fd6dc778d502f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a617634e2eea1e72c00d6b0c3… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Wed Jul 2 10:13:54 2008 +0900 taskmgr: Updated Korean resource. --- programs/taskmgr/Ko.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/taskmgr/Ko.rc b/programs/taskmgr/Ko.rc index 14070a2..00e05b6 100644 --- a/programs/taskmgr/Ko.rc +++ b/programs/taskmgr/Ko.rc @@ -433,12 +433,12 @@ STRINGTABLE DISCARDABLE BEGIN IDS_APP_TITLE "�۾� ��" IDC_TASKMGR "�۾� ��" - IDS_RUNDLG_CAPTION "Create New Task" + IDS_RUNDLG_CAPTION "�� ۾� ��" END STRINGTABLE DISCARDABLE BEGIN - ID_FILE_NEW "�� Ǯ�׸� ��" + ID_FILE_NEW "�� α׷� ��" ID_OPTIONS_ALWAYSONTOP "�۾��ڴ� �ּ�ȭ �� ʴ� �� ٸ� â �տ� �ְ� �˴ϴ�" ID_OPTIONS_MINIMIZEONUSE "�۾��ڴ� ��ȯ �۾�� Ϸ�� ּ�ȭ�˴ϴ�"

1 0

Hwang YunSong(=?UTF-8?Q?=ED=99=A9=EC=9C=A4=EC=84=B1?=) : shell32: Updated Korean resource.
by Alexandre Julliard 02 Jul '08

02 Jul '08

Module: wine Branch: master Commit: d0add535440fac5249b355c09781b8239a30ad77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0add535440fac5249b355c09… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Wed Jul 2 10:13:32 2008 +0900 shell32: Updated Korean resource. --- dlls/shell32/shell32_Ko.rc | 22 +++++++++++++++------- 1 files changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/shell32/shell32_Ko.rc b/dlls/shell32/shell32_Ko.rc index 0379926..04f4af0 100644 --- a/dlls/shell32/shell32_Ko.rc +++ b/dlls/shell32/shell32_Ko.rc @@ -153,20 +153,22 @@ FONT 10, "MS Shell Dlg" LTEXT "Wine was brought to you by:", IDC_ABOUT_WINE_TEXT, 8, 54, 204, 10 } + SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "" FONT 8, "MS Shell Dlg" { -ICON "", 12297, 7, 11, 18, 20, WS_VISIBLE -LTEXT "Ǯ�׸�,��,�� ͳ� �ڿ�, �׸�� Wine�� ̸�� ּ��.", 12289, 36, 11, 182, 18 -LTEXT "��(&O):", 12305, 7, 39, 24, 10 -CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 -DEFPUSHBUTTON "Ȯ��", IDOK, 62, 63, 50, 14, WS_TABSTOP -PUSHBUTTON "��", IDCANCEL, 116, 63, 50, 14, WS_TABSTOP -PUSHBUTTON "ã��(&B)...", 12288, 170, 63, 50, 14, WS_TABSTOP + ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE + LTEXT "Ǯ�׸�,��,�� ͳ� �ڿ�, �׸�� Wine�� ̸�� ּ��.", IDC_RUNDLG_DESCRIPTION, 36, 11, 182, 18 + LTEXT "��(&O):", IDC_RUNDLG_LABEL, 7, 39, 24, 10 + CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 + DEFPUSHBUTTON "Ȯ��", IDOK, 62, 63, 50, 14, WS_TABSTOP + PUSHBUTTON "��", IDCANCEL, 116, 63, 50, 14, WS_TABSTOP + PUSHBUTTON "ã��(&B)...", IDC_RUNDLG_BROWSE, 170, 63, 50, 14, WS_TABSTOP } + STRINGTABLE { /* columns in the shellview */ @@ -222,6 +224,12 @@ IDS_RESTART_PROMPT " IDS_SHUTDOWN_TITLE "��" IDS_SHUTDOWN_PROMPT "�� Wine �� ڽ��ϱ�?" +/* Run File dialog */ +IDS_RUNDLG_ERROR "�� ȭ ��ڸ� ��ټ� ��ϴ�(�� )" +IDS_RUNDLG_BROWSE_ERROR "ã�� ȭ ��ڸ� �� ϴ�(�� )" +IDS_RUNDLG_BROWSE_CAPTION "ã��" +IDS_RUNDLG_BROWSE_FILTER "�� \0*.exe\0A�� \0*.*\0\0" + /* shell folder path default values */ IDS_PROGRAMS "�� ޴�\\��α׷�" IDS_PERSONAL "�� "

1 0

Detlef Riekenberg : spoolss: Implement InitializeRouter.
by Alexandre Julliard 02 Jul '08

02 Jul '08

Module: wine Branch: master Commit: 76204941b815a8095f8d99bdca4862faec6a1fa6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76204941b815a8095f8d99bdc… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Jul 2 00:16:46 2008 +0200 spoolss: Implement InitializeRouter. --- dlls/spoolss/spoolss.spec | 2 +- dlls/spoolss/spoolss_main.c | 101 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 102 insertions(+), 1 deletions(-) diff --git a/dlls/spoolss/spoolss.spec b/dlls/spoolss/spoolss.spec index 5645b2e..da5ee04 100644 --- a/dlls/spoolss/spoolss.spec +++ b/dlls/spoolss/spoolss.spec @@ -73,7 +73,7 @@ @ stub GetPrinterDriverW @ stub GetPrinterW @ stdcall ImpersonatePrinterClient(long) -@ stub InitializeRouter +@ stdcall InitializeRouter() @ stdcall IsLocalCall() @ stub IsNamedPipeRpcCall @ stub LoadDriver diff --git a/dlls/spoolss/spoolss_main.c b/dlls/spoolss/spoolss_main.c index c701c0d..cc4487c 100644 --- a/dlls/spoolss/spoolss_main.c +++ b/dlls/spoolss/spoolss_main.c @@ -23,16 +23,104 @@ #include "windef.h" #include "winbase.h" #include "winerror.h" +#include "winreg.h" + +#include "wingdi.h" +#include "winspool.h" +#include "ddk/winsplp.h" + #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(spoolss); /* ################################ */ +static CRITICAL_SECTION backend_cs; +static CRITICAL_SECTION_DEBUG backend_cs_debug = +{ + 0, 0, &backend_cs, + { &backend_cs_debug.ProcessLocksList, &backend_cs_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": backend_cs") } +}; +static CRITICAL_SECTION backend_cs = { &backend_cs_debug, -1, 0, 0, 0, 0 }; + +/* ################################ */ + static HMODULE hwinspool; +static HMODULE hlocalspl; +static BOOL (WINAPI *pInitializePrintProvidor)(LPPRINTPROVIDOR, DWORD, LPWSTR); + +static PRINTPROVIDOR * backend; + +/* ################################ */ + +static const WCHAR localspldllW[] = {'l','o','c','a','l','s','p','l','.','d','l','l',0}; static const WCHAR winspooldrvW[] = {'w','i','n','s','p','o','o','l','.','d','r','v',0}; +/****************************************************************************** + * backend_load [internal] + * + * load and init our backend (the local printprovider: "localspl.dll") + * + * PARAMS + * + * RETURNS + * Success: TRUE + * Failure: FALSE and RPC_S_SERVER_UNAVAILABLE + * + * NOTES + * In windows, the spooler router (spoolss.dll) support multiple + * printprovider (localspl.dll for the local system) + * + */ +static BOOL backend_load(void) +{ + static PRINTPROVIDOR mybackend; + DWORD res; + + if (backend) return TRUE; + + EnterCriticalSection(&backend_cs); + hlocalspl = LoadLibraryW(localspldllW); + if (hlocalspl) { + pInitializePrintProvidor = (void *) GetProcAddress(hlocalspl, "InitializePrintProvidor"); + if (pInitializePrintProvidor) { + + /* native localspl does not clear unused entries */ + memset(&mybackend, 0, sizeof(mybackend)); + res = pInitializePrintProvidor(&mybackend, sizeof(mybackend), NULL); + if (res) { + backend = &mybackend; + LeaveCriticalSection(&backend_cs); + TRACE("backend: %p (%p)\n", backend, hlocalspl); + return TRUE; + } + } + FreeLibrary(hlocalspl); + } + + LeaveCriticalSection(&backend_cs); + + WARN("failed to load the backend: %u\n", GetLastError()); + SetLastError(RPC_S_SERVER_UNAVAILABLE); + return FALSE; +} + /****************************************************************** + * unload_backend [internal] + * + */ +static void backend_unload(void) +{ + EnterCriticalSection(&backend_cs); + if (backend) { + backend = NULL; + FreeLibrary(hlocalspl); + } + LeaveCriticalSection(&backend_cs); +} + +/****************************************************************************** * */ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) @@ -45,6 +133,10 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) case DLL_PROCESS_ATTACH: { DisableThreadLibraryCalls(hinstDLL); break; + + case DLL_PROCESS_DETACH: + backend_unload(); + break; } } return TRUE; @@ -170,6 +262,15 @@ BOOL WINAPI ImpersonatePrinterClient(HANDLE hToken) } /****************************************************************** + * InitializeRouter [SPOOLSS.@] + */ +BOOL WINAPI InitializeRouter(void) +{ + TRACE("()\n"); + return backend_load(); +} + +/****************************************************************** * IsLocalCall [SPOOLSS.@] */ BOOL WINAPI IsLocalCall(void)

1 0

Austin English : crypt32: Fix a couple of test failures on Vista.
by Alexandre Julliard 02 Jul '08

02 Jul '08

Module: wine Branch: master Commit: ae24e21da12dfde382602cb9e6890b1ae358e6d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae24e21da12dfde382602cb9e… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Jul 1 15:09:17 2008 -0500 crypt32: Fix a couple of test failures on Vista. --- dlls/crypt32/tests/crl.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/tests/crl.c b/dlls/crypt32/tests/crl.c index 3a65c7d..561953b 100644 --- a/dlls/crypt32/tests/crl.c +++ b/dlls/crypt32/tests/crl.c @@ -164,11 +164,13 @@ static void testAddCRL(void) /* Weird--bad add disposition leads to an access violation in Windows. */ ret = CertAddEncodedCRLToStore(0, X509_ASN_ENCODING, signedCRL, sizeof(signedCRL), 0, NULL); - ok(!ret && GetLastError() == STATUS_ACCESS_VIOLATION, - "Expected STATUS_ACCESS_VIOLATION, got %08x\n", GetLastError()); + ok(!ret && (GetLastError() == STATUS_ACCESS_VIOLATION || + GetLastError() == E_INVALIDARG /* Vista */), + "Expected STATUS_ACCESS_VIOLATION or E_INVALIDARG, got %08x\n", GetLastError()); ret = CertAddEncodedCRLToStore(store, X509_ASN_ENCODING, signedCRL, sizeof(signedCRL), 0, NULL); - ok(!ret && GetLastError() == STATUS_ACCESS_VIOLATION, + ok(!ret && (GetLastError() == STATUS_ACCESS_VIOLATION || + GetLastError() == E_INVALIDARG /* Vista */), "Expected STATUS_ACCESS_VIOLATION, got %08x\n", GetLastError()); /* Weird--can add a CRL to the NULL store (does this have special meaning?)

1 0

Peter Oberndorfer : opengl32: Fix a typo (wglShaderLists -> wglShareLists).
by Alexandre Julliard 02 Jul '08

02 Jul '08

Module: wine Branch: master Commit: c5a702f513623d81aac5f5d9ad4046dc074c31ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5a702f513623d81aac5f5d9a… Author: Peter Oberndorfer <kumbayo84(a)arcor.de> Date: Tue Jul 1 22:08:30 2008 +0200 opengl32: Fix a typo (wglShaderLists -> wglShareLists). --- dlls/winex11.drv/opengl.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 23f53d6..a68591d 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1850,7 +1850,7 @@ BOOL X11DRV_wglMakeContextCurrentARB(X11DRV_PDEVICE* pDrawDev, X11DRV_PDEVICE* p /** * X11DRV_wglShareLists * - * For OpenGL32 wglShaderLists. + * For OpenGL32 wglShareLists. */ BOOL X11DRV_wglShareLists(HGLRC hglrc1, HGLRC hglrc2) { Wine_GLContext *org = (Wine_GLContext *) hglrc1; @@ -3652,7 +3652,7 @@ BOOL X11DRV_wglMakeCurrent(X11DRV_PDEVICE *physDev, HGLRC hglrc) { /** * X11DRV_wglShareLists * - * For OpenGL32 wglShaderLists. + * For OpenGL32 wglShareLists. */ BOOL X11DRV_wglShareLists(HGLRC hglrc1, HGLRC hglrc2) { opengl_error();

1 0

Dan Hipschman : widl: Factor a small part of the grammar.
by Alexandre Julliard 02 Jul '08

02 Jul '08

Module: wine Branch: master Commit: d87bc0520f1bc6f6201b8b44bd25cf6dff69184c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d87bc0520f1bc6f6201b8b44b… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Tue Jul 1 13:09:56 2008 -0700 widl: Factor a small part of the grammar. --- tools/widl/parser.y | 22 ++++++++-------------- 1 files changed, 8 insertions(+), 14 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index fc27b2d..180ca98 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -311,7 +311,7 @@ static func_list_t *append_func_from_statement(func_list_t *list, statement_t *s %type <type> dispinterface dispinterfacehdr dispinterfacedef %type <type> module modulehdr moduledef %type <type> base_type int_std -%type <type> enumdef structdef uniondef +%type <type> enumdef structdef uniondef typedecl %type <type> type %type <ifref> coclass_int %type <ifref_list> coclass_ints @@ -401,7 +401,7 @@ semicolon_opt: statement: cppquote { $$ = make_statement_cppquote($1); } - | enumdef ';' { $$ = make_statement_type_decl($1); + | typedecl ';' { $$ = make_statement_type_decl($1); if (!parse_only && do_header) { write_type_def_or_decl(header, $1, FALSE, NULL); fprintf(header, ";\n\n"); @@ -411,19 +411,13 @@ statement: if (!parse_only && do_header) write_declaration($1, is_in_interface); } | import { $$ = make_statement_import($1); } - | structdef ';' { $$ = make_statement_type_decl($1); - if (!parse_only && do_header) { - write_type_def_or_decl(header, $1, FALSE, NULL); - fprintf(header, ";\n\n"); - } - } | typedef ';' { $$ = $1; } - | uniondef ';' { $$ = make_statement_type_decl($1); - if (!parse_only && do_header) { - write_type_def_or_decl(header, $1, FALSE, NULL); - fprintf(header, ";\n\n"); - } - } + ; + +typedecl: + enumdef + | structdef + | uniondef ; cppquote: tCPPQUOTE '(' aSTRING ')' { $$ = $3; if (!parse_only && do_header) fprintf(header, "%s\n", $3); }

1 0

Peter Oberndorfer : ntdll: Add broken() to two test cases.
by Alexandre Julliard 02 Jul '08

02 Jul '08

Module: wine Branch: master Commit: 9cd60e20242646b2f070892226dd79ee59ac2764 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cd60e20242646b2f07089222… Author: Peter Oberndorfer <kumbayo84(a)arcor.de> Date: Tue Jul 1 21:53:09 2008 +0200 ntdll: Add broken() to two test cases. --- dlls/ntdll/tests/exception.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 8116503..3a9b65d 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -169,6 +169,11 @@ static const struct exception 0, 5, STATUS_ACCESS_VIOLATION, 2, { 1, 0xfffffffe } }, { { 0xa3, 0xff, 0xff, 0xff, 0xff, 0xc3 }, /* movl %eax,0xffffffff; ret */ 0, 5, STATUS_ACCESS_VIOLATION, 2, { 1, 0xffffffff } }, + + /* test exception with cleared %ds and %es */ + { { 0x1e, 0x06, 0x31, 0xc0, 0x8e, 0xd8, 0x8e, 0xc0, 0xfa, 0x07, 0x1f, 0xc3 }, + /* push %ds; push %es; xorl %eax,%eax; mov %ax,%ds; mov %ax,%es; cli; pop %es; pop %ds; ret */ + 8, 1, STATUS_PRIVILEGED_INSTRUCTION, 0 }, }; static int got_exception; @@ -216,7 +221,7 @@ LONG CALLBACK rtlraiseexception_vectored_handler(EXCEPTION_POINTERS *ExceptionIn if(rec->ExceptionCode == EXCEPTION_BREAKPOINT) { ok(context->Eip == (DWORD)code_mem + 0xa || - context->Eip == (DWORD)code_mem + 0xb, /* win2k3 */ + broken(context->Eip == (DWORD)code_mem + 0xb), /* win2k3 */ "Eip at %x instead of %x or %x\n", context->Eip, (DWORD)code_mem + 0xa, (DWORD)code_mem + 0xb); } @@ -248,7 +253,7 @@ static DWORD rtlraiseexception_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTR if(rec->ExceptionCode == EXCEPTION_BREAKPOINT) { ok(context->Eip == (DWORD)code_mem + 0xa || - context->Eip == (DWORD)code_mem + 0xb, /* win2k3 */ + broken(context->Eip == (DWORD)code_mem + 0xb), /* win2k3 */ "Eip at %x instead of %x or %x\n", context->Eip, (DWORD)code_mem + 0xa, (DWORD)code_mem + 0xb); }

1 0

Dan Hipschman : widl: Implement type redefinition checks.
by Alexandre Julliard 02 Jul '08

02 Jul '08

Module: wine Branch: master Commit: 6725c5d756dc6cd1dc19e7de0e0c45005a2024a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6725c5d756dc6cd1dc19e7de0… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Tue Jul 1 13:08:51 2008 -0700 widl: Implement type redefinition checks. This allows widl to catch type redefinitions and report an error, like MIDL. However, this does a better job than MIDL since it also reports the location of the originial definition, like GCC. --- tools/widl/parser.y | 41 ++++++++++++++++++++++++++++++++++------- tools/widl/typelib.c | 1 + tools/widl/widltypes.h | 3 +++ 3 files changed, 38 insertions(+), 7 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 6616193..fc27b2d 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -156,6 +156,8 @@ static attr_list_t *check_module_attrs(const char *name, attr_list_t *attrs); static attr_list_t *check_coclass_attrs(const char *name, attr_list_t *attrs); const char *get_attr_display_name(enum attr_type type); static void add_explicit_handle_if_necessary(func_t *func); +static type_t *find_type_helper(const char *name, int t); +static void check_def(const type_t *t); static statement_t *make_statement(enum statement_type type); static statement_t *make_statement_type_decl(type_t *type); @@ -845,12 +847,15 @@ int_std: tINT { $$ = make_builtin($<str>1); } coclass: tCOCLASS aIDENTIFIER { $$ = make_class($2); } | tCOCLASS aKNOWNTYPE { $$ = find_type($2, 0); - if ($$->defined) error_loc("multiple definition error\n"); - if ($$->kind != TKIND_COCLASS) error_loc("%s was not declared a coclass\n", $2); + if ($$->kind != TKIND_COCLASS) + error_loc("%s was not declared a coclass at %s:%d\n", + $2, $$->loc_info.input_name, + $$->loc_info.line_number); } ; coclasshdr: attributes coclass { $$ = $2; + check_def($$); $$->attrs = check_coclass_attrs($2->name, $1); if (!parse_only && do_header) write_coclass($$); @@ -882,7 +887,7 @@ dispinterfacehdr: attributes dispinterface { attr_t *attrs; is_in_interface = TRUE; is_object_interface = TRUE; $$ = $2; - if ($$->defined) error_loc("multiple definition error\n"); + check_def($$); attrs = make_attr(ATTR_DISPINTERFACE); $$->attrs = append_attr( check_dispiface_attrs($2->name, $1), attrs ); $$->ref = find_type("IDispatch", 0); @@ -934,7 +939,7 @@ interfacehdr: attributes interface { $$.interface = $2; pointer_default = get_attrv($1, ATTR_POINTERDEFAULT); is_object_interface = is_object($1); is_in_interface = TRUE; - if ($2->defined) error_loc("multiple definition error\n"); + check_def($2); $2->attrs = check_iface_attrs($2->name, $1); $2->defined = TRUE; if (!parse_only && do_header) write_forward($2); @@ -1060,6 +1065,7 @@ pointer_type: structdef: tSTRUCT t_ident '{' fields '}' { $$ = get_typev(RPC_FC_STRUCT, $2, tsSTRUCT); /* overwrite RPC_FC_STRUCT with a more exact type */ + check_def($$); $$->type = get_struct_type( $4 ); $$->kind = TKIND_RECORD; $$->fields_or_args = $4; @@ -1089,6 +1095,7 @@ typedef: tTYPEDEF m_attributes decl_spec declarator_list uniondef: tUNION t_ident '{' ne_union_fields '}' { $$ = get_typev(RPC_FC_NON_ENCAPSULATED_UNION, $2, tsUNION); + check_def($$); $$->kind = TKIND_UNION; $$->fields_or_args = $4; $$->defined = TRUE; @@ -1097,6 +1104,7 @@ uniondef: tUNION t_ident '{' ne_union_fields '}' tSWITCH '(' s_field ')' m_ident '{' cases '}' { var_t *u = $7; $$ = get_typev(RPC_FC_ENCAPSULATED_UNION, $2, tsUNION); + check_def($$); $$->kind = TKIND_UNION; if (!u) u = make_var( xstrdup("tagged_union") ); u->type = make_type(RPC_FC_NON_ENCAPSULATED_UNION, NULL); @@ -1390,6 +1398,7 @@ type_t *make_type(unsigned char type, type_t *ref) t->tfswrite = FALSE; t->checked = FALSE; t->typelib_idx = -1; + init_loc_info(&t->loc_info); return t; } @@ -1701,9 +1710,7 @@ static var_t *make_var(char *name) v->attrs = NULL; v->eval = NULL; v->stgclass = STG_NONE; - v->loc_info.input_name = input_name ? input_name : "stdin"; - v->loc_info.line_number = line_number; - v->loc_info.near_text = parser_text; + init_loc_info(&v->loc_info); return v; } @@ -1894,6 +1901,12 @@ static type_t *reg_typedefs(decl_spec_t *decl_spec, declarator_list_t *decls, at if (name->name) { type_t *cur; + cur = find_type_helper(name->name, 0); + if (cur) + error_loc("%s: redefinition error; original definition was at %s:%d\n", + cur->name, cur->loc_info.input_name, + cur->loc_info.line_number); + /* set the attributes to allow set_type to do some checks on them */ name->attrs = attrs; set_type(name, decl_spec, decl, 0); @@ -2896,3 +2909,17 @@ static func_list_t *append_func_from_statement(func_list_t *list, statement_t *s } return list; } + +void init_loc_info(loc_info_t *i) +{ + i->input_name = input_name ? input_name : "stdin"; + i->line_number = line_number; + i->near_text = parser_text; +} + +static void check_def(const type_t *t) +{ + if (t->defined) + error_loc("%s: redefinition error; original definition was at %s:%d\n", + t->name, t->loc_info.input_name, t->loc_info.line_number); +} diff --git a/tools/widl/typelib.c b/tools/widl/typelib.c index 4102fad..b30b323 100644 --- a/tools/widl/typelib.c +++ b/tools/widl/typelib.c @@ -70,6 +70,7 @@ type_t *alias(type_t *t, const char *name) a->kind = TKIND_ALIAS; a->attrs = NULL; a->declarray = FALSE; + init_loc_info(&a->loc_info); return a; } diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index c3a3948..d00a732 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -274,6 +274,7 @@ struct _type_t { unsigned int typestring_offset; unsigned int ptrdesc; /* used for complex structs */ int typelib_idx; + loc_info_t loc_info; unsigned int declarray : 1; /* if declared as an array */ unsigned int ignore : 1; unsigned int defined : 1; @@ -410,6 +411,8 @@ var_t *find_const(const char *name, int f); type_t *find_type(const char *name, int t); type_t *make_type(unsigned char type, type_t *ref); +void init_loc_info(loc_info_t *); + static inline type_t *get_func_return_type(const func_t *func) { return func->def->type->ref;

1 0

Dan Hipschman : include: Fix type redefinitions in IDL files.
by Alexandre Julliard 02 Jul '08

02 Jul '08

Module: wine Branch: master Commit: 6db7ce7a6dcf8023bf4c0ffc78c0eb3271e68cb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6db7ce7a6dcf8023bf4c0ffc7… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Tue Jul 1 13:08:04 2008 -0700 include: Fix type redefinitions in IDL files. --- include/d3d10.idl | 2 +- include/vmr9.idl | 1 - 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/include/d3d10.idl b/include/d3d10.idl index 4e5292f..120f884 100644 --- a/include/d3d10.idl +++ b/include/d3d10.idl @@ -676,7 +676,7 @@ typedef struct D3D10_TEX2DMS_SRV { UINT UnusedField_NothingToDefine; } D3D10_TEX2DMS_SRV; -typedef struct D3D10_TEX2DMS_ARRAY_RTV { +typedef struct D3D10_TEX2DMS_ARRAY_SRV { UINT FirstArraySlice; UINT ArraySize; } D3D10_TEX2DMS_ARRAY_SRV; diff --git a/include/vmr9.idl b/include/vmr9.idl index e5e5fd8..b7f916c 100644 --- a/include/vmr9.idl +++ b/include/vmr9.idl @@ -25,7 +25,6 @@ typedef LONGLONG REFERENCE_TIME; typedef DWORD D3DFORMAT; typedef DWORD D3DPOOL; typedef HANDLE HMONITOR; -typedef HANDLE HDC; typedef struct { } AM_MEDIA_TYPE; typedef struct { } D3DCOLOR; cpp_quote("#endif")

1 0

Rob Shearman : widl: Check that the structure has been defined in check_remoting_args.
by Alexandre Julliard 02 Jul '08

02 Jul '08

Module: wine Branch: master Commit: 037fa861ab07be09a90409e5031d8207ddf27bda URL: http://source.winehq.org/git/wine.git/?a=commit;h=037fa861ab07be09a90409e50… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Wed Jul 2 00:01:42 2008 +0100 widl: Check that the structure has been defined in check_remoting_args. --- tools/widl/parser.y | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index bb54b43..6616193 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -2611,7 +2611,12 @@ static void check_remoting_fields(const var_t *var, type_t *type) type->checked = TRUE; if (is_struct(type->type)) - fields = type->fields_or_args; + { + if (type->defined) + fields = type->fields_or_args; + else + error_loc_info(&var->loc_info, "undefined type declaration %s\n", type->name); + } else if (is_union(type->type)) { if (type->type == RPC_FC_ENCAPSULATED_UNION)

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2008