[IMM32_APITEST] Fix himc testcase crash (#4036)

- Add NULL checks for pIC.
CORE-11700
This commit is contained in:
Katayama Hirofumi MZ 2021-10-20 20:23:38 +09:00 committed by GitHub
parent be8e5fc7b3
commit 396b49436c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -43,29 +43,29 @@ START_TEST(himc)
ok(hIMC != NULL, "\n"); ok(hIMC != NULL, "\n");
pIC = ImmLockIMC(hIMC); pIC = ImmLockIMC(hIMC);
ok(pIC != NULL, "\n"); ok(pIC != NULL, "\n");
ok(pIC->hWnd == NULL, "\n"); ok(pIC && pIC->hWnd == NULL, "\n");
ok(!pIC->fOpen, "\n"); ok(pIC && !pIC->fOpen, "\n");
ok(ImmGetIMCCSize(pIC->hCompStr) != 0, "\n"); ok(pIC && ImmGetIMCCSize(pIC->hCompStr) != 0, "\n");
ok(ImmGetIMCCSize(pIC->hCandInfo) != 0, "\n"); ok(pIC && ImmGetIMCCSize(pIC->hCandInfo) != 0, "\n");
ok(ImmGetIMCCSize(pIC->hGuideLine) != 0, "\n"); ok(pIC && ImmGetIMCCSize(pIC->hGuideLine) != 0, "\n");
ok(ImmGetIMCCSize(pIC->hPrivate) != 0, "\n"); ok(pIC && ImmGetIMCCSize(pIC->hPrivate) != 0, "\n");
ok(ImmGetIMCCSize(pIC->hMsgBuf) != 0, "\n"); ok(pIC && ImmGetIMCCSize(pIC->hMsgBuf) != 0, "\n");
ImmUnlockIMC(hNewIMC); ImmUnlockIMC(hNewIMC);
SetFocus(hwndEdit); SetFocus(hwndEdit);
pIC = ImmLockIMC(hIMC); pIC = ImmLockIMC(hIMC);
ok(pIC != NULL, "\n"); ok(pIC != NULL, "\n");
ok(pIC->hWnd == hwndEdit, "\n"); ok(pIC && pIC->hWnd == hwndEdit, "\n");
ok(!pIC->fOpen, "\n"); ok(pIC && !pIC->fOpen, "\n");
ImmUnlockIMC(hNewIMC); ImmUnlockIMC(hNewIMC);
SetFocus(NULL); SetFocus(NULL);
pIC = ImmLockIMC(hIMC); pIC = ImmLockIMC(hIMC);
ok(pIC != NULL, "\n"); ok(pIC != NULL, "\n");
ok(pIC->hWnd == hwndEdit, "\n"); ok(pIC && pIC->hWnd == hwndEdit, "\n");
ImmUnlockIMC(hNewIMC); ImmUnlockIMC(hNewIMC);
ok(ImmSetOpenStatus(hIMC, TRUE), "\n"); ok(ImmSetOpenStatus(hIMC, TRUE), "\n");
pIC = ImmLockIMC(hIMC); pIC = ImmLockIMC(hIMC);
ok(pIC != NULL, "\n"); ok(pIC != NULL, "\n");
ok(pIC->fOpen, "\n"); ok(pIC && pIC->fOpen, "\n");
ImmUnlockIMC(hNewIMC); ImmUnlockIMC(hNewIMC);
ok(ImmReleaseContext(hwndEdit, hIMC), "\n"); ok(ImmReleaseContext(hwndEdit, hIMC), "\n");
@ -73,12 +73,12 @@ START_TEST(himc)
ok(hIMC != NULL, "\n"); ok(hIMC != NULL, "\n");
pIC = ImmLockIMC(hIMC); pIC = ImmLockIMC(hIMC);
ok(pIC != NULL, "\n"); ok(pIC != NULL, "\n");
ok(pIC->hWnd == hwndEdit, "\n"); ok(pIC && pIC->hWnd == hwndEdit, "\n");
ok(ImmGetIMCCSize(pIC->hCompStr) != 0, "\n"); ok(pIC && ImmGetIMCCSize(pIC->hCompStr) != 0, "\n");
ok(ImmGetIMCCSize(pIC->hCandInfo) != 0, "\n"); ok(pIC && ImmGetIMCCSize(pIC->hCandInfo) != 0, "\n");
ok(ImmGetIMCCSize(pIC->hGuideLine) != 0, "\n"); ok(pIC && ImmGetIMCCSize(pIC->hGuideLine) != 0, "\n");
ok(ImmGetIMCCSize(pIC->hPrivate) != 0, "\n"); ok(pIC && ImmGetIMCCSize(pIC->hPrivate) != 0, "\n");
ok(ImmGetIMCCSize(pIC->hMsgBuf) != 0, "\n"); ok(pIC && ImmGetIMCCSize(pIC->hMsgBuf) != 0, "\n");
ImmUnlockIMC(hNewIMC); ImmUnlockIMC(hNewIMC);
ok(ImmReleaseContext(hwndEdit, hIMC), "\n"); ok(ImmReleaseContext(hwndEdit, hIMC), "\n");
@ -97,12 +97,12 @@ START_TEST(himc)
ok(hIMC != hOldIMC, "\n"); ok(hIMC != hOldIMC, "\n");
pIC = ImmLockIMC(hNewIMC); pIC = ImmLockIMC(hNewIMC);
ok(pIC != NULL, "\n"); ok(pIC != NULL, "\n");
ok(pIC->hWnd == NULL, "\n"); ok(pIC && pIC->hWnd == NULL, "\n");
ok(ImmGetIMCCSize(pIC->hCompStr) != 0, "\n"); ok(pIC && ImmGetIMCCSize(pIC->hCompStr) != 0, "\n");
ok(ImmGetIMCCSize(pIC->hCandInfo) != 0, "\n"); ok(pIC && ImmGetIMCCSize(pIC->hCandInfo) != 0, "\n");
ok(ImmGetIMCCSize(pIC->hGuideLine) != 0, "\n"); ok(pIC && ImmGetIMCCSize(pIC->hGuideLine) != 0, "\n");
ok(ImmGetIMCCSize(pIC->hPrivate) != 0, "\n"); ok(pIC && ImmGetIMCCSize(pIC->hPrivate) != 0, "\n");
ok(ImmGetIMCCSize(pIC->hMsgBuf) != 0, "\n"); ok(pIC && ImmGetIMCCSize(pIC->hMsgBuf) != 0, "\n");
ImmUnlockIMC(hNewIMC); ImmUnlockIMC(hNewIMC);
ok(ImmReleaseContext(hwndEdit, hIMC), "\n"); ok(ImmReleaseContext(hwndEdit, hIMC), "\n");
ok(ImmDestroyContext(hNewIMC), "\n"); ok(ImmDestroyContext(hNewIMC), "\n");