Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
bb52d301
Commit
bb52d301
authored
Apr 08, 2008
by
Aric Stewart
Committed by
Alexandre Julliard
Apr 09, 2008
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
imm32: ImmDestroyContext cannot destroy the default context.
parent
5c8473ba
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
16 additions
and
6 deletions
+16
-6
imm.c
dlls/imm32/imm.c
+16
-6
No files found.
dlls/imm32/imm.c
View file @
bb52d301
...
@@ -109,6 +109,8 @@ static const WCHAR szwWineIMCProperty[] = {'W','i','n','e','I','m','m','H','I','
...
@@ -109,6 +109,8 @@ static const WCHAR szwWineIMCProperty[] = {'W','i','n','e','I','m','m','H','I','
#define is_himc_ime_unicode(p) (p->immKbd->imeInfo.fdwProperty & IME_PROP_UNICODE)
#define is_himc_ime_unicode(p) (p->immKbd->imeInfo.fdwProperty & IME_PROP_UNICODE)
#define is_kbd_ime_unicode(p) (p->imeInfo.fdwProperty & IME_PROP_UNICODE)
#define is_kbd_ime_unicode(p) (p->imeInfo.fdwProperty & IME_PROP_UNICODE)
static
BOOL
IMM_DestroyContext
(
HIMC
hIMC
);
static
inline
WCHAR
*
strdupAtoW
(
const
char
*
str
)
static
inline
WCHAR
*
strdupAtoW
(
const
char
*
str
)
{
{
WCHAR
*
ret
=
NULL
;
WCHAR
*
ret
=
NULL
;
...
@@ -150,7 +152,7 @@ static void IMM_InitThreadData(void)
...
@@ -150,7 +152,7 @@ static void IMM_InitThreadData(void)
static
void
IMM_FreeThreadData
(
void
)
static
void
IMM_FreeThreadData
(
void
)
{
{
IMMThreadData
*
data
=
TlsGetValue
(
tlsIndex
);
IMMThreadData
*
data
=
TlsGetValue
(
tlsIndex
);
I
mm
DestroyContext
(
data
->
defaultContext
);
I
MM_
DestroyContext
(
data
->
defaultContext
);
DestroyWindow
(
data
->
hwndDefault
);
DestroyWindow
(
data
->
hwndDefault
);
HeapFree
(
GetProcessHeap
(),
0
,
data
);
HeapFree
(
GetProcessHeap
(),
0
,
data
);
TRACE
(
"Thread Data Destroyed
\n
"
);
TRACE
(
"Thread Data Destroyed
\n
"
);
...
@@ -510,7 +512,7 @@ HIMC WINAPI ImmCreateContext(void)
...
@@ -510,7 +512,7 @@ HIMC WINAPI ImmCreateContext(void)
if
(
!
new_context
->
immKbd
->
pImeSelect
(
new_context
,
TRUE
))
if
(
!
new_context
->
immKbd
->
pImeSelect
(
new_context
,
TRUE
))
{
{
TRACE
(
"Selection of IME failed
\n
"
);
TRACE
(
"Selection of IME failed
\n
"
);
I
mm
DestroyContext
(
new_context
);
I
MM_
DestroyContext
(
new_context
);
return
0
;
return
0
;
}
}
...
@@ -520,10 +522,7 @@ HIMC WINAPI ImmCreateContext(void)
...
@@ -520,10 +522,7 @@ HIMC WINAPI ImmCreateContext(void)
return
(
HIMC
)
new_context
;
return
(
HIMC
)
new_context
;
}
}
/***********************************************************************
static
BOOL
IMM_DestroyContext
(
HIMC
hIMC
)
* ImmDestroyContext (IMM32.@)
*/
BOOL
WINAPI
ImmDestroyContext
(
HIMC
hIMC
)
{
{
InputContextData
*
data
=
(
InputContextData
*
)
hIMC
;
InputContextData
*
data
=
(
InputContextData
*
)
hIMC
;
...
@@ -550,6 +549,17 @@ BOOL WINAPI ImmDestroyContext(HIMC hIMC)
...
@@ -550,6 +549,17 @@ BOOL WINAPI ImmDestroyContext(HIMC hIMC)
}
}
/***********************************************************************
/***********************************************************************
* ImmDestroyContext (IMM32.@)
*/
BOOL
WINAPI
ImmDestroyContext
(
HIMC
hIMC
)
{
if
(
hIMC
!=
IMM_GetThreadData
()
->
defaultContext
)
return
IMM_DestroyContext
(
hIMC
);
else
return
FALSE
;
}
/***********************************************************************
* ImmDisableIME (IMM32.@)
* ImmDisableIME (IMM32.@)
*/
*/
BOOL
WINAPI
ImmDisableIME
(
DWORD
idThread
)
BOOL
WINAPI
ImmDisableIME
(
DWORD
idThread
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment