wine-commits August 2013

wine-commits@winehq.org

2 participants
461 discussions

Nikolay Sivov : oledb32: Stub for IRowPosition.
by Alexandre Julliard 01 Aug '13

01 Aug '13

Module: wine Branch: master Commit: 6297ba3dcbb6e96c12193d30d471d9479e38e19a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6297ba3dcbb6e96c12193d30d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 1 07:48:13 2013 +0400 oledb32: Stub for IRowPosition. --- dlls/oledb32/Makefile.in | 3 +- dlls/oledb32/main.c | 6 ++ dlls/oledb32/oledb32_classes.idl | 12 +++ dlls/oledb32/oledb_private.h | 1 + dlls/oledb32/rowpos.c | 155 ++++++++++++++++++++++++++++++++++++++ dlls/oledb32/tests/database.c | 15 ++++ include/msdaguid.h | 1 + 7 files changed, 192 insertions(+), 1 deletions(-) diff --git a/dlls/oledb32/Makefile.in b/dlls/oledb32/Makefile.in index 2da63ad..b019bdb 100644 --- a/dlls/oledb32/Makefile.in +++ b/dlls/oledb32/Makefile.in @@ -6,7 +6,8 @@ C_SRCS = \ convert.c \ datainit.c \ errorinfo.c \ - main.c + main.c \ + rowpos.c IDL_I_SRCS = convert.idl diff --git a/dlls/oledb32/main.c b/dlls/oledb32/main.c index 838e6d1..d101316 100644 --- a/dlls/oledb32/main.c +++ b/dlls/oledb32/main.c @@ -129,6 +129,7 @@ static const IClassFactoryVtbl CF_Vtbl = static cf oledb_convert_cf = { { &CF_Vtbl }, create_oledb_convert }; static cf oledb_datainit_cf = { { &CF_Vtbl }, create_data_init }; static cf oledb_errorinfo_cf = { { &CF_Vtbl }, create_error_info }; +static cf oledb_rowpos_cf = { { &CF_Vtbl }, create_oledb_rowpos }; /****************************************************************** * DllGetClassObject @@ -152,6 +153,11 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **obj) *obj = &oledb_errorinfo_cf; return S_OK; } + else if ( IsEqualCLSID (rclsid, &CLSID_OLEDB_ROWPOSITIONLIBRARY) ) + { + *obj = &oledb_rowpos_cf; + return S_OK; + } return CLASS_E_CLASSNOTAVAILABLE; } diff --git a/dlls/oledb32/oledb32_classes.idl b/dlls/oledb32/oledb32_classes.idl index a154b57..e4b1e22 100644 --- a/dlls/oledb32/oledb32_classes.idl +++ b/dlls/oledb32/oledb32_classes.idl @@ -41,3 +41,15 @@ coclass OLEDB_CONVERSIONLIBRARY coclass OLEDB_MSDAER { } + +[ + helpstring("OLE DB Row Position Library"), + threading(both), + progid("RowPosition.RowPosition.1"), + vi_progid("RowPosition.RowPosition"), + uuid(2048eee6-7fa2-11d0-9e6a-00a0c9138c29) +] +coclass OLEDB_ROWPOSITIONLIBRARY +{ + interface IRowPosition; +} diff --git a/dlls/oledb32/oledb_private.h b/dlls/oledb32/oledb_private.h index 3497369..3ff8d1d 100644 --- a/dlls/oledb32/oledb_private.h +++ b/dlls/oledb32/oledb_private.h @@ -20,3 +20,4 @@ HRESULT create_oledb_convert(IUnknown *outer, void **obj) DECLSPEC_HIDDEN; HRESULT create_data_init(IUnknown *outer, void **obj) DECLSPEC_HIDDEN; HRESULT create_error_info(IUnknown *outer, void **obj) DECLSPEC_HIDDEN; +HRESULT create_oledb_rowpos(IUnknown *outer, void **obj) DECLSPEC_HIDDEN; diff --git a/dlls/oledb32/rowpos.c b/dlls/oledb32/rowpos.c new file mode 100644 index 0000000..c7581b7 --- /dev/null +++ b/dlls/oledb32/rowpos.c @@ -0,0 +1,155 @@ +/* OLE DB Row Position library + * + * Copyright 2013 Nikolay Sivov + * + * 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 + */ + +#define COBJMACROS + +#include "windef.h" +#include "ole2.h" + +#include "oledb.h" + +#include "oledb_private.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(oledb); + +typedef struct +{ + IRowPosition IRowPosition_iface; + LONG ref; +} rowpos; + +static inline rowpos *impl_from_IRowPosition(IRowPosition *iface) +{ + return CONTAINING_RECORD(iface, rowpos, IRowPosition_iface); +} + +static HRESULT WINAPI rowpos_QueryInterface(IRowPosition* iface, REFIID riid, void **obj) +{ + rowpos *This = impl_from_IRowPosition(iface); + + TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), obj); + + *obj = NULL; + + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IRowPosition)) + { + *obj = iface; + } + else + { + FIXME("interface %s not implemented\n", debugstr_guid(riid)); + return E_NOINTERFACE; + } + + IRowPosition_AddRef(iface); + return S_OK; +} + +static ULONG WINAPI rowpos_AddRef(IRowPosition* iface) +{ + rowpos *This = impl_from_IRowPosition(iface); + ULONG ref = InterlockedIncrement(&This->ref); + TRACE("(%p)->(%d)\n", This, ref); + return ref; +} + +static ULONG WINAPI rowpos_Release(IRowPosition* iface) +{ + rowpos *This = impl_from_IRowPosition(iface); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p)->(%d)\n", This, ref); + + if (ref == 0) + HeapFree(GetProcessHeap(), 0, This); + + return ref; +} + +static HRESULT WINAPI rowpos_ClearRowPosition(IRowPosition* iface) +{ + rowpos *This = impl_from_IRowPosition(iface); + FIXME("(%p): stub\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI rowpos_GetRowPosition(IRowPosition *iface, HCHAPTER *chapter, + HROW *row, DBPOSITIONFLAGS *flags) +{ + rowpos *This = impl_from_IRowPosition(iface); + FIXME("(%p)->(%p %p %p): stub\n", This, chapter, row, flags); + return E_NOTIMPL; +} + +static HRESULT WINAPI rowpos_GetRowset(IRowPosition *iface, REFIID riid, IUnknown **rowset) +{ + rowpos *This = impl_from_IRowPosition(iface); + FIXME("(%p)->(%s %p): stub\n", This, debugstr_guid(riid), rowset); + return E_NOTIMPL; +} + +static HRESULT WINAPI rowpos_Initialize(IRowPosition *iface, IUnknown *rowset) +{ + rowpos *This = impl_from_IRowPosition(iface); + FIXME("(%p)->(%p): stub\n", This, rowset); + return E_NOTIMPL; +} + +static HRESULT WINAPI rowpos_SetRowPosition(IRowPosition *iface, HCHAPTER chapter, + HROW row, DBPOSITIONFLAGS flags) +{ + rowpos *This = impl_from_IRowPosition(iface); + FIXME("(%p)->(%lx %lx %d): stub\n", This, chapter, row, flags); + return E_NOTIMPL; +} + +static const struct IRowPositionVtbl rowpos_vtbl = +{ + rowpos_QueryInterface, + rowpos_AddRef, + rowpos_Release, + rowpos_ClearRowPosition, + rowpos_GetRowPosition, + rowpos_GetRowset, + rowpos_Initialize, + rowpos_SetRowPosition +}; + +HRESULT create_oledb_rowpos(IUnknown *outer, void **obj) +{ + rowpos *This; + + TRACE("(%p, %p)\n", outer, obj); + + *obj = NULL; + + if(outer) return CLASS_E_NOAGGREGATION; + + This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); + if(!This) return E_OUTOFMEMORY; + + This->IRowPosition_iface.lpVtbl = &rowpos_vtbl; + This->ref = 1; + + *obj = &This->IRowPosition_iface; + + return S_OK; +} diff --git a/dlls/oledb32/tests/database.c b/dlls/oledb32/tests/database.c index 840bb2a..d54d546 100644 --- a/dlls/oledb32/tests/database.c +++ b/dlls/oledb32/tests/database.c @@ -28,6 +28,7 @@ #include "msdadc.h" #include "msdasc.h" #include "shlobj.h" +#include "msdaguid.h" #include "initguid.h" #include "wine/test.h" @@ -185,6 +186,17 @@ static void test_initializationstring(void) } } +static void test_rowposition(void) +{ + IRowPosition *rowpos; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_OLEDB_ROWPOSITIONLIBRARY, NULL, CLSCTX_INPROC_SERVER, &IID_IRowPosition, (void**)&rowpos); + ok(hr == S_OK, "got %08x\n", hr); + + IRowPosition_Release(rowpos); +} + START_TEST(database) { OleInitialize(NULL); @@ -193,5 +205,8 @@ START_TEST(database) test_errorinfo(); test_initializationstring(); + /* row position */ + test_rowposition(); + OleUninitialize(); } diff --git a/include/msdaguid.h b/include/msdaguid.h index 7ee9b56..d86ac23 100644 --- a/include/msdaguid.h +++ b/include/msdaguid.h @@ -22,5 +22,6 @@ DEFINE_GUID(CLSID_EXTENDEDERRORINFO, 0xc8b522cf, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); DEFINE_GUID(CLSID_OLEDB_ENUMERATOR, 0xc8b522d0, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); DEFINE_GUID(CLSID_OLEDB_CONVERSIONLIBRARY, 0xc8b522d1, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); +DEFINE_GUID(CLSID_OLEDB_ROWPOSITIONLIBRARY,0x2048eee6, 0x7fa2, 0x11d0, 0x9e, 0x6a, 0x00, 0xa0, 0xc9, 0x13, 0x8c, 0x29); #endif /*__WINE_MSDAGUID_H */

1 0

Alexandre Julliard : wrc: Remove non-bison compatibility code.
by Alexandre Julliard 01 Aug '13

01 Aug '13

Module: wine Branch: master Commit: 8fcac3b2bb8ce4cdbcffc126df779bf1be168882 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fcac3b2bb8ce4cdbcffc126d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 1 12:04:29 2013 +0200 wrc: Remove non-bison compatibility code. --- tools/wrc/parser.y | 27 +-------------------------- 1 files changed, 1 insertions(+), 26 deletions(-) diff --git a/tools/wrc/parser.y b/tools/wrc/parser.y index ad5fb98..ff59327 100644 --- a/tools/wrc/parser.y +++ b/tools/wrc/parser.y @@ -142,31 +142,6 @@ #include "wingdi.h" #include "winuser.h" -#if defined(YYBYACC) - /* Berkeley yacc (byacc) doesn't seem to know about these */ - /* Some *BSD supplied versions do define these though */ -# ifndef YYEMPTY -# define YYEMPTY (-1) /* Empty lookahead value of yychar */ -# endif -# ifndef YYLEX -# define YYLEX yylex() -# endif - -#elif defined(YYBISON) - /* Bison was used for original development */ - /* #define YYEMPTY -2 */ - /* #define YYLEX yylex() */ - -#else - /* No yacc we know yet */ -# if !defined(YYEMPTY) || !defined(YYLEX) -# error Yacc version/type unknown. This version needs to be verified for settings of YYEMPTY and YYLEX. -# elif defined(__GNUC__) /* gcc defines the #warning directive */ -# warning Yacc version/type unknown. It defines YYEMPTY and YYLEX, but is not tested - /* #else we just take a chance that it works... */ -# endif -#endif - int want_nl = 0; /* Signal flex that we need the next newline */ int want_id = 0; /* Signal flex that we need the next identifier */ static stringtable_t *tagstt; /* Stringtable tag. @@ -2837,7 +2812,7 @@ static int rsrcid_to_token(int lookahead) /* Get a token if we don't have one yet */ if(lookahead == YYEMPTY) - lookahead = YYLEX; + lookahead = yylex(); /* Only numbers are possibly interesting */ switch(lookahead)

