fix MysterX for MSVC 7.1
svn: r3269
This commit is contained in:
parent
9709a1bbb4
commit
fa5d2b779e
|
@ -126,6 +126,7 @@ Scheme_Object *mx_make_browser(int argc,Scheme_Object **argv) {
|
|||
|
||||
WaitForSingleObject(browserHwndMutex,INFINITE);
|
||||
|
||||
pBrowserStream = NULL;
|
||||
browserWindowInit.ppIStream = &pBrowserStream;
|
||||
|
||||
browser = (MX_Browser_Object *)scheme_malloc(sizeof(MX_Browser_Object));
|
||||
|
@ -145,6 +146,9 @@ Scheme_Object *mx_make_browser(int argc,Scheme_Object **argv) {
|
|||
browser->destroy = FALSE;
|
||||
browser->hwnd = browserHwnd;
|
||||
|
||||
if (!pBrowserStream)
|
||||
scheme_signal_error ("make-browser: Can't create browser window");
|
||||
|
||||
hr = CoGetInterfaceAndReleaseStream(pBrowserStream,IID_IUnknown,(void **)&pIUnknown);
|
||||
|
||||
ReleaseSemaphore(browserHwndMutex,1,NULL);
|
||||
|
@ -241,6 +245,7 @@ Scheme_Object *mx_make_browser(int argc,Scheme_Object **argv) {
|
|||
|
||||
browser->pIWebBrowser2 = pIWebBrowser2;
|
||||
browser->pISink = pISink;
|
||||
|
||||
browser->pIEventQueue = pIEventQueue;
|
||||
|
||||
scheme_add_managed((Scheme_Custodian *)scheme_get_param(scheme_current_config(),MZCONFIG_CUSTODIAN),
|
||||
|
|
|
@ -4951,15 +4951,17 @@ void browserHwndMsgLoop (LPVOID p)
|
|||
? 1L
|
||||
: 0L;
|
||||
|
||||
hwnd = CreateWindow ("AtlAxWin7", "myspage.DHTMLPage.1",
|
||||
hwnd = CreateWindow ("AtlAxWin71", "myspage.DHTMLPage.1",
|
||||
WS_VISIBLE | hasScrollBars |
|
||||
(pBrowserWindowInit->browserWindow.style & ~ (WS_HSCROLL|WS_VSCROLL)),
|
||||
pBrowserWindowInit->browserWindow.x, pBrowserWindowInit->browserWindow.y,
|
||||
pBrowserWindowInit->browserWindow.width, pBrowserWindowInit->browserWindow.height,
|
||||
NULL, NULL, hInstance, NULL);
|
||||
|
||||
if (hwnd == NULL)
|
||||
scheme_signal_error ("make-browser: Can't create browser window");
|
||||
if (hwnd == NULL) {
|
||||
ReleaseSemaphore (createHwndSem, 1, NULL);
|
||||
return;
|
||||
}
|
||||
|
||||
ShowWindow (hwnd, SW_SHOW);
|
||||
SetForegroundWindow (hwnd);
|
||||
|
|
Loading…
Reference in New Issue
Block a user