Ros-diffs November 2020

ros-diffs@reactos.org

18 participants
162 discussions

[reactos] 02/02: [VMAKE/WIDL] Properly fix build (try 3)

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f54c7b646ced236fdd8fb… commit f54c7b646ced236fdd8fb4f16b144469df14c8dc Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Fri Nov 20 19:56:56 2020 +0100 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Fri Nov 20 19:57:48 2020 +0100 [VMAKE/WIDL] Properly fix build (try 3) --- sdk/cmake/widl-support.cmake | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/sdk/cmake/widl-support.cmake b/sdk/cmake/widl-support.cmake index 972011f3d9e..1ad152b22a2 100644 --- a/sdk/cmake/widl-support.cmake +++ b/sdk/cmake/widl-support.cmake @@ -61,9 +61,9 @@ function(add_rpcproxy_files) list(APPEND IDL_DEPS ${CMAKE_CURRENT_SOURCE_DIR}/${FILE} ${EXTRA_DEP}) add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_p.c ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_p.h - # We generate the two files in two passes because WIDL doesn't cope with being given two absolute paths as output + # We generate the two files in two passes because WIDL accepts only one custom file name as output COMMAND native-widl ${INCLUDES} ${DEFINES} ${IDL_FLAGS} -p -o ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_p.c -H ${NAME}_p.h ${FILE} - COMMAND native-widl ${INCLUDES} ${DEFINES} ${IDL_FLAGS} -p -h -H ${NAME}_p.h ${FILE} + COMMAND native-widl ${INCLUDES} ${DEFINES} ${IDL_FLAGS} -h -o ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_p.h ${FILE} DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${FILE} ${EXTRA_DEP} native-widl WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) endforeach() @@ -79,24 +79,25 @@ endfunction() function(add_rpc_files __type) get_includes(INCLUDES) get_defines(DEFINES) + set(__additional_flags -Oif) # Is it a client or server module? if(__type STREQUAL "server") - set(__server_client -Oif -s) + set(__server_client -s) set(__suffix _s) elseif(__type STREQUAL "client") - set(__server_client -Oif -c) + set(__server_client -c) set(__suffix _c) else() message(FATAL_ERROR "Please pass either server or client as argument to add_rpc_files") endif() foreach(FILE ${ARGN}) get_filename_component(__name ${FILE} NAME_WE) - set(__name ${CMAKE_CURRENT_BINARY_DIR}/${__name}${__suffix}) + set(__name ${__name}${__suffix}) add_custom_command( - OUTPUT ${__name}.c ${__name}.h - # We generate the two files in two passes because WIDL doesn't cope with being given two absolute paths as output - COMMAND native-widl ${INCLUDES} ${DEFINES} ${IDL_FLAGS} ${__server_client} -o ${__name}.c -H ${__name}.h ${FILE} - COMMAND native-widl ${INCLUDES} ${DEFINES} ${IDL_FLAGS} ${__server_client} -h -H ${__name}.h ${FILE} + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${__name}.c ${CMAKE_CURRENT_BINARY_DIR}/${__name}.h + # We generate the two files in two passes because WIDL accepts only one custom file name as output + COMMAND native-widl ${INCLUDES} ${DEFINES} ${IDL_FLAGS} ${__additional_flags} ${__server_client} -o ${CMAKE_CURRENT_BINARY_DIR}/${__name}.c -H ${__name}.h ${FILE} + COMMAND native-widl ${INCLUDES} ${DEFINES} ${IDL_FLAGS} ${__additional_flags} -h -o ${CMAKE_CURRENT_BINARY_DIR}/${__name}.h ${FILE} DEPENDS ${FILE} native-widl WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) endforeach()

3 years, 10 months

[reactos] 01/02: [CMAKE] Fix host tools dependency tracking

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=72d94714241006190741e… commit 72d94714241006190741e47ecc9020503d977d37 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Fri Nov 20 19:54:54 2020 +0100 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Fri Nov 20 19:57:48 2020 +0100 [CMAKE] Fix host tools dependency tracking --- sdk/cmake/host-tools.cmake | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sdk/cmake/host-tools.cmake b/sdk/cmake/host-tools.cmake index dedcb11a4c5..08e91da0216 100644 --- a/sdk/cmake/host-tools.cmake +++ b/sdk/cmake/host-tools.cmake @@ -15,9 +15,10 @@ function(setup_host_tools) ExternalProject_Add(host-tools SOURCE_DIR ${REACTOS_SOURCE_DIR} PREFIX ${REACTOS_BINARY_DIR}/host-tools - INSTALL_DIR ${REACTOS_BINARY_DIR}/host-tools - CMAKE_ARGS -UCMAKE_TOOLCHAIN_FILE -DARCH:STRING=${ARCH} -DCMAKE_INSTALL_PREFIX=${REACTOS_BINARY_DIR}/host-tools + BINARY_DIR ${REACTOS_BINARY_DIR}/host-tools/bin + CMAKE_ARGS -UCMAKE_TOOLCHAIN_FILE -DARCH:STRING=${ARCH} -DCMAKE_INSTALL_PREFIX=${REACTOS_BINARY_DIR}/host-tools -DTOOLS_FOLDER=${REACTOS_BINARY_DIR}/host-tools/bin BUILD_ALWAYS TRUE + INSTALL_COMMAND ${CMAKE_COMMAND} -E true BUILD_BYPRODUCTS ${HOST_TOOLS_OUTPUT} ) @@ -26,6 +27,6 @@ function(setup_host_tools) foreach(_tool ${HOST_TOOLS}) add_executable(native-${_tool} IMPORTED) set_target_properties(native-${_tool} PROPERTIES IMPORTED_LOCATION ${INSTALL_DIR}/bin/${_tool}${HOST_EXE_SUFFIX}) - add_dependencies(native-${_tool} host-tools) + add_dependencies(native-${_tool} host-tools ${INSTALL_DIR}/bin/${_tool}${HOST_EXE_SUFFIX}) endforeach() endfunction()

3 years, 10 months

