From c5aa8b9f1f8bdcd6995140e5b9b14f44eca22ef6 Mon Sep 17 00:00:00 2001
From: Christoph von Wittich <christoph_vw@reactos.org>
Date: Sat, 27 Dec 2008 13:06:42 +0000
Subject: [PATCH] sync atl with wine 1.1.11

svn path=/trunk/; revision=38385
---
 reactos/dll/win32/atl/atl_ax.c    | 10 +++++-----
 reactos/dll/win32/atl/registrar.c |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/reactos/dll/win32/atl/atl_ax.c b/reactos/dll/win32/atl/atl_ax.c
index 1d8a67ca90c..c98cba7e1f9 100644
--- a/reactos/dll/win32/atl/atl_ax.c
+++ b/reactos/dll/win32/atl/atl_ax.c
@@ -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 );
diff --git a/reactos/dll/win32/atl/registrar.c b/reactos/dll/win32/atl/registrar.c
index 2b921c5094d..d3ca9b0709f 100644
--- a/reactos/dll/win32/atl/registrar.c
+++ b/reactos/dll/win32/atl/registrar.c
@@ -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;