August 2013 - Wine-commits - list.winehq.org

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 : 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 : 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

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

Nikolay Sivov : oledb32: Implement IRowPosition::Initialize().
by Alexandre Julliard 01 Aug '13

01 Aug '13

Module: wine Branch: master Commit: 0e2e8386978df1a1dfe4e1336b59924e102a251f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e2e8386978df1a1dfe4e1336… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 1 07:53:48 2013 +0400 oledb32: Implement IRowPosition::Initialize(). --- dlls/oledb32/rowpos.c | 15 +++++++++++++-- include/oledberr.h | 1 + 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/oledb32/rowpos.c b/dlls/oledb32/rowpos.c index c7581b7..d789c19 100644 --- a/dlls/oledb32/rowpos.c +++ b/dlls/oledb32/rowpos.c @@ -23,6 +23,7 @@ #include "ole2.h" #include "oledb.h" +#include "oledberr.h" #include "oledb_private.h" #include "wine/debug.h" @@ -33,6 +34,8 @@ typedef struct { IRowPosition IRowPosition_iface; LONG ref; + + IRowset *rowset; } rowpos; static inline rowpos *impl_from_IRowPosition(IRowPosition *iface) @@ -79,7 +82,10 @@ static ULONG WINAPI rowpos_Release(IRowPosition* iface) TRACE("(%p)->(%d)\n", This, ref); if (ref == 0) + { + if (This->rowset) IRowset_Release(This->rowset); HeapFree(GetProcessHeap(), 0, This); + } return ref; } @@ -109,8 +115,12 @@ static HRESULT WINAPI rowpos_GetRowset(IRowPosition *iface, REFIID riid, IUnknow 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; + + TRACE("(%p)->(%p)\n", This, rowset); + + if (This->rowset) return DB_E_ALREADYINITIALIZED; + + return IUnknown_QueryInterface(rowset, &IID_IRowset, (void**)&This->rowset); } static HRESULT WINAPI rowpos_SetRowPosition(IRowPosition *iface, HCHAPTER chapter, @@ -148,6 +158,7 @@ HRESULT create_oledb_rowpos(IUnknown *outer, void **obj) This->IRowPosition_iface.lpVtbl = &rowpos_vtbl; This->ref = 1; + This->rowset = NULL; *obj = &This->IRowPosition_iface; diff --git a/include/oledberr.h b/include/oledberr.h index 9b87ba7..d1306e4 100644 --- a/include/oledberr.h +++ b/include/oledberr.h @@ -42,6 +42,7 @@ #define DB_E_BADPROPERTYVALUE 0x80040e44 #define DB_E_INVALID 0x80040e45 +#define DB_E_ALREADYINITIALIZED 0x80040e52 #define DB_E_DATAOVERFLOW 0x80040e57 #define DB_E_MISMATCHEDPROVIDER 0x80040e75

1 0

Nikolay Sivov : oledb32: Added IRowPositionChange interface definition.
by Alexandre Julliard 01 Aug '13

01 Aug '13

Module: wine Branch: master Commit: 2a78e48e201dfcf05e2385ebeaf5d329ff3c55e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a78e48e201dfcf05e2385ebe… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 1 07:57:55 2013 +0400 oledb32: Added IRowPositionChange interface definition. --- dlls/msdaps/usrmarshal.c | 14 ++++++++++++++ include/Makefile.in | 1 + include/oledb.idl | 1 + include/rowpsc.idl | 36 ++++++++++++++++++++++++++++++++++++ tools/make_makefiles | 1 + 5 files changed, 53 insertions(+), 0 deletions(-) diff --git a/dlls/msdaps/usrmarshal.c b/dlls/msdaps/usrmarshal.c index bff07ef..e5be7b6 100644 --- a/dlls/msdaps/usrmarshal.c +++ b/dlls/msdaps/usrmarshal.c @@ -1477,3 +1477,17 @@ HRESULT CALLBACK IRowPosition_SetRowPosition_Proxy(IRowPosition* This, HCHAPTER FIXME("(%p)->(%lx %lx %d): stub\n", This, chapter, row, flags); return E_NOTIMPL; } + +HRESULT __RPC_STUB IRowPositionChange_OnRowPositionChange_Stub(IRowPositionChange* This, DBREASON reason, DBEVENTPHASE phase, + BOOL cant_deny, IErrorInfo **errorinfo) +{ + FIXME("(%p)->(0x%x 0x%x %d %p): stub\n", This, reason, phase, cant_deny, errorinfo); + return E_NOTIMPL; +} + +HRESULT CALLBACK IRowPositionChange_OnRowPositionChange_Proxy(IRowPositionChange* This, DBREASON reason, DBEVENTPHASE phase, + BOOL cant_deny) +{ + FIXME("(%p)->(0x%x 0x%x %d): stub\n", This, reason, phase, cant_deny); + return E_NOTIMPL; +} diff --git a/include/Makefile.in b/include/Makefile.in index 0818999..7f26dca 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -481,6 +481,7 @@ SRCDIR_INCLUDES = \ row.idl \ rowchg.idl \ rowpos.idl \ + rowpsc.idl \ rpc.h \ rpcasync.h \ rpcdce.h \ diff --git a/include/oledb.idl b/include/oledb.idl index 3d47fe7..3f038c7 100644 --- a/include/oledb.idl +++ b/include/oledb.idl @@ -65,6 +65,7 @@ typedef DWORD_PTR DBHASHVALUE; #include "row.idl" #include "rowchg.idl" #include "rowpos.idl" +#include "rowpsc.idl" #include "binres.idl" #include "crtrow.idl" #include "errrec.idl" diff --git a/include/rowpsc.idl b/include/rowpsc.idl new file mode 100644 index 0000000..2cbe8ac --- /dev/null +++ b/include/rowpsc.idl @@ -0,0 +1,36 @@ +/* + * Copyright (C) 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 + */ + +[ + object, + uuid(0997a571-126e-11d0-9f8a-00a0c9a0631e), + pointer_default(unique) +] +interface IRowPositionChange : IUnknown +{ + [local] + HRESULT OnRowPositionChange([in] DBREASON reason, + [in] DBEVENTPHASE phase, + [in] BOOL cant_deny); + + [call_as(OnRowPositionChange)] + HRESULT RemoteOnRowPositionChange([in] DBREASON reason, + [in] DBEVENTPHASE phase, + [in] BOOL cant_deny, + [out] IErrorInfo **errorinfo); +} diff --git a/tools/make_makefiles b/tools/make_makefiles index 566ca0d..5f89683 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -156,6 +156,7 @@ my %private_idl_headers = ( "row.idl" => 1, "rowchg.idl" => 1, "rowpos.idl" => 1, + "rowpsc.idl" => 1, "rstbas.idl" => 1, "rstinf.idl" => 1, "rstloc.idl" => 1,

1 0

Marcus Meissner : mshtml: Fixed character vs byte mismatches.
by Alexandre Julliard 01 Aug '13

01 Aug '13

Module: wine Branch: master Commit: c803d53b130b182bf42029b20aebb698d9c18643 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c803d53b130b182bf42029b20… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Thu Aug 1 07:37:09 2013 +0200 mshtml: Fixed character vs byte mismatches. --- dlls/mshtml/tests/protocol.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/tests/protocol.c b/dlls/mshtml/tests/protocol.c index 04c4714..b4a6fc7 100644 --- a/dlls/mshtml/tests/protocol.c +++ b/dlls/mshtml/tests/protocol.c @@ -281,7 +281,7 @@ static void test_res_url(const char *url_suffix) HRESULT hres; memcpy(url, res_url_base, res_url_base_len*sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP, 0, url_suffix, -1, url+res_url_base_len, sizeof(url)-res_url_base_len); + MultiByteToWideChar(CP_ACP, 0, url_suffix, -1, url+res_url_base_len, sizeof(url)/sizeof(WCHAR)-res_url_base_len); hres = CoCreateInstance(&CLSID_ResProtocol, NULL, CLSCTX_INPROC_SERVER, &IID_IInternetProtocol, (void**)&protocol); ok(hres == S_OK, "Could not create ResProtocol instance: %08x\n", hres); @@ -943,7 +943,7 @@ static void test_javascript_protocol(void) START_TEST(protocol) { - res_url_base_len = 6 + GetModuleFileNameW(NULL, res_url_base + 6 /* strlen("res://") */, sizeof(res_url_base)-6); + res_url_base_len = 6 + GetModuleFileNameW(NULL, res_url_base + 6 /* strlen("res://") */, sizeof(res_url_base)/sizeof(WCHAR)-6); OleInitialize(NULL);

1 0

Marcus Meissner : urlmon: Fixed a chars vs bytes mismatch.
by Alexandre Julliard 01 Aug '13

01 Aug '13

Module: wine Branch: master Commit: e89c801b502b2c2c53deb434d311ef8c1fafd928 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e89c801b502b2c2c53deb434d… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Thu Aug 1 07:41:04 2013 +0200 urlmon: Fixed a chars vs bytes mismatch. --- dlls/urlmon/tests/misc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index cf5c943..aa5e365 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -83,7 +83,7 @@ static HRESULT (WINAPI *pIEInstallScope)(DWORD*); static int strcmp_wa(const WCHAR *strw, const char *stra) { WCHAR buf[512]; - MultiByteToWideChar(CP_ACP, 0, stra, -1, buf, sizeof(buf)); + MultiByteToWideChar(CP_ACP, 0, stra, -1, buf, sizeof(buf)/sizeof(WCHAR)); return lstrcmpW(strw, buf); }

1 0

Qian Hong : imm32/tests: Added test for IMC lock count.
by Alexandre Julliard 01 Aug '13

01 Aug '13

Module: wine Branch: master Commit: 0f14a77f5da795cc240716486a16bc92462d7274 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f14a77f5da795cc240716486… Author: Qian Hong <qhong(a)codeweavers.com> Date: Thu Aug 1 14:32:24 2013 +0800 imm32/tests: Added test for IMC lock count. --- dlls/imm32/tests/imm32.c | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 8e6dab8..7313854 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -24,6 +24,7 @@ #include "winuser.h" #include "wingdi.h" #include "imm.h" +#include "ddk/imm.h" #define NUMELEMS(array) (sizeof((array))/sizeof((array)[0])) @@ -687,6 +688,30 @@ static void test_ImmDefaultHwnd(void) DestroyWindow(hwnd); } +static void test_ImmGetIMCLockCount(void) +{ + HIMC imc; + DWORD count, ret; + INPUTCONTEXT *ic; + + imc = ImmCreateContext(); + count = ImmGetIMCLockCount(imc); + ok(count == 0, "expect 0, returned %d\n", count); + ic = ImmLockIMC(imc); + ok(ic != NULL, "ImmLockIMC failed\n!"); + count = ImmGetIMCLockCount(imc); + ok(count == 1, "expect 1, returned %d\n", count); + ret = ImmUnlockIMC(imc); + todo_wine ok(ret == TRUE, "expect TRUE, ret %d\n", ret); + count = ImmGetIMCLockCount(imc); + ok(count == 0, "expect 0, returned %d\n", count); + ret = ImmUnlockIMC(imc); + ok(ret == TRUE, "expect TRUE, ret %d\n", ret); + count = ImmGetIMCLockCount(imc); + todo_wine ok(count == 0, "expect 0, returned %d\n", count); + ImmDestroyContext(imc); +} + static void test_ImmMessages(void) { CANDIDATEFORM cf; @@ -846,6 +871,7 @@ START_TEST(imm32) { test_ImmGetContext(); test_ImmGetDescription(); test_ImmDefaultHwnd(); + test_ImmGetIMCLockCount(); msg_spy_cleanup(); /* Reinitialize the hooks to capture all windows */ msg_spy_init(NULL);

1 0

Qian Hong : imm32: Fixed ImmUnlockIMC.
by Alexandre Julliard 01 Aug '13

01 Aug '13

Module: wine Branch: master Commit: 44f60067381245ed11162d8796db0dbd96f8ec3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=44f60067381245ed11162d879… Author: Qian Hong <qhong(a)codeweavers.com> Date: Thu Aug 1 14:32:35 2013 +0800 imm32: Fixed ImmUnlockIMC. --- dlls/imm32/imm.c | 5 +++-- dlls/imm32/tests/imm32.c | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 62f4b71..284d49e 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -2606,8 +2606,9 @@ LPINPUTCONTEXT WINAPI ImmLockIMC(HIMC hIMC) BOOL WINAPI ImmUnlockIMC(HIMC hIMC) { InputContextData *data = hIMC; - data->dwLock--; - return (data->dwLock!=0); + if (data->dwLock) + data->dwLock--; + return TRUE; } /*********************************************************************** diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 7313854..0d4cb5c 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -702,13 +702,13 @@ static void test_ImmGetIMCLockCount(void) count = ImmGetIMCLockCount(imc); ok(count == 1, "expect 1, returned %d\n", count); ret = ImmUnlockIMC(imc); - todo_wine ok(ret == TRUE, "expect TRUE, ret %d\n", ret); + ok(ret == TRUE, "expect TRUE, ret %d\n", ret); count = ImmGetIMCLockCount(imc); ok(count == 0, "expect 0, returned %d\n", count); ret = ImmUnlockIMC(imc); ok(ret == TRUE, "expect TRUE, ret %d\n", ret); count = ImmGetIMCLockCount(imc); - todo_wine ok(count == 0, "expect 0, returned %d\n", count); + ok(count == 0, "expect 0, returned %d\n", count); ImmDestroyContext(imc); }

1 0