Kaydet (Commit) 44e52d66 authored tarafından Tor Lillqvist's avatar Tor Lillqvist

fdo#45081: We never registered the SAL_OBJECT_CHILDCLASSNAMEA window class

A crucial line of code that called RegisterClassExA() for that window
class had been deleted by accident in commit
cda4a293 "Code cleanup" in May 2011,
whoa. So apparently that window class is not needed for much except
embedded video in Impress?

Change-Id: I I19e70cefcf47aaf8a12a62539e0dacc5adb3c3b1
üst aeb1451d
...@@ -559,7 +559,8 @@ SalObject* ImplSalCreateObject( WinSalInstance* pInst, WinSalFrame* pParent ) ...@@ -559,7 +559,8 @@ SalObject* ImplSalCreateObject( WinSalInstance* pInst, WinSalFrame* pParent )
aWndClassEx.hbrBackground = (HBRUSH)(COLOR_WINDOW+1); aWndClassEx.hbrBackground = (HBRUSH)(COLOR_WINDOW+1);
aWndClassEx.lpfnWndProc = SalSysObjChildWndProcA; aWndClassEx.lpfnWndProc = SalSysObjChildWndProcA;
aWndClassEx.lpszClassName = SAL_OBJECT_CHILDCLASSNAMEA; aWndClassEx.lpszClassName = SAL_OBJECT_CHILDCLASSNAMEA;
pSalData->mbObjClassInit = TRUE; if ( RegisterClassExA( &aWndClassEx ) )
pSalData->mbObjClassInit = TRUE;
} }
} }
...@@ -593,6 +594,15 @@ SalObject* ImplSalCreateObject( WinSalInstance* pInst, WinSalFrame* pParent ) ...@@ -593,6 +594,15 @@ SalObject* ImplSalCreateObject( WinSalInstance* pInst, WinSalFrame* pParent )
if ( !hWndChild ) if ( !hWndChild )
{ {
#if OSL_DEBUG_LEVEL > 1
char *msg = NULL;
FormatMessageA(FORMAT_MESSAGE_ALLOCATE_BUFFER
|FORMAT_MESSAGE_IGNORE_INSERTS
|FORMAT_MESSAGE_FROM_SYSTEM,
NULL, GetLastError(), 0,
(LPSTR) &msg, 0, NULL);
MessageBoxA(NULL, msg, "CreateWindowExA failed", MB_OK);
#endif
delete pObject; delete pObject;
return NULL; return NULL;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment