Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hyperion] 38460: modified lib/pseh/framebased-gcchack.c modified lib/pseh/i386/framebased-gcchack.S Correctly handle exceptions thrown during unwinding Renamed some internal routines to more appropriate names
by hyperion＠svn.reactos.org 30 Dec '08

30 Dec '08

Author: hyperion Date: Mon Dec 29 22:00:45 2008 New Revision: 38460 URL: http://svn.reactos.org/svn/reactos?rev=38460&view=rev Log: modified lib/pseh/framebased-gcchack.c modified lib/pseh/i386/framebased-gcchack.S Correctly handle exceptions thrown during unwinding Renamed some internal routines to more appropriate names Modified: trunk/reactos/lib/pseh/framebased-gcchack.c trunk/reactos/lib/pseh/i386/framebased-gcchack.S Modified: trunk/reactos/lib/pseh/framebased-gcchack.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/pseh/framebased-gcchac… ============================================================================== --- trunk/reactos/lib/pseh/framebased-gcchack.c [iso-8859-1] (original) +++ trunk/reactos/lib/pseh/framebased-gcchack.c [iso-8859-1] Mon Dec 29 22:00:45 2008 @@ -40,7 +40,7 @@ extern DECLSPEC_NORETURN int __SEH2Handle(void *, void *, void *); extern int __cdecl __SEH2FrameHandler(struct _EXCEPTION_RECORD *, void *, struct _CONTEXT *, void *); -extern int __cdecl __SEH2NestedHandler(struct _EXCEPTION_RECORD *, void *, struct _CONTEXT *, void *); +extern int __cdecl __SEH2UnwindHandler(struct _EXCEPTION_RECORD *, void *, struct _CONTEXT *, void *); FORCEINLINE _SEH2Registration_t * __cdecl _SEH2CurrentRegistration(void) @@ -134,8 +134,18 @@ } } -extern -int __cdecl _SEH2NestedHandler +typedef struct __SEH2UnwindFrame +{ + _SEH2Registration_t SUF_Registration; + _SEH2Frame_t * SUF_Frame; + volatile _SEH2TryLevel_t * SUF_TargetTryLevel; +} +_SEH2UnwindFrame_t; + +static void _SEH2LocalUnwind(_SEH2Frame_t *, volatile _SEH2TryLevel_t *); + +extern +int __cdecl _SEH2UnwindHandler ( struct _EXCEPTION_RECORD * ExceptionRecord, void * EstablisherFrame, @@ -144,25 +154,33 @@ ) { if(ExceptionRecord->ExceptionFlags & (EXCEPTION_EXIT_UNWIND | EXCEPTION_UNWINDING)) - return ExceptionContinueSearch; - - *((void **)DispatcherContext) = EstablisherFrame; - return ExceptionCollidedUnwind; + { + _SEH2UnwindFrame_t * unwindframe = CONTAINING_RECORD(EstablisherFrame, _SEH2UnwindFrame_t, SUF_Registration); + _SEH2LocalUnwind(unwindframe->SUF_Frame, unwindframe->SUF_TargetTryLevel); + *((void **)DispatcherContext) = EstablisherFrame; + return ExceptionCollidedUnwind; + } + + return ExceptionContinueSearch; } static void _SEH2LocalUnwind(_SEH2Frame_t * frame, volatile _SEH2TryLevel_t * dsttrylevel) { volatile _SEH2TryLevel_t * trylevel; - _SEH2Registration_t nestedframe; - - nestedframe.SER_Handler = &__SEH2NestedHandler; - __SEH2EnterFrame(&nestedframe); + _SEH2UnwindFrame_t unwindframe; + + unwindframe.SUF_Frame = frame; + unwindframe.SUF_TargetTryLevel = dsttrylevel; + + unwindframe.SUF_Registration.SER_Handler = &__SEH2UnwindHandler; + __SEH2EnterFrame(&unwindframe.SUF_Registration); for(trylevel = frame->SF_TopTryLevel; trylevel && trylevel != dsttrylevel; trylevel = trylevel->ST_Next) + { + frame->SF_TopTryLevel = trylevel->ST_Next; _SEH2Finally(frame, trylevel); - - frame->SF_TopTryLevel = dsttrylevel; + } __SEH2LeaveFrame(); } Modified: trunk/reactos/lib/pseh/i386/framebased-gcchack.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/pseh/i386/framebased-g… ============================================================================== --- trunk/reactos/lib/pseh/i386/framebased-gcchack.S [iso-8859-1] (original) +++ trunk/reactos/lib/pseh/i386/framebased-gcchack.S [iso-8859-1] Mon Dec 29 22:00:45 2008 @@ -40,14 +40,14 @@ jmp __SEH2FrameHandler .endfunc -.func __SEH2NestedHandler -.globl ___SEH2NestedHandler -___SEH2NestedHandler: +.func __SEH2UnwindHandler +.globl ___SEH2UnwindHandler +___SEH2UnwindHandler: -.extern __SEH2NestedHandler +.extern __SEH2UnwindHandler cld - jmp __SEH2NestedHandler + jmp __SEH2UnwindHandler .endfunc // EOF

1 0

[dgorbachev] 38459: Fix UTF-8 -> Wide Char conversion bug #3990.
by dgorbachev＠svn.reactos.org 29 Dec '08

29 Dec '08

Author: dgorbachev Date: Mon Dec 29 14:16:22 2008 New Revision: 38459 URL: http://svn.reactos.org/svn/reactos?rev=38459&view=rev Log: Fix UTF-8 -> Wide Char conversion bug #3990. Modified: trunk/reactos/dll/win32/kernel32/misc/nls.c Modified: trunk/reactos/dll/win32/kernel32/misc/nls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/nl… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/nls.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/nls.c [iso-8859-1] Mon Dec 29 14:16:22 2008 @@ -379,7 +379,7 @@ WideChar = Char & UTF8Mask[Length]; while (Length && MultiByteString < MbsEnd) { - WideChar = (WideChar << 6) | *MultiByteString++; + WideChar = (WideChar << 6) | (*MultiByteString++ & 0x7f); Length--; } *WideCharString++ = WideChar;

1 0

[dchapyshev] 38458: - Remove lpAddress check, this is broken trunk
by dchapyshev＠svn.reactos.org 29 Dec '08

29 Dec '08

Author: dchapyshev Date: Mon Dec 29 11:14:17 2008 New Revision: 38458 URL: http://svn.reactos.org/svn/reactos?rev=38458&view=rev Log: - Remove lpAddress check, this is broken trunk Modified: trunk/reactos/dll/win32/kernel32/mem/virtual.c Modified: trunk/reactos/dll/win32/kernel32/mem/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/mem/vir… ============================================================================== --- trunk/reactos/dll/win32/kernel32/mem/virtual.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/mem/virtual.c [iso-8859-1] Mon Dec 29 11:14:17 2008 @@ -27,12 +27,6 @@ IN DWORD flProtect) { NTSTATUS Status; - - if (lpAddress != NULL) - { - SetLastErrorByStatus(STATUS_INVALID_PARAMETER); - return NULL; - } /* Allocate the memory */ Status = NtAllocateVirtualMemory(hProcess,

1 0

[dgorbachev] 38457: Fix translations. Patch by Mario Kacmar. Bug #3955.
by dgorbachev＠svn.reactos.org 29 Dec '08

29 Dec '08

Author: dgorbachev Date: Mon Dec 29 08:26:01 2008 New Revision: 38457 URL: http://svn.reactos.org/svn/reactos?rev=38457&view=rev Log: Fix translations. Patch by Mario Kacmar. Bug #3955. Modified: trunk/reactos/base/applications/taskmgr/lang/da-DK.rc trunk/reactos/base/setup/usetup/lang/sk-SK.h trunk/reactos/ntoskrnl/kd/kdmain.c Modified: trunk/reactos/base/applications/taskmgr/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/da-DK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/da-DK.rc [iso-8859-1] Mon Dec 29 08:26:01 2008 @@ -198,7 +198,6 @@ IDD_PROCESS_PAGE DIALOGEX DISCARDABLE 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -CAPTION "KMK" FONT 8, "MS Shell Dlg" BEGIN CONTROL "List2",IDC_PROCESSLIST,"SysListView32",LVS_REPORT | @@ -366,7 +365,7 @@ CONTROL "&Billede Navn",IDC_IMAGENAME,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,7,28,56,10 CONTROL "&PID (Process Identifikation)",IDC_PID,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,7, 39, 100, 10 + BS_AUTOCHECKBOX | WS_TABSTOP,7,39,100,10 CONTROL "&CPU Forbrug",IDC_CPUUSAGE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,50,53,10 CONTROL "CPU &Tid",IDC_CPUTIME,"Button",BS_AUTOCHECKBOX | @@ -605,7 +604,71 @@ IDS_LICENSE "Dette program er fri software; du kan formidle det og/eller ændre det under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA." END -#endif // English (U.S.) resources + +STRINGTABLE DISCARDABLE +BEGIN + IDS_TAB_APPS "Applications" + IDS_TAB_PROCESSES "Processes" + IDS_TAB_PERFORMANCE "Performance" + IDS_TAB_TASK "Task" + IDS_TAB_STATUS "Status" + IDS_TAB_IMAGENAME "Image Name" + IDS_TAB_PID "PID" + IDS_TAB_USERNAME "Username" + IDS_TAB_SESSIONID "Session ID" + IDS_TAB_CPU "CPU" + IDS_TAB_CPUTIME "CPU Time" + IDS_TAB_MEMUSAGE "Mem Usage" + IDS_TAB_PEAKMEMUSAGE "Peak Mem Usage" + IDS_TAB_MEMDELTA "Mem Delta" + IDS_TAB_PAGEFAULT "Page Faults" + IDS_TAB_PFDELTA "PF Delta" + IDS_TAB_VMSIZE "VM Size" + IDS_TAB_PAGEDPOOL "Paged Pool" + IDS_TAB_NPPOOL "NP Pool" + IDS_TAB_BASEPRI "Base Pri" + IDS_TAB_HANDLES "Handles" + IDS_TAB_THREADS "Threads" + IDS_TAB_USERPBJECTS "USER Objects" + IDS_TAB_GDIOBJECTS "GDI Objects" + IDS_TAB_IOREADS "I/O Reads" + IDS_TAB_IOWRITES "I/O Writes" + IDS_TAB_IOOTHER "I/O Other" + IDS_TAB_IOREADBYTES "I/O Read Bytes" + IDS_TAB_IOWRITESBYTES "I/O Write Bytes" + IDS_TAB_IOOTHERBYTES "I/O Other Bytes" + IDS_MENU_SELECTCOLUMNS "&Select Columns..." + IDS_MENU_16BITTASK "&Show 16-bit tasks" + IDS_MENU_WINDOWS "&Windows" + IDS_MENU_LARGEICONS "Lar&ge Icons" + IDS_MENU_SMALLICONS "S&mall Icons" + IDS_MENU_DETAILS "&Details" + IDS_MENU_ONEGRAPHALLCPUS "&One Graph, All CPUs" + IDS_MENU_ONEGRAPHPERCPU "One Graph &Per CPU" + IDS_MENU_CPUHISTORY "&CPU History" + IDS_MENU_SHOWKERNELTIMES "&Show Kernel Times" + IDS_CREATENEWTASK "Create New Task" + IDS_CREATENEWTASK_DESC "Type the name of a program, folder, document, or Internet resource, and Task Manager will open it for you." + IDS_MSG_ACCESSPROCESSAFF "Unable to Access or Set Process Affinity" + IDS_MSG_PROCESSONEPRO "The process must have affinity with at least one processor." + IDS_MSG_INVALIDOPTION "Invalid Option" + IDS_MSG_UNABLEDEBUGPROCESS "Unable to Debug Process" + IDS_MSG_WARNINGDEBUG "WARNING: Debugging this process may result in loss of data.\nAre you sure you wish to attach the debugger?" + IDS_MSG_TASKMGRWARNING "Task Manager Warning" + IDS_MSG_WARNINGTERMINATING "WARNING: Terminating a process can cause undesired\nresults including loss of data and system instability. The\nprocess will not be given the chance to save its state or\ndata before it is terminated. Are you sure you want to\nterminate the process?" + IDS_MSG_UNABLETERMINATEPRO "Unable to Terminate Process" + IDS_MSG_UNABLECHANGEPRIORITY "Unable to Change Priority" + IDS_MSG_WARNINGCHANGEPRIORITY "WARNING: Changing the priority class of this process may\ncause undesired results including system instability. Are you\nsure you want to change the priority class?" + IDS_MSG_TRAYICONCPUUSAGE "CPU Usage: %d%%" + IDS_STATUS_MEMUSAGE "Mem Usage: %dK / %dK" + IDS_STATUS_CPUUSAGE "CPU Usage: %3d%%" + IDS_STATUS_PROCESSES "Processes: %d" + IDS_Not_Responding "Not Responding" + IDS_Running "Running" +END + + +#endif // Danish resources ///////////////////////////////////////////////////////////////////////////// Modified: trunk/reactos/base/setup/usetup/lang/sk-SK.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sk-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/sk-SK.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/sk-SK.h [iso-8859-1] Mon Dec 29 08:26:01 2008 @@ -1,7 +1,7 @@ /* TRANSLATOR: M rio Kam r /Mario Kacmar/ aka Kario (kario(a)szm.sk) * DATE OF TR: 22-01-2008 * Encoding : Latin II (852) - * LastChange: 01-12-2008 + * LastChange: 14-12-2008 */ #ifndef LANG_SK_SK_H__ @@ -1215,7 +1215,7 @@ { 6, 8, - "Vybrali Ste si odstr nenie oblasti", + "Vybrali ste si odstr nenie oblasti", TEXT_STYLE_NORMAL }, { @@ -1323,7 +1323,8 @@ }, { //ERROR_WRITE_BOOT, - "Setup failed to install FAT bootcode on the system partition.", + "Inçtal toru sa nepodarilo nainçtalova zav dzac¡ k¢d s£borovho\n" + "systmu FAT na systmov£ part¡ciu.", "ENTER = Reçtart po¡taa" }, { @@ -1374,7 +1375,8 @@ }, { //ERROR_INSTALL_BOOTCODE, - "Setup failed to install the FAT bootcode on the system partition.", + "Inçtal toru sa nepodarilo nainçtalova zav dzac¡ k¢d s£borovho\n" + "systmu FAT na systmov£ part¡ciu.", "ENTER = Reçtart po¡taa" }, { @@ -1598,7 +1600,7 @@ {STRING_PARTITIONSIZE, "Vekos novej oblasti:"}, {STRING_CHOOSENEWPARTITION, - "Zvolili Ste vytvorenie novej oblasti na"}, + "Zvolili ste vytvorenie novej oblasti na"}, {STRING_HDDSIZE, "Zadajte, pros¡m, vekos novej oblasti v megabajtoch."}, {STRING_CREATEPARTITION, @@ -1606,7 +1608,7 @@ {STRING_PARTFORMAT, "T to oblas sa bude form tova ako Ôalçia."}, {STRING_NONFORMATTEDPART, - "Zvolili Ste inçtal ciu systmu ReactOS na nov£ alebo nenaform tovan£ oblas."}, + "Zvolili ste inçtal ciu systmu ReactOS na nov£ alebo nenaform tovan£ oblas."}, {STRING_INSTALLONPART, "Inçtal tor nainçtaluje systm ReactOS na oblas"}, {STRING_CHECKINGPART, Modified: trunk/reactos/ntoskrnl/kd/kdmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/kdmain.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/kd/kdmain.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd/kdmain.c [iso-8859-1] Mon Dec 29 08:26:01 2008 @@ -2,7 +2,7 @@ * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Kernel * FILE: ntoskrnl/kd/kdinit.c - * PURPOSE: Kernel Debugger Initializtion + * PURPOSE: Kernel Debugger Initialization * * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) */

1 0

[dgorbachev] 38456: - Fix more ICU warnings
by dgorbachev＠svn.reactos.org 29 Dec '08

29 Dec '08

Author: dgorbachev Date: Mon Dec 29 07:10:33 2008 New Revision: 38456 URL: http://svn.reactos.org/svn/reactos?rev=38456&view=rev Log: - Fix more ICU warnings Modified: trunk/reactos/lib/3rdparty/icu4ros/icu/source/common/unistr.cpp Modified: trunk/reactos/lib/3rdparty/icu4ros/icu/source/common/unistr.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/icu4ros/icu/s… ============================================================================== --- trunk/reactos/lib/3rdparty/icu4ros/icu/source/common/unistr.cpp [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/icu4ros/icu/source/common/unistr.cpp [iso-8859-1] Mon Dec 29 07:10:33 2008 @@ -1314,7 +1314,7 @@ */ if(forceClone || fFlags & kBufferIsReadonly || - fFlags & kRefCounted && refCount() > 1 || + (fFlags & kRefCounted && refCount() > 1) || newCapacity > fCapacity ) { // save old values @@ -1330,7 +1330,7 @@ // allocate a new array if(allocate(growCapacity) || - newCapacity < growCapacity && allocate(newCapacity) + (newCapacity < growCapacity && allocate(newCapacity)) ) { if(doCopyArray) { // copy the contents

1 0

[dgorbachev] 38455: - Fix indentation. - Fix bug #3920 (at line 736).
by dgorbachev＠svn.reactos.org 29 Dec '08

29 Dec '08

Author: dgorbachev Date: Mon Dec 29 05:50:09 2008 New Revision: 38455 URL: http://svn.reactos.org/svn/reactos?rev=38455&view=rev Log: - Fix indentation. - Fix bug #3920 (at line 736). Modified: trunk/reactos/dll/win32/shell32/fprop.c Modified: trunk/reactos/dll/win32/shell32/fprop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/fprop.c?… ============================================================================== --- trunk/reactos/dll/win32/shell32/fprop.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/fprop.c [iso-8859-1] Mon Dec 29 05:50:09 2008 @@ -25,12 +25,13 @@ #define MAX_PROPERTY_SHEET_PAGE 32 typedef struct _LANGANDCODEPAGE_ - { +{ WORD lang; WORD code; } LANGANDCODEPAGE, *LPLANGANDCODEPAGE; HPSXA WINAPI SHCreatePropSheetExtArrayEx(HKEY hKey, LPCWSTR pszSubKey, UINT max_iface, IDataObject *pDataObj); + /************************************************************************* * * SH_CreatePropertySheetPage [Internal] @@ -38,6 +39,7 @@ * creates a property sheet page from an resource name * */ + HPROPSHEETPAGE SH_CreatePropertySheetPage(LPSTR resname, DLGPROC dlgproc, LPARAM lParam, LPWSTR szTitle) { @@ -55,7 +57,9 @@ ERR("failed to find resource name\n"); return (HPROPSHEETPAGE)0; } + lpsztemplate = LoadResource(shell32_hInstance, hRes); + if (lpsztemplate == NULL) return (HPROPSHEETPAGE)0; @@ -66,18 +70,14 @@ ppage.pfnDlgProc = dlgproc; ppage.lParam = lParam; ppage.pszTitle = szTitle; + if (szTitle) { ppage.dwFlags |= PSP_USETITLE; } + return CreatePropertySheetPageW(&ppage); } - - - - - - /************************************************************************* * @@ -90,67 +90,72 @@ */ BOOL -SH_FileGeneralSetFileType(HWND hwndDlg, WCHAR * filext) -{ - WCHAR name[MAX_PATH]; - WCHAR value[MAX_PATH]; - DWORD lname = MAX_PATH; - DWORD lvalue = MAX_PATH; - - HKEY hKey; - LONG result; - HWND hDlgCtrl; - - TRACE("fileext %s\n", debugstr_w(filext)); - - if (filext == NULL) - return FALSE; - - hDlgCtrl = GetDlgItem(hwndDlg, 14005); - - if (hDlgCtrl == NULL) - return FALSE; - - if (RegOpenKeyW(HKEY_CLASSES_ROOT, filext, &hKey) != ERROR_SUCCESS) - { - /* the fileextension is unknown, so default to string "FileExtension File" */ - SendMessageW(hDlgCtrl, WM_GETTEXT, (WPARAM)MAX_PATH, (LPARAM)value); - swprintf(name, value, &filext[1]); - SendMessageW(hDlgCtrl, WM_SETTEXT, (WPARAM)NULL, (LPARAM)name); - return TRUE; - } - result = RegEnumValueW(hKey, 0, name, &lname, NULL, NULL, (LPBYTE)value, &lvalue); - RegCloseKey(hKey); +SH_FileGeneralSetFileType(HWND hwndDlg, WCHAR *filext) +{ + WCHAR name[MAX_PATH]; + WCHAR value[MAX_PATH]; + DWORD lname = MAX_PATH; + DWORD lvalue = MAX_PATH; + HKEY hKey; + LONG result; + HWND hDlgCtrl; + + TRACE("fileext %s\n", debugstr_w(filext)); + + if (filext == NULL) + return FALSE; + + hDlgCtrl = GetDlgItem(hwndDlg, 14005); + + if (hDlgCtrl == NULL) + return FALSE; + + if (RegOpenKeyW(HKEY_CLASSES_ROOT, filext, &hKey) != ERROR_SUCCESS) + { + /* the file extension is unknown, so default to string "FileExtension File" */ + SendMessageW(hDlgCtrl, WM_GETTEXT, (WPARAM)MAX_PATH, (LPARAM)value); + swprintf(name, value, &filext[1]); + SendMessageW(hDlgCtrl, WM_SETTEXT, (WPARAM)NULL, (LPARAM)name); + return TRUE; + } + + result = RegEnumValueW(hKey, 0, name, &lname, NULL, NULL, (LPBYTE)value, &lvalue); + RegCloseKey(hKey); if (result != ERROR_SUCCESS) return FALSE; + if (RegOpenKeyW(HKEY_CLASSES_ROOT, value, &hKey) == ERROR_SUCCESS) { if (RegLoadMUIStringW(hKey, L"FriendlyTypeName", value, MAX_PATH, NULL, 0, NULL) != ERROR_SUCCESS) { lvalue = lname = MAX_PATH; - result = RegEnumValueW(hKey,0, name, &lname, NULL, NULL, (LPBYTE)value, &lvalue); + result = RegEnumValueW(hKey, 0, name, &lname, NULL, NULL, (LPBYTE)value, &lvalue); } + lname = MAX_PATH; + if (RegGetValueW(hKey, L"DefaultIcon", NULL, RRF_RT_REG_SZ, NULL, name, &lname) == ERROR_SUCCESS) { UINT IconIndex; WCHAR szBuffer[MAX_PATH]; - WCHAR * Offset; + WCHAR *Offset; HICON hIcon = 0; HRSRC hResource; LPVOID pResource = NULL; HGLOBAL hGlobal; HANDLE hLibrary; Offset = wcsrchr(name, L','); + if (Offset) { IconIndex = _wtoi(Offset + 2); *Offset = L'\0'; - name[MAX_PATH-1] = L'\0'; + name[MAX_PATH - 1] = L'\0'; + if (ExpandEnvironmentStringsW(name, szBuffer, MAX_PATH)) { - szBuffer[MAX_PATH-1] = L'\0'; + szBuffer[MAX_PATH - 1] = L'\0'; hLibrary = LoadLibraryExW(szBuffer, NULL, LOAD_LIBRARY_AS_DATAFILE); if (hLibrary) { @@ -164,7 +169,13 @@ if (pResource != NULL) { hIcon = CreateIconFromResource(pResource, SizeofResource(shell32_hInstance, hResource), TRUE, 0x00030000); - TRACE("hIcon %p,- szBuffer %s IconIndex %u error %u icon %p hResource %p pResource %p\n", hIcon, debugstr_w(szBuffer), IconIndex, MAKEINTRESOURCEW(IconIndex), hResource, pResource); + TRACE("hIcon %p,- szBuffer %s IconIndex %u error %u icon %p hResource %p pResource %p\n", + hIcon, + debugstr_w(szBuffer), + IconIndex, + MAKEINTRESOURCEW(IconIndex), + hResource, + pResource); SendDlgItemMessageW(hwndDlg, 14000, STM_SETICON, (WPARAM)hIcon, 0); } } @@ -178,10 +189,12 @@ } /* file extension type */ - value[MAX_PATH-1] = L'\0'; + value[MAX_PATH - 1] = L'\0'; SendMessageW(hDlgCtrl, WM_SETTEXT, (WPARAM)NULL, (LPARAM)value); + return TRUE; } + /************************************************************************* * * SHFileGeneralGetFileTimeString [Internal] @@ -190,12 +203,14 @@ */ BOOL -SHFileGeneralGetFileTimeString(LPFILETIME lpFileTime, WCHAR * lpResult) +SHFileGeneralGetFileTimeString(LPFILETIME lpFileTime, WCHAR *lpResult) { FILETIME ft; SYSTEMTIME dt; WORD wYear; - static const WCHAR wFormat[] = {'%','0','2','d','/','%','0','2','d','/','%','0','4','d',' ',' ','%','0','2','d',':','%','0','2','u',0}; + static const WCHAR wFormat[] = { + '%', '0', '2', 'd', '/', '%', '0', '2', 'd', '/', '%', '0', '4', 'd', + ' ', ' ', '%', '0', '2', 'd', ':', '%', '0', '2', 'u', 0 }; if (lpFileTime == NULL || lpResult == NULL) return FALSE; @@ -206,10 +221,11 @@ FileTimeToSystemTime(&ft, &dt); wYear = dt.wYear; + /* ddmmyy */ - swprintf (lpResult, wFormat, dt.wDay, dt.wMonth, wYear, dt.wHour, dt.wMinute); - - TRACE("result %s\n",debugstr_w(lpResult)); + swprintf(lpResult, wFormat, dt.wDay, dt.wMonth, wYear, dt.wHour, dt.wMinute); + + TRACE("result %s\n", debugstr_w(lpResult)); return TRUE; } @@ -222,18 +238,18 @@ */ BOOL -SH_FileGeneralSetText(HWND hwndDlg, WCHAR * lpstr) +SH_FileGeneralSetText(HWND hwndDlg, WCHAR *lpstr) { int flength; int plength; - WCHAR * lpdir; + WCHAR *lpdir; WCHAR buff[MAX_PATH]; HWND hDlgCtrl; if (lpstr == NULL) return FALSE; - lpdir = wcschr(lpstr, '\\'); /* find the last occurence of '\\' */ + lpdir = wcschr(lpstr, '\\'); /* find the last occurence of '\\' */ plength = wcslen(lpstr); flength = wcslen(lpdir); @@ -247,12 +263,12 @@ SendMessageW(hDlgCtrl, WM_SETTEXT, (WPARAM)NULL, (LPARAM)buff); } - if(flength > 1) - { - /* text filename field */ - wcsncpy(buff, &lpdir[1], flength); - hDlgCtrl = GetDlgItem(hwndDlg, 14001); - SendMessageW(hDlgCtrl, WM_SETTEXT, (WPARAM)NULL, (LPARAM)buff); + if (flength > 1) + { + /* text filename field */ + wcsncpy(buff, &lpdir[1], flength); + hDlgCtrl = GetDlgItem(hwndDlg, 14001); + SendMessageW(hDlgCtrl, WM_SETTEXT, (WPARAM)NULL, (LPARAM)buff); } return TRUE; @@ -267,7 +283,7 @@ */ BOOL -SH_FileGeneralSetFileSizeTime(HWND hwndDlg, WCHAR * lpfilename, PULARGE_INTEGER lpfilesize) +SH_FileGeneralSetFileSizeTime(HWND hwndDlg, WCHAR *lpfilename, PULARGE_INTEGER lpfilesize) { BOOL result; HANDLE hFile; @@ -283,7 +299,8 @@ hFile = CreateFileW(lpfilename, GENERIC_READ, - FILE_SHARE_READ,NULL, + FILE_SHARE_READ, + NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); @@ -301,7 +318,8 @@ WARN("GetFileTime failed\n"); return FALSE; } - if (SHFileGeneralGetFileTimeString(&create_time,resultstr)) + + if (SHFileGeneralGetFileTimeString(&create_time, resultstr)) { hDlgCtrl = GetDlgItem(hwndDlg, 14015); SendMessageW(hDlgCtrl, WM_SETTEXT, (WPARAM)NULL, (LPARAM)resultstr); @@ -325,15 +343,21 @@ CloseHandle(hFile); return FALSE; } + CloseHandle(hFile); - if (!StrFormatByteSizeW(file_size.QuadPart, resultstr, sizeof(resultstr) / sizeof(WCHAR))) - return FALSE; + + if (!StrFormatByteSizeW(file_size.QuadPart, + resultstr, + sizeof(resultstr) / sizeof(WCHAR))) + return FALSE; + hDlgCtrl = GetDlgItem(hwndDlg, 14011); + TRACE("result size %u resultstr %s\n", file_size.QuadPart, debugstr_w(resultstr)); SendMessageW(hDlgCtrl, WM_SETTEXT, (WPARAM)NULL, (LPARAM)resultstr); if (lpfilesize) - lpfilesize->QuadPart = (ULONGLONG)file_size.QuadPart; + lpfilesize->QuadPart = (ULONGLONG)file_size.QuadPart; return TRUE; } @@ -346,23 +370,24 @@ */ BOOL -SH_FileVersionQuerySetText(HWND hwndDlg, DWORD dlgId, LPVOID pInfo, WCHAR * text, WCHAR ** resptr) -{ - UINT reslen; - HWND hDlgCtrl; - - if(hwndDlg == NULL || resptr == NULL || text == NULL) - return FALSE; - - if(VerQueryValueW(pInfo, text, (LPVOID *)resptr, &reslen)) - { - /* file description property */ - hDlgCtrl = GetDlgItem(hwndDlg, dlgId); - TRACE("%s :: %s\n",debugstr_w(text), debugstr_w(*resptr)); - SendMessageW(hDlgCtrl, WM_SETTEXT, (WPARAM)0, (LPARAM)*resptr); - return TRUE; - } - return FALSE; +SH_FileVersionQuerySetText(HWND hwndDlg, DWORD dlgId, LPVOID pInfo, WCHAR *text, WCHAR **resptr) +{ + UINT reslen; + HWND hDlgCtrl; + + if (hwndDlg == NULL || resptr == NULL || text == NULL) + return FALSE; + + if (VerQueryValueW(pInfo, text, (LPVOID *)resptr, &reslen)) + { + /* file description property */ + hDlgCtrl = GetDlgItem(hwndDlg, dlgId); + TRACE("%s :: %s\n", debugstr_w(text), debugstr_w(*resptr)); + SendMessageW(hDlgCtrl, WM_SETTEXT, (WPARAM)0, (LPARAM)*resptr); + return TRUE; + } + + return FALSE; } /************************************************************************* @@ -373,33 +398,35 @@ * */ - BOOL -SH_FileVersionQuerySetListText(HWND hwndDlg, LPVOID pInfo, const WCHAR * text, WCHAR **resptr, WORD lang, WORD code) -{ - UINT reslen; - HWND hDlgCtrl; - UINT index; - static const WCHAR wFormat[] = { '\\','S','t','r','i','n','g','F','i','l','e','I','n', - 'f','o','\\','%','0','4','x','%','0','4','x','\\','%','s',0 }; - WCHAR buff[256]; - - TRACE("text %s, resptr %p hwndDlg %p\n",debugstr_w(text), resptr, hwndDlg); - - if(hwndDlg == NULL || resptr == NULL || text == NULL) - return FALSE; - - swprintf(buff, wFormat, lang, code, text); - if(VerQueryValueW(pInfo, buff, (LPVOID *)resptr, &reslen)) - { - /* listbox name property */ - hDlgCtrl = GetDlgItem(hwndDlg, 14009); - TRACE("%s :: %s\n",debugstr_w(text), debugstr_w(*resptr)); - index = SendMessageW(hDlgCtrl, LB_ADDSTRING, (WPARAM)-1, (LPARAM)text); - SendMessageW(hDlgCtrl, LB_SETITEMDATA, (WPARAM)index, (LPARAM)(WCHAR*)*resptr); - return TRUE; - } - return FALSE; +SH_FileVersionQuerySetListText(HWND hwndDlg, LPVOID pInfo, const WCHAR *text, WCHAR **resptr, WORD lang, WORD code) +{ + UINT reslen; + HWND hDlgCtrl; + UINT index; + static const WCHAR wFormat[] = { + '\\', 'S', 't', 'r', 'i', 'n', 'g', 'F', 'i', 'l', 'e', 'I', 'n', 'f', 'o', + '\\', '%', '0', '4', 'x', '%', '0', '4', 'x', '\\', '%', 's', 0 }; + WCHAR buff[256]; + + TRACE("text %s, resptr %p hwndDlg %p\n", debugstr_w(text), resptr, hwndDlg); + + if (hwndDlg == NULL || resptr == NULL || text == NULL) + return FALSE; + + swprintf(buff, wFormat, lang, code, text); + + if (VerQueryValueW(pInfo, buff, (LPVOID *)resptr, &reslen)) + { + /* listbox name property */ + hDlgCtrl = GetDlgItem(hwndDlg, 14009); + TRACE("%s :: %s\n", debugstr_w(text), debugstr_w(*resptr)); + index = SendMessageW(hDlgCtrl, LB_ADDSTRING, (WPARAM)-1, (LPARAM)text); + SendMessageW(hDlgCtrl, LB_SETITEMDATA, (WPARAM)index, (LPARAM)(WCHAR *)*resptr); + return TRUE; + } + + return FALSE; } /************************************************************************* @@ -408,102 +435,117 @@ * * sets all file version properties in dialog */ + BOOL -SH_FileVersionInitialize(HWND hwndDlg, WCHAR * lpfilename) -{ - LPVOID pBuf; - DWORD versize; - DWORD handle; - LPVOID info = NULL; - UINT infolen; - WCHAR buff[256]; - HWND hDlgCtrl; - WORD lang = 0; - WORD code = 0; - LPLANGANDCODEPAGE lplangcode; - WCHAR * str; - static const WCHAR wVersionFormat[] = { '%','d','.','%','d','.','%','d','.','%','d',0 }; - static const WCHAR wFileDescriptionFormat[] = { '\\','S','t','r','i','n','g','F','i','l','e','I','n','f','o', - '\\','%','0','4','x','%','0','4','x','\\','F','i','l','e','D','e','s','c','r','i','p','t','i','o','n',0 }; - static const WCHAR wLegalCopyrightFormat[] = { '\\','S','t','r','i','n','g','F','i','l','e','I','n','f','o', - '\\','%','0','4','x','%','0','4','x','\\','L','e','g','a','l','C','o','p','y','r','i','g','h','t',0 }; - static const WCHAR wTranslation[] = { 'V','a','r','F','i','l','e','I','n','f','o','\\','T','r','a','n','s','l','a','t','i','o','n',0 }; - static const WCHAR wCompanyName[] = { 'C','o','m','p','a','n','y','N','a','m','e',0 }; - static const WCHAR wFileVersion[] = { 'F','i','l','e','V','e','r','s','i','o','n',0 }; - static const WCHAR wInternalName[] = { 'I','n','t','e','r','n','a','l','N','a','m','e',0 }; - static const WCHAR wOriginalFilename[] = { 'O','r','i','g','i','n','a','l','F','i','l','e','n','a','m','e',0 }; - static const WCHAR wProductName[] = { 'P','r','o','d','u','c','t','N','a','m','e',0 }; - static const WCHAR wProductVersion[] = { 'P','r','o','d','u','c','t','V','e','r','s','i','o','n',0 }; - static const WCHAR wSlash[] = { '\\',0 }; - - - if(lpfilename == 0) - return FALSE; - - if(!(versize = GetFileVersionInfoSizeW(lpfilename, &handle))) - { - WARN("GetFileVersionInfoSize failed\n"); - return FALSE; - } - - if(!(pBuf = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, versize))) - { - WARN("HeapAlloc failed bytes %x\n",versize); - return FALSE; - } - - if(!GetFileVersionInfoW(lpfilename, handle, versize, pBuf)) - { - HeapFree(GetProcessHeap(), 0, pBuf); - return FALSE; - } - if(VerQueryValueW(pBuf, wSlash, &info, &infolen)) - { - VS_FIXEDFILEINFO * inf = (VS_FIXEDFILEINFO *)info; - swprintf(buff, wVersionFormat, HIWORD(inf->dwFileVersionMS), - LOWORD(inf->dwFileVersionMS), - HIWORD(inf->dwFileVersionLS), - LOWORD(inf->dwFileVersionLS)); - - hDlgCtrl = GetDlgItem(hwndDlg, 14001); - TRACE("MS %x LS %x res %s \n",inf->dwFileVersionMS, inf->dwFileVersionLS, debugstr_w(buff)); - SendMessageW(hDlgCtrl, WM_SETTEXT, (WPARAM)NULL, (LPARAM)buff); - } - if(VerQueryValueW(pBuf, wTranslation, (LPVOID *)&lplangcode, &infolen)) - { - /* FIXME find language from current locale / if not available, - * default to english - * for now default to first available language - */ - lang = lplangcode->lang; - code = lplangcode->code; - } - - swprintf(buff, wFileDescriptionFormat, lang, code); - SH_FileVersionQuerySetText(hwndDlg, 14003, pBuf, buff, &str); - - swprintf(buff, wLegalCopyrightFormat, lang, code); - SH_FileVersionQuerySetText(hwndDlg, 14005, pBuf, buff, &str); - - /* listbox properties */ - SH_FileVersionQuerySetListText(hwndDlg, pBuf, wCompanyName, &str, lang, code); - SH_FileVersionQuerySetListText(hwndDlg, pBuf, wFileVersion, &str, lang, code); - SH_FileVersionQuerySetListText(hwndDlg, pBuf, wInternalName, &str, lang, code); - - /* FIXME insert language identifier */ - - SH_FileVersionQuerySetListText(hwndDlg, pBuf, wOriginalFilename, &str, lang, code); - SH_FileVersionQuerySetListText(hwndDlg, pBuf, wProductName, &str, lang, code); - SH_FileVersionQuerySetListText(hwndDlg, pBuf, wProductVersion, &str, lang, code); - SetWindowLong(hwndDlg, DWL_USER, (LONG)pBuf); - - /* select first item */ - hDlgCtrl = GetDlgItem(hwndDlg, 14009); - SendMessageW(hDlgCtrl, LB_SETCURSEL, 0, 0); - str = (WCHAR *)SendMessageW(hDlgCtrl, LB_GETITEMDATA, (WPARAM)0, (LPARAM)NULL); - hDlgCtrl = GetDlgItem(hwndDlg, 14010); - SendMessageW(hDlgCtrl, WM_SETTEXT, (WPARAM)NULL, (LPARAM)str); - return TRUE; +SH_FileVersionInitialize(HWND hwndDlg, WCHAR *lpfilename) +{ + LPVOID pBuf; + DWORD versize; + DWORD handle; + LPVOID info = NULL; + UINT infolen; + WCHAR buff[256]; + HWND hDlgCtrl; + WORD lang = 0; + WORD code = 0; + LPLANGANDCODEPAGE lplangcode; + WCHAR *str; + static const WCHAR wVersionFormat[] = { + '%', 'd', '.', '%', 'd', '.', '%', 'd', '.', '%', 'd', 0 }; + static const WCHAR wFileDescriptionFormat[] = { + '\\', 'S', 't', 'r', 'i', 'n', 'g', 'F', 'i', 'l', 'e', 'I', 'n', 'f', 'o', + '\\', '%', '0', '4', 'x', '%', '0', '4', 'x', + '\\', 'F', 'i', 'l', 'e', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'i', 'o', 'n', 0 }; + static const WCHAR wLegalCopyrightFormat[] = { + '\\', 'S', 't', 'r', 'i', 'n', 'g', 'F', 'i', 'l', 'e', 'I', 'n', 'f', 'o', + '\\', '%', '0', '4', 'x', '%', '0', '4', 'x', + '\\', 'L', 'e', 'g', 'a', 'l', 'C', 'o', 'p', 'y', 'r', 'i', 'g', 'h', 't', 0 }; + static const WCHAR wTranslation[] = { + 'V', 'a', 'r', 'F', 'i', 'l', 'e', 'I', 'n', 'f', 'o', + '\\', 'T', 'r', 'a', 'n', 's', 'l', 'a', 't', 'i', 'o', 'n', 0 }; + static const WCHAR wCompanyName[] = { + 'C', 'o', 'm', 'p', 'a', 'n', 'y', 'N', 'a', 'm', 'e', 0 }; + static const WCHAR wFileVersion[] = { + 'F', 'i', 'l', 'e', 'V', 'e', 'r', 's', 'i', 'o', 'n', 0 }; + static const WCHAR wInternalName[] = { + 'I', 'n', 't', 'e', 'r', 'n', 'a', 'l', 'N', 'a', 'm', 'e', 0 }; + static const WCHAR wOriginalFilename[] = { + 'O', 'r', 'i', 'g', 'i', 'n', 'a', 'l', 'F', 'i', 'l', 'e', 'n', 'a', 'm', 'e', 0 }; + static const WCHAR wProductName[] = { + 'P', 'r', 'o', 'd', 'u', 'c', 't', 'N', 'a', 'm', 'e', 0 }; + static const WCHAR wProductVersion[] = { + 'P', 'r', 'o', 'd', 'u', 'c', 't', 'V', 'e', 'r', 's', 'i', 'o', 'n', 0 }; + static const WCHAR wSlash[] = { '\\', 0 }; + + if (lpfilename == 0) + return FALSE; + + if (!(versize = GetFileVersionInfoSizeW(lpfilename, &handle))) + { + WARN("GetFileVersionInfoSize failed\n"); + return FALSE; + } + + if (!(pBuf = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, versize))) + { + WARN("HeapAlloc failed bytes %x\n", versize); + return FALSE; + } + + if (!GetFileVersionInfoW(lpfilename, handle, versize, pBuf)) + { + HeapFree(GetProcessHeap(), 0, pBuf); + return FALSE; + } + + if (VerQueryValueW(pBuf, wSlash, &info, &infolen)) + { + VS_FIXEDFILEINFO *inf = (VS_FIXEDFILEINFO *)info; + swprintf(buff, wVersionFormat, HIWORD(inf->dwFileVersionMS), + LOWORD(inf->dwFileVersionMS), + HIWORD(inf->dwFileVersionLS), + LOWORD(inf->dwFileVersionLS)); + hDlgCtrl = GetDlgItem(hwndDlg, 14001); + TRACE("MS %x LS %x res %s \n", inf->dwFileVersionMS, inf->dwFileVersionLS, debugstr_w(buff)); + SendMessageW(hDlgCtrl, WM_SETTEXT, (WPARAM)NULL, (LPARAM)buff); + } + + if (VerQueryValueW(pBuf, wTranslation, (LPVOID *)&lplangcode, &infolen)) + { + /* FIXME find language from current locale / if not available, + * default to english + * for now default to first available language + */ + lang = lplangcode->lang; + code = lplangcode->code; + } + + swprintf(buff, wFileDescriptionFormat, lang, code); + SH_FileVersionQuerySetText(hwndDlg, 14003, pBuf, buff, &str); + + swprintf(buff, wLegalCopyrightFormat, lang, code); + SH_FileVersionQuerySetText(hwndDlg, 14005, pBuf, buff, &str); + + /* listbox properties */ + SH_FileVersionQuerySetListText(hwndDlg, pBuf, wCompanyName, &str, lang, code); + SH_FileVersionQuerySetListText(hwndDlg, pBuf, wFileVersion, &str, lang, code); + SH_FileVersionQuerySetListText(hwndDlg, pBuf, wInternalName, &str, lang, code); + + /* FIXME insert language identifier */ + + SH_FileVersionQuerySetListText(hwndDlg, pBuf, wOriginalFilename, &str, lang, code); + SH_FileVersionQuerySetListText(hwndDlg, pBuf, wProductName, &str, lang, code); + SH_FileVersionQuerySetListText(hwndDlg, pBuf, wProductVersion, &str, lang, code); + SetWindowLong(hwndDlg, DWL_USER, (LONG)pBuf); + + /* select first item */ + hDlgCtrl = GetDlgItem(hwndDlg, 14009); + SendMessageW(hDlgCtrl, LB_SETCURSEL, 0, 0); + str = (WCHAR *) SendMessageW(hDlgCtrl, LB_GETITEMDATA, (WPARAM)0, (LPARAM)NULL); + hDlgCtrl = GetDlgItem(hwndDlg, 14010); + SendMessageW(hDlgCtrl, WM_SETTEXT, (WPARAM)NULL, (LPARAM)str); + + return TRUE; } /************************************************************************* @@ -512,70 +554,71 @@ * * wnd proc of 'Version' property sheet page */ + INT_PTR CALLBACK -SH_FileVersionDlgProc( - HWND hwndDlg, - UINT uMsg, - WPARAM wParam, - LPARAM lParam -) -{ - LPPROPSHEETPAGE ppsp; - WCHAR * lpstr; - LPVOID * buf; - switch(uMsg) - { - case WM_INITDIALOG: - ppsp = (LPPROPSHEETPAGE)lParam; - if(ppsp == NULL) - break; - - TRACE("WM_INITDIALOG hwnd %p lParam %p ppsplParam %x\n",hwndDlg, lParam, ppsp->lParam); - - lpstr = (WCHAR *)ppsp->lParam; - - if(lpstr == NULL) - break; - - return SH_FileVersionInitialize(hwndDlg, lpstr); - - - case WM_COMMAND: - if(LOWORD(wParam) == 14009 && HIWORD(wParam) == LBN_DBLCLK) - { - HWND hDlgCtrl; - LRESULT lresult; - WCHAR * str; - - hDlgCtrl = GetDlgItem(hwndDlg, 14009); - lresult = SendMessageW(hDlgCtrl, LB_GETCURSEL, (WPARAM)NULL, (LPARAM)NULL); - if(lresult == LB_ERR) - { - break; - } - str = (WCHAR *)SendMessageW(hDlgCtrl, LB_GETITEMDATA, (WPARAM)lresult, (LPARAM)NULL); - - if(str == NULL) - { - break; - } - hDlgCtrl = GetDlgItem(hwndDlg, 14010); - TRACE("hDlgCtrl %x string %s \n",hDlgCtrl, debugstr_w(str)); - SendMessageW(hDlgCtrl, WM_SETTEXT, (WPARAM)NULL, (LPARAM)str); - return TRUE; - } - break; - - case WM_DESTROY: - buf = (LPVOID)GetWindowLong(hwndDlg, DWL_USER); - HeapFree(GetProcessHeap(), 0, buf); - break; - - default: - break; - } - return FALSE; +SH_FileVersionDlgProc(HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + LPPROPSHEETPAGE ppsp; + WCHAR *lpstr; + LPVOID *buf; + + switch (uMsg) + { + case WM_INITDIALOG: + ppsp = (LPPROPSHEETPAGE)lParam; + + if (ppsp == NULL) + break; + + TRACE("WM_INITDIALOG hwnd %p lParam %p ppsplParam %x\n", hwndDlg, lParam, ppsp->lParam); + + lpstr = (WCHAR *)ppsp->lParam; + + if (lpstr == NULL) + break; + + return SH_FileVersionInitialize(hwndDlg, lpstr); + + case WM_COMMAND: + if (LOWORD(wParam) == 14009 && HIWORD(wParam) == LBN_DBLCLK) + { + HWND hDlgCtrl; + LRESULT lresult; + WCHAR *str; + + hDlgCtrl = GetDlgItem(hwndDlg, 14009); + lresult = SendMessageW(hDlgCtrl, LB_GETCURSEL, (WPARAM)NULL, (LPARAM)NULL); + + if (lresult == LB_ERR) + break; + + str = (WCHAR *) SendMessageW(hDlgCtrl, LB_GETITEMDATA, (WPARAM)lresult, (LPARAM)NULL); + + if (str == NULL) + break; + + hDlgCtrl = GetDlgItem(hwndDlg, 14010); + TRACE("hDlgCtrl %x string %s \n", hDlgCtrl, debugstr_w(str)); + SendMessageW(hDlgCtrl, WM_SETTEXT, (WPARAM)NULL, (LPARAM)str); + + return TRUE; + } + break; + + case WM_DESTROY: + buf = (LPVOID) GetWindowLong(hwndDlg, DWL_USER); + HeapFree(GetProcessHeap(), 0, buf); + break; + + default: + break; + } + + return FALSE; } /************************************************************************* @@ -588,44 +631,54 @@ INT_PTR CALLBACK -SH_FileGeneralDlgProc( - HWND hwndDlg, - UINT uMsg, - WPARAM wParam, - LPARAM lParam -) +SH_FileGeneralDlgProc(HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) { LPPROPSHEETPAGEW ppsp; - WCHAR * lpstr; - switch(uMsg) - { - case WM_INITDIALOG: - ppsp = (LPPROPSHEETPAGEW)lParam; - if (ppsp == NULL) + WCHAR *lpstr; + + switch (uMsg) + { + case WM_INITDIALOG: + ppsp = (LPPROPSHEETPAGEW)lParam; + + if (ppsp == NULL) + break; + + TRACE("WM_INITDIALOG hwnd %p lParam %p ppsplParam %S\n", hwndDlg, lParam, ppsp->lParam); + + lpstr = (WCHAR *)ppsp->lParam; + + if (lpstr == NULL) + { + ERR("no filename\n"); + break; + } + + /* set general text properties filename filelocation and icon */ + SH_FileGeneralSetText(hwndDlg, lpstr); + + /* enumerate file extension from registry and application which opens it */ + SH_FileGeneralSetFileType(hwndDlg, wcsrchr(lpstr, '.')); + + /* set file time create/modfied/accessed */ + SH_FileGeneralSetFileSizeTime(hwndDlg, lpstr, NULL); + + return TRUE; + + default: break; - TRACE("WM_INITDIALOG hwnd %p lParam %p ppsplParam %S\n",hwndDlg, lParam, ppsp->lParam); - - lpstr = (WCHAR *)ppsp->lParam; - - if ( lpstr == NULL) - { - ERR("no filename\n"); - break; - } - /* set general text properties filename filelocation and icon */ - SH_FileGeneralSetText(hwndDlg, lpstr); - /* enumerate file extension from registry and application which opens it*/ - SH_FileGeneralSetFileType(hwndDlg, wcsrchr(lpstr, '.')); - /* set file time create/modfied/accessed */ - SH_FileGeneralSetFileSizeTime(hwndDlg, lpstr, NULL); - return TRUE; - default: - break; - } - return FALSE; -} - -BOOL CALLBACK AddShellPropSheetExCallback(HPROPSHEETPAGE hPage, LPARAM lParam) + } + + return FALSE; +} + +BOOL +CALLBACK +AddShellPropSheetExCallback(HPROPSHEETPAGE hPage, + LPARAM lParam) { PROPSHEETHEADERW *pinfo = (PROPSHEETHEADERW *)lParam; @@ -634,66 +687,73 @@ pinfo->u3.phpage[pinfo->nPages++] = hPage; return TRUE; } + return FALSE; } - int -EnumPropSheetExt(LPWSTR wFileName, PROPSHEETHEADERW *pinfo, int NumPages, HPSXA * hpsxa, IDataObject *pDataObj) -{ - WCHAR szName[MAX_PATH] = {0}; - WCHAR * pOffset; +EnumPropSheetExt(LPWSTR wFileName, PROPSHEETHEADERW *pinfo, int NumPages, HPSXA *hpsxa, IDataObject *pDataObj) +{ + WCHAR szName[MAX_PATH] = { 0 }; + WCHAR *pOffset; UINT Length; DWORD dwName; int Pages; CLSID clsid; pOffset = wcsrchr(wFileName, L'.'); + if (!pOffset) { Length = wcslen(szName); - if (Length + 6 > sizeof(szName)/sizeof(szName[0])) - return 0; + + if (Length + 6 > sizeof(szName) / sizeof(szName[0])) + return 0; if (CLSIDFromString(wFileName, &clsid) == NOERROR) { - wcscpy(szName, L"CLSID\\"); - wcscpy(&szName[6], wFileName); + wcscpy(szName, L"CLSID\\"); + wcscpy(&szName[6], wFileName); } else { - wcscpy(szName, wFileName); + wcscpy(szName, wFileName); } } else { Length = wcslen(pOffset); - if (Length >= sizeof(szName)/sizeof(szName[0])) + + if (Length >= sizeof(szName) / sizeof(szName[0])) return 0; + wcscpy(szName, pOffset); } + TRACE("EnumPropSheetExt szName %s\n", debugstr_w(szName)); + hpsxa[0] = SHCreatePropSheetExtArrayEx(HKEY_CLASSES_ROOT, szName, NumPages, pDataObj); + hpsxa[1] = NULL; + Pages = SHAddFromPropSheetExtArray(hpsxa[0], AddShellPropSheetExCallback, (LPARAM)pinfo); - if (pOffset) { /* try to load property sheet handlers from prog id key */ dwName = sizeof(szName); + if (RegGetValueW(HKEY_CLASSES_ROOT, pOffset, NULL, RRF_RT_REG_SZ, NULL, szName, &dwName) == ERROR_SUCCESS) { TRACE("EnumPropSheetExt szName %s, pOffset %s\n", debugstr_w(szName), debugstr_w(pOffset)); - szName[(sizeof(szName)/sizeof(WCHAR))-1] = L'\0'; + szName[(sizeof(szName) / sizeof(WCHAR)) - 1] = L'\0'; hpsxa[1] = SHCreatePropSheetExtArrayEx(HKEY_CLASSES_ROOT, szName, NumPages - Pages, pDataObj); - Pages +=SHAddFromPropSheetExtArray(hpsxa[1], AddShellPropSheetExCallback, (LPARAM)pinfo); + Pages += SHAddFromPropSheetExtArray(hpsxa[1], AddShellPropSheetExCallback, (LPARAM)pinfo); } } + return Pages; } - - /************************************************************************* * * SH_ShowPropertiesDialog @@ -703,38 +763,39 @@ * lpf contains (quoted) path of folder/file * * TODO: provide button change application type if file has registered type - * make filename field editable and apply changes to filename on close + * make filename field editable and apply changes to filename on close */ BOOL -SH_ShowPropertiesDialog(WCHAR * lpf, LPCITEMIDLIST pidlFolder, LPCITEMIDLIST * apidl) +SH_ShowPropertiesDialog(WCHAR *lpf, LPCITEMIDLIST pidlFolder, LPCITEMIDLIST *apidl) { PROPSHEETHEADERW pinfo; HPROPSHEETPAGE hppages[MAX_PROPERTY_SHEET_PAGE]; WCHAR wFileName[MAX_PATH]; DWORD dwHandle = 0; - WCHAR * pFileName; + WCHAR *pFileName; HPSXA hpsxa[2]; INT_PTR res; - IDataObject* pDataObj = NULL; + IDataObject *pDataObj = NULL; HRESULT hResult; TRACE("SH_ShowPropertiesDialog entered filename %s\n", debugstr_w(lpf)); - if (lpf== NULL) - return FALSE; - - if ( !wcslen(lpf) ) + if (lpf == NULL) + return FALSE; + + if (!wcslen(lpf)) return FALSE; memset(hppages, 0x0, sizeof(HPROPSHEETPAGE) * MAX_PROPERTY_SHEET_PAGE); + if (lpf[0] == '"') { /* remove quotes from lpf */ LPCWSTR src = lpf + 1; LPWSTR dst = wFileName; - while(*src && *src!='"') + while (*src && *src != '"') *dst++ = *src++; *dst = '\0'; @@ -754,13 +815,12 @@ return SH_ShowDriveProperties(wFileName, pidlFolder, apidl); } - pFileName = wcsrchr(wFileName, '\\'); + if (!pFileName) pFileName = wFileName; else pFileName++; - memset(&pinfo, 0x0, sizeof(PROPSHEETHEADERW)); pinfo.dwSize = sizeof(PROPSHEETHEADERW); @@ -768,24 +828,33 @@ pinfo.u3.phpage = hppages; pinfo.pszCaption = pFileName; - hppages[pinfo.nPages] = SH_CreatePropertySheetPage("SHELL_FILE_GENERAL_DLG", SH_FileGeneralDlgProc, (LPARAM)wFileName, NULL); + hppages[pinfo.nPages] = + SH_CreatePropertySheetPage("SHELL_FILE_GENERAL_DLG", + SH_FileGeneralDlgProc, + (LPARAM)wFileName, + NULL); + if (hppages[pinfo.nPages]) pinfo.nPages++; - - hResult = SHCreateDataObject(pidlFolder, 1, apidl, NULL, &IID_IDataObject, (LPVOID*)&pDataObj); + hResult = SHCreateDataObject(pidlFolder, 1, apidl, NULL, &IID_IDataObject, (LPVOID *)&pDataObj); + if (hResult == S_OK) { - if (!EnumPropSheetExt(wFileName, &pinfo, MAX_PROPERTY_SHEET_PAGE-1, hpsxa, pDataObj)) + if (!EnumPropSheetExt(wFileName, &pinfo, MAX_PROPERTY_SHEET_PAGE - 1, hpsxa, pDataObj)) { hpsxa[0] = NULL; hpsxa[1] = NULL; } } - if ( GetFileVersionInfoSizeW(lpf, &dwHandle)) - { - hppages[pinfo.nPages] = SH_CreatePropertySheetPage("SHELL_FILE_VERSION_DLG",SH_FileVersionDlgProc, (LPARAM)wFileName, NULL); + if (GetFileVersionInfoSizeW(lpf, &dwHandle)) + { + hppages[pinfo.nPages] = + SH_CreatePropertySheetPage("SHELL_FILE_VERSION_DLG", + SH_FileVersionDlgProc, + (LPARAM)wFileName, + NULL); if (hppages[pinfo.nPages]) pinfo.nPages++; } @@ -794,11 +863,12 @@ if (hResult == S_OK) { - SHDestroyPropSheetExtArray(hpsxa[0]); - SHDestroyPropSheetExtArray(hpsxa[1]); + SHDestroyPropSheetExtArray(hpsxa[0]); + SHDestroyPropSheetExtArray(hpsxa[1]); IDataObject_Release(pDataObj); } return (res != -1); } + /*EOF */

1 0

[sginsberg] 38454: - Fix ICU warnings
by sginsberg＠svn.reactos.org 29 Dec '08

29 Dec '08

Author: sginsberg Date: Mon Dec 29 05:05:00 2008 New Revision: 38454 URL: http://svn.reactos.org/svn/reactos?rev=38454&view=rev Log: - Fix ICU warnings Modified: trunk/reactos/lib/3rdparty/icu4ros/icu/source/common/umutex.c trunk/reactos/lib/3rdparty/icu4ros/icu/source/common/unistr.cpp trunk/reactos/lib/3rdparty/icu4ros/icu4ros.rbuild Modified: trunk/reactos/lib/3rdparty/icu4ros/icu/source/common/umutex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/icu4ros/icu/s… ============================================================================== --- trunk/reactos/lib/3rdparty/icu4ros/icu/source/common/umutex.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/icu4ros/icu/source/common/umutex.c [iso-8859-1] Mon Dec 29 05:05:00 2008 @@ -104,7 +104,7 @@ * *-------------------------------------------------------------*/ static CRITICAL_SECTION gMutexes[MAX_MUTEXES]; -static CRITICAL_SECTION gGlobalWinMutex; +/* static */ CRITICAL_SECTION gGlobalWinMutex; /* On WIN32 mutexes are reentrant. This makes it difficult to debug Modified: trunk/reactos/lib/3rdparty/icu4ros/icu/source/common/unistr.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/icu4ros/icu/s… ============================================================================== --- trunk/reactos/lib/3rdparty/icu4ros/icu/source/common/unistr.cpp [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/icu4ros/icu/source/common/unistr.cpp [iso-8859-1] Mon Dec 29 05:05:00 2008 @@ -1377,7 +1377,7 @@ but defining it here makes sure that it is included with this object file. This makes sure that static library dependencies are kept to a minimum. */ -static void uprv_UnicodeStringDummy(void) { +/* static */ void uprv_UnicodeStringDummy(void) { U_NAMESPACE_USE delete [] (new UnicodeString[2]); } Modified: trunk/reactos/lib/3rdparty/icu4ros/icu4ros.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/icu4ros/icu4r… ============================================================================== --- trunk/reactos/lib/3rdparty/icu4ros/icu4ros.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/icu4ros/icu4ros.rbuild [iso-8859-1] Mon Dec 29 05:05:00 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../tools/rbuild/project.dtd"> -<module name="icu4ros" type="staticlibrary" allowwarnings="true"> +<module name="icu4ros" type="staticlibrary"> <define name="U_STATIC_IMPLEMENTATION" /> <define name="U_HAVE_INTTYPES_H" /> <define name="UCONFIG_NO_FILE_IO">1</define>

1 0

[sginsberg] 38453: - Silence riched20 format warnings
by sginsberg＠svn.reactos.org 29 Dec '08

29 Dec '08

Author: sginsberg Date: Mon Dec 29 05:04:13 2008 New Revision: 38453 URL: http://svn.reactos.org/svn/reactos?rev=38453&view=rev Log: - Silence riched20 format warnings Modified: trunk/reactos/dll/win32/riched20/riched20.rbuild Modified: trunk/reactos/dll/win32/riched20/riched20.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/riched2… ============================================================================== --- trunk/reactos/dll/win32/riched20/riched20.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/riched20.rbuild [iso-8859-1] Mon Dec 29 05:04:13 2008 @@ -3,6 +3,7 @@ <group> <module name="riched20" type="win32dll" baseaddress="${BASEADDRESS_RICHED20}" installbase="system32" installname="riched20.dll" allowwarnings="true"> <importlibrary definition="riched20.spec" /> + <compilerflag compiler="cc">-Wno-format</compilerflag> <include base="riched20">.</include> <include base="ReactOS">include/reactos/wine</include> <define name="__WINESRC__" />

1 0

[sginsberg] 38452: - Silence Uniata warnings, add a .diff and remove allowwarnings=true
by sginsberg＠svn.reactos.org 29 Dec '08

29 Dec '08

Author: sginsberg Date: Mon Dec 29 05:03:54 2008 New Revision: 38452 URL: http://svn.reactos.org/svn/reactos?rev=38452&view=rev Log: - Silence Uniata warnings, add a .diff and remove allowwarnings=true Added: trunk/reactos/drivers/storage/ide/uniata/warningfixes.diff Modified: trunk/reactos/drivers/storage/ide/uniata/atapi.h trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp trunk/reactos/drivers/storage/ide/uniata/id_badblock.cpp trunk/reactos/drivers/storage/ide/uniata/id_dma.cpp trunk/reactos/drivers/storage/ide/uniata/id_init.cpp trunk/reactos/drivers/storage/ide/uniata/id_probe.cpp trunk/reactos/drivers/storage/ide/uniata/id_sata.cpp trunk/reactos/drivers/storage/ide/uniata/ntddk_ex.h trunk/reactos/drivers/storage/ide/uniata/uniata.rbuild Modified: trunk/reactos/drivers/storage/ide/uniata/atapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/atapi.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/atapi.h [iso-8859-1] Mon Dec 29 05:03:54 2008 @@ -137,6 +137,10 @@ #endif // _DBGNT_ #else // _DEBUG + +#ifdef KdPrint +#undef KdPrint +#endif #define PRINT_PREFIX "UniATA: " Modified: trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp [iso-8859-1] Mon Dec 29 05:03:54 2008 @@ -1864,7 +1864,9 @@ ULONG slotNumber = deviceExtension->slotNumber; ULONG SystemIoBusNumber = deviceExtension->SystemIoBusNumber; ULONG VendorID = deviceExtension->DevID & 0xffff; +#ifdef _DEBUG ULONG DeviceID = (deviceExtension->DevID >> 16) & 0xffff; +#endif //ULONG RevID = deviceExtension->RevID; ULONG ChipFlags = deviceExtension->HwFlags & CHIPFLAG_MASK; UCHAR tmp8; Modified: trunk/reactos/drivers/storage/ide/uniata/id_badblock.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_badblock.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_badblock.cpp [iso-8859-1] Mon Dec 29 05:03:54 2008 @@ -159,7 +159,11 @@ L"UniATA\\Parameters\\BadBlocks", QueryTable, 0, 0); +#ifdef _DEBUG KdPrint(( "InitBadBlocks returned: %#x\n", status)); +#else + UNREFERENCED_PARAMETER(status); +#endif } else { KdPrint(( "InitBadBlocks local\n")); Modified: trunk/reactos/drivers/storage/ide/uniata/id_dma.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_dma.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_dma.cpp [iso-8859-1] Mon Dec 29 05:03:54 2008 @@ -219,7 +219,7 @@ PHW_CHANNEL chan = &(deviceExtension->chan[lChannel]); PATA_REQ AtaReq = (PATA_REQ)(Srb->SrbExtension); BOOLEAN use_DB_IO = FALSE; - BOOLEAN use_AHCI = FALSE; + //BOOLEAN use_AHCI = FALSE; ULONG orig_count = count; ULONG max_entries = (deviceExtension->HwFlags & UNIATA_AHCI) ? ATA_AHCI_DMA_ENTRIES : ATA_DMA_ENTRIES; @@ -281,7 +281,7 @@ if(!dma_count || ((LONG)(dma_base) == -1)) { KdPrint2((PRINT_PREFIX "AtapiDmaSetup: No 1st block\n" )); //AtaReq->dma_base = NULL; - AtaReq->ahci_base64 = NULL; + AtaReq->ahci_base64 = (ULONGLONG)NULL; return FALSE; } @@ -303,7 +303,7 @@ if (i >= max_entries) { KdPrint2((PRINT_PREFIX "too many segments in DMA table\n" )); //AtaReq->dma_base = NULL; - AtaReq->ahci_base64 = NULL; + AtaReq->ahci_base64 = (ULONGLONG)NULL; return FALSE; } KdPrint2((PRINT_PREFIX " get Phys(data[n]=%x)\n", data )); @@ -321,7 +321,7 @@ } else if(!dma_count || !dma_base || ((LONG)(dma_base) == -1)) { //AtaReq->dma_base = NULL; - AtaReq->ahci_base64 = NULL; + AtaReq->ahci_base64 = (ULONGLONG)NULL; KdPrint2((PRINT_PREFIX "AtapiDmaSetup: No NEXT block\n" )); return FALSE; } @@ -612,7 +612,7 @@ } if((deviceExtension->HbaCtrlFlags & HBAFLAGS_DMA_DISABLED_LBA48) && - (AtaReq->lba >= ATA_MAX_LBA28) && + (AtaReq->lba >= (LONGLONG)ATA_MAX_LBA28) && (LunExt->TransferMode > ATA_PIO5) ) { KdPrint2((PRINT_PREFIX "AtapiDmaReinit: FORCE_DOWNRATE on Device %d for LBA48\n", ldev & 1)); @@ -623,7 +623,7 @@ if(AtaReq->Flags & REQ_FLAG_FORCE_DOWNRATE) { KdPrint2((PRINT_PREFIX "AtapiDmaReinit: FORCE_DOWNRATE on Device %d\n", ldev & 1)); - if(AtaReq->lba >= ATA_MAX_LBA28) { + if(AtaReq->lba >= (LONGLONG)ATA_MAX_LBA28) { limit_lba48: LunExt->DeviceFlags |= REQ_FLAG_FORCE_DOWNRATE_LBA48; limit_pio: @@ -1046,7 +1046,7 @@ /* set PIO mode timings */ AtaSetTransferMode(deviceExtension, DeviceNumber, lChannel, LunExt, ATA_PIO0 + apiomode); if((apiomode >= 0) && (ChipType != VIA133)) { - SetPciConfig1(reg-0x08, via_pio[apiomode]); + SetPciConfig1(reg-0x08, via_pio[(UCHAR)apiomode]); } via82c_timing(deviceExtension, dev, ATA_PIO0 + apiomode); AtaSetTransferMode(deviceExtension, DeviceNumber, lChannel, LunExt, ATA_PIO0 + apiomode); @@ -1067,18 +1067,18 @@ apiomode = 4; for(i=udmamode; i>=0; i--) { if(AtaSetTransferMode(deviceExtension, DeviceNumber, lChannel, LunExt, ATA_UDMA0 + i)) { - AtapiWritePortEx4(chan, (ULONG)(&deviceExtension->BaseIoAddressBM_0), mode_reg, cyr_udmatiming[udmamode]); + AtapiWritePortEx4(chan, (ULONG)(&deviceExtension->BaseIoAddressBM_0), mode_reg, cyr_udmatiming[(UCHAR)udmamode]); return; } } for(i=wdmamode; i>=0; i--) { if(AtaSetTransferMode(deviceExtension, DeviceNumber, lChannel, LunExt, ATA_WDMA0 + i)) { - AtapiWritePortEx4(chan, (ULONG)(&deviceExtension->BaseIoAddressBM_0), mode_reg, cyr_wdmatiming[wdmamode]); + AtapiWritePortEx4(chan, (ULONG)(&deviceExtension->BaseIoAddressBM_0), mode_reg, cyr_wdmatiming[(UCHAR)wdmamode]); return; } } if(AtaSetTransferMode(deviceExtension, DeviceNumber, lChannel, LunExt, ATA_PIO0 + apiomode)) { - AtapiWritePortEx4(chan, (ULONG)(&deviceExtension->BaseIoAddressBM_0), mode_reg, cyr_piotiming[apiomode]); + AtapiWritePortEx4(chan, (ULONG)(&deviceExtension->BaseIoAddressBM_0), mode_reg, cyr_piotiming[(UCHAR)apiomode]); return; } return; @@ -1113,7 +1113,7 @@ } if(AtaSetTransferMode(deviceExtension, DeviceNumber, lChannel, LunExt, ATA_PIO0 + apiomode)) { ChangePciConfig4(0x44 + (dev * 8), a | 0x80000000); - SetPciConfig4(0x40 + (dev * 8), nat_piotiming[apiomode]); + SetPciConfig4(0x40 + (dev * 8), nat_piotiming[(UCHAR)apiomode]); return; } /* Use GENERIC PIO */ @@ -1413,7 +1413,7 @@ // 44 GetPciConfig4(0x44, reg44); reg44 = (reg44 & ~(0xff << bit_offset)) | - (sw_dma_modes[wdmamode] << bit_offset); + (sw_dma_modes[(UCHAR)wdmamode] << bit_offset); SetPciConfig4(0x44, reg44); // 40 GetPciConfig4(0x40, reg40); @@ -1439,7 +1439,7 @@ // 40 GetPciConfig4(0x40, reg40); reg40 = (reg40 & ~(0xff << bit_offset)) | - (sw_pio_modes[apiomode] << bit_offset); + (sw_pio_modes[(UCHAR)apiomode] << bit_offset); SetPciConfig4(0x40, reg40); return; break; } @@ -1527,7 +1527,7 @@ /* set PIO mode timings */ AtaSetTransferMode(deviceExtension, DeviceNumber, lChannel, LunExt, ATA_PIO0 + apiomode); - SetPciConfig1(treg, cmd_pio_modes[apiomode]); + SetPciConfig1(treg, cmd_pio_modes[(UCHAR)apiomode]); ChangePciConfig1(Channel ? 0x7b : 0x73, a & ~(!(DeviceNumber & 1) ? 0x35 : 0xca)); return; @@ -1538,7 +1538,7 @@ /*******/ /* SiS */ /*******/ - PULONG sis_modes; + PULONG sis_modes = NULL; static const ULONG sis_modes_new133[] = { 0x28269008, 0x0c266008, 0x04263008, 0x0c0a3008, 0x05093008, 0x22196008, 0x0c0a3008, 0x05093008, 0x050939fc, 0x050936ac, @@ -1553,9 +1553,9 @@ { 0x00cb, 0x0067, 0x0044, 0x0033, 0x0031, 0x0044, 0x0033, 0x0031, 0x8b31, 0x8731, 0x8531, 0x8431, 0x8231, 0x8131 }; - ULONG reg; + ULONG reg = 0; UCHAR reg57; - ULONG reg_size; + ULONG reg_size = 0; ULONG offs; switch(ChipType) { @@ -1901,7 +1901,7 @@ ULONG ChipType = deviceExtension->HwFlags & CHIPTYPE_MASK; //ULONG ChipFlags = deviceExtension->HwFlags & CHIPFLAG_MASK; - ULONG timing; + ULONG timing = 0; if(mode == ATA_PIO5) mode = ATA_PIO4; Modified: trunk/reactos/drivers/storage/ide/uniata/id_init.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_init.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_init.cpp [iso-8859-1] Mon Dec 29 05:03:54 2008 @@ -52,11 +52,11 @@ ) { PHW_DEVICE_EXTENSION deviceExtension = (PHW_DEVICE_EXTENSION)HwDeviceExtension; - ULONG slotNumber = deviceExtension->slotNumber; - ULONG SystemIoBusNumber = deviceExtension->SystemIoBusNumber; + //ULONG slotNumber = deviceExtension->slotNumber; + //ULONG SystemIoBusNumber = deviceExtension->SystemIoBusNumber; ULONG VendorID = deviceExtension->DevID & 0xffff; - ULONG DeviceID = (deviceExtension->DevID >> 16) & 0xffff; - ULONG RevID = deviceExtension->RevID; + //ULONG DeviceID = (deviceExtension->DevID >> 16) & 0xffff; + //ULONG RevID = deviceExtension->RevID; ULONG ChipType = deviceExtension->HwFlags & CHIPTYPE_MASK; ULONG ChipFlags= deviceExtension->HwFlags & CHIPFLAG_MASK; @@ -216,7 +216,7 @@ PCI_DEV_HW_SPEC_BM( 0730, 1039, 0x00, ATA_UDMA5, "SiS 730" , SIS100OLD ), PCI_DEV_HW_SPEC_BM( 0646, 1039, 0x00, ATA_UDMA6, "SiS 645DX", SIS133NEW ), -/* PCI_DEV_HW_SPEC_BM( 0645, 1039, 0x00, ATA_UDMA6, "SiS 645" , SIS133NEW ), +/* PCI_DEV_HW_SPEC_BM( 0645, 1039, 0x00, ATA_UDMA6, "SiS 645" , SIS133NEW ),*/ /* PCI_DEV_HW_SPEC_BM( 0640, 1039, 0x00, ATA_UDMA4, "SiS 640" , SIS_SOUTH ),*/ PCI_DEV_HW_SPEC_BM( 0635, 1039, 0x00, ATA_UDMA5, "SiS 635" , SIS100NEW ), PCI_DEV_HW_SPEC_BM( 0633, 1039, 0x00, ATA_UDMA5, "SiS 633" , SIS100NEW ), @@ -419,7 +419,7 @@ BaseIoAddressBM = AtapiGetIoRange(HwDeviceExtension, ConfigInfo, pciData, SystemIoBusNumber, 4, 0, deviceExtension->NumberChannels*sizeof(IDE_BUSMASTER_REGISTERS)); for(c=0; c<deviceExtension->NumberChannels; c++) { - ULONG unit01 = (c & 1); + //ULONG unit01 = (c & 1); ULONG unit10 = (c & 2); chan = &deviceExtension->chan[c]; @@ -987,7 +987,7 @@ IN ULONG slotNumber ) { - PHW_DEVICE_EXTENSION deviceExtension = (PHW_DEVICE_EXTENSION)HwDeviceExtension; + //PHW_DEVICE_EXTENSION deviceExtension = (PHW_DEVICE_EXTENSION)HwDeviceExtension; PCI_COMMON_CONFIG pciData; ULONG funcNumber; ULONG busDataRead; @@ -1039,7 +1039,7 @@ IN ULONG c ) { - PHW_DEVICE_EXTENSION deviceExtension = (PHW_DEVICE_EXTENSION)HwDeviceExtension; + //PHW_DEVICE_EXTENSION deviceExtension = (PHW_DEVICE_EXTENSION)HwDeviceExtension; PCI_COMMON_CONFIG pciData; ULONG funcNumber; ULONG busDataRead; @@ -1174,7 +1174,7 @@ ULONG slotNumber = deviceExtension->slotNumber; ULONG SystemIoBusNumber = deviceExtension->SystemIoBusNumber; - ULONG ChipType = deviceExtension->HwFlags & CHIPTYPE_MASK; + //ULONG ChipType = deviceExtension->HwFlags & CHIPTYPE_MASK; PHW_CHANNEL chan; ULONG c; // logical channel (for Compatible Mode controllers) UCHAR tmp8; @@ -1332,7 +1332,9 @@ ULONG slotNumber = deviceExtension->slotNumber; ULONG SystemIoBusNumber = deviceExtension->SystemIoBusNumber; ULONG VendorID = deviceExtension->DevID & 0xffff; +#ifdef _DEBUG ULONG DeviceID = (deviceExtension->DevID >> 16) & 0xffff; +#endif ULONG RevID = deviceExtension->RevID; // ULONG i; // BUSMASTER_CONTROLLER_INFORMATION* DevTypeInfo; Modified: trunk/reactos/drivers/storage/ide/uniata/id_probe.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_probe.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_probe.cpp [iso-8859-1] Mon Dec 29 05:03:54 2008 @@ -76,7 +76,6 @@ VOID AtapiDoNothing(VOID) { - ULONG i = 0; return; } // end AtapiDoNothing() @@ -504,8 +503,8 @@ /* if(known) { RtlCopyMemory(newBMListPtr, (PVOID)&(BusMasterAdapters[i]), sizeof(BUSMASTER_CONTROLLER_INFORMATION)); } else {*/ - sprintf((PCHAR)vendorStrPtr, "%4.4x", VendorID); - sprintf((PCHAR)deviceStrPtr, "%4.4x", DeviceID); + sprintf((PCHAR)vendorStrPtr, "%4.4x", (UINT32)VendorID); + sprintf((PCHAR)deviceStrPtr, "%4.4x", (UINT32)DeviceID); RtlCopyMemory(&(newBMListPtr->VendorIdStr), (PCHAR)vendorStrPtr, 4); RtlCopyMemory(&(newBMListPtr->DeviceIdStr), (PCHAR)deviceStrPtr, 4); @@ -874,7 +873,11 @@ BOOLEAN found = FALSE; BOOLEAN MasterDev; BOOLEAN simplexOnly = FALSE; +#ifndef UNIATA_CORE +#ifdef UNIATA_INIT_ON_PROBE BOOLEAN skip_find_dev = FALSE; +#endif +#endif BOOLEAN AltInit = FALSE; SCSI_PHYSICAL_ADDRESS IoBasePort1; @@ -1712,7 +1715,7 @@ ) { PHW_DEVICE_EXTENSION deviceExtension = (PHW_DEVICE_EXTENSION)HwDeviceExtension; - PHW_CHANNEL chan = NULL; + //PHW_CHANNEL chan = NULL; // this buffer must be global for UNIATA_CORE build PCI_COMMON_CONFIG pciData; @@ -1743,8 +1746,8 @@ BOOLEAN found = FALSE; BOOLEAN MasterDev; BOOLEAN simplexOnly = FALSE; - BOOLEAN skip_find_dev = FALSE; - BOOLEAN AltInit = FALSE; + //BOOLEAN skip_find_dev = FALSE; + //BOOLEAN AltInit = FALSE; PIDE_BUSMASTER_REGISTERS BaseIoAddressBM_0 = NULL; @@ -1797,7 +1800,7 @@ &pciData, PCI_COMMON_HDR_LENGTH); - if (busDataRead < PCI_COMMON_HDR_LENGTH) { + if (busDataRead < (ULONG)PCI_COMMON_HDR_LENGTH) { KdPrint2((PRINT_PREFIX "busDataRead < PCI_COMMON_HDR_LENGTH => SP_RETURN_ERROR\n")); goto exit_error; } @@ -2207,7 +2210,7 @@ PHW_DEVICE_EXTENSION deviceExtension = (PHW_DEVICE_EXTENSION)HwDeviceExtension; PHW_CHANNEL chan; PULONG adapterCount = (PULONG)Context; - PUCHAR ioSpace; + PUCHAR ioSpace = NULL; ULONG i; ULONG irq=0; ULONG portBase; @@ -2217,7 +2220,7 @@ BOOLEAN preConfig = FALSE; // PIDE_REGISTERS_1 BaseIoAddress1; - PIDE_REGISTERS_2 BaseIoAddress2; + PIDE_REGISTERS_2 BaseIoAddress2 = NULL; // The following table specifies the ports to be checked when searching for // an IDE controller. A zero entry terminates the search. Modified: trunk/reactos/drivers/storage/ide/uniata/id_sata.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_sata.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_sata.cpp [iso-8859-1] Mon Dec 29 05:03:54 2008 @@ -7,7 +7,7 @@ ) { PHW_DEVICE_EXTENSION deviceExtension = (PHW_DEVICE_EXTENSION)HwDeviceExtension; - ULONG Channel = deviceExtension->Channel + lChannel; + //ULONG Channel = deviceExtension->Channel + lChannel; PHW_CHANNEL chan = &deviceExtension->chan[lChannel]; SATA_SSTATUS_REG SStatus; ULONG i; @@ -126,7 +126,7 @@ { PHW_DEVICE_EXTENSION deviceExtension = (PHW_DEVICE_EXTENSION)HwDeviceExtension; PHW_CHANNEL chan = &deviceExtension->chan[lChannel]; - ULONG ChipFlags = deviceExtension->HwFlags & CHIPFLAG_MASK; + //ULONG ChipFlags = deviceExtension->HwFlags & CHIPFLAG_MASK; SATA_SSTATUS_REG SStatus; SATA_SERROR_REG SError; Modified: trunk/reactos/drivers/storage/ide/uniata/ntddk_ex.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/ntddk_ex.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/ntddk_ex.h [iso-8859-1] Mon Dec 29 05:03:54 2008 @@ -6,7 +6,8 @@ #define ASSERT #else #undef ASSERT -#define ASSERT //(x) if (!(x)) {RtlAssert("#x",__FILE__,__LINE__, ""); } +//#define ASSERT //(x) if (!(x)) {RtlAssert("#x",__FILE__,__LINE__, ""); } +#define ASSERT(x) // FIXME: WTF! #endif //__REACTOS__ Modified: trunk/reactos/drivers/storage/ide/uniata/uniata.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/uniata.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/uniata.rbuild [iso-8859-1] Mon Dec 29 05:03:54 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> -<module name="uniata" type="kernelmodedriver" installbase="system32/drivers" allowwarnings="true" installname="uniata.sys"> +<module name="uniata" type="kernelmodedriver" installbase="system32/drivers" installname="uniata.sys"> <bootstrap installbase="$(CDOUTPUT)" /> <include base="uniata">.</include> <include base="uniata">inc</include> Added: trunk/reactos/drivers/storage/ide/uniata/warningfixes.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/warningfixes.diff (added) +++ trunk/reactos/drivers/storage/ide/uniata/warningfixes.diff [iso-8859-1] Mon Dec 29 05:03:54 2008 @@ -1,0 +1,393 @@ +Index: atapi.h +=================================================================== +--- atapi.h (revision 38425) ++++ atapi.h (working copy) +@@ -138,6 +138,10 @@ + + #else // _DEBUG + ++#ifdef KdPrint ++#undef KdPrint ++#endif ++ + #define PRINT_PREFIX "UniATA: " + + //#define KdPrint3(_x_) {if(LOG_ON_RAISED_IRQL_W2K || MajorVersion < 0x05 || KeGetCurrentIrql() <= 2){/*DbgPrint("%x: ", PsGetCurrentThread()) ;*/ DbgPrint _x_ ; if(g_LogToDisplay){ PrintNtConsole _x_ ;} }} +Index: id_ata.cpp +=================================================================== +--- id_ata.cpp (revision 38425) ++++ id_ata.cpp (working copy) +@@ -1864,7 +1864,9 @@ + ULONG slotNumber = deviceExtension->slotNumber; + ULONG SystemIoBusNumber = deviceExtension->SystemIoBusNumber; + ULONG VendorID = deviceExtension->DevID & 0xffff; ++#ifdef _DEBUG + ULONG DeviceID = (deviceExtension->DevID >> 16) & 0xffff; ++#endif + //ULONG RevID = deviceExtension->RevID; + ULONG ChipFlags = deviceExtension->HwFlags & CHIPFLAG_MASK; + UCHAR tmp8; +Index: id_badblock.cpp +=================================================================== +--- id_badblock.cpp (revision 38425) ++++ id_badblock.cpp (working copy) +@@ -159,7 +159,11 @@ + L"UniATA\\Parameters\\BadBlocks", + QueryTable, 0, 0); + ++#ifdef _DEBUG + KdPrint(( "InitBadBlocks returned: %#x\n", status)); ++#else ++ UNREFERENCED_PARAMETER(status); ++#endif + } else { + + KdPrint(( "InitBadBlocks local\n")); +Index: id_dma.cpp +=================================================================== +--- id_dma.cpp (revision 38425) ++++ id_dma.cpp (working copy) +@@ -219,7 +219,7 @@ + PHW_CHANNEL chan = &(deviceExtension->chan[lChannel]); + PATA_REQ AtaReq = (PATA_REQ)(Srb->SrbExtension); + BOOLEAN use_DB_IO = FALSE; +- BOOLEAN use_AHCI = FALSE; ++ //BOOLEAN use_AHCI = FALSE; + ULONG orig_count = count; + ULONG max_entries = (deviceExtension->HwFlags & UNIATA_AHCI) ? ATA_AHCI_DMA_ENTRIES : ATA_DMA_ENTRIES; + +@@ -281,7 +281,7 @@ + if(!dma_count || ((LONG)(dma_base) == -1)) { + KdPrint2((PRINT_PREFIX "AtapiDmaSetup: No 1st block\n" )); + //AtaReq->dma_base = NULL; +- AtaReq->ahci_base64 = NULL; ++ AtaReq->ahci_base64 = (ULONGLONG)NULL; + return FALSE; + } + +@@ -303,7 +303,7 @@ + if (i >= max_entries) { + KdPrint2((PRINT_PREFIX "too many segments in DMA table\n" )); + //AtaReq->dma_base = NULL; +- AtaReq->ahci_base64 = NULL; ++ AtaReq->ahci_base64 = (ULONGLONG)NULL; + return FALSE; + } + KdPrint2((PRINT_PREFIX " get Phys(data[n]=%x)\n", data )); +@@ -321,7 +321,7 @@ + } else + if(!dma_count || !dma_base || ((LONG)(dma_base) == -1)) { + //AtaReq->dma_base = NULL; +- AtaReq->ahci_base64 = NULL; ++ AtaReq->ahci_base64 = (ULONGLONG)NULL; + KdPrint2((PRINT_PREFIX "AtapiDmaSetup: No NEXT block\n" )); + return FALSE; + } +@@ -612,7 +612,7 @@ + } + + if((deviceExtension->HbaCtrlFlags & HBAFLAGS_DMA_DISABLED_LBA48) && +- (AtaReq->lba >= ATA_MAX_LBA28) && ++ (AtaReq->lba >= (LONGLONG)ATA_MAX_LBA28) && + (LunExt->TransferMode > ATA_PIO5) ) { + KdPrint2((PRINT_PREFIX + "AtapiDmaReinit: FORCE_DOWNRATE on Device %d for LBA48\n", ldev & 1)); +@@ -623,7 +623,7 @@ + if(AtaReq->Flags & REQ_FLAG_FORCE_DOWNRATE) { + KdPrint2((PRINT_PREFIX + "AtapiDmaReinit: FORCE_DOWNRATE on Device %d\n", ldev & 1)); +- if(AtaReq->lba >= ATA_MAX_LBA28) { ++ if(AtaReq->lba >= (LONGLONG)ATA_MAX_LBA28) { + limit_lba48: + LunExt->DeviceFlags |= REQ_FLAG_FORCE_DOWNRATE_LBA48; + limit_pio: +@@ -1046,7 +1046,7 @@ + /* set PIO mode timings */ + AtaSetTransferMode(deviceExtension, DeviceNumber, lChannel, LunExt, ATA_PIO0 + apiomode); + if((apiomode >= 0) && (ChipType != VIA133)) { +- SetPciConfig1(reg-0x08, via_pio[apiomode]); ++ SetPciConfig1(reg-0x08, via_pio[(UCHAR)apiomode]); + } + via82c_timing(deviceExtension, dev, ATA_PIO0 + apiomode); + AtaSetTransferMode(deviceExtension, DeviceNumber, lChannel, LunExt, ATA_PIO0 + apiomode); +@@ -1067,18 +1067,18 @@ + apiomode = 4; + for(i=udmamode; i>=0; i--) { + if(AtaSetTransferMode(deviceExtension, DeviceNumber, lChannel, LunExt, ATA_UDMA0 + i)) { +- AtapiWritePortEx4(chan, (ULONG)(&deviceExtension->BaseIoAddressBM_0), mode_reg, cyr_udmatiming[udmamode]); ++ AtapiWritePortEx4(chan, (ULONG)(&deviceExtension->BaseIoAddressBM_0), mode_reg, cyr_udmatiming[(UCHAR)udmamode]); + return; + } + } + for(i=wdmamode; i>=0; i--) { + if(AtaSetTransferMode(deviceExtension, DeviceNumber, lChannel, LunExt, ATA_WDMA0 + i)) { +- AtapiWritePortEx4(chan, (ULONG)(&deviceExtension->BaseIoAddressBM_0), mode_reg, cyr_wdmatiming[wdmamode]); ++ AtapiWritePortEx4(chan, (ULONG)(&deviceExtension->BaseIoAddressBM_0), mode_reg, cyr_wdmatiming[(UCHAR)wdmamode]); + return; + } + } + if(AtaSetTransferMode(deviceExtension, DeviceNumber, lChannel, LunExt, ATA_PIO0 + apiomode)) { +- AtapiWritePortEx4(chan, (ULONG)(&deviceExtension->BaseIoAddressBM_0), mode_reg, cyr_piotiming[apiomode]); ++ AtapiWritePortEx4(chan, (ULONG)(&deviceExtension->BaseIoAddressBM_0), mode_reg, cyr_piotiming[(UCHAR)apiomode]); + return; + } + return; +@@ -1113,7 +1113,7 @@ + } + if(AtaSetTransferMode(deviceExtension, DeviceNumber, lChannel, LunExt, ATA_PIO0 + apiomode)) { + ChangePciConfig4(0x44 + (dev * 8), a | 0x80000000); +- SetPciConfig4(0x40 + (dev * 8), nat_piotiming[apiomode]); ++ SetPciConfig4(0x40 + (dev * 8), nat_piotiming[(UCHAR)apiomode]); + return; + } + /* Use GENERIC PIO */ +@@ -1413,7 +1413,7 @@ + // 44 + GetPciConfig4(0x44, reg44); + reg44 = (reg44 & ~(0xff << bit_offset)) | +- (sw_dma_modes[wdmamode] << bit_offset); ++ (sw_dma_modes[(UCHAR)wdmamode] << bit_offset); + SetPciConfig4(0x44, reg44); + // 40 + GetPciConfig4(0x40, reg40); +@@ -1439,7 +1439,7 @@ + // 40 + GetPciConfig4(0x40, reg40); + reg40 = (reg40 & ~(0xff << bit_offset)) | +- (sw_pio_modes[apiomode] << bit_offset); ++ (sw_pio_modes[(UCHAR)apiomode] << bit_offset); + SetPciConfig4(0x40, reg40); + return; + break; } +@@ -1527,7 +1527,7 @@ + /* set PIO mode timings */ + AtaSetTransferMode(deviceExtension, DeviceNumber, lChannel, LunExt, ATA_PIO0 + apiomode); + +- SetPciConfig1(treg, cmd_pio_modes[apiomode]); ++ SetPciConfig1(treg, cmd_pio_modes[(UCHAR)apiomode]); + ChangePciConfig1(Channel ? 0x7b : 0x73, a & ~(!(DeviceNumber & 1) ? 0x35 : 0xca)); + return; + +@@ -1538,7 +1538,7 @@ + /*******/ + /* SiS */ + /*******/ +- PULONG sis_modes; ++ PULONG sis_modes = NULL; + static const ULONG sis_modes_new133[] = + { 0x28269008, 0x0c266008, 0x04263008, 0x0c0a3008, 0x05093008, + 0x22196008, 0x0c0a3008, 0x05093008, 0x050939fc, 0x050936ac, +@@ -1553,9 +1553,9 @@ + { 0x00cb, 0x0067, 0x0044, 0x0033, 0x0031, 0x0044, 0x0033, 0x0031, + 0x8b31, 0x8731, 0x8531, 0x8431, 0x8231, 0x8131 }; + +- ULONG reg; ++ ULONG reg = 0; + UCHAR reg57; +- ULONG reg_size; ++ ULONG reg_size = 0; + ULONG offs; + + switch(ChipType) { +@@ -1901,7 +1901,7 @@ + ULONG ChipType = deviceExtension->HwFlags & CHIPTYPE_MASK; + //ULONG ChipFlags = deviceExtension->HwFlags & CHIPFLAG_MASK; + +- ULONG timing; ++ ULONG timing = 0; + + if(mode == ATA_PIO5) + mode = ATA_PIO4; +Index: id_init.cpp +=================================================================== +--- id_init.cpp (revision 38425) ++++ id_init.cpp (working copy) +@@ -52,11 +52,11 @@ + ) + { + PHW_DEVICE_EXTENSION deviceExtension = (PHW_DEVICE_EXTENSION)HwDeviceExtension; +- ULONG slotNumber = deviceExtension->slotNumber; +- ULONG SystemIoBusNumber = deviceExtension->SystemIoBusNumber; ++ //ULONG slotNumber = deviceExtension->slotNumber; ++ //ULONG SystemIoBusNumber = deviceExtension->SystemIoBusNumber; + ULONG VendorID = deviceExtension->DevID & 0xffff; +- ULONG DeviceID = (deviceExtension->DevID >> 16) & 0xffff; +- ULONG RevID = deviceExtension->RevID; ++ //ULONG DeviceID = (deviceExtension->DevID >> 16) & 0xffff; ++ //ULONG RevID = deviceExtension->RevID; + ULONG ChipType = deviceExtension->HwFlags & CHIPTYPE_MASK; + ULONG ChipFlags= deviceExtension->HwFlags & CHIPFLAG_MASK; + +@@ -216,7 +216,7 @@ + PCI_DEV_HW_SPEC_BM( 0730, 1039, 0x00, ATA_UDMA5, "SiS 730" , SIS100OLD ), + + PCI_DEV_HW_SPEC_BM( 0646, 1039, 0x00, ATA_UDMA6, "SiS 645DX", SIS133NEW ), +-/* PCI_DEV_HW_SPEC_BM( 0645, 1039, 0x00, ATA_UDMA6, "SiS 645" , SIS133NEW ), ++/* PCI_DEV_HW_SPEC_BM( 0645, 1039, 0x00, ATA_UDMA6, "SiS 645" , SIS133NEW ),*/ + /* PCI_DEV_HW_SPEC_BM( 0640, 1039, 0x00, ATA_UDMA4, "SiS 640" , SIS_SOUTH ),*/ + PCI_DEV_HW_SPEC_BM( 0635, 1039, 0x00, ATA_UDMA5, "SiS 635" , SIS100NEW ), + PCI_DEV_HW_SPEC_BM( 0633, 1039, 0x00, ATA_UDMA5, "SiS 633" , SIS100NEW ), +@@ -419,7 +419,7 @@ + BaseIoAddressBM = AtapiGetIoRange(HwDeviceExtension, ConfigInfo, pciData, SystemIoBusNumber, + 4, 0, deviceExtension->NumberChannels*sizeof(IDE_BUSMASTER_REGISTERS)); + for(c=0; c<deviceExtension->NumberChannels; c++) { +- ULONG unit01 = (c & 1); ++ //ULONG unit01 = (c & 1); + ULONG unit10 = (c & 2); + chan = &deviceExtension->chan[c]; + +@@ -987,7 +987,7 @@ + IN ULONG slotNumber + ) + { +- PHW_DEVICE_EXTENSION deviceExtension = (PHW_DEVICE_EXTENSION)HwDeviceExtension; ++ //PHW_DEVICE_EXTENSION deviceExtension = (PHW_DEVICE_EXTENSION)HwDeviceExtension; + PCI_COMMON_CONFIG pciData; + ULONG funcNumber; + ULONG busDataRead; +@@ -1039,7 +1039,7 @@ + IN ULONG c + ) + { +- PHW_DEVICE_EXTENSION deviceExtension = (PHW_DEVICE_EXTENSION)HwDeviceExtension; ++ //PHW_DEVICE_EXTENSION deviceExtension = (PHW_DEVICE_EXTENSION)HwDeviceExtension; + PCI_COMMON_CONFIG pciData; + ULONG funcNumber; + ULONG busDataRead; +@@ -1174,7 +1174,7 @@ + ULONG slotNumber = deviceExtension->slotNumber; + ULONG SystemIoBusNumber = deviceExtension->SystemIoBusNumber; + +- ULONG ChipType = deviceExtension->HwFlags & CHIPTYPE_MASK; ++ //ULONG ChipType = deviceExtension->HwFlags & CHIPTYPE_MASK; + PHW_CHANNEL chan; + ULONG c; // logical channel (for Compatible Mode controllers) + UCHAR tmp8; +@@ -1332,7 +1332,9 @@ + ULONG slotNumber = deviceExtension->slotNumber; + ULONG SystemIoBusNumber = deviceExtension->SystemIoBusNumber; + ULONG VendorID = deviceExtension->DevID & 0xffff; ++#ifdef _DEBUG + ULONG DeviceID = (deviceExtension->DevID >> 16) & 0xffff; ++#endif + ULONG RevID = deviceExtension->RevID; + // ULONG i; + // BUSMASTER_CONTROLLER_INFORMATION* DevTypeInfo; +Index: id_probe.cpp +=================================================================== +--- id_probe.cpp (revision 38425) ++++ id_probe.cpp (working copy) +@@ -76,7 +76,6 @@ + VOID + AtapiDoNothing(VOID) + { +- ULONG i = 0; + return; + } // end AtapiDoNothing() + +@@ -504,8 +503,8 @@ + /* if(known) { + RtlCopyMemory(newBMListPtr, (PVOID)&(BusMasterAdapters[i]), sizeof(BUSMASTER_CONTROLLER_INFORMATION)); + } else {*/ +- sprintf((PCHAR)vendorStrPtr, "%4.4x", VendorID); +- sprintf((PCHAR)deviceStrPtr, "%4.4x", DeviceID); ++ sprintf((PCHAR)vendorStrPtr, "%4.4x", (UINT32)VendorID); ++ sprintf((PCHAR)deviceStrPtr, "%4.4x", (UINT32)DeviceID); + + RtlCopyMemory(&(newBMListPtr->VendorIdStr), (PCHAR)vendorStrPtr, 4); + RtlCopyMemory(&(newBMListPtr->DeviceIdStr), (PCHAR)deviceStrPtr, 4); +@@ -874,7 +873,11 @@ + BOOLEAN found = FALSE; + BOOLEAN MasterDev; + BOOLEAN simplexOnly = FALSE; ++#ifndef UNIATA_CORE ++#ifdef UNIATA_INIT_ON_PROBE + BOOLEAN skip_find_dev = FALSE; ++#endif ++#endif + BOOLEAN AltInit = FALSE; + + SCSI_PHYSICAL_ADDRESS IoBasePort1; +@@ -1712,7 +1715,7 @@ + ) + { + PHW_DEVICE_EXTENSION deviceExtension = (PHW_DEVICE_EXTENSION)HwDeviceExtension; +- PHW_CHANNEL chan = NULL; ++ //PHW_CHANNEL chan = NULL; + // this buffer must be global for UNIATA_CORE build + PCI_COMMON_CONFIG pciData; + +@@ -1743,8 +1746,8 @@ + BOOLEAN found = FALSE; + BOOLEAN MasterDev; + BOOLEAN simplexOnly = FALSE; +- BOOLEAN skip_find_dev = FALSE; +- BOOLEAN AltInit = FALSE; ++ //BOOLEAN skip_find_dev = FALSE; ++ //BOOLEAN AltInit = FALSE; + + PIDE_BUSMASTER_REGISTERS BaseIoAddressBM_0 = NULL; + +@@ -1797,7 +1800,7 @@ + &pciData, + PCI_COMMON_HDR_LENGTH); + +- if (busDataRead < PCI_COMMON_HDR_LENGTH) { ++ if (busDataRead < (ULONG)PCI_COMMON_HDR_LENGTH) { + KdPrint2((PRINT_PREFIX "busDataRead < PCI_COMMON_HDR_LENGTH => SP_RETURN_ERROR\n")); + goto exit_error; + } +@@ -2207,7 +2210,7 @@ + PHW_DEVICE_EXTENSION deviceExtension = (PHW_DEVICE_EXTENSION)HwDeviceExtension; + PHW_CHANNEL chan; + PULONG adapterCount = (PULONG)Context; +- PUCHAR ioSpace; ++ PUCHAR ioSpace = NULL; + ULONG i; + ULONG irq=0; + ULONG portBase; +@@ -2217,7 +2220,7 @@ + BOOLEAN preConfig = FALSE; + // + PIDE_REGISTERS_1 BaseIoAddress1; +- PIDE_REGISTERS_2 BaseIoAddress2; ++ PIDE_REGISTERS_2 BaseIoAddress2 = NULL; + + // The following table specifies the ports to be checked when searching for + // an IDE controller. A zero entry terminates the search. +Index: id_sata.cpp +=================================================================== +--- id_sata.cpp (revision 38425) ++++ id_sata.cpp (working copy) +@@ -7,7 +7,7 @@ + ) + { + PHW_DEVICE_EXTENSION deviceExtension = (PHW_DEVICE_EXTENSION)HwDeviceExtension; +- ULONG Channel = deviceExtension->Channel + lChannel; ++ //ULONG Channel = deviceExtension->Channel + lChannel; + PHW_CHANNEL chan = &deviceExtension->chan[lChannel]; + SATA_SSTATUS_REG SStatus; + ULONG i; +@@ -126,7 +126,7 @@ + { + PHW_DEVICE_EXTENSION deviceExtension = (PHW_DEVICE_EXTENSION)HwDeviceExtension; + PHW_CHANNEL chan = &deviceExtension->chan[lChannel]; +- ULONG ChipFlags = deviceExtension->HwFlags & CHIPFLAG_MASK; ++ //ULONG ChipFlags = deviceExtension->HwFlags & CHIPFLAG_MASK; + SATA_SSTATUS_REG SStatus; + SATA_SERROR_REG SError; + +Index: ntddk_ex.h +=================================================================== +--- ntddk_ex.h (revision 38425) ++++ ntddk_ex.h (working copy) +@@ -6,7 +6,8 @@ + #define ASSERT + #else + #undef ASSERT +-#define ASSERT //(x) if (!(x)) {RtlAssert("#x",__FILE__,__LINE__, ""); } ++//#define ASSERT //(x) if (!(x)) {RtlAssert("#x",__FILE__,__LINE__, ""); } ++#define ASSERT(x) // FIXME: WTF! + #endif //__REACTOS__ + +

1 0

[cwittich] 38451: fix copy and paste error
by cwittich＠svn.reactos.org 29 Dec '08

29 Dec '08

Author: cwittich Date: Mon Dec 29 04:30:50 2008 New Revision: 38451 URL: http://svn.reactos.org/svn/reactos?rev=38451&view=rev Log: fix copy and paste error Modified: trunk/rostests/winetests/crypt32/testlist.c Modified: trunk/rostests/winetests/crypt32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/crypt32/testlis… ============================================================================== --- trunk/rostests/winetests/crypt32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/crypt32/testlist.c [iso-8859-1] Mon Dec 29 04:30:50 2008 @@ -24,7 +24,7 @@ const struct test winetest_testlist[] = { - { "asn", func_base64 }, + { "base64", func_base64 }, { "cert", func_cert }, { "chain", func_chain }, { "crl", func_crl },

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