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

Kirill K. Smirnov : kernel32: Do not append empty lines to the console history.
by Alexandre Julliard Aug. 8, 2007

Aug. 8, 2007

Module: wine Branch: master Commit: 5217ea7a1bbc5ef36895c1f27e7fcdd62245048f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5217ea7a1bbc5ef36895c1f27… Author: Kirill K. Smirnov <lich(a)math.spbu.ru> Date: Wed Aug 8 14:55:43 2007 +0400 kernel32: Do not append empty lines to the console history. --- dlls/kernel32/console.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index b4e8437..8da9f8c 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -2503,6 +2503,7 @@ BOOL CONSOLE_AppendHistory(const WCHAR* ptr) BOOL ret; while (len && (ptr[len - 1] == '\n' || ptr[len - 1] == '\r')) len--; + if (!len) return FALSE; SERVER_START_REQ( append_console_input_history ) {

1 0

Francois Gouget : hlink: Add a missing prototype and update win32. api to fix the winapi_check warnings.
by Alexandre Julliard Aug. 8, 2007

Aug. 8, 2007

Module: wine Branch: master Commit: 7a94a171a56179a07268152a49236053c96cafd5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a94a171a56179a07268152a4… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Aug 8 10:51:45 2007 +0200 hlink: Add a missing prototype and update win32.api to fix the winapi_check warnings. --- include/hlink.idl | 1 + tools/winapi/win32.api | 28 ++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 0 deletions(-) diff --git a/include/hlink.idl b/include/hlink.idl index 884c4be..9642956 100644 --- a/include/hlink.idl +++ b/include/hlink.idl @@ -26,6 +26,7 @@ interface IHlinkBrowseContext; cpp_quote("HRESULT WINAPI HlinkCreateFromMoniker(IMoniker*, LPCWSTR, LPCWSTR, IHlinkSite*, DWORD, IUnknown*, REFIID, void**);") cpp_quote("HRESULT WINAPI HlinkCreateFromString(LPCWSTR, LPCWSTR, LPCWSTR, IHlinkSite*, DWORD, IUnknown*, REFIID, void**);") cpp_quote("HRESULT WINAPI HlinkCreateFromData(IDataObject*, IHlinkSite*, DWORD dwSiteData, IUnknown*, REFIID, void**);") +cpp_quote("HRESULT WINAPI HlinkCreateExtensionServices(LPCWSTR, HWND, LPCWSTR, LPCWSTR, IUnknown*, REFIID, void**);") cpp_quote("HRESULT WINAPI HlinkQueryCreateFromData(IDataObject*);") cpp_quote("HRESULT WINAPI HlinkClone(IHlink*, REFIID, IHlinkSite*, DWORD, void **);") cpp_quote("HRESULT WINAPI HlinkCreateBrowseContext(IUnknown*, REFIID, void **);") diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index 5382646..f9f191a 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -1549,6 +1549,34 @@ LPGUID void +%%hlink.dll + +%long + +DWORD +HRESULT +HWND + +%ptr + +IBindStatusCallback * +IDataObject * +IHlink * +IHlinkBrowseContext * +IHlinkFrame * +IHlinkSite * +IMoniker * +IUnknown * +LPBC +LPWSTR * +REFIID +ULONG * +void ** + +%wstr + +LPCWSTR + %%iccvid.dll %long

1 0

Francois Gouget : mapi32: Remove redundant protections against duplicate header inclusion.
by Alexandre Julliard Aug. 8, 2007

Aug. 8, 2007

Module: wine Branch: master Commit: 7fe20800e0f9e07e76a731973ca143c8f96efe73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fe20800e0f9e07e76a731973… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Aug 8 10:50:34 2007 +0200 mapi32: Remove redundant protections against duplicate header inclusion. --- include/mapidefs.h | 2 -- include/mapix.h | 8 -------- 2 files changed, 0 insertions(+), 10 deletions(-) diff --git a/include/mapidefs.h b/include/mapidefs.h index 219177d..b753045 100644 --- a/include/mapidefs.h +++ b/include/mapidefs.h @@ -24,9 +24,7 @@ #endif #include <winerror.h> -#ifndef _OBJBASE_H_ #include <objbase.h> -#endif #include <stddef.h> /* Some types from other headers */ diff --git a/include/mapix.h b/include/mapix.h index e511cdf..1ca7aaf 100644 --- a/include/mapix.h +++ b/include/mapix.h @@ -19,18 +19,10 @@ #ifndef MAPIX_H #define MAPIX_H -#ifndef MAPIDEFS_H #include <mapidefs.h> -#endif -#ifndef MAPICODE_H #include <mapicode.h> -#endif -#ifndef MAPIGUID_H #include <mapiguid.h> -#endif -#ifndef MAPITAGS_H #include <mapitags.h> -#endif #ifdef __cplusplus extern "C" {

1 0

Francois Gouget : hhctrl.ocx: Update win32. api to fix the winapi_check warnings.
by Alexandre Julliard Aug. 8, 2007

Aug. 8, 2007

Module: wine Branch: master Commit: f59ad1e31a2323770c06339143be67257e0effef URL: http://source.winehq.org/git/wine.git/?a=commit;h=f59ad1e31a2323770c0633914… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Aug 8 10:50:44 2007 +0200 hhctrl.ocx: Update win32.api to fix the winapi_check warnings. --- tools/winapi/win32.api | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index e86199c..5e6bdd6 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -1520,13 +1520,16 @@ TW_MEMREF %long -DWORD HINSTANCE HRESULT HWND UINT int +%long --pointer + +DWORD_PTR + %str LPCSTR

1 0

Alexandre Julliard : msvcrt: Use the correct size_t type.
by Alexandre Julliard Aug. 8, 2007

Aug. 8, 2007

Module: wine Branch: master Commit: 7f1db3a3e48bf02b4d7cbbc3802f3a08eed830c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f1db3a3e48bf02b4d7cbbc38… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 8 14:07:57 2007 +0200 msvcrt: Use the correct size_t type. --- dlls/msvcrt/heap.c | 20 +++++++++----------- 1 files changed, 9 insertions(+), 11 deletions(-) diff --git a/dlls/msvcrt/heap.c b/dlls/msvcrt/heap.c index d51675d..78739d5 100644 --- a/dlls/msvcrt/heap.c +++ b/dlls/msvcrt/heap.c @@ -48,7 +48,7 @@ static int MSVCRT_new_mode; /* FIXME - According to documentation it should be 8*1024, at runtime it returns 16 */ static unsigned int MSVCRT_amblksiz = 16; /* FIXME - According to documentation it should be 480 bytes, at runtime default is 0 */ -static size_t MSVCRT_sbh_threshold = 0; +static MSVCRT_size_t MSVCRT_sbh_threshold = 0; /********************************************************************* * ??2(a)YAPAXI@Z (MSVCRT.@) @@ -306,7 +306,7 @@ unsigned int* CDECL __p__amblksiz(void) /********************************************************************* * _get_sbh_threshold (MSVCRT.@) */ -size_t CDECL _get_sbh_threshold(void) +MSVCRT_size_t CDECL _get_sbh_threshold(void) { return MSVCRT_sbh_threshold; } @@ -314,7 +314,7 @@ size_t CDECL _get_sbh_threshold(void) /********************************************************************* * _set_sbh_threshold (MSVCRT.@) */ -int CDECL _set_sbh_threshold(size_t threshold) +int CDECL _set_sbh_threshold(MSVCRT_size_t threshold) { if(threshold > 1016) return 0; @@ -340,8 +340,7 @@ void CDECL _aligned_free(void *memblock) /********************************************************************* * _aligned_offset_malloc (MSVCRT.@) */ -void * CDECL _aligned_offset_malloc(size_t size, size_t alignment, - size_t offset) +void * CDECL _aligned_offset_malloc(MSVCRT_size_t size, MSVCRT_size_t alignment, MSVCRT_size_t offset) { void *memblock, *temp, **saved; TRACE("(%u, %u, %u)\n", size, alignment, offset); @@ -384,7 +383,7 @@ void * CDECL _aligned_offset_malloc(size_t size, size_t alignment, /********************************************************************* * _aligned_malloc (MSVCRT.@) */ -void * CDECL _aligned_malloc(size_t size, size_t alignment) +void * CDECL _aligned_malloc(MSVCRT_size_t size, MSVCRT_size_t alignment) { TRACE("(%u, %u)\n", size, alignment); return _aligned_offset_malloc(size, alignment, 0); @@ -393,11 +392,11 @@ void * CDECL _aligned_malloc(size_t size, size_t alignment) /********************************************************************* * _aligned_offset_realloc (MSVCRT.@) */ -void * CDECL _aligned_offset_realloc(void *memblock, size_t size, - size_t alignment, size_t offset) +void * CDECL _aligned_offset_realloc(void *memblock, MSVCRT_size_t size, + MSVCRT_size_t alignment, MSVCRT_size_t offset) { void * temp, **saved; - size_t old_padding, new_padding; + MSVCRT_size_t old_padding, new_padding; TRACE("(%p, %u, %u, %u)\n", memblock, size, alignment, offset); if (!memblock) @@ -463,8 +462,7 @@ void * CDECL _aligned_offset_realloc(void *memblock, size_t size, /********************************************************************* * _aligned_realloc (MSVCRT.@) */ -void * CDECL _aligned_realloc(void *memblock, size_t size, - size_t alignment) +void * CDECL _aligned_realloc(void *memblock, MSVCRT_size_t size, MSVCRT_size_t alignment) { TRACE("(%p, %u, %u)\n", memblock, size, alignment); return _aligned_offset_realloc(memblock, size, alignment, 0);

1 0

Rob Shearman : urlmon: The pcbRead parameter for IInternetProtocol:: Read is optional, so fix the protocol implementation to check for this.
by Alexandre Julliard Aug. 8, 2007

Aug. 8, 2007

Module: wine Branch: master Commit: 25b2bff9bf8ee79f08e35a2644e3f8b8d2420126 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25b2bff9bf8ee79f08e35a264… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Aug 3 22:10:55 2007 +0100 urlmon: The pcbRead parameter for IInternetProtocol::Read is optional, so fix the protocol implementation to check for this. --- dlls/urlmon/binding.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index 5820d4f..894d7b5 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -487,12 +487,14 @@ static HRESULT WINAPI ProtocolStream_Read(IStream *iface, void *pv, } if(read == cb) { - *pcbRead = read; + if (pcbRead) + *pcbRead = read; return S_OK; } This->hres = IInternetProtocol_Read(This->protocol, (PBYTE)pv+read, cb-read, &pread); - *pcbRead = read + pread; + if (pcbRead) + *pcbRead = read + pread; if(This->hres == E_PENDING) return E_PENDING;

1 0

Francois Gouget : wined3d: Update win32. api to fix the winapi_check warnings.
by Alexandre Julliard Aug. 8, 2007

Aug. 8, 2007

Module: wine Branch: master Commit: a0e92f16745fba4ffe5a9e1105de0152348724f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0e92f16745fba4ffe5a9e110… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Aug 8 10:51:04 2007 +0200 wined3d: Update win32.api to fix the winapi_check warnings. --- tools/winapi/win32.api | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index 5e6bdd6..b590ede 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -5010,6 +5010,7 @@ UINT IUnknown * IWineD3D * +IWineD3DClipper * %%winedos.dll

1 0

Francois Gouget : localui: Update win32. api to fix the winapi_check warnings.
by Alexandre Julliard Aug. 8, 2007

Aug. 8, 2007

Module: wine Branch: master Commit: 9dab7ad474469b17c8932dc46fbfce51377c2ba1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9dab7ad474469b17c8932dc46… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Aug 8 10:51:19 2007 +0200 localui: Update win32.api to fix the winapi_check warnings. --- tools/winapi/win32.api | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index b590ede..5382646 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -1990,6 +1990,12 @@ LPMONITOREX LPWSTR +%%localui.dll + +%ptr + +PMONITORUI + %%mapi32.dll %long

1 0

Peter Dons Tychsen : faultrep: Add a stub dll.
by Alexandre Julliard Aug. 8, 2007

Aug. 8, 2007

Module: wine Branch: master Commit: a2cd64303b5216225072a2e7f7bad3431e8c9185 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2cd64303b5216225072a2e7f… Author: Peter Dons Tychsen <donpedro(a)tdcadsl.dk> Date: Fri Jul 27 01:43:49 2007 +0200 faultrep: Add a stub dll. --- Makefile.in | 2 + configure | 3 ++ configure.ac | 1 + dlls/Makefile.in | 1 + dlls/faultrep/Makefile.in | 12 +++++++++++ dlls/faultrep/faultrep.c | 44 +++++++++++++++++++++++++++++++++++++++++++ dlls/faultrep/faultrep.spec | 14 +++++++++++++ 7 files changed, 77 insertions(+), 0 deletions(-) diff --git a/Makefile.in b/Makefile.in index d504ac6..774249c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -233,6 +233,7 @@ ALL_MAKEFILES = \ dlls/dxerr8/Makefile \ dlls/dxerr9/Makefile \ dlls/dxguid/Makefile \ + dlls/faultrep/Makefile \ dlls/gdi32/Makefile \ dlls/gdi32/tests/Makefile \ dlls/gdiplus/Makefile \ @@ -598,6 +599,7 @@ dlls/dxdiagn/Makefile: dlls/dxdiagn/Makefile.in dlls/Makedll.rules dlls/dxerr8/Makefile: dlls/dxerr8/Makefile.in dlls/Makeimplib.rules dlls/dxerr9/Makefile: dlls/dxerr9/Makefile.in dlls/Makeimplib.rules dlls/dxguid/Makefile: dlls/dxguid/Makefile.in dlls/Makeimplib.rules +dlls/faultrep/Makefile: dlls/faultrep/Makefile.in dlls/Makedll.rules dlls/gdi32/Makefile: dlls/gdi32/Makefile.in dlls/Makedll.rules dlls/gdi32/tests/Makefile: dlls/gdi32/tests/Makefile.in dlls/Maketest.rules dlls/gdiplus/Makefile: dlls/gdiplus/Makefile.in dlls/Makedll.rules diff --git a/configure b/configure index b9ea64f..23dfa4b 100755 --- a/configure +++ b/configure @@ -20416,6 +20416,8 @@ ac_config_files="$ac_config_files dlls/dxerr9/Makefile" ac_config_files="$ac_config_files dlls/dxguid/Makefile" +ac_config_files="$ac_config_files dlls/faultrep/Makefile" + ac_config_files="$ac_config_files dlls/gdi32/Makefile" ac_config_files="$ac_config_files dlls/gdi32/tests/Makefile" @@ -21607,6 +21609,7 @@ do "dlls/dxerr8/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dxerr8/Makefile" ;; "dlls/dxerr9/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dxerr9/Makefile" ;; "dlls/dxguid/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dxguid/Makefile" ;; + "dlls/faultrep/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/faultrep/Makefile" ;; "dlls/gdi32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/gdi32/Makefile" ;; "dlls/gdi32/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/gdi32/tests/Makefile" ;; "dlls/gdiplus/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/gdiplus/Makefile" ;; diff --git a/configure.ac b/configure.ac index ba5b4da..ec6ff71 100644 --- a/configure.ac +++ b/configure.ac @@ -1634,6 +1634,7 @@ AC_CONFIG_FILES([dlls/dxdiagn/Makefile]) AC_CONFIG_FILES([dlls/dxerr8/Makefile]) AC_CONFIG_FILES([dlls/dxerr9/Makefile]) AC_CONFIG_FILES([dlls/dxguid/Makefile]) +AC_CONFIG_FILES([dlls/faultrep/Makefile]) AC_CONFIG_FILES([dlls/gdi32/Makefile]) AC_CONFIG_FILES([dlls/gdi32/tests/Makefile]) AC_CONFIG_FILES([dlls/gdiplus/Makefile]) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index 2fdc360..2a7b7b8 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -73,6 +73,7 @@ BASEDIRS = \ dswave \ dwmapi \ dxdiagn \ + faultrep \ gdi32 \ gdiplus \ gphoto2.ds \ diff --git a/dlls/faultrep/Makefile.in b/dlls/faultrep/Makefile.in new file mode 100644 index 0000000..e6e04a2 --- /dev/null +++ b/dlls/faultrep/Makefile.in @@ -0,0 +1,12 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = faultrep.dll +IMPORTS = kernel32 + +C_SRCS = faultrep.c + +(a)MAKE_DLL_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/faultrep/faultrep.c b/dlls/faultrep/faultrep.c new file mode 100644 index 0000000..7771191 --- /dev/null +++ b/dlls/faultrep/faultrep.c @@ -0,0 +1,44 @@ +/* Fault report handling + * + * Copyright 2007 Peter Dons Tychsen + * + * 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 + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(faultrep); + +/*********************************************************************** + * DllMain. + */ +BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved) +{ + switch(reason) + { + case DLL_WINE_PREATTACH: + return FALSE; + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(inst); + break; + case DLL_PROCESS_DETACH: + break; + } + return TRUE; +} diff --git a/dlls/faultrep/faultrep.spec b/dlls/faultrep/faultrep.spec new file mode 100644 index 0000000..3cc9934 --- /dev/null +++ b/dlls/faultrep/faultrep.spec @@ -0,0 +1,14 @@ +@ stub AddERExcludedApplicationA +@ stub AddERExcludedApplicationW +@ stub CreateMinidumpA +@ stub CreateMinidumpW +@ stub ReportEREvent +@ stub ReportEREventDW +@ stub ReportFault +@ stub ReportFaultDWM +@ stub ReportFaultFromQueue +@ stub ReportFaultToQueue +@ stub ReportHang +@ stub ReportKernelFaultA +@ stub ReportKernelFaultDWW +@ stub ReportKernelFaultW

1 0

Rob Shearman : include: Add declarations for URLOpenStreamA/W, URLOpenBlockingStreamA/W and URLOpenPullStreamA/W.
by Alexandre Julliard Aug. 8, 2007

Aug. 8, 2007

Module: wine Branch: master Commit: c26db8ca8cc001adf9cca1109d64bc491c82ffb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c26db8ca8cc001adf9cca1109… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Aug 3 11:04:53 2007 +0100 include: Add declarations for URLOpenStreamA/W, URLOpenBlockingStreamA/W and URLOpenPullStreamA/W. --- include/urlmon.idl | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/include/urlmon.idl b/include/urlmon.idl index 5f64086..3f2b49e 100644 --- a/include/urlmon.idl +++ b/include/urlmon.idl @@ -1278,6 +1278,12 @@ cpp_quote("HRESULT WINAPI RevokeBindStatusCallback(LPBC,IBindStatusCallback*);") cpp_quote("void WINAPI ReleaseBindInfo(BINDINFO*);") cpp_quote("HRESULT WINAPI UrlMkGetSessionOption(DWORD,LPVOID,DWORD,DWORD*,DWORD);") cpp_quote("HRESULT WINAPI UrlMkSetSessionOption(DWORD,LPVOID,DWORD,DWORD);") +cpp_quote("HRESULT WINAPI URLOpenStreamA(LPUNKNOWN,LPCSTR,DWORD,LPBINDSTATUSCALLBACK);") +cpp_quote("HRESULT WINAPI URLOpenStreamW(LPUNKNOWN,LPCWSTR,DWORD,LPBINDSTATUSCALLBACK);") +cpp_quote("HRESULT WINAPI URLOpenPullStreamA(LPUNKNOWN,LPCSTR,DWORD,LPBINDSTATUSCALLBACK);") +cpp_quote("HRESULT WINAPI URLOpenPullStreamW(LPUNKNOWN,LPCWSTR,DWORD,LPBINDSTATUSCALLBACK);") +cpp_quote("HRESULT WINAPI URLOpenBlockingStreamA(LPUNKNOWN,LPCSTR,LPSTREAM*,DWORD,LPBINDSTATUSCALLBACK);") +cpp_quote("HRESULT WINAPI URLOpenBlockingStreamW(LPUNKNOWN,LPCWSTR,LPSTREAM*,DWORD,LPBINDSTATUSCALLBACK);") cpp_quote("#define OInetCombineUrl CoInternetCombineUrl") cpp_quote("#define OInetCompareUrl CoInternetCompareUrl")

1 0