lywsvip/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2026-05-31 08:17:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

[IMM32] Revert to Wine module (#8003)

Browse Source 
Partially revert #7912.
JIRA issue: CORE-5743
- Use wine instead of wine2ros.
- Improve Unexpected Condition Checkers.
This commit is contained in:
Katayama Hirofumi MZ
2025-05-15 07:38:49 +09:00
committed by GitHub
parent a2dd6efcb4
commit e2e6fcdb96
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dll/win32/imm32/CMakeLists.txt
View File

@@ -28,6 +28,6 @@ add_rc_deps(imm32.rc ${imm32_rc_deps})
add_library(imm32 MODULE ${SOURCE} imm32.rc)
set_module_type(imm32 win32dll UNICODE ENTRYPOINT ImmDllInitialize 12)
target_link_libraries(imm32 wine2ros win32ksys uuid)
target_link_libraries(imm32 wine win32ksys uuid)
add_importlibs(imm32 advapi32 user32 gdi32 kernel32 ntdll)
add_cd_file(TARGET imm32 DESTINATION reactos/system32 FOR all)

15
dll/win32/imm32/precomp.h
View File

@@ -44,23 +44,26 @@
#include <strsafe.h>
#include <wine2ros.h>
#include <wine/debug.h>
/* #define UNEXPECTED() (ASSERT(FALSE), TRUE) */
#define UNEXPECTED() TRUE
#define ERR_PRINTF(fmt, ...) (__WINE_IS_DEBUG_ON(_ERR, __wine_dbch___default) ? \
(wine_dbg_printf(fmt, ##__VA_ARGS__), UNEXPECTED()) : UNEXPECTED())
/* Unexpected Condition Checkers */
#if DBG
#define FAILED_UNEXPECTEDLY(hr) \
(FAILED(hr) ? (ERR("FAILED(0x%08X)\n", hr), UNEXPECTED()) : FALSE)
(FAILED(hr) ? ERR_PRINTF("FAILED(0x%08X)\n", hr) : FALSE)
#define IS_NULL_UNEXPECTEDLY(p) \
(!(p) ? (ERR("%s was NULL\n", #p), UNEXPECTED()) : FALSE)
(!(p) ? ERR_PRINTF("%s was NULL\n", #p) : FALSE)
#define IS_ZERO_UNEXPECTEDLY(p) \
(!(p) ? (ERR("%s was zero\n", #p), UNEXPECTED()) : FALSE)
(!(p) ? ERR_PRINTF("%s was zero\n", #p) : FALSE)
#define IS_TRUE_UNEXPECTEDLY(x) \
((x) ? (ERR("%s was %d\n", #x, (int)(x)), UNEXPECTED()) : FALSE)
((x) ? ERR_PRINTF("%s was non-zero\n", #x) : FALSE)
#define IS_ERROR_UNEXPECTEDLY(x) \
((x) != ERROR_SUCCESS ? (ERR("%s was %d\n", #x, (int)(x)), UNEXPECTED()) : FALSE)
((x) != ERROR_SUCCESS ? ERR_PRINTF("%s was %d\n", #x, (int)(x)) : FALSE)
#else
#define FAILED_UNEXPECTEDLY(hr) FAILED(hr)
#define IS_NULL_UNEXPECTEDLY(p) (!(p))