Ros-diffs October 2017

ros-diffs@reactos.org

43 participants
275 discussions

[reactos] 01/01: [GLU32] Add TrimRegion destructor when compiling with clang-cl. CORE-11799 (#94)

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9cb62498de69b5597e9a9… commit 9cb62498de69b5597e9a9034939b0072580088b6 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sat Oct 28 14:06:01 2017 +0100 [GLU32] Add TrimRegion destructor when compiling with clang-cl. CORE-11799 (#94) --- dll/opengl/glu32/src/libnurbs/internals/trimregion.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dll/opengl/glu32/src/libnurbs/internals/trimregion.h b/dll/opengl/glu32/src/libnurbs/internals/trimregion.h index ee15d7b988..186f28437a 100644 --- a/dll/opengl/glu32/src/libnurbs/internals/trimregion.h +++ b/dll/opengl/glu32/src/libnurbs/internals/trimregion.h @@ -46,6 +46,10 @@ class Backend; class TrimRegion { public: TrimRegion(); +#if defined(__REACTOS__) && defined(__clang__) + /* FIXME: Inspect */ + ~TrimRegion( void ) {} +#endif Trimline left; Trimline right; Gridline top;

7 years, 1 month

[reactos] 01/01: [OPENGL32] Set the stdcall calling convention for wglGetDHGLRC(). CORE-11799 (#94)

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=788efd34a8c591ba74bbb… commit 788efd34a8c591ba74bbb6200863406e2f9e0619 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sat Oct 28 13:56:32 2017 +0100 [OPENGL32] Set the stdcall calling convention for wglGetDHGLRC(). CORE-11799 (#94) --- dll/opengl/opengl32/icdload.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/opengl/opengl32/icdload.c b/dll/opengl/opengl32/icdload.c index 1215e10fcc..0f4c65a782 100644 --- a/dll/opengl/opengl32/icdload.c +++ b/dll/opengl/opengl32/icdload.c @@ -43,7 +43,7 @@ static PVOID APIENTRY wglGetCurrentValue() return IntGetCurrentICDPrivate(); } -static DHGLRC wglGetDHGLRC(struct wgl_context* context) +static DHGLRC APIENTRY wglGetDHGLRC(struct wgl_context* context) { return context->dhglrc; }

7 years, 1 month

[reactos] 01/01: [UDFS] Do not take some of the msvc codepaths when compiling with clang-cl due to issues such as inline assembly support. CORE-11799 (#94)

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5bf1fbec4938dd7d5ae46… commit 5bf1fbec4938dd7d5ae46a0595a7595e3486dab2 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sat Oct 28 13:52:44 2017 +0100 [UDFS] Do not take some of the msvc codepaths when compiling with clang-cl due to issues such as inline assembly support. CORE-11799 (#94) --- drivers/filesystems/udfs/Include/Sys_spec_lib.cpp | 4 ++-- drivers/filesystems/udfs/Include/wcache_lib.cpp | 2 +- drivers/filesystems/udfs/namesup.cpp | 2 +- drivers/filesystems/udfs/udf_info/alloc.cpp | 6 +++--- drivers/filesystems/udfs/udf_info/dirtree.cpp | 4 ++-- drivers/filesystems/udfs/udf_info/extent.cpp | 4 ++-- drivers/filesystems/udfs/udf_info/mount.cpp | 2 +- drivers/filesystems/udfs/udf_info/udf_info.cpp | 16 ++++++++-------- drivers/filesystems/udfs/write.cpp | 6 +++--- 9 files changed, 23 insertions(+), 23 deletions(-) diff --git a/drivers/filesystems/udfs/Include/Sys_spec_lib.cpp b/drivers/filesystems/udfs/Include/Sys_spec_lib.cpp index d2602d6f76..d775e86bd2 100644 --- a/drivers/filesystems/udfs/Include/Sys_spec_lib.cpp +++ b/drivers/filesystems/udfs/Include/Sys_spec_lib.cpp @@ -806,7 +806,7 @@ MyAppendUnicodeToString_( #define UDF_UNC_STR_TAG "AppStr" #endif -#if defined (_X86_) && defined (_MSC_VER) +#if defined(_X86_) && defined(_MSC_VER) && !defined(__clang__) __asm push ebx __asm push esi @@ -868,7 +868,7 @@ MyInitUnicodeString( USHORT i; -#if defined (_X86_) && defined (_MSC_VER) +#if defined(_X86_) && defined(_MSC_VER) && !defined(__clang__) __asm push ebx __asm push esi diff --git a/drivers/filesystems/udfs/Include/wcache_lib.cpp b/drivers/filesystems/udfs/Include/wcache_lib.cpp index db47913113..b00dc50357 100644 --- a/drivers/filesystems/udfs/Include/wcache_lib.cpp +++ b/drivers/filesystems/udfs/Include/wcache_lib.cpp @@ -455,7 +455,7 @@ WCacheGetSortedListIndex( if(!BlockCount) return 0; -#if defined (_X86_) && defined (_MSC_VER) +#if defined(_X86_) && defined(_MSC_VER) && !defined(__clang__) __asm push ecx __asm push ebx diff --git a/drivers/filesystems/udfs/namesup.cpp b/drivers/filesystems/udfs/namesup.cpp index a028f283f8..b30ad8bc2a 100644 --- a/drivers/filesystems/udfs/namesup.cpp +++ b/drivers/filesystems/udfs/namesup.cpp @@ -24,7 +24,7 @@ UDFDissectName( USHORT i; -#if defined (_X86_) && defined (_MSC_VER) +#if defined(_X86_) && defined(_MSC_VER) && !defined(__clang__) PWCHAR retval; diff --git a/drivers/filesystems/udfs/udf_info/alloc.cpp b/drivers/filesystems/udfs/udf_info/alloc.cpp index 0d55dcfb4b..49905fb61a 100644 --- a/drivers/filesystems/udfs/udf_info/alloc.cpp +++ b/drivers/filesystems/udfs/udf_info/alloc.cpp @@ -50,7 +50,7 @@ UDFPhysLbaToPart( ) { PUDFPartMap pm = Vcb->Partitions; -#if defined (_X86_) && defined (_MSC_VER) +#if defined (_X86_) && defined (_MSC_VER) && !defined(__clang__) uint32 retval; __asm { push ebx @@ -1280,7 +1280,7 @@ UDFSetBits__( IN uint32 bc ) { -#ifdef _MSC_VER +#if defined(_MSC_VER) && !defined(__clang__) __asm { push eax push ebx @@ -1388,7 +1388,7 @@ UDFClrBits__( IN uint32 bc ) { -#ifdef _MSC_VER +#if defined(_MSC_VER) && !defined(__clang__) __asm { push eax push ebx diff --git a/drivers/filesystems/udfs/udf_info/dirtree.cpp b/drivers/filesystems/udfs/udf_info/dirtree.cpp index 0f425c7032..d20e353966 100644 --- a/drivers/filesystems/udfs/udf_info/dirtree.cpp +++ b/drivers/filesystems/udfs/udf_info/dirtree.cpp @@ -242,7 +242,7 @@ UDFDirIndexTrunc( /* This routine returns pointer to DirIndex item with index i. */ -#ifdef _MSC_VER +#if defined(_MSC_VER) && !defined(__clang__) __declspec (naked) #endif PDIR_INDEX_ITEM @@ -252,7 +252,7 @@ UDFDirIndex( IN uint32 i // EDX ) { -#ifdef _MSC_VER +#if defined(_MSC_VER) && !defined(__clang__) __asm { push ebx push ecx diff --git a/drivers/filesystems/udfs/udf_info/extent.cpp b/drivers/filesystems/udfs/udf_info/extent.cpp index 8c76c2b018..f949cf1d52 100644 --- a/drivers/filesystems/udfs/udf_info/extent.cpp +++ b/drivers/filesystems/udfs/udf_info/extent.cpp @@ -146,7 +146,7 @@ UDFGetExtentLength( if(!Extent) return 0; int64 i=0; -#if defined (_X86_) && defined (_MSC_VER) +#if defined(_X86_) && defined(_MSC_VER) && !defined(__clang__) __asm push ebx __asm push ecx @@ -227,7 +227,7 @@ UDFGetMappingLength( if(!Extent) return 0; uint32 i=0; -#if defined (_X86_) && defined (_MSC_VER) +#if defined(_X86_) && defined(_MSC_VER) && !defined(__clang__) __asm push ebx __asm mov ebx,Extent diff --git a/drivers/filesystems/udfs/udf_info/mount.cpp b/drivers/filesystems/udfs/udf_info/mount.cpp index 7ce68faa9f..2cbaccc506 100644 --- a/drivers/filesystems/udfs/udf_info/mount.cpp +++ b/drivers/filesystems/udfs/udf_info/mount.cpp @@ -2939,7 +2939,7 @@ UDFCheckZeroBuf( ) { -#if defined (_X86_) && defined (_MSC_VER) +#if defined(_X86_) && defined(_MSC_VER) && !defined(__clang__) BOOLEAN RC = FALSE; diff --git a/drivers/filesystems/udfs/udf_info/udf_info.cpp b/drivers/filesystems/udfs/udf_info/udf_info.cpp index 0d9e5c1bcd..6f29d88e5f 100644 --- a/drivers/filesystems/udfs/udf_info/udf_info.cpp +++ b/drivers/filesystems/udfs/udf_info/udf_info.cpp @@ -4280,7 +4280,7 @@ UDFCompareFileInfo( #pragma warning(disable:4035) // re-enable below #endif -#if defined (_X86_) && defined (_MSC_VER) +#if defined(_X86_) && defined(_MSC_VER) && !defined(__clang__) __declspec (naked) #endif // _X86_ uint32 @@ -4290,7 +4290,7 @@ crc32( IN uint32 len // EDX ) { -#if defined (_X86_) && defined (_MSC_VER) +#if defined(_X86_) && defined(_MSC_VER) && !defined(__clang__) // uint32 _Size = len; __asm { @@ -4346,7 +4346,7 @@ EO_CRC: The polynomial used is: x^16 + x^12 + x^15 + 1 */ -#if defined (_X86_) && defined (_MSC_VER) +#if defined(_X86_) && defined(_MSC_VER) && !defined(__clang__) __declspec (naked) #endif // _X86_ uint16 @@ -4356,7 +4356,7 @@ UDFUnicodeCksum( uint32 n // EDX ) { -#if defined (_X86_) && defined (_MSC_VER) +#if defined(_X86_) && defined(_MSC_VER) && !defined(__clang__) // uint32 _Size = n; __asm { @@ -4412,7 +4412,7 @@ EO_uCRC: #endif // _X86_ } // end UDFUnicodeCksum() -#if defined (_X86_) && defined (_MSC_VER) +#if defined(_X86_) && defined(_MSC_VER) && !defined(__clang__) __declspec (naked) #endif // _X86_ uint16 @@ -4422,7 +4422,7 @@ UDFUnicodeCksum150( uint32 n // EDX ) { -#if defined (_X86_) && defined (_MSC_VER) +#if defined(_X86_) && defined(_MSC_VER) && !defined(__clang__) // uint32 _Size = n; __asm { @@ -4517,7 +4517,7 @@ use16_2: The OSTA-UDF(tm) 1.50 standard states that using CRCs is mandatory. The polynomial used is: x^16 + x^12 + x^15 + 1 */ -#if defined (_X86_) && defined (_MSC_VER) +#if defined(_X86_) && defined(_MSC_VER) && !defined(__clang__) __declspec (naked) #endif // _X86_ uint16 @@ -4527,7 +4527,7 @@ UDFCrc( IN uint32 Size // EDX ) { -#if defined (_X86_) && defined (_MSC_VER) +#if defined(_X86_) && defined(_MSC_VER) && !defined(__clang__) // uint32 _Size = Size; __asm { diff --git a/drivers/filesystems/udfs/write.cpp b/drivers/filesystems/udfs/write.cpp index 467e41b6be..ceaa69bda0 100644 --- a/drivers/filesystems/udfs/write.cpp +++ b/drivers/filesystems/udfs/write.cpp @@ -324,7 +324,7 @@ UDFCommonWrite( // flush system cache UDFFlushLogicalVolume(NULL, NULL, Vcb, 0); } -#ifdef _MSC_VER +#if defined(_MSC_VER) && !defined(__clang__) /* FIXME */ if(PagingIo) { CollectStatistics(Vcb, MetaDataWrites); @@ -444,7 +444,7 @@ UDFCommonWrite( TruncatedLength = WriteLength; } -#ifdef _MSC_VER +#if defined(_MSC_VER) && !defined(__clang__) /* FIXME */ if(PagingIo) { CollectStatistics(Vcb, UserFileWrites); @@ -906,7 +906,7 @@ UDFCommonWrite( UDFUnlockCallersBuffer(PtrIrpContext, Irp, SystemBuffer); -#ifdef _MSC_VER +#if defined(_MSC_VER) && !defined(__clang__) /* FIXME */ if(PagingIo) { CollectStatistics(Vcb, UserDiskWrites);

7 years, 1 month

[reactos] 01/01: [NTDLL][NTUSER][SPOOLSS][WINSPOOL] Add some missing VOIDs. CORE-11799 (#94)

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=706a70c9e11f8371ada69… commit 706a70c9e11f8371ada69ebccf756979a61c5165 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sat Oct 28 13:46:11 2017 +0100 [NTDLL][NTUSER][SPOOLSS][WINSPOOL] Add some missing VOIDs. CORE-11799 (#94) --- dll/ntdll/include/ntdllp.h | 4 ++-- win32ss/printing/base/spoolss/main.c | 2 +- win32ss/printing/base/winspool/main.c | 2 +- win32ss/printing/include/spoolss.h | 2 +- win32ss/user/ntuser/ntuser.c | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dll/ntdll/include/ntdllp.h b/dll/ntdll/include/ntdllp.h index 8164a294c1..4d6086730e 100644 --- a/dll/ntdll/include/ntdllp.h +++ b/dll/ntdll/include/ntdllp.h @@ -147,7 +147,7 @@ VOID NTAPI LdrpFreeUnicodeString(PUNICODE_STRING String); VOID NTAPI -LdrpGetShimEngineInterface(); +LdrpGetShimEngineInterface(VOID); VOID NTAPI @@ -156,7 +156,7 @@ LdrpLoadShimEngine(IN PWSTR ImageName, IN PVOID pShimData); VOID NTAPI -LdrpUnloadShimEngine(); +LdrpUnloadShimEngine(VOID); /* FIXME: Cleanup this mess */ diff --git a/win32ss/printing/base/spoolss/main.c b/win32ss/printing/base/spoolss/main.c index 01142edde8..dcbb447e4c 100644 --- a/win32ss/printing/base/spoolss/main.c +++ b/win32ss/printing/base/spoolss/main.c @@ -240,7 +240,7 @@ SplIsUpgrade() } BOOL WINAPI -SpoolerInit() +SpoolerInit(VOID) { // Nothing to do here yet SetLastError(ERROR_SUCCESS); diff --git a/win32ss/printing/base/winspool/main.c b/win32ss/printing/base/winspool/main.c index 7cf28de577..97e09d7009 100644 --- a/win32ss/printing/base/winspool/main.c +++ b/win32ss/printing/base/winspool/main.c @@ -84,7 +84,7 @@ DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) } BOOL WINAPI -SpoolerInit() +SpoolerInit(VOID) { BOOL bReturnValue = FALSE; DWORD dwErrorCode; diff --git a/win32ss/printing/include/spoolss.h b/win32ss/printing/include/spoolss.h index 6dc318023f..a841fb29e0 100644 --- a/win32ss/printing/include/spoolss.h +++ b/win32ss/printing/include/spoolss.h @@ -68,7 +68,7 @@ PBYTE WINAPI PackStrings(PWSTR* pSource, PBYTE pDest, const DWORD* DestOffsets, PVOID WINAPI ReallocSplMem(PVOID pOldMem, DWORD cbOld, DWORD cbNew); BOOL WINAPI ReallocSplStr(PWSTR* ppwszString, PCWSTR pwszInput); BOOL WINAPI SplInitializeWinSpoolDrv(PVOID* pTable); -BOOL WINAPI SpoolerInit(); +BOOL WINAPI SpoolerInit(VOID); PDWORD WINAPI UndoAlignRpcPtr(PVOID pDestinationBuffer, PVOID pSourceBuffer, DWORD cbBuffer, PDWORD pcbNeeded); #endif diff --git a/win32ss/user/ntuser/ntuser.c b/win32ss/user/ntuser/ntuser.c index d86e563486..e44feb8db0 100644 --- a/win32ss/user/ntuser/ntuser.c +++ b/win32ss/user/ntuser/ntuser.c @@ -113,7 +113,7 @@ InitUserImpl(VOID) NTSTATUS NTAPI -InitVideo(); +InitVideo(VOID); NTSTATUS NTAPI

7 years, 1 month

[reactos] 01/01: [CRT/INTRIN] Use __forceinline for __INTRIN_INLINE in the clang case. CORE-11799 (#94)

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=28dd5cfc5e26b94d40378… commit 28dd5cfc5e26b94d4037882a6c64e8b1068d859c Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sat Oct 28 13:34:43 2017 +0100 [CRT/INTRIN] Use __forceinline for __INTRIN_INLINE in the clang case. CORE-11799 (#94) --- sdk/include/crt/mingw32/intrin.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sdk/include/crt/mingw32/intrin.h b/sdk/include/crt/mingw32/intrin.h index 1c9d20889d..03edc8bfaf 100644 --- a/sdk/include/crt/mingw32/intrin.h +++ b/sdk/include/crt/mingw32/intrin.h @@ -31,12 +31,11 @@ #ifndef RC_INVOKED #ifdef __clang__ -#define __ATTRIBUTE_ARTIFICIAL +#define __INTRIN_INLINE __forceinline #else #define __ATTRIBUTE_ARTIFICIAL __attribute__((artificial)) -#endif - #define __INTRIN_INLINE extern __inline__ __attribute__((__always_inline__,__gnu_inline__)) __ATTRIBUTE_ARTIFICIAL +#endif #ifndef _SIZE_T_DEFINED #define _SIZE_T_DEFINED

7 years, 1 month

[reactos] 01/01: [CRT] fix bug in _rotr implementation

by zefklop

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=07c72955457267ee26f60… commit 07c72955457267ee26f6086e75c5595fbce76e06 Author: zefklop <zefklop(a)users.noreply.github.com> AuthorDate: Sat Oct 28 10:28:27 2017 +0200 [CRT] fix bug in _rotr implementation --- sdk/lib/crt/stdlib/rot.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/lib/crt/stdlib/rot.c b/sdk/lib/crt/stdlib/rot.c index 825a76d3ed..7637a5e9b6 100644 --- a/sdk/lib/crt/stdlib/rot.c +++ b/sdk/lib/crt/stdlib/rot.c @@ -38,7 +38,7 @@ unsigned int _rotr( unsigned int value, int shift ) if ( shift < 0 ) return _rotl(value,-shift); - if ( shift > max_bits<<3 ) + if ( shift > max_bits ) shift = shift % max_bits; return (value >> shift) | (value << (max_bits-shift)); }

7 years, 1 month

[reactos] 01/01: [INCLUDE/WINE] Use __builtin_ffs in the clang-cl build. CORE-11799 (#94)

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d3e83d7d5e43dd9949592… commit d3e83d7d5e43dd9949592c406637b260339f32c5 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Fri Oct 27 23:55:59 2017 +0100 [INCLUDE/WINE] Use __builtin_ffs in the clang-cl build. CORE-11799 (#94) --- sdk/include/reactos/wine/port.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/include/reactos/wine/port.h b/sdk/include/reactos/wine/port.h index 30d8e9e41b..26acee00d6 100644 --- a/sdk/include/reactos/wine/port.h +++ b/sdk/include/reactos/wine/port.h @@ -351,7 +351,7 @@ extern int spawnvp(int mode, const char *cmdname, const char * const argv[]); #endif /* __i386___ && __GNUC__ */ -#if defined(_MSC_VER) +#if defined(_MSC_VER) && !defined(__clang__) __forceinline int ffs(int mask)

7 years, 1 month

[reactos] 01/01: [SHELL32] Remove some unused members and comment out some unused Wine code. CORE-11799 (#94)

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ce4ecd604d3962a8dc11d… commit ce4ecd604d3962a8dc11d52cfa8673b950ed490c Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Fri Oct 27 23:51:44 2017 +0100 [SHELL32] Remove some unused members and comment out some unused Wine code. CORE-11799 (#94) --- dll/win32/shell32/shellmenu/CMenuFocusManager.h | 1 - dll/win32/shell32/shellmenu/CMenuToolbars.cpp | 1 - dll/win32/shell32/shellmenu/CMenuToolbars.h | 1 - dll/win32/shell32/wine/shellole.c | 4 ++-- 4 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dll/win32/shell32/shellmenu/CMenuFocusManager.h b/dll/win32/shell32/shellmenu/CMenuFocusManager.h index d74ed1296d..50575ce968 100644 --- a/dll/win32/shell32/shellmenu/CMenuFocusManager.h +++ b/dll/win32/shell32/shellmenu/CMenuFocusManager.h @@ -77,7 +77,6 @@ private: INT m_selectedItem; DWORD m_selectedItemFlags; - BOOL m_isLButtonDown; BOOL m_movedSinceDown; HWND m_windowAtDown; diff --git a/dll/win32/shell32/shellmenu/CMenuToolbars.cpp b/dll/win32/shell32/shellmenu/CMenuToolbars.cpp index 3d046ba4d5..0b13432359 100644 --- a/dll/win32/shell32/shellmenu/CMenuToolbars.cpp +++ b/dll/win32/shell32/shellmenu/CMenuToolbars.cpp @@ -256,7 +256,6 @@ HRESULT CMenuToolbarBase::OnCustomDraw(LPNMTBCUSTOMDRAW cdraw, LRESULT * theResu CMenuToolbarBase::CMenuToolbarBase(CMenuBand *menuBand, BOOL usePager) : m_pager(this, 1), m_useFlatMenus(FALSE), - m_SubclassOld(NULL), m_disableMouseTrack(FALSE), m_timerEnabled(FALSE), m_menuBand(menuBand), diff --git a/dll/win32/shell32/shellmenu/CMenuToolbars.h b/dll/win32/shell32/shellmenu/CMenuToolbars.h index fcbd62855f..6463166d25 100644 --- a/dll/win32/shell32/shellmenu/CMenuToolbars.h +++ b/dll/win32/shell32/shellmenu/CMenuToolbars.h @@ -32,7 +32,6 @@ class CMenuToolbarBase : private: HFONT m_marlett; BOOL m_useFlatMenus; - WNDPROC m_SubclassOld; BOOL m_disableMouseTrack; BOOL m_timerEnabled; diff --git a/dll/win32/shell32/wine/shellole.c b/dll/win32/shell32/wine/shellole.c index 8d58a00da0..ae9a39bb8f 100644 --- a/dll/win32/shell32/wine/shellole.c +++ b/dll/win32/shell32/wine/shellole.c @@ -365,6 +365,8 @@ HRESULT WINAPI SHGetDesktopFolder(IShellFolder **psf) * When the CreateInstance of the cf is called the callback is executed. */ +#ifndef __REACTOS__ + typedef struct { IClassFactory IClassFactory_iface; @@ -380,8 +382,6 @@ static inline IDefClFImpl *impl_from_IClassFactory(IClassFactory *iface) return CONTAINING_RECORD(iface, IDefClFImpl, IClassFactory_iface); } -#ifndef __REACTOS__ - static const IClassFactoryVtbl dclfvt; /**************************************************************************

7 years, 1 month

[reactos] 01/01: [MSAFD] Properly define SockAsyncThread() and avoid the cast. CORE-11799 (#94)

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5a1484597041c5f0d8561… commit 5a1484597041c5f0d8561a49fe0d1db0497187fe Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Fri Oct 27 23:47:30 2017 +0100 [MSAFD] Properly define SockAsyncThread() and avoid the cast. CORE-11799 (#94) --- dll/win32/msafd/misc/dllmain.c | 6 ++++-- dll/win32/msafd/msafd.h | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dll/win32/msafd/misc/dllmain.c b/dll/win32/msafd/misc/dllmain.c index 45a1d17df1..c2ee828b08 100644 --- a/dll/win32/msafd/misc/dllmain.c +++ b/dll/win32/msafd/misc/dllmain.c @@ -3524,7 +3524,7 @@ BOOLEAN SockCreateOrReferenceAsyncThread(VOID) /* Create the Async Thread */ hAsyncThread = CreateThread(NULL, 0, - (LPTHREAD_START_ROUTINE)SockAsyncThread, + SockAsyncThread, NULL, 0, &AsyncThreadId); @@ -3537,7 +3537,9 @@ BOOLEAN SockCreateOrReferenceAsyncThread(VOID) return TRUE; } -int SockAsyncThread(PVOID ThreadParam) +ULONG +NTAPI +SockAsyncThread(PVOID ThreadParam) { PVOID AsyncContext; PASYNC_COMPLETION_ROUTINE AsyncCompletionRoutine; diff --git a/dll/win32/msafd/msafd.h b/dll/win32/msafd/msafd.h index fa3396ed00..1b8d3cf463 100644 --- a/dll/win32/msafd/msafd.h +++ b/dll/win32/msafd/msafd.h @@ -454,7 +454,9 @@ int CreateContext( PSOCKET_INFORMATION Socket ); -int SockAsyncThread( +ULONG +NTAPI +SockAsyncThread( PVOID ThreadParam );

7 years, 1 month

[reactos] 01/01: [SHSVCS] Add missing VOID. CORE-11799 (#94)

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=511ad21fae04d129338d2… commit 511ad21fae04d129338d26f375184499d9b1089d Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Fri Oct 27 23:42:40 2017 +0100 [SHSVCS] Add missing VOID. CORE-11799 (#94) --- base/services/shsvcs/shsvcs.c | 6 +++--- base/services/shsvcs/thmserver.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/base/services/shsvcs/shsvcs.c b/base/services/shsvcs/shsvcs.c index 74078a5e64..22ba3b973a 100644 --- a/base/services/shsvcs/shsvcs.c +++ b/base/services/shsvcs/shsvcs.c @@ -20,17 +20,17 @@ HRESULT WINAPI DllInstall(BOOL bInstall, LPCWSTR cmdline) return S_OK; } -HRESULT WINAPI DllRegisterServer() +HRESULT WINAPI DllRegisterServer(VOID) { return S_OK; } -HRESULT WINAPI DllUnregisterServer() +HRESULT WINAPI DllUnregisterServer(VOID) { return S_OK; } -HRESULT WINAPI DllCanUnloadNow() +HRESULT WINAPI DllCanUnloadNow(VOID) { return S_OK; } diff --git a/base/services/shsvcs/thmserver.c b/base/services/shsvcs/thmserver.c index b40f02dccb..c4169446f4 100644 --- a/base/services/shsvcs/thmserver.c +++ b/base/services/shsvcs/thmserver.c @@ -28,13 +28,13 @@ static WCHAR ServiceName[] = L"Themes"; HANDLE hThemeStartWaitObject, hThemeStopWaitObject, hThemeServiceWaitObject; HANDLE hStartEvent, hStopEvent, hServiceProcess; -BOOL WINAPI ThemeWatchForStart(); +BOOL WINAPI ThemeWatchForStart(VOID); /* FUNCTIONS *****************************************************************/ static HANDLE -GetThemeServiceProcessHandle() +GetThemeServiceProcessHandle(VOID) { SC_HANDLE scm, service; SERVICE_STATUS_PROCESS status; @@ -112,7 +112,7 @@ ThemeStartCallback(PVOID lpParameter, BOOLEAN TimerOrWaitFired) BOOL WINAPI -ThemeWatchForStart() +ThemeWatchForStart(VOID) { hStartEvent = CreateEventW(NULL, TRUE, FALSE, L"Global\\ThemeStartEvent"); hStopEvent = CreateEventW(NULL, TRUE, FALSE, L"Global\\ThemeStopEvent");

7 years, 1 month

← Newer
1
2
3
4
5
6
7
...
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2017