Ros-diffs

ros-diffs@reactos.org

81390 discussions

[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

[tkreuzer] 75566: [WIN32K] - Refactor GreExtTextOutW to use a single exit path instead of 3 - Call MouseSafetyOnDraw* only for direct DCs
by tkreuzer＠svn.reactos.org 16 Aug '17

16 Aug '17

Author: tkreuzer Date: Wed Aug 16 13:37:15 2017 New Revision: 75566 URL: http://svn.reactos.org/svn/reactos?rev=75566&view=rev Log: [WIN32K] - Refactor GreExtTextOutW to use a single exit path instead of 3 - Call MouseSafetyOnDraw* only for direct DCs 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 13:37:15 2017 @@ -5102,6 +5102,14 @@ LOGFONTW *plf; BOOL EmuBold, EmuItalic; int thickness; + BOOL bResult; + + /* Check if String is valid */ + if ((Count > 0xFFFF) || (Count > 0 && String == NULL)) + { + EngSetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } // TODO: Write test-cases to exactly match real Windows in different // bad parameters (e.g. does Windows check the DC or the RECT first?). @@ -5112,42 +5120,30 @@ return FALSE; } - pdcattr = dc->pdcattr; - - if ((fuOptions & ETO_OPAQUE) || pdcattr->jBkMode == OPAQUE) - { - if (pdcattr->ulDirty_ & DIRTY_BACKGROUND) - DC_vUpdateBackgroundBrush(dc); - } - - /* Check if String is valid */ - if ((Count > 0xFFFF) || (Count > 0 && String == NULL)) - { - EngSetLastError(ERROR_INVALID_PARAMETER); - goto fail; - } - - DxShift = fuOptions & ETO_PDY ? 1 : 0; - if (PATH_IsPathOpen(dc->dclevel)) { - if (!PATH_ExtTextOut( dc, + bResult = PATH_ExtTextOut(dc, XStart, YStart, fuOptions, (const RECTL *)lprc, String, Count, - (const INT *)Dx)) goto fail; - goto good; - } + (const INT *)Dx); + DC_UnlockDc(dc); + return bResult; + } + + DC_vPrepareDCsForBlit(dc, NULL, NULL, NULL); if (!dc->dclevel.pSurface) { /* Memory DC with no surface selected */ - DC_UnlockDc(dc); - return TRUE; - } + bResult = FALSE; // TRUE? + goto Cleanup; + } + + pdcattr = dc->pdcattr; if (lprc && (fuOptions & (ETO_OPAQUE | ETO_CLIPPED))) { @@ -5191,10 +5187,10 @@ IntUpdateBoundsRect(dc, &DestRect); } - DC_vPrepareDCsForBlit(dc, &DestRect, NULL, NULL); - if (pdcattr->ulDirty_ & DIRTY_BACKGROUND) DC_vUpdateBackgroundBrush(dc); + if (dc->dctype == DCTYPE_DIRECT) + MouseSafetyOnDrawStart(dc->ppdev, DestRect.left, DestRect.top, DestRect.right, DestRect.bottom); psurf = dc->dclevel.pSurface; IntEngBitBlt( @@ -5209,8 +5205,11 @@ &dc->eboBackground.BrushObject, &BrushOrigin, ROP4_FROM_INDEX(R3_OPINDEX_PATCOPY)); + + if (dc->dctype == DCTYPE_DIRECT) + MouseSafetyOnDrawEnd(dc->ppdev); + fuOptions &= ~ETO_OPAQUE; - DC_vFinishBlit(dc, NULL); } else { @@ -5223,7 +5222,8 @@ TextObj = RealizeFontInit(pdcattr->hlfntNew); if (TextObj == NULL) { - goto fail; + bResult = FALSE; + goto Cleanup; } FontObj = TextObj->Font; @@ -5247,7 +5247,8 @@ if (!TextIntUpdateSize(dc, TextObj, FontGDI, FALSE)) { IntUnLockFreeType; - goto fail; + bResult = FALSE; + goto Cleanup; } if (dc->pdcattr->iGraphicsMode == GM_ADVANCED) @@ -5284,7 +5285,7 @@ /* * Process the horizontal alignment and modify XStart accordingly. */ - + DxShift = fuOptions & ETO_PDY ? 1 : 0; if (pdcattr->lTextAlign & (TA_RIGHT | TA_CENTER)) { ULONGLONG TextWidth = 0; @@ -5348,7 +5349,7 @@ { DPRINT1("Failed to render glyph! [index: %d]\n", glyph_index); IntUnLockFreeType; - goto fail; + goto Cleanup; } } @@ -5384,14 +5385,8 @@ } } - /* Lock blit with a dummy rect */ - DC_vPrepareDCsForBlit(dc, NULL, NULL, NULL); - psurf = dc->dclevel.pSurface; SurfObj = &psurf->SurfObj ; - - EXLATEOBJ_vInitialize(&exloRGB2Dst, &gpalRGB, psurf->ppal, 0, 0, 0); - EXLATEOBJ_vInitialize(&exloDst2RGB, psurf->ppal, &gpalRGB, 0, 0, 0); if ((fuOptions & ETO_OPAQUE) && (dc->pdcattr->ulDirty_ & DIRTY_BACKGROUND)) DC_vUpdateBackgroundBrush(dc) ; @@ -5429,8 +5424,7 @@ { DPRINT1("Failed to load and render glyph! [index: %d]\n", glyph_index); IntUnLockFreeType; - DC_vFinishBlit(dc, NULL); - goto fail2; + goto Cleanup; // FIXME } glyph = face->glyph; @@ -5443,8 +5437,7 @@ { DPRINT1("Failed to render glyph! [index: %d]\n", glyph_index); IntUnLockFreeType; - DC_vFinishBlit(dc, NULL); - goto fail2; + goto Cleanup; // FIXME } /* retrieve kerning distance and move pen position */ @@ -5525,6 +5518,12 @@ } } + EXLATEOBJ_vInitialize(&exloRGB2Dst, &gpalRGB, psurf->ppal, 0, 0, 0); + EXLATEOBJ_vInitialize(&exloDst2RGB, psurf->ppal, &gpalRGB, 0, 0, 0); + + /* Assume success */ + bResult = TRUE; + /* * The main rendering loop. */ @@ -5549,9 +5548,8 @@ if (error) { DPRINT1("Failed to load and render glyph! [index: %d]\n", glyph_index); - IntUnLockFreeType; - DC_vFinishBlit(dc, NULL); - goto fail2; + bResult = FALSE; + break; } glyph = face->glyph; @@ -5575,9 +5573,8 @@ if (!realglyph) { DPRINT1("Failed to render glyph! [index: %d]\n", glyph_index); - IntUnLockFreeType; - DC_vFinishBlit(dc, NULL); - goto fail2; + bResult = FALSE; + break; } } @@ -5598,7 +5595,9 @@ DestRect.right = (TextLeft + (realglyph->root.advance.x >> 10) + 32) >> 6; DestRect.top = TextTop + yoff - ((fixAscender + 32) >> 6); DestRect.bottom = TextTop + yoff + ((32 - fixDescender) >> 6); - MouseSafetyOnDrawStart(dc->ppdev, DestRect.left, DestRect.top, DestRect.right, DestRect.bottom); + + 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); @@ -5615,7 +5614,10 @@ &dc->eboBackground.BrushObject, &BrushOrigin, ROP4_FROM_INDEX(R3_OPINDEX_PATCOPY)); - MouseSafetyOnDrawEnd(dc->ppdev); + + if (dc->dctype == DCTYPE_DIRECT) + MouseSafetyOnDrawEnd(dc->ppdev); + BackgroundLeft = DestRect.right; } @@ -5644,18 +5646,16 @@ { DPRINT1("WARNING: EngCreateBitmap() failed!\n"); // FT_Done_Glyph(realglyph); - IntUnLockFreeType; - DC_vFinishBlit(dc, NULL); - goto fail2; + bResult = FALSE; + break; } SourceGlyphSurf = EngLockSurface((HSURF)HSourceGlyph); if ( !SourceGlyphSurf ) { EngDeleteSurface((HSURF)HSourceGlyph); DPRINT1("WARNING: EngLockSurface() failed!\n"); - IntUnLockFreeType; - DC_vFinishBlit(dc, NULL); - goto fail2; + bResult = FALSE; + break; } /* @@ -5676,7 +5676,10 @@ { DestRect.bottom = lprc->bottom + dc->ptlDCOrig.y; } - MouseSafetyOnDrawStart(dc->ppdev, DestRect.left, DestRect.top, DestRect.right, DestRect.bottom); + + if (dc->dctype == DCTYPE_DIRECT) + MouseSafetyOnDrawStart(dc->ppdev, DestRect.left, DestRect.top, DestRect.right, DestRect.bottom); + if (!IntEngMaskBlt( SurfObj, SourceGlyphSurf, @@ -5691,7 +5694,8 @@ DPRINT1("Failed to MaskBlt a glyph!\n"); } - MouseSafetyOnDrawEnd(dc->ppdev) ; + if (dc->dctype == DCTYPE_DIRECT) + MouseSafetyOnDrawEnd(dc->ppdev) ; EngUnlockSurface(SourceGlyphSurf); EngDeleteSurface((HSURF)HSourceGlyph); @@ -5782,27 +5786,18 @@ IntUnLockFreeType; - DC_vFinishBlit(dc, NULL) ; - EXLATEOBJ_vCleanup(&exloRGB2Dst); EXLATEOBJ_vCleanup(&exloDst2RGB); + +Cleanup: + DC_vFinishBlit(dc, NULL); + if (TextObj != NULL) TEXTOBJ_UnlockText(TextObj); -good: - DC_UnlockDc( dc ); - - return TRUE; - -fail2: - EXLATEOBJ_vCleanup(&exloRGB2Dst); - EXLATEOBJ_vCleanup(&exloDst2RGB); -fail: - if (TextObj != NULL) - TEXTOBJ_UnlockText(TextObj); DC_UnlockDc(dc); - return FALSE; + return bResult; } #define STACK_TEXT_BUFFER_SIZE 100

1 0

[ekohl] 75565: [SETUPAPI] - Implement CMP_GetBlockedDriverInfo. - Make sure that CMP_GetServerSideDeviceInstallFlags and CMP_WaitServicesAvailable can be called on local and remote machines.
by ekohl＠svn.reactos.org 16 Aug '17

16 Aug '17

Author: ekohl Date: Wed Aug 16 11:45:21 2017 New Revision: 75565 URL: http://svn.reactos.org/svn/reactos?rev=75565&view=rev Log: [SETUPAPI] - Implement CMP_GetBlockedDriverInfo. - Make sure that CMP_GetServerSideDeviceInstallFlags and CMP_WaitServicesAvailable can be called on local and remote machines. 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 11:45:21 2017 @@ -165,6 +165,56 @@ /*********************************************************************** + * CMP_GetBlockedDriverInfo [SETUPAPI.@] + */ +CONFIGRET +WINAPI +CMP_GetBlockedDriverInfo( + _Out_opt_ LPWSTR pszNames, + _Inout_ PULONG pulLength, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine) +{ + RPC_BINDING_HANDLE BindingHandle = NULL; + ULONG ulTransferLength; + CONFIGRET ret; + + TRACE("CMP_GetBlockedDriverInfo(%p %p %lx %p)\n", + pszNames, pulLength, ulFlags, hMachine); + + if (hMachine != NULL) + { + BindingHandle = ((PMACHINE_INFO)hMachine)->BindingHandle; + if (BindingHandle == NULL) + return CR_FAILURE; + } + else + { + if (!PnpGetLocalHandles(&BindingHandle, NULL)) + return CR_FAILURE; + } + + ulTransferLength = *pulLength; + + RpcTryExcept + { + ret = PNP_GetBlockedDriverInfo(BindingHandle, + (PBYTE)pszNames, + &ulTransferLength, + pulLength, + ulFlags); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + ret = RpcStatusToCmStatus(RpcExceptionCode()); + } + RpcEndExcept; + + return ret; +} + + +/*********************************************************************** * CMP_GetServerSideDeviceInstallFlags [SETUPAPI.@] */ CONFIGRET @@ -172,7 +222,7 @@ CMP_GetServerSideDeviceInstallFlags( _Out_ PULONG pulSSDIFlags, _In_ ULONG ulFlags, - _In_ HMACHINE hMachine) + _In_opt_ HMACHINE hMachine) { RPC_BINDING_HANDLE BindingHandle = NULL; CONFIGRET ret; @@ -444,7 +494,7 @@ CONFIGRET WINAPI CMP_WaitServicesAvailable( - _In_ HMACHINE hMachine) + _In_opt_ HMACHINE hMachine) { RPC_BINDING_HANDLE BindingHandle = NULL; CONFIGRET ret = CR_SUCCESS; @@ -452,8 +502,17 @@ TRACE("CMP_WaitServicesAvailable(%p)\n", hMachine); - if (!PnpGetLocalHandles(&BindingHandle, NULL)) - return CR_FAILURE; + if (hMachine != NULL) + { + BindingHandle = ((PMACHINE_INFO)hMachine)->BindingHandle; + if (BindingHandle == NULL) + return CR_FAILURE; + } + else + { + if (!PnpGetLocalHandles(&BindingHandle, NULL)) + return CR_FAILURE; + } RpcTryExcept { 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 11:45:21 2017 @@ -1,5 +1,5 @@ # Functions exported by Win2003 SP1 -@ stub CMP_GetBlockedDriverInfo +@ stdcall CMP_GetBlockedDriverInfo(wstr ptr long ptr) @ stdcall CMP_GetServerSideDeviceInstallFlags(ptr long ptr) @ stdcall CMP_Init_Detection(long) @ stdcall CMP_RegisterNotification(ptr ptr long ptr)

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs