Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hpoussin] 29495: Add list of source files in generated makefile
by hpoussin＠svn.reactos.org 11 Oct '07

11 Oct '07

Author: hpoussin Date: Thu Oct 11 14:18:47 2007 New Revision: 29495 URL: http://svn.reactos.org/svn/reactos?rev=29495&view=rev Log: Add list of source files in generated makefile Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp Thu Oct 11 14:18:47 2007 @@ -260,6 +260,8 @@ size_t iend = v.size (); + for ( i = 0; i < iend; i++ ) + v[i]->GenerateSourceMacro(); for ( i = 0; i < iend; i++ ) v[i]->GenerateObjectMacro(); fprintf ( fMakefile, "\n" ); 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 Thu Oct 11 14:18:47 2007 @@ -907,10 +907,76 @@ } void +MingwModuleHandler::GenerateSourceMacros ( + const char* assignmentOperation, + const IfableData& data ) +{ + size_t i; + + const vector<CompilationUnit*>& compilationUnits = data.compilationUnits; + vector<const FileLocation *> headers; + if ( compilationUnits.size () > 0 ) + { + fprintf ( + fMakefile, + "%s %s", + sourcesMacro.c_str (), + assignmentOperation ); + for ( i = 0; i < compilationUnits.size(); i++ ) + { + CompilationUnit& compilationUnit = *compilationUnits[i]; + fprintf ( + fMakefile, + "%s%s", + ( i%10 == 9 ? " \\\n\t" : " " ), + backend->GetFullName ( *compilationUnit.GetFilename () ).c_str () ); + } + fprintf ( fMakefile, "\n" ); + } + + const vector<If*>& ifs = data.ifs; + for ( i = 0; i < ifs.size(); i++ ) + { + If& rIf = *ifs[i]; + if ( rIf.data.defines.size() + || rIf.data.includes.size() + || rIf.data.libraries.size() + || rIf.data.compilationUnits.size() + || rIf.data.compilerFlags.size() + || rIf.data.ifs.size() ) + { + fprintf ( + fMakefile, + "%s (\"$(%s)\",\"%s\")\n", + rIf.negated ? "ifneq" : "ifeq", + rIf.property.c_str(), + rIf.value.c_str() ); + GenerateSourceMacros ( + "+=", + rIf.data ); + fprintf ( + fMakefile, + "endif\n\n" ); + } + } + + vector<CompilationUnit*> sourceCompilationUnits; + GetModuleSpecificCompilationUnits ( sourceCompilationUnits ); + for ( i = 0; i < sourceCompilationUnits.size (); i++ ) + { + fprintf ( + fMakefile, + "%s += %s\n", + sourcesMacro.c_str(), + backend->GetFullName ( *sourceCompilationUnits[i]->GetFilename () ).c_str () ); + } + CleanupCompilationUnitVector ( sourceCompilationUnits ); +} + +void MingwModuleHandler::GenerateObjectMacros ( const char* assignmentOperation, - const IfableData& data, - const vector<LinkerFlag*>* linkerFlags ) + const IfableData& data ) { size_t i; @@ -988,8 +1054,7 @@ rIf.value.c_str() ); GenerateObjectMacros ( "+=", - rIf.data, - NULL ); + rIf.data ); fprintf ( fMakefile, "endif\n\n" ); @@ -1887,14 +1952,26 @@ } void +MingwModuleHandler::GenerateSourceMacro () +{ + sourcesMacro = ssprintf ( "%s_SOURCES", module.name.c_str ()); + + GenerateSourceMacros ( + "=", + module.non_if_data ); + + // future references to the macro will be to get its values + sourcesMacro = ssprintf ("$(%s)", sourcesMacro.c_str ()); +} + +void MingwModuleHandler::GenerateObjectMacro () { objectsMacro = ssprintf ("%s_OBJS", module.name.c_str ()); GenerateObjectMacros ( "=", - module.non_if_data, - &module.linkerFlags ); + module.non_if_data ); // future references to the macro will be to get its values objectsMacro = ssprintf ("$(%s)", objectsMacro.c_str ()); Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h Thu Oct 11 14:18:47 2007 @@ -57,6 +57,7 @@ std::string GetModuleTargets ( const Module& module ); void GetObjectsVector ( const IfableData& data, std::vector<FileLocation>& objectFiles ) const; + void GenerateSourceMacro(); void GenerateObjectMacro(); void GenerateTargetMacro(); void GenerateOtherMacros(); @@ -139,9 +140,10 @@ void GenerateMacros ( const char* op, const IfableData& data, const std::vector<LinkerFlag*>* linkerFlags ); + void GenerateSourceMacros ( const char* assignmentOperation, + const IfableData& data ); void GenerateObjectMacros ( const char* assignmentOperation, - const IfableData& data, - const std::vector<LinkerFlag*>* linkerFlags ); + const IfableData& data ); std::string GenerateGccIncludeParameters () const; std::string GenerateGccParameters () const; std::string GenerateNasmParameters () const; @@ -221,6 +223,7 @@ std::string windresflagsMacro; std::string widlflagsMacro; std::string linkerflagsMacro; + std::string sourcesMacro; std::string objectsMacro; std::string libsMacro; std::string linkDepsMacro;

1 0

[hpoussin] 29494: Do not change dependancy root directory if not needed
by hpoussin＠svn.reactos.org 11 Oct '07

11 Oct '07

Author: hpoussin Date: Thu Oct 11 14:18:03 2007 New Revision: 29494 URL: http://svn.reactos.org/svn/reactos?rev=29494&view=rev Log: Do not change dependancy root directory if not needed Modified: trunk/reactos/tools/rbuild/module.cpp 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 Thu Oct 11 14:18:03 2007 @@ -1234,7 +1234,7 @@ Module::SetImportLibrary ( ImportLibrary* importLibrary ) { this->importLibrary = importLibrary; - dependency = new FileLocation ( IntermediateDirectory, + dependency = new FileLocation ( HasImportLibrary () ? IntermediateDirectory : output->directory, output->relative_path, HasImportLibrary () ? "lib" + name + ".a" : output->name ); }

1 0

[cwittich] 29493: Disabled service has start button enabled (patch by gabrielilardi at hotmail dot it) - modified by myself (HeapFree, formatting) See issue #2519 for more details.
by cwittich＠svn.reactos.org 11 Oct '07

11 Oct '07

Author: cwittich Date: Thu Oct 11 14:15:46 2007 New Revision: 29493 URL: http://svn.reactos.org/svn/reactos?rev=29493&view=rev Log: Disabled service has start button enabled (patch by gabrielilardi at hotmail dot it) - modified by myself (HeapFree, formatting) See issue #2519 for more details. Modified: trunk/reactos/base/applications/mscutils/servman/propsheet.c Modified: trunk/reactos/base/applications/mscutils/servman/propsheet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/propsheet.c (original) +++ trunk/reactos/base/applications/mscutils/servman/propsheet.c Thu Oct 11 14:15:46 2007 @@ -23,9 +23,11 @@ HWND hButton; DWORD Flags, State; UINT i; + LPQUERY_SERVICE_CONFIG lpServiceConfig; Flags = dlgInfo->pService->ServiceStatusProcess.dwControlsAccepted; State = dlgInfo->pService->ServiceStatusProcess.dwCurrentState; + lpServiceConfig = GetServiceConfig(dlgInfo->pService->lpServiceName); for (i = IDC_START; i <= IDC_RESUME; i++) { @@ -33,7 +35,7 @@ EnableWindow (hButton, FALSE); } - if (State == SERVICE_STOPPED) + if ( (State == SERVICE_STOPPED) && (lpServiceConfig->dwStartType != SERVICE_DISABLED) ) { hButton = GetDlgItem(hwndDlg, IDC_START); EnableWindow (hButton, TRUE); @@ -48,6 +50,11 @@ hButton = GetDlgItem(hwndDlg, IDC_PAUSE); EnableWindow (hButton, TRUE); } + + HeapFree(ProcessHeap, + 0, + lpServiceConfig); + } @@ -485,3 +492,4 @@ return Ret; } +

1 0

[janderwald] 29492: Jonathan Ernst <jonathan@ernstfamily.ch> - Update the address of the Free Software Foundation. Andrew Talbot <Andrew.Talbot@talbotville.com> - Exclude unused headers. Aric Stewart <aric@codeweavers.com> - Update the debug functions to handle Unicode value pidl. - Add _ILIsUnicode as a simple pidl test. Michael Stefaniuc <mstefani@redhat.de> - The Data1 member of the GUID struct needs to be an unsigned int too for Win64 compatibility. Hans Leidekker <hans@it.vu.nl> - Win64 pri
by janderwald＠svn.reactos.org 11 Oct '07

11 Oct '07

Author: janderwald Date: Thu Oct 11 14:13:05 2007 New Revision: 29492 URL: http://svn.reactos.org/svn/reactos?rev=29492&view=rev Log: Jonathan Ernst <jonathan(a)ernstfamily.ch> - Update the address of the Free Software Foundation. Andrew Talbot <Andrew.Talbot(a)talbotville.com> - Exclude unused headers. Aric Stewart <aric(a)codeweavers.com> - Update the debug functions to handle Unicode value pidl. - Add _ILIsUnicode as a simple pidl test. Michael Stefaniuc <mstefani(a)redhat.de> - The Data1 member of the GUID struct needs to be an unsigned int too for Win64 compatibility. Hans Leidekker <hans(a)it.vu.nl> - Win64 printf format warning fixes. Modified: trunk/reactos/dll/win32/shell32/debughlp.c trunk/reactos/dll/win32/shell32/debughlp.h Modified: trunk/reactos/dll/win32/shell32/debughlp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/debughlp… ============================================================================== --- trunk/reactos/dll/win32/shell32/debughlp.c (original) +++ trunk/reactos/dll/win32/shell32/debughlp.c Thu Oct 11 14:13:05 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 <ctype.h> @@ -25,7 +25,6 @@ #include "windef.h" #include "wingdi.h" #include "pidl.h" -#include "shlguid.h" #include "shldisp.h" #include "wine/debug.h" #include "debughlp.h" @@ -104,6 +103,51 @@ } static +LPWSTR _dbg_ILGetTextPointerW(LPCITEMIDLIST pidl) +{ + LPPIDLDATA pdata =_dbg_ILGetDataPointer(pidl); + + if (pdata) + { + switch (pdata->type) + { + case PT_GUID: + case PT_SHELLEXT: + case PT_YAGUID: + return NULL; + + case PT_DRIVE: + case PT_DRIVE1: + case PT_DRIVE2: + case PT_DRIVE3: + /* return (LPSTR)&(pdata->u.drive.szDriveName);*/ + return NULL; + + case PT_FOLDER: + case PT_FOLDER1: + case PT_VALUE: + case PT_IESPECIAL1: + case PT_IESPECIAL2: + /* return (LPSTR)&(pdata->u.file.szNames); */ + return NULL; + + case PT_WORKGRP: + case PT_COMP: + case PT_NETWORK: + case PT_NETPROVIDER: + case PT_SHARE: + /* return (LPSTR)&(pdata->u.network.szNames); */ + return NULL; + + case PT_VALUEW: + return (LPWSTR)&(pdata->u.file.szNames); + } + } + return NULL; +} + + +static LPSTR _dbg_ILGetSTextPointer(LPCITEMIDLIST pidl) { LPPIDLDATA pdata =_dbg_ILGetDataPointer(pidl); @@ -126,6 +170,34 @@ } static +LPWSTR _dbg_ILGetSTextPointerW(LPCITEMIDLIST pidl) +{ + LPPIDLDATA pdata =_dbg_ILGetDataPointer(pidl); + + if (pdata) + { + switch (pdata->type) + { + case PT_FOLDER: + case PT_VALUE: + case PT_IESPECIAL1: + case PT_IESPECIAL2: + /*return (LPSTR)(pdata->u.file.szNames + strlen (pdata->u.file.szNames) + 1); */ + return NULL; + + case PT_WORKGRP: + /* return (LPSTR)(pdata->u.network.szNames + strlen (pdata->u.network.szNames) + 1); */ + return NULL; + + case PT_VALUEW: + return (LPWSTR)(pdata->u.file.szNames + lstrlenW ((LPWSTR)pdata->u.file.szNames) + 1); + } + } + return NULL; +} + + +static IID* _dbg_ILGetGUIDPointer(LPCITEMIDLIST pidl) { LPPIDLDATA pdata =_ILGetDataPointer(pidl); @@ -147,6 +219,7 @@ void _dbg_ILSimpleGetText (LPCITEMIDLIST pidl, LPSTR szOut, UINT uOutSize) { LPSTR szSrc; + LPWSTR szSrcW; GUID const * riid; if (!pidl) return; @@ -164,10 +237,17 @@ /* filesystem */ if (szOut) lstrcpynA(szOut, szSrc, uOutSize); } + else if (( szSrcW = _dbg_ILGetTextPointerW(pidl) )) + { + CHAR tmp[MAX_PATH]; + /* unicode filesystem */ + WideCharToMultiByte(CP_ACP,0,szSrcW, -1, tmp, MAX_PATH, NULL, NULL); + if (szOut) lstrcpynA(szOut, tmp, uOutSize); + } else if (( riid = _dbg_ILGetGUIDPointer(pidl) )) { if (szOut) - sprintf( szOut, "{%08lx-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", + sprintf( szOut, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", riid->Data1, riid->Data2, riid->Data3, riid->Data4[0], riid->Data4[1], riid->Data4[2], riid->Data4[3], riid->Data4[4], riid->Data4[5], riid->Data4[6], riid->Data4[7] ); @@ -194,20 +274,40 @@ { do { - DWORD dwAttrib = 0; - LPPIDLDATA pData = _dbg_ILGetDataPointer(pidltemp); - DWORD type = pData ? pData->type : 0; - LPSTR szLongName = _dbg_ILGetTextPointer(pidltemp); - LPSTR szShortName = _dbg_ILGetSTextPointer(pidltemp); - char szName[MAX_PATH]; - - _dbg_ILSimpleGetText(pidltemp, szName, MAX_PATH); - if ( pData && (PT_FOLDER == type || PT_VALUE == type) ) - dwAttrib = pData->u.file.uFileAttribs; - - MESSAGE ("[%p] size=%04u type=%lx attr=0x%08lx name=%s (%s,%s)\n", - pidltemp, pidltemp->mkid.cb, type, dwAttrib, - debugstr_a(szName), debugstr_a(szLongName), debugstr_a(szShortName)); + if (_ILIsUnicode(pidltemp)) + { + DWORD dwAttrib = 0; + LPPIDLDATA pData = _dbg_ILGetDataPointer(pidltemp); + DWORD type = pData ? pData->type : 0; + LPWSTR szLongName = _dbg_ILGetTextPointerW(pidltemp); + LPWSTR szShortName = _dbg_ILGetSTextPointerW(pidltemp); + char szName[MAX_PATH]; + + _dbg_ILSimpleGetText(pidltemp, szName, MAX_PATH); + if ( pData && (PT_FOLDER == type || PT_VALUE == type) ) + dwAttrib = pData->u.file.uFileAttribs; + + MESSAGE ("[%p] size=%04u type=%x attr=0x%08x name=%s (%s,%s)\n", + pidltemp, pidltemp->mkid.cb, type, dwAttrib, + debugstr_a(szName), debugstr_w(szLongName), debugstr_w(szShortName)); + } + else + { + DWORD dwAttrib = 0; + LPPIDLDATA pData = _dbg_ILGetDataPointer(pidltemp); + DWORD type = pData ? pData->type : 0; + LPSTR szLongName = _dbg_ILGetTextPointer(pidltemp); + LPSTR szShortName = _dbg_ILGetSTextPointer(pidltemp); + char szName[MAX_PATH]; + + _dbg_ILSimpleGetText(pidltemp, szName, MAX_PATH); + if ( pData && (PT_FOLDER == type || PT_VALUE == type) ) + dwAttrib = pData->u.file.uFileAttribs; + + MESSAGE ("[%p] size=%04u type=%x attr=0x%08x name=%s (%s,%s)\n", + pidltemp, pidltemp->mkid.cb, type, dwAttrib, + debugstr_a(szName), debugstr_a(szLongName), debugstr_a(szShortName)); + } pidltemp = _dbg_ILGetNext(pidltemp); @@ -224,7 +324,8 @@ static void dump_pidl_hex( LPCITEMIDLIST pidl ) { const unsigned char *p = (const unsigned char *)pidl; - const int max_bytes = 0x80, max_line = 0x10; + const int max_bytes = 0x80; +#define max_line 0x10 char szHex[max_line*3+1], szAscii[max_line+1]; int i, n; @@ -275,7 +376,7 @@ case PT_SHARE: break; default: - ERR("unknown IDLIST %p [%p] size=%u type=%lx\n", + ERR("unknown IDLIST %p [%p] size=%u type=%x\n", pidl, pidltemp, pidltemp->mkid.cb,type ); dump_pidl_hex( pidltemp ); return FALSE; @@ -329,7 +430,7 @@ name = clsidbuf; } - return wine_dbg_sprintf( "\n\t{%08lx-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x} (%s)", + return wine_dbg_sprintf( "\n\t{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x} (%s)", id->Data1, id->Data2, id->Data3, id->Data4[0], id->Data4[1], id->Data4[2], id->Data4[3], id->Data4[4], id->Data4[5], id->Data4[6], id->Data4[7], name ? name : "unknown" ); Modified: trunk/reactos/dll/win32/shell32/debughlp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/debughlp… ============================================================================== --- trunk/reactos/dll/win32/shell32/debughlp.h (original) +++ trunk/reactos/dll/win32/shell32/debughlp.h Thu Oct 11 14:13:05 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 */ #ifndef __WINE_SHELL32_DEBUGHLP_H

1 0

[janderwald] 29491: Mikoaj Zalewski <mikolaj@zalewski.pl> - Make the shell view control Unicode - Change some more ANSI calls to Unicode
by janderwald＠svn.reactos.org 11 Oct '07

11 Oct '07

Author: janderwald Date: Thu Oct 11 14:00:11 2007 New Revision: 29491 URL: http://svn.reactos.org/svn/reactos?rev=29491&view=rev Log: Mikoaj Zalewski <mikolaj(a)zalewski.pl> - Make the shell view control Unicode - Change some more ANSI calls to Unicode Modified: trunk/reactos/dll/win32/shell32/shlview.c Modified: trunk/reactos/dll/win32/shell32/shlview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlview.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shlview.c (original) +++ trunk/reactos/dll/win32/shell32/shlview.c Thu Oct 11 14:00:11 2007 @@ -68,6 +68,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); +#undef SV_CLASS_NAME + +static const WCHAR SV_CLASS_NAME[] = {'S','H','E','L','L','D','L','L','_','D','e','f','V','i','e','w',0}; + typedef struct { BOOL bIsAscending; INT nHeaderID; @@ -290,8 +294,8 @@ TRACE("(%p)\n", This); - tmpstyle = GetWindowLongA(This->hWndList, GWL_STYLE); - SetWindowLongA(This->hWndList, GWL_STYLE, dwAdd | (tmpstyle & ~dwRemove)); + tmpstyle = GetWindowLongW(This->hWndList, GWL_STYLE); + SetWindowLongW(This->hWndList, GWL_STYLE, dwAdd | (tmpstyle & ~dwRemove)); } /********************************************************** @@ -324,8 +328,8 @@ if (This->FolderSettings.fFlags & FWF_NOCLIENTEDGE) dwExStyle &= ~WS_EX_CLIENTEDGE; - This->hWndList=CreateWindowExA( dwExStyle, - WC_LISTVIEWA, + This->hWndList=CreateWindowExW( dwExStyle, + WC_LISTVIEWW, NULL, dwStyle, 0,0,0,0, @@ -526,11 +530,11 @@ IShellViewImpl * This, LPCITEMIDLIST pidl) { - LVITEMA lvItem; + LVITEMW lvItem; lvItem.iSubItem = 0; lvItem.mask = LVIF_PARAM; for(lvItem.iItem = 0; - SendMessageA(This->hWndList, LVM_GETITEMA, 0, (LPARAM) &lvItem); + SendMessageW(This->hWndList, LVM_GETITEMW, 0, (LPARAM) &lvItem); lvItem.iItem++) { LPITEMIDLIST currentpidl = (LPITEMIDLIST) lvItem.lParam; @@ -548,7 +552,7 @@ */ static BOOLEAN LV_AddItem(IShellViewImpl * This, LPCITEMIDLIST pidl) { - LVITEMA lvItem; + LVITEMW lvItem; TRACE("(%p)(pidl=%p)\n", This, pidl); @@ -556,9 +560,9 @@ lvItem.iItem = ListView_GetItemCount(This->hWndList); /*add the item to the end of the list*/ lvItem.iSubItem = 0; lvItem.lParam = (LPARAM) ILClone(ILFindLastID(pidl)); /*set the item's data*/ - lvItem.pszText = LPSTR_TEXTCALLBACKA; /*get text on a callback basis*/ + lvItem.pszText = LPSTR_TEXTCALLBACKW; /*get text on a callback basis*/ lvItem.iImage = I_IMAGECALLBACK; /*get the image on a callback basis*/ - return (-1==ListView_InsertItemA(This->hWndList, &lvItem))? FALSE: TRUE; + return (-1==ListView_InsertItemW(This->hWndList, &lvItem))? FALSE: TRUE; } /********************************************************** @@ -580,7 +584,7 @@ static BOOLEAN LV_RenameItem(IShellViewImpl * This, LPCITEMIDLIST pidlOld, LPCITEMIDLIST pidlNew ) { int nItem; - LVITEMA lvItem; + LVITEMW lvItem; TRACE("(%p)(pidlold=%p pidlnew=%p)\n", This, pidlOld, pidlNew); @@ -589,14 +593,14 @@ { lvItem.mask = LVIF_PARAM; /* only the pidl */ lvItem.iItem = nItem; - SendMessageA(This->hWndList, LVM_GETITEMA, 0, (LPARAM) &lvItem); + SendMessageW(This->hWndList, LVM_GETITEMW, 0, (LPARAM) &lvItem); SHFree((LPITEMIDLIST)lvItem.lParam); lvItem.mask = LVIF_PARAM; lvItem.iItem = nItem; lvItem.lParam = (LPARAM) ILClone(ILFindLastID(pidlNew)); /* set the item's data */ - SendMessageA(This->hWndList, LVM_SETITEMA, 0, (LPARAM) &lvItem); - SendMessageA(This->hWndList, LVM_UPDATE, nItem, 0); + SendMessageW(This->hWndList, LVM_SETITEMW, 0, (LPARAM) &lvItem); + SendMessageW(This->hWndList, LVM_UPDATE, nItem, 0); return TRUE; /* FIXME: better handling */ } return FALSE; @@ -719,8 +723,8 @@ * ShellView_BuildFileMenu() */ static HMENU ShellView_BuildFileMenu(IShellViewImpl * This) -{ CHAR szText[MAX_PATH]; - MENUITEMINFOA mii; +{ WCHAR szText[MAX_PATH]; + MENUITEMINFOW mii; int nTools,i; HMENU hSubMenu; @@ -734,7 +738,7 @@ /*add the menu items*/ for(i = 0; i < nTools; i++) { - LoadStringA(shell32_hInstance, Tools[i].idMenuString, szText, MAX_PATH); + LoadStringW(shell32_hInstance, Tools[i].idMenuString, szText, MAX_PATH); ZeroMemory(&mii, sizeof(mii)); mii.cbSize = sizeof(mii); @@ -752,7 +756,7 @@ mii.fType = MFT_SEPARATOR; } /* tack This item onto the end of the menu */ - InsertMenuItemA(hSubMenu, (UINT)-1, TRUE, &mii); + InsertMenuItemW(hSubMenu, (UINT)-1, TRUE, &mii); } } TRACE("-- return (menu=%p)\n",hSubMenu); @@ -808,7 +812,7 @@ */ static UINT ShellView_GetSelections(IShellViewImpl * This) { - LVITEMA lvItem; + LVITEMW lvItem; UINT i = 0; SHFree(This->apidl); @@ -827,7 +831,7 @@ lvItem.iItem = 0; lvItem.iSubItem = 0; - while(ListView_GetItemA(This->hWndList, &lvItem) && (i < This->cidl)) + while(ListView_GetItemW(This->hWndList, &lvItem) && (i < This->cidl)) { if(lvItem.state & LVIS_SELECTED) { @@ -1257,7 +1261,7 @@ static LRESULT ShellView_OnNotify(IShellViewImpl * This, UINT CtlID, LPNMHDR lpnmh) { LPNMLISTVIEW lpnmlv = (LPNMLISTVIEW)lpnmh; - NMLVDISPINFOA *lpdi = (NMLVDISPINFOA *)lpnmh; + NMLVDISPINFOW *lpdi = (NMLVDISPINFOW *)lpnmh; LPITEMIDLIST pidl; TRACE("%p CtlID=%u lpnmh->code=%x\n",This,CtlID,lpnmh->code); @@ -1302,8 +1306,8 @@ if (OnDefaultCommand(This) != S_OK) ShellView_OpenSelectedItems(This); break; - case HDN_ENDTRACKA: - TRACE("-- HDN_ENDTRACKA %p\n",This); + case HDN_ENDTRACKW: + TRACE("-- HDN_ENDTRACKW %p\n",This); /*nColumn1 = ListView_GetColumnWidth(This->hWndList, 0); nColumn2 = ListView_GetColumnWidth(This->hWndList, 1);*/ break; @@ -1338,7 +1342,7 @@ } This->ListViewSortInfo.nLastHeaderID = This->ListViewSortInfo.nHeaderID; - SendMessageA(lpnmlv->hdr.hwndFrom, LVM_SORTITEMS, (WPARAM) &This->ListViewSortInfo, (LPARAM)ShellView_ListViewCompareItems); + SendMessageW(lpnmlv->hdr.hwndFrom, LVM_SORTITEMS, (WPARAM) &This->ListViewSortInfo, (LPARAM)ShellView_ListViewCompareItems); break; case LVN_GETDISPINFOA: @@ -1354,13 +1358,15 @@ IShellFolder2_GetDetailsOf(This->pSF2Parent, pidl, lpdi->item.iSubItem, &sd); if (lpnmh->code == LVN_GETDISPINFOA) { - StrRetToStrNA( lpdi->item.pszText, lpdi->item.cchTextMax, &sd.str, NULL); - TRACE("-- text=%s\n",lpdi->item.pszText); + /* shouldn't happen */ + NMLVDISPINFOA *lpdiA = (NMLVDISPINFOA *)lpnmh; + StrRetToStrNA( lpdiA->item.pszText, lpdiA->item.cchTextMax, &sd.str, NULL); + TRACE("-- text=%s\n",lpdiA->item.pszText); } else /* LVN_GETDISPINFOW */ { - StrRetToStrNW( ((NMLVDISPINFOW *)lpdi)->item.pszText, lpdi->item.cchTextMax, &sd.str, NULL); - TRACE("-- text=%s\n",debugstr_w((WCHAR*)(lpdi->item.pszText))); + StrRetToStrNW( lpdi->item.pszText, lpdi->item.cchTextMax, &sd.str, NULL); + TRACE("-- text=%s\n",debugstr_w(lpdi->item.pszText)); } } else @@ -1411,7 +1417,7 @@ } break; - case LVN_BEGINLABELEDITA: + case LVN_BEGINLABELEDITW: { DWORD dwAttr = SFGAO_CANRENAME; pidl = (LPITEMIDLIST)lpdi->item.lParam; @@ -1426,30 +1432,27 @@ return TRUE; } - case LVN_ENDLABELEDITA: + case LVN_ENDLABELEDITW: { TRACE("-- LVN_ENDLABELEDITA %p\n",This); if (lpdi->item.pszText) { HRESULT hr; - WCHAR wszNewName[MAX_PATH]; - LVITEMA lvItem; + LVITEMW lvItem; lvItem.iItem = lpdi->item.iItem; lvItem.iSubItem = 0; lvItem.mask = LVIF_PARAM; - SendMessageA(This->hWndList, LVM_GETITEMA, 0, (LPARAM) &lvItem); + SendMessageW(This->hWndList, LVM_GETITEMW, 0, (LPARAM) &lvItem); pidl = (LPITEMIDLIST)lpdi->item.lParam; - if (!MultiByteToWideChar( CP_ACP, 0, lpdi->item.pszText, -1, wszNewName, MAX_PATH )) - wszNewName[MAX_PATH-1] = 0; - hr = IShellFolder_SetNameOf(This->pSFParent, 0, pidl, wszNewName, SHGDN_INFOLDER, &pidl); + hr = IShellFolder_SetNameOf(This->pSFParent, 0, pidl, lpdi->item.pszText, SHGDN_INFOLDER, &pidl); if(SUCCEEDED(hr) && pidl) { lvItem.mask = LVIF_PARAM; lvItem.lParam = (LPARAM)pidl; - SendMessageA(This->hWndList, LVM_SETITEMA, 0, (LPARAM) &lvItem); + SendMessageW(This->hWndList, LVM_SETITEMW, 0, (LPARAM) &lvItem); return TRUE; } } @@ -1586,14 +1589,14 @@ static LRESULT CALLBACK ShellView_WndProc(HWND hWnd, UINT uMessage, WPARAM wParam, LPARAM lParam) { IShellViewImpl * pThis = (IShellViewImpl*)GetWindowLongPtrW(hWnd, GWLP_USERDATA); - LPCREATESTRUCTA lpcs; - - TRACE("(hwnd=%p msg=%x wparm=%x lparm=%lx)\n",hWnd, uMessage, wParam, lParam); + LPCREATESTRUCTW lpcs; + + TRACE("(hwnd=%p msg=%x wparm=%lx lparm=%lx)\n",hWnd, uMessage, wParam, lParam); switch (uMessage) { case WM_NCCREATE: - lpcs = (LPCREATESTRUCTA)lParam; + lpcs = (LPCREATESTRUCTW)lParam; pThis = (IShellViewImpl*)(lpcs->lpCreateParams); SetWindowLongPtrW(hWnd, GWLP_USERDATA, (ULONG_PTR)pThis); pThis->hWnd = hWnd; /*set the window handle*/ @@ -1631,7 +1634,7 @@ break; } - return DefWindowProcA (hWnd, uMessage, wParam, lParam); + return DefWindowProcW(hWnd, uMessage, wParam, lParam); } /********************************************************** * @@ -1768,7 +1771,7 @@ if ((lpmsg->message>=WM_KEYFIRST) && (lpmsg->message>=WM_KEYLAST)) { - TRACE("-- key=0x04%x\n",lpmsg->wParam) ; + TRACE("-- key=0x04%lx\n",lpmsg->wParam) ; } return S_FALSE; /* not handled */ } @@ -1847,7 +1850,7 @@ { IShellViewImpl *This = (IShellViewImpl *)iface; - WNDCLASSA wc; + WNDCLASSW wc; *phWnd = 0; @@ -1871,7 +1874,7 @@ } /*if our window class has not been registered, then do so*/ - if(!GetClassInfoA(shell32_hInstance, SV_CLASS_NAME, &wc)) + if(!GetClassInfoW(shell32_hInstance, SV_CLASS_NAME, &wc)) { ZeroMemory(&wc, sizeof(wc)); wc.style = CS_HREDRAW | CS_VREDRAW; @@ -1880,16 +1883,16 @@ wc.cbWndExtra = 0; wc.hInstance = shell32_hInstance; wc.hIcon = 0; - wc.hCursor = LoadCursorA (0, (LPSTR)IDC_ARROW); + wc.hCursor = LoadCursorW(0, (LPWSTR)IDC_ARROW); wc.hbrBackground = (HBRUSH) (COLOR_WINDOW + 1); wc.lpszMenuName = NULL; wc.lpszClassName = SV_CLASS_NAME; - if(!RegisterClassA(&wc)) + if(!RegisterClassW(&wc)) return E_FAIL; } - *phWnd = CreateWindowExA(0, + *phWnd = CreateWindowExW(0, SV_CLASS_NAME, NULL, WS_CHILD | WS_TABSTOP, @@ -1979,7 +1982,7 @@ if (i != -1) { - LVITEMA lvItem; + LVITEMW lvItem; if(uFlags & SVSI_ENSUREVISIBLE) SendMessageW(This->hWndList, LVM_ENSUREVISIBLE, i, 0); @@ -1989,7 +1992,7 @@ lvItem.iItem = 0; lvItem.iSubItem = 0; - while(SendMessageA(This->hWndList, LVM_GETITEMA, 0, (LPARAM) &lvItem)) + while(SendMessageW(This->hWndList, LVM_GETITEMW, 0, (LPARAM) &lvItem)) { if (lvItem.iItem == i) { @@ -2006,7 +2009,7 @@ if (uFlags & SVSI_DESELECTOTHERS) lvItem.state &= ~LVIS_SELECTED; } - SendMessageA(This->hWndList, LVM_SETITEMA, 0, (LPARAM) &lvItem); + SendMessageW(This->hWndList, LVM_SETITEMW, 0, (LPARAM) &lvItem); lvItem.iItem++; } @@ -2212,7 +2215,7 @@ DWORD *pdwEffect) { LVHITTESTINFO htinfo; - LVITEMA lvItem; + LVITEMW lvItem; LONG lResult; HRESULT hr; RECT clientRect; @@ -2270,7 +2273,7 @@ lvItem.mask = LVIF_PARAM; lvItem.iItem = lResult; lvItem.iSubItem = 0; - SendMessageA(This->hWndList, LVM_GETITEMA, 0, (LPARAM) &lvItem); + SendMessageW(This->hWndList, LVM_GETITEMW, 0, (LPARAM) &lvItem); /* ... and bind pCurDropTarget to the IDropTarget interface of an UIObject of this object */ hr = IShellFolder_GetUIObjectOf(This->pSFParent, This->hWndList, 1,

1 0

[gedmurphy] 29490: remove some test code which shouldn't have been added.
by gedmurphy＠svn.reactos.org 11 Oct '07

11 Oct '07

Author: gedmurphy Date: Thu Oct 11 13:15:14 2007 New Revision: 29490 URL: http://svn.reactos.org/svn/reactos?rev=29490&view=rev Log: remove some test code which shouldn't have been added. Modified: trunk/reactos/base/applications/mscutils/devmgmt/devmgmt.c trunk/reactos/base/applications/mscutils/servman/stop.c Modified: trunk/reactos/base/applications/mscutils/devmgmt/devmgmt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/devmgmt.c (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/devmgmt.c Thu Oct 11 13:15:14 2007 @@ -34,8 +34,6 @@ } return 0; } - - hInstance = hThisInstance; ProcessHeap = GetProcessHeap(); Modified: 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 (original) +++ trunk/reactos/base/applications/mscutils/servman/stop.c Thu Oct 11 13:15:14 2007 @@ -51,6 +51,7 @@ BytesNeeded, &BytesNeeded)) { +#if 0 if (lpServiceConfig->lpDependencies) { TCHAR str[500]; @@ -63,6 +64,7 @@ } else { +#endif hProgDlg = CreateProgressDialog(Info->hMainWnd, Info->pCurrentService->lpServiceName, IDS_PROGRESS_INFO_STOP); @@ -74,7 +76,7 @@ DestroyWindow(hProgDlg); } - } + //} HeapFree(ProcessHeap, 0,

1 0

[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

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