1 0

Alexandre Julliard : widl: Remove non-bison compatibility code.
by Alexandre Julliard 01 Aug '13

01 Aug '13

Module: wine Branch: master Commit: bda5a2ffb833b2824325bd9361b30dbaf5f78068 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bda5a2ffb833b2824325bd936… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 1 12:04:24 2013 +0200 widl: Remove non-bison compatibility code. --- tools/widl/parser.y | 29 ++--------------------------- 1 files changed, 2 insertions(+), 27 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index b7fa2f6..579cbc6 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -38,33 +38,6 @@ #include "expr.h" #include "typetree.h" -#if defined(YYBYACC) - /* Berkeley yacc (byacc) doesn't seem to know about these */ - /* Some *BSD supplied versions do define these though */ -# ifndef YYEMPTY -# define YYEMPTY (-1) /* Empty lookahead value of yychar */ -# endif -# ifndef YYLEX -# define YYLEX yylex() -# endif - -#elif defined(YYBISON) - /* Bison was used for original development */ - /* #define YYEMPTY -2 */ - /* #define YYLEX yylex() */ - -#else - /* No yacc we know yet */ -# if !defined(YYEMPTY) || !defined(YYLEX) -# error Yacc version/type unknown. This version needs to be verified for settings of YYEMPTY and YYLEX. -# elif defined(__GNUC__) /* gcc defines the #warning directive */ -# warning Yacc version/type unknown. It defines YYEMPTY and YYLEX, but is not tested - /* #else we just take a chance that it works... */ -# endif -#endif - -#define YYERROR_VERBOSE - static unsigned char pointer_default = RPC_FC_UP; typedef struct list typelist_t; @@ -323,6 +296,8 @@ static statement_list_t *append_statement(statement_list_t *list, statement_t *s %right '!' '~' CAST PPTR POS NEG ADDRESSOF tSIZEOF %left '.' MEMBERPTR '[' ']' +%error-verbose + %% input: gbl_statements { fix_incomplete();

1 0

Alexandre Julliard : wbemprox: Use bison directives instead of defines to specify extra lexer parameters.
by Alexandre Julliard 01 Aug '13

01 Aug '13

Module: wine Branch: master Commit: c14e322a92a24e704836c5c12207c694a30e805f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c14e322a92a24e704836c5c12… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 1 12:00:44 2013 +0200 wbemprox: Use bison directives instead of defines to specify extra lexer parameters. --- dlls/wbemprox/wql.y | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/wbemprox/wql.y b/dlls/wbemprox/wql.y index 8e347c2..58663d0 100644 --- a/dlls/wbemprox/wql.y +++ b/dlls/wbemprox/wql.y @@ -30,11 +30,6 @@ #include "wine/debug.h" #include "wine/unicode.h" -#define YYLEX_PARAM ctx -#define YYPARSE_PARAM ctx -#define YYERROR_DEBUG 1 -#define YYERROR_VERBOSE 1 - WINE_DEFAULT_DEBUG_CHANNEL(wbemprox); struct parser @@ -181,7 +176,7 @@ static struct expr *expr_propval( struct parser *parser, const struct property * return e; } -static int wql_error( const char *str ); +static int wql_error( struct parser *parser, const char *str ); static int wql_lex( void *val, struct parser *parser ); #define PARSER_BUBBLE_UP_VIEW( parser, result, current_view ) \ @@ -190,6 +185,9 @@ static int wql_lex( void *val, struct parser *parser ); %} +%lex-param { struct parser *ctx } +%parse-param { struct parser *ctx } +%error-verbose %pure-parser %union @@ -691,7 +689,7 @@ static int wql_lex( void *p, struct parser *parser ) return token; } -static int wql_error( const char *str ) +static int wql_error( struct parser *parser, const char *str ) { ERR("%s\n", str); return 0;

1 0

Alexandre Julliard : vbscript: Use bison directives instead of defines to specify extra lexer parameters.
by Alexandre Julliard 01 Aug '13

01 Aug '13

Module: wine Branch: master Commit: f86c46f6403fe338a544ab134bdf563c5b0934ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=f86c46f6403fe338a544ab134… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 1 12:00:23 2013 +0200 vbscript: Use bison directives instead of defines to specify extra lexer parameters. --- dlls/vbscript/parser.y | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 4b380ef..3c54fd8 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -25,10 +25,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(vbscript); -#define YYLEX_PARAM ctx -#define YYPARSE_PARAM ctx - -static int parser_error(const char*); +static int parser_error(parser_ctx_t *,const char*); static void parse_complete(parser_ctx_t*,BOOL); @@ -82,7 +79,9 @@ static const WCHAR propertyW[] = {'p','r','o','p','e','r','t','y',0}; %} -%pure_parser +%lex-param { parser_ctx_t *ctx } +%parse-param { parser_ctx_t *ctx } +%pure-parser %start Program %union { @@ -426,7 +425,7 @@ Identifier | tPROPERTY { $$ = propertyW; } %% -static int parser_error(const char *str) +static int parser_error(parser_ctx_t *ctx, const char *str) { return 0; }

1 0

Alexandre Julliard : msi: Use bison directives instead of defines to specify extra lexer parameters.
by Alexandre Julliard 01 Aug '13

01 Aug '13

Module: wine Branch: master Commit: 3f98185fb8f88c181877e909ab1b6422fb9bca1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f98185fb8f88c181877e909a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 1 12:00:04 2013 +0200 msi: Use bison directives instead of defines to specify extra lexer parameters. --- dlls/msi/cond.y | 10 ++++------ dlls/msi/query.h | 13 +++++++++++++ dlls/msi/sql.y | 23 ++++------------------- 3 files changed, 21 insertions(+), 25 deletions(-) diff --git a/dlls/msi/cond.y b/dlls/msi/cond.y index 97bb002..fa55825 100644 --- a/dlls/msi/cond.y +++ b/dlls/msi/cond.y @@ -42,11 +42,6 @@ #include "wine/unicode.h" #include "wine/list.h" -#define YYLEX_PARAM info -#define YYPARSE_PARAM info - -static int cond_error(const char *str); - WINE_DEFAULT_DEBUG_CHANNEL(msi); typedef struct tag_yyinput @@ -66,6 +61,7 @@ struct cond_str { static LPWSTR COND_GetString( COND_input *info, const struct cond_str *str ); static LPWSTR COND_GetLiteral( COND_input *info, const struct cond_str *str ); static int cond_lex( void *COND_lval, COND_input *info); +static int cond_error( COND_input *info, const char *str); static void *cond_alloc( COND_input *cond, unsigned int sz ); static void *cond_track_mem( COND_input *cond, void *ptr, unsigned int sz ); @@ -110,6 +106,8 @@ static BOOL num_from_prop( LPCWSTR p, INT *val ) %} +%lex-param { COND_input *info } +%parse-param { COND_input *info } %pure-parser %union @@ -798,7 +796,7 @@ static void cond_free( void *ptr ) } } -static int cond_error(const char *str) +static int cond_error( COND_input *info, const char *str ) { TRACE("%s\n", str ); return 0; diff --git a/dlls/msi/query.h b/dlls/msi/query.h index ca34b4c..063fbb9 100644 --- a/dlls/msi/query.h +++ b/dlls/msi/query.h @@ -96,6 +96,19 @@ struct expr } u; }; +typedef struct +{ + MSIDATABASE *db; + LPCWSTR command; + DWORD n, len; + UINT r; + MSIVIEW **view; /* View structure for the resulting query. This value + * tracks the view currently being created so we can free + * this view on syntax error. + */ + struct list *mem; +} SQL_input; + UINT MSI_ParseSQL( MSIDATABASE *db, LPCWSTR command, MSIVIEW **phview, struct list *mem ) DECLSPEC_HIDDEN; diff --git a/dlls/msi/sql.y b/dlls/msi/sql.y index ead7743..fa54741 100644 --- a/dlls/msi/sql.y +++ b/dlls/msi/sql.y @@ -34,29 +34,12 @@ #include "wine/debug.h" #include "wine/unicode.h" -#define YYLEX_PARAM info -#define YYPARSE_PARAM info - -static int sql_error(const char *str); - WINE_DEFAULT_DEBUG_CHANNEL(msi); -typedef struct tag_SQL_input -{ - MSIDATABASE *db; - LPCWSTR command; - DWORD n, len; - UINT r; - MSIVIEW **view; /* View structure for the resulting query. This value - * tracks the view currently being created so we can free - * this view on syntax error. - */ - struct list *mem; -} SQL_input; - static UINT SQL_getstring( void *info, const struct sql_str *strdata, LPWSTR *str ); static INT SQL_getint( void *info ); static int sql_lex( void *SQL_lval, SQL_input *info ); +static int sql_error( SQL_input *info, const char *str); static LPWSTR parser_add_table( void *info, LPCWSTR list, LPCWSTR table ); static void *parser_alloc( void *info, unsigned int sz ); @@ -77,6 +60,8 @@ static struct expr * EXPR_wildcard( void *info ); %} +%lex-param { SQL_input *info } +%parse-param { SQL_input *info } %pure-parser %union @@ -866,7 +851,7 @@ INT SQL_getint( void *info ) return r; } -static int sql_error( const char *str ) +static int sql_error( SQL_input *info, const char *str ) { return 0; }

1 0

Alexandre Julliard : jscript: Use bison directives instead of defines to specify extra lexer parameters.
by Alexandre Julliard 01 Aug '13

01 Aug '13

Module: wine Branch: master Commit: ffbe1ca986bd299e1fc894440849914378adbf5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffbe1ca986bd299e1fc894440… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 1 11:59:12 2013 +0200 jscript: Use bison directives instead of defines to specify extra lexer parameters. --- dlls/jscript/parser.y | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index f5a2e72..327366a 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -25,10 +25,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(jscript); -#define YYLEX_PARAM ctx -#define YYPARSE_PARAM ctx - -static int parser_error(const char*); +static int parser_error(parser_ctx_t*,const char*); static void set_error(parser_ctx_t*,UINT); static BOOL explicit_error(parser_ctx_t*,void*,WCHAR); static BOOL allow_auto_semicolon(parser_ctx_t*); @@ -139,7 +136,9 @@ static source_elements_t *source_elements_add_statement(source_elements_t*,state %} -%pure_parser +%lex-param { parser_ctx_t *ctx } +%parse-param { parser_ctx_t *ctx } +%pure-parser %start Program %union { @@ -1386,7 +1385,7 @@ static expression_t *new_call_expression(parser_ctx_t *ctx, expression_t *expres return &ret->expr; } -static int parser_error(const char *str) +static int parser_error(parser_ctx_t *ctx, const char *str) { return 0; }

1 0

Volkan Gezer : po: Updated Turkish translations.
by Alexandre Julliard 01 Aug '13

01 Aug '13

Module: wine Branch: master Commit: 5b17363adda159fab9e4726ea604fc32639bb564 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b17363adda159fab9e4726ea… Author: Volkan Gezer <volkangezer(a)gmail.com> Date: Wed Jul 31 22:10:09 2013 +0200 po: Updated Turkish translations. --- po/tr.po | 36 +++++++++++++++--------------------- 1 files changed, 15 insertions(+), 21 deletions(-) diff --git a/po/tr.po b/po/tr.po index c9e55f0..f0e624b 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4420,7 +4420,7 @@ msgstr "Takas hatası.\n" #: winerror.mc:1021 msgid "Stack overflow.\n" -msgstr "" +msgstr "Yığın bellek taştı.\n" #: winerror.mc:1026 msgid "Invalid message.\n" @@ -4428,7 +4428,7 @@ msgstr "Geçersiz mesaj.\n" #: winerror.mc:1031 msgid "Cannot complete.\n" -msgstr "" +msgstr "Tamamlanamadı.\n" #: winerror.mc:1036 msgid "Invalid flags.\n" @@ -4456,7 +4456,7 @@ msgstr "Kayıt defteri bozuk.\n" #: winerror.mc:1066 msgid "Invalid key.\n" -msgstr "" +msgstr "Geçersiz anahtar.\n" #: winerror.mc:1071 msgid "Can't open registry key.\n" @@ -4476,23 +4476,23 @@ msgstr "Kayıt kurtarıldı.\n" #: winerror.mc:1091 msgid "Registry is corrupt.\n" -msgstr "" +msgstr "Kayıt defteri bozuk.\n" #: winerror.mc:1096 msgid "I/O to registry failed.\n" -msgstr "" +msgstr "Kayda G/Ç başarısız.\n" #: winerror.mc:1101 msgid "Not registry file.\n" -msgstr "" +msgstr "Kayıt dosyası değil.\n" #: winerror.mc:1106 msgid "Key deleted.\n" -msgstr "" +msgstr "Anahtar silindi.\n" #: winerror.mc:1111 msgid "No registry log space.\n" -msgstr "" +msgstr "Kayıt günlük boşluğu yok.\n" #: winerror.mc:1116 msgid "Registry key has subkeys.\n" @@ -4552,7 +4552,7 @@ msgstr "" #: winerror.mc:1186 msgid "Service not active.\n" -msgstr "" +msgstr "Hizmet etkin değil.\n" #: winerror.mc:1191 msgid "Service controller connect failed.\n" @@ -5844,15 +5844,15 @@ msgstr "Aygıt kaldırıldı.\n" #: winerror.mc:2811 msgid "Installation already running.\n" -msgstr "" +msgstr "Kurulum zaten çalışıyor.\n" #: winerror.mc:2816 msgid "Installation package failed to open.\n" -msgstr "" +msgstr "Kurulum paketi açılamadı.\n" #: winerror.mc:2821 msgid "Installation package is invalid.\n" -msgstr "" +msgstr "Kurulum paketi geçersiz.\n" #: winerror.mc:2826 msgid "Installer user interface failed.\n" @@ -13564,22 +13564,16 @@ msgid "Not yet implemented" msgstr "Henüz tamamlanmadı" #: winefile.rc:106 -#, fuzzy -#| msgid "Expiration Date" msgid "Creation date" -msgstr "Son Kullanma Tarihi" +msgstr "Oluşturma tarihi" #: winefile.rc:107 -#, fuzzy -#| msgid "Access denied.\n" msgid "Access date" -msgstr "Erişim engellendi.\n" +msgstr "Erişim tarihi" #: winefile.rc:108 -#, fuzzy -#| msgid "Certification Path" msgid "Modification date" -msgstr "Sertifika Yolu" +msgstr "Düzenlenme tarihi" #: winefile.rc:109 msgid "Index/Inode"

1 0

Bruno Jesus : ws2_32/tests: Test the precedence of parameters while creating a socket in WSASocket().
by Alexandre Julliard 01 Aug '13

01 Aug '13

Module: wine Branch: master Commit: d5f7f74f7868667f4257ea251fee74569b162594 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5f7f74f7868667f4257ea251… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Jul 31 18:32:43 2013 -0300 ws2_32/tests: Test the precedence of parameters while creating a socket in WSASocket(). --- dlls/ws2_32/tests/sock.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 2ee81ae..7e70449 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1733,7 +1733,21 @@ todo_wine FROM_PROTOCOL_INFO, &pi[0], 0, 0); ok(sock != INVALID_SOCKET, "Failed to create socket: %d\n", WSAGetLastError()); + closesocket(sock); + /* find what parameters are used first: plain parameters or protocol info struct */ + pi[0].iProtocol = IPPROTO_UDP; + pi[0].iSocketType = SOCK_DGRAM; + pi[0].iAddressFamily = AF_INET; + sock = WSASocketA(AF_INET, SOCK_STREAM, IPPROTO_TCP, &pi[0], 0, 0); + ok(sock != INVALID_SOCKET, "Failed to create socket: %d\n", + WSAGetLastError()); + size = sizeof(socktype); + socktype = 0xdead; + err = getsockopt(sock, SOL_SOCKET, SO_TYPE, (char *) &socktype, &size); + ok(!err,"getsockopt failed with %d\n", WSAGetLastError()); + ok(socktype == SOCK_STREAM, "Wrong socket type, expected %d received %d\n", + SOCK_STREAM, socktype); closesocket(sock); HeapFree(GetProcessHeap(), 0, pi);

1 0

Bruno Jesus : ws2_32/tests: Fix bad usage of WSAGetLastError() in tests.
by Alexandre Julliard 01 Aug '13

01 Aug '13

Module: wine Branch: master Commit: d7f216818f10077599dc17a5e2a43ca0f7d520a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7f216818f10077599dc17a5e… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Jul 31 18:32:26 2013 -0300 ws2_32/tests: Fix bad usage of WSAGetLastError() in tests. --- dlls/ws2_32/tests/sock.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 1a75ffd..2ee81ae 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1766,8 +1766,8 @@ todo_wine todo_wine { size = sizeof(socktype); socktype = 0xdead; - ok(!getsockopt(sock, SOL_SOCKET, SO_TYPE, (char *) &socktype, &size), "getsockopt failed with %d\n", - WSAGetLastError()); + err = getsockopt(sock, SOL_SOCKET, SO_TYPE, (char *) &socktype, &size); + ok(!err, "getsockopt failed with %d\n", WSAGetLastError()); ok(socktype == pi[0].iSocketType, "Wrong socket type, expected %d received %d\n", pi[0].iSocketType, socktype); } @@ -1783,9 +1783,9 @@ todo_wine size = sizeof(socktype); socktype = 0xdead; + err = getsockopt(sock, SOL_SOCKET, SO_TYPE, (char *) &socktype, &size); todo_wine - ok(!getsockopt(sock, SOL_SOCKET, SO_TYPE, (char *) &socktype, &size), "getsockopt failed with %d\n", - WSAGetLastError()); + ok(!err, "getsockopt failed with %d\n", WSAGetLastError()); for (j = 0; j < items; j++) { @@ -2508,14 +2508,16 @@ static void test_listen(void) ok (ret == WSAEINVAL, "expected 10022, received %d\n", ret); acceptc = 0xdead; - ok (!getsockopt(fdA, SOL_SOCKET, SO_ACCEPTCONN, (char*)&acceptc, &olen), "getsockopt failed\n"); + ret = getsockopt(fdA, SOL_SOCKET, SO_ACCEPTCONN, (char*)&acceptc, &olen); + ok (!ret, "getsockopt failed\n"); ok (acceptc == 0, "SO_ACCEPTCONN should be 0, received %d\n", acceptc); ok (!listen(fdA, 0), "listen failed\n"); ok (!listen(fdA, SOMAXCONN), "double listen failed\n"); acceptc = 0xdead; - ok (!getsockopt(fdA, SOL_SOCKET, SO_ACCEPTCONN, (char*)&acceptc, &olen), "getsockopt failed\n"); + ret = getsockopt(fdA, SOL_SOCKET, SO_ACCEPTCONN, (char*)&acceptc, &olen); + ok (!ret, "getsockopt failed\n"); ok (acceptc == 1, "SO_ACCEPTCONN should be 1, received %d\n", acceptc); SetLastError(0xdeadbeef);

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 August 2013