September 2006 - Wine-Commits

Alexandre Julliard : libs/wpp: Specify the bison name prefix directly in the source file.
by Alexandre Julliard Sept. 10, 2006

Sept. 10, 2006

Module: wine Branch: master Commit: 65516804eeb0ee71eb8f81dea2ad61ff6ed1d42b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=65516804eeb0ee71eb8f81d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Sep 9 11:25:10 2006 +0200 libs/wpp: Specify the bison name prefix directly in the source file. --- libs/wpp/Makefile.in | 2 +- libs/wpp/ppy.y | 2 ++ 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/libs/wpp/Makefile.in b/libs/wpp/Makefile.in index 58a374c..9d501e9 100644 --- a/libs/wpp/Makefile.in +++ b/libs/wpp/Makefile.in @@ -21,7 +21,7 @@ all: $(MODULE) $(RANLIB) $@ ppy.tab.c ppy.tab.h: ppy.y - $(BISON) -ppp -d -t $(SRCDIR)/ppy.y -o ppy.tab.c + $(BISON) -d $(SRCDIR)/ppy.y -o ppy.tab.c # hack to allow parallel make ppy.tab.h: ppy.tab.c diff --git a/libs/wpp/ppy.y b/libs/wpp/ppy.y index 801c7ac..3d7928a 100644 --- a/libs/wpp/ppy.y +++ b/libs/wpp/ppy.y @@ -123,6 +123,8 @@ static int nmacro_args; %} +%name-prefix="pp" + %union{ int sint; unsigned int uint;

1 0

Alexandre Julliard : winhelp: Specify the lex options directly in the source file.
by Alexandre Julliard Sept. 10, 2006

Sept. 10, 2006

Module: wine Branch: master Commit: a2a8279238533ff70b8dacbb509904a2337077d8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a2a8279238533ff70b8dacb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Sep 9 11:25:50 2006 +0200 winhelp: Specify the lex options directly in the source file. --- programs/winhelp/Makefile.in | 2 +- programs/winhelp/macro.lex.l | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winhelp/Makefile.in b/programs/winhelp/Makefile.in index ff6a3c8..3d6c5b0 100644 --- a/programs/winhelp/Makefile.in +++ b/programs/winhelp/Makefile.in @@ -23,6 +23,6 @@ RC_SRCS = rsrc.rc @MAKE_PROG_RULES@ @LEX_OUTPUT_ROOT(a).c: macro.lex.l - $(LEX) -8 -i $(SRCDIR)/macro.lex.l + $(LEX) $(SRCDIR)/macro.lex.l ### Dependencies: diff --git a/programs/winhelp/macro.lex.l b/programs/winhelp/macro.lex.l index 8cad9f0..1480431 100644 --- a/programs/winhelp/macro.lex.l +++ b/programs/winhelp/macro.lex.l @@ -20,7 +20,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ %} -%option nounput +%option nounput interactive 8bit %x quote %{ #include <assert.h>

1 0

Alexandre Julliard : winedbg: Specify the lex options directly in the source file.
by Alexandre Julliard Sept. 10, 2006

Sept. 10, 2006

Module: wine Branch: master Commit: c58614fd2c3c394c8b01677a25bc41b6b75714f1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c58614fd2c3c394c8b01677… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Sep 9 11:25:41 2006 +0200 winedbg: Specify the lex options directly in the source file. --- programs/winedbg/Makefile.in | 2 +- programs/winedbg/debug.l | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winedbg/Makefile.in b/programs/winedbg/Makefile.in index 79b71d3..6c2274b 100644 --- a/programs/winedbg/Makefile.in +++ b/programs/winedbg/Makefile.in @@ -45,7 +45,7 @@ dbg.tab.h: dbg.tab.c dbg.tab.o: dbg.tab.h @LEX_OUTPUT_ROOT(a).c: debug.l - $(LEX) -8 -I $(SRCDIR)/debug.l + $(LEX) $(SRCDIR)/debug.l @LEX_OUTPUT_ROOT(a).o: dbg.tab.h diff --git a/programs/winedbg/debug.l b/programs/winedbg/debug.l index cb2a564..9fef183 100644 --- a/programs/winedbg/debug.l +++ b/programs/winedbg/debug.l @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -%option nounput +%option nounput interactive 8bit %{ #include <stdlib.h>

1 0

Alexandre Julliard : widl: Allow building without debug support in the parser.
by Alexandre Julliard Sept. 10, 2006

Sept. 10, 2006

Module: wine Branch: master Commit: aded30dad76611cc650ba15f7bf719cf5c0605b1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=aded30dad76611cc650ba15… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Sep 9 11:26:20 2006 +0200 widl: Allow building without debug support in the parser. --- tools/widl/widl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/widl/widl.c b/tools/widl/widl.c index c2456f1..39cd9be 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -84,7 +84,7 @@ static const char version_string[] = "Wi int win32 = 1; int debuglevel = DEBUGLEVEL_NONE; -int yy_flex_debug; +int yydebug, yy_flex_debug; int pedantic = 0; static int do_everything = 1;

1 0

Alexandre Julliard : msi: Specify the bison name prefix directly in the source file.
by Alexandre Julliard Sept. 10, 2006

Sept. 10, 2006

Module: wine Branch: master Commit: 689d943dabd0d6e3a08e433f6964b26c5f7223c3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=689d943dabd0d6e3a08e433… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Sep 9 11:25:19 2006 +0200 msi: Specify the bison name prefix directly in the source file. --- dlls/msi/Makefile.in | 4 ++-- dlls/msi/cond.y | 1 + dlls/msi/sql.y | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/msi/Makefile.in b/dlls/msi/Makefile.in index b122de4..47728e0 100644 --- a/dlls/msi/Makefile.in +++ b/dlls/msi/Makefile.in @@ -58,10 +58,10 @@ EXTRA_OBJS = sql.tab.o cond.tab.o @MAKE_DLL_RULES@ sql.tab.c sql.tab.h: sql.y - $(BISON) -p SQL_ -d $(SRCDIR)/sql.y -o sql.tab.c + $(BISON) -d $(SRCDIR)/sql.y -o sql.tab.c cond.tab.c cond.tab.h: cond.y - $(BISON) -p COND_ -d $(SRCDIR)/cond.y -o cond.tab.c + $(BISON) -d $(SRCDIR)/cond.y -o cond.tab.c # hack to allow parallel make sql.tab.h: sql.tab.c diff --git a/dlls/msi/cond.y b/dlls/msi/cond.y index fda2c69..26d0ecb 100644 --- a/dlls/msi/cond.y +++ b/dlls/msi/cond.y @@ -102,6 +102,7 @@ static BOOL num_from_prop( LPCWSTR p, IN %} %pure-parser +%name-prefix="COND_" %union { diff --git a/dlls/msi/sql.y b/dlls/msi/sql.y index 8fa0fb3..5d5a904 100644 --- a/dlls/msi/sql.y +++ b/dlls/msi/sql.y @@ -67,6 +67,7 @@ static struct expr * EXPR_wildcard( void %} %pure-parser +%name-prefix="SQL_" %union {

1 0

Andrew Talbot : dbghelp: Cast-qual warnings fix.
by Alexandre Julliard Sept. 8, 2006

Sept. 8, 2006

Module: wine Branch: master Commit: 2f8c51f5475b169b916fed4987292b03eddb0cc7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2f8c51f5475b169b916fed4… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Wed Sep 6 17:55:40 2006 +0100 dbghelp: Cast-qual warnings fix. --- dlls/dbghelp/module.c | 3 +-- dlls/dbghelp/pe_module.c | 6 ++---- dlls/dbghelp/symbol.c | 2 +- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index a08cf12..db725b8 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -473,8 +473,7 @@ DWORD64 WINAPI SymLoadModuleEx(HANDLE h if (Flags & ~(SLMFLAG_VIRTUAL)) FIXME("Unsupported Flags %08lx for %s\n", Flags, ImageName); - return SymLoadModule(hProcess, hFile, (char*)ImageName, (char*)ModuleName, - (DWORD)BaseOfDll, DllSize); + return SymLoadModule(hProcess, hFile, ImageName, ModuleName, (DWORD)BaseOfDll, DllSize); } /*********************************************************************** diff --git a/dlls/dbghelp/pe_module.c b/dlls/dbghelp/pe_module.c index d177132..13857b8 100644 --- a/dlls/dbghelp/pe_module.c +++ b/dlls/dbghelp/pe_module.c @@ -100,9 +100,7 @@ static BOOL pe_load_dbg_file(const struc WINE_TRACE("Processing DBG file %s\n", dbg_name); - if (SymFindFileInPath(pcs->handle, NULL, (char*)dbg_name, - NULL, 0, 0, 0, - tmp, dbg_match, NULL) && + if (SymFindFileInPath(pcs->handle, NULL, dbg_name, NULL, 0, 0, 0, tmp, dbg_match, NULL) && (hFile = CreateFileA(tmp, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL)) != INVALID_HANDLE_VALUE && ((hMap = CreateFileMappingA(hFile, NULL, PAGE_READONLY, 0, 0, NULL)) != 0) && @@ -142,7 +140,7 @@ static BOOL pe_load_dbg_file(const struc else WINE_ERR("-Unable to peruse .DBG file %s (%s)\n", dbg_name, debugstr_a(tmp)); - if (dbg_mapping) UnmapViewOfFile((void*)dbg_mapping); + if (dbg_mapping) UnmapViewOfFile(dbg_mapping); if (hMap) CloseHandle(hMap); if (hFile != NULL) CloseHandle(hFile); return ret; diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 2354c1a..2c7904b 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -1121,7 +1121,7 @@ BOOL WINAPI SymFromName(HANDLE hProcess, memcpy(tmp, Name, name - Name); tmp[name - Name] = '\0'; module = module_find_by_name(pcs, tmp, DMT_UNKNOWN); - return find_name(pcs, module, (char*)(name + 1), Symbol); + return find_name(pcs, module, name + 1, Symbol); } for (module = pcs->lmodules; module; module = module->next) {

1 0

Andrew Talbot : kernel: Constify a formal parameter.
by Alexandre Julliard Sept. 8, 2006

Sept. 8, 2006

Module: wine Branch: master Commit: 06e7d91bad45665947b026a8a1303d5830efbaba URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=06e7d91bad45665947b026a… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Wed Sep 6 17:35:44 2006 +0100 kernel: Constify a formal parameter. --- dlls/kernel/virtual.c | 6 ++---- include/winbase.h | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/kernel/virtual.c b/dlls/kernel/virtual.c index 61ae397..d2b473e 100644 --- a/dlls/kernel/virtual.c +++ b/dlls/kernel/virtual.c @@ -546,12 +546,10 @@ LPVOID WINAPI MapViewOfFileEx( HANDLE ha * Success: TRUE. * Failure: FALSE. * - * NOTES - * Should addr be an LPCVOID? */ -BOOL WINAPI UnmapViewOfFile( LPVOID addr ) +BOOL WINAPI UnmapViewOfFile( LPCVOID addr ) { - NTSTATUS status = NtUnmapViewOfSection( GetCurrentProcess(), addr ); + NTSTATUS status = NtUnmapViewOfSection( GetCurrentProcess(), (void *)addr ); if (status) SetLastError( RtlNtStatusToDosError(status) ); return !status; } diff --git a/include/winbase.h b/include/winbase.h index 086d194..8bc83cf 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2008,7 +2008,7 @@ BOOL WINAPI TzSpecificLocalTimeTo BOOL WINAPI UnlockFile(HANDLE,DWORD,DWORD,DWORD,DWORD); BOOL WINAPI UnlockFileEx(HANDLE,DWORD,DWORD,DWORD,LPOVERLAPPED); #define UnlockSegment(handle) GlobalUnfix((HANDLE)(handle)) -BOOL WINAPI UnmapViewOfFile(LPVOID); +BOOL WINAPI UnmapViewOfFile(LPCVOID); BOOL WINAPI UnregisterWait(HANDLE); BOOL WINAPI UnregisterWaitEx(HANDLE,HANDLE); BOOL WINAPI UpdateResourceA(HANDLE,LPCSTR,LPCSTR,WORD,LPVOID,DWORD);

1 0

Mike McCormack : oleaut32: Include minimal ungif source to remove dependency on libungif.
by Alexandre Julliard Sept. 8, 2006

Sept. 8, 2006

Module: wine Branch: master Commit: 7aa893481e79dffab280393497417ae7175ff6c9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7aa893481e79dffab280393… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Sep 8 12:27:15 2006 +0900 oleaut32: Include minimal ungif source to remove dependency on libungif. --- configure | 262 ------------ configure.ac | 19 - dlls/oleaut32/Makefile.in | 1 dlls/oleaut32/olepicture.c | 61 --- dlls/oleaut32/ungif.c | 978 ++++++++++++++++++++++++++++++++++++++++++++ dlls/oleaut32/ungif.h | 169 ++++++++ include/config.h.in | 12 - 7 files changed, 1153 insertions(+), 349 deletions(-) create mode 100644 dlls/oleaut32/ungif.c create mode 100644 dlls/oleaut32/ungif.h Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=7aa893481e79dffab28…

1 0

Detlef Riekenberg : netapi32: Avoid NULL access in NetApiBufferAllocate, with test.
by Alexandre Julliard Sept. 8, 2006

Sept. 8, 2006

Module: wine Branch: master Commit: c8d441306893fec831ae0872e5297337adb25459 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c8d441306893fec831ae087… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Sep 8 11:29:54 2006 +0200 netapi32: Avoid NULL access in NetApiBufferAllocate, with test. --- dlls/netapi32/apibuf.c | 2 ++ dlls/netapi32/tests/apibuf.c | 15 +++++++++++++++ 2 files changed, 17 insertions(+), 0 deletions(-) diff --git a/dlls/netapi32/apibuf.c b/dlls/netapi32/apibuf.c index 87af683..136e9d7 100644 --- a/dlls/netapi32/apibuf.c +++ b/dlls/netapi32/apibuf.c @@ -36,6 +36,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(netapi32); NET_API_STATUS WINAPI NetApiBufferAllocate(DWORD ByteCount, LPVOID* Buffer) { TRACE("(%ld, %p)\n", ByteCount, Buffer); + + if (Buffer == NULL) return ERROR_INVALID_PARAMETER; *Buffer = HeapAlloc(GetProcessHeap(), 0, ByteCount); if (*Buffer) return NERR_Success; diff --git a/dlls/netapi32/tests/apibuf.c b/dlls/netapi32/tests/apibuf.c index 91af3d4..871a4d3 100644 --- a/dlls/netapi32/tests/apibuf.c +++ b/dlls/netapi32/tests/apibuf.c @@ -39,6 +39,7 @@ static void run_apibuf_tests(void) { VOID *p; DWORD dwSize; + NET_API_STATUS res; if (!pNetApiBufferAllocate) return; @@ -76,6 +77,20 @@ static void run_apibuf_tests(void) ok(pNetApiBufferSize(p, &dwSize) == NERR_Success, "Got size\n"); ok((dwSize >= 0) && (dwSize < 0xFFFFFFFF),"The size of the 0-length buffer\n"); ok(pNetApiBufferFree(p) == NERR_Success, "Freed\n"); + + /* NULL-Pointer */ + /* NT: ERROR_INVALID_PARAMETER, lasterror is untouched) */ + SetLastError(0xdeadbeef); + res = pNetApiBufferAllocate(0, (LPVOID *)NULL); + ok( (res == ERROR_INVALID_PARAMETER) && (GetLastError() == 0xdeadbeef), + "returned %ld with 0x%lx (expected ERROR_INVALID_PARAMETER with " \ + "0xdeadbeef)\n", res, GetLastError()); + + SetLastError(0xdeadbeef); + res = pNetApiBufferAllocate(1024, (LPVOID *)NULL); + ok( (res == ERROR_INVALID_PARAMETER) && (GetLastError() == 0xdeadbeef), + "returned %ld with 0x%lx (expected ERROR_INVALID_PARAMETER with " \ + "0xdeadbeef)\n", res, GetLastError()); } START_TEST(apibuf)

1 0

Paul Vriens : crypt32: Bail out on registry errors and return the error ( if any).
by Alexandre Julliard Sept. 8, 2006

Sept. 8, 2006

Module: wine Branch: master Commit: 4388bdac70debcf600e52c70abdd3de6274759c1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4388bdac70debcf600e52c7… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Fri Sep 8 13:19:26 2006 +0200 crypt32: Bail out on registry errors and return the error (if any). --- dlls/crypt32/main.c | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/main.c b/dlls/crypt32/main.c index 4c0166d..3c9c050 100644 --- a/dlls/crypt32/main.c +++ b/dlls/crypt32/main.c @@ -198,6 +198,7 @@ BOOL WINAPI CryptSIPAddProvider(SIP_ADD_ static const WCHAR szVerify[] = { 'V','e','r','i','f','y', 'I','n','d','i','r','e','c','t','D','a','t','a',0}; + LONG r = ERROR_SUCCESS; TRACE("%p\n", psNewProv); @@ -220,8 +221,9 @@ BOOL WINAPI CryptSIPAddProvider(SIP_ADD_ debugstr_w( psNewProv->pwszIsFunctionName ) ); #define CRYPT_SIPADDPROV( key, field ) \ - CRYPT_SIPWriteFunction( psNewProv->pgSubject, key, \ - psNewProv->pwszDLLFileName, psNewProv->field) + r = CRYPT_SIPWriteFunction( psNewProv->pgSubject, key, \ + psNewProv->pwszDLLFileName, psNewProv->field); \ + if (r != ERROR_SUCCESS) goto end_function CRYPT_SIPADDPROV( szPutSigned, pwszPutFuncName ); CRYPT_SIPADDPROV( szGetSigned, pwszGetFuncName ); @@ -232,6 +234,14 @@ #define CRYPT_SIPADDPROV( key, field ) \ #undef CRYPT_SIPADDPROV +end_function: + + if (r != ERROR_SUCCESS) + { + SetLastError(r); + return FALSE; + } + return TRUE; }

1 0