Ros-diffs August 2017

ros-diffs@reactos.org

22 participants
262 discussions

[bfreisen] 75576: [PSDK][GDIPLUS] Partly implement Pen
by bfreisen＠svn.reactos.org 16 Aug '17

16 Aug '17

Author: bfreisen Date: Wed Aug 16 16:19:17 2017 New Revision: 75576 URL: http://svn.reactos.org/svn/reactos?rev=75576&view=rev Log: [PSDK][GDIPLUS] Partly implement Pen Modified: trunk/reactos/sdk/include/psdk/gdiplusmatrix.h trunk/reactos/sdk/include/psdk/gdipluspen.h Modified: trunk/reactos/sdk/include/psdk/gdiplusmatrix.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/gdiplusma… ============================================================================== --- trunk/reactos/sdk/include/psdk/gdiplusmatrix.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/gdiplusmatrix.h [iso-8859-1] Wed Aug 16 16:19:17 2017 @@ -21,6 +21,7 @@ class Matrix : public GdiplusBase { + friend class Pen; friend class Region; public: Modified: trunk/reactos/sdk/include/psdk/gdipluspen.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/gdipluspe… ============================================================================== --- trunk/reactos/sdk/include/psdk/gdipluspen.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/gdipluspen.h [iso-8859-1] Wed Aug 16 16:19:17 2017 @@ -57,17 +57,23 @@ Status GetColor(Color *color) { - return NotImplemented; + ARGB argb; + Status status = SetStatus(DllExports::GdipGetPenColor(pen, &argb)); + if (color) + color->SetValue(argb); + return status; } Status GetCompoundArray(REAL *compoundArray, INT count) { - return NotImplemented; + return NotImplemented; // FIXME: not available: SetStatus(DllExports::GdipGetPenCompoundArray(pen, count)); } INT GetCompoundArrayCount(VOID) { - return 0; + INT count; + SetStatus(DllExports::GdipGetPenCompoundCount(pen, &count)); + return count; } Status GetCustomEndCap(CustomLineCap *customCap) @@ -87,17 +93,21 @@ REAL GetDashOffset(VOID) { - return 0; + REAL offset; + SetStatus(DllExports::GdipGetPenDashOffset(pen, &offset)); + return offset; } Status GetDashPattern(REAL *dashArray, INT count) { - return NotImplemented; + return SetStatus(DllExports::GdipGetPenDashArray(pen, dashArray, count)); } INT GetDashPatternCount(VOID) { - return 0; + INT count; + SetStatus(DllExports::GdipGetPenDashCount(pen, &count)); + return count; } DashStyle GetDashStyle(VOID) @@ -122,7 +132,9 @@ REAL GetMiterLimit(VOID) { - return 0; + REAL miterLimit; + SetStatus(DllExports::GdipGetPenMiterLimit(pen, &miterLimit)); + return miterLimit; } PenType GetPenType(VOID) @@ -142,47 +154,49 @@ REAL GetWidth(VOID) { - return 0; + REAL width; + SetStatus(DllExports::GdipGetPenWidth(pen, &width)); + return width; } Status MultiplyTransform(Matrix *matrix, MatrixOrder order) { - return NotImplemented; + return NotImplemented; // FIXME: not available: SetStatus(DllExports::GdipMultiplyPenTransform(pen, matrix ? matrix->matrix : NULL, order)); } Status ResetTransform(VOID) { - return NotImplemented; + return SetStatus(DllExports::GdipResetPenTransform(pen)); } Status RotateTransform(REAL angle, MatrixOrder order) { - return NotImplemented; + return NotImplemented; // FIXME: not available: SetStatus(DllExports::GdipRotatePenTransform(pen, angle, order)); } Status ScaleTransform(REAL sx, REAL sy, MatrixOrder order) { - return NotImplemented; + return SetStatus(DllExports::GdipScalePenTransform(pen, sx, sy, order)); } Status SetAlignment(PenAlignment penAlignment) { - return NotImplemented; + return SetStatus(DllExports::GdipSetPenMode(pen, penAlignment)); } Status SetBrush(const Brush *brush) { - return NotImplemented; + return NotImplemented; // FIXME: Brush unimplemented SetStatus(DllExports::GdipSetPenBrushFill(pen, brush ? brush->brush : NULL)); } Status SetColor(const Color &color) { - return NotImplemented; + return SetStatus(DllExports::GdipSetPenColor(pen, color.GetValue())); } Status SetCompoundArray(const REAL *compoundArray, INT count) { - return NotImplemented; + return SetStatus(DllExports::GdipSetPenCompoundArray(pen, compoundArray, count)); } Status SetCustomEndCap(const CustomLineCap *customCap) @@ -197,22 +211,22 @@ Status SetDashCap(DashCap dashCap) { - return NotImplemented; + return SetStatus(DllExports::GdipSetPenDashCap197819(pen, dashCap)); } Status SetDashOffset(REAL dashOffset) { - return NotImplemented; + return SetStatus(DllExports::GdipSetPenDashOffset(pen, dashOffset)); } Status SetDashPattern(const REAL *dashArray, INT count) { - return NotImplemented; + return SetStatus(DllExports::GdipSetPenDashArray(pen, dashArray, count)); } Status SetDashStyle(DashStyle dashStyle) { - return NotImplemented; + return SetStatus(DllExports::GdipSetPenDashStyle(pen, dashStyle)); } Status SetEndCap(LineCap endCap) @@ -232,7 +246,7 @@ Status SetMiterLimit(REAL miterLimit) { - return NotImplemented; + return SetStatus(DllExports::GdipSetPenMiterLimit(pen, miterLimit)); } Status SetStartCap(LineCap startCap) @@ -242,17 +256,27 @@ Status SetTransform(const Matrix *matrix) { - return NotImplemented; + return SetStatus(DllExports::GdipSetPenTransform(pen, matrix ? matrix->matrix : NULL)); } Status SetWidth(REAL width) { - return NotImplemented; + return SetStatus(DllExports::GdipSetPenWidth(pen, width)); } private: - Status status; GpPen *pen; + +private: + mutable Status status; + + Status SetStatus(Status status) const + { + if (status == Ok) + return status; + this->status = status; + return status; + } }; #endif /* _GDIPLUSPEN_H */

1 0

[tkreuzer] 75575: [FLTMC][NFSD] Fix version definition
by tkreuzer＠svn.reactos.org 16 Aug '17

16 Aug '17

Author: tkreuzer Date: Wed Aug 16 16:06:41 2017 New Revision: 75575 URL: http://svn.reactos.org/svn/reactos?rev=75575&view=rev Log: [FLTMC][NFSD] Fix version definition Modified: trunk/reactos/base/applications/fltmc/CMakeLists.txt trunk/reactos/base/applications/fltmc/fltmc.cpp trunk/reactos/base/services/nfsd/CMakeLists.txt trunk/reactos/base/services/nfsd/readwrite.c Modified: trunk/reactos/base/applications/fltmc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fltmc/CM… ============================================================================== --- trunk/reactos/base/applications/fltmc/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/fltmc/CMakeLists.txt [iso-8859-1] Wed Aug 16 16:06:41 2017 @@ -1,3 +1,6 @@ + +remove_definitions(-D_WIN32_WINNT=0x502 -DWINVER=0x502) +add_definitions(-D_WIN32_WINNT=0x601) set_cpp(WITH_RUNTIME WITH_EXCEPTIONS) Modified: trunk/reactos/base/applications/fltmc/fltmc.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fltmc/fl… ============================================================================== --- trunk/reactos/base/applications/fltmc/fltmc.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/fltmc/fltmc.cpp [iso-8859-1] Wed Aug 16 16:06:41 2017 @@ -5,9 +5,6 @@ * PURPOSE: Control utility for file system filter drivers * PROGRAMMERS: Copyright 2016 Ged Murphy (gedmurphy(a)gmail.com) */ - -//FIXME -#define NTDDI_VERSION NTDDI_WIN7 // Please leave this temporary hack in place // it's used to keep VS2015 happy for development. Modified: trunk/reactos/base/services/nfsd/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/nfsd/CMakeLi… ============================================================================== --- trunk/reactos/base/services/nfsd/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/services/nfsd/CMakeLists.txt [iso-8859-1] Wed Aug 16 16:06:41 2017 @@ -1,5 +1,5 @@ -remove_definitions(-D_WIN32_WINNT=0x502) -add_definitions(-D_WIN32_WINNT=0x600) +remove_definitions(-D_WIN32_WINNT=0x502 -DWINVER=0x502) +add_definitions(-D_WIN32_WINNT=0x601) add_definitions(-DNTDDI_VERSION=0x06010000) include_directories( Modified: trunk/reactos/base/services/nfsd/readwrite.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/nfsd/readwri… ============================================================================== --- trunk/reactos/base/services/nfsd/readwrite.c [iso-8859-1] (original) +++ trunk/reactos/base/services/nfsd/readwrite.c [iso-8859-1] Wed Aug 16 16:06:41 2017 @@ -142,45 +142,27 @@ ULONG pnfs_bytes_read = 0; int status = NO_ERROR; -#ifdef __REACTOS__ - do - { + nfs41_open_stateid_arg(upcall->state_ref, &stateid); + +#ifdef PNFS_ENABLE_READ + status = read_from_pnfs(upcall, &stateid); + + if (status == NO_ERROR || status == ERROR_HANDLE_EOF) + goto out; + + if (args->out_len) { + pnfs_bytes_read = args->out_len; + args->out_len = 0; + + args->offset += pnfs_bytes_read; + args->buffer += pnfs_bytes_read; + args->len -= pnfs_bytes_read; + } #endif - nfs41_open_stateid_arg(upcall->state_ref, &stateid); - -#ifdef PNFS_ENABLE_READ - status = read_from_pnfs(upcall, &stateid); - - if (status == NO_ERROR || status == ERROR_HANDLE_EOF) - goto out; - - if (args->out_len) { - pnfs_bytes_read = args->out_len; - args->out_len = 0; - - args->offset += pnfs_bytes_read; - args->buffer += pnfs_bytes_read; - args->len -= pnfs_bytes_read; - } -#endif - - status = read_from_mds(upcall, &stateid); -#ifdef __REACTOS__ - /* Status returned by NFS server when session is to be renewed */ - if (status == 1006) - { - nfs41_session_renew(upcall->state_ref->session); - dprintf(1, "Session renewed (read)!\n"); - continue; - } -#endif - - args->out_len += pnfs_bytes_read; -#ifdef __REACTOS__ - break; - } - while (TRUE); -#endif + + status = read_from_mds(upcall, &stateid); + + args->out_len += pnfs_bytes_read; out: return status; } @@ -296,41 +278,24 @@ uint32_t pnfs_bytes_written = 0; int status; -#ifdef __REACTOS__ - do - { + nfs41_open_stateid_arg(upcall->state_ref, &stateid); + +#ifdef PNFS_ENABLE_WRITE + status = write_to_pnfs(upcall, &stateid); + if (args->out_len) { + pnfs_bytes_written = args->out_len; + args->out_len = 0; + + args->offset += pnfs_bytes_written; + args->buffer += pnfs_bytes_written; + args->len -= pnfs_bytes_written; + + if (args->len == 0) + goto out; + } #endif - nfs41_open_stateid_arg(upcall->state_ref, &stateid); - -#ifdef PNFS_ENABLE_WRITE - status = write_to_pnfs(upcall, &stateid); - if (args->out_len) { - pnfs_bytes_written = args->out_len; - args->out_len = 0; - - args->offset += pnfs_bytes_written; - args->buffer += pnfs_bytes_written; - args->len -= pnfs_bytes_written; - - if (args->len == 0) - goto out; - } -#endif - - status = write_to_mds(upcall, &stateid); -#ifdef __REACTOS__ - /* Status returned by NFS server when session is to be renewed */ - if (status == 1006) - { - nfs41_session_renew(upcall->state_ref->session); - dprintf(1, "Session renewed (write)!\n"); - continue; - } - - break; - } - while (TRUE); -#endif + + status = write_to_mds(upcall, &stateid); out: args->out_len += pnfs_bytes_written; return status;

1 0

[tkreuzer] 75574: [KERNEL32] Support PAGE_EXECUTE_WRITECOPY in CreateFileMappingW if OsMajorVersion is 6+.
by tkreuzer＠svn.reactos.org 16 Aug '17

16 Aug '17

Author: tkreuzer Date: Wed Aug 16 16:06:36 2017 New Revision: 75574 URL: http://svn.reactos.org/svn/reactos?rev=75574&view=rev Log: [KERNEL32] Support PAGE_EXECUTE_WRITECOPY in CreateFileMappingW if OsMajorVersion is 6+. Modified: trunk/reactos/dll/win32/kernel32/client/file/filemap.c Modified: trunk/reactos/dll/win32/kernel32/client/file/filemap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/filemap.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/filemap.c [iso-8859-1] Wed Aug 16 16:06:36 2017 @@ -84,6 +84,12 @@ { /* Give it */ DesiredAccess |= SECTION_MAP_EXECUTE; + } + else if ((flProtect == PAGE_EXECUTE_WRITECOPY) && + (NtCurrentPeb()->OSMajorVersion >= 6)) + { + /* Give it */ + DesiredAccess |= (SECTION_MAP_WRITE | SECTION_MAP_EXECUTE); } else if ((flProtect != PAGE_READONLY) && (flProtect != PAGE_WRITECOPY)) {

1 0

[tkreuzer] 75573: [DELAYIMP] Use underscore symbol prefix only on x86
by tkreuzer＠svn.reactos.org 16 Aug '17

16 Aug '17

Author: tkreuzer Date: Wed Aug 16 16:06:31 2017 New Revision: 75573 URL: http://svn.reactos.org/svn/reactos?rev=75573&view=rev Log: [DELAYIMP] Use underscore symbol prefix only on x86 Modified: trunk/reactos/sdk/lib/delayimp/delayimp.c Modified: trunk/reactos/sdk/lib/delayimp/delayimp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/delayimp/delayimp.… ============================================================================== --- trunk/reactos/sdk/lib/delayimp/delayimp.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/delayimp/delayimp.c [iso-8859-1] Wed Aug 16 16:06:31 2017 @@ -31,14 +31,9 @@ #if defined (_M_IX86) #pragma comment(linker, "/alternatename:___pfnDliNotifyHook2=___pfnDliNotifyHook2Default") #pragma comment(linker, "/alternatename:___pfnDliFailureHook2=___pfnDliFailureHook2Default") -#elif defined (_M_IA64) || defined (_M_AMD64) +#else #pragma comment(linker, "/alternatename:__pfnDliNotifyHook2=__pfnDliNotifyHook2Default") #pragma comment(linker, "/alternatename:__pfnDliFailureHook2=__pfnDliFailureHook2Default") -#elif defined (_M_ARM) -#pragma comment(linker, "/alternatename:__pfnDliNotifyHook2=__pfnDliNotifyHook2Default") -#pragma comment(linker, "/alternatename:__pfnDliFailureHook2=__pfnDliFailureHook2Default") -#else -#error Unsupported platform, please find the correct decoration for your arch! #endif #endif

1 0

[tkreuzer] 75572: [PSDK] Add SymSrvIsStoreW prototype to dbghelp.h
by tkreuzer＠svn.reactos.org 16 Aug '17

16 Aug '17

Author: tkreuzer Date: Wed Aug 16 16:06:27 2017 New Revision: 75572 URL: http://svn.reactos.org/svn/reactos?rev=75572&view=rev Log: [PSDK] Add SymSrvIsStoreW prototype to dbghelp.h Modified: trunk/reactos/sdk/include/psdk/dbghelp.h Modified: trunk/reactos/sdk/include/psdk/dbghelp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/dbghelp.h… ============================================================================== --- trunk/reactos/sdk/include/psdk/dbghelp.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/dbghelp.h [iso-8859-1] Wed Aug 16 16:06:27 2017 @@ -2253,6 +2253,18 @@ BOOL WINAPI SymSetParentWindow(_In_ HWND); +BOOL +IMAGEAPI +SymSrvIsStore( + _In_opt_ HANDLE hProcess, + _In_ PCSTR path); + +BOOL +IMAGEAPI +SymSrvIsStoreW( + _In_opt_ HANDLE hProcess, + _In_ PCWSTR path); + /************************* * Version, global stuff * *************************/ @@ -2544,12 +2556,6 @@ BOOL WINAPI SymUnloadModule(_In_ HANDLE, _In_ DWORD); -BOOL -IMAGEAPI -SymSrvIsStore( - _In_opt_ HANDLE hProcess, - _In_ PCSTR path); - #endif #ifdef __cplusplus

1 0

[tkreuzer] 75571: [INTRIN.H] Add _mul128 and _umul128 prototypes and remove some obsolete ones from the MSC version.
by tkreuzer＠svn.reactos.org 16 Aug '17

16 Aug '17

Author: tkreuzer Date: Wed Aug 16 16:06:22 2017 New Revision: 75571 URL: http://svn.reactos.org/svn/reactos?rev=75571&view=rev Log: [INTRIN.H] Add _mul128 and _umul128 prototypes and remove some obsolete ones from the MSC version. Modified: trunk/reactos/sdk/include/crt/intrin.h trunk/reactos/sdk/include/crt/msc/intrin.h Modified: trunk/reactos/sdk/include/crt/intrin.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/crt/intrin.h?r… ============================================================================== --- trunk/reactos/sdk/include/crt/intrin.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/crt/intrin.h [iso-8859-1] Wed Aug 16 16:06:22 2017 @@ -757,6 +757,8 @@ unsigned __int64 __lzcnt64(unsigned __int64); void __movsq(unsigned long long *, unsigned long long const *, size_t); __int64 __mulh(__int64, __int64); +__int64 _mul128(__int64 _Multiplier, __int64 _Multiplicand, __int64 * _HighProduct); +unsigned __int64 _umul128(unsigned __int64 _Multiplier, unsigned __int64 _Multiplicand, unsigned __int64 * _HighProduct); unsigned __int64 __popcnt64(unsigned __int64); unsigned __int64 __readcr0(void); unsigned __int64 __readcr2(void); @@ -820,8 +822,6 @@ __m128i _mm_set1_epi64x(__int64); __m128i _mm_set_epi64x(__int64, __int64); void _mm_stream_si64x(__int64 *, __int64); -__int64 _mul128(__int64 _Multiplier, __int64 _Multiplicand, __int64 * _HighProduct); -unsigned __int64 _umul128(unsigned __int64 _Multiplier, unsigned __int64 _Multiplicand, unsigned __int64 * _HighProduct); #endif #endif /* _M_X64 */ Modified: trunk/reactos/sdk/include/crt/msc/intrin.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/crt/msc/intrin… ============================================================================== --- trunk/reactos/sdk/include/crt/msc/intrin.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/crt/msc/intrin.h [iso-8859-1] Wed Aug 16 16:06:22 2017 @@ -173,7 +173,6 @@ #pragma intrinsic(_byteswap_uint64) #if defined(_M_IX86) || defined(_M_AMD64) #pragma intrinsic(__ll_lshift) -__int64 __ll_rshift(__int64 Mask, int Bit); #pragma intrinsic(__ll_rshift) #pragma intrinsic(__ull_rshift) #pragma intrinsic(__lzcnt) @@ -195,17 +194,14 @@ #endif /*** 64/128-bit math ***/ -__int64 __cdecl _abs64(__int64); #pragma intrinsic(_abs64) #if defined(_M_IX86) || defined(_M_AMD64) #pragma intrinsic(__emul) #pragma intrinsic(__emulu) #endif #ifdef _M_AMD64 -__int64 __mulh(__int64 a, __int64 b); #pragma intrinsic(__mulh) #pragma intrinsic(__umulh) -__int64 _mul128(__int64 Multiplier, __int64 Multiplicand, __int64 * HighProduct); #pragma intrinsic(_mul128) #pragma intrinsic(_umul128) #elif defined(_M_ARM)

1 0

[tkreuzer] 75570: [FAT32] Remove duplicated print
by tkreuzer＠svn.reactos.org 16 Aug '17

16 Aug '17

Author: tkreuzer Date: Wed Aug 16 16:06:18 2017 New Revision: 75570 URL: http://svn.reactos.org/svn/reactos?rev=75570&view=rev Log: [FAT32] Remove duplicated print Modified: trunk/reactos/boot/freeldr/bootsect/fat32.S Modified: trunk/reactos/boot/freeldr/bootsect/fat32.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/bootsect/fat3… ============================================================================== --- trunk/reactos/boot/freeldr/bootsect/fat32.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/bootsect/fat32.S [iso-8859-1] Wed Aug 16 16:06:18 2017 @@ -519,8 +519,6 @@ PrintFileNotFound: mov si, offset msgFreeLdr // FreeLdr not found message call PutChars // Display it - mov si, offset msgAnyKey // Press any key message - call PutChars // Display it jmp Reboot

1 0

[tkreuzer] 75569: [SHELLDESKTOP] Add missing dependency to psdk
by tkreuzer＠svn.reactos.org 16 Aug '17

16 Aug '17

Author: tkreuzer Date: Wed Aug 16 16:06:14 2017 New Revision: 75569 URL: http://svn.reactos.org/svn/reactos?rev=75569&view=rev Log: [SHELLDESKTOP] Add missing dependency to psdk Modified: trunk/reactos/dll/win32/shell32/shelldesktop/CMakeLists.txt Modified: trunk/reactos/dll/win32/shell32/shelldesktop/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shelldes… ============================================================================== --- trunk/reactos/dll/win32/shell32/shelldesktop/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shelldesktop/CMakeLists.txt [iso-8859-1] Wed Aug 16 16:06:14 2017 @@ -9,4 +9,4 @@ dde.cpp) add_library(shelldesktop ${SOURCE}) -add_dependencies(shelldesktop xdk) +add_dependencies(shelldesktop xdk psdk)

1 0

[ekohl] 75568: [SETUPAPI] Add stubs for the remaining range list functions.
by ekohl＠svn.reactos.org 16 Aug '17

16 Aug '17

