Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-02 12:55:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

-----------------------------------------------------

Browse source 
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 Foundation.
Hans Leidekker <hans@it.vu.nl>
Win64 printf format warning fixes.
-----------------------------------------------------
enumidlist.c:
Jonathan Ernst <jonathan@ernstfamily.ch>
Update the address of the Free Software Foundation.
Hans Leidekker <hans@it.vu.nl>
Win64 printf format warning fixes.
-----------------------------------------------------
enumidlist.h:
Jonathan Ernst <jonathan@ernstfamily.ch>
Update the address of the Free Software Foundation.
-----------------------------------------------------
shellreg.c:
Andrew Talbot <Andrew.Talbot@talbotville.com>
Exclude unused headers.
Detlef Riekenberg <wine.dev@web.de>
Implement SHRegQueryValueA with RegQueryValueA.
Jonathan Ernst <jonathan@ernstfamily.ch>
Update the address of the Free Software Foundation.
-----------------------------------------------------
shellstring.c:
Jonathan Ernst <jonathan@ernstfamily.ch>
Update the address of the Free Software Foundation.
Hans Leidekker <hans@it.vu.nl>
Win64 printf format warning fixes.
Andrew Talbot <Andrew.Talbot@talbotville.com>
Exclude unused headers.
-----------------------------------------------------
shlfsbind.c
Jonathan Ernst <jonathan@ernstfamily.ch>
Update the address of the Free Software Foundation.
Hans Leidekker <hans@it.vu.nl>
shell32: Win64 printf format warning fixes.
Andrew Talbot <Andrew.Talbot@talbotville.com>
shell32: Exclude unused headers.
-----------------------------------------------------
shlmenu.c:
Dmitry Timoshkov <dmitry@codeweavers.com>
Switch to using 'long' for INT_PTR type for 64-bit compatibility.
Andrew Talbot <Andrew.Talbot@talbotville.com>
Exclude unused headers.
Hans Leidekker <hans@it.vu.nl>
Win64 printf format warning fixes.
James Hawkins <truiken@gmail.com>
janitorial: Remove redundant NULL checks before SHFree.
Francois Gouget <fgouget@free.fr>
Fix spelling of a local variable.
Jonathan Ernst <jonathan@ernstfamily.ch>
Update the address of the Free Software Foundation.
-----------------------------------------------------
shpolicy.c:
Dmitry Timoshkov <dmitry@codeweavers.com>
Make some data static and const.
Jonathan Ernst <jonathan@ernstfamily.ch>
Update the address of the Free Software Foundation.

svn path=/trunk/; revision=29485
This commit is contained in:
Johannes Anderwald 2007-10-10 22:39:44 +00:00
parent a0e410976f
commit fd1c983af4
10 changed files with 53 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

3
reactos/dll/win32/shell32/changenotify.c
View file

@ -26,7 +26,6 @@
#include "windef.h" #include "windef.h"
#include "winbase.h" #include "winbase.h"
#include "wine/debug.h" #include "wine/debug.h"
#include "wingdi.h"
#include "shell32_main.h" #include "shell32_main.h"
WINE_DEFAULT_DEBUG_CHANNEL(shell); WINE_DEFAULT_DEBUG_CHANNEL(shell);
@ -106,7 +105,7 @@ static const char * DumpEvent( LONG event )
#undef DUMPEV #undef DUMPEV
} }
static const char * NodeName(LPNOTIFICATIONLIST item) static const char * NodeName(const NOTIFICATIONLIST *item)
{ {
const char *str; const char *str;
WCHAR path[MAX_PATH]; WCHAR path[MAX_PATH];

2
reactos/dll/win32/shell32/dde.c
View file

@ -15,7 +15,7 @@
* *
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software * 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> #include <stdarg.h>

12
reactos/dll/win32/shell32/dragdrophelper.c
View file

@ -16,7 +16,7 @@
* *
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software * 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" #include "config.h"
@ -115,7 +115,7 @@ static ULONG WINAPI IDropTargetHelper_fnAddRef (IDropTargetHelper * iface)
IDropTargetHelperImpl *This = (IDropTargetHelperImpl *)iface; IDropTargetHelperImpl *This = (IDropTargetHelperImpl *)iface;
ULONG refCount = InterlockedIncrement(&This->ref); ULONG refCount = InterlockedIncrement(&This->ref);
TRACE ("(%p)->(count=%lu)\n", This, refCount - 1); TRACE ("(%p)->(count=%u)\n", This, refCount - 1);
return refCount; return refCount;
} }
@ -125,7 +125,7 @@ static ULONG WINAPI IDropTargetHelper_fnRelease (IDropTargetHelper * iface)
IDropTargetHelperImpl *This = (IDropTargetHelperImpl *)iface; IDropTargetHelperImpl *This = (IDropTargetHelperImpl *)iface;
ULONG refCount = InterlockedDecrement(&This->ref); ULONG refCount = InterlockedDecrement(&This->ref);
TRACE ("(%p)->(count=%lu)\n", This, refCount + 1); TRACE ("(%p)->(count=%u)\n", This, refCount + 1);
if (!refCount) { if (!refCount) {
TRACE("-- destroying (%p)\n", This); TRACE("-- destroying (%p)\n", This);
@ -143,7 +143,7 @@ static HRESULT WINAPI IDropTargetHelper_fnDragEnter (
DWORD dwEffect) DWORD dwEffect)
{ {
IDropTargetHelperImpl *This = (IDropTargetHelperImpl *)iface; 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; return E_NOTIMPL;
} }
@ -157,14 +157,14 @@ static HRESULT WINAPI IDropTargetHelper_fnDragLeave (IDropTargetHelper * iface)
static HRESULT WINAPI IDropTargetHelper_fnDragOver (IDropTargetHelper * iface, POINT* ppt, DWORD dwEffect) static HRESULT WINAPI IDropTargetHelper_fnDragOver (IDropTargetHelper * iface, POINT* ppt, DWORD dwEffect)
{ {
IDropTargetHelperImpl *This = (IDropTargetHelperImpl *)iface; 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; return E_NOTIMPL;
} }
static HRESULT WINAPI IDropTargetHelper_fnDrop (IDropTargetHelper * iface, IDataObject* pDataObject, POINT* ppt, DWORD dwEffect) static HRESULT WINAPI IDropTargetHelper_fnDrop (IDropTargetHelper * iface, IDataObject* pDataObject, POINT* ppt, DWORD dwEffect)
{ {
IDropTargetHelperImpl *This = (IDropTargetHelperImpl *)iface; 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; return E_NOTIMPL;
} }

12
reactos/dll/win32/shell32/enumidlist.c
View file

@ -15,7 +15,7 @@
* *
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software * 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> #include <stdarg.h>
@ -116,7 +116,7 @@ BOOL CreateFolderEnumList(
static const WCHAR dot[] = { '.',0 }; static const WCHAR dot[] = { '.',0 };
static const WCHAR dotdot[] = { '.','.',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; if(!lpszPath || !lpszPath[0]) return FALSE;
@ -246,7 +246,7 @@ static ULONG WINAPI IEnumIDList_fnAddRef(
IEnumIDListImpl *This = (IEnumIDListImpl *)iface; IEnumIDListImpl *This = (IEnumIDListImpl *)iface;
ULONG refCount = InterlockedIncrement(&This->ref); ULONG refCount = InterlockedIncrement(&This->ref);
TRACE("(%p)->(%lu)\n", This, refCount - 1); TRACE("(%p)->(%u)\n", This, refCount - 1);
return refCount; return refCount;
} }
@ -259,7 +259,7 @@ static ULONG WINAPI IEnumIDList_fnRelease(
IEnumIDListImpl *This = (IEnumIDListImpl *)iface; IEnumIDListImpl *This = (IEnumIDListImpl *)iface;
ULONG refCount = InterlockedDecrement(&This->ref); ULONG refCount = InterlockedDecrement(&This->ref);
TRACE("(%p)->(%lu)\n", This, refCount + 1); TRACE("(%p)->(%u)\n", This, refCount + 1);
if (!refCount) { if (!refCount) {
TRACE(" destroying IEnumIDList(%p)\n",This); TRACE(" destroying IEnumIDList(%p)\n",This);
@ -285,7 +285,7 @@ static HRESULT WINAPI IEnumIDList_fnNext(
HRESULT hr = S_OK; HRESULT hr = S_OK;
LPITEMIDLIST temp; 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 /* 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) * subsystems actually use it (and so may a third party browser)
@ -329,7 +329,7 @@ static HRESULT WINAPI IEnumIDList_fnSkip(
DWORD dwIndex; DWORD dwIndex;
HRESULT hr = S_OK; HRESULT hr = S_OK;
TRACE("(%p)->(%lu)\n",This,celt); TRACE("(%p)->(%u)\n",This,celt);
for(dwIndex = 0; dwIndex < celt; dwIndex++) for(dwIndex = 0; dwIndex < celt; dwIndex++)
{ if(!This->mpCurrent) { if(!This->mpCurrent)

2
reactos/dll/win32/shell32/enumidlist.h
View file

@ -11,7 +11,7 @@
* *
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software * 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__ #ifndef __ENUMIDLIST_H__
#define __ENUMIDLIST_H__ #define __ENUMIDLIST_H__

14
reactos/dll/win32/shell32/shellreg.c
View file

@ -15,7 +15,7 @@
* *
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software * 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" #include "config.h"
@ -30,9 +30,7 @@
#include "wingdi.h" #include "wingdi.h"
#include "winuser.h" #include "winuser.h"
#include "shlobj.h" #include "shlobj.h"
#include "winerror.h"
#include "winreg.h" #include "winreg.h"
#include "winnls.h"
#include "undocshell.h" #include "undocshell.h"
#include "wine/winbase16.h" #include "wine/winbase16.h"
@ -67,6 +65,16 @@ HRESULT WINAPI SHRegOpenKeyW (
return RegOpenKeyW( hkey, 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);
}
/************************************************************************* /*************************************************************************
* SHRegQueryValueExA [SHELL32.509] * SHRegQueryValueExA [SHELL32.509]
* *

12
reactos/dll/win32/shell32/shellstring.c
View file

@ -13,7 +13,7 @@
* *
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software * 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> #include <string.h>
@ -27,13 +27,11 @@
#include "windef.h" #include "windef.h"
#include "winbase.h" #include "winbase.h"
#include "winnls.h" #include "winnls.h"
#include "winerror.h"
#include "wingdi.h" #include "wingdi.h"
#include "winuser.h" #include "winuser.h"
#include "winreg.h" #include "winreg.h"
#include "shlobj.h" #include "shlobj.h"
#include "shellapi.h"
#include "shlwapi.h" #include "shlwapi.h"
#include "shell32_main.h" #include "shell32_main.h"
#include "undocshell.h" #include "undocshell.h"
@ -46,7 +44,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell);
BOOL WINAPI StrRetToStrNA(LPSTR dest, DWORD len, LPSTRRET src, const ITEMIDLIST *pidl) 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, dest,len,src,
(src->uType == STRRET_WSTR) ? "STRRET_WSTR" : (src->uType == STRRET_WSTR) ? "STRRET_WSTR" :
(src->uType == STRRET_CSTR) ? "STRRET_CSTR" : (src->uType == STRRET_CSTR) ? "STRRET_CSTR" :
@ -84,7 +82,7 @@ BOOL WINAPI StrRetToStrNA(LPSTR dest, DWORD len, LPSTRRET src, const ITEMIDLIST
BOOL WINAPI StrRetToStrNW(LPWSTR dest, DWORD len, LPSTRRET src, const ITEMIDLIST *pidl) 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, dest,len,src,
(src->uType == STRRET_WSTR) ? "STRRET_WSTR" : (src->uType == STRRET_WSTR) ? "STRRET_WSTR" :
(src->uType == STRRET_CSTR) ? "STRRET_CSTR" : (src->uType == STRRET_CSTR) ? "STRRET_CSTR" :
@ -243,7 +241,7 @@ DWORD WINAPI CheckEscapesA(
LPWSTR wString; LPWSTR wString;
DWORD ret = 0; 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)); wString = (LPWSTR)LocalAlloc(LPTR, len * sizeof(WCHAR));
if (wString) if (wString)
{ {
@ -269,7 +267,7 @@ DWORD WINAPI CheckEscapesW(
DWORD size = lstrlenW(string); DWORD size = lstrlenW(string);
LPWSTR s, d; 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) if (StrPBrkW(string, strEscapedChars) && size + 2 <= len)
{ {

7
reactos/dll/win32/shell32/shlfsbind.c
View file

@ -16,7 +16,7 @@
* *
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software * 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" #include "config.h"
@ -28,7 +28,6 @@
#include "windef.h" #include "windef.h"
#include "winbase.h" #include "winbase.h"
#include "winreg.h"
#include "winuser.h" #include "winuser.h"
#include "shlobj.h" #include "shlobj.h"
#include "shell32_main.h" #include "shell32_main.h"
@ -179,7 +178,7 @@ static ULONG WINAPI IFileSystemBindData_fnAddRef(IFileSystemBindData *iface)
IFileSystemBindDataImpl *This = (IFileSystemBindDataImpl *)iface; IFileSystemBindDataImpl *This = (IFileSystemBindDataImpl *)iface;
ULONG refCount = InterlockedIncrement(&This->ref); ULONG refCount = InterlockedIncrement(&This->ref);
TRACE("(%p)->(count=%li)\n", This, refCount - 1); TRACE("(%p)->(count=%i)\n", This, refCount - 1);
return refCount; return refCount;
} }
@ -189,7 +188,7 @@ static ULONG WINAPI IFileSystemBindData_fnRelease(IFileSystemBindData *iface)
IFileSystemBindDataImpl *This = (IFileSystemBindDataImpl *)iface; IFileSystemBindDataImpl *This = (IFileSystemBindDataImpl *)iface;
ULONG refCount = InterlockedDecrement(&This->ref); ULONG refCount = InterlockedDecrement(&This->ref);
TRACE("(%p)->(count=%li)\n", This, refCount + 1); TRACE("(%p)->(count=%i)\n", This, refCount + 1);
if (!refCount) if (!refCount)
{ {

38
reactos/dll/win32/shell32/shlmenu.c
View file

@ -15,7 +15,7 @@
* *
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software * 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> #include <stdarg.h>
@ -32,7 +32,6 @@
#include "undocshell.h" #include "undocshell.h"
#include "shlwapi.h" #include "shlwapi.h"
#include "shell32_main.h" #include "shell32_main.h"
#include "shlguid.h"
#include "pidl.h" #include "pidl.h"
#include "wine/debug.h" #include "wine/debug.h"
@ -90,7 +89,7 @@ static LPFMINFO FM_GetMenuInfo(HMENU hmenu)
if ((menudata == 0) || (MenuInfo.cbSize != sizeof(MENUINFO))) 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; return 0;
} }
@ -115,9 +114,7 @@ static LPFMINFO FM_SetMenuParameter(
menudata = FM_GetMenuInfo(hmenu); menudata = FM_GetMenuInfo(hmenu);
if ( menudata->pidl) SHFree(menudata->pidl);
{ SHFree(menudata->pidl);
}
menudata->uID = uID; menudata->uID = uID;
menudata->pidl = ILClone(pidl); menudata->pidl = ILClone(pidl);
@ -155,7 +152,7 @@ static int FM_InitMenuPopup(HMENU hmenu, LPCITEMIDLIST pAlternatePidl)
if ((menudata == 0) || (MenuInfo.cbSize != sizeof(MENUINFO))) 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; return 0;
} }
@ -267,7 +264,7 @@ HMENU WINAPI FileMenu_Create (
HMENU hMenu = CreatePopupMenu(); 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); crBorderColor, nBorderWidth, hBorderBmp, nSelHeight, uFlags, hMenu);
menudata = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(FMINFO)); menudata = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(FMINFO));
@ -299,9 +296,7 @@ void WINAPI FileMenu_Destroy (HMENU hmenu)
menudata = FM_GetMenuInfo(hmenu); menudata = FM_GetMenuInfo(hmenu);
if ( menudata->pidl) SHFree( menudata->pidl);
{ SHFree( menudata->pidl);
}
HeapFree(GetProcessHeap(), 0, menudata); HeapFree(GetProcessHeap(), 0, menudata);
DestroyMenu (hmenu); DestroyMenu (hmenu);
@ -375,7 +370,7 @@ static BOOL FileMenu_AppendItemW(
menudata = (LPFMINFO)MenuInfo.dwMenuData; menudata = (LPFMINFO)MenuInfo.dwMenuData;
if ((menudata == 0) || (MenuInfo.cbSize != sizeof(MENUINFO))) 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; return 0;
} }
@ -485,7 +480,7 @@ HMENU WINAPI FileMenu_FindSubMenuByPidl(
int WINAPI FileMenu_AppendFilesForPidl( int WINAPI FileMenu_AppendFilesForPidl(
HMENU hmenu, HMENU hmenu,
LPCITEMIDLIST pidl, LPCITEMIDLIST pidl,
BOOL bAddSeperator) BOOL bAddSeparator)
{ {
LPFMINFO menudata; LPFMINFO menudata;
@ -495,10 +490,10 @@ int WINAPI FileMenu_AppendFilesForPidl(
FM_InitMenuPopup(hmenu, pidl); FM_InitMenuPopup(hmenu, pidl);
if (bAddSeperator) if (bAddSeparator)
FileMenu_AppendItemW (hmenu, FM_SEPARATOR, 0, 0, 0, FM_DEFAULT_HEIGHT); 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; return 0;
} }
@ -637,7 +632,7 @@ LRESULT WINAPI FileMenu_DrawItem(
Shell_GetImageList(0, &hImageList); Shell_GetImageList(0, &hImageList);
ImageList_Draw(hImageList, pMyItem->iIconIndex, lpdis->hDC, xi, yi, ILD_NORMAL); 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); SetTextColor(lpdis->hDC, clrPrevText);
SetBkColor(lpdis->hDC, clrPrevBkgnd); SetBkColor(lpdis->hDC, clrPrevBkgnd);
@ -666,7 +661,7 @@ LRESULT WINAPI FileMenu_HandleMenuChar(
HMENU hMenu, HMENU hMenu,
WPARAM wParam) WPARAM wParam)
{ {
FIXME("%p 0x%08x\n",hMenu,wParam); FIXME("%p 0x%08lx\n",hMenu,wParam);
return 0; return 0;
} }
@ -692,8 +687,7 @@ BOOL WINAPI FileMenu_DeleteAllItems (HMENU hmenu)
for (i = 0; i < GetMenuItemCount( hmenu ); i++) for (i = 0; i < GetMenuItemCount( hmenu ); i++)
{ GetMenuItemInfoW(hmenu, i, TRUE, &mii ); { GetMenuItemInfoW(hmenu, i, TRUE, &mii );
if (mii.dwItemData) SHFree((LPFMINFO)mii.dwItemData);
SHFree((LPFMINFO)mii.dwItemData);
if (mii.hSubMenu) if (mii.hSubMenu)
FileMenu_Destroy(mii.hSubMenu); FileMenu_Destroy(mii.hSubMenu);
@ -799,7 +793,7 @@ DWORD WINAPI FileMenu_GetItemExtent (HMENU hMenu, UINT uPos)
FIXME("%p 0x%08x\n", hMenu, uPos); FIXME("%p 0x%08x\n", hMenu, uPos);
if (GetMenuItemRect(0, hMenu, uPos, &rect)) 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); rect.right, rect.left, rect.top, rect.bottom);
return ((rect.right-rect.left)<<16) + (rect.top-rect.bottom); return ((rect.right-rect.left)<<16) + (rect.top-rect.bottom);
} }
@ -833,7 +827,7 @@ void WINAPI FileMenu_AbortInitMenu (void)
*/ */
LPVOID WINAPI SHFind_InitMenuPopup (HMENU hMenu, HWND hWndParent, DWORD w, DWORD x) 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); hMenu,hWndParent,w,x);
return NULL; /* this is supposed to be a pointer */ return NULL; /* this is supposed to be a pointer */
} }
@ -872,7 +866,7 @@ HRESULT WINAPI Shell_MergeMenus (HMENU hmDst, HMENU hmSrc, UINT uInsert, UINT uI
WCHAR szName[256]; WCHAR szName[256];
UINT uTemp, uIDMax = uIDAdjust; 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); hmDst, hmSrc, uInsert, uIDAdjust, uIDAdjustMax, uFlags);
if (!hmDst || !hmSrc) if (!hmDst || !hmSrc)

6
reactos/dll/win32/shell32/shpolicy.c
View file

@ -15,7 +15,7 @@
* *
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software * 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: * NOTES:
* *
@ -133,7 +133,7 @@ static const char strNoClose[] = {"NoClose"};
static const char strNoRun[] = {"NoRun"}; static const char strNoRun[] = {"NoRun"};
/* policy data array */ /* policy data array */
POLICYDATA sh32_policy_table[] = static POLICYDATA sh32_policy_table[] =
{ {
{ {
REST_NORUN, REST_NORUN,
@ -796,7 +796,7 @@ POLICYDATA sh32_policy_table[] =
0, 0,
0, 0,
SHELL_NO_POLICY SHELL_NO_POLICY
} }
}; };
/************************************************************************* /*************************************************************************