Ros-diffs

ros-diffs@reactos.org

81390 discussions

[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
by janderwald＠svn.reactos.org 10 Oct '07

10 Oct '07

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 - } + } }; /*************************************************************************

1 0

[janderwald] 29484: sync to wine head Andrew Talbot <Andrew.Talbot@talbotville.com> Exclude unused headers. Mikoaj Zalewski <mikolaj@zalewski.pl> autocomplete: Don't use sel uninitialized.
by janderwald＠svn.reactos.org 10 Oct '07

10 Oct '07

Author: janderwald Date: Thu Oct 11 01:52:22 2007 New Revision: 29484 URL: http://svn.reactos.org/svn/reactos?rev=29484&view=rev Log: sync to wine head Andrew Talbot <Andrew.Talbot(a)talbotville.com> Exclude unused headers. Mikoaj Zalewski <mikolaj(a)zalewski.pl> autocomplete: Don't use sel uninitialized. Modified: trunk/reactos/dll/win32/shell32/autocomplete.c Modified: trunk/reactos/dll/win32/shell32/autocomplete.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/autocomp… ============================================================================== --- trunk/reactos/dll/win32/shell32/autocomplete.c (original) +++ trunk/reactos/dll/win32/shell32/autocomplete.c Thu Oct 11 01:52:22 2007 @@ -39,7 +39,6 @@ #include <stdlib.h> #include <string.h> #include <stdio.h> - #define COBJMACROS #include "wine/debug.h" @@ -52,7 +51,6 @@ #include "objbase.h" #include "pidl.h" -#include "shlguid.h" #include "shlobj.h" #include "shldisp.h" #include "debughlp.h" @@ -625,7 +623,7 @@ { IAutoCompleteImpl *This = (IAutoCompleteImpl *)GetWindowLongPtrW(hwnd, GWLP_USERDATA); WCHAR *msg; - int sel = -1, len; + int sel, len; switch (uMsg) { case WM_MOUSEMOVE: @@ -633,9 +631,11 @@ SendMessageW(hwnd, LB_SETCURSEL, (WPARAM)sel, (LPARAM)0); break; case WM_LBUTTONDOWN: - len = SendMessageW(This->hwndListBox, LB_GETTEXTLEN, sel, (LPARAM)NULL); + sel = SendMessageW(hwnd, LB_GETCURSEL, 0, 0); + if (sel < 0) + break; + len = SendMessageW(This->hwndListBox, LB_GETTEXTLEN, sel, 0); msg = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (len+1)*sizeof(WCHAR)); - sel = (INT)SendMessageW(hwnd, LB_GETCURSEL, 0, 0); SendMessageW(hwnd, LB_GETTEXT, sel, (LPARAM)msg); SendMessageW(This->hwndEdit, WM_SETTEXT, 0, (LPARAM)msg); SendMessageW(This->hwndEdit, EM_SETSEL, 0, lstrlenW(msg));

1 0

[janderwald] 29483: - fix RegLoadMUIStringA|W prototype
by janderwald＠svn.reactos.org 10 Oct '07

10 Oct '07

Author: janderwald Date: Thu Oct 11 01:19:05 2007 New Revision: 29483 URL: http://svn.reactos.org/svn/reactos?rev=29483&view=rev Log: - fix RegLoadMUIStringA|W prototype Modified: trunk/reactos/dll/win32/advapi32/advapi32.def trunk/reactos/dll/win32/advapi32/reg/reg.c Modified: trunk/reactos/dll/win32/advapi32/advapi32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/advapi3… ============================================================================== --- trunk/reactos/dll/win32/advapi32/advapi32.def (original) +++ trunk/reactos/dll/win32/advapi32/advapi32.def Thu Oct 11 01:19:05 2007 @@ -501,8 +501,8 @@ RegGetValueW@28 RegLoadKeyA@12 RegLoadKeyW@12 -RegLoadMUIStringA@24 -RegLoadMUIStringW@24 +RegLoadMUIStringA@28 +RegLoadMUIStringW@28 RegNotifyChangeKeyValue@20 RegOpenCurrentUser@8 RegOpenKeyA@12 Modified: trunk/reactos/dll/win32/advapi32/reg/reg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/reg/reg… ============================================================================== --- trunk/reactos/dll/win32/advapi32/reg/reg.c (original) +++ trunk/reactos/dll/win32/advapi32/reg/reg.c Thu Oct 11 01:19:05 2007 @@ -4858,12 +4858,13 @@ RegLoadMUIStringW(IN HKEY hKey, IN LPCWSTR pszValue OPTIONAL, OUT LPWSTR pszOutBuf, - IN ULONG cbOutBuf, - IN ULONG Reserved, + IN DWORD cbOutBuf, + OUT LPDWORD pcbData OPTIONAL, + IN DWORD Flags, IN LPCWSTR pszDirectory OPTIONAL) { - FIXME("RegLoadMUIStringW(0x%p, 0x%p, 0x%p, 0x%x, 0x%x, 0x%p) UNIMPLEMENTED!\n", - hKey, pszValue, pszOutBuf, cbOutBuf, Reserved, pszDirectory); + FIXME("RegLoadMUIStringW(0x%p, 0x%p, 0x%p, 0x%x, 0x%p, 0x%x, 0x%p) UNIMPLEMENTED!\n", + hKey, pszValue, pszOutBuf, cbOutBuf, pcbData, Flags, pszDirectory); return ERROR_CALL_NOT_IMPLEMENTED; } @@ -4877,12 +4878,13 @@ RegLoadMUIStringA(IN HKEY hKey, IN LPCSTR pszValue OPTIONAL, OUT LPSTR pszOutBuf, - IN ULONG cbOutBuf, - IN ULONG Reserved, + IN DWORD cbOutBuf, + OUT LPDWORD pcbData OPTIONAL, + IN DWORD Flags, IN LPCSTR pszDirectory OPTIONAL) { - FIXME("RegLoadMUIStringA(0x%p, 0x%p, 0x%p, 0x%x, 0x%x, 0x%p) UNIMPLEMENTED!\n", - hKey, pszValue, pszOutBuf, cbOutBuf, Reserved, pszDirectory); + FIXME("RegLoadMUIStringA(0x%p, 0x%p, 0x%p, 0x%x, 0x%p, 0x%x, 0x%p) UNIMPLEMENTED!\n", + hKey, pszValue, pszOutBuf, cbOutBuf, pcbData, Flags, pszDirectory); return ERROR_CALL_NOT_IMPLEMENTED; }

1 0

[janderwald] 29482: - fix RegLoadMUIStringA|W prototype
by janderwald＠svn.reactos.org 10 Oct '07

10 Oct '07

Author: janderwald Date: Thu Oct 11 01:18:59 2007 New Revision: 29482 URL: http://svn.reactos.org/svn/reactos?rev=29482&view=rev Log: - fix RegLoadMUIStringA|W prototype Modified: trunk/reactos/include/psdk/winreg.h Modified: trunk/reactos/include/psdk/winreg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winreg.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/winreg.h (original) +++ trunk/reactos/include/psdk/winreg.h Thu Oct 11 01:18:59 2007 @@ -115,8 +115,8 @@ LONG WINAPI RegLoadKeyA(HKEY,LPCSTR,LPCSTR); LONG WINAPI RegLoadKeyW(HKEY,LPCWSTR,LPCWSTR); #if (_WIN32_WINNT >= 0x0600) -LONG WINAPI RegLoadMUIStringA(HKEY,LPCSTR,LPSTR,ULONG,ULONG,LPCSTR); -LONG WINAPI RegLoadMUIStringW(HKEY,LPCWSTR,LPWSTR,ULONG,ULONG,LPCWSTR); +LONG WINAPI RegLoadMUIStringA(HKEY,LPCSTR,LPSTR,DWORD,LPDWORD,DWORD,LPCSTR); +LONG WINAPI RegLoadMUIStringW(HKEY,LPCWSTR,LPWSTR,DWORD,LPDWORD,DWORD,LPCWSTR); #endif LONG WINAPI RegNotifyChangeKeyValue(HKEY,BOOL,DWORD,HANDLE,BOOL); LONG WINAPI RegOpenCurrentUser(REGSAM,PHKEY);

1 0

[janderwald] 29481: - add ntquery.h from Wine (rev 1.3)
by janderwald＠svn.reactos.org 10 Oct '07

10 Oct '07

Author: janderwald Date: Thu Oct 11 01:03:27 2007 New Revision: 29481 URL: http://svn.reactos.org/svn/reactos?rev=29481&view=rev Log: - add ntquery.h from Wine (rev 1.3) Added: trunk/reactos/include/psdk/ntquery.h (with props) Added: trunk/reactos/include/psdk/ntquery.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntquery.h?rev… ============================================================================== --- trunk/reactos/include/psdk/ntquery.h (added) +++ trunk/reactos/include/psdk/ntquery.h Thu Oct 11 01:03:27 2007 @@ -1,0 +1,82 @@ +/* + * Copyright 2006 Mike McCormack + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_NTQUERY_H__ +#define __WINE_NTQUERY_H__ + +/* FIXME: #include <stgprop.h> */ + +#include <pshpack4.h> + +typedef struct _CI_STATE +{ + DWORD cbStruct; + DWORD cWordList; + DWORD cPersistentIndex; + DWORD cQueries; + DWORD cDocuments; + DWORD cFreshTest; + DWORD dwMergeProgress; + DWORD eState; + DWORD cFilteredDocuments; + DWORD cTotalDocuments; + DWORD cPendingScans; + DWORD dwIndexSize; + DWORD cUniqueKeys; + DWORD cSeqQDocuments; + DWORD dwPropCacheSize; +} CI_STATE; + +#include <poppack.h> + +#define PSGUID_STORAGE {0xb725f130, 0x47ef, 0x101a, {0xa5, 0xf1, 0x02, 0x60, 0x8c, 0x9e, 0xeb, 0xac}} +#define PID_STG_DIRECTORY ((PROPID)0x02) +#define PID_STG_CLASSID ((PROPID)0x03) +#define PID_STG_STORAGETYPE ((PROPID)0x04) +#define PID_STG_VOLUME_ID ((PROPID)0x05) +#define PID_STG_PARENT_WORKID ((PROPID)0x06) +#define PID_STG_SECONDARYSTORE ((PROPID)0x07) +#define PID_STG_FILEINDEX ((PROPID)0x08) +#define PID_STG_LASTCHANGEUSN ((PROPID)0x09) +#define PID_STG_NAME ((PROPID)0x0a) +#define PID_STG_PATH ((PROPID)0x0b) +#define PID_STG_SIZE ((PROPID)0x0c) +#define PID_STG_ATTRIBUTES ((PROPID)0x0d) +#define PID_STG_WRITETIME ((PROPID)0x0e) +#define PID_STG_CREATETIME ((PROPID)0x0f) +#define PID_STG_ACCESSTIME ((PROPID)0x10) +#define PID_STG_CHANGETIME ((PROPID)0x11) +#define PID_STG_CONTENTS ((PROPID)0x13) +#define PID_STG_SHORTNAME ((PROPID)0x14) +#define PID_STG_MAX PID_STG_SHORTNAME + + +#ifdef __cplusplus +extern "C" { +#endif + +STDAPI CIState(WCHAR const *, WCHAR const *, CI_STATE *); +STDAPI LocateCatalogsA(CHAR const *, ULONG, CHAR *, ULONG *, CHAR *, ULONG *); +STDAPI LocateCatalogsW(WCHAR const *, ULONG, WCHAR *, ULONG *, WCHAR *, ULONG *); +#define LocateCatalogs WINELIB_NAME_AW(LocateCatalogs) + +#ifdef __cplusplus +} +#endif + +#endif Propchange: trunk/reactos/include/psdk/ntquery.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[janderwald] 29480: - add __MINGW_NOTHROW macro (required for shell32 sync used in dirent.h)
by janderwald＠svn.reactos.org 10 Oct '07

10 Oct '07

Author: janderwald Date: Thu Oct 11 00:53:47 2007 New Revision: 29480 URL: http://svn.reactos.org/svn/reactos?rev=29480&view=rev Log: - add __MINGW_NOTHROW macro (required for shell32 sync used in dirent.h) Modified: trunk/reactos/include/crt/_mingw.h Modified: trunk/reactos/include/crt/_mingw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/_mingw.h?rev=2… ============================================================================== --- trunk/reactos/include/crt/_mingw.h (original) +++ trunk/reactos/include/crt/_mingw.h Thu Oct 11 00:53:47 2007 @@ -164,6 +164,12 @@ #define __MINGW_ATTRIB_DEPRECATED #endif /* GNUC >= 3.1 */ +#if __MINGW_GNUC_PREREQ (3, 3) +#define __MINGW_NOTHROW __attribute__ ((__nothrow__)) +#else +#define __MINGW_NOTHROW +#endif /* GNUC >= 3.3 */ + #ifndef __MSVCRT_VERSION__ /* High byte is the major version, low byte is the minor. */ # define __MSVCRT_VERSION__ 0x0600

1 0

[cfinck] 29479: - Set all Bugzilla text files to svn:eol-style "LF". As far as I know, Bugzilla can get into trouble, when another line-ending style is used. - Remove the unneeded "CVS" subdirectories and ".cvsignore" files from the "bugzilla" directory.
by cfinck＠svn.reactos.org 10 Oct '07

10 Oct '07

1 0

[cfinck] 29478: Update to MediaWiki 1.10.2 The new release contains many security fixes.
by cfinck＠svn.reactos.org 10 Oct '07

10 Oct '07

1 0

[fireball] 29477: - Copy kernel's IDT entries to the IDT we've got from the bootloader. Fixes boot-process initiated by ntldr-compatible loaders.
by fireball＠svn.reactos.org 10 Oct '07

10 Oct '07

Author: fireball Date: Wed Oct 10 16:39:54 2007 New Revision: 29477 URL: http://svn.reactos.org/svn/reactos?rev=29477&view=rev Log: - Copy kernel's IDT entries to the IDT we've got from the bootloader. Fixes boot-process initiated by ntldr-compatible loaders. Modified: trunk/reactos/ntoskrnl/ke/i386/kiinit.c Modified: trunk/reactos/ntoskrnl/ke/i386/kiinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/kiinit.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/kiinit.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/kiinit.c Wed Oct 10 16:39:54 2007 @@ -661,6 +661,7 @@ ULONG InitialStack; PKGDTENTRY Gdt; PKIDTENTRY Idt; + KIDTENTRY NmiEntry, DoubleFaultEntry; PKTSS Tss; PKIPCR Pcr; @@ -722,6 +723,19 @@ Ke386SetDs(KGDT_R3_DATA | RPL_MASK); Ke386SetEs(KGDT_R3_DATA | RPL_MASK); + /* Save NMI and double fault traps */ + RtlCopyMemory(&NmiEntry, &Idt[2], sizeof(KIDTENTRY)); + RtlCopyMemory(&DoubleFaultEntry, &Idt[8], sizeof(KIDTENTRY)); + + /* Copy kernel's trap handlers */ + RtlCopyMemory(Idt, + (PVOID)KiIdtDescriptor.Base, + KiIdtDescriptor.Limit + 1); + + /* Restore NMI and double fault */ + RtlCopyMemory(&Idt[2], &NmiEntry, sizeof(KIDTENTRY)); + RtlCopyMemory(&Idt[8], &DoubleFaultEntry, sizeof(KIDTENTRY)); + AppCpuInit: /* Loop until we can release the freeze lock */ do