Author: ekohl Date: Wed Aug 16 14:18:42 2017 New Revision: 75568 URL: http://svn.reactos.org/svn/reactos?rev=75568&view=rev Log: [SETUPAPI] Add stubs for the remaining range list functions. Modified: trunk/reactos/dll/win32/setupapi/cfgmgr.c trunk/reactos/dll/win32/setupapi/setupapi.spec Modified: trunk/reactos/dll/win32/setupapi/cfgmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/cfgmgr.… ============================================================================== --- trunk/reactos/dll/win32/setupapi/cfgmgr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/cfgmgr.c [iso-8859-1] Wed Aug 16 14:18:42 2017 @@ -735,6 +735,23 @@ /*********************************************************************** + * CM_Add_Range [SETUPAPI.@] + */ +CONFIGRET +WINAPI +CM_Add_Range( + _In_ DWORDLONG ullStartValue, + _In_ DWORDLONG ullEndValue, + _In_ RANGE_LIST rlh, + _In_ ULONG ulFlags) +{ + FIXME("CM_Add_Range(%I64u %I64u %p %lx)\n", + ullStartValue, ullEndValue, rlh, ulFlags); + return CR_CALL_NOT_IMPLEMENTED; +} + + +/*********************************************************************** * CM_Add_Res_Des [SETUPAPI.@] */ CONFIGRET WINAPI CM_Add_Res_Des( @@ -1105,6 +1122,23 @@ /*********************************************************************** + * CM_Delete_Range [SETUPAPI.@] + */ +CONFIGRET +WINAPI +CM_Delete_Range( + _In_ DWORDLONG ullStartValue, + _In_ DWORDLONG ullEndValue, + _In_ RANGE_LIST rlh, + _In_ ULONG ulFlags) +{ + FIXME("CM_Delete_Range(%I64u %I64u %p %lx)\n", + ullStartValue, ullEndValue, rlh, ulFlags); + return CR_CALL_NOT_IMPLEMENTED; +} + + +/*********************************************************************** * CM_Disable_DevNode [SETUPAPI.@] */ CONFIGRET WINAPI CM_Disable_DevNode( @@ -1200,6 +1234,22 @@ HeapFree(GetProcessHeap(), 0, pMachine); return CR_SUCCESS; +} + + +/*********************************************************************** + * CM_Dup_Range_List [SETUPAPI.@] + */ +CONFIGRET +WINAPI +CM_Dup_Range_List( + _In_ RANGE_LIST rlhOld, + _In_ RANGE_LIST rlhNew, + _In_ ULONG ulFlags) +{ + FIXME("CM_Dup_Range_List(%p %p %lx)\n", + rlhOld, rlhNew, ulFlags); + return CR_CALL_NOT_IMPLEMENTED; } @@ -1466,6 +1516,44 @@ RpcEndExcept; return ret; +} + + +/*********************************************************************** + * CM_Find_Range [SETUPAPI.@] + */ +CONFIGRET +WINAPI +CM_Find_Range( + _Out_ PDWORDLONG pullStart, + _In_ DWORDLONG ullStart, + _In_ ULONG ulLength, + _In_ DWORDLONG ullAlignment, + _In_ DWORDLONG ullEnd, + _In_ RANGE_LIST rlh, + _In_ ULONG ulFlags) +{ + FIXME("CM_Find_Range(%p %I64u %lu %I64u %I64u %p %lx)\n", + pullStart, ullStart, ulLength, ullAlignment, ullEnd, rlh, ulFlags); + return CR_CALL_NOT_IMPLEMENTED; +} + + +/*********************************************************************** + * CM_First_Range [SETUPAPI.@] + */ +CONFIGRET +WINAPI +CM_First_Range( + _In_ RANGE_LIST rlh, + _Out_ PDWORDLONG pullStart, + _Out_ PDWORDLONG pullEnd, + _Out_ PRANGE_ELEMENT preElement, + _In_ ULONG ulFlags) +{ + FIXME("CM_First_Range(%p %p %p %p %lx)\n", + rlh, pullStart, pullEnd, preElement, ulFlags); + return CR_CALL_NOT_IMPLEMENTED; } @@ -4193,6 +4281,40 @@ /*********************************************************************** + * CM_Intersect_Range_List [SETUPAPI.@] + */ +CONFIGRET +WINAPI +CM_Intersect_Range_List( + _In_ RANGE_LIST rlhOld1, + _In_ RANGE_LIST rlhOld2, + _In_ RANGE_LIST rlhNew, + _In_ ULONG ulFlags) +{ + FIXME("CM_Intersect_Range_List(%p %p %p %lx)\n", + rlhOld1, rlhOld2, rlhNew, ulFlags); + return CR_CALL_NOT_IMPLEMENTED; +} + + +/*********************************************************************** + * CM_Invert_Range_List [SETUPAPI.@] + */ +CONFIGRET +WINAPI +CM_Invert_Range_List( + _In_ RANGE_LIST rlhOld, + _In_ RANGE_LIST rlhNew, + _In_ DWORDLONG ullMaxValue, + _In_ ULONG ulFlags) +{ + FIXME("CM_Invert_Range_List(%p %p %I64u %lx)\n", + rlhOld, rlhNew, ullMaxValue, ulFlags); + return CR_CALL_NOT_IMPLEMENTED; +} + + +/*********************************************************************** * CM_Is_Dock_Station_Present [SETUPAPI.@] */ CONFIGRET WINAPI CM_Is_Dock_Station_Present( @@ -4433,6 +4555,23 @@ /*********************************************************************** + * CM_Merge_Range_List [SETUPAPI.@] + */ +CONFIGRET +WINAPI +CM_Merge_Range_List( + _In_ RANGE_LIST rlhOld1, + _In_ RANGE_LIST rlhOld2, + _In_ RANGE_LIST rlhNew, + _In_ ULONG ulFlags) +{ + FIXME("CM_Merge_Range_List(%p %p %p %lx)\n", + rlhOld1, rlhOld2, rlhNew, ulFlags); + return CR_CALL_NOT_IMPLEMENTED; +} + + +/*********************************************************************** * CM_Modify_Res_Des [SETUPAPI.@] */ CONFIGRET WINAPI CM_Modify_Res_Des( @@ -4534,6 +4673,23 @@ RpcEndExcept; return ret; +} + + +/*********************************************************************** + * CM_Next_Range [SETUPAPI.@] + */ +CONFIGRET +WINAPI +CM_Next_Range( + _Inout_ PRANGE_ELEMENT preElement, + _Out_ PDWORDLONG pullStart, + _Out_ PDWORDLONG pullEnd, + _In_ ULONG ulFlags) +{ + FIXME("CM_Next_Range(%p %p %p %lx)\n", + preElement, pullStart, pullEnd, ulFlags); + return CR_CALL_NOT_IMPLEMENTED; } @@ -6110,6 +6266,23 @@ /*********************************************************************** + * CM_Test_Range_Available [SETUPAPI.@] + */ +CONFIGRET +WINAPI +CM_Test_Range_Available( + _In_ DWORDLONG ullStartValue, + _In_ DWORDLONG ullEndValue, + _In_ RANGE_LIST rlh, + _In_ ULONG ulFlags) +{ + FIXME("CM_Test_Range_Available(%I64u %I64u %p %lx)\n", + ullStartValue, ullEndValue, rlh, ulFlags); + return CR_CALL_NOT_IMPLEMENTED; +} + + +/*********************************************************************** * CM_Uninstall_DevNode [SETUPAPI.@] */ CONFIGRET WINAPI CM_Uninstall_DevNode( Modified: trunk/reactos/dll/win32/setupapi/setupapi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupap… ============================================================================== --- trunk/reactos/dll/win32/setupapi/setupapi.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/setupapi.spec [iso-8859-1] Wed Aug 16 14:18:42 2017 @@ -13,7 +13,7 @@ @ stdcall CM_Add_IDW(ptr wstr long) @ stdcall CM_Add_ID_ExA(ptr str long ptr) @ stdcall CM_Add_ID_ExW(ptr wstr long ptr) -@ stub CM_Add_Range +@ stdcall CM_Add_Range(int64 int64 ptr long) @ stdcall CM_Add_Res_Des(ptr ptr long ptr long long) @ stdcall CM_Add_Res_Des_Ex(ptr ptr long ptr long long long) @ stdcall CM_Connect_MachineA(str ptr) @@ -27,13 +27,13 @@ @ stdcall CM_Delete_Class_Key_Ex(ptr long long) @ stdcall CM_Delete_DevNode_Key(long long long) @ stdcall CM_Delete_DevNode_Key_Ex(long long long ptr) -@ stub CM_Delete_Range +@ stdcall CM_Delete_Range(int64 int64 ptr long) @ stub CM_Detect_Resource_Conflict @ stub CM_Detect_Resource_Conflict_Ex @ stdcall CM_Disable_DevNode(long long) @ stdcall CM_Disable_DevNode_Ex(long long ptr) @ stdcall CM_Disconnect_Machine(long) -@ stub CM_Dup_Range_List +@ stdcall CM_Dup_Range_List(ptr ptr long) @ stdcall CM_Enable_DevNode(long long) @ stdcall CM_Enable_DevNode_Ex(long long ptr) @ stdcall CM_Enumerate_Classes(long ptr long) @@ -42,8 +42,8 @@ @ stdcall CM_Enumerate_EnumeratorsW(long wstr ptr long) @ stdcall CM_Enumerate_Enumerators_ExA(long str ptr long long) @ stdcall CM_Enumerate_Enumerators_ExW(long wstr ptr long long) -@ stub CM_Find_Range -@ stub CM_First_Range +@ stdcall CM_Find_Range(ptr int64 long int64 int64 ptr long) +@ stdcall CM_First_Range(ptr ptr ptr ptr long) @ stdcall CM_Free_Log_Conf(ptr long) @ stdcall CM_Free_Log_Conf_Ex(ptr long ptr) @ stdcall CM_Free_Log_Conf_Handle(ptr) @@ -133,8 +133,8 @@ @ stdcall CM_Get_Sibling_Ex(ptr long long long) @ stdcall CM_Get_Version() @ stdcall CM_Get_Version_Ex(long) -@ stub CM_Intersect_Range_List -@ stub CM_Invert_Range_List +@ stdcall CM_Intersect_Range_List(ptr ptr ptr long) +@ stdcall CM_Invert_Range_List(ptr ptr int64 long) @ stdcall CM_Is_Dock_Station_Present(ptr) @ stdcall CM_Is_Dock_Station_Present_Ex(ptr long) @ stdcall CM_Is_Version_Available(long) @@ -143,12 +143,12 @@ @ stdcall CM_Locate_DevNodeW(ptr wstr long) @ stdcall CM_Locate_DevNode_ExA(ptr str long long) @ stdcall CM_Locate_DevNode_ExW(ptr wstr long long) -@ stub CM_Merge_Range_List +@ stdcall CM_Merge_Range_List(ptr ptr ptr long) @ stdcall CM_Modify_Res_Des(ptr ptr long ptr long long) @ stdcall CM_Modify_Res_Des_Ex(ptr ptr long ptr long long long) @ stdcall CM_Move_DevNode(long long long) @ stdcall CM_Move_DevNode_Ex(long long long long) -@ stub CM_Next_Range +@ stdcall CM_Next_Range(ptr ptr ptr long) @ stdcall CM_Open_Class_KeyA(ptr str long long ptr long) @ stdcall CM_Open_Class_KeyW(ptr wstr long long ptr long) @ stdcall CM_Open_Class_Key_ExA(ptr str long long ptr long long) @@ -200,7 +200,7 @@ @ stdcall CM_Set_HW_Prof_Flags_ExW(wstr long long long long) @ stdcall CM_Setup_DevNode(long long) @ stdcall CM_Setup_DevNode_Ex(long long long) -@ stub CM_Test_Range_Available +@ stdcall CM_Test_Range_Available(int64 int64 ptr long) @ stdcall CM_Uninstall_DevNode(long long) @ stdcall CM_Uninstall_DevNode_Ex(long long long) @ stdcall CM_Unregister_Device_InterfaceA(str long)

1 0

[tkreuzer] 75567: [WIN32K] Remove old comments
by tkreuzer＠svn.reactos.org 16 Aug '17

16 Aug '17

Author: tkreuzer Date: Wed Aug 16 14:18:08 2017 New Revision: 75567 URL: http://svn.reactos.org/svn/reactos?rev=75567&view=rev Log: [WIN32K] Remove old comments Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/freetype… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] Wed Aug 16 14:18:08 2017 @@ -5424,7 +5424,7 @@ { DPRINT1("Failed to load and render glyph! [index: %d]\n", glyph_index); IntUnLockFreeType; - goto Cleanup; // FIXME + goto Cleanup; } glyph = face->glyph; @@ -5437,7 +5437,7 @@ { DPRINT1("Failed to render glyph! [index: %d]\n", glyph_index); IntUnLockFreeType; - goto Cleanup; // FIXME + goto Cleanup; } /* retrieve kerning distance and move pen position */ @@ -5598,6 +5598,7 @@ if (dc->dctype == DCTYPE_DIRECT) MouseSafetyOnDrawStart(dc->ppdev, DestRect.left, DestRect.top, DestRect.right, DestRect.bottom); + if (dc->fs & (DC_ACCUM_APP|DC_ACCUM_WMGR)) { IntUpdateBoundsRect(dc, &DestRect); @@ -5790,6 +5791,7 @@ EXLATEOBJ_vCleanup(&exloDst2RGB); Cleanup: + DC_vFinishBlit(dc, NULL); if (TextObj != NULL)

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
27
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2017