From a96dc753bed847d077b3ada0aff753c1035b6b98 Mon Sep 17 00:00:00 2001 From: Dmitry Chapyshev Date: Thu, 26 Feb 2009 10:27:27 +0000 Subject: [PATCH] - Sync wldap32, uxtheme, sxs with Wine head svn path=/trunk/; revision=39763 --- reactos/dll/win32/sxs/sxs.c | 3 -- reactos/dll/win32/uxtheme/msstyles.c | 10 +++--- reactos/dll/win32/uxtheme/msstyles.h | 1 - reactos/dll/win32/uxtheme/system.c | 24 ++++++------- reactos/dll/win32/uxtheme/uxini.c | 14 -------- reactos/dll/win32/wldap32/option.c | 4 +-- reactos/dll/win32/wldap32/parse.c | 2 +- reactos/dll/win32/wldap32/winldap_private.h | 38 ++++++++++----------- 8 files changed, 38 insertions(+), 58 deletions(-) diff --git a/reactos/dll/win32/sxs/sxs.c b/reactos/dll/win32/sxs/sxs.c index cd64de562f6..06e6672dbf7 100644 --- a/reactos/dll/win32/sxs/sxs.c +++ b/reactos/dll/win32/sxs/sxs.c @@ -22,9 +22,6 @@ #include "windef.h" #include "winbase.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(sxs); /*********************************************************************** diff --git a/reactos/dll/win32/uxtheme/msstyles.c b/reactos/dll/win32/uxtheme/msstyles.c index 3f2a0549ebb..825645d2f4b 100644 --- a/reactos/dll/win32/uxtheme/msstyles.c +++ b/reactos/dll/win32/uxtheme/msstyles.c @@ -733,9 +733,9 @@ static inline void parse_init_nonclient (struct PARSENONCLIENTSTATE* state) 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 @@ static void parse_apply_nonclient (struct PARSENONCLIENTSTATE* state) 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 @@ static BOOL prepare_alpha (HBITMAP bmp, BOOL* hasAlpha) 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) diff --git a/reactos/dll/win32/uxtheme/msstyles.h b/reactos/dll/win32/uxtheme/msstyles.h index 1d02725e185..6cd73acc785 100644 --- a/reactos/dll/win32/uxtheme/msstyles.h +++ b/reactos/dll/win32/uxtheme/msstyles.h @@ -110,7 +110,6 @@ HRESULT MSSTYLES_GetPropertyMargins(PTHEME_PROPERTY tp, RECT *prc, MARGINS *pMar 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); diff --git a/reactos/dll/win32/uxtheme/system.c b/reactos/dll/win32/uxtheme/system.c index c1e26c8b32c..28395393729 100644 --- a/reactos/dll/win32/uxtheme/system.c +++ b/reactos/dll/win32/uxtheme/system.c @@ -126,7 +126,7 @@ static DWORD query_reg_path (HKEY hKey, LPCWSTR lpszValue, 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 @@ static DWORD query_reg_path (HKEY hKey, LPCWSTR lpszValue, 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 @@ static void UXTHEME_RestoreSystemMetrics(void) &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 @@ static void UXTHEME_RestoreSystemMetrics(void) &type, (LPBYTE)&iconTitleFont, &count) == ERROR_SUCCESS) { SystemParametersInfoW (SPI_SETICONTITLELOGFONT, - count, (LPVOID)&iconTitleFont, SPIF_UPDATEINIFILE); + count, &iconTitleFont, SPIF_UPDATEINIFILE); } } @@ -453,17 +453,15 @@ static void UXTHEME_SaveSystemMetrics(void) 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); } /*********************************************************************** diff --git a/reactos/dll/win32/uxtheme/uxini.c b/reactos/dll/win32/uxtheme/uxini.c index 02c54431d94..a2dfabfd0de 100644 --- a/reactos/dll/win32/uxtheme/uxini.c +++ b/reactos/dll/win32/uxtheme/uxini.c @@ -95,19 +95,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; -} - /********************************************************************** * UXINI_eof * @@ -212,7 +199,6 @@ LPCWSTR UXINI_GetNextSection(PUXINI_FILE uf, DWORD *dwLen) * * 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 diff --git a/reactos/dll/win32/wldap32/option.c b/reactos/dll/win32/wldap32/option.c index 713b3cace8b..801d77d931c 100644 --- a/reactos/dll/win32/wldap32/option.c +++ b/reactos/dll/win32/wldap32/option.c @@ -327,7 +327,7 @@ ULONG CDECL ldap_set_optionA( WLDAP32_LDAP *ld, int option, void *value ) { 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 @@ ULONG CDECL ldap_set_optionW( WLDAP32_LDAP *ld, int option, void *value ) { 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 )); diff --git a/reactos/dll/win32/wldap32/parse.c b/reactos/dll/win32/wldap32/parse.c index 6439ba61966..f7e93dd02a3 100644 --- a/reactos/dll/win32/wldap32/parse.c +++ b/reactos/dll/win32/wldap32/parse.c @@ -444,7 +444,7 @@ INT CDECL ldap_parse_vlv_controlW( WLDAP32_LDAP *ld, PLDAPControlW *control, #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; diff --git a/reactos/dll/win32/wldap32/winldap_private.h b/reactos/dll/win32/wldap32/winldap_private.h index ac1c739dffa..a19ceb1b353 100644 --- a/reactos/dll/win32/wldap32/winldap_private.h +++ b/reactos/dll/win32/wldap32/winldap_private.h @@ -276,8 +276,8 @@ typedef struct ldap_apifeature_infoW 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_ext_sW(WLDAP32_LDAP*,PWCHAR,PWCHAR,PWCHAR,struct WLDAP3 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 @@ PCHAR CDECL ldap_err2stringA(ULONG); 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 @@ ULONG CDECL ldap_extended_operation_sW(WLDAP32_LDAP*,PWCHAR,struct WLDAP32_berva 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_next_page_s(WLDAP32_LDAP*,PLDAPSearch,struct l_timeval*,ULO 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 ldap_modrdn_sW(WLDAP32_LDAP*,PWCHAR,PWCHAR); 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_bindA(WLDAP32_LDAP*,PCHAR,PCHAR); 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*);