Ros-diffs

ros-diffs@reactos.org

81390 discussions

[weiden] 25535: Merge patch from wine-head: Fixes function prototypes of SHAddFromPropSheetExtArray, SHCreatePropSheetExtArray, SHReplaceFromPropSheetExtArray and SHDestroyPropSheetExtArray
by weiden＠svn.reactos.org 19 Jan '07

19 Jan '07

Author: weiden Date: Fri Jan 19 21:30:53 2007 New Revision: 25535 URL: http://svn.reactos.org/svn/reactos?rev=25535&view=rev Log: Merge patch from wine-head: Fixes function prototypes of SHAddFromPropSheetExtArray, SHCreatePropSheetExtArray, SHReplaceFromPropSheetExtArray and SHDestroyPropSheetExtArray Modified: trunk/reactos/dll/win32/shell32/shellord.c trunk/reactos/include/psdk/shlobj.h Modified: trunk/reactos/dll/win32/shell32/shellord.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellord… ============================================================================== --- trunk/reactos/dll/win32/shell32/shellord.c (original) +++ trunk/reactos/dll/win32/shell32/shellord.c Fri Jan 19 21:30:53 2007 @@ -1461,37 +1461,36 @@ /************************************************************************* * SHAddFromPropSheetExtArray [SHELL32.167] */ -DWORD WINAPI SHAddFromPropSheetExtArray(DWORD a, DWORD b, DWORD c) -{ - FIXME("(%08lx,%08lx,%08lx)stub\n", a, b, c); +UINT WINAPI SHAddFromPropSheetExtArray(HPSXA hpsxa, LPFNADDPROPSHEETPAGE lpfnAddPage, LPARAM lParam) +{ + FIXME("(%p,%p,%08lx)stub\n", hpsxa, lpfnAddPage, lParam); return 0; } /************************************************************************* * SHCreatePropSheetExtArray [SHELL32.168] */ -DWORD WINAPI SHCreatePropSheetExtArray(DWORD a, LPCSTR b, DWORD c) -{ - FIXME("(%08lx,%s,%08lx)stub\n", a, debugstr_a(b), c); +HPSXA WINAPI SHCreatePropSheetExtArray(HKEY hKey, LPCWSTR pszSubKey, UINT max_iface) +{ + FIXME("(%p,%s,%u)stub\n", hKey, debugstr_w(pszSubKey), max_iface); + return NULL; +} + +/************************************************************************* + * SHReplaceFromPropSheetExtArray [SHELL32.170] + */ +UINT WINAPI SHReplaceFromPropSheetExtArray(HPSXA hpsxa, UINT uPageID, LPFNADDPROPSHEETPAGE lpfnReplaceWith, LPARAM lParam) +{ + FIXME("(%p,%u,%p,%08lx)stub\n", hpsxa, uPageID, lpfnReplaceWith, lParam); return 0; } /************************************************************************* - * SHReplaceFromPropSheetExtArray [SHELL32.170] - */ -DWORD WINAPI SHReplaceFromPropSheetExtArray(DWORD a, DWORD b, DWORD c, DWORD d) -{ - FIXME("(%08lx,%08lx,%08lx,%08lx)stub\n", a, b, c, d); - return 0; -} - -/************************************************************************* * SHDestroyPropSheetExtArray [SHELL32.169] */ -DWORD WINAPI SHDestroyPropSheetExtArray(DWORD a) -{ - FIXME("(%08lx)stub\n", a); - return 0; +void WINAPI SHDestroyPropSheetExtArray(HPSXA hpsxa) +{ + FIXME("(%p)stub\n", hpsxa); } /************************************************************************* Modified: trunk/reactos/include/psdk/shlobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shlobj.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/shlobj.h (original) +++ trunk/reactos/include/psdk/shlobj.h Fri Jan 19 21:30:53 2007 @@ -430,6 +430,11 @@ typedef ULONG SFGAOF; typedef DWORD SHGDNF; + +#ifndef HPSXA_DEFINED +#define HPSXA_DEFINED +DECLARE_HANDLE(HPSXA); +#endif typedef struct _IDA { UINT cidl; @@ -994,6 +999,15 @@ #undef INTERFACE typedef IShellExtInit *LPSHELLEXTINIT; +#if defined(COBJMACROS) +/*** IUnknown methods ***/ +#define IShellExtInit_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) +#define IShellExtInit_AddRef(p) (p)->lpVtbl->AddRef(p) +#define IShellExtInit_Release(p) (p)->lpVtbl->Release(p) +/*** IShellExtInit methods ***/ +#define IShellExtInit_Initialize(p,a,b,c) (p)->lpVtbl->Initialize(p,a,b,c) +#endif + #define INTERFACE IShellPropSheetExt DECLARE_INTERFACE_(IShellPropSheetExt, IUnknown) { @@ -1005,6 +1019,17 @@ }; #undef INTERFACE typedef IShellPropSheetExt *LPSHELLPROPSHEETEXT; + +#if defined(COBJMACROS) +/*** IUnknown methods ***/ +#define IShellPropSheetExt_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) +#define IShellPropSheetExt_AddRef(p) (p)->lpVtbl->AddRef(p) +#define IShellPropSheetExt_Release(p) (p)->lpVtbl->Release(p) +/*** IShellPropSheetExt methods ***/ +#define IShellPropSheetExt_AddPage(p,a,b) (p)->lpVtbl->AddPage(p,a,b) +#define IShellPropSheetExt_ReplacePage(p,a,b,c) (p)->lpVtbl->ReplacePage(p,a,b,c) +#endif + #define INTERFACE IExtractIconA DECLARE_INTERFACE_(IExtractIconA, IUnknown) @@ -1855,14 +1880,18 @@ IShellFolderViewCB *psfvcb; } SFV_CREATE; + +UINT WINAPI SHAddFromPropSheetExtArray(HPSXA,LPFNADDPROPSHEETPAGE,LPARAM); void WINAPI SHAddToRecentDocs(UINT,PCVOID); LPITEMIDLIST WINAPI SHBrowseForFolderA(PBROWSEINFOA); LPITEMIDLIST WINAPI SHBrowseForFolderW(PBROWSEINFOW); DWORD WINAPI SHCLSIDFromStringA(LPCSTR,CLSID*); DWORD WINAPI SHCLSIDFromStringW(LPCWSTR,CLSID*); +HPSXA WINAPI SHCreatePropSheetExtArray(HKEY,LPCWSTR,UINT); HRESULT WINAPI SHCreateShellFolderView(const SFV_CREATE*,IShellView**); HRESULT WINAPI SHCreateShellFolderViewEx(LPCSFV pshfvi, IShellView **ppshv); void WINAPI SHChangeNotify(LONG,UINT,PCVOID,PCVOID); +void WINAPI SHDestroyPropSheetExtArray(HPSXA); HRESULT WINAPI SHGetDataFromIDListA(LPSHELLFOLDER,LPCITEMIDLIST,int,PVOID,int); HRESULT WINAPI SHGetDataFromIDListW(LPSHELLFOLDER,LPCITEMIDLIST,int,PVOID,int); HRESULT WINAPI SHGetDesktopFolder(LPSHELLFOLDER*); @@ -1895,6 +1924,7 @@ #if (_WIN32_WINNT >= 0x0500) /* W2K */ void WINAPI SHGetSetSettings(LPSHELLSTATE,DWORD,BOOL); #endif +UINT WINAPI SHReplaceFromPropSheetExtArray(HPSXA,UINT,LPFNADDPROPSHEETPAGE,LPARAM); #if (_WIN32_WINNT >= 0x0500) /* W2K */ BOOL WINAPI ILIsEqual(LPCITEMIDLIST, LPCITEMIDLIST);