[reactos] 01/01: [RAPPS] Properly use FormatMessageW with WinInet message table

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=059ba9b0c037e76270aa8… commit 059ba9b0c037e76270aa888828cf3355426a7586 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Fri Nov 20 21:16:37 2020 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Fri Nov 20 21:30:29 2020 +0300 [RAPPS] Properly use FormatMessageW with WinInet message table Addendum to fb1582d. CORE-17375 CORE-17377 --- base/applications/rapps/loaddlg.cpp | 47 +++++++++++++++++++++++-------------- 1 file changed, 29 insertions(+), 18 deletions(-) diff --git a/base/applications/rapps/loaddlg.cpp b/base/applications/rapps/loaddlg.cpp index 7ad7de1d32f..fb060358e55 100644 --- a/base/applications/rapps/loaddlg.cpp +++ b/base/applications/rapps/loaddlg.cpp @@ -522,25 +522,28 @@ VOID CDownloadManager::UpdateProgress( } } -VOID ShowLastError( +BOOL ShowLastError( HWND hWndOwner, + BOOL bInetError, DWORD dwLastError) { CLocalPtr<WCHAR> lpMsg; if (!FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | - FORMAT_MESSAGE_FROM_SYSTEM | - FORMAT_MESSAGE_IGNORE_INSERTS, - NULL, + FORMAT_MESSAGE_IGNORE_INSERTS | + (bInetError ? FORMAT_MESSAGE_FROM_HMODULE : FORMAT_MESSAGE_FROM_SYSTEM), + (bInetError ? GetModuleHandleW(L"wininet.dll") : NULL), dwLastError, LANG_USER_DEFAULT, (LPWSTR)&lpMsg, 0, NULL)) { - return; + DPRINT1("FormatMessageW unexpected failure (err %d)\n", GetLastError()); + return FALSE; } MessageBoxW(hWndOwner, lpMsg, NULL, MB_OK | MB_ICONERROR); + return TRUE; } unsigned int WINAPI CDownloadManager::ThreadFunc(LPVOID param) @@ -596,7 +599,7 @@ unsigned int WINAPI CDownloadManager::ThreadFunc(LPVOID param) { if (!GetStorageDirectory(Path)) { - ShowLastError(hMainWnd, GetLastError()); + ShowLastError(hMainWnd, FALSE, GetLastError()); goto end; } } @@ -646,7 +649,7 @@ unsigned int WINAPI CDownloadManager::ThreadFunc(LPVOID param) { if (!CreateDirectoryW(Path.GetString(), NULL)) { - ShowLastError(hMainWnd, GetLastError()); + ShowLastError(hMainWnd, FALSE, GetLastError()); goto end; } } @@ -700,7 +703,7 @@ unsigned int WINAPI CDownloadManager::ThreadFunc(LPVOID param) if (!hOpen) { - ShowLastError(hMainWnd, GetLastError()); + ShowLastError(hMainWnd, TRUE, GetLastError()); goto end; } @@ -715,7 +718,7 @@ unsigned int WINAPI CDownloadManager::ThreadFunc(LPVOID param) if (!InternetCrackUrlW(InfoArray[iAppId].szUrl, urlLength + 1, ICU_DECODE | ICU_ESCAPE, &urlComponents)) { - ShowLastError(hMainWnd, GetLastError()); + ShowLastError(hMainWnd, TRUE, GetLastError()); goto end; } @@ -729,14 +732,18 @@ unsigned int WINAPI CDownloadManager::ThreadFunc(LPVOID param) 0); if (!hFile) { - ShowLastError(hMainWnd, GetLastError()); + if (!ShowLastError(hMainWnd, TRUE, GetLastError())) + { + /* Workaround for CORE-17377 */ + MessageBox_LoadString(hMainWnd, IDS_UNABLE_TO_DOWNLOAD2); + } goto end; } // query connection if (!HttpQueryInfoW(hFile, HTTP_QUERY_STATUS_CODE | HTTP_QUERY_FLAG_NUMBER, &dwStatus, &dwStatusLen, NULL)) { - ShowLastError(hMainWnd, GetLastError()); + ShowLastError(hMainWnd, TRUE, GetLastError()); goto end; } @@ -757,7 +764,11 @@ unsigned int WINAPI CDownloadManager::ThreadFunc(LPVOID param) 0); if (!hFile) { - ShowLastError(hMainWnd, GetLastError()); + if (!ShowLastError(hMainWnd, TRUE, GetLastError())) + { + /* Workaround for CORE-17377 */ + MessageBox_LoadString(hMainWnd, IDS_UNABLE_TO_DOWNLOAD2); + } goto end; } @@ -778,13 +789,13 @@ unsigned int WINAPI CDownloadManager::ThreadFunc(LPVOID param) } else { - ShowLastError(hMainWnd, GetLastError()); + ShowLastError(hMainWnd, FALSE, GetLastError()); goto end; } } else { - ShowLastError(hMainWnd, hr); + ShowLastError(hMainWnd, FALSE, hr); goto end; } } @@ -842,7 +853,7 @@ unsigned int WINAPI CDownloadManager::ThreadFunc(LPVOID param) if (hOut == INVALID_HANDLE_VALUE) { - ShowLastError(hMainWnd, GetLastError()); + ShowLastError(hMainWnd, FALSE, GetLastError()); goto end; } @@ -851,13 +862,13 @@ unsigned int WINAPI CDownloadManager::ThreadFunc(LPVOID param) { if (!InternetReadFile(hFile, lpBuffer, _countof(lpBuffer), &dwBytesRead)) { - ShowLastError(hMainWnd, GetLastError()); + ShowLastError(hMainWnd, TRUE, GetLastError()); goto end; } if (!WriteFile(hOut, &lpBuffer[0], dwBytesRead, &dwBytesWritten, NULL)) { - ShowLastError(hMainWnd, GetLastError()); + ShowLastError(hMainWnd, FALSE, GetLastError()); goto end; } @@ -947,7 +958,7 @@ run: } else { - ShowLastError(hMainWnd, GetLastError()); + ShowLastError(hMainWnd, FALSE, GetLastError()); } }

3 years, 10 months

[reactos] 01/01: [CMAKE/WIDL] Fix build (try 2)

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8297109b95afd989ed5a7… commit 8297109b95afd989ed5a7c1796e2a2e444e1421b Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Fri Nov 20 10:17:43 2020 +0100 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Fri Nov 20 10:17:43 2020 +0100 [CMAKE/WIDL] Fix build (try 2) --- sdk/cmake/widl-support.cmake | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sdk/cmake/widl-support.cmake b/sdk/cmake/widl-support.cmake index dbd5f3a73ab..972011f3d9e 100644 --- a/sdk/cmake/widl-support.cmake +++ b/sdk/cmake/widl-support.cmake @@ -61,7 +61,9 @@ function(add_rpcproxy_files) list(APPEND IDL_DEPS ${CMAKE_CURRENT_SOURCE_DIR}/${FILE} ${EXTRA_DEP}) add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_p.c ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_p.h - COMMAND native-widl ${INCLUDES} ${DEFINES} ${IDL_FLAGS} -p -o ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_p.c -h -H ${NAME}_p.h ${FILE} + # We generate the two files in two passes because WIDL doesn't cope with being given two absolute paths as output + COMMAND native-widl ${INCLUDES} ${DEFINES} ${IDL_FLAGS} -p -o ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_p.c -H ${NAME}_p.h ${FILE} + COMMAND native-widl ${INCLUDES} ${DEFINES} ${IDL_FLAGS} -p -h -H ${NAME}_p.h ${FILE} DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${FILE} ${EXTRA_DEP} native-widl WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) endforeach()

3 years, 10 months

[reactos] 01/01: [CMAKE/WIDL] Fix build

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=acfff0919ebacc028f500… commit acfff0919ebacc028f5000bbe8a7c0c7f3457772 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Fri Nov 20 10:12:31 2020 +0100 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Fri Nov 20 10:12:31 2020 +0100 [CMAKE/WIDL] Fix build --- sdk/cmake/widl-support.cmake | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/sdk/cmake/widl-support.cmake b/sdk/cmake/widl-support.cmake index 1b55d21b226..dbd5f3a73ab 100644 --- a/sdk/cmake/widl-support.cmake +++ b/sdk/cmake/widl-support.cmake @@ -79,10 +79,10 @@ function(add_rpc_files __type) get_defines(DEFINES) # Is it a client or server module? if(__type STREQUAL "server") - set(__server_client -Oif -s -o) + set(__server_client -Oif -s) set(__suffix _s) elseif(__type STREQUAL "client") - set(__server_client -Oif -c -o) + set(__server_client -Oif -c) set(__suffix _c) else() message(FATAL_ERROR "Please pass either server or client as argument to add_rpc_files") @@ -92,7 +92,9 @@ function(add_rpc_files __type) set(__name ${CMAKE_CURRENT_BINARY_DIR}/${__name}${__suffix}) add_custom_command( OUTPUT ${__name}.c ${__name}.h - COMMAND native-widl ${INCLUDES} ${DEFINES} ${IDL_FLAGS} -h -H ${__name}.h ${__server_client} ${__name}.c ${FILE} + # We generate the two files in two passes because WIDL doesn't cope with being given two absolute paths as output + COMMAND native-widl ${INCLUDES} ${DEFINES} ${IDL_FLAGS} ${__server_client} -o ${__name}.c -H ${__name}.h ${FILE} + COMMAND native-widl ${INCLUDES} ${DEFINES} ${IDL_FLAGS} ${__server_client} -h -H ${__name}.h ${FILE} DEPENDS ${FILE} native-widl WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) endforeach()

3 years, 10 months

[reactos] 01/01: [CMAKE/WIDL] Run widl from the source directory

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b587e7b32eccdb85ee186… commit b587e7b32eccdb85ee1865c5e7e241abe8580f20 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Fri Nov 20 09:47:33 2020 +0100 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Fri Nov 20 09:47:33 2020 +0100 [CMAKE/WIDL] Run widl from the source directory This dramatically improves ccache direct hit rate as now the generated files are identical across build trees --- sdk/cmake/widl-support.cmake | 46 ++++++++++++++++++-------------------------- 1 file changed, 19 insertions(+), 27 deletions(-) diff --git a/sdk/cmake/widl-support.cmake b/sdk/cmake/widl-support.cmake index 267459383ba..1b55d21b226 100644 --- a/sdk/cmake/widl-support.cmake +++ b/sdk/cmake/widl-support.cmake @@ -32,8 +32,9 @@ function(add_idl_headers TARGET) set(HEADER ${CMAKE_CURRENT_BINARY_DIR}/${NAME}.h) add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${NAME}.h - COMMAND native-widl ${INCLUDES} ${DEFINES} ${IDL_FLAGS} -h -o ${CMAKE_CURRENT_BINARY_DIR}/${NAME}.h ${CMAKE_CURRENT_SOURCE_DIR}/${FILE} - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${FILE} native-widl) + COMMAND native-widl ${INCLUDES} ${DEFINES} ${IDL_FLAGS} -h -o ${CMAKE_CURRENT_BINARY_DIR}/${NAME}.h ${FILE} + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${FILE} native-widl + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) list(APPEND HEADERS ${HEADER}) endforeach() add_custom_target(${TARGET} DEPENDS ${HEADERS}) @@ -56,18 +57,21 @@ function(add_rpcproxy_files) set(EXTRA_DEP ${REACTOS_SOURCE_DIR}/sdk/include/psdk/${SPLIT_FILE}) endif() endif() - list(APPEND IDLS ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}) + list(APPEND IDLS ${FILE}) + list(APPEND IDL_DEPS ${CMAKE_CURRENT_SOURCE_DIR}/${FILE} ${EXTRA_DEP}) add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_p.c ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_p.h - COMMAND native-widl ${INCLUDES} ${DEFINES} ${IDL_FLAGS} -p -o ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_p.c -h -H ${NAME}_p.h ${CMAKE_CURRENT_SOURCE_DIR}/${FILE} - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${FILE} ${EXTRA_DEP} native-widl) + COMMAND native-widl ${INCLUDES} ${DEFINES} ${IDL_FLAGS} -p -o ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_p.c -h -H ${NAME}_p.h ${FILE} + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${FILE} ${EXTRA_DEP} native-widl + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) endforeach() # Extra pass to generate dlldata add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c COMMAND native-widl ${INCLUDES} ${DEFINES} ${IDL_FLAGS} --dlldata-only -o ${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c ${IDLS} - DEPENDS ${IDLS} native-widl) + DEPENDS ${IDL_DEPS} native-widl + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) endfunction() function(add_rpc_files __type) @@ -86,32 +90,25 @@ function(add_rpc_files __type) foreach(FILE ${ARGN}) get_filename_component(__name ${FILE} NAME_WE) set(__name ${CMAKE_CURRENT_BINARY_DIR}/${__name}${__suffix}) - if(NOT IS_ABSOLUTE ${FILE}) - set(FILE ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}) - endif() add_custom_command( OUTPUT ${__name}.c ${__name}.h COMMAND native-widl ${INCLUDES} ${DEFINES} ${IDL_FLAGS} -h -H ${__name}.h ${__server_client} ${__name}.c ${FILE} - DEPENDS ${FILE} native-widl) + DEPENDS ${FILE} native-widl + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) endforeach() endfunction() function(generate_idl_iids) foreach(IDL_FILE ${ARGN}) get_filename_component(FILE ${IDL_FILE} NAME) - if(FILE STREQUAL "${IDL_FILE}") - set(IDL_FILE_FULL "${CMAKE_CURRENT_SOURCE_DIR}/${IDL_FILE}") - else() - set(IDL_FILE_FULL ${IDL_FILE}) - endif() get_includes(INCLUDES) get_defines(DEFINES) get_filename_component(NAME ${IDL_FILE} NAME_WE) add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_i.c - COMMAND native-widl ${INCLUDES} ${DEFINES} ${IDL_FLAGS} -u -o ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_i.c ${IDL_FILE_FULL} - DEPENDS ${IDL_FILE_FULL} native-widl) - set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${NAME}_i.c PROPERTIES GENERATED TRUE) + COMMAND native-widl ${INCLUDES} ${DEFINES} ${IDL_FLAGS} -u -o ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_i.c ${IDL_FILE} + DEPENDS ${IDL_FILE_FULL} native-widl + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) endforeach() endfunction() @@ -127,19 +124,14 @@ function(add_iid_library TARGET) endfunction() function(add_idl_reg_script IDL_FILE) - get_filename_component(FILE ${IDL_FILE} NAME) - if(FILE STREQUAL "${IDL_FILE}") - set(IDL_FILE_FULL "${CMAKE_CURRENT_SOURCE_DIR}/${IDL_FILE}") - else() - set(IDL_FILE_FULL ${IDL_FILE}) - endif() get_includes(INCLUDES) get_defines(DEFINES) get_filename_component(NAME ${IDL_FILE} NAME_WE) add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_r.res - COMMAND native-widl ${INCLUDES} ${DEFINES} ${IDL_FLAGS} -r -o ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_r.res ${IDL_FILE_FULL} - DEPENDS ${IDL_FILE_FULL} native-widl) - set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${NAME}_r.res PROPERTIES + COMMAND native-widl ${INCLUDES} ${DEFINES} ${IDL_FLAGS} -r -o ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_r.res ${IDL_FILE} + DEPENDS ${IDL_FILE_FULL} native-widl + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) + set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${NAME}_r.res PROPERTIES GENERATED TRUE EXTERNAL_OBJECT TRUE) endfunction()

3 years, 10 months

[reactos] 01/01: [NTOS:KD] Correctly define previous mode when entering KDBG (addendum to 0c76bbfe98d8dae26749670cba355136413ba3ce)

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=44c6df4b2769b2b2d7aa6… commit 44c6df4b2769b2b2d7aa62b589625e1a5b87338d Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Tue Nov 17 14:22:27 2020 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Tue Nov 17 14:23:36 2020 +0100 [NTOS:KD] Correctly define previous mode when entering KDBG (addendum to 0c76bbfe98d8dae26749670cba355136413ba3ce) --- ntoskrnl/kd/kdio.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ntoskrnl/kd/kdio.c b/ntoskrnl/kd/kdio.c index 22842942596..50f011c7f02 100644 --- a/ntoskrnl/kd/kdio.c +++ b/ntoskrnl/kd/kdio.c @@ -56,6 +56,7 @@ static ULONG KdbgNextApiNumber = DbgKdContinueApi; static CONTEXT KdbgContext; static EXCEPTION_RECORD64 KdbgExceptionRecord; static BOOLEAN KdbgFirstChanceException; +static KPROCESSOR_MODE KdbgPreviousMode; static NTSTATUS KdbgContinueStatus = STATUS_SUCCESS; /* LOCKING FUNCTIONS *********************************************************/ @@ -580,6 +581,7 @@ KdSendPacket( KdbgNextApiNumber = DbgKdGetContextApi; KdbgExceptionRecord = WaitStateChange->u.Exception.ExceptionRecord; KdbgFirstChanceException = WaitStateChange->u.Exception.FirstChance; + KdbgPreviousMode = ((PKTHREAD)(ULONG_PTR)WaitStateChange->Thread)->PreviousMode; return; } } @@ -599,7 +601,7 @@ KdSendPacket( } Result = KdbEnterDebuggerException(&KdbgExceptionRecord, - KernelMode, // FIXME + KdbgPreviousMode, &KdbgContext, KdbgFirstChanceException); #else

3 years, 10 months

[reactos] 19/19: [PARTMGR] Use FORCEINLINE

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6488440a6a9abee129512… commit 6488440a6a9abee129512a3717a8b81f0951e395 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Mon Nov 16 14:27:47 2020 +0100 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Mon Nov 16 16:58:10 2020 +0100 [PARTMGR] Use FORCEINLINE --- drivers/storage/partmgr/partmgr.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/storage/partmgr/partmgr.h b/drivers/storage/partmgr/partmgr.h index 05a0ee6bbbd..71eccfb8823 100644 --- a/drivers/storage/partmgr/partmgr.h +++ b/drivers/storage/partmgr/partmgr.h @@ -139,7 +139,7 @@ IssueSyncIoControlRequest( _In_ ULONG OutputBufferLength, _In_ BOOLEAN InternalDeviceIoControl); -inline +FORCEINLINE BOOLEAN VerifyIrpOutBufferSize( _In_ PIRP Irp, @@ -154,7 +154,7 @@ VerifyIrpOutBufferSize( return TRUE; } -inline +FORCEINLINE BOOLEAN VerifyIrpInBufferSize( _In_ PIRP Irp, @@ -169,7 +169,7 @@ VerifyIrpInBufferSize( return TRUE; } -inline +FORCEINLINE VOID PartMgrAcquireLayoutLock( _In_ PFDO_EXTENSION FDOExtension) @@ -179,7 +179,7 @@ PartMgrAcquireLayoutLock( KeWaitForSingleObject(&FDOExtension->SyncEvent, Executive, KernelMode, FALSE, NULL); } -inline +FORCEINLINE VOID PartMgrReleaseLayoutLock( _In_ PFDO_EXTENSION FDOExtension)

3 years, 10 months

[reactos] 18/19: [SDK] Use FORCEINLINE instead of inline

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=02f4c755b8147b26d6855… commit 02f4c755b8147b26d6855ee26f81081bc824b300 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Mon Nov 16 14:27:24 2020 +0100 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Mon Nov 16 16:58:10 2020 +0100 [SDK] Use FORCEINLINE instead of inline --- sdk/include/reactos/debug/driverdbg.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/include/reactos/debug/driverdbg.h b/sdk/include/reactos/debug/driverdbg.h index 963236e503f..c25e5fdcc97 100644 --- a/sdk/include/reactos/debug/driverdbg.h +++ b/sdk/include/reactos/debug/driverdbg.h @@ -8,7 +8,7 @@ #ifndef _DBG_DRIVERDBG_H_ #define _DBG_DRIVERDBG_H_ -inline +FORCEINLINE PCHAR GetIRPMinorFunctionString( UCHAR MinorFunction)

3 years, 10 months

[reactos] 17/19: [NCFTP] declare DisposeWinsock as static

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=13dad0231a91ada4735d6… commit 13dad0231a91ada4735d63c08c6354d9c016e815 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Tue Nov 10 14:25:54 2020 +0100 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Mon Nov 16 16:58:10 2020 +0100 [NCFTP] declare DisposeWinsock as static --- modules/rosapps/applications/net/ncftp/ncftp/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/rosapps/applications/net/ncftp/ncftp/main.c b/modules/rosapps/applications/net/ncftp/ncftp/main.c index 418aa60a53c..189202d711b 100644 --- a/modules/rosapps/applications/net/ncftp/ncftp/main.c +++ b/modules/rosapps/applications/net/ncftp/ncftp/main.c @@ -24,7 +24,7 @@ WSADATA wsaData; int wsaInit = 0; - __inline void DisposeWinsock(int aUNUSED) { if (wsaInit > 0) WSACleanup(); wsaInit--; } + static __inline void DisposeWinsock(int aUNUSED) { if (wsaInit > 0) WSACleanup(); wsaInit--; } #else # define DisposeWinsock(a) #endif

3 years, 10 months

← Newer
1
2
3
4
5
6
7
...
17
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 November 2020