Replaced calls to KERNEL.Yield16 by calls to KERNEL32.K32WOWYield from
outside libkernel.so.
This commit is contained in:
parent
e441d3c4e1
commit
4d24e0f5a6
|
@ -22,7 +22,6 @@
|
||||||
|
|
||||||
#include "winbase.h"
|
#include "winbase.h"
|
||||||
#include "wingdi.h"
|
#include "wingdi.h"
|
||||||
#include "wine/winbase16.h"
|
|
||||||
#include "wine/winuser16.h"
|
#include "wine/winuser16.h"
|
||||||
#include "heap.h"
|
#include "heap.h"
|
||||||
#include "winemm.h"
|
#include "winemm.h"
|
||||||
|
@ -4967,7 +4966,7 @@ void WINAPI mmTaskYield16(void)
|
||||||
MSG msg;
|
MSG msg;
|
||||||
|
|
||||||
if (PeekMessageA(&msg, 0, 0, 0, 0)) {
|
if (PeekMessageA(&msg, 0, 0, 0, 0)) {
|
||||||
Yield16();
|
K32WOWYield16();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -5248,12 +5247,12 @@ void WINAPI WINE_mmThreadEntryPoint(DWORD _pmt)
|
||||||
TRACE("[30-%08x]\n", lpMMThd->hThread);
|
TRACE("[30-%08x]\n", lpMMThd->hThread);
|
||||||
while (lpMMThd->dwCounter) {
|
while (lpMMThd->dwCounter) {
|
||||||
Sleep(1);
|
Sleep(1);
|
||||||
/* Yield16();*/
|
/* K32WOWYield16();*/
|
||||||
}
|
}
|
||||||
TRACE("[XX-%08x]\n", lpMMThd->hThread);
|
TRACE("[XX-%08x]\n", lpMMThd->hThread);
|
||||||
/* paranoia */
|
/* paranoia */
|
||||||
lpMMThd->dwSignature = WINE_MMTHREAD_DELETED;
|
lpMMThd->dwSignature = WINE_MMTHREAD_DELETED;
|
||||||
/* close lpMMThread->hVxD directio */
|
/* close lpMMThread->hVxD directIO */
|
||||||
if (lpMMThd->hEvent)
|
if (lpMMThd->hEvent)
|
||||||
CloseHandle(lpMMThd->hEvent);
|
CloseHandle(lpMMThd->hEvent);
|
||||||
GlobalFree16(hndl);
|
GlobalFree16(hndl);
|
||||||
|
|
|
@ -325,7 +325,9 @@ DWORD WINAPI SizeofResource16(HMODULE16,HRSRC16);
|
||||||
void WINAPI UnlockSegment16(HGLOBAL16);
|
void WINAPI UnlockSegment16(HGLOBAL16);
|
||||||
BOOL16 WINAPI WritePrivateProfileString16(LPCSTR,LPCSTR,LPCSTR,LPCSTR);
|
BOOL16 WINAPI WritePrivateProfileString16(LPCSTR,LPCSTR,LPCSTR,LPCSTR);
|
||||||
BOOL16 WINAPI WriteProfileString16(LPCSTR,LPCSTR,LPCSTR);
|
BOOL16 WINAPI WriteProfileString16(LPCSTR,LPCSTR,LPCSTR);
|
||||||
|
/* Yield16 will only be available from kernel module, use K32WOWYield instead */
|
||||||
VOID WINAPI Yield16(void);
|
VOID WINAPI Yield16(void);
|
||||||
|
VOID WINAPI K32WOWYield16(void);
|
||||||
SEGPTR WINAPI lstrcat16(SEGPTR,LPCSTR);
|
SEGPTR WINAPI lstrcat16(SEGPTR,LPCSTR);
|
||||||
SEGPTR WINAPI lstrcatn16(SEGPTR,LPCSTR,INT16);
|
SEGPTR WINAPI lstrcatn16(SEGPTR,LPCSTR,INT16);
|
||||||
SEGPTR WINAPI lstrcpy16(SEGPTR,LPCSTR);
|
SEGPTR WINAPI lstrcpy16(SEGPTR,LPCSTR);
|
||||||
|
|
|
@ -2020,7 +2020,7 @@ DWORD WINAPI MsgWaitForMultipleObjects( DWORD nCount, HANDLE *pHandles,
|
||||||
/*
|
/*
|
||||||
* Then, let the 16 bit scheduler do it's thing.
|
* Then, let the 16 bit scheduler do it's thing.
|
||||||
*/
|
*/
|
||||||
Yield16();
|
K32WOWYield16();
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* If a message matching the wait mask has arrived, return.
|
* If a message matching the wait mask has arrived, return.
|
||||||
|
|
|
@ -745,7 +745,7 @@ int QUEUE_WaitBits( WORD bits, DWORD timeout )
|
||||||
QUEUE_Unlock( queue );
|
QUEUE_Unlock( queue );
|
||||||
return 0; /* exit with timeout */
|
return 0; /* exit with timeout */
|
||||||
}
|
}
|
||||||
Yield16();
|
K32WOWYield16();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -44,7 +44,7 @@ BOOL16 WINAPI WinHelp16( HWND16 hWnd, LPCSTR lpHelpFile, UINT16 wCommand,
|
||||||
/* try to start the 16-bit winhelp */
|
/* try to start the 16-bit winhelp */
|
||||||
if (WinExec( "winhelp.exe -x", SW_SHOWNORMAL ) >= 32)
|
if (WinExec( "winhelp.exe -x", SW_SHOWNORMAL ) >= 32)
|
||||||
{
|
{
|
||||||
Yield16();
|
K32WOWYield16();
|
||||||
ret = WinHelpA( hWnd, lpHelpFile, wCommand, (DWORD)MapSL(dwData) );
|
ret = WinHelpA( hWnd, lpHelpFile, wCommand, (DWORD)MapSL(dwData) );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue