ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

user32: Remove remaining calls to internal 32-bit functions from msg16.c.

This commit is contained in:
Alexandre Julliard 2009-12-23 19:45:41 +01:00
parent b63d0e19ed
commit cf81d0f0f9
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dlls/user32/msg16.c
View File

@ -258,8 +258,6 @@ static LRESULT call_window_proc16( HWND16 hwnd, UINT16 msg, WPARAM16 wParam, LPA
} u; } u;
} args; } args;
USER_CheckNotLock();
if (index >= MAX_WINPROCS32) func = winproc16_array[index - MAX_WINPROCS32]; if (index >= MAX_WINPROCS32) func = winproc16_array[index - MAX_WINPROCS32];
/* Window procedures want ax = hInstance, ds = es = ss */ /* Window procedures want ax = hInstance, ds = es = ss */
@ -1489,7 +1487,8 @@ LRESULT WINAPI SendMessage16( HWND16 hwnd16, UINT16 msg, WPARAM16 wparam, LPARAM
LRESULT result; LRESULT result;
HWND hwnd = WIN_Handle32( hwnd16 ); HWND hwnd = WIN_Handle32( hwnd16 );
if (hwnd != HWND_BROADCAST && WIN_IsCurrentThread(hwnd)) if (hwnd != HWND_BROADCAST &&
GetWindowThreadProcessId( hwnd, NULL ) == GetCurrentThreadId())
{ {
/* call 16-bit window proc directly */ /* call 16-bit window proc directly */
WNDPROC16 winproc; WNDPROC16 winproc;
@ -2495,12 +2494,8 @@ static LRESULT mdiclient_proc16( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPar
if (msg == WM_CREATE) if (msg == WM_CREATE)
{ {
LPCREATESTRUCTA cs = (LPCREATESTRUCTA)lParam; LPCREATESTRUCTA cs = (LPCREATESTRUCTA)lParam;
WND *win; HINSTANCE instance = (HINSTANCE)GetWindowLongPtrW( hwnd, GWLP_HINSTANCE );
BOOL is_win32; BOOL is_win32 = !instance || ((ULONG_PTR)instance >> 16);
if (!(win = WIN_GetPtr( hwnd ))) return 0;
is_win32 = (win == WND_OTHER_PROCESS || win == WND_DESKTOP || (win->flags & WIN_ISWIN32));
WIN_ReleasePtr( win );
/* Translation layer doesn't know what's in the cs->lpCreateParams /* Translation layer doesn't know what's in the cs->lpCreateParams
* so we have to keep track of what environment we're in. */ * so we have to keep track of what environment we're in. */