Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-25 08:00:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

sync atl with wine 1.1.11

Browse source 
svn path=/trunk/; revision=38385
This commit is contained in:
Christoph von Wittich 2008-12-27 13:06:42 +00:00
parent da81dbeb59
commit c5aa8b9f1f
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
reactos/dll/win32/atl/atl_ax.c
View file

@ -117,7 +117,7 @@ BOOL WINAPI AtlAxWinInit(void)
*/
static ULONG WINAPI IOCS_AddRef(IOCS *This)
static ULONG IOCS_AddRef(IOCS *This)
{
ULONG ref = InterlockedIncrement(&This->ref);
@ -132,7 +132,7 @@ static ULONG WINAPI IOCS_AddRef(IOCS *This)
#define THIS2IOLEINPLACEFRAME(This) ((IOleInPlaceFrame*)&This->lpOleInPlaceFrameVtbl)
#define THIS2IOLECONTROLSITE(This) ((IOleControlSite*)&This->lpOleControlSiteVtbl)
static HRESULT WINAPI IOCS_QueryInterface(IOCS *This, REFIID riid, void **ppv)
static HRESULT IOCS_QueryInterface(IOCS *This, REFIID riid, void **ppv)
{
*ppv = NULL;
@ -166,7 +166,7 @@ static HRESULT WINAPI IOCS_QueryInterface(IOCS *This, REFIID riid, void **ppv)
}
static HRESULT IOCS_Detach( IOCS *This );
static ULONG WINAPI IOCS_Release(IOCS *This)
static ULONG IOCS_Release(IOCS *This)
{
ULONG ref = InterlockedDecrement(&This->ref);
@ -752,7 +752,7 @@ static HRESULT IOCS_Detach( IOCS *This ) /* remove subclassing */
if ( This->hWnd )
{
SetWindowLongPtrW( This->hWnd, GWLP_WNDPROC, (ULONG_PTR) This->OrigWndProc );
SetWindowLongPtrW( This->hWnd, GWLP_USERDATA, (LONG_PTR) NULL );
SetWindowLongPtrW( This->hWnd, GWLP_USERDATA, 0 );
This->hWnd = NULL;
}
if ( This->control )
@ -1244,7 +1244,7 @@ HWND WINAPI AtlAxCreateDialogW(HINSTANCE hInst, LPCWSTR name, HWND owner, DLGPRO
hgl = LoadResource (hInst, hrsrc);
if ( !hgl )
return NULL;
ptr = (LPCDLGTEMPLATEW)LockResource ( hgl );
ptr = LockResource ( hgl );
if (!ptr)
{
FreeResource( hgl );

4
reactos/dll/win32/atl/registrar.c
View file

@ -242,7 +242,7 @@ static HRESULT do_process_key(LPCOLESTR *pstr, HKEY parent_key, strbuf *buf, BOO
strbuf_write(buf->str, &name, -1);
}else if(key_type == DO_DELETE) {
TRACE("Deleting %s\n", debugstr_w(buf->str));
lres = RegDeleteTreeW(parent_key, buf->str);
RegDeleteTreeW(parent_key, buf->str);
}else {
if(key_type == FORCE_REMOVE)
RegDeleteTreeW(parent_key, buf->str);
@ -439,7 +439,7 @@ static HRESULT resource_register(Registrar *This, LPCOLESTR resFileName,
if(hins) {
src = FindResourceW(hins, szID, szType);
if(src) {
regstra = (LPSTR)LoadResource(hins, src);
regstra = LoadResource(hins, src);
reslen = SizeofResource(hins, src);
if(regstra) {
len = MultiByteToWideChar(CP_ACP, 0, regstra, reslen, NULL, 0)+1;