1 0

[weiden] 25534: Merged recent w32api changes
by weiden＠svn.reactos.org 19 Jan '07

19 Jan '07

Author: weiden Date: Fri Jan 19 19:46:36 2007 New Revision: 25534 URL: http://svn.reactos.org/svn/reactos?rev=25534&view=rev Log: Merged recent w32api changes Modified: trunk/reactos/include/psdk/winbase.h trunk/reactos/include/psdk/windns.h Modified: trunk/reactos/include/psdk/winbase.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winbase.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winbase.h (original) +++ trunk/reactos/include/psdk/winbase.h Fri Jan 19 19:46:36 2007 @@ -709,8 +709,8 @@ } u; } DEBUG_EVENT,*LPDEBUG_EVENT; typedef struct _OVERLAPPED { - DWORD Internal; - DWORD InternalHigh; + ULONG_PTR Internal; + ULONG_PTR InternalHigh; DWORD Offset; DWORD OffsetHigh; HANDLE hEvent; @@ -1070,7 +1070,7 @@ typedef void(CALLBACK *LPOVERLAPPED_COMPLETION_ROUTINE)(DWORD,DWORD,LPOVERLAPPED); typedef LONG(CALLBACK *PTOP_LEVEL_EXCEPTION_FILTER)(LPEXCEPTION_POINTERS); typedef PTOP_LEVEL_EXCEPTION_FILTER LPTOP_LEVEL_EXCEPTION_FILTER; -typedef void(APIENTRY *PAPCFUNC)(DWORD); +typedef void(APIENTRY *PAPCFUNC)(ULONG_PTR); typedef void(CALLBACK *PTIMERAPCROUTINE)(PVOID,DWORD,DWORD); #if (_WIN32_WINNT >= 0x0500) typedef void(CALLBACK *WAITORTIMERCALLBACK)(PVOID,BOOLEAN); @@ -1213,7 +1213,7 @@ BOOL WINAPI CreateHardLinkA(LPCSTR,LPCSTR,LPSECURITY_ATTRIBUTES); BOOL WINAPI CreateHardLinkW(LPCWSTR,LPCWSTR,LPSECURITY_ATTRIBUTES); #endif -HANDLE WINAPI CreateIoCompletionPort(HANDLE,HANDLE,DWORD,DWORD); +HANDLE WINAPI CreateIoCompletionPort(HANDLE,HANDLE,ULONG_PTR,DWORD); #if (_WIN32_WINNT >= 0x0500) HANDLE WINAPI CreateJobObjectA(LPSECURITY_ATTRIBUTES,LPCSTR); HANDLE WINAPI CreateJobObjectW(LPSECURITY_ATTRIBUTES,LPCWSTR); @@ -1538,7 +1538,7 @@ DWORD WINAPI GetProfileSectionW(LPCWSTR,LPWSTR,DWORD); DWORD WINAPI GetProfileStringA(LPCSTR,LPCSTR,LPCSTR,LPSTR,DWORD); DWORD WINAPI GetProfileStringW(LPCWSTR,LPCWSTR,LPCWSTR,LPWSTR,DWORD); -BOOL WINAPI GetQueuedCompletionStatus(HANDLE,PDWORD,PDWORD,LPOVERLAPPED*,DWORD); +BOOL WINAPI GetQueuedCompletionStatus(HANDLE,PDWORD,PULONG_PTR,LPOVERLAPPED*,DWORD); BOOL WINAPI GetSecurityDescriptorControl(PSECURITY_DESCRIPTOR,PSECURITY_DESCRIPTOR_CONTROL,PDWORD); BOOL WINAPI GetSecurityDescriptorDacl(PSECURITY_DESCRIPTOR,LPBOOL,PACL*,LPBOOL); BOOL WINAPI GetSecurityDescriptorGroup(PSECURITY_DESCRIPTOR,PSID*,LPBOOL); @@ -1841,7 +1841,7 @@ #endif BOOL WINAPI QueryPerformanceCounter(PLARGE_INTEGER); BOOL WINAPI QueryPerformanceFrequency(PLARGE_INTEGER); -DWORD WINAPI QueueUserAPC(PAPCFUNC,HANDLE,DWORD); +DWORD WINAPI QueueUserAPC(PAPCFUNC,HANDLE,ULONG_PTR); #if (_WIN32_WINNT >= 0x0500) BOOL WINAPI QueueUserWorkItem(LPTHREAD_START_ROUTINE,PVOID,ULONG); #endif Modified: trunk/reactos/include/psdk/windns.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/windns.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/windns.h (original) +++ trunk/reactos/include/psdk/windns.h Fri Jan 19 19:46:36 2007 @@ -51,7 +51,45 @@ DNS_TYPE_HINFO, DNS_TYPE_MINFO, DNS_TYPE_MX, - DNS_TYPE_TEXT + DNS_TYPE_TEXT, + DNS_TYPE_RP, + DNS_TYPE_AFSDB, + DNS_TYPE_X25, + DNS_TYPE_ISDN, + DNS_TYPE_RT, + DNS_TYPE_NSAP, + DNS_TYPE_NSAPPTR, + DNS_TYPE_SIG, + DNS_TYPE_KEY, + DNS_TYPE_PX, + DNS_TYPE_GPOS, + DNS_TYPE_AAAA, + DNS_TYPE_LOC, + DNS_TYPE_NXT, + DNS_TYPE_EID, + DNS_TYPE_NIMLOC, + DNS_TYPE_SRV, + DNS_TYPE_ATMA, + DNS_TYPE_NAPTR, + DNS_TYPE_KX, + DNS_TYPE_CERT, + DNS_TYPE_A6, + DNS_TYPE_DNAME, + DNS_TYPE_SINK, + DNS_TYPE_OPT, + DNS_TYPE_UINFO=100, + DNS_TYPE_UID, + DNS_TYPE_GID, + DNS_TYPE_UNSPEC, + DNS_TYPE_ADDRS=248, + DNS_TYPE_TKEY, + DNS_TYPE_TSIG, + DNS_TYPE_IXFR, + DNS_TYPE_AXFR, + DNS_TYPE_MAILB, + DNS_TYPE_MAILA, + DNS_TYPE_ALL, + DNS_TYPE_ANY=DNS_TYPE_ALL }; typedef enum _DNS_CHARSET {

1 0

[spetreolle] 25533: fix typo
by spetreolle＠svn.reactos.org 19 Jan '07

19 Jan '07

Author: spetreolle Date: Fri Jan 19 18:45:44 2007 New Revision: 25533 URL: http://svn.reactos.org/svn/reactos?rev=25533&view=rev Log: fix typo Modified: trunk/reactos/base/shell/explorer/explorer-fr.rc Modified: trunk/reactos/base/shell/explorer/explorer-fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-fr.rc (original) +++ trunk/reactos/base/shell/explorer/explorer-fr.rc Fri Jan 19 18:45:44 2007 @@ -366,7 +366,7 @@ IDS_MINIMIZE_ALL "mimimiser toutes les fenêtres" IDS_DESKTOP_NUM "Bureau %d" IDS_VOLUME "Volume" - IDS_ITEMS_CUR "abjets actuels" + IDS_ITEMS_CUR "objets actuels" IDS_ITEMS_CONFIGURED "configuration" IDS_ITEMS_VISIBLE "visible" IDS_ITEMS_HIDDEN "caché"

1 0

[weiden] 25532: Fix compilation
by weiden＠svn.reactos.org 19 Jan '07

19 Jan '07

Author: weiden Date: Fri Jan 19 18:37:51 2007 New Revision: 25532 URL: http://svn.reactos.org/svn/reactos?rev=25532&view=rev Log: Fix compilation Modified: trunk/reactos/base/shell/explorer/utility/utility.h Modified: trunk/reactos/base/shell/explorer/utility/utility.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/utilit… ============================================================================== --- trunk/reactos/base/shell/explorer/utility/utility.h (original) +++ trunk/reactos/base/shell/explorer/utility/utility.h Fri Jan 19 18:37:51 2007 @@ -25,11 +25,18 @@ // Martin Fuchs, 23.07.2003 // +#ifdef __cplusplus + +#ifdef _MSC_VER +#pragma warning(disable: 4786) // disable warnings about too long debug information symbols +#endif // STL headers for strings and streams #include <string> #include <iostream> using namespace std; + +#endif /* __cplusplus */ // standard windows headers @@ -195,10 +202,6 @@ #ifdef __cplusplus - -#ifdef _MSC_VER -#pragma warning(disable: 4786) // disable warnings about too long debug information symbols -#endif // containers #include <map>

1 0

[fireball] 25531: Move LOADER_HIGH_ZONE definition to a header file (thus removing hardcoded value from meminit.c). NT4 boots with both 16Mb and 32Mb loading sizes. Win2003 doesn't fit into 16Mb, so ~32Mb should be used.
by fireball＠svn.reactos.org 19 Jan '07

19 Jan '07

Author: fireball Date: Fri Jan 19 18:08:05 2007 New Revision: 25531 URL: http://svn.reactos.org/svn/reactos?rev=25531&view=rev Log: Move LOADER_HIGH_ZONE definition to a header file (thus removing hardcoded value from meminit.c). NT4 boots with both 16Mb and 32Mb loading sizes. Win2003 doesn't fit into 16Mb, so ~32Mb should be used. Modified: branches/winldr/include/mm.h branches/winldr/mm/meminit.c branches/winldr/windows/wlmemory.c Modified: branches/winldr/include/mm.h URL: http://svn.reactos.org/svn/reactos/branches/winldr/include/mm.h?rev=25531&r… ============================================================================== --- branches/winldr/include/mm.h (original) +++ branches/winldr/include/mm.h Fri Jan 19 18:08:05 2007 @@ -45,6 +45,11 @@ #define MM_SIZE_TO_PAGES(a) \ ( ((a) >> MM_PAGE_SHIFT) + ((a) & MM_PAGE_MASK ? 1 : 0) ) + +// +// This is the zone which is used by the OS loader +// +#define LOADER_HIGH_ZONE ((16*1024*1024) >> MM_PAGE_SHIFT) //16Mb page #endif // defined __i386__ or _PPC_ Modified: branches/winldr/mm/meminit.c URL: http://svn.reactos.org/svn/reactos/branches/winldr/mm/meminit.c?rev=25531&r… ============================================================================== --- branches/winldr/mm/meminit.c (original) +++ branches/winldr/mm/meminit.c Fri Jan 19 18:08:05 2007 @@ -352,7 +352,7 @@ if (FromEnd) { /* Allocate "high" (from end) pages */ - for (Index=/*LastFreePageHint-1*/(16*1024*1024>>12)-1; Index>0; Index--) + for (Index=/*LastFreePageHint-1*/LOADER_HIGH_ZONE-1; Index>0; Index--) //for (Index=LastFreePageHint-1; Index>0; Index--) { if (RealPageLookupTable[Index].PageAllocated != LoaderFree) Modified: branches/winldr/windows/wlmemory.c URL: http://svn.reactos.org/svn/reactos/branches/winldr/windows/wlmemory.c?rev=2… ============================================================================== --- branches/winldr/windows/wlmemory.c (original) +++ branches/winldr/windows/wlmemory.c Fri Jan 19 18:08:05 2007 @@ -20,11 +20,6 @@ // This is needed because headers define wrong one for ReactOS #undef KIP0PCRADDRESS #define KIP0PCRADDRESS 0xffdff000 - -// -// This is the zone which is used by the OS loader -// -#define LOADER_HIGH_ZONE ((16*1024*1024) >> MM_PAGE_SHIFT) //16Mb page #define HYPER_SPACE_ENTRY 0x300

1 0

[greatlrd] 25530: adding beepmidi to build
by greatlrd＠svn.reactos.org 19 Jan '07

19 Jan '07

Author: greatlrd Date: Fri Jan 19 13:37:52 2007 New Revision: 25530 URL: http://svn.reactos.org/svn/reactos?rev=25530&view=rev Log: adding beepmidi to build Modified: trunk/reactos/dll/win32/win32.rbuild Modified: trunk/reactos/dll/win32/win32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/win32.rbuild?rev… ============================================================================== --- trunk/reactos/dll/win32/win32.rbuild (original) +++ trunk/reactos/dll/win32/win32.rbuild Fri Jan 19 13:37:52 2007 @@ -19,6 +19,9 @@ <directory name="avifil32"> <xi:include href="avifil32/avifil32.rbuild" /> </directory> +<directory name="beepmidi"> + <xi:include href="beepmidi/beepmidi.rbuild" /> +</directory> <directory name="cabinet"> <xi:include href="cabinet/cabinet.rbuild" /> </directory>

1 0

[cwittich] 25528: fix some gcc 4.2 compilation problems and warnings
by cwittich＠svn.reactos.org 19 Jan '07

19 Jan '07

Author: cwittich Date: Fri Jan 19 12:26:20 2007 New Revision: 25528 URL: http://svn.reactos.org/svn/reactos?rev=25528&view=rev Log: fix some gcc 4.2 compilation problems and warnings Modified: trunk/reactos/base/applications/ibrowser/mainframe.cpp trunk/reactos/base/applications/ibrowser/utility/utility.h trunk/reactos/base/applications/ibrowser/webchild.cpp trunk/reactos/base/shell/explorer/dialogs/searchprogram.cpp trunk/reactos/base/shell/explorer/shell/mainframe.cpp trunk/reactos/base/shell/explorer/shell/ntobjfs.cpp trunk/reactos/base/shell/explorer/shell/webchild.cpp trunk/reactos/base/shell/explorer/taskbar/desktopbar.cpp trunk/reactos/base/shell/explorer/utility/utility.h trunk/reactos/include/psdk/windef.h Modified: trunk/reactos/base/applications/ibrowser/mainframe.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/ibrowser… ============================================================================== --- trunk/reactos/base/applications/ibrowser/mainframe.cpp (original) +++ trunk/reactos/base/applications/ibrowser/mainframe.cpp Fri Jan 19 12:26:20 2007 @@ -149,14 +149,16 @@ rbBand.cyMaxChild = 0; rbBand.cyIntegral = btn_hgt; - rbBand.lpText = TEXT("Toolbar"); + TCHAR ToolBarText[] = _T("Toolbar"); + rbBand.lpText = ToolBarText; rbBand.hwndChild = _htoolbar; rbBand.cxMinChild = 0; rbBand.cyMinChild = btn_hgt + 4; rbBand.cx = 182; SendMessage(_hwndrebar, RB_INSERTBAND, (WPARAM)-1, (LPARAM)&rbBand); - rbBand.lpText = TEXT("Address"); + TCHAR AddressText[] = _T("Address"); + rbBand.lpText = AddressText; rbBand.hwndChild = _haddressedit; rbBand.cxMinChild = 0; rbBand.cyMinChild = btn_hgt - 2; Modified: trunk/reactos/base/applications/ibrowser/utility/utility.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/ibrowser… ============================================================================== --- trunk/reactos/base/applications/ibrowser/utility/utility.h (original) +++ trunk/reactos/base/applications/ibrowser/utility/utility.h Fri Jan 19 12:26:20 2007 @@ -25,6 +25,10 @@ // Martin Fuchs, 23.07.2003 // + // STL headers for strings and streams +#include <string> +#include <iostream> +using namespace std; // standard windows headers #define WIN32_LEAN_AND_MEAN @@ -154,11 +158,6 @@ #ifdef _MSC_VER #pragma warning(disable: 4786) // disable warnings about too long debug information symbols #endif - - // STL headers for strings and streams -#include <string> -#include <iostream> -using namespace std; // containers #include <map> Modified: trunk/reactos/base/applications/ibrowser/webchild.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/ibrowser… ============================================================================== --- trunk/reactos/base/applications/ibrowser/webchild.cpp (original) +++ trunk/reactos/base/applications/ibrowser/webchild.cpp Fri Jan 19 12:26:20 2007 @@ -133,7 +133,7 @@ else { _new_url = url; - _browser->Navigate(L"about:blank", NULL, NULL, NULL, NULL); + _browser->Navigate(BStr(L"about:blank"), NULL, NULL, NULL, NULL); } } Modified: trunk/reactos/base/shell/explorer/dialogs/searchprogram.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/dialog… ============================================================================== --- trunk/reactos/base/shell/explorer/dialogs/searchprogram.cpp (original) +++ trunk/reactos/base/shell/explorer/dialogs/searchprogram.cpp Fri Jan 19 12:26:20 2007 @@ -107,15 +107,18 @@ LV_COLUMN column = {LVCF_FMT|LVCF_WIDTH|LVCF_TEXT, LVCFMT_LEFT, 250}; - column.pszText = _T("Name"); + TCHAR lvColName[] = _T("Name"); + column.pszText = lvColName; ListView_InsertColumn(_list_ctrl, 0, &column); column.cx = 300; - column.pszText = _T("Path"); + TCHAR lvColPath[] = _T("Path"); + column.pszText = lvColPath; ListView_InsertColumn(_list_ctrl, 1, &column); column.cx = 400; - column.pszText = _T("Menu Path"); + TCHAR lvColMenuPath[] = _T("Menu Path"); + column.pszText = lvColMenuPath; ListView_InsertColumn(_list_ctrl, 2, &column); ListView_SetExtendedListViewStyleEx(_list_ctrl, LVS_EX_FULLROWSELECT, LVS_EX_FULLROWSELECT); Modified: trunk/reactos/base/shell/explorer/shell/mainframe.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/shell/… ============================================================================== --- trunk/reactos/base/shell/explorer/shell/mainframe.cpp (original) +++ trunk/reactos/base/shell/explorer/shell/mainframe.cpp Fri Jan 19 12:26:20 2007 @@ -865,7 +865,8 @@ #endif rbBand.fStyle = RBBS_CHILDEDGE|RBBS_GRIPPERALWAYS|RBBS_HIDETITLE; - rbBand.lpText = TEXT("Extras"); + TCHAR ExtrasBand[] = _T("Extras"); + rbBand.lpText = ExtrasBand; rbBand.hwndChild = _hextrabar; rbBand.cxMinChild = 0; rbBand.cyMinChild = btn_hgt; @@ -874,7 +875,8 @@ #ifndef _NO_WIN_FS rbBand.fStyle |= RBBS_BREAK; - rbBand.lpText = TEXT("Drives"); + TCHAR DrivesBand[] = _T("Drives"); + rbBand.lpText = DrivesBand; rbBand.hwndChild = _hdrivebar; rbBand.cxMinChild = 0; rbBand.cyMinChild = btn_hgt; Modified: trunk/reactos/base/shell/explorer/shell/ntobjfs.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/shell/… ============================================================================== --- trunk/reactos/base/shell/explorer/shell/ntobjfs.cpp (original) +++ trunk/reactos/base/shell/explorer/shell/ntobjfs.cpp Fri Jan 19 12:26:20 2007 @@ -230,12 +230,14 @@ if (info->name.string_ptr) { info->name.string_ptr[info->name.string_len / sizeof(WCHAR)] = 0; } else { - info->name.string_ptr = TEXT(""); + TCHAR empty_string_ptr[] = _T(""); + info->name.string_ptr = empty_string_ptr; } if (info->type.string_ptr) { info->type.string_ptr[info->type.string_len / sizeof(WCHAR)] = 0; } else { - info->type.string_ptr = TEXT(""); + TCHAR empty_string_ptr[] = _T(""); + info->type.string_ptr = empty_string_ptr; } lstrcpynW(p, info->name.string_ptr, COUNTOF(buffer)); #else Modified: trunk/reactos/base/shell/explorer/shell/webchild.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/shell/… ============================================================================== --- trunk/reactos/base/shell/explorer/shell/webchild.cpp (original) +++ trunk/reactos/base/shell/explorer/shell/webchild.cpp Fri Jan 19 12:26:20 2007 @@ -133,7 +133,7 @@ else { _new_url = url; - _browser->Navigate(L"about:blank", NULL, NULL, NULL, NULL); + _browser->Navigate(BStr(L"about:blank"), NULL, NULL, NULL, NULL); } } Modified: trunk/reactos/base/shell/explorer/taskbar/desktopbar.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/taskba… ============================================================================== --- trunk/reactos/base/shell/explorer/taskbar/desktopbar.cpp (original) +++ trunk/reactos/base/shell/explorer/taskbar/desktopbar.cpp Fri Jan 19 12:26:20 2007 @@ -148,13 +148,15 @@ rbBand.cxMinChild = rbBand.cyIntegral * 3; rbBand.fStyle = RBBS_VARIABLEHEIGHT|RBBS_GRIPPERALWAYS|RBBS_HIDETITLE; - rbBand.lpText = TEXT("Quicklaunch"); + TCHAR QuickLaunchBand[] = _T("Quicklaunch"); + rbBand.lpText = QuickLaunchBand; rbBand.hwndChild = _hwndQuickLaunch; rbBand.cx = 250; rbBand.wID = IDW_QUICKLAUNCHBAR; SendMessage(_hwndrebar, RB_INSERTBAND, (WPARAM)-1, (LPARAM)&rbBand); - rbBand.lpText = TEXT("Taskbar"); + TCHAR TaskbarBand[] = _T("Taskbar"); + rbBand.lpText = TaskbarBand; rbBand.hwndChild = _hwndTaskBar; rbBand.cx = 200; //pcs->cx-_taskbar_pos-quicklaunch_width-(notifyarea_width+1); rbBand.wID = IDW_TASKTOOLBAR; Modified: trunk/reactos/base/shell/explorer/utility/utility.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/utilit… ============================================================================== --- trunk/reactos/base/shell/explorer/utility/utility.h (original) +++ trunk/reactos/base/shell/explorer/utility/utility.h Fri Jan 19 12:26:20 2007 @@ -26,6 +26,12 @@ // + // STL headers for strings and streams +#include <string> +#include <iostream> +using namespace std; + + // standard windows headers #define WIN32_LEAN_AND_MEAN #define WIN32_EXTRA_LEAN @@ -193,11 +199,6 @@ #ifdef _MSC_VER #pragma warning(disable: 4786) // disable warnings about too long debug information symbols #endif - - // STL headers for strings and streams -#include <string> -#include <iostream> -using namespace std; // containers #include <map> Modified: trunk/reactos/include/psdk/windef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/windef.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/windef.h (original) +++ trunk/reactos/include/psdk/windef.h Fri Jan 19 12:26:20 2007 @@ -123,8 +123,8 @@ #endif /* __GNUC__/__WATCOMC__ */ #define MAKEWORD(a,b) ((WORD)(((BYTE)(a))|(((WORD)((BYTE)(b)))<<8))) #define MAKELONG(a,b) ((LONG)(((WORD)(a))|(((DWORD)((WORD)(b)))<<16))) -#define LOWORD(l) ((WORD)((DWORD)(l))) -#define HIWORD(l) ((WORD)(((DWORD)(l)>>16)&0xFFFF)) +#define LOWORD(l) ((WORD)((DWORD_PTR)(l))) +#define HIWORD(l) ((WORD)(((DWORD_PTR)(l)>>16)&0xFFFF)) #define LOBYTE(w) ((BYTE)(w)) #define HIBYTE(w) ((BYTE)(((WORD)(w)>>8)&0xFF))

1 0

[greatlrd] 25527: Fixing the src and dst of register so they are being read right (PPC brain) Adding stw for dissembler and converting (PPC and IA32) Fixing a counter bug in ConvertBitToByte, ConvertBitToByte32, GetMaskByte, GetMaskByte32 we did miss one bit calculation when we count the mask the bit 0
by greatlrd＠svn.reactos.org 19 Jan '07

19 Jan '07

Author: greatlrd Date: Fri Jan 19 11:20:42 2007 New Revision: 25527 URL: http://svn.reactos.org/svn/reactos?rev=25527&view=rev Log: Fixing the src and dst of register so they are being read right (PPC brain) Adding stw for dissembler and converting (PPC and IA32) Fixing a counter bug in ConvertBitToByte, ConvertBitToByte32, GetMaskByte, GetMaskByte32 we did miss one bit calculation when we count the mask the bit 0 Modified: trunk/rosapps/devutils/cputointel/ConvertToIA32Process.c trunk/rosapps/devutils/cputointel/ConvertingProcess.c trunk/rosapps/devutils/cputointel/CpuToIntel.c trunk/rosapps/devutils/cputointel/From/PPC/PPC.h trunk/rosapps/devutils/cputointel/From/PPC/PPCBrain.c trunk/rosapps/devutils/cputointel/From/PPC/PPCBrain.h trunk/rosapps/devutils/cputointel/From/PPC/PPCopcode.c trunk/rosapps/devutils/cputointel/ImageLoader.c trunk/rosapps/devutils/cputointel/OpCodePPC.txt trunk/rosapps/devutils/cputointel/misc.c Modified: trunk/rosapps/devutils/cputointel/ConvertToIA32Process.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/Conver… ============================================================================== --- trunk/rosapps/devutils/cputointel/ConvertToIA32Process.c (original) +++ trunk/rosapps/devutils/cputointel/ConvertToIA32Process.c Fri Jan 19 11:20:42 2007 @@ -28,7 +28,7 @@ * mmx/sse/fpu 7 = 28 */ -static void standardreg(CPU_INT *RegTableCount, CPU_UNINT reg, CPU_INT setup_ebp, FILE *outfp) +static void standardreg(CPU_INT *RegTableCount, CPU_INT reg, CPU_INT setup_ebp, FILE *outfp) { /* eax */ if (reg == RegTableCount[3]) @@ -66,7 +66,7 @@ fprintf(outfp,"esi"); } /* edi */ - else if (reg == RegTableCount[10]) + else if (reg == RegTableCount[11]) { fprintf(outfp,"edi"); } @@ -194,7 +194,11 @@ standardreg( RegTableCount, pMystart->dst, setup_ebp, outfp); - fprintf(outfp," %d], ",pMystart->dst_extra); + if (pMystart->dst_extra>=0) + fprintf(outfp," +%d], ",pMystart->dst_extra); + else + fprintf(outfp," %d], ",pMystart->dst_extra); + standardreg( RegTableCount, pMystart->src, setup_ebp, outfp); Modified: trunk/rosapps/devutils/cputointel/ConvertingProcess.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/Conver… ============================================================================== --- trunk/rosapps/devutils/cputointel/ConvertingProcess.c (original) +++ trunk/rosapps/devutils/cputointel/ConvertingProcess.c Fri Jan 19 11:20:42 2007 @@ -42,13 +42,19 @@ if ((ptmpMystart->type & 8) == 8) RegTableCount[ptmpMystart->dst]++; + if ((ptmpMystart->type & 32) == 32) + RegTableCount[ptmpMystart->src]++; + + if ((ptmpMystart->type & 64) == 64) + RegTableCount[ptmpMystart->dst]++; + if (ptmpMystart == ptmpMyend) ptmpMystart=NULL; else ptmpMystart = (PMYBrainAnalys) ptmpMystart->ptr_next; } - for (t=0;t<31;t++) + for (t=0;t<=31;t++) { if (RegTableCount[t]!=0) { Modified: trunk/rosapps/devutils/cputointel/CpuToIntel.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/CpuToI… ============================================================================== --- trunk/rosapps/devutils/cputointel/CpuToIntel.c (original) +++ trunk/rosapps/devutils/cputointel/CpuToIntel.c Fri Jan 19 11:20:42 2007 @@ -94,8 +94,11 @@ //} + // mode 0 disambler + // mode 1 convert to intel + // mode 2 convert to ppc //return LoadPFileImage(infile,outfile,BaseAddress,cpuid,type, mode); - return LoadPFileImage("e:\\testppc.exe","e:\\cputointel.asm",0,0,0,1); // disambler + return LoadPFileImage("e:\\testppc.exe","e:\\cputointel.asm",0,0,0,1); // return LoadPFileImage("e:\\testms.exe","e:\\cputointel.asm",0,0,0,1); // convert } Modified: trunk/rosapps/devutils/cputointel/From/PPC/PPC.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/From/P… ============================================================================== --- trunk/rosapps/devutils/cputointel/From/PPC/PPC.h (original) +++ trunk/rosapps/devutils/cputointel/From/PPC/PPC.h Fri Jan 19 11:20:42 2007 @@ -12,6 +12,7 @@ /* here we put the prototype for the opcode api that brain need we show a example for it */ CPU_INT PPC_Blr( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch); CPU_INT PPC_Li( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch); +CPU_INT PPC_Stw( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch); CPU_INT PPC_Stwu( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch); /* Export comment thing see m68k for example Modified: trunk/rosapps/devutils/cputointel/From/PPC/PPCBrain.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/From/P… ============================================================================== --- trunk/rosapps/devutils/cputointel/From/PPC/PPCBrain.c (original) +++ trunk/rosapps/devutils/cputointel/From/PPC/PPCBrain.c Fri Jan 19 11:20:42 2007 @@ -80,6 +80,18 @@ cpu_pos += retsize; } + /* stw */ + if ((cpuint - (cpuint & GetMaskByte32(cpuPPCInit_stw))) == ConvertBitToByte32(cpuPPCInit_stw)) + { + retsize = PPC_Stw( outfp, cpu_buffer, cpu_pos, cpu_size, + BaseAddress, cpuarch); + if (retsize<0) + retcode = 1; + else + cpu_pos += retsize; + } + retcode = 0; + /* stwu */ if ((cpuint - (cpuint & GetMaskByte32(cpuPPCInit_stwu))) == ConvertBitToByte32(cpuPPCInit_stwu)) { @@ -116,6 +128,6 @@ } } -// return 0; // hack getting dismabler working or converting working + return 0; // hack getting dismabler working or converting working return retcode; } Modified: trunk/rosapps/devutils/cputointel/From/PPC/PPCBrain.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/From/P… ============================================================================== --- trunk/rosapps/devutils/cputointel/From/PPC/PPCBrain.h (original) +++ trunk/rosapps/devutils/cputointel/From/PPC/PPCBrain.h Fri Jan 19 11:20:42 2007 @@ -12,6 +12,7 @@ /* FIXME RA should be 0 in stwu */ CPU_BYTE cpuPPCInit_Blr[32] = {0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,1,0,0,1,1,1,0}; CPU_BYTE cpuPPCInit_Li[32] = {2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,1,1,1,0,2,2}; +CPU_BYTE cpuPPCInit_stw[32] = {2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,1,0,0,1,0,0,2,2}; CPU_BYTE cpuPPCInit_stwu[32] = {2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,1,0,0,1,0,1,2,2}; /* mask */ /* Modified: trunk/rosapps/devutils/cputointel/From/PPC/PPCopcode.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/From/P… ============================================================================== --- trunk/rosapps/devutils/cputointel/From/PPC/PPCopcode.c (original) +++ trunk/rosapps/devutils/cputointel/From/PPC/PPCopcode.c Fri Jan 19 11:20:42 2007 @@ -28,7 +28,7 @@ */ /* Get Dest register */ -#define PPC_GetBitArrayDstReg(opcode) (((opcode & 0x3) << 3) | ((opcode & 0xE000) >> 13)) +#define PPC_GetBitArraySrcReg(opcode) (((opcode & 0x3) << 3) | ((opcode & 0xE000) >> 13)) /* Get Source register */ CPU_UNINT PPC_GetBitArrayBto31xx(CPU_UNINT opcode) @@ -75,7 +75,7 @@ { CPU_UNINT opcode; - opcode = GetData32Le(cpu_buffer); + opcode = GetData32Le(&cpu_buffer[cpu_pos]); BaseAddress +=cpu_pos; @@ -87,13 +87,45 @@ pMyBrainAnalys->op = OP_ANY_mov; pMyBrainAnalys->type= 8 + 16; /* 8 dst reg, 16 imm */ pMyBrainAnalys->src_size = 16; - pMyBrainAnalys->src = PPC_GetBitArrayBto31(opcode); - pMyBrainAnalys->dst = PPC_GetBitArrayDstReg(opcode); + pMyBrainAnalys->src = PPC_GetBitArraySrcReg(opcode); + pMyBrainAnalys->dst = PPC_GetBitArrayBto31(opcode); pMyBrainAnalys->memAdr=BaseAddress; return 4; } + +CPU_INT PPC_Stw( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, + CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch) +{ + /* r1 store at -0x20(r1) */ + + CPU_UNINT opcode; + CPU_SHORT tmp = 0; + + opcode = GetData32Le(&cpu_buffer[cpu_pos]); + + BaseAddress +=cpu_pos; + + /* own translatons langues */ + if (AllocAny()!=0) /* alloc memory for pMyBrainAnalys */ + { + return -1; + } + + tmp = _byteswap_ushort( ((CPU_SHORT)((opcode >> 16) & 0xffff))); + + pMyBrainAnalys->op = OP_ANY_mov; + pMyBrainAnalys->type= 2 + 64; + pMyBrainAnalys->src_size = 32; + pMyBrainAnalys->dst_size = 32; + pMyBrainAnalys->src = PPC_GetBitArraySrcReg(opcode); + pMyBrainAnalys->dst = PPC_GetBitArrayBto31xx(opcode); + pMyBrainAnalys-> dst_extra = tmp; + pMyBrainAnalys->memAdr=BaseAddress; + + return 4; +} CPU_INT PPC_Stwu( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch) @@ -101,9 +133,16 @@ /* r1 store at -0x20(r1) */ CPU_UNINT opcode; + CPU_INT DstReg; CPU_SHORT tmp = 0; - opcode = GetData32Le(cpu_buffer); + opcode = GetData32Le(&cpu_buffer[cpu_pos]); + + DstReg = PPC_GetBitArrayBto31xx(opcode); + if (DstReg == 0) + { + return 0; + } BaseAddress +=cpu_pos; @@ -119,8 +158,8 @@ pMyBrainAnalys->type= 2 + 64 + 128; pMyBrainAnalys->src_size = 32; pMyBrainAnalys->dst_size = 32; - pMyBrainAnalys->src = PPC_GetBitArrayBto31xx(opcode); - pMyBrainAnalys->dst = PPC_GetBitArrayDstReg(opcode); + pMyBrainAnalys->src = PPC_GetBitArraySrcReg(opcode); + pMyBrainAnalys->dst = DstReg; pMyBrainAnalys-> dst_extra = tmp; pMyBrainAnalys->memAdr=BaseAddress; Modified: trunk/rosapps/devutils/cputointel/ImageLoader.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/ImageL… ============================================================================== --- trunk/rosapps/devutils/cputointel/ImageLoader.c (original) +++ trunk/rosapps/devutils/cputointel/ImageLoader.c Fri Jan 19 11:20:42 2007 @@ -485,7 +485,8 @@ fprintf(outfp,"; CPU found POWERPC\n"); //PPCBrain(memory, pos, cpu_size, base, 0, outfp); machine_type = IMAGE_FILE_MACHINE_POWERPC; - return PPCBrain(memory+SectionHeader->PointerToRawData, 0, SectionHeader->SizeOfRawData, 0, 0, outfp); + PPCBrain(memory+SectionHeader->PointerToRawData, 0, SectionHeader->SizeOfRawData, 0, 0, outfp); + break; case IMAGE_FILE_MACHINE_POWERPCFP: Modified: trunk/rosapps/devutils/cputointel/OpCodePPC.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/OpCode… ============================================================================== --- trunk/rosapps/devutils/cputointel/OpCodePPC.txt (original) +++ trunk/rosapps/devutils/cputointel/OpCodePPC.txt Fri Jan 19 11:20:42 2007 @@ -9,11 +9,15 @@ 1 = mean bit is set 2 = mean this bit can be 0 or 1 -opcode Name Desciptions -0010 0000 0000 0000 1000 0000 0100 1110 blr return from a functions +opcode Name Desciptions +0010 0000 0000 0000 1000 0000 0100 1110 blr return from a functions -0222 2222 2222 2222 2222 2222 0011 1000 Li reg,#imm move a value to a register +0222 2222 2222 2222 2222 2222 0011 1000 Li reg,#imm move a value to a register +2222 2222 2222 2222 2222 2222 1001 0022 stw reg,mem store a value into memory + +2222 2222 2222 2222 2222 2222 1001 0122 stwu reg,mem store contain of reg to memory and + move reg to that memory position Modified: trunk/rosapps/devutils/cputointel/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/misc.c… ============================================================================== --- trunk/rosapps/devutils/cputointel/misc.c (original) +++ trunk/rosapps/devutils/cputointel/misc.c Fri Jan 19 11:20:42 2007 @@ -36,10 +36,10 @@ CPU_UNINT ConvertBitToByte(CPU_BYTE *bit) { CPU_UNINT Byte = 0; - CPU_UNINT t; + CPU_INT t; CPU_UNINT size = 15; - for(t=size;t>0;t--) + for(t=size;t>=0;t--) { if (bit[size-t] != 2) Byte = Byte + (bit[size-t]<<t); @@ -51,10 +51,10 @@ CPU_UNINT GetMaskByte(CPU_BYTE *bit) { CPU_UNINT MaskByte = 0; - CPU_UNINT t; + CPU_INT t; CPU_UNINT size = 15; - for(t=size;t>0;t--) + for(t=size;t>=0;t--) { if (bit[size-t] == 2) { @@ -68,10 +68,10 @@ CPU_UNINT ConvertBitToByte32(CPU_BYTE *bit) { CPU_UNINT Byte = 0; - CPU_UNINT t; + CPU_INT t; CPU_UNINT size = 31; - for(t=size;t>0;t--) + for(t=size;t>=0;t--) { if (bit[size-t] != 2) Byte = Byte + (bit[size-t]<<t); @@ -83,10 +83,10 @@ CPU_UNINT GetMaskByte32(CPU_BYTE *bit) { CPU_UNINT MaskByte = 0; - CPU_UNINT t; + CPU_INT t; CPU_UNINT size = 31; - for(t=size;t>0;t--) + for(t=size;t>=0;t--) { if (bit[size-t] == 2) {

1 0

[weiden] 25526: Fix compilation (second attempt, too many local changes to keep track of)
by weiden＠svn.reactos.org 19 Jan '07

19 Jan '07

Author: weiden Date: Fri Jan 19 04:06:25 2007 New Revision: 25526 URL: http://svn.reactos.org/svn/reactos?rev=25526&view=rev Log: Fix compilation (second attempt, too many local changes to keep track of) Modified: trunk/reactos/dll/cpl/sysdm/sysdm.c Modified: trunk/reactos/dll/cpl/sysdm/sysdm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/sysdm.c?rev=… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/sysdm.c (original) +++ trunk/reactos/dll/cpl/sysdm/sysdm.c Fri Jan 19 04:06:25 2007 @@ -102,7 +102,6 @@ HPROPSHEETPAGE hpsp[MAX_SYSTEM_PAGES]; PROPSHEETHEADER psh; HMODULE hNetIdDll; - HPSXA hpsxa; LONG Ret; static INITCOMMONCONTROLSEX icc = {sizeof(INITCOMMONCONTROLSEX), ICC_LINK_CLASS};

1 0

[weiden] 25525: Fix compilation
by weiden＠svn.reactos.org 19 Jan '07

19 Jan '07

Author: weiden Date: Fri Jan 19 04:05:44 2007 New Revision: 25525 URL: http://svn.reactos.org/svn/reactos?rev=25525&view=rev Log: Fix compilation Modified: trunk/reactos/dll/cpl/sysdm/sysdm.c Modified: trunk/reactos/dll/cpl/sysdm/sysdm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/sysdm.c?rev=… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/sysdm.c (original) +++ trunk/reactos/dll/cpl/sysdm/sysdm.c Fri Jan 19 04:05:44 2007 @@ -102,8 +102,9 @@ HPROPSHEETPAGE hpsp[MAX_SYSTEM_PAGES]; PROPSHEETHEADER psh; HMODULE hNetIdDll; + HPSXA hpsxa; LONG Ret; - static const INITCOMMONCONTROLSEX icc = {sizeof(INITCOMMONCONTROLSEX), ICC_LINK_CLASS}; + static INITCOMMONCONTROLSEX icc = {sizeof(INITCOMMONCONTROLSEX), ICC_LINK_CLASS}; if (!InitCommonControlsEx(&icc)) return 0;

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