[ros-diffs] [dchapyshev] 39763: - Sync wldap32, uxtheme, sxs with Wine head

Author: dchapyshev
Date: Thu Feb 26 13:27:27 2009
New Revision: 39763

URL: http://svn.reactos.org/svn/reactos?rev=39763&view=rev
Log:
- Sync wldap32, uxtheme, sxs with Wine head

Modified:
    trunk/reactos/dll/win32/sxs/sxs.c
    trunk/reactos/dll/win32/uxtheme/msstyles.c
    trunk/reactos/dll/win32/uxtheme/msstyles.h
    trunk/reactos/dll/win32/uxtheme/system.c
    trunk/reactos/dll/win32/uxtheme/uxini.c
    trunk/reactos/dll/win32/wldap32/option.c
    trunk/reactos/dll/win32/wldap32/parse.c
    trunk/reactos/dll/win32/wldap32/winldap_private.h

Modified: trunk/reactos/dll/win32/sxs/sxs.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sxs/sxs.c?rev=39…
==============================================================================
--- trunk/reactos/dll/win32/sxs/sxs.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/sxs/sxs.c [iso-8859-1] Thu Feb 26 13:27:27 2009
@@ -22,9 +22,6 @@
 
 #include "windef.h"
 #include "winbase.h"
-#include "wine/debug.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(sxs);
 
 
 /***********************************************************************

Modified: trunk/reactos/dll/win32/uxtheme/msstyles.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/msstyles…
==============================================================================
--- trunk/reactos/dll/win32/uxtheme/msstyles.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/uxtheme/msstyles.c [iso-8859-1] Thu Feb 26 13:27:27 2009
@@ -733,9 +733,9 @@
     memset (state, 0, sizeof (*state));
     state->metrics.cbSize = sizeof (NONCLIENTMETRICSW);
     SystemParametersInfoW (SPI_GETNONCLIENTMETRICS, sizeof (NONCLIENTMETRICSW),
-        (PVOID)&state->metrics, 0);
+        &state->metrics, 0);
     SystemParametersInfoW (SPI_GETICONTITLELOGFONT, sizeof (LOGFONTW),
-        (PVOID)&state->iconTitleFont, 0);
+        &state->iconTitleFont, 0);
 }
 
 static BOOL parse_handle_nonclient_font (struct PARSENONCLIENTSTATE* state, 
@@ -838,9 +838,9 @@
     if (state->metricsDirty)
     {
         SystemParametersInfoW (SPI_SETNONCLIENTMETRICS, sizeof (state->metrics),
-            (PVOID)&state->metrics, 0);
+            &state->metrics, 0);
         SystemParametersInfoW (SPI_SETICONTITLELOGFONT, sizeof
(state->iconTitleFont),
-            (PVOID)&state->iconTitleFont, 0);
+            &state->iconTitleFont, 0);
     }
 }
 
@@ -1086,7 +1086,7 @@
         return TRUE;
 
     *hasAlpha = TRUE;
-    p = (BYTE*)dib.dsBm.bmBits;
+    p = dib.dsBm.bmBits;
     n = abs(dib.dsBmih.biHeight) * dib.dsBmih.biWidth;
     /* AlphaBlend() wants premultiplied alpha, so do that now */
     while (n-- > 0)

Modified: trunk/reactos/dll/win32/uxtheme/msstyles.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/msstyles…
==============================================================================
--- trunk/reactos/dll/win32/uxtheme/msstyles.h [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/uxtheme/msstyles.h [iso-8859-1] Thu Feb 26 13:27:27 2009
@@ -110,7 +110,6 @@
 
 PUXINI_FILE UXINI_LoadINI(HMODULE hTheme, LPCWSTR lpName);
 void UXINI_CloseINI(PUXINI_FILE uf);
-void UXINI_ResetINI(PUXINI_FILE uf);
 LPCWSTR UXINI_GetNextSection(PUXINI_FILE uf, DWORD *dwLen);
 BOOL UXINI_FindSection(PUXINI_FILE uf, LPCWSTR lpName);
 LPCWSTR UXINI_GetNextValue(PUXINI_FILE uf, DWORD *dwNameLen, LPCWSTR *lpValue, DWORD
*dwValueLen);

Modified: trunk/reactos/dll/win32/uxtheme/system.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/system.c…
==============================================================================
--- trunk/reactos/dll/win32/uxtheme/system.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/uxtheme/system.c [iso-8859-1] Thu Feb 26 13:27:27 2009
@@ -126,7 +126,7 @@
       RegQueryValueExW (hKey, lpszValue, 0, NULL, (LPBYTE)szData, &nBytesToAlloc);
       dwExpDataLen = ExpandEnvironmentStringsW(szData, &cNull, 1);
       dwUnExpDataLen = max(nBytesToAlloc, dwExpDataLen);
-      LocalFree((HLOCAL) szData);
+      LocalFree(szData);
     }
     else
     {
@@ -136,7 +136,7 @@
       dwExpDataLen = ExpandEnvironmentStringsW(szData, pvData, MAX_PATH );
       if (dwExpDataLen > MAX_PATH) dwRet = ERROR_MORE_DATA;
       dwUnExpDataLen = max(nBytesToAlloc, dwExpDataLen);
-      LocalFree((HLOCAL) szData);
+      LocalFree(szData);
     }
   }
 
@@ -411,7 +411,7 @@
 		&type, (LPBYTE)&ncm, &count) == ERROR_SUCCESS)
 	    {
 		SystemParametersInfoW (SPI_SETNONCLIENTMETRICS, 
-		    count, (LPVOID)&ncm, SPIF_UPDATEINIFILE);
+                    count, &ncm, SPIF_UPDATEINIFILE);
 	    }
 	    
             count = sizeof(iconTitleFont);
@@ -420,7 +420,7 @@
 		&type, (LPBYTE)&iconTitleFont, &count) == ERROR_SUCCESS)
 	    {
 		SystemParametersInfoW (SPI_SETICONTITLELOGFONT, 
-		    count, (LPVOID)&iconTitleFont, SPIF_UPDATEINIFILE);
+                    count, &iconTitleFont, SPIF_UPDATEINIFILE);
 	    }
 	}
       
@@ -453,17 +453,15 @@
     
     memset (&ncm, 0, sizeof (ncm));
     ncm.cbSize = sizeof (ncm);
-    SystemParametersInfoW (SPI_GETNONCLIENTMETRICS, 
-	sizeof (ncm), (LPVOID)&ncm, 0);
-    SystemParametersInfoW (SPI_SETNONCLIENTMETRICS, 
-	sizeof (ncm), (LPVOID)&ncm, SPIF_UPDATEINIFILE);
+    SystemParametersInfoW (SPI_GETNONCLIENTMETRICS, sizeof (ncm), &ncm, 0);
+    SystemParametersInfoW (SPI_SETNONCLIENTMETRICS, sizeof (ncm), &ncm,
+        SPIF_UPDATEINIFILE);
 
     memset (&iconTitleFont, 0, sizeof (iconTitleFont));
-    SystemParametersInfoW (SPI_GETICONTITLELOGFONT, 
-	sizeof (iconTitleFont), (LPVOID)&iconTitleFont, 0);
-    SystemParametersInfoW (SPI_SETICONTITLELOGFONT, 
-	sizeof (iconTitleFont), (LPVOID)&iconTitleFont, 
-	SPIF_UPDATEINIFILE | SPIF_SENDCHANGE);
+    SystemParametersInfoW (SPI_GETICONTITLELOGFONT, sizeof (iconTitleFont),
+        &iconTitleFont, 0);
+    SystemParametersInfoW (SPI_SETICONTITLELOGFONT, sizeof (iconTitleFont),
+        &iconTitleFont, SPIF_UPDATEINIFILE | SPIF_SENDCHANGE);
 }
 
 /***********************************************************************

Modified: trunk/reactos/dll/win32/uxtheme/uxini.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/uxini.c?…
==============================================================================
--- trunk/reactos/dll/win32/uxtheme/uxini.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/uxtheme/uxini.c [iso-8859-1] Thu Feb 26 13:27:27 2009
@@ -93,19 +93,6 @@
 void UXINI_CloseINI(PUXINI_FILE uf)
 {
     HeapFree(GetProcessHeap(), 0, uf);
-}
-
-/**********************************************************************
- *      UXINI_ResetINI
- *
- * Reset the current pointer into INI file to the beginning of the file
- *
- * PARAMS
- *     uf                  Theme INI file to reset
- */
-void UXINI_ResetINI(PUXINI_FILE uf)
-{
-    uf->lpCurLoc = uf->lpIni;
 }
 
 /**********************************************************************
@@ -212,7 +199,6 @@
  *
  * Locate a section with the specified name, search starts
  * at current location in ini file
- * to start search from start, call UXINI_ResetINI
  *
  * PARAMS
  *     uf                  INI file to search, search starts at current location

Modified: trunk/reactos/dll/win32/wldap32/option.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/option.c…
==============================================================================
--- trunk/reactos/dll/win32/wldap32/option.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/wldap32/option.c [iso-8859-1] Thu Feb 26 13:27:27 2009
@@ -327,7 +327,7 @@
     {
         LDAPControlW **ctrlsW;
 
-        ctrlsW = controlarrayAtoW( (LDAPControlA **)value );
+        ctrlsW = controlarrayAtoW( value );
         if (!ctrlsW) return WLDAP32_LDAP_NO_MEMORY;
 
         ret = ldap_set_optionW( ld, option, ctrlsW );
@@ -430,7 +430,7 @@
     {
         LDAPControl **ctrlsU;
 
-        ctrlsU = controlarrayWtoU( (LDAPControlW **)value );
+        ctrlsU = controlarrayWtoU( value );
         if (!ctrlsU) return WLDAP32_LDAP_NO_MEMORY;
 
         ret = map_error( ldap_set_option( ld, option, ctrlsU ));

Modified: trunk/reactos/dll/win32/wldap32/parse.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/parse.c?…
==============================================================================
--- trunk/reactos/dll/win32/wldap32/parse.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/wldap32/parse.c [iso-8859-1] Thu Feb 26 13:27:27 2009
@@ -444,7 +444,7 @@
 
 #ifdef HAVE_LDAP_PARSE_VLV_CONTROL
     if (!(ret = ldap_parse_vlv_control( ld, controlU, &pos, &count,
-                                        (struct berval **)context, errcode )))
+                                        context, errcode )))
     {
         *targetpos = pos;
         *listcount = count;

Modified: trunk/reactos/dll/win32/wldap32/winldap_private.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/winldap_…
==============================================================================
--- trunk/reactos/dll/win32/wldap32/winldap_private.h [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/wldap32/winldap_private.h [iso-8859-1] Thu Feb 26 13:27:27
2009
@@ -276,8 +276,8 @@
     int ldapaif_version;
 } LDAPAPIFeatureInfoW;
 
-WLDAP32_LDAP CDECL *cldap_openA(PCHAR,ULONG);
-WLDAP32_LDAP CDECL *cldap_openW(PWCHAR,ULONG);
+WLDAP32_LDAP * CDECL cldap_openA(PCHAR,ULONG);
+WLDAP32_LDAP * CDECL cldap_openW(PWCHAR,ULONG);
 ULONG CDECL WLDAP32_ldap_abandon(WLDAP32_LDAP*,ULONG);
 ULONG CDECL ldap_addA(WLDAP32_LDAP*,PCHAR,LDAPModA*[]);
 ULONG CDECL ldap_addW(WLDAP32_LDAP*,PWCHAR,LDAPModW*[]);
@@ -304,7 +304,7 @@
 ULONG CDECL ldap_compare_sA(WLDAP32_LDAP*,PCHAR,PCHAR,PCHAR);
 ULONG CDECL ldap_compare_sW(WLDAP32_LDAP*,PWCHAR,PWCHAR,PWCHAR);
 ULONG CDECL ldap_connect(WLDAP32_LDAP*,LDAP_TIMEVAL*);
-WLDAP32_LDAP CDECL *ldap_conn_from_msg(WLDAP32_LDAP*,WLDAP32_LDAPMessage*);
+WLDAP32_LDAP * CDECL ldap_conn_from_msg(WLDAP32_LDAP*,WLDAP32_LDAPMessage*);
 ULONG CDECL ldap_control_freeA(LDAPControlA*);
 ULONG CDECL ldap_control_freeW(LDAPControlW*);
 ULONG CDECL ldap_controls_freeA(LDAPControlA**);
@@ -336,8 +336,8 @@
 PWCHAR CDECL ldap_err2stringW(ULONG);
 ULONG CDECL ldap_escape_filter_elementA(PCHAR,ULONG,PCHAR,ULONG);
 ULONG CDECL ldap_escape_filter_elementW(PCHAR,ULONG,PWCHAR,ULONG);
-PCHAR CDECL *ldap_explode_dnA(PCHAR,ULONG);
-PWCHAR CDECL *ldap_explode_dnW(PWCHAR,ULONG);
+PCHAR * CDECL ldap_explode_dnA(PCHAR,ULONG);
+PWCHAR * CDECL ldap_explode_dnW(PWCHAR,ULONG);
 ULONG CDECL ldap_extended_operationA(WLDAP32_LDAP*,PCHAR,struct
WLDAP32_berval*,PLDAPControlA*,PLDAPControlA*,ULONG*);
 ULONG CDECL ldap_extended_operationW(WLDAP32_LDAP*,PWCHAR,struct
WLDAP32_berval*,PLDAPControlW*,PLDAPControlW*,ULONG*);
 ULONG CDECL ldap_extended_operation_sA(WLDAP32_LDAP*,PCHAR,struct
WLDAP32_berval*,PLDAPControlA*, PLDAPControlA*,
@@ -346,8 +346,8 @@
     PWCHAR*,struct WLDAP32_berval**);
 PCHAR CDECL
ldap_first_attributeA(WLDAP32_LDAP*,WLDAP32_LDAPMessage*,WLDAP32_BerElement**);
 PWCHAR CDECL
ldap_first_attributeW(WLDAP32_LDAP*,WLDAP32_LDAPMessage*,WLDAP32_BerElement**);
-WLDAP32_LDAPMessage CDECL *WLDAP32_ldap_first_entry(WLDAP32_LDAP*,WLDAP32_LDAPMessage*);
-WLDAP32_LDAPMessage CDECL
*WLDAP32_ldap_first_reference(WLDAP32_LDAP*,WLDAP32_LDAPMessage*);
+WLDAP32_LDAPMessage * CDECL
WLDAP32_ldap_first_entry(WLDAP32_LDAP*,WLDAP32_LDAPMessage*);
+WLDAP32_LDAPMessage * CDECL
WLDAP32_ldap_first_reference(WLDAP32_LDAP*,WLDAP32_LDAPMessage*);
 ULONG CDECL ldap_free_controlsA(LDAPControlA**);
 ULONG CDECL ldap_free_controlsW(LDAPControlW**);
 PCHAR CDECL ldap_get_dnA(WLDAP32_LDAP*,WLDAP32_LDAPMessage*);
@@ -357,12 +357,12 @@
 ULONG CDECL ldap_get_optionA(WLDAP32_LDAP*,int,void*);
 ULONG CDECL ldap_get_optionW(WLDAP32_LDAP*,int,void*);
 ULONG CDECL ldap_get_paged_count(WLDAP32_LDAP*,PLDAPSearch,ULONG*,WLDAP32_LDAPMessage*);
-PCHAR CDECL *ldap_get_valuesA(WLDAP32_LDAP*,WLDAP32_LDAPMessage*,PCHAR);
-PWCHAR CDECL *ldap_get_valuesW(WLDAP32_LDAP*,WLDAP32_LDAPMessage*,PWCHAR);
-PBERVAL CDECL *ldap_get_values_lenA(WLDAP32_LDAP*,WLDAP32_LDAPMessage*,PCHAR);
-PBERVAL CDECL *ldap_get_values_lenW(WLDAP32_LDAP*,WLDAP32_LDAPMessage*,PWCHAR);
-WLDAP32_LDAP CDECL *ldap_initA(const PCHAR,ULONG);
-WLDAP32_LDAP CDECL *ldap_initW(const PWCHAR,ULONG);
+PCHAR * CDECL ldap_get_valuesA(WLDAP32_LDAP*,WLDAP32_LDAPMessage*,PCHAR);
+PWCHAR * CDECL ldap_get_valuesW(WLDAP32_LDAP*,WLDAP32_LDAPMessage*,PWCHAR);
+PBERVAL * CDECL ldap_get_values_lenA(WLDAP32_LDAP*,WLDAP32_LDAPMessage*,PCHAR);
+PBERVAL * CDECL ldap_get_values_lenW(WLDAP32_LDAP*,WLDAP32_LDAPMessage*,PWCHAR);
+WLDAP32_LDAP * CDECL ldap_initA(const PCHAR,ULONG);
+WLDAP32_LDAP * CDECL ldap_initW(const PWCHAR,ULONG);
 void CDECL ldap_memfreeA(PCHAR);
 void CDECL ldap_memfreeW(PWCHAR);
 ULONG CDECL ldap_modifyA(WLDAP32_LDAP*,PCHAR,LDAPModA*[]);
@@ -384,10 +384,10 @@
 ULONG CDECL WLDAP32_ldap_msgfree(WLDAP32_LDAPMessage*);
 PCHAR CDECL
ldap_next_attributeA(WLDAP32_LDAP*,WLDAP32_LDAPMessage*,WLDAP32_BerElement*);
 PWCHAR CDECL
ldap_next_attributeW(WLDAP32_LDAP*,WLDAP32_LDAPMessage*,WLDAP32_BerElement*);
-WLDAP32_LDAPMessage CDECL *WLDAP32_ldap_next_entry(WLDAP32_LDAP*,WLDAP32_LDAPMessage*);
-WLDAP32_LDAPMessage CDECL
*WLDAP32_ldap_next_reference(WLDAP32_LDAP*,WLDAP32_LDAPMessage*);
-WLDAP32_LDAP CDECL *ldap_openA(PCHAR,ULONG);
-WLDAP32_LDAP CDECL *ldap_openW(PWCHAR,ULONG);
+WLDAP32_LDAPMessage * CDECL WLDAP32_ldap_next_entry(WLDAP32_LDAP*,WLDAP32_LDAPMessage*);
+WLDAP32_LDAPMessage * CDECL
WLDAP32_ldap_next_reference(WLDAP32_LDAP*,WLDAP32_LDAPMessage*);
+WLDAP32_LDAP * CDECL ldap_openA(PCHAR,ULONG);
+WLDAP32_LDAP * CDECL ldap_openW(PWCHAR,ULONG);
 ULONG CDECL ldap_parse_extended_resultA(WLDAP32_LDAP*,WLDAP32_LDAPMessage*,PCHAR*,struct
WLDAP32_berval**,BOOLEAN);
 ULONG CDECL ldap_parse_extended_resultW(WLDAP32_LDAP*,WLDAP32_LDAPMessage*,PWCHAR*,struct
WLDAP32_berval**,BOOLEAN);
 ULONG CDECL ldap_parse_page_controlA(WLDAP32_LDAP*,PLDAPControlA*,ULONG*,struct
WLDAP32_berval**);
@@ -438,8 +438,8 @@
 ULONG CDECL ldap_simple_bindW(WLDAP32_LDAP*,PWCHAR,PWCHAR);
 ULONG CDECL ldap_simple_bind_sA(WLDAP32_LDAP*,PCHAR,PCHAR);
 ULONG CDECL ldap_simple_bind_sW(WLDAP32_LDAP*,PWCHAR,PWCHAR);
-WLDAP32_LDAP CDECL *ldap_sslinitA(PCHAR,ULONG,int);
-WLDAP32_LDAP CDECL *ldap_sslinitW(PWCHAR,ULONG,int);
+WLDAP32_LDAP * CDECL ldap_sslinitA(PCHAR,ULONG,int);
+WLDAP32_LDAP * CDECL ldap_sslinitW(PWCHAR,ULONG,int);
 ULONG CDECL
ldap_start_tls_sA(WLDAP32_PLDAP,PULONG,WLDAP32_LDAPMessage**,PLDAPControlA*,PLDAPControlA*);
 ULONG CDECL
ldap_start_tls_sW(WLDAP32_PLDAP,PULONG,WLDAP32_LDAPMessage**,PLDAPControlW*,PLDAPControlW*);
 ULONG CDECL ldap_startup(PLDAP_VERSION_INFO,HANDLE*);