Ros-diffs October 2007

ros-diffs@reactos.org

20 participants
708 discussions

[gedmurphy] 29489: add some old code I had floating around. no real in functionality
by gedmurphy＠svn.reactos.org 11 Oct '07

11 Oct '07

Author: gedmurphy Date: Thu Oct 11 13:07:38 2007 New Revision: 29489 URL: http://svn.reactos.org/svn/reactos?rev=29489&view=rev Log: add some old code I had floating around. no real in functionality Added: trunk/reactos/base/applications/mscutils/servman/stop.c (with props) Modified: trunk/reactos/base/applications/mscutils/servman/control.c trunk/reactos/base/applications/mscutils/servman/precomp.h trunk/reactos/base/applications/mscutils/servman/servman.rbuild Modified: trunk/reactos/base/applications/mscutils/servman/control.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/control.c (original) +++ trunk/reactos/base/applications/mscutils/servman/control.c Thu Oct 11 13:07:38 2007 @@ -9,7 +9,7 @@ #include "precomp.h" -static BOOL +BOOL Control(PMAIN_WND_INFO Info, HWND hProgDlg, DWORD Control) @@ -114,25 +114,6 @@ } -BOOL DoStop(PMAIN_WND_INFO Info) -{ - BOOL ret = FALSE; - HWND hProgDlg; - - hProgDlg = CreateProgressDialog(Info->hMainWnd, - Info->pCurrentService->lpServiceName, - IDS_PROGRESS_INFO_STOP); - if (hProgDlg) - { - ret = Control(Info, - hProgDlg, - SERVICE_CONTROL_STOP); - - DestroyWindow(hProgDlg); - } - - return ret; -} BOOL DoPause(PMAIN_WND_INFO Info) { @@ -154,6 +135,7 @@ return ret; } + BOOL DoResume(PMAIN_WND_INFO Info) { BOOL ret = FALSE; @@ -173,4 +155,3 @@ return ret; } - Modified: trunk/reactos/base/applications/mscutils/servman/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/precomp.h (original) +++ trunk/reactos/base/applications/mscutils/servman/precomp.h Thu Oct 11 13:07:38 2007 @@ -75,6 +75,7 @@ BOOL DoStart(PMAIN_WND_INFO Info); /* control */ +BOOL Control(PMAIN_WND_INFO Info, HWND hProgDlg, DWORD Control); BOOL DoStop(PMAIN_WND_INFO Info); BOOL DoPause(PMAIN_WND_INFO Info); BOOL DoResume(PMAIN_WND_INFO Info); Modified: trunk/reactos/base/applications/mscutils/servman/servman.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/servman.rbuild (original) +++ trunk/reactos/base/applications/mscutils/servman/servman.rbuild Thu Oct 11 13:07:38 2007 @@ -27,6 +27,7 @@ <file>query.c</file> <file>servman.c</file> <file>start.c</file> + <file>stop.c</file> </compilationunit> <file>servman.rc</file> <pch>precomp.h</pch> Added: trunk/reactos/base/applications/mscutils/servman/stop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/stop.c (added) +++ trunk/reactos/base/applications/mscutils/servman/stop.c Thu Oct 11 13:07:38 2007 @@ -1,0 +1,96 @@ +/* + * PROJECT: ReactOS Services + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/applications/mscutils/servman/stop.c + * PURPOSE: Stops running a service + * COPYRIGHT: Copyright 2006-2007 Ged Murphy <gedmurphy(a)reactos.org> + * + */ + +#include "precomp.h" + +BOOL +DoStop(PMAIN_WND_INFO Info) +{ + SC_HANDLE hSCManager = NULL; + SC_HANDLE hSc = NULL; + LPQUERY_SERVICE_CONFIG lpServiceConfig = NULL; + HWND hProgDlg; + DWORD BytesNeeded = 0; + BOOL ret = FALSE; + + hSCManager = OpenSCManager(NULL, + NULL, + SC_MANAGER_ENUMERATE_SERVICE); + if (hSCManager == NULL) + { + GetError(); + return FALSE; + } + + hSc = OpenService(hSCManager, + Info->pCurrentService->lpServiceName, + SERVICE_QUERY_CONFIG); + if (hSc) + { + if (!QueryServiceConfig(hSc, + lpServiceConfig, + 0, + &BytesNeeded)) + { + if (GetLastError() == ERROR_INSUFFICIENT_BUFFER) + { + lpServiceConfig = (LPQUERY_SERVICE_CONFIG)HeapAlloc(ProcessHeap, + 0, + BytesNeeded); + if (lpServiceConfig == NULL) + goto cleanup; + + if (QueryServiceConfig(hSc, + lpServiceConfig, + BytesNeeded, + &BytesNeeded)) + { + if (lpServiceConfig->lpDependencies) + { + TCHAR str[500]; + + _sntprintf(str, 499, _T("%s depends on this service, implement the dialog to allow closing of other services"), + lpServiceConfig->lpDependencies); + MessageBox(NULL, str, NULL, 0); + + //FIXME: open 'stop other services' box + } + else + { + hProgDlg = CreateProgressDialog(Info->hMainWnd, + Info->pCurrentService->lpServiceName, + IDS_PROGRESS_INFO_STOP); + if (hProgDlg) + { + ret = Control(Info, + hProgDlg, + SERVICE_CONTROL_STOP); + + DestroyWindow(hProgDlg); + } + } + + HeapFree(ProcessHeap, + 0, + lpServiceConfig); + + lpServiceConfig = NULL; + } + } + } + } + +cleanup: + if (hSCManager != NULL) + CloseServiceHandle(hSCManager); + if (hSc != NULL) + CloseServiceHandle(hSc); + + return ret; +} Propchange: trunk/reactos/base/applications/mscutils/servman/stop.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[janderwald] 29488: Andrew Talbot <Andrew.Talbot@talbotville.com> - Exclude unused headers. Hans Leidekker <hans@it.vu.nl> - Add a stub implementation for SHMapIDListToImageListIndexAsync. Jonathan Ernst <jonathan@ernstfamily.ch> - Update the address of the Free Software Foundation. Martin Fuchs <martin-fuchs@gmx.net> - Fix folder icon index when read from registry. - Change "DWORD dwNr" into "int icon_idx" at several places. ----------------------------------------- ReactOS specific: - PrivateE
by janderwald＠svn.reactos.org 11 Oct '07

11 Oct '07

Author: janderwald Date: Thu Oct 11 12:51:11 2007 New Revision: 29488 URL: http://svn.reactos.org/svn/reactos?rev=29488&view=rev Log: Andrew Talbot <Andrew.Talbot(a)talbotville.com> - Exclude unused headers. Hans Leidekker <hans(a)it.vu.nl> - Add a stub implementation for SHMapIDListToImageListIndexAsync. Jonathan Ernst <jonathan(a)ernstfamily.ch> - Update the address of the Free Software Foundation. Martin Fuchs <martin-fuchs(a)gmx.net> - Fix folder icon index when read from registry. - Change "DWORD dwNr" into "int icon_idx" at several places. ----------------------------------------- ReactOS specific: - PrivateExtractIconW is an undocumented user32 function. Dynamically get the function with GetProcAddress at runtime (readd) Modified: trunk/reactos/dll/win32/shell32/iconcache.c Modified: trunk/reactos/dll/win32/shell32/iconcache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/iconcach… ============================================================================== --- trunk/reactos/dll/win32/shell32/iconcache.c (original) +++ trunk/reactos/dll/win32/shell32/iconcache.c Thu Oct 11 12:51:11 2007 @@ -15,14 +15,13 @@ * * 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" #include "wine/port.h" #include <stdarg.h> -#include <stdio.h> #include <string.h> #include <sys/types.h> #ifdef HAVE_UNISTD_H @@ -40,7 +39,6 @@ #include "shellapi.h" #include "objbase.h" -#include "shlguid.h" #include "pidl.h" #include "shell32_main.h" #include "undocshell.h" @@ -98,7 +96,7 @@ } /* declare SIC_LoadOverlayIcon() */ -static int SIC_LoadOverlayIcon(int idx); +static int SIC_LoadOverlayIcon(int icon_idx); /***************************************************************************** * SIC_OverlayShortcutImage [internal] @@ -474,6 +472,7 @@ ShellBigIconList = 0; LeaveCriticalSection(&SHELL32_SicCS); + //DeleteCriticalSection(&SHELL32_SicCS); //static } /***************************************************************************** @@ -481,7 +480,7 @@ * * Load a shell overlay icon and return its icon cache index. */ -static int SIC_LoadOverlayIcon(int idx) +static int SIC_LoadOverlayIcon(int icon_idx) { WCHAR buffer[1024], wszIdx[8]; HKEY hKeyShellIcons; @@ -496,13 +495,13 @@ static const WCHAR wszNumFmt[] = {'%','d',0}; iconPath = swShell32Name; /* default: load icon from shell32.dll */ - iconIdx = idx; + iconIdx = icon_idx; if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, wszShellIcons, 0, KEY_READ, &hKeyShellIcons) == ERROR_SUCCESS) { DWORD count = sizeof(buffer); - sprintfW(wszIdx, wszNumFmt, idx); + sprintfW(wszIdx, wszNumFmt, icon_idx); /* read icon path and index */ if (RegQueryValueExW(hKeyShellIcons, wszIdx, NULL, NULL, (LPBYTE)buffer, &count) == ERROR_SUCCESS) @@ -631,6 +630,19 @@ } /************************************************************************* + * SHMapIDListToImageListIndexAsync [SHELL32.148] + */ +HRESULT WINAPI SHMapIDListToImageListIndexAsync(IUnknown *pts, IShellFolder *psf, + LPCITEMIDLIST pidl, UINT flags, + void *pfn, void *pvData, void *pvHint, + int *piIndex, int *piIndexSel) +{ + FIXME("(%p, %p, %p, 0x%08x, %p, %p, %p, %p, %p)\n", + pts, psf, pidl, flags, pfn, pvData, pvHint, piIndex, piIndexSel); + return E_FAIL; +} + +/************************************************************************* * Shell_GetCachedImageIndex [SHELL32.72] * */

1 0

[janderwald] 29487: -------------------------------------------------- shfldr_mycomp.c: Rob Shearman <rob@codeweavers.com> Return Unicode strings from all of the IShellFolder::GetDisplayNameOf functions in not running in Win9x mode. Hans Leidekker <hans@it.vu.nl> shell32: Win64 printf format warning fixes. James Hawkins <truiken@gmail.com> janitorial: Remove redundant NULL checks before SHFree. Robert Shearman <rob@codeweavers.com> shell32: Convert ISF_MyComputer_fnGetDisplayNameOf to Unicode. -
by janderwald＠svn.reactos.org 10 Oct '07

10 Oct '07

Author: janderwald Date: Thu Oct 11 03:49:42 2007 New Revision: 29487 URL: http://svn.reactos.org/svn/reactos?rev=29487&view=rev Log: -------------------------------------------------- shfldr_mycomp.c: Rob Shearman <rob(a)codeweavers.com> Return Unicode strings from all of the IShellFolder::GetDisplayNameOf functions in not running in Win9x mode. Hans Leidekker <hans(a)it.vu.nl> shell32: Win64 printf format warning fixes. James Hawkins <truiken(a)gmail.com> janitorial: Remove redundant NULL checks before SHFree. Robert Shearman <rob(a)codeweavers.com> shell32: Convert ISF_MyComputer_fnGetDisplayNameOf to Unicode. -------------------------------------------------- - ReactOS specific: - return always in unicode Modified: trunk/reactos/dll/win32/shell32/shfldr_mycomp.c Modified: trunk/reactos/dll/win32/shell32/shfldr_mycomp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_m… ============================================================================== --- trunk/reactos/dll/win32/shell32/shfldr_mycomp.c (original) +++ trunk/reactos/dll/win32/shell32/shfldr_mycomp.c Thu Oct 11 03:49:42 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" @@ -171,7 +171,7 @@ IGenericSFImpl *This = (IGenericSFImpl *)iface; ULONG refCount = InterlockedIncrement(&This->ref); - TRACE ("(%p)->(count=%lu)\n", This, refCount - 1); + TRACE ("(%p)->(count=%u)\n", This, refCount - 1); return refCount; } @@ -181,13 +181,12 @@ IGenericSFImpl *This = (IGenericSFImpl *)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 IShellFolder(%p)\n", This); - if (This->pidlRoot) - SHFree (This->pidlRoot); + SHFree (This->pidlRoot); LocalFree ((HLOCAL) This); } return refCount; @@ -248,7 +247,7 @@ *ppidl = pidlTemp; - TRACE ("(%p)->(-- ret=0x%08lx)\n", This, hr); + TRACE ("(%p)->(-- ret=0x%08x)\n", This, hr); return hr; } @@ -266,7 +265,7 @@ { BOOL ret = TRUE; - TRACE("(%p)->(flags=0x%08lx)\n", list, dwFlags); + TRACE("(%p)->(flags=0x%08x)\n", list, dwFlags); /* enumerate the folders */ if (dwFlags & SHCONTF_FOLDERS) @@ -326,7 +325,7 @@ { IGenericSFImpl *This = (IGenericSFImpl *)iface; - TRACE("(%p)->(HWND=%p flags=0x%08lx pplist=%p)\n", This, + TRACE("(%p)->(HWND=%p flags=0x%08x pplist=%p)\n", This, hwndOwner, dwFlags, ppEnumIDList); *ppEnumIDList = IEnumIDList_Constructor(); @@ -433,7 +432,7 @@ IGenericSFImpl *This = (IGenericSFImpl *)iface; HRESULT hr = S_OK; - TRACE ("(%p)->(cidl=%d apidl=%p mask=%p (0x%08lx))\n", + TRACE ("(%p)->(cidl=%d apidl=%p mask=%p (0x%08x))\n", This, cidl, apidl, rgfInOut, rgfInOut ? *rgfInOut : 0); if (!rgfInOut) @@ -464,7 +463,7 @@ /* make sure SFGAO_VALIDATE is cleared, some apps depend on that */ *rgfInOut &= ~SFGAO_VALIDATE; - TRACE ("-- result=0x%08lx\n", *rgfInOut); + TRACE ("-- result=0x%08x\n", *rgfInOut); return hr; } @@ -543,7 +542,7 @@ hr = E_OUTOFMEMORY; *ppvOut = pObj; - TRACE ("(%p)->hr=0x%08lx\n", This, hr); + TRACE ("(%p)->hr=0x%08x\n", This, hr); return hr; } @@ -555,22 +554,27 @@ { IGenericSFImpl *This = (IGenericSFImpl *)iface; - char szPath[MAX_PATH]; + LPWSTR pszPath; HRESULT hr = S_OK; - TRACE ("(%p)->(pidl=%p,0x%08lx,%p)\n", This, pidl, dwFlags, strRet); + TRACE ("(%p)->(pidl=%p,0x%08x,%p)\n", This, pidl, dwFlags, strRet); pdump (pidl); if (!strRet) return E_INVALIDARG; - szPath[0] = 0x00; + pszPath = CoTaskMemAlloc((MAX_PATH +1) * sizeof(WCHAR)); + if (!pszPath) + return E_OUTOFMEMORY; + + pszPath[0] = 0; if (!pidl->mkid.cb) { /* parsing name like ::{...} */ - lstrcpyA (szPath, "::"); - SHELL32_GUIDToStringA(&CLSID_MyComputer, &szPath[2]); + pszPath[0] = ':'; + pszPath[1] = ':'; + SHELL32_GUIDToStringW(&CLSID_MyComputer, &pszPath[2]); } else if (_ILIsPidlSimple(pidl)) { @@ -622,50 +626,58 @@ * Only the folder itself can know it */ hr = SHELL32_GetDisplayNameOfChild (iface, pidl, - dwFlags, szPath, MAX_PATH); + dwFlags, pszPath, MAX_PATH); } else { - LPSTR p; + LPWSTR p = pszPath; /* parsing name like ::{...} */ - p = lstrcpyA(szPath, "::") + 2; - p += SHELL32_GUIDToStringA(&CLSID_MyComputer, p); - - lstrcatA(p, "\\::"); + p[0] = ':'; + p[1] = ':'; + p += 2; + p += SHELL32_GUIDToStringW(&CLSID_MyComputer, p); + + /* \:: */ + p[0] = '\\'; + p[1] = ':'; + p[2] = ':'; p += 3; - SHELL32_GUIDToStringA(clsid, p); + SHELL32_GUIDToStringW(clsid, p); } } else { /* user friendly name */ - HCR_GetClassNameA (clsid, szPath, MAX_PATH); + HCR_GetClassNameW (clsid, pszPath, MAX_PATH); } } else { /* append my own path */ - _ILSimpleGetText (pidl, szPath, MAX_PATH); + _ILSimpleGetTextW (pidl, pszPath, MAX_PATH); } } else if (_ILIsDrive(pidl)) { - _ILSimpleGetText (pidl, szPath, MAX_PATH); /* append my own path */ + _ILSimpleGetTextW (pidl, pszPath, MAX_PATH); /* append my own path */ /* long view "lw_name (C:)" */ if (!(dwFlags & SHGDN_FORPARSING)) { DWORD dwVolumeSerialNumber, dwMaximumComponetLength, dwFileSystemFlags; - char szDrive[18] = ""; - - GetVolumeInformationA (szPath, szDrive, sizeof (szDrive) - 6, + WCHAR wszDrive[18] = {0}; + static const WCHAR wszOpenBracket[] = {' ','(',0}; + static const WCHAR wszCloseBracket[] = {')',0}; + + GetVolumeInformationW (pszPath, wszDrive, + sizeof(wszDrive)/sizeof(wszDrive[0]) - 6, &dwVolumeSerialNumber, &dwMaximumComponetLength, &dwFileSystemFlags, NULL, 0); - strcat (szDrive, " ("); - strncat (szDrive, szPath, 2); - strcat (szDrive, ")"); - strcpy (szPath, szDrive); + strcatW (wszDrive, wszOpenBracket); + lstrcpynW (wszDrive + strlenW(wszDrive), pszPath, 3); + strcatW (wszDrive, wszCloseBracket); + strcpyW (pszPath, wszDrive); } } else @@ -678,17 +690,18 @@ else { /* Complex pidl. Let the child folder do the work */ - strRet->uType = STRRET_CSTR; - hr = SHELL32_GetDisplayNameOfChild(iface, pidl, dwFlags, szPath, MAX_PATH); + hr = SHELL32_GetDisplayNameOfChild(iface, pidl, dwFlags, pszPath, MAX_PATH); } if (SUCCEEDED (hr)) { - strRet->uType = STRRET_CSTR; - lstrcpynA (strRet->u.cStr, szPath, MAX_PATH); - } - - TRACE ("-- (%p)->(%s)\n", This, szPath); + strRet->uType = STRRET_WSTR; + strRet->u.pOleStr = pszPath; + } + else + CoTaskMemFree(pszPath); + + TRACE ("-- (%p)->(%s)\n", This, strRet->uType == STRRET_CSTR ? strRet->u.cStr : debugstr_w(strRet->u.pOleStr)); return hr; } @@ -709,7 +722,7 @@ LPCOLESTR lpName, DWORD dwFlags, LPITEMIDLIST * pPidlOut) { IGenericSFImpl *This = (IGenericSFImpl *)iface; - FIXME ("(%p)->(%p,pidl=%p,%s,%lu,%p)\n", This, + FIXME ("(%p)->(%p,pidl=%p,%s,%u,%p)\n", This, hwndOwner, pidl, debugstr_w (lpName), dwFlags, pPidlOut); return E_FAIL; } @@ -875,7 +888,7 @@ { IGenericSFImpl *This = impl_from_IPersistFolder2(iface); - TRACE ("(%p)->(count=%lu)\n", This, This->ref); + TRACE ("(%p)->(count=%u)\n", This, This->ref); return IUnknown_AddRef (_IUnknown_ (This)); } @@ -887,7 +900,7 @@ { IGenericSFImpl *This = impl_from_IPersistFolder2(iface); - TRACE ("(%p)->(count=%lu)\n", This, This->ref); + TRACE ("(%p)->(count=%u)\n", This, This->ref); return IUnknown_Release (_IUnknown_ (This)); }

1 0

[peterw] 29486: - Two small Ldr cleanup patches (ntdll and kernel32) by: Mike Nordell
by peterw＠svn.reactos.org 10 Oct '07

10 Oct '07

Author: peterw Date: Thu Oct 11 03:14:20 2007 New Revision: 29486 URL: http://svn.reactos.org/svn/reactos?rev=29486&view=rev Log: - Two small Ldr cleanup patches (ntdll and kernel32) by: Mike Nordell Modified: trunk/reactos/dll/ntdll/ldr/utils.c trunk/reactos/dll/win32/kernel32/misc/ldr.c Modified: trunk/reactos/dll/ntdll/ldr/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/utils.c?rev=… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/utils.c (original) +++ trunk/reactos/dll/ntdll/ldr/utils.c Thu Oct 11 03:14:20 2007 @@ -731,38 +731,30 @@ LdrLoadDll (IN PWSTR SearchPath OPTIONAL, IN PULONG LoadFlags OPTIONAL, IN PUNICODE_STRING Name, - OUT PVOID *BaseAddress OPTIONAL) + OUT PVOID *BaseAddress /* also known as HMODULE*, and PHANDLE 'DllHandle' */) { NTSTATUS Status; - PLDR_DATA_TABLE_ENTRY Module; + PLDR_DATA_TABLE_ENTRY Module; + + PPEB Peb = NtCurrentPeb(); TRACE_LDR("LdrLoadDll, loading %wZ%s%S\n", Name, SearchPath ? L" from " : L"", SearchPath ? SearchPath : L""); - if (Name == NULL) - { - if (BaseAddress) - *BaseAddress = NtCurrentPeb()->ImageBaseAddress; - return STATUS_SUCCESS; - } - - if (BaseAddress) - *BaseAddress = NULL; - Status = LdrpLoadModule(SearchPath, LoadFlags ? *LoadFlags : 0, Name, &Module, BaseAddress); - if (NT_SUCCESS(Status) - && (!LoadFlags || 0 == (*LoadFlags & LOAD_LIBRARY_AS_DATAFILE))) - { - RtlEnterCriticalSection(NtCurrentPeb()->LoaderLock); + + if (NT_SUCCESS(Status) && + (!LoadFlags || 0 == (*LoadFlags & LOAD_LIBRARY_AS_DATAFILE))) + { + RtlEnterCriticalSection(Peb->LoaderLock); Status = LdrpAttachProcess(); - RtlLeaveCriticalSection(NtCurrentPeb()->LoaderLock); - if (NT_SUCCESS(Status) && BaseAddress) - { - *BaseAddress = Module->DllBase; - } - } + RtlLeaveCriticalSection(Peb->LoaderLock); + } + + *BaseAddress = NT_SUCCESS(Status) ? Module->DllBase : NULL; + return Status; } @@ -1324,7 +1316,7 @@ } static NTSTATUS -LdrpGetOrLoadModule(PWCHAR SerachPath, +LdrpGetOrLoadModule(PWCHAR SearchPath, PCHAR Name, PLDR_DATA_TABLE_ENTRY* Module, BOOLEAN Load) @@ -1345,7 +1337,7 @@ Status = LdrFindEntryForName (&DllName, Module, Load); if (Load && !NT_SUCCESS(Status)) { - Status = LdrpLoadModule(SerachPath, + Status = LdrpLoadModule(SearchPath, NtCurrentPeb()->Ldr->Initialized ? 0 : LDRP_PROCESS_CREATION_TIME, &DllName, Module, Modified: trunk/reactos/dll/win32/kernel32/misc/ldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/ld… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/ldr.c (original) +++ trunk/reactos/dll/win32/kernel32/misc/ldr.c Thu Oct 11 03:14:20 2007 @@ -34,10 +34,10 @@ LPWSTR STDCALL GetDllLoadPath(LPCWSTR lpModule) { - ULONG Pos = 0, Length = 0; - PWCHAR EnvironmentBufferW = NULL; - LPCWSTR lpModuleEnd = NULL; - UNICODE_STRING ModuleName; + ULONG Pos = 0, Length = 0; + PWCHAR EnvironmentBufferW = NULL; + LPCWSTR lpModuleEnd = NULL; + UNICODE_STRING ModuleName; if (lpModule != NULL) { @@ -45,16 +45,18 @@ } else { - ModuleName = NtCurrentTeb()->ProcessEnvironmentBlock->ProcessParameters->ImagePathName; - lpModule = ModuleName.Buffer; - lpModuleEnd = lpModule + (ModuleName.Length / sizeof(WCHAR)); + ModuleName = NtCurrentPeb()->ProcessParameters->ImagePathName; + lpModule = ModuleName.Buffer; + lpModuleEnd = lpModule + (ModuleName.Length / sizeof(WCHAR)); } if (lpModule != NULL) { - while (lpModuleEnd > lpModule && *lpModuleEnd != L'/' && - *lpModuleEnd != L'\\' && *lpModuleEnd != L':') + while (lpModuleEnd > lpModule && *lpModuleEnd != L'/' && + *lpModuleEnd != L'\\' && *lpModuleEnd != L':') + { --lpModuleEnd; + } Length = (lpModuleEnd - lpModule) + 1; } @@ -64,9 +66,11 @@ Length += GetEnvironmentVariableW(L"PATH", NULL, 0); EnvironmentBufferW = RtlAllocateHeap(RtlGetProcessHeap(), 0, - Length * sizeof(WCHAR)); + Length * sizeof(WCHAR)); if (EnvironmentBufferW == NULL) + { return NULL; + } if (lpModule) { @@ -75,6 +79,7 @@ Pos += lpModuleEnd - lpModule; EnvironmentBufferW[Pos++] = L';'; } + Pos += GetCurrentDirectoryW(Length, EnvironmentBufferW + Pos); EnvironmentBufferW[Pos++] = L';'; Pos += GetSystemDirectoryW(EnvironmentBufferW + Pos, Length - Pos); @@ -412,40 +417,28 @@ STDCALL GetModuleHandleA ( LPCSTR lpModuleName ) { - UNICODE_STRING UnicodeName; ANSI_STRING ModuleName; - PVOID BaseAddress; NTSTATUS Status; + PTEB pTeb = NtCurrentTeb(); if (lpModuleName == NULL) - return ((HMODULE)NtCurrentPeb()->ImageBaseAddress); - RtlInitAnsiString (&ModuleName, - (LPSTR)lpModuleName); - - /* convert ansi (or oem) string to unicode */ - if (bIsFileApiAnsi) - RtlAnsiStringToUnicodeString (&UnicodeName, - &ModuleName, - TRUE); - else - RtlOemStringToUnicodeString (&UnicodeName, - &ModuleName, - TRUE); - - Status = LdrGetDllHandle (0, - 0, - &UnicodeName, - &BaseAddress); - - RtlFreeUnicodeString (&UnicodeName); - - if (!NT_SUCCESS(Status)) - { - SetLastErrorByStatus (Status); - return NULL; - } - - return ((HMODULE)BaseAddress); + { + return ((HMODULE)pTeb->ProcessEnvironmentBlock->ImageBaseAddress); + } + + RtlInitAnsiString(&ModuleName, lpModuleName); + + Status = RtlAnsiStringToUnicodeString(&pTeb->StaticUnicodeString, + &ModuleName, + FALSE); + + if (NT_SUCCESS(Status)) + { + return GetModuleHandleW(pTeb->StaticUnicodeString.Buffer); + } + + SetLastErrorByStatus(Status); + return FALSE; } @@ -556,30 +549,24 @@ IN LPCSTR lpModuleName OPTIONAL, OUT HMODULE* phModule) { - UNICODE_STRING UnicodeName; ANSI_STRING ModuleName; LPCWSTR lpModuleNameW; NTSTATUS Status; BOOL Ret; + PTEB pTeb = NtCurrentTeb(); + if (dwFlags & GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS) { lpModuleNameW = (LPCWSTR)lpModuleName; } else { - RtlInitAnsiString(&ModuleName, - (LPSTR)lpModuleName); - - /* convert ansi (or oem) string to unicode */ - if (bIsFileApiAnsi) - Status = RtlAnsiStringToUnicodeString(&UnicodeName, - &ModuleName, - TRUE); - else - Status = RtlOemStringToUnicodeString(&UnicodeName, - &ModuleName, - TRUE); + RtlInitAnsiString(&ModuleName, lpModuleName); + + Status = RtlAnsiStringToUnicodeString(&pTeb->StaticUnicodeString, + &ModuleName, + FALSE); if (!NT_SUCCESS(Status)) { @@ -587,17 +574,12 @@ return FALSE; } - lpModuleNameW = UnicodeName.Buffer; + lpModuleNameW = pTeb->StaticUnicodeString.Buffer; } Ret = GetModuleHandleExW(dwFlags, lpModuleNameW, phModule); - - if (!(dwFlags & GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS)) - { - RtlFreeUnicodeString(&UnicodeName); - } return Ret; }

1 0

[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

← Newer
1
...
52
53
54
55
56
57
58
...
71
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2007