Ros-diffs October 2007

ros-diffs@reactos.org

20 participants
708 discussions

[janderwald] 29499: Dmitry Timoshkov <dmitry@codeweavers.com> - Switch to using 'long' for INT_PTR type for 64-bit compatibility. Andrew Talbot <Andrew.Talbot@talbotville.com> - Exclude unused headers. Hans Leidekker <hans@it.vu.nl> - Win64 printf format warning fixes. James Hawkins <truiken@gmail.com> - Remove redundant NULL checks before SHFree. Jonathan Ernst <jonathan@ernstfamily.ch> - Update the address of the Free Software Foundation. ------------------------ - readd ReactOS changes (the p

by janderwald＠svn.reactos.org

Author: janderwald Date: Thu Oct 11 14:48:31 2007 New Revision: 29499 URL: http://svn.reactos.org/svn/reactos?rev=29499&view=rev Log: 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> - Remove redundant NULL checks before SHFree. Jonathan Ernst <jonathan(a)ernstfamily.ch> - Update the address of the Free Software Foundation. ------------------------ - readd ReactOS changes (the properties menu item was removed, readd it + code to show properties dialogs) Modified: trunk/reactos/dll/win32/shell32/shv_item_cmenu.c Modified: trunk/reactos/dll/win32/shell32/shv_item_cmenu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shv_item… ============================================================================== --- trunk/reactos/dll/win32/shell32/shv_item_cmenu.c (original) +++ trunk/reactos/dll/win32/shell32/shv_item_cmenu.c Thu Oct 11 14:48:31 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 <string.h> @@ -30,7 +30,6 @@ #include "windef.h" #include "wingdi.h" #include "pidl.h" -#include "shlguid.h" #include "undocshell.h" #include "shlobj.h" @@ -38,9 +37,6 @@ #include "shellfolder.h" WINE_DEFAULT_DEBUG_CHANNEL(shell); - -/* ugly hack for cut&psate files */ -BOOL fileMoving = FALSE; /************************************************************************** * IContextMenu Implementation @@ -147,7 +143,7 @@ ItemCmImpl *This = (ItemCmImpl *)iface; ULONG refCount = InterlockedIncrement(&This->ref); - TRACE("(%p)->(count=%lu)\n", This, refCount - 1); + TRACE("(%p)->(count=%u)\n", This, refCount - 1); return refCount; } @@ -160,7 +156,7 @@ ItemCmImpl *This = (ItemCmImpl *)iface; ULONG refCount = InterlockedDecrement(&This->ref); - TRACE("(%p)->(count=%li)\n", This, refCount + 1); + TRACE("(%p)->(count=%i)\n", This, refCount + 1); if (!refCount) { @@ -169,8 +165,7 @@ if(This->pSFParent) IShellFolder_Release(This->pSFParent); - if(This->pidl) - SHFree(This->pidl); + SHFree(This->pidl); /*make sure the pidl is freed*/ _ILFreeaPidl(This->apidl, This->cidl); @@ -257,13 +252,10 @@ _InsertMenuItem(hmenu, indexMenu++, TRUE, FCIDM_SHVIEW_DELETE, MFT_STRING, "&Delete", MFS_ENABLED); if(uFlags & CMF_CANRENAME) - { _InsertMenuItem(hmenu, indexMenu++, TRUE, FCIDM_SHVIEW_RENAME, MFT_STRING, "&Rename", ISvItemCm_CanRenameItems(This) ? MFS_ENABLED : MFS_DISABLED); - } _InsertMenuItem(hmenu, indexMenu++, TRUE, 0, MFT_SEPARATOR, NULL, 0); _InsertMenuItem(hmenu, indexMenu++, TRUE, FCIDM_SHVIEW_PROPERTIES, MFT_STRING, "&Properties", MFS_ENABLED); - return MAKE_HRESULT(SEVERITY_SUCCESS, 0, (FCIDM_SHVIEWLAST)); } @@ -376,8 +368,6 @@ LPSHELLVIEW lpSV; LPDATAOBJECT lpDo; - fileMoving = bCut; - TRACE("(%p)->(wnd=%p,bCut=0x%08x)\n",This, hwnd, bCut); /* get the active IShellView */ @@ -525,7 +515,7 @@ HRESULT hr = E_INVALIDARG; - TRACE("(%p)->(idcom=%x flags=%x %p name=%p len=%x)\n",This, idCommand, uFlags, lpReserved, lpszName, uMaxNameLen); + TRACE("(%p)->(idcom=%lx flags=%x %p name=%p len=%x)\n",This, idCommand, uFlags, lpReserved, lpszName, uMaxNameLen); switch(uFlags) { @@ -578,7 +568,7 @@ { ItemCmImpl *This = (ItemCmImpl *)iface; - TRACE("(%p)->(msg=%x wp=%x lp=%lx)\n",This, uMsg, wParam, lParam); + TRACE("(%p)->(msg=%x wp=%lx lp=%lx)\n",This, uMsg, wParam, lParam); return E_NOTIMPL; }

17 years, 2 months

[hpoussin] 29498: Remove unneeded comment (__REACTOS__ is always defined)

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Thu Oct 11 14:47:25 2007 New Revision: 29498 URL: http://svn.reactos.org/svn/reactos?rev=29498&view=rev Log: Remove unneeded comment (__REACTOS__ is always defined) Modified: trunk/reactos/base/shell/cmd/config.h Modified: trunk/reactos/base/shell/cmd/config.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/config.h?re… ============================================================================== --- trunk/reactos/base/shell/cmd/config.h (original) +++ trunk/reactos/base/shell/cmd/config.h Thu Oct 11 14:47:25 2007 @@ -8,9 +8,6 @@ * started. * */ - -/* Define only if used under ReactOS */ -//#define __REACTOS__ #ifndef _CONFIG_H_INCLUDED_ #define _CONFIG_H_INCLUDED_

17 years, 2 months

[cwittich] 29497: disable redrawing of the ListView window before updating the service list

by cwittich＠svn.reactos.org

Author: cwittich Date: Thu Oct 11 14:30:43 2007 New Revision: 29497 URL: http://svn.reactos.org/svn/reactos?rev=29497&view=rev Log: disable redrawing of the ListView window before updating the service list Modified: trunk/reactos/base/applications/mscutils/servman/listview.c Modified: trunk/reactos/base/applications/mscutils/servman/listview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/listview.c (original) +++ trunk/reactos/base/applications/mscutils/servman/listview.c Thu Oct 11 14:30:43 2007 @@ -235,6 +235,11 @@ DWORD NumServices; DWORD Index; + SendMessage (Info->hListView, + WM_SETREDRAW, + FALSE, + 0); + (void)ListView_DeleteAllItems(Info->hListView); if (GetServiceList(Info, &NumServices)) @@ -331,7 +336,7 @@ UpdateServiceCount(Info); } - /* turn redraw flag on. It's turned off initially via the LBS_NOREDRAW flag */ + /* turn redraw flag on. */ SendMessage (Info->hListView, WM_SETREDRAW, TRUE,

17 years, 2 months

[gedmurphy] 29496: a better fix for bug 2519

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Thu Oct 11 14:29:02 2007 New Revision: 29496 URL: http://svn.reactos.org/svn/reactos?rev=29496&view=rev Log: a better fix for bug 2519 Modified: trunk/reactos/base/applications/mscutils/servman/mainwnd.c trunk/reactos/base/applications/mscutils/servman/propsheet.c Modified: trunk/reactos/base/applications/mscutils/servman/mainwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/mainwnd.c (original) +++ trunk/reactos/base/applications/mscutils/servman/mainwnd.c Thu Oct 11 14:29:02 2007 @@ -151,8 +151,8 @@ VOID SetMenuAndButtonStates(PMAIN_WND_INFO Info) { + LPQUERY_SERVICE_CONFIG lpServiceConfig; HMENU hMainMenu; - DWORD Flags, State; UINT i; /* get handle to menu */ @@ -178,39 +178,47 @@ EnableMenuItem(GetSubMenu(Info->hShortcutMenu, 0), ID_DELETE, MF_ENABLED); } - Flags = Info->pCurrentService->ServiceStatusProcess.dwControlsAccepted; - State = Info->pCurrentService->ServiceStatusProcess.dwCurrentState; - - if (State == SERVICE_STOPPED) - { - EnableMenuItem(hMainMenu, ID_START, MF_ENABLED); - EnableMenuItem(GetSubMenu(Info->hShortcutMenu, 0), ID_START, MF_ENABLED); - SendMessage(Info->hTool, TB_SETSTATE, ID_START, - (LPARAM)MAKELONG(TBSTATE_ENABLED, 0)); - } - - if ( (Flags & SERVICE_ACCEPT_STOP) && (State == SERVICE_RUNNING) ) - { - EnableMenuItem(hMainMenu, ID_STOP, MF_ENABLED); - EnableMenuItem(GetSubMenu(Info->hShortcutMenu, 0), ID_STOP, MF_ENABLED); - SendMessage(Info->hTool, TB_SETSTATE, ID_STOP, - (LPARAM)MAKELONG(TBSTATE_ENABLED, 0)); - } - - if ( (Flags & SERVICE_ACCEPT_PAUSE_CONTINUE) && (State == SERVICE_RUNNING) ) - { - EnableMenuItem(hMainMenu, ID_PAUSE, MF_ENABLED); - EnableMenuItem(GetSubMenu(Info->hShortcutMenu, 0), ID_PAUSE, MF_ENABLED); - SendMessage(Info->hTool, TB_SETSTATE, ID_PAUSE, - (LPARAM)MAKELONG(TBSTATE_ENABLED, 0)); - } - - if ( (Flags & SERVICE_ACCEPT_STOP) && (State == SERVICE_RUNNING) ) - { - EnableMenuItem(hMainMenu, ID_RESTART, MF_ENABLED); - EnableMenuItem(GetSubMenu(Info->hShortcutMenu, 0), ID_RESTART, MF_ENABLED); - SendMessage(Info->hTool, TB_SETSTATE, ID_RESTART, - (LPARAM)MAKELONG(TBSTATE_ENABLED, 0)); + lpServiceConfig = GetServiceConfig(Info->pCurrentService->lpServiceName); + if (lpServiceConfig && lpServiceConfig->dwStartType != SERVICE_DISABLED) + { + DWORD Flags, State; + + Flags = Info->pCurrentService->ServiceStatusProcess.dwControlsAccepted; + State = Info->pCurrentService->ServiceStatusProcess.dwCurrentState; + + if (State == SERVICE_STOPPED) + { + EnableMenuItem(hMainMenu, ID_START, MF_ENABLED); + EnableMenuItem(GetSubMenu(Info->hShortcutMenu, 0), ID_START, MF_ENABLED); + SendMessage(Info->hTool, TB_SETSTATE, ID_START, + (LPARAM)MAKELONG(TBSTATE_ENABLED, 0)); + } + + if ( (Flags & SERVICE_ACCEPT_STOP) && (State == SERVICE_RUNNING) ) + { + EnableMenuItem(hMainMenu, ID_STOP, MF_ENABLED); + EnableMenuItem(GetSubMenu(Info->hShortcutMenu, 0), ID_STOP, MF_ENABLED); + SendMessage(Info->hTool, TB_SETSTATE, ID_STOP, + (LPARAM)MAKELONG(TBSTATE_ENABLED, 0)); + } + + if ( (Flags & SERVICE_ACCEPT_PAUSE_CONTINUE) && (State == SERVICE_RUNNING) ) + { + EnableMenuItem(hMainMenu, ID_PAUSE, MF_ENABLED); + EnableMenuItem(GetSubMenu(Info->hShortcutMenu, 0), ID_PAUSE, MF_ENABLED); + SendMessage(Info->hTool, TB_SETSTATE, ID_PAUSE, + (LPARAM)MAKELONG(TBSTATE_ENABLED, 0)); + } + + if ( (Flags & SERVICE_ACCEPT_STOP) && (State == SERVICE_RUNNING) ) + { + EnableMenuItem(hMainMenu, ID_RESTART, MF_ENABLED); + EnableMenuItem(GetSubMenu(Info->hShortcutMenu, 0), ID_RESTART, MF_ENABLED); + SendMessage(Info->hTool, TB_SETSTATE, ID_RESTART, + (LPARAM)MAKELONG(TBSTATE_ENABLED, 0)); + } + + HeapFree(GetProcessHeap(), 0, lpServiceConfig); } } else 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:29:02 2007 @@ -21,13 +21,12 @@ HWND hwndDlg) { HWND hButton; + LPQUERY_SERVICE_CONFIG lpServiceConfig; 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++) { @@ -35,26 +34,27 @@ EnableWindow (hButton, FALSE); } - if ( (State == SERVICE_STOPPED) && (lpServiceConfig->dwStartType != SERVICE_DISABLED) ) - { - hButton = GetDlgItem(hwndDlg, IDC_START); - EnableWindow (hButton, TRUE); - } - else if ( (Flags & SERVICE_ACCEPT_STOP) && (State == SERVICE_RUNNING) ) - { - hButton = GetDlgItem(hwndDlg, IDC_STOP); - EnableWindow (hButton, TRUE); - } - else if ( (Flags & SERVICE_ACCEPT_PAUSE_CONTINUE) && (State == SERVICE_RUNNING) ) - { - hButton = GetDlgItem(hwndDlg, IDC_PAUSE); - EnableWindow (hButton, TRUE); - } - - HeapFree(ProcessHeap, - 0, - lpServiceConfig); - + lpServiceConfig = GetServiceConfig(dlgInfo->pService->lpServiceName); + if (lpServiceConfig && lpServiceConfig->dwStartType != SERVICE_DISABLED) + { + if (State == SERVICE_STOPPED) + { + hButton = GetDlgItem(hwndDlg, IDC_START); + EnableWindow (hButton, TRUE); + } + else if ( (Flags & SERVICE_ACCEPT_STOP) && (State == SERVICE_RUNNING) ) + { + hButton = GetDlgItem(hwndDlg, IDC_STOP); + EnableWindow (hButton, TRUE); + } + else if ( (Flags & SERVICE_ACCEPT_PAUSE_CONTINUE) && (State == SERVICE_RUNNING) ) + { + hButton = GetDlgItem(hwndDlg, IDC_PAUSE); + EnableWindow (hButton, TRUE); + } + + HeapFree(GetProcessHeap(), 0, lpServiceConfig); + } } @@ -492,4 +492,3 @@ return Ret; } -

17 years, 2 months

[hpoussin] 29495: Add list of source files in generated makefile

by hpoussin＠svn.reactos.org

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;

17 years, 2 months

[hpoussin] 29494: Do not change dependancy root directory if not needed

by hpoussin＠svn.reactos.org

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 ); }

17 years, 2 months

[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

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

17 years, 2 months

[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

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

17 years, 2 months

[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

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,

17 years, 2 months

[gedmurphy] 29490: remove some test code which shouldn't have been added.

by gedmurphy＠svn.reactos.org

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,

17 years, 2 months

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

Jump to page:

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