1 0

[hpoussin] 29476: Cleanup the LinkerScript class and use it Patch by Marc Piulachs, marc dot puilachs at codexchange dot net See issue #2721 for more details.
by hpoussin＠svn.reactos.org 10 Oct '07

10 Oct '07

Author: hpoussin Date: Wed Oct 10 12:44:45 2007 New Revision: 29476 URL: http://svn.reactos.org/svn/reactos?rev=29476&view=rev Log: Cleanup the LinkerScript class and use it Patch by Marc Piulachs, marc dot puilachs at codexchange dot net See issue #2721 for more details. Modified: trunk/reactos/ntoskrnl/ntoskrnl.rbuild trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp trunk/reactos/tools/rbuild/linkerscript.cpp trunk/reactos/tools/rbuild/module.cpp trunk/reactos/tools/rbuild/rbuild.h Modified: trunk/reactos/ntoskrnl/ntoskrnl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.rbuild?r… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.rbuild (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.rbuild Wed Oct 10 12:44:45 2007 @@ -422,4 +422,5 @@ <linkerflag>-nostartfiles</linkerflag> <linkerflag>-nostdlib</linkerflag> <linkerflag>-lgcc</linkerflag> + <linkerscript>ntoskrnl_$(ARCH).lnk</linkerscript> </module> Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Wed Oct 10 12:44:45 2007 @@ -1598,7 +1598,7 @@ string linkerScriptArgument; if ( module.linkerScript != NULL ) - linkerScriptArgument = ssprintf ( "-Wl,-T,%s", module.linkerScript->directory.c_str () ); + linkerScriptArgument = ssprintf ( "-Wl,-T,%s", backend->GetFullName ( module.linkerScript->file ).c_str () ); else linkerScriptArgument = ""; @@ -2469,9 +2469,7 @@ string dependencies = linkDepsMacro + " " + objectsMacro; - string linkerParameters = ssprintf ( "-Wl,-T,%s%cntoskrnl_$(ARCH).lnk -Wl,--subsystem,native -Wl,--entry,%s -Wl,--image-base,%s", - module.output->relative_path.c_str (), - cSep, + string linkerParameters = ssprintf ( "-Wl,--subsystem,native -Wl,--entry,%s -Wl,--image-base,%s", module.GetEntryPoint(true).c_str (), module.baseaddress.c_str () ); GenerateLinkerCommand ( dependencies, Modified: trunk/reactos/tools/rbuild/linkerscript.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/linkerscript.… ============================================================================== --- trunk/reactos/tools/rbuild/linkerscript.cpp (original) +++ trunk/reactos/tools/rbuild/linkerscript.cpp Wed Oct 10 12:44:45 2007 @@ -20,16 +20,10 @@ #include "rbuild.h" -using std::string; -using std::vector; - -LinkerScript::LinkerScript ( const Project& project, - const Module* module, - const XMLElement& node ) - : project ( project ), - module ( module ), - node ( node ), - baseModule ( NULL ) +LinkerScript::LinkerScript ( const XMLElement& node_, + const Module& module_, + const FileLocation& file_ ) + : node(node_), module(module_), file(file_) { } @@ -40,36 +34,4 @@ void LinkerScript::ProcessXML() { - const XMLAttribute* att; - att = node.GetAttribute ( "base", - false ); - if ( att ) - { - bool referenceResolved = false; - if ( att->value == project.name ) - { - basePath = "."; - referenceResolved = true; - } - else - { - const Module* base = project.LocateModule ( att->value ); - if ( base != NULL ) - { - baseModule = base; - basePath = base->output->relative_path; - referenceResolved = true; - } - } - if ( !referenceResolved ) - { - throw XMLInvalidBuildFileException ( - node.location, - "<linkerscript> attribute 'base' references non-existant project or module '%s'", - att->value.c_str() ); - } - directory = NormalizeFilename ( basePath + sSep + node.value ); - } - else - directory = NormalizeFilename ( node.value ); } Modified: trunk/reactos/tools/rbuild/module.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/module.cpp?re… ============================================================================== --- trunk/reactos/tools/rbuild/module.cpp (original) +++ trunk/reactos/tools/rbuild/module.cpp Wed Oct 10 12:44:45 2007 @@ -748,13 +748,31 @@ } else if ( e.name == "linkerscript" ) { + if ( parseContext.ifData ) + { + throw XMLInvalidBuildFileException ( + e.location, + "<linkerscript> is not a valid sub-element of <if>" ); + } if ( linkerScript ) { throw XMLInvalidBuildFileException ( e.location, "Only one <linkerscript> is valid per module" ); } - linkerScript = new LinkerScript ( project, this, e ); + size_t pos = e.value.find_last_of ( "/\\" ); + if ( pos == string::npos ) + { + linkerScript = new LinkerScript ( + e, *this, FileLocation ( SourceDirectory, relative_path, e.value, &e ) ); + } + else + { + string dir = e.value.substr ( 0, pos ); + string name = e.value.substr ( pos + 1); + linkerScript = new LinkerScript ( + e, *this, FileLocation ( SourceDirectory, relative_path + sSep + dir, name, &e ) ); + } subs_invalid = true; } else if ( e.name == "component" ) Modified: trunk/reactos/tools/rbuild/rbuild.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/rbuild.h?rev=… ============================================================================== --- trunk/reactos/tools/rbuild/rbuild.h (original) +++ trunk/reactos/tools/rbuild/rbuild.h Wed Oct 10 12:44:45 2007 @@ -625,16 +625,13 @@ class LinkerScript { public: - const Project& project; - const Module* module; - const XMLElement& node; - const Module* baseModule; - std::string directory; - std::string basePath; - - LinkerScript ( const Project& project, - const Module* module, - const XMLElement& node ); + const XMLElement& node; + const Module& module; + FileLocation file; + + LinkerScript ( const XMLElement& node, + const Module& module, + const FileLocation& file ); ~LinkerScript (); void ProcessXML(); };

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs