suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix MysterX for MSVC 7.1

Browse Source 
svn: r3269
This commit is contained in:
Matthew Flatt 2006-06-07 18:49:50 +00:00
parent 9709a1bbb4
commit fa5d2b779e
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/mysterx/browser.cxx
View File

@ -126,6 +126,7 @@ Scheme_Object *mx_make_browser(int argc,Scheme_Object **argv) {
WaitForSingleObject(browserHwndMutex,INFINITE); WaitForSingleObject(browserHwndMutex,INFINITE);
pBrowserStream = NULL;
browserWindowInit.ppIStream = &pBrowserStream; browserWindowInit.ppIStream = &pBrowserStream;
browser = (MX_Browser_Object *)scheme_malloc(sizeof(MX_Browser_Object)); 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->destroy = FALSE;
browser->hwnd = browserHwnd; browser->hwnd = browserHwnd;
if (!pBrowserStream)
scheme_signal_error ("make-browser: Can't create browser window");
hr = CoGetInterfaceAndReleaseStream(pBrowserStream,IID_IUnknown,(void **)&pIUnknown); hr = CoGetInterfaceAndReleaseStream(pBrowserStream,IID_IUnknown,(void **)&pIUnknown);
ReleaseSemaphore(browserHwndMutex,1,NULL); ReleaseSemaphore(browserHwndMutex,1,NULL);
@ -241,6 +245,7 @@ Scheme_Object *mx_make_browser(int argc,Scheme_Object **argv) {
browser->pIWebBrowser2 = pIWebBrowser2; browser->pIWebBrowser2 = pIWebBrowser2;
browser->pISink = pISink; browser->pISink = pISink;
browser->pIEventQueue = pIEventQueue; browser->pIEventQueue = pIEventQueue;
scheme_add_managed((Scheme_Custodian *)scheme_get_param(scheme_current_config(),MZCONFIG_CUSTODIAN), scheme_add_managed((Scheme_Custodian *)scheme_get_param(scheme_current_config(),MZCONFIG_CUSTODIAN),

8
src/mysterx/mysterx.cxx
View File

@ -4951,15 +4951,17 @@ void browserHwndMsgLoop (LPVOID p)
? 1L ? 1L
: 0L; : 0L;
hwnd = CreateWindow ("AtlAxWin7", "myspage.DHTMLPage.1", hwnd = CreateWindow ("AtlAxWin71", "myspage.DHTMLPage.1",
WS_VISIBLE | hasScrollBars | WS_VISIBLE | hasScrollBars |
(pBrowserWindowInit->browserWindow.style & ~ (WS_HSCROLL|WS_VSCROLL)), (pBrowserWindowInit->browserWindow.style & ~ (WS_HSCROLL|WS_VSCROLL)),
pBrowserWindowInit->browserWindow.x, pBrowserWindowInit->browserWindow.y, pBrowserWindowInit->browserWindow.x, pBrowserWindowInit->browserWindow.y,
pBrowserWindowInit->browserWindow.width, pBrowserWindowInit->browserWindow.height, pBrowserWindowInit->browserWindow.width, pBrowserWindowInit->browserWindow.height,
NULL, NULL, hInstance, NULL); NULL, NULL, hInstance, NULL);
if (hwnd == NULL) if (hwnd == NULL) {
scheme_signal_error ("make-browser: Can't create browser window"); ReleaseSemaphore (createHwndSem, 1, NULL);
return;
}
ShowWindow (hwnd, SW_SHOW); ShowWindow (hwnd, SW_SHOW);
SetForegroundWindow (hwnd); SetForegroundWindow (hwnd);