Set up ConnMgr proc ptrs *before* attempting to use them.

This commit is contained in:
ehouse 2009-12-27 23:53:41 +00:00
parent 56ece4ee5f
commit dfe1d849cd

View file

@ -1344,6 +1344,7 @@ static void
initConnMgr( CEAppGlobals* globals ) initConnMgr( CEAppGlobals* globals )
{ {
HINSTANCE hcellDll = LoadLibrary(TEXT("cellcore.dll")); HINSTANCE hcellDll = LoadLibrary(TEXT("cellcore.dll"));
XP_ASSERT( !!hcellDll );
if ( !!hcellDll ) { if ( !!hcellDll ) {
globals->hcellDll = hcellDll; globals->hcellDll = hcellDll;
@ -1515,6 +1516,9 @@ InitInstance(HINSTANCE hInstance, int nCmdShow
result = TRUE; result = TRUE;
#endif #endif
#if defined _WIN32_WCE && ! defined CEGCC_DOES_CONNMGR
initConnMgr( globals );
#endif
/* must load prefs before creating draw ctxt */ /* must load prefs before creating draw ctxt */
globals->draw = ce_drawctxt_make( MPPARM(globals->mpool) globals->draw = ce_drawctxt_make( MPPARM(globals->mpool)
@ -1538,10 +1542,6 @@ InitInstance(HINSTANCE hInstance, int nCmdShow
trapBackspaceKey( hWnd ); trapBackspaceKey( hWnd );
#if defined _WIN32_WCE && ! defined CEGCC_DOES_CONNMGR
initConnMgr( globals );
#endif
ShowWindow(hWnd, nCmdShow); ShowWindow(hWnd, nCmdShow);
UpdateWindow(hWnd); UpdateWindow(hWnd);
#ifdef _WIN32_WCE #ifdef _WIN32_WCE