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

Piotr Caban : scrrun: Fix IFileSystem3::GetAbsolutePathName tests failures.
by Alexandre Julliard Aug. 1, 2013

Aug. 1, 2013

Module: wine Branch: master Commit: ec7ebd358d2683baeb7c2bc2b8d51be87964ea18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec7ebd358d2683baeb7c2bc2b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Aug 1 11:46:50 2013 +0200 scrrun: Fix IFileSystem3::GetAbsolutePathName tests failures. --- dlls/scrrun/tests/filesystem.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index a3ad79f..e231f9a 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -401,7 +401,7 @@ static void test_GetAbsolutePathName(void) WIN32_FIND_DATAW fdata; HANDLE find; - WCHAR buf[MAX_PATH]; + WCHAR buf[MAX_PATH], buf2[MAX_PATH]; BSTR path, result; HRESULT hr; @@ -424,22 +424,23 @@ static void test_GetAbsolutePathName(void) path = SysAllocString(dir_match1); hr = IFileSystem3_GetAbsolutePathName(fs3, path, &result); ok(hr == S_OK, "GetAbsolutePathName returned %x, expected S_OK\n", hr); - GetFullPathNameW(dir_match1, MAX_PATH, buf, NULL); - ok(!lstrcmpW(buf, result), "result = %s, expected %s\n", wine_dbgstr_w(result), wine_dbgstr_w(buf)); + GetFullPathNameW(dir_match1, MAX_PATH, buf2, NULL); + ok(!lstrcmpW(buf2, result), "result = %s, expected %s\n", wine_dbgstr_w(result), wine_dbgstr_w(buf2)); SysFreeString(result); ok(CreateDirectoryW(dir1, NULL), "CreateDirectory(%s) failed\n", wine_dbgstr_w(dir1)); hr = IFileSystem3_GetAbsolutePathName(fs3, path, &result); ok(hr == S_OK, "GetAbsolutePathName returned %x, expected S_OK\n", hr); GetFullPathNameW(dir1, MAX_PATH, buf, NULL); - ok(!lstrcmpW(buf, result), "result = %s, expected %s\n", wine_dbgstr_w(result), wine_dbgstr_w(buf)); + ok(!lstrcmpW(buf, result) || broken(!lstrcmpW(buf2, result)), "result = %s, expected %s\n", + wine_dbgstr_w(result), wine_dbgstr_w(buf)); SysFreeString(result); ok(CreateDirectoryW(dir2, NULL), "CreateDirectory(%s) failed\n", wine_dbgstr_w(dir2)); hr = IFileSystem3_GetAbsolutePathName(fs3, path, &result); ok(hr == S_OK, "GetAbsolutePathName returned %x, expected S_OK\n", hr); - if(!lstrcmpW(buf, result)) { - ok(!lstrcmpW(buf, result), "result = %s, expected %s\n", + if(!lstrcmpW(buf, result) || !lstrcmpW(buf2, result)) { + ok(!lstrcmpW(buf, result) || broken(!lstrcmpW(buf2, result)), "result = %s, expected %s\n", wine_dbgstr_w(result), wine_dbgstr_w(buf)); }else { GetFullPathNameW(dir2, MAX_PATH, buf, NULL);

1 0

Aric Stewart : wineps.drv: Allow for vertical text printing.
by Alexandre Julliard Aug. 1, 2013

Aug. 1, 2013

Module: wine Branch: master Commit: 745e7c93c9042f62460f181daaa1f05645560b41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=745e7c93c9042f62460f181da… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Jul 30 07:54:25 2013 -0500 wineps.drv: Allow for vertical text printing. With extensive review and help from Huw Davies. --- dlls/wineps.drv/builtin.c | 2 +- dlls/wineps.drv/download.c | 23 +++-- dlls/wineps.drv/font.c | 14 ++- dlls/wineps.drv/ps.c | 2 +- dlls/wineps.drv/psdrv.h | 10 ++- dlls/wineps.drv/text.c | 206 +++++++++++++++++++++++++++++++++++++------- 6 files changed, 208 insertions(+), 49 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=745e7c93c9042f62460f1…

1 0

Piotr Caban : scrrun: Fix IFile::get_Attributes tests and implementation.
by Alexandre Julliard Aug. 1, 2013

Aug. 1, 2013

Module: wine Branch: master Commit: 12d3741200a658cbe2076f4d0efeb56133f666a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12d3741200a658cbe2076f4d0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Aug 1 11:46:34 2013 +0200 scrrun: Fix IFile::get_Attributes tests and implementation. --- dlls/scrrun/filesystem.c | 4 +++- dlls/scrrun/tests/filesystem.c | 8 ++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 19e3e23..19f5f2b 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -791,7 +791,9 @@ static HRESULT WINAPI file_get_Attributes(IFile *iface, FileAttribute *pfa) if(fa == INVALID_FILE_ATTRIBUTES) return create_error(GetLastError()); - *pfa = fa & ~FILE_ATTRIBUTE_NORMAL; + *pfa = fa & (FILE_ATTRIBUTE_READONLY | FILE_ATTRIBUTE_HIDDEN | + FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_DIRECTORY | FILE_ATTRIBUTE_ARCHIVE | + FILE_ATTRIBUTE_REPARSE_POINT | FILE_ATTRIBUTE_COMPRESSED); return S_OK; } diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 0ddbbac..a3ad79f 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -478,9 +478,7 @@ static void test_GetFile(void) hr = IFileSystem3_GetFile(fs3, NULL, &file); ok(hr == E_INVALIDARG, "GetFile returned %x, expected E_INVALIDARG\n", hr); - hf = CreateFileW(path, GENERIC_WRITE, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); - if(hf != INVALID_HANDLE_VALUE) { - CloseHandle(hf); + if(GetFileAttributesW(path) != INVALID_FILE_ATTRIBUTES) { skip("File already exists, skipping GetFile tests\n"); SysFreeString(path); return; @@ -503,7 +501,9 @@ static void test_GetFile(void) ok(hr == S_OK, "GetFile returned %x, expected S_OK\n", hr); hr = IFile_get_Attributes(file, &fa); - gfa = GetFileAttributesW(get_file) & ~FILE_ATTRIBUTE_NORMAL; + gfa = GetFileAttributesW(get_file) & (FILE_ATTRIBUTE_READONLY | FILE_ATTRIBUTE_HIDDEN | + FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_DIRECTORY | FILE_ATTRIBUTE_ARCHIVE | + FILE_ATTRIBUTE_REPARSE_POINT | FILE_ATTRIBUTE_COMPRESSED); ok(hr == S_OK, "get_Attributes returned %x, expected S_OK\n", hr); ok(fa == gfa, "fa = %x, expected %x\n", fa, gfa);

1 0

Qian Hong : imm32/tests: Added test for IMCC lock count.
by Alexandre Julliard Aug. 1, 2013

Aug. 1, 2013

Module: wine Branch: master Commit: 221438165774a2983678d0fd93cce1e49b3ef196 URL: http://source.winehq.org/git/wine.git/?a=commit;h=221438165774a2983678d0fd9… Author: Qian Hong <qhong(a)codeweavers.com> Date: Thu Aug 1 14:32:45 2013 +0800 imm32/tests: Added test for IMCC lock count. --- dlls/imm32/tests/imm32.c | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 0d4cb5c..9d41cc7 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -712,6 +712,28 @@ static void test_ImmGetIMCLockCount(void) ImmDestroyContext(imc); } +static void test_ImmGetIMCCLockCount(void) +{ + HIMCC imcc; + DWORD count, ret; + + imcc = ImmCreateIMCC(sizeof(CANDIDATEINFO)); + count = ImmGetIMCCLockCount(imcc); + ok(count == 0, "expect 0, returned %d\n", count); + ImmLockIMCC(imcc); + count = ImmGetIMCCLockCount(imcc); + ok(count == 1, "expect 1, returned %d\n", count); + ret = ImmUnlockIMCC(imcc); + ok(ret == FALSE, "expect FALSE, ret %d\n", ret); + count = ImmGetIMCCLockCount(imcc); + ok(count == 0, "expect 0, returned %d\n", count); + ret = ImmUnlockIMCC(imcc); + todo_wine ok(ret == FALSE, "expect FALSE, ret %d\n", ret); + count = ImmGetIMCCLockCount(imcc); + todo_wine ok(count == 0, "expect 0, returned %d\n", count); + ImmDestroyIMCC(imcc); +} + static void test_ImmMessages(void) { CANDIDATEFORM cf; @@ -872,6 +894,7 @@ START_TEST(imm32) { test_ImmGetDescription(); test_ImmDefaultHwnd(); test_ImmGetIMCLockCount(); + test_ImmGetIMCCLockCount(); msg_spy_cleanup(); /* Reinitialize the hooks to capture all windows */ msg_spy_init(NULL);

1 0

Nikolay Sivov : oledb32: Stub for IRowPosition.
by Alexandre Julliard Aug. 1, 2013

Aug. 1, 2013

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 : widl: Remove non-bison compatibility code.
by Alexandre Julliard Aug. 1, 2013

Aug. 1, 2013

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

Ken Thomases : winemac: Make a file-scope variable static.
by Alexandre Julliard Aug. 1, 2013

Aug. 1, 2013

Module: wine Branch: master Commit: 47337ed14c8d4b4fa18109eb9a6ad3b3c7cc9e3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=47337ed14c8d4b4fa18109eb9… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Jul 31 15:10:49 2013 -0500 winemac: Make a file-scope variable static. --- dlls/winemac.drv/window.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 5e03936..845fe01 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -42,7 +42,7 @@ static CRITICAL_SECTION win_data_section = { &critsect_debug, -1, 0, 0, 0, 0 }; static CFMutableDictionaryRef win_datas; -DWORD activate_on_focus_time; +static DWORD activate_on_focus_time; void CDECL macdrv_SetFocus(HWND hwnd);

1 0

Marcus Meissner : urlmon: Fixed a chars vs bytes mismatch.
by Alexandre Julliard Aug. 1, 2013

Aug. 1, 2013

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

Alexandre Julliard : msi: Use bison directives instead of defines to specify extra lexer parameters.
by Alexandre Julliard Aug. 1, 2013

Aug. 1, 2013

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 Aug. 1, 2013

Aug. 1, 2013

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