[janderwald] 29485: ----------------------------------------------------- autocomplete.c: Andrew Talbot <Andrew.Talbot@talbotville.com> Exclude unused headers Constify some variables. ----------------------------------------------------- dde.c: Jonathan Ernst <jonathan@ernstfamily.ch> Update the address of the Free Software Foundation. ----------------------------------------------------- dragdrophelper.c: Jonathan Ernst <jonathan@ernstfamily.ch> Update the address of the Free Software Foundatio
10 Oct
2007
10 Oct
'07
10:39 p.m.
Author: janderwald
Date: Thu Oct 11 02:39:44 2007
New Revision: 29485
URL: http://svn.reactos.org/svn/reactos?rev=29485&view=rev
Log:
-----------------------------------------------------
autocomplete.c:
Andrew Talbot <Andrew.Talbot(a)talbotville.com>
Exclude unused headers Constify some variables.
-----------------------------------------------------
dde.c:
Jonathan Ernst <jonathan(a)ernstfamily.ch>
Update the address of the Free Software Foundation.
-----------------------------------------------------
dragdrophelper.c:
Jonathan Ernst <jonathan(a)ernstfamily.ch>
Update the address of the Free Software Foundation.
Hans Leidekker <hans(a)it.vu.nl>
Win64 printf format warning fixes.
-----------------------------------------------------
enumidlist.c:
Jonathan Ernst <jonathan(a)ernstfamily.ch>
Update the address of the Free Software Foundation.
Hans Leidekker <hans(a)it.vu.nl>
Win64 printf format warning fixes.
-----------------------------------------------------
enumidlist.h:
Jonathan Ernst <jonathan(a)ernstfamily.ch>
Update the address of the Free Software Foundation.
-----------------------------------------------------
shellreg.c:
Andrew Talbot <Andrew.Talbot(a)talbotville.com>
Exclude unused headers.
Detlef Riekenberg <wine.dev(a)web.de>
Implement SHRegQueryValueA with RegQueryValueA.
Jonathan Ernst <jonathan(a)ernstfamily.ch>
Update the address of the Free Software Foundation.
-----------------------------------------------------
shellstring.c:
Jonathan Ernst <jonathan(a)ernstfamily.ch>
Update the address of the Free Software Foundation.
Hans Leidekker <hans(a)it.vu.nl>
Win64 printf format warning fixes.
Andrew Talbot <Andrew.Talbot(a)talbotville.com>
Exclude unused headers.
-----------------------------------------------------
shlfsbind.c
Jonathan Ernst <jonathan(a)ernstfamily.ch>
Update the address of the Free Software Foundation.
Hans Leidekker <hans(a)it.vu.nl>
shell32: Win64 printf format warning fixes.
Andrew Talbot <Andrew.Talbot(a)talbotville.com>
shell32: Exclude unused headers.
-----------------------------------------------------
shlmenu.c:
Dmitry Timoshkov <dmitry(a)codeweavers.com>
Switch to using 'long' for INT_PTR type for 64-bit compatibility.
Andrew Talbot <Andrew.Talbot(a)talbotville.com>
Exclude unused headers.
Hans Leidekker <hans(a)it.vu.nl>
Win64 printf format warning fixes.
James Hawkins <truiken(a)gmail.com>
janitorial: Remove redundant NULL checks before SHFree.
Francois Gouget <fgouget(a)free.fr>
Fix spelling of a local variable.
Jonathan Ernst <jonathan(a)ernstfamily.ch>
Update the address of the Free Software Foundation.
-----------------------------------------------------
shpolicy.c:
Dmitry Timoshkov <dmitry(a)codeweavers.com>
Make some data static and const.
Jonathan Ernst <jonathan(a)ernstfamily.ch>
Update the address of the Free Software Foundation.
Modified:
trunk/reactos/dll/win32/shell32/changenotify.c
trunk/reactos/dll/win32/shell32/dde.c
trunk/reactos/dll/win32/shell32/dragdrophelper.c
trunk/reactos/dll/win32/shell32/enumidlist.c
trunk/reactos/dll/win32/shell32/enumidlist.h
trunk/reactos/dll/win32/shell32/shellreg.c
trunk/reactos/dll/win32/shell32/shellstring.c
trunk/reactos/dll/win32/shell32/shlfsbind.c
trunk/reactos/dll/win32/shell32/shlmenu.c
trunk/reactos/dll/win32/shell32/shpolicy.c
Modified: trunk/reactos/dll/win32/shell32/changenotify.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/changeno…
==============================================================================
--- trunk/reactos/dll/win32/shell32/changenotify.c (original)
+++ trunk/reactos/dll/win32/shell32/changenotify.c Thu Oct 11 02:39:44 2007
@@ -26,7 +26,6 @@
#include "windef.h"
#include "winbase.h"
#include "wine/debug.h"
-#include "wingdi.h"
#include "shell32_main.h"
WINE_DEFAULT_DEBUG_CHANNEL(shell);
@@ -106,7 +105,7 @@
#undef DUMPEV
}
-static const char * NodeName(LPNOTIFICATIONLIST item)
+static const char * NodeName(const NOTIFICATIONLIST *item)
{
const char *str;
WCHAR path[MAX_PATH];
Modified: trunk/reactos/dll/win32/shell32/dde.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/dde.c?re…
==============================================================================
--- trunk/reactos/dll/win32/shell32/dde.c (original)
+++ trunk/reactos/dll/win32/shell32/dde.c Thu Oct 11 02:39:44 2007
@@ -15,7 +15,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include <stdarg.h>
Modified: trunk/reactos/dll/win32/shell32/dragdrophelper.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/dragdrop…
==============================================================================
--- trunk/reactos/dll/win32/shell32/dragdrophelper.c (original)
+++ trunk/reactos/dll/win32/shell32/dragdrophelper.c Thu Oct 11 02:39:44 2007
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "config.h"
@@ -115,7 +115,7 @@
IDropTargetHelperImpl *This = (IDropTargetHelperImpl *)iface;
ULONG refCount = InterlockedIncrement(&This->ref);
- TRACE ("(%p)->(count=%lu)\n", This, refCount - 1);
+ TRACE ("(%p)->(count=%u)\n", This, refCount - 1);
return refCount;
}
@@ -125,7 +125,7 @@
IDropTargetHelperImpl *This = (IDropTargetHelperImpl *)iface;
ULONG refCount = InterlockedDecrement(&This->ref);
- TRACE ("(%p)->(count=%lu)\n", This, refCount + 1);
+ TRACE ("(%p)->(count=%u)\n", This, refCount + 1);
if (!refCount) {
TRACE("-- destroying (%p)\n", This);
@@ -143,7 +143,7 @@
DWORD dwEffect)
{
IDropTargetHelperImpl *This = (IDropTargetHelperImpl *)iface;
- FIXME ("(%p)->(%p %p %p 0x%08lx)\n", This,hwndTarget, pDataObject, ppt,
dwEffect);
+ FIXME ("(%p)->(%p %p %p 0x%08x)\n", This,hwndTarget, pDataObject, ppt,
dwEffect);
return E_NOTIMPL;
}
@@ -157,14 +157,14 @@
static HRESULT WINAPI IDropTargetHelper_fnDragOver (IDropTargetHelper * iface, POINT*
ppt, DWORD dwEffect)
{
IDropTargetHelperImpl *This = (IDropTargetHelperImpl *)iface;
- FIXME ("(%p)->(%p 0x%08lx)\n", This, ppt, dwEffect);
+ FIXME ("(%p)->(%p 0x%08x)\n", This, ppt, dwEffect);
return E_NOTIMPL;
}
static HRESULT WINAPI IDropTargetHelper_fnDrop (IDropTargetHelper * iface, IDataObject*
pDataObject, POINT* ppt, DWORD dwEffect)
{
IDropTargetHelperImpl *This = (IDropTargetHelperImpl *)iface;
- FIXME ("(%p)->(%p %p 0x%08lx)\n", This, pDataObject, ppt, dwEffect);
+ FIXME ("(%p)->(%p %p 0x%08x)\n", This, pDataObject, ppt, dwEffect);
return E_NOTIMPL;
}
Modified: trunk/reactos/dll/win32/shell32/enumidlist.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/enumidli…
==============================================================================
--- trunk/reactos/dll/win32/shell32/enumidlist.c (original)
+++ trunk/reactos/dll/win32/shell32/enumidlist.c Thu Oct 11 02:39:44 2007
@@ -15,7 +15,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include <stdarg.h>
@@ -116,7 +116,7 @@
static const WCHAR dot[] = { '.',0 };
static const WCHAR dotdot[] = { '.','.',0 };
- TRACE("(%p)->(path=%s flags=0x%08lx)\n", list, debugstr_w(lpszPath),
dwFlags);
+ TRACE("(%p)->(path=%s flags=0x%08x)\n", list, debugstr_w(lpszPath),
dwFlags);
if(!lpszPath || !lpszPath[0]) return FALSE;
@@ -246,7 +246,7 @@
IEnumIDListImpl *This = (IEnumIDListImpl *)iface;
ULONG refCount = InterlockedIncrement(&This->ref);
- TRACE("(%p)->(%lu)\n", This, refCount - 1);
+ TRACE("(%p)->(%u)\n", This, refCount - 1);
return refCount;
}
@@ -259,7 +259,7 @@
IEnumIDListImpl *This = (IEnumIDListImpl *)iface;
ULONG refCount = InterlockedDecrement(&This->ref);
- TRACE("(%p)->(%lu)\n", This, refCount + 1);
+ TRACE("(%p)->(%u)\n", This, refCount + 1);
if (!refCount) {
TRACE(" destroying IEnumIDList(%p)\n",This);
@@ -285,7 +285,7 @@
HRESULT hr = S_OK;
LPITEMIDLIST temp;
- TRACE("(%p)->(%ld,%p, %p)\n",This,celt,rgelt,pceltFetched);
+ TRACE("(%p)->(%d,%p, %p)\n",This,celt,rgelt,pceltFetched);
/* It is valid to leave pceltFetched NULL when celt is 1. Some of explorer's
* subsystems actually use it (and so may a third party browser)
@@ -329,7 +329,7 @@
DWORD dwIndex;
HRESULT hr = S_OK;
- TRACE("(%p)->(%lu)\n",This,celt);
+ TRACE("(%p)->(%u)\n",This,celt);
for(dwIndex = 0; dwIndex < celt; dwIndex++)
{ if(!This->mpCurrent)
Modified: trunk/reactos/dll/win32/shell32/enumidlist.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/enumidli…
==============================================================================
--- trunk/reactos/dll/win32/shell32/enumidlist.h (original)
+++ trunk/reactos/dll/win32/shell32/enumidlist.h Thu Oct 11 02:39:44 2007
@@ -11,7 +11,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#ifndef __ENUMIDLIST_H__
#define __ENUMIDLIST_H__
Modified: trunk/reactos/dll/win32/shell32/shellreg.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellreg…
==============================================================================
--- trunk/reactos/dll/win32/shell32/shellreg.c (original)
+++ trunk/reactos/dll/win32/shell32/shellreg.c Thu Oct 11 02:39:44 2007
@@ -15,7 +15,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "config.h"
@@ -30,9 +30,7 @@
#include "wingdi.h"
#include "winuser.h"
#include "shlobj.h"
-#include "winerror.h"
#include "winreg.h"
-#include "winnls.h"
#include "undocshell.h"
#include "wine/winbase16.h"
@@ -65,6 +63,16 @@
{
WARN("%p %s %p\n",hkey,debugstr_w(lpszSubKey),retkey);
return RegOpenKeyW( hkey, lpszSubKey, retkey );
+}
+
+/*************************************************************************
+ * SHRegQueryValueA [SHELL32.508]
+ *
+ */
+HRESULT WINAPI SHRegQueryValueA(HKEY hkey, LPSTR lpSubKey, LPSTR lpValue, LPDWORD
lpcbValue)
+{
+ TRACE("(%p %s %p %p)\n", hkey, debugstr_a(lpSubKey), lpValue, lpcbValue);
+ return RegQueryValueA(hkey, lpSubKey, lpValue, (LONG*)lpcbValue);
}
/*************************************************************************
Modified: trunk/reactos/dll/win32/shell32/shellstring.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellstr…
==============================================================================
--- trunk/reactos/dll/win32/shell32/shellstring.c (original)
+++ trunk/reactos/dll/win32/shell32/shellstring.c Thu Oct 11 02:39:44 2007
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include <string.h>
@@ -27,13 +27,11 @@
#include "windef.h"
#include "winbase.h"
#include "winnls.h"
-#include "winerror.h"
#include "wingdi.h"
#include "winuser.h"
#include "winreg.h"
#include "shlobj.h"
-#include "shellapi.h"
#include "shlwapi.h"
#include "shell32_main.h"
#include "undocshell.h"
@@ -46,7 +44,7 @@
BOOL WINAPI StrRetToStrNA(LPSTR dest, DWORD len, LPSTRRET src, const ITEMIDLIST *pidl)
{
- TRACE("dest=%p len=0x%lx strret=%p(%s) pidl=%p\n",
+ TRACE("dest=%p len=0x%x strret=%p(%s) pidl=%p\n",
dest,len,src,
(src->uType == STRRET_WSTR) ? "STRRET_WSTR" :
(src->uType == STRRET_CSTR) ? "STRRET_CSTR" :
@@ -84,7 +82,7 @@
BOOL WINAPI StrRetToStrNW(LPWSTR dest, DWORD len, LPSTRRET src, const ITEMIDLIST *pidl)
{
- TRACE("dest=%p len=0x%lx strret=%p(%s) pidl=%p\n",
+ TRACE("dest=%p len=0x%x strret=%p(%s) pidl=%p\n",
dest,len,src,
(src->uType == STRRET_WSTR) ? "STRRET_WSTR" :
(src->uType == STRRET_CSTR) ? "STRRET_CSTR" :
@@ -243,7 +241,7 @@
LPWSTR wString;
DWORD ret = 0;
- TRACE("(%s %ld)\n", debugstr_a(string), len);
+ TRACE("(%s %d)\n", debugstr_a(string), len);
wString = (LPWSTR)LocalAlloc(LPTR, len * sizeof(WCHAR));
if (wString)
{
@@ -269,7 +267,7 @@
DWORD size = lstrlenW(string);
LPWSTR s, d;
- TRACE("(%s %ld) stub\n", debugstr_w(string), len);
+ TRACE("(%s %d) stub\n", debugstr_w(string), len);
if (StrPBrkW(string, strEscapedChars) && size + 2 <= len)
{
Modified: trunk/reactos/dll/win32/shell32/shlfsbind.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlfsbin…
==============================================================================
--- trunk/reactos/dll/win32/shell32/shlfsbind.c (original)
+++ trunk/reactos/dll/win32/shell32/shlfsbind.c Thu Oct 11 02:39:44 2007
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*
*/
#include "config.h"
@@ -28,7 +28,6 @@
#include "windef.h"
#include "winbase.h"
-#include "winreg.h"
#include "winuser.h"
#include "shlobj.h"
#include "shell32_main.h"
@@ -179,7 +178,7 @@
IFileSystemBindDataImpl *This = (IFileSystemBindDataImpl *)iface;
ULONG refCount = InterlockedIncrement(&This->ref);
- TRACE("(%p)->(count=%li)\n", This, refCount - 1);
+ TRACE("(%p)->(count=%i)\n", This, refCount - 1);
return refCount;
}
@@ -189,7 +188,7 @@
IFileSystemBindDataImpl *This = (IFileSystemBindDataImpl *)iface;
ULONG refCount = InterlockedDecrement(&This->ref);
- TRACE("(%p)->(count=%li)\n", This, refCount + 1);
+ TRACE("(%p)->(count=%i)\n", This, refCount + 1);
if (!refCount)
{
Modified: trunk/reactos/dll/win32/shell32/shlmenu.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlmenu.…
==============================================================================
--- trunk/reactos/dll/win32/shell32/shlmenu.c (original)
+++ trunk/reactos/dll/win32/shell32/shlmenu.c Thu Oct 11 02:39:44 2007
@@ -15,7 +15,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include <stdarg.h>
@@ -32,7 +32,6 @@
#include "undocshell.h"
#include "shlwapi.h"
#include "shell32_main.h"
-#include "shlguid.h"
#include "pidl.h"
#include "wine/debug.h"
@@ -90,7 +89,7 @@
if ((menudata == 0) || (MenuInfo.cbSize != sizeof(MENUINFO)))
{
- ERR("menudata corrupt: %p %lu\n", menudata, MenuInfo.cbSize);
+ ERR("menudata corrupt: %p %u\n", menudata, MenuInfo.cbSize);
return 0;
}
@@ -115,9 +114,7 @@
menudata = FM_GetMenuInfo(hmenu);
- if ( menudata->pidl)
- { SHFree(menudata->pidl);
- }
+ SHFree(menudata->pidl);
menudata->uID = uID;
menudata->pidl = ILClone(pidl);
@@ -155,7 +152,7 @@
if ((menudata == 0) || (MenuInfo.cbSize != sizeof(MENUINFO)))
{
- ERR("menudata corrupt: %p %lu\n", menudata, MenuInfo.cbSize);
+ ERR("menudata corrupt: %p %u\n", menudata, MenuInfo.cbSize);
return 0;
}
@@ -267,7 +264,7 @@
HMENU hMenu = CreatePopupMenu();
- TRACE("0x%08lx 0x%08x %p 0x%08x 0x%08x hMenu=%p\n",
+ TRACE("0x%08x 0x%08x %p 0x%08x 0x%08x hMenu=%p\n",
crBorderColor, nBorderWidth, hBorderBmp, nSelHeight, uFlags, hMenu);
menudata = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(FMINFO));
@@ -299,9 +296,7 @@
menudata = FM_GetMenuInfo(hmenu);
- if ( menudata->pidl)
- { SHFree( menudata->pidl);
- }
+ SHFree( menudata->pidl);
HeapFree(GetProcessHeap(), 0, menudata);
DestroyMenu (hmenu);
@@ -375,7 +370,7 @@
menudata = (LPFMINFO)MenuInfo.dwMenuData;
if ((menudata == 0) || (MenuInfo.cbSize != sizeof(MENUINFO)))
{
- ERR("menudata corrupt: %p %lu\n", menudata, MenuInfo.cbSize);
+ ERR("menudata corrupt: %p %u\n", menudata, MenuInfo.cbSize);
return 0;
}
@@ -485,7 +480,7 @@
int WINAPI FileMenu_AppendFilesForPidl(
HMENU hmenu,
LPCITEMIDLIST pidl,
- BOOL bAddSeperator)
+ BOOL bAddSeparator)
{
LPFMINFO menudata;
@@ -495,10 +490,10 @@
FM_InitMenuPopup(hmenu, pidl);
- if (bAddSeperator)
+ if (bAddSeparator)
FileMenu_AppendItemW (hmenu, FM_SEPARATOR, 0, 0, 0, FM_DEFAULT_HEIGHT);
- TRACE("%p %p 0x%08x\n",hmenu, pidl,bAddSeperator);
+ TRACE("%p %p 0x%08x\n",hmenu, pidl,bAddSeparator);
return 0;
}
@@ -637,7 +632,7 @@
Shell_GetImageList(0, &hImageList);
ImageList_Draw(hImageList, pMyItem->iIconIndex, lpdis->hDC, xi, yi, ILD_NORMAL);
- TRACE("-- 0x%04lx 0x%04lx 0x%04lx 0x%04lx\n", TextRect.left, TextRect.top,
TextRect.right, TextRect.bottom);
+ TRACE("-- 0x%04x 0x%04x 0x%04x 0x%04x\n", TextRect.left, TextRect.top,
TextRect.right, TextRect.bottom);
SetTextColor(lpdis->hDC, clrPrevText);
SetBkColor(lpdis->hDC, clrPrevBkgnd);
@@ -666,7 +661,7 @@
HMENU hMenu,
WPARAM wParam)
{
- FIXME("%p 0x%08x\n",hMenu,wParam);
+ FIXME("%p 0x%08lx\n",hMenu,wParam);
return 0;
}
@@ -692,8 +687,7 @@
for (i = 0; i < GetMenuItemCount( hmenu ); i++)
{ GetMenuItemInfoW(hmenu, i, TRUE, &mii );
- if (mii.dwItemData)
- SHFree((LPFMINFO)mii.dwItemData);
+ SHFree((LPFMINFO)mii.dwItemData);
if (mii.hSubMenu)
FileMenu_Destroy(mii.hSubMenu);
@@ -799,7 +793,7 @@
FIXME("%p 0x%08x\n", hMenu, uPos);
if (GetMenuItemRect(0, hMenu, uPos, &rect))
- { FIXME("0x%04lx 0x%04lx 0x%04lx 0x%04lx\n",
+ { FIXME("0x%04x 0x%04x 0x%04x 0x%04x\n",
rect.right, rect.left, rect.top, rect.bottom);
return ((rect.right-rect.left)<<16) + (rect.top-rect.bottom);
}
@@ -833,7 +827,7 @@
*/
LPVOID WINAPI SHFind_InitMenuPopup (HMENU hMenu, HWND hWndParent, DWORD w, DWORD x)
{
- FIXME("hmenu=%p hwnd=%p 0x%08lx 0x%08lx stub\n",
+ FIXME("hmenu=%p hwnd=%p 0x%08x 0x%08x stub\n",
hMenu,hWndParent,w,x);
return NULL; /* this is supposed to be a pointer */
}
@@ -872,7 +866,7 @@
WCHAR szName[256];
UINT uTemp, uIDMax = uIDAdjust;
- TRACE("hmenu1=%p hmenu2=%p 0x%04x 0x%04x 0x%04x 0x%04lx\n",
+ TRACE("hmenu1=%p hmenu2=%p 0x%04x 0x%04x 0x%04x 0x%04x\n",
hmDst, hmSrc, uInsert, uIDAdjust, uIDAdjustMax, uFlags);
if (!hmDst || !hmSrc)
Modified: trunk/reactos/dll/win32/shell32/shpolicy.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shpolicy…
==============================================================================
--- trunk/reactos/dll/win32/shell32/shpolicy.c (original)
+++ trunk/reactos/dll/win32/shell32/shpolicy.c Thu Oct 11 02:39:44 2007
@@ -15,7 +15,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*
* NOTES:
*
@@ -133,7 +133,7 @@
static const char strNoRun[] = {"NoRun"};
/* policy data array */
-POLICYDATA sh32_policy_table[] =
+static POLICYDATA sh32_policy_table[] =
{
{
REST_NORUN,
@@ -796,7 +796,7 @@
0,
0,
SHELL_NO_POLICY
- }
+ }
};
/*************************************************************************
6218
days inactive
6218
days old
0 comments
1 participants
participants (1)
-
janderwald＠svn.reactos.org