Ros-diffs July 2005

ros-diffs@reactos.org

21 participants
563 discussions

by ion＠svn.reactos.com

- Fix warnings - Remove code that isn't used in ReactOS because our _SHExpandEnvironmentStrings was completely re-written and thus doesn't use the two helper functions that WINE's _SHExpandEnvironmentStrings does. Modified: trunk/reactos/lib/dinput/keyboard.c Modified: trunk/reactos/lib/shell32/shellpath.c Modified: trunk/reactos/lib/shell32/shfldr_mycomp.c _____ Modified: trunk/reactos/lib/dinput/keyboard.c --- trunk/reactos/lib/dinput/keyboard.c 2005-07-27 02:06:31 UTC (rev 16788) +++ trunk/reactos/lib/dinput/keyboard.c 2005-07-27 05:08:32 UTC (rev 16789) @@ -88,9 +88,8 @@ }; static CRITICAL_SECTION keyboard_crit = { &critsect_debug, -1, 0, 0, 0, 0 }; -static DWORD keyboard_users; - #ifndef __REACTOS__ +static DWORD keyboard_users; static HHOOK keyboard_hook; #endif _____ Modified: trunk/reactos/lib/shell32/shellpath.c --- trunk/reactos/lib/shell32/shellpath.c 2005-07-27 02:06:31 UTC (rev 16788) +++ trunk/reactos/lib/shell32/shellpath.c 2005-07-27 05:08:32 UTC (rev 16789) @@ -1457,57 +1457,6 @@ return hr; } -static HRESULT _SHOpenProfilesKey(PHKEY pKey) -{ - LONG lRet; - DWORD disp; - - lRet = RegCreateKeyExW(HKEY_LOCAL_MACHINE, ProfileListW, 0, NULL, 0, - KEY_ALL_ACCESS, NULL, pKey, &disp); - return HRESULT_FROM_WIN32(lRet); -} - -/* Reads the value named szValueName from the key profilesKey (assumed to be - * opened by _SHOpenProfilesKey) into szValue, which is assumed to be MAX_PATH - * WCHARs in length. If it doesn't exist, returns szDefault (and saves - * szDefault to the registry). - */ -static HRESULT _SHGetProfilesValue(HKEY profilesKey, LPCWSTR szValueName, - LPWSTR szValue, LPCWSTR szDefault) -{ - HRESULT hr; - DWORD type, dwPathLen = MAX_PATH * sizeof(WCHAR); - LONG lRet; - - TRACE("%p,%s,%p,%s\n", profilesKey, debugstr_w(szValueName), szValue, - debugstr_w(szDefault)); - lRet = RegQueryValueExW(profilesKey, szValueName, NULL, &type, - (LPBYTE)szValue, &dwPathLen); - if (!lRet && (type == REG_SZ || type == REG_EXPAND_SZ) && dwPathLen - && *szValue) - { - dwPathLen /= sizeof(WCHAR); - szValue[dwPathLen] = '\0'; - hr = S_OK; - } - else - { - /* Missing or invalid value, set a default */ - lstrcpynW(szValue, szDefault, MAX_PATH); - TRACE("Setting missing value %s to %s\n", debugstr_w(szValueName), - debugstr_w(szValue)); - lRet = RegSetValueExW(profilesKey, szValueName, 0, REG_EXPAND_SZ, - (LPBYTE)szValue, - (strlenW(szValue) + 1) * sizeof(WCHAR)); - if (lRet) - hr = HRESULT_FROM_WIN32(lRet); - else - hr = S_OK; - } - TRACE("returning 0x%08lx (output value is %s)\n", hr, debugstr_w(szValue)); - return hr; -} - /* From the original Wine source: * * Attempts to expand environment variables from szSrc into szDest, which is _____ Modified: trunk/reactos/lib/shell32/shfldr_mycomp.c --- trunk/reactos/lib/shell32/shfldr_mycomp.c 2005-07-27 02:06:31 UTC (rev 16788) +++ trunk/reactos/lib/shell32/shfldr_mycomp.c 2005-07-27 05:08:32 UTC (rev 16789) @@ -26,6 +26,7 @@ #include <string.h> #include <stdarg.h> #include <stdio.h> +#include <ctype.h> #define COBJMACROS #define NONAMELESSUNION

19 years, 2 months

[ion] 16788: - Fix warnings

by ion＠svn.reactos.com

- Fix warnings Modified: trunk/reactos/lib/oleaut32/vartype.c _____ Modified: trunk/reactos/lib/oleaut32/vartype.c --- trunk/reactos/lib/oleaut32/vartype.c 2005-07-27 02:04:55 UTC (rev 16787) +++ trunk/reactos/lib/oleaut32/vartype.c 2005-07-27 02:06:31 UTC (rev 16788) @@ -29,6 +29,7 @@ #include "winnt.h" #include "variant.h" #include "resource.h" +#include <ctype.h> WINE_DEFAULT_DEBUG_CHANNEL(variant);

19 years, 2 months

[ion] 16787: - Fix warnings

by ion＠svn.reactos.com

- Fix warnings Modified: trunk/reactos/lib/msi/action.c Modified: trunk/reactos/lib/msi/appsearch.c Modified: trunk/reactos/lib/msi/msi.c _____ Modified: trunk/reactos/lib/msi/action.c --- trunk/reactos/lib/msi/action.c 2005-07-27 02:03:01 UTC (rev 16786) +++ trunk/reactos/lib/msi/action.c 2005-07-27 02:04:55 UTC (rev 16787) @@ -2635,7 +2635,7 @@ version = HeapAlloc(GetProcessHeap(),0,versize); GetFileVersionInfoW(file->TargetPath, 0, versize, version); - VerQueryValueW(version, name, (LPVOID*)&lpVer, &sz); + VerQueryValueW(version, (LPWSTR)name, (LPVOID*)&lpVer, &sz); sprintfW(filever,name_fmt, HIWORD(lpVer->dwFileVersionMS), _____ Modified: trunk/reactos/lib/msi/appsearch.c --- trunk/reactos/lib/msi/appsearch.c 2005-07-27 02:03:01 UTC (rev 16786) +++ trunk/reactos/lib/msi/appsearch.c 2005-07-27 02:04:55 UTC (rev 16787) @@ -538,7 +538,7 @@ } else { - DWORD zero, size = GetFileVersionInfoSizeW(filePath, &zero); + DWORD zero, size = GetFileVersionInfoSizeW((LPWSTR)filePath, &zero); if (size) { @@ -550,8 +550,8 @@ UINT versionLen; LPVOID subBlock = NULL; - if (GetFileVersionInfoW(filePath, 0, size, buf)) - VerQueryValueW(buf, rootW, &subBlock, &versionLen); + if (GetFileVersionInfoW((LPWSTR)filePath, 0, size, buf)) + VerQueryValueW(buf, (LPWSTR)rootW, &subBlock, &versionLen); if (subBlock) { VS_FIXEDFILEINFO *info = _____ Modified: trunk/reactos/lib/msi/msi.c --- trunk/reactos/lib/msi/msi.c 2005-07-27 02:03:01 UTC (rev 16786) +++ trunk/reactos/lib/msi/msi.c 2005-07-27 02:04:55 UTC (rev 16787) @@ -1195,7 +1195,7 @@ lpVersionBuf, pcchVersionBuf?*pcchVersionBuf:0, lpLangBuf, pcchLangBuf?*pcchLangBuf:0); - dwVerLen = GetFileVersionInfoSizeW(szFilePath, NULL); + dwVerLen = GetFileVersionInfoSizeW((LPWSTR)szFilePath, NULL); if( !dwVerLen ) return GetLastError(); @@ -1206,14 +1206,14 @@ goto end; } - if( !GetFileVersionInfoW(szFilePath, 0, dwVerLen, lpVer) ) + if( !GetFileVersionInfoW((LPWSTR)szFilePath, 0, dwVerLen, lpVer) ) { ret = GetLastError(); goto end; } if( lpVersionBuf && pcchVersionBuf && *pcchVersionBuf ) { - if( VerQueryValueW(lpVer, szVersionResource, (LPVOID*)&ffi, &puLen) && + if( VerQueryValueW(lpVer, (LPWSTR)szVersionResource, (LPVOID*)&ffi, &puLen) && (puLen > 0) ) { wsprintfW(tmp, szVersionFormat,

19 years, 2 months

[ion] 16786: - Fix warnings

by ion＠svn.reactos.com

- Fix warnings Modified: trunk/reactos/lib/comctl32/comctl32undoc.c _____ Modified: trunk/reactos/lib/comctl32/comctl32undoc.c --- trunk/reactos/lib/comctl32/comctl32undoc.c 2005-07-27 02:01:02 UTC (rev 16785) +++ trunk/reactos/lib/comctl32/comctl32undoc.c 2005-07-27 02:03:01 UTC (rev 16786) @@ -592,7 +592,7 @@ err); if ((err = RegCreateKeyExW( mp->extview.hKey, mp->extview.lpszSubKey, 0, - emptyW, + (LPWSTR)emptyW, REG_OPTION_NON_VOLATILE, KEY_READ | KEY_WRITE, 0, @@ -973,7 +973,7 @@ /* open the sub key */ if ((err = RegCreateKeyExW( mp->extview.hKey, mp->extview.lpszSubKey, 0, - emptyW, + (LPWSTR)emptyW, REG_OPTION_NON_VOLATILE, KEY_READ | KEY_WRITE, 0,

19 years, 2 months

[ion] 16785: - Fix warnings

by ion＠svn.reactos.com

- Fix warnings Modified: trunk/reactos/lib/comdlg32/cdlg32.c _____ Modified: trunk/reactos/lib/comdlg32/cdlg32.c --- trunk/reactos/lib/comdlg32/cdlg32.c 2005-07-27 01:59:41 UTC (rev 16784) +++ trunk/reactos/lib/comdlg32/cdlg32.c 2005-07-27 02:01:02 UTC (rev 16785) @@ -67,7 +67,7 @@ #define GPA(dest, hinst, name) \ if(!(dest = (void*)GetProcAddress(hinst,name)))\ { \ - ERR(GPA_string, debugstr_a(name), hinst); \ + ERR((LPSTR)GPA_string, debugstr_a(name), hinst); \ return FALSE; \ }

19 years, 2 months

[ion] 16784: - Fix warnings

by ion＠svn.reactos.com

- Fix warnings Modified: trunk/reactos/lib/dbghelp/module.c Modified: trunk/reactos/lib/dbghelp/path.c Modified: trunk/reactos/lib/dbghelp/stabs.c _____ Modified: trunk/reactos/lib/dbghelp/module.c --- trunk/reactos/lib/dbghelp/module.c 2005-07-27 01:58:34 UTC (rev 16783) +++ trunk/reactos/lib/dbghelp/module.c 2005-07-27 01:59:41 UTC (rev 16784) @@ -22,6 +22,7 @@ #include "config.h" #include <stdlib.h> #include <stdio.h> +#include <ctype.h> #include <string.h> #include <assert.h> _____ Modified: trunk/reactos/lib/dbghelp/path.c --- trunk/reactos/lib/dbghelp/path.c 2005-07-27 01:58:34 UTC (rev 16783) +++ trunk/reactos/lib/dbghelp/path.c 2005-07-27 01:59:41 UTC (rev 16784) @@ -21,6 +21,7 @@ #include "config.h" #include <stdlib.h> #include <stdio.h> +#include <ctype.h> #include <string.h> #include "dbghelp_private.h" _____ Modified: trunk/reactos/lib/dbghelp/stabs.c --- trunk/reactos/lib/dbghelp/stabs.c 2005-07-27 01:58:34 UTC (rev 16783) +++ trunk/reactos/lib/dbghelp/stabs.c 2005-07-27 01:59:41 UTC (rev 16784) @@ -39,6 +39,7 @@ #endif #include <limits.h> #include <stdlib.h> +#include <ctype.h> #include <string.h> #ifdef HAVE_UNISTD_H # include <unistd.h>

19 years, 2 months

[ion] 16783: - Fix warnings

by ion＠svn.reactos.com

- Fix warnings Modified: trunk/reactos/lib/setupapi/queue.c _____ Modified: trunk/reactos/lib/setupapi/queue.c --- trunk/reactos/lib/setupapi/queue.c 2005-07-27 01:56:55 UTC (rev 16782) +++ trunk/reactos/lib/setupapi/queue.c 2005-07-27 01:58:34 UTC (rev 16783) @@ -979,8 +979,8 @@ if ((GetFileAttributesW(target) != INVALID_FILE_ATTRIBUTES) && (GetFileAttributesW(source) != INVALID_FILE_ATTRIBUTES)) { - VersionSizeSource = GetFileVersionInfoSizeW(source,&zero); - VersionSizeTarget = GetFileVersionInfoSizeW(target,&zero); + VersionSizeSource = GetFileVersionInfoSizeW((LPWSTR)source,&zero); + VersionSizeTarget = GetFileVersionInfoSizeW((LPWSTR)target,&zero); } TRACE("SizeTarget %li ... SizeSource %li\n",VersionSizeTarget, @@ -999,9 +999,9 @@ VersionSource = HeapAlloc(GetProcessHeap(),0,VersionSizeSource); VersionTarget = HeapAlloc(GetProcessHeap(),0,VersionSizeTarget); - ret = GetFileVersionInfoW(source,0,VersionSizeSource,VersionSource); + ret = GetFileVersionInfoW((LPWSTR)source,0,VersionSizeSource,VersionSource); if (ret) - ret = GetFileVersionInfoW(target, 0, VersionSizeTarget, + ret = GetFileVersionInfoW((LPWSTR)target, 0, VersionSizeTarget, VersionTarget); if (ret)

19 years, 2 months

[ion] 16782: - Fix broken IInternetZoneManagerVtbl definition.

by ion＠svn.reactos.com

- Fix broken IInternetZoneManagerVtbl definition. Modified: trunk/reactos/include/wine/urlmon.h _____ Modified: trunk/reactos/include/wine/urlmon.h --- trunk/reactos/include/wine/urlmon.h 2005-07-27 01:52:27 UTC (rev 16781) +++ trunk/reactos/include/wine/urlmon.h 2005-07-27 01:56:55 UTC (rev 16782) @@ -2043,6 +2043,13 @@ DWORD cbPolicy, URLZONEREG urlZoneReg); + HRESULT (STDMETHODCALLTYPE *PromptAction)( + IInternetZoneManager* This, + DWORD dwAction, + LPCWSTR pwszUrl, + LPCWSTR pwszText, + DWORD dwPromptFlags); + HRESULT (STDMETHODCALLTYPE *LogAction)( IInternetZoneManager* This, DWORD dwAction,

19 years, 2 months

[ion] 16781: - Fix export definition

by ion＠svn.reactos.com

- Fix export definition Modified: trunk/reactos/lib/snmpapi/snmpapi.def _____ Modified: trunk/reactos/lib/snmpapi/snmpapi.def --- trunk/reactos/lib/snmpapi/snmpapi.def 2005-07-27 01:50:31 UTC (rev 16780) +++ trunk/reactos/lib/snmpapi/snmpapi.def 2005-07-27 01:52:27 UTC (rev 16781) @@ -16,7 +16,7 @@ SnmpUtilAnsiToUnicode@8 SnmpUtilAsnAnyCpy@8 SnmpUtilAsnAnyFree@4 -SnmpUtilDbgPrint@0 +SnmpUtilDbgPrint SnmpUtilIdsToA@8 SnmpUtilMemAlloc@4 SnmpUtilMemFree@4

19 years, 2 months

[ion] 16780: - Fix warnings

by ion＠svn.reactos.com

- Fix warnings Modified: trunk/reactos/lib/shlwapi/path.c Modified: trunk/reactos/lib/shlwapi/reg.c Modified: trunk/reactos/lib/shlwapi/string.c Modified: trunk/reactos/lib/shlwapi/url.c _____ Modified: trunk/reactos/lib/shlwapi/path.c --- trunk/reactos/lib/shlwapi/path.c 2005-07-27 01:44:10 UTC (rev 16779) +++ trunk/reactos/lib/shlwapi/path.c 2005-07-27 01:50:31 UTC (rev 16780) @@ -25,6 +25,7 @@ #include <stdarg.h> #include <string.h> #include <stdlib.h> +#include <ctype.h> #include "wine/unicode.h" #include "windef.h" _____ Modified: trunk/reactos/lib/shlwapi/reg.c --- trunk/reactos/lib/shlwapi/reg.c 2005-07-27 01:44:10 UTC (rev 16779) +++ trunk/reactos/lib/shlwapi/reg.c 2005-07-27 01:50:31 UTC (rev 16780) @@ -1197,7 +1197,7 @@ debugstr_a(lpszValue), dwType, pvData, cbData); if (lpszSubKey && *lpszSubKey) - dwRet = RegCreateKeyExA(hKey, lpszSubKey, 0, szEmpty, + dwRet = RegCreateKeyExA(hKey, lpszSubKey, 0, (LPSTR)szEmpty, 0, KEY_SET_VALUE, NULL, &hSubKey, &dwDummy); else hSubKey = hKey; @@ -1226,7 +1226,7 @@ debugstr_w(lpszValue), dwType, pvData, cbData); if (lpszSubKey && *lpszSubKey) - dwRet = RegCreateKeyExW(hKey, lpszSubKey, 0, szEmpty, + dwRet = RegCreateKeyExW(hKey, lpszSubKey, 0, (LPWSTR)szEmpty, 0, KEY_SET_VALUE, NULL, &hSubKey, &dwDummy); else hSubKey = hKey; _____ Modified: trunk/reactos/lib/shlwapi/string.c --- trunk/reactos/lib/shlwapi/string.c 2005-07-27 01:44:10 UTC (rev 16779) +++ trunk/reactos/lib/shlwapi/string.c 2005-07-27 01:50:31 UTC (rev 16780) @@ -27,6 +27,7 @@ #include <stdarg.h> #include <stdio.h> #include <string.h> +#include <ctype.h> #define NONAMELESSUNION #define NONAMELESSSTRUCT _____ Modified: trunk/reactos/lib/shlwapi/url.c --- trunk/reactos/lib/shlwapi/url.c 2005-07-27 01:44:10 UTC (rev 16779) +++ trunk/reactos/lib/shlwapi/url.c 2005-07-27 01:50:31 UTC (rev 16780) @@ -23,6 +23,7 @@ #include <stdarg.h> #include <string.h> #include <stdlib.h> +#include <ctype.h> #include "windef.h" #include "winbase.h" #include "winnls.h" @@ -1398,7 +1399,7 @@ if (IsBadStringPtrA(pszUrl, -1) || IsBadWritePtr(lpDest, nDestLen)) return E_INVALIDARG; - HashData((const BYTE*)pszUrl, (int)strlen(pszUrl), lpDest, nDestLen); + HashData((LPSTR)pszUrl, (int)strlen(pszUrl), lpDest, nDestLen); return S_OK; } @@ -1420,7 +1421,7 @@ * return the same digests for the same URL. */ WideCharToMultiByte(0, 0, pszUrl, -1, szUrl, MAX_PATH, 0, 0); - HashData((const BYTE*)szUrl, (int)strlen(szUrl), lpDest, nDestLen); + HashData((BYTE*)szUrl, (int)strlen(szUrl), lpDest, nDestLen); return S_OK; }

19 years, 2 months

← Newer
1
...
12
13
14
15
16
17
18
...
57
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2005