Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ion] 20637: * Rbuild MSVC Backend changes:
by ion＠svn.reactos.org 07 Jan '06

07 Jan '06

* Rbuild MSVC Backend changes: - Don't do runtime checks for drivers - Don't do buffer checks for drivers - Use W0 for speed build, not for the release build. - Disable Wp64 only for the speed build, not for the release build - Use /STDCALL default calling convention for native modules because the DDK requires it - Remove some duplicated options that were passed on the command line - Replace some options that were passed on the commandline with their appropriate XML keywords. Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp _____ Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp --- trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp 2006-01-07 01:14:38 UTC (rev 20636) +++ trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp 2006-01-07 01:15:26 UTC (rev 20637) @@ -96,9 +96,10 @@ ifs_list.push_back ( &module.project.non_if_data ); ifs_list.push_back ( &module.non_if_data ); - // this is a define in MinGW w32api, but not Microsoft's headers + // MinGW doesn't have a safe-string library yet defines.push_back ( "_CRT_SECURE_NO_DEPRECATE" ); defines.push_back ( "_CRT_NON_CONFORMING_SWPRINTFS" ); + // this is a define in MinGW w32api, but not Microsoft's headers defines.push_back ( "STDCALL=__stdcall" ); string baseaddr; @@ -309,9 +310,9 @@ fprintf ( OUT, "\"\r\n" ); fprintf ( OUT, "\t\t\t\tMinimalRebuild=\"%s\"\r\n", speed ? "FALSE" : "TRUE" ); - fprintf ( OUT, "\t\t\t\tBasicRuntimeChecks=\"%s\"\r\n", debug ? "3" : "0" ); + fprintf ( OUT, "\t\t\t\tBasicRuntimeChecks=\"%s\"\r\n", sys ? 0 : (debug ? "3" : "0") ); fprintf ( OUT, "\t\t\t\tRuntimeLibrary=\"5\"\r\n" ); - fprintf ( OUT, "\t\t\t\tBufferSecurityCheck=\"%s\"\r\n", debug ? "TRUE" : "FALSE" ); + fprintf ( OUT, "\t\t\t\tBufferSecurityCheck=\"%s\"\r\n", sys ? "FALSE" : (debug ? "TRUE" : "FALSE" )); fprintf ( OUT, "\t\t\t\tEnableFunctionLevelLinking=\"%s\"\r\n", debug ? "TRUE" : "FALSE" ); if ( module.pch != NULL ) @@ -336,8 +337,8 @@ fprintf ( OUT, "\t\t\t\tEnablePREfast=\"%s\"\r\n", debug ? "TRUE" : "FALSE"); fprintf ( OUT, "\t\t\t\tDisableSpecificWarnings=\"4201;4127;4214\"\r\n" ); - fprintf ( OUT, "\t\t\t\tWarningLevel=\"%s\"\r\n", release ? "0" : "4" ); - fprintf ( OUT, "\t\t\t\tDetect64BitPortabilityProblems=\"%s\"\r\n", release ? "FALSE" : "TRUE"); + fprintf ( OUT, "\t\t\t\tWarningLevel=\"%s\"\r\n", speed ? "0" : "4" ); + fprintf ( OUT, "\t\t\t\tDetect64BitPortabilityProblems=\"%s\"\r\n", speed ? "FALSE" : "TRUE"); if ( !module.cplusplus ) fprintf ( OUT, "\t\t\t\tCompileAs=\"1\"\r\n" ); fprintf ( OUT, "\t\t\t\tDebugInformationFormat=\"%s\"/>\r\n", speed ? "0" : "4"); @@ -384,31 +385,39 @@ if ( sys ) { - fprintf ( OUT, "\t\t\t\tAdditionalOptions=\" /DRIVER /ALIGN:0x20 /SUBSYSTEM:NATIVE /SECTION:INIT,D /NODEFAULTLIB /IGNORE:4001,4037,4039,4065,4070,4078,4087,4089,4096\"\r\n" ); + fprintf ( OUT, "\t\t\t\tAdditionalOptions=\" /ALIGN:0x20 /SECTION:INIT,D /IGNORE:4001,4037,4039,4065,4070,4078,4087,4089,4096\"\r\n" ); fprintf ( OUT, "\t\t\t\tIgnoreAllDefaultLibraries=\"TRUE\"\r\n" ); + fprintf ( OUT, "\t\t\t\tSubSystem=\"%d\"\r\n", 3 ); + fprintf ( OUT, "\t\t\t\tDriver=\"%d\"\r\n", 1 ); + fprintf ( OUT, "\t\t\t\tCallingConvention=\"%d\"\r\n", 2 ); fprintf ( OUT, "\t\t\t\tEntryPointSymbol=\"%s\"\r\n", module.entrypoint == "" ? "DriverEntry" : module.entrypoint.c_str ()); fprintf ( OUT, "\t\t\t\tBaseAddress=\"%s\"\r\n", baseaddr == "" ? "0x10000" : baseaddr.c_str ()); } else if ( exe ) { if ( module.type == Kernel ) - { - fprintf ( OUT, "\t\t\t\tAdditionalOptions=\" /SUBSYSTEM:NATIVE /NODEFAULTLIB /SECTION:INIT,D /ALIGN:0x80\"\r\n" ); - fprintf ( OUT, "\t\t\t\tIgnoreAllDefaultLibraries=\"TRUE\"\r\n" ); + { + fprintf ( OUT, "\t\t\t\tAdditionalOptions=\" /SECTION:INIT,D /ALIGN:0x80\"\r\n" ); + fprintf ( OUT, "\t\t\t\tIgnoreAllDefaultLibraries=\"TRUE\"\r\n" ); + fprintf ( OUT, "\t\t\t\tSubSystem=\"%d\"\r\n", 3 ); + fprintf ( OUT, "\t\t\t\tDriver=\"%d\"\r\n", 1 ); + fprintf ( OUT, "\t\t\t\tCallingConvention=\"%d\"\r\n", 2 ); fprintf ( OUT, "\t\t\t\tEntryPointSymbol=\"KiSystemStartup\"\r\n" ); fprintf ( OUT, "\t\t\t\tBaseAddress=\"%s\"\r\n", baseaddr.c_str ()); - } + } else if ( module.type == NativeCUI ) { - fprintf ( OUT, "\t\t\t\tAdditionalOptions=\" /SUBSYSTEM:NATIVE /NODEFAULTLIB /ALIGN:0x20\"\r\n" ); - fprintf ( OUT, "\t\t\t\tIgnoreAllDefaultLibraries=\"TRUE\"\r\n" ); + fprintf ( OUT, "\t\t\t\tAdditionalOptions=\" /ALIGN:0x20\"\r\n" ); + fprintf ( OUT, "\t\t\t\tSubSystem=\"%d\"\r\n", 1 ); + fprintf ( OUT, "\t\t\t\tCallingConvention=\"%d\"\r\n", 2 ); + fprintf ( OUT, "\t\t\t\tIgnoreAllDefaultLibraries=\"TRUE\"\r\n" ); fprintf ( OUT, "\t\t\t\tEntryPointSymbol=\"NtProcessStartup\"\r\n" ); fprintf ( OUT, "\t\t\t\tBaseAddress=\"%s\"\r\n", baseaddr.c_str ()); } else if ( module.type == Win32CUI || module.type == Win32GUI ) - { - fprintf ( OUT, "\t\t\t\tSubSystem=\"%d\"\r\n", console ? 1 : 2 ); - } + { + fprintf ( OUT, "\t\t\t\tSubSystem=\"%d\"\r\n", console ? 1 : 2 ); + } } else if ( dll ) {

1 0

[gedmurphy] 20636: pull service info out of the registry to populate the list view
by gedmurphy＠svn.reactos.org 07 Jan '06

07 Jan '06

pull service info out of the registry to populate the list view Modified: trunk/reactos/subsys/system/servman/En.rc Modified: trunk/reactos/subsys/system/servman/query.c Modified: trunk/reactos/subsys/system/servman/res/system.ico Modified: trunk/reactos/subsys/system/servman/resource.h _____ Modified: trunk/reactos/subsys/system/servman/En.rc --- trunk/reactos/subsys/system/servman/En.rc 2006-01-07 01:06:48 UTC (rev 20635) +++ trunk/reactos/subsys/system/servman/En.rc 2006-01-07 01:14:38 UTC (rev 20636) @@ -82,6 +82,9 @@ IDS_SERVICES_STATUS_STOPPED "Stopped" IDS_SERVICES_YES "Yes" IDS_SERVICES_UNKNOWN "Unknown" + IDS_SERVICES_AUTO "Automatic" + IDS_SERVICES_MAN "Manual" + IDS_SERVICES_DIS "Disabled" END STRINGTABLE DISCARDABLE _____ Modified: trunk/reactos/subsys/system/servman/query.c --- trunk/reactos/subsys/system/servman/query.c 2006-01-07 01:06:48 UTC (rev 20635) +++ trunk/reactos/subsys/system/servman/query.c 2006-01-07 01:14:38 UTC (rev 20636) @@ -47,12 +47,31 @@ _stprintf(buf, szNumServices, NumServices); SendMessage(hStatus, SB_SETTEXT, 0, (LPARAM)buf); + for (Index = 0; Index < NumServices; Index++) { HKEY hKey = NULL; - TCHAR Description[5000]; - DWORD Size = 5000; + LPTSTR Description = NULL; + LONG ret; + LPTSTR LogOnAs = NULL; + DWORD StartUp = 0; + DWORD dwValueSize; + /* open the registry key for the service */ + _stprintf(buf, _T("System\\CurrentControlSet\\Services\\%s"), + pServiceStatus[Index].lpServiceName); + + if( RegOpenKeyEx(HKEY_LOCAL_MACHINE, + buf, + 0, + KEY_READ, + &hKey) != ERROR_SUCCESS) + { + GetError(); + return FALSE; + } + + /* set the display name */ ZeroMemory(&item, sizeof(LV_ITEM)); @@ -60,35 +79,51 @@ //item.iImage = 0; item.pszText = pServiceStatus[Index].lpDisplayName; item.iItem = ListView_GetItemCount(hListView); - item.lParam = 0; + //item.lParam = 0; item.iItem = ListView_InsertItem(hListView, &item); /* set the description */ - - _stprintf(buf, _T("System\\CurrentControlSet\\Services\\%s"), - pServiceStatus[Index].lpServiceName); - - if( RegOpenKeyEx(HKEY_LOCAL_MACHINE, - buf, - 0, - KEY_READ, - &hKey) != ERROR_SUCCESS) + dwValueSize = 0; + ret = RegQueryValueEx(hKey, + _T("Description"), + NULL, + NULL, + NULL, + &dwValueSize); + if (ret != ERROR_SUCCESS && ret != ERROR_FILE_NOT_FOUND) { - GetError(); + RegCloseKey(hKey); return FALSE; } + + if (ret != ERROR_FILE_NOT_FOUND) + { + Description = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, dwValueSize); + if (Description == NULL) + { + RegCloseKey(hKey); + return FALSE; + } + if(RegQueryValueEx(hKey, + _T("Description"), + NULL, + NULL, + (LPBYTE)Description, + &dwValueSize)) + { + HeapFree(GetProcessHeap(), 0, Description); + RegCloseKey(hKey); + return FALSE; + } - RegQueryValueEx(hKey, - _T("Description"), - NULL, - NULL, - (LPBYTE)Description, - &Size); + item.pszText = Description; + item.iSubItem = 1; + SendMessage(hListView, LVM_SETITEMTEXT, item.iItem, (LPARAM) &item); - item.pszText = Description; - item.iSubItem = 1; - SendMessage(hListView, LVM_SETITEMTEXT, item.iItem, (LPARAM) &item); + HeapFree(GetProcessHeap(), 0, Description); + } + /* set the status */ @@ -106,9 +141,88 @@ item.iSubItem = 2; SendMessage(hListView, LVM_SETITEMTEXT, item.iItem, (LPARAM) &item); } - } - } + /* set the startup type */ + + dwValueSize = sizeof(DWORD); + if (RegQueryValueEx(hKey, + _T("Start"), + NULL, + NULL, + (LPBYTE)StartUp, + &dwValueSize)) + { + RegCloseKey(hKey); + return FALSE; + } + + if (StartUp == 0x02) + { + LoadString(hInstance, IDS_SERVICES_AUTO, szStatus, 128); + item.pszText = szStatus; + item.iSubItem = 2; + SendMessage(hListView, LVM_SETITEMTEXT, item.iItem, (LPARAM) &item); + } + else if (StartUp == 0x03) + { + LoadString(hInstance, IDS_SERVICES_MAN, szStatus, 128); + item.pszText = szStatus; + item.iSubItem = 2; + SendMessage(hListView, LVM_SETITEMTEXT, item.iItem, (LPARAM) &item); + } + else if (StartUp == 0x04) + { + LoadString(hInstance, IDS_SERVICES_DIS, szStatus, 128); + item.pszText = szStatus; + item.iSubItem = 2; + SendMessage(hListView, LVM_SETITEMTEXT, item.iItem, (LPARAM) &item); + } + + + + /* set Log On As */ + + dwValueSize = 0; + if (RegQueryValueEx(hKey, + _T("ObjectName"), + NULL, + NULL, + NULL, + &dwValueSize)) + { + RegCloseKey(hKey); + return FALSE; + } + + LogOnAs = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, dwValueSize); + if (LogOnAs == NULL) + { + RegCloseKey(hKey); + return FALSE; + } + if(RegQueryValueEx(hKey, + _T("ObjectName"), + NULL, + NULL, + (LPBYTE)LogOnAs, + &dwValueSize)) + { + HeapFree(GetProcessHeap(), 0, LogOnAs); + RegCloseKey(hKey); + return FALSE; + } + + item.pszText = LogOnAs; + item.iSubItem = 4; + SendMessage(hListView, LVM_SETITEMTEXT, item.iItem, (LPARAM) &item); + + HeapFree(GetProcessHeap(), 0, LogOnAs); + + RegCloseKey(hKey); + + } + } + return TRUE; } _____ Modified: trunk/reactos/subsys/system/servman/res/system.ico (Binary files differ) _____ Modified: trunk/reactos/subsys/system/servman/resource.h --- trunk/reactos/subsys/system/servman/resource.h 2006-01-07 01:06:48 UTC (rev 20635) +++ trunk/reactos/subsys/system/servman/resource.h 2006-01-07 01:14:38 UTC (rev 20636) @@ -43,7 +43,10 @@ #define IDS_SERVICES_STATUS_STOPPED 5001 #define IDS_SERVICES_YES 5002 #define IDS_SERVICES_UNKNOWN 5003 -#define IDS_SERVICES_NUM_SERVICES 5004 +#define IDS_SERVICES_AUTO 5004 +#define IDS_SERVICES_MAN 5005 +#define IDS_SERVICES_DIS 5006 +#define IDS_SERVICES_NUM_SERVICES 5010 #define IDB_START 50 #define IDI_SM_ICON 51

1 0

[turner] 20635: Remove NtGdiDeleteDC
by turner＠svn.reactos.org 07 Jan '06

07 Jan '06

Remove NtGdiDeleteDC Modified: trunk/reactos/include/win32k/ntgdibad.h Modified: trunk/reactos/lib/gdi32/gdi32.def Modified: trunk/reactos/lib/gdi32/misc/gdientry.c Modified: trunk/reactos/subsys/system/usetup/bootsup.c Modified: trunk/reactos/subsys/win32k/ntuser/cursoricon.c Modified: trunk/reactos/subsys/win32k/ntuser/desktop.c Modified: trunk/reactos/subsys/win32k/ntuser/metric.c Modified: trunk/reactos/subsys/win32k/ntuser/windc.c Modified: trunk/reactos/subsys/win32k/ntuser/winsta.c Modified: trunk/reactos/subsys/win32k/objects/bitmaps.c Modified: trunk/reactos/subsys/win32k/objects/dc.c Modified: trunk/reactos/subsys/win32k/objects/dib.c Modified: trunk/reactos/tools/nci/w32ksvc.db _____ Modified: trunk/reactos/include/win32k/ntgdibad.h --- trunk/reactos/include/win32k/ntgdibad.h 2006-01-06 23:47:15 UTC (rev 20634) +++ trunk/reactos/include/win32k/ntgdibad.h 2006-01-07 01:06:48 UTC (rev 20635) @@ -348,9 +348,6 @@ int Count ); -/* Use NtGdiDeleteObjectApp. */ -BOOL STDCALL NtGdiDeleteDC(HDC hDC); - /* Meta are user-mode. */ BOOL STDCALL _____ Modified: trunk/reactos/lib/gdi32/gdi32.def --- trunk/reactos/lib/gdi32/gdi32.def 2006-01-06 23:47:15 UTC (rev 20634) +++ trunk/reactos/lib/gdi32/gdi32.def 2006-01-07 01:06:48 UTC (rev 20635) @@ -91,7 +91,7 @@ CreateSolidBrush@4 DPtoLP@12=NtGdiDPtoLP@12 DeleteColorSpace@4 -DeleteDC@4=NtGdiDeleteDC@4 +DeleteDC@4=NtGdiDeleteObjectApp@4 DeleteEnhMetaFile@4 DeleteMetaFile@4 DeleteObject@4 _____ Modified: trunk/reactos/lib/gdi32/misc/gdientry.c --- trunk/reactos/lib/gdi32/misc/gdientry.c 2006-01-06 23:47:15 UTC (rev 20634) +++ trunk/reactos/lib/gdi32/misc/gdientry.c 2006-01-07 01:06:48 UTC (rev 20635) @@ -83,7 +83,7 @@ if ((ULONG_PTR)newHdc != pDirectDrawGlobalInternal->hDD) { pDirectDrawGlobalInternal->hDD = (ULONG_PTR) NtGdiDdCreateDirectDrawObject(newHdc); - NtGdiDeleteDC(newHdc); + NtGdiDeleteObjectApp(newHdc); } /* pDirectDrawGlobal->hDD = pDirectDrawGlobalInternal->hDD; ? */ _____ Modified: trunk/reactos/subsys/system/usetup/bootsup.c --- trunk/reactos/subsys/system/usetup/bootsup.c 2006-01-06 23:47:15 UTC (rev 20634) +++ trunk/reactos/subsys/system/usetup/bootsup.c 2006-01-07 01:06:48 UTC (rev 20635) @@ -245,7 +245,7 @@ NULL, INSERT_LAST, L"Options", - L"/DEBUGPORT=SCREEN /NOGUIBOOT"); + L"/DEBUGPORT=COM1 /NOGUIBOOT"); /* Create "DOS" section */ IniSection = IniCacheAppendSection(IniCache, @@ -356,7 +356,7 @@ NULL, INSERT_LAST, L"Options", - L"/DEBUGPORT=SCREEN /NOGUIBOOT"); + L"/DEBUGPORT=COM1 /NOGUIBOOT"); /* Save the ini file */ IniCacheSave(IniCache, IniPath); _____ Modified: trunk/reactos/subsys/win32k/ntuser/cursoricon.c --- trunk/reactos/subsys/win32k/ntuser/cursoricon.c 2006-01-06 23:47:15 UTC (rev 20634) +++ trunk/reactos/subsys/win32k/ntuser/cursoricon.c 2006-01-07 01:06:48 UTC (rev 20635) @@ -1312,7 +1312,7 @@ } if (NULL == BitmapStretched) { - NtGdiDeleteDC(DcStretched); + NtGdiDeleteObjectApp(DcStretched); DPRINT1("Failed to create temporary bitmap\n"); return; } @@ -1320,7 +1320,7 @@ if (NULL == OldBitmap) { NtGdiDeleteObject(BitmapStretched); - NtGdiDeleteDC(DcStretched); + NtGdiDeleteObjectApp(DcStretched); DPRINT1("Failed to create temporary bitmap\n"); return; } @@ -1334,7 +1334,7 @@ } NtGdiSelectObject(DcStretched, OldBitmap); NtGdiDeleteObject(BitmapStretched); - NtGdiDeleteDC(DcStretched); + NtGdiDeleteObjectApp(DcStretched); } } #else @@ -1439,7 +1439,7 @@ hbmOff = NtGdiCreateCompatibleBitmap(hdc, cxWidth, cyHeight); if(!hbmOff) { - NtGdiDeleteDC(hdcOff); + NtGdiDeleteObjectApp(hdcOff); goto done; } hOldOffBrush = NtGdiSelectObject(hdcOff, hbrFlickerFreeDraw); @@ -1511,10 +1511,10 @@ NtGdiSelectObject(hdcOff, hOldOffBmp); NtGdiSelectObject(hdcOff, hOldOffBrush); NtGdiDeleteObject(hbmOff); - NtGdiDeleteDC(hdcOff); + NtGdiDeleteObjectApp(hdcOff); } if(hdcMem) - NtGdiDeleteDC(hdcMem); + NtGdiDeleteObjectApp(hdcMem); done: ObDereferenceObject(WinSta); _____ Modified: trunk/reactos/subsys/win32k/ntuser/desktop.c --- trunk/reactos/subsys/win32k/ntuser/desktop.c 2006-01-06 23:47:15 UTC (rev 20634) +++ trunk/reactos/subsys/win32k/ntuser/desktop.c 2006-01-07 01:06:48 UTC (rev 20635) @@ -1320,7 +1320,7 @@ 0); } NtGdiSelectObject(hWallpaperDC, hOldBitmap); - NtGdiDeleteDC(hWallpaperDC); + NtGdiDeleteObjectApp(hWallpaperDC); } } } _____ Modified: trunk/reactos/subsys/win32k/ntuser/metric.c --- trunk/reactos/subsys/win32k/ntuser/metric.c 2006-01-06 23:47:15 UTC (rev 20634) +++ trunk/reactos/subsys/win32k/ntuser/metric.c 2006-01-07 01:06:48 UTC (rev 20635) @@ -171,7 +171,7 @@ Height = ScreenDC->GDIInfo->ulVertRes; DC_UnlockDc(ScreenDC); } - NtGdiDeleteDC(ScreenDCHandle); + NtGdiDeleteObjectApp(ScreenDCHandle); } return SM_CXSCREEN == Index ? Width : Height; } _____ Modified: trunk/reactos/subsys/win32k/ntuser/windc.c --- trunk/reactos/subsys/win32k/ntuser/windc.c 2006-01-06 23:47:15 UTC (rev 20634) +++ trunk/reactos/subsys/win32k/ntuser/windc.c 2006-01-07 01:06:48 UTC (rev 20635) @@ -647,7 +647,7 @@ DC_SetOwnership(dce->hDC, PsGetCurrentProcess()); } - NtGdiDeleteDC(dce->hDC); + NtGdiDeleteObjectApp(dce->hDC); if (dce->hClipRgn && ! (dce->DCXFlags & DCX_KEEPCLIPRGN)) { NtGdiDeleteObject(dce->hClipRgn); _____ Modified: trunk/reactos/subsys/win32k/ntuser/winsta.c --- trunk/reactos/subsys/win32k/ntuser/winsta.c 2006-01-06 23:47:15 UTC (rev 20634) +++ trunk/reactos/subsys/win32k/ntuser/winsta.c 2006-01-07 01:06:48 UTC (rev 20635) @@ -371,7 +371,7 @@ if (NULL != ScreenDeviceContext) { DC_SetOwnership(ScreenDeviceContext, PsGetCurrentProcess()); - NtGdiDeleteDC(ScreenDeviceContext); + NtGdiDeleteObjectApp(ScreenDeviceContext); ScreenDeviceContext = NULL; } IntHideDesktop(IntGetActiveDesktop()); _____ Modified: trunk/reactos/subsys/win32k/objects/bitmaps.c --- trunk/reactos/subsys/win32k/objects/bitmaps.c 2006-01-06 23:47:15 UTC (rev 20634) +++ trunk/reactos/subsys/win32k/objects/bitmaps.c 2006-01-07 01:06:48 UTC (rev 20635) @@ -729,7 +729,7 @@ } NtGdiDeleteObject ( hBmpTmp ); } - NtGdiDeleteDC ( hDCTmp ); + NtGdiDeleteObjectApp ( hDCTmp ); } } @@ -941,9 +941,9 @@ NtGdiDeleteObject(hBitmap2); NtGdiDeleteObject(hBitmap3); - NtGdiDeleteDC(hDC1); - NtGdiDeleteDC(hDC2); - NtGdiDeleteDC(hDCMask); + NtGdiDeleteObjectApp(hDC1); + NtGdiDeleteObjectApp(hDC2); + NtGdiDeleteObjectApp(hDCMask); return TRUE; } _____ Modified: trunk/reactos/subsys/win32k/objects/dc.c --- trunk/reactos/subsys/win32k/objects/dc.c 2006-01-06 23:47:15 UTC (rev 20634) +++ trunk/reactos/subsys/win32k/objects/dc.c 2006-01-07 01:06:48 UTC (rev 20635) @@ -165,7 +165,7 @@ { if (NULL != DisplayDC) { - NtGdiDeleteDC(DisplayDC); + NtGdiDeleteObjectApp(DisplayDC); } return NULL; } @@ -176,7 +176,7 @@ DC_UnlockDc(OrigDC); if (NULL != DisplayDC) { - NtGdiDeleteDC(DisplayDC); + NtGdiDeleteObjectApp(DisplayDC); } return NULL; } @@ -213,7 +213,7 @@ DC_FreeDC( hNewDC ); if (NULL != DisplayDC) { - NtGdiDeleteDC(DisplayDC); + NtGdiDeleteObjectApp(DisplayDC); } return NULL; } @@ -233,7 +233,7 @@ DC_UnlockDc(OrigDC); if (NULL != DisplayDC) { - NtGdiDeleteDC(DisplayDC); + NtGdiDeleteObjectApp(DisplayDC); } hVisRgn = NtGdiCreateRectRgn(0, 0, 1, 1); @@ -1060,7 +1060,7 @@ } BOOL STDCALL -NtGdiDeleteDC(HDC DCHandle) +NtGdiDeleteObjectApp(HANDLE DCHandle) { PDC DCToDelete; @@ -1092,7 +1092,7 @@ DC_SetNextDC (DCToDelete, DC_GetNextDC (savedDC)); DCToDelete->saveLevel--; DC_UnlockDc( savedDC ); - NtGdiDeleteDC (savedHDC); + NtGdiDeleteObjectApp (savedHDC); } /* Free GDI resources allocated to this DC */ @@ -1991,7 +1991,7 @@ { DC_UnlockDc( dcs ); } - NtGdiDeleteDC (hdcs); + NtGdiDeleteObjectApp (hdcs); } DC_UnlockDc( dc ); return success; @@ -2034,7 +2034,7 @@ */ if (!PATH_AssignGdiPath (&dcs->w.path, &dc->w.path)) { - NtGdiDeleteDC (hdcs); + NtGdiDeleteObjectApp (hdcs); return 0; } #endif _____ Modified: trunk/reactos/subsys/win32k/objects/dib.c --- trunk/reactos/subsys/win32k/objects/dib.c 2006-01-06 23:47:15 UTC (rev 20634) +++ trunk/reactos/subsys/win32k/objects/dib.c 2006-01-07 01:06:48 UTC (rev 20635) @@ -579,7 +579,7 @@ SrcWidth, SrcHeight, ROP, 0); NtGdiSelectObject(hdcMem, hOldBitmap); - NtGdiDeleteDC(hdcMem); + NtGdiDeleteObjectApp(hdcMem); NtGdiDeleteObject(hBitmap); return SrcHeight; @@ -799,7 +799,7 @@ } if (bDesktopDC) - NtGdiDeleteDC(hDC); + NtGdiDeleteObjectApp(hDC); return hbitmap; } _____ Modified: trunk/reactos/tools/nci/w32ksvc.db --- trunk/reactos/tools/nci/w32ksvc.db 2006-01-06 23:47:15 UTC (rev 20634) +++ trunk/reactos/tools/nci/w32ksvc.db 2006-01-07 01:06:48 UTC (rev 20635) @@ -52,7 +52,7 @@ NtGdiCreateSolidBrush 2 NtGdiDPtoLP 3 NtGdiDeleteColorSpace 1 -NtGdiDeleteDC 1 +NtGdiDeleteObjectApp 1 NtGdiDeleteEnhMetaFile 1 NtGdiDeleteMetaFile 1 NtGdiDeleteObject 1

1 0

[cwittich] 20634: disabled warning 4214
by cwittich＠svn.reactos.org 06 Jan '06

06 Jan '06

disabled warning 4214 Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp _____ Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp --- trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp 2006-01-06 23:13:23 UTC (rev 20633) +++ trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp 2006-01-06 23:47:15 UTC (rev 20634) @@ -335,7 +335,7 @@ } fprintf ( OUT, "\t\t\t\tEnablePREfast=\"%s\"\r\n", debug ? "TRUE" : "FALSE"); - fprintf ( OUT, "\t\t\t\tDisableSpecificWarnings=\"4201;4127\"\r\n" ); + fprintf ( OUT, "\t\t\t\tDisableSpecificWarnings=\"4201;4127;4214\"\r\n" ); fprintf ( OUT, "\t\t\t\tWarningLevel=\"%s\"\r\n", release ? "0" : "4" ); fprintf ( OUT, "\t\t\t\tDetect64BitPortabilityProblems=\"%s\"\r\n", release ? "FALSE" : "TRUE"); if ( !module.cplusplus )

1 0

[gvg] 20633: The adapter name is actually the GUID. Also store the human recognizable
by gvg＠svn.reactos.org 06 Jan '06

06 Jan '06

The adapter name is actually the GUID. Also store the human recognizable description. This brings the network control panel applet a step further. Modified: trunk/reactos/drivers/net/tcpip/datalink/lan.c Modified: trunk/reactos/drivers/net/tcpip/include/ip.h _____ Modified: trunk/reactos/drivers/net/tcpip/datalink/lan.c --- trunk/reactos/drivers/net/tcpip/datalink/lan.c 2006-01-06 22:57:21 UTC (rev 20632) +++ trunk/reactos/drivers/net/tcpip/datalink/lan.c 2006-01-06 23:13:23 UTC (rev 20633) @@ -781,8 +781,8 @@ static NTSTATUS CheckForDeviceDesc( PUNICODE_STRING EnumKeyName, PUNICODE_STRING TargetKeyName, - PUNICODE_STRING ShortName, - PUNICODE_STRING OutName ) { + PUNICODE_STRING Name, + PUNICODE_STRING DeviceDesc ) { UNICODE_STRING RootDevice = { 0 }, LinkageKeyName = { 0 }; UNICODE_STRING DescKeyName = { 0 }, Linkage = { 0 }; UNICODE_STRING BackSlash = { 0 }; @@ -809,14 +809,14 @@ Status = ReadStringFromRegistry( LinkageKey, L"RootDevice", &RootDevice ); if( !NT_SUCCESS(Status) ) goto cleanup; - if( RtlCompareUnicodeString( &RootDevice, ShortName, TRUE ) == 0 ) { + if( RtlCompareUnicodeString( &RootDevice, Name, TRUE ) == 0 ) { Status = OpenRegistryKey( &DescKeyName, &DescKey ); if( !NT_SUCCESS(Status) ) goto cleanup; - Status = ReadStringFromRegistry( DescKey, L"DriverDesc", OutName ); + Status = ReadStringFromRegistry( DescKey, L"DriverDesc", DeviceDesc ); if( !NT_SUCCESS(Status) ) goto cleanup; - TI_DbgPrint(DEBUG_DATALINK,("ADAPTER NAME: %wZ\n", OutName)); + TI_DbgPrint(DEBUG_DATALINK,("ADAPTER DESC: %wZ\n", DeviceDesc)); } else Status = STATUS_UNSUCCESSFUL; cleanup: @@ -831,8 +831,8 @@ return Status; } -static NTSTATUS FindDeviceNameForAdapter( PUNICODE_STRING ShortName, - PUNICODE_STRING OutName ) { +static NTSTATUS FindDeviceDescForAdapter( PUNICODE_STRING Name, + PUNICODE_STRING DeviceDesc ) { UNICODE_STRING EnumKeyName, TargetKeyName; HANDLE EnumKey; NTSTATUS Status; @@ -872,7 +872,7 @@ TargetKeyName.Buffer = Kbio->Name; Status = CheckForDeviceDesc - ( &EnumKeyName, &TargetKeyName, ShortName, OutName ); + ( &EnumKeyName, &TargetKeyName, Name, DeviceDesc ); if( NT_SUCCESS(Status) ) { NtClose( EnumKey ); return Status; @@ -880,25 +880,30 @@ } } - RtlInitUnicodeString( OutName, L"" ); - AppendUnicodeString( OutName, &TargetKeyName, FALSE ); + RtlInitUnicodeString( DeviceDesc, L"" ); + AppendUnicodeString( DeviceDesc, &TargetKeyName, FALSE ); NtClose( EnumKey ); return STATUS_UNSUCCESSFUL; } -VOID GetShortName( PUNICODE_STRING RegistryKey, - PUNICODE_STRING ShortNameOut ) { +VOID GetName( PUNICODE_STRING RegistryKey, + PUNICODE_STRING OutName ) { PWCHAR Ptr; - ShortNameOut->Buffer = + UNICODE_STRING PartialRegistryKey; + + PartialRegistryKey.Buffer = RegistryKey->Buffer + wcslen(CCS_ROOT L"\\Services\\"); - Ptr = ShortNameOut->Buffer; + Ptr = PartialRegistryKey.Buffer; while( *Ptr != L'\\' && ((PCHAR)Ptr) < ((PCHAR)RegistryKey->Buffer) + RegistryKey->Length ) Ptr++; - ShortNameOut->Length = ShortNameOut->MaximumLength = - (Ptr - ShortNameOut->Buffer) * sizeof(WCHAR); + PartialRegistryKey.Length = PartialRegistryKey.MaximumLength = + (Ptr - PartialRegistryKey.Buffer) * sizeof(WCHAR); + + RtlInitUnicodeString( OutName, L"" ); + AppendUnicodeString( OutName, &PartialRegistryKey, FALSE ); } VOID BindAdapter( @@ -920,14 +925,11 @@ ULONG Lookahead = LOOKAHEAD_SIZE; NTSTATUS Status; HANDLE RegHandle = 0; - UNICODE_STRING ShortName; TI_DbgPrint(DEBUG_DATALINK, ("Called.\n")); Adapter->State = LAN_STATE_OPENING; - GetShortName( RegistryPath, &ShortName ); - NdisStatus = NDISCall(Adapter, NdisRequestSetInformation, OID_GEN_CURRENT_LOOKAHEAD, @@ -963,11 +965,14 @@ * services (ZwOpenKey, etc). */ + GetName( RegistryPath, &IF->Name ); + Status = OpenRegistryKey( RegistryPath, &RegHandle ); if(NT_SUCCESS(Status)) { - Status = FindDeviceNameForAdapter( &ShortName, &IF->Name ); - TI_DbgPrint(DEBUG_DATALINK,("Adapter Name: %wZ\n", &IF->Name)); + Status = FindDeviceDescForAdapter( &IF->Name, &IF->Description ); + TI_DbgPrint(DEBUG_DATALINK,("Adapter Description: %wZ\n", + &IF->Description)); } DefaultMask.Type = IP_ADDRESS_V4; _____ Modified: trunk/reactos/drivers/net/tcpip/include/ip.h --- trunk/reactos/drivers/net/tcpip/include/ip.h 2006-01-06 22:57:21 UTC (rev 20632) +++ trunk/reactos/drivers/net/tcpip/include/ip.h 2006-01-06 23:13:23 UTC (rev 20633) @@ -150,7 +150,8 @@ IP_ADDRESS PointToPoint; /* Point to point address */ IP_ADDRESS Netmask; /* Netmask */ IP_ADDRESS Broadcast; /* Broadcast */ - UNICODE_STRING Name; /* Adapter name */ + UNICODE_STRING Name; /* Adapter name (GUID) */ + UNICODE_STRING Description; /* Adapter description (Human readable) */ PUCHAR Address; /* Pointer to interface address */ UINT AddressLength; /* Length of address in bytes */ UINT Index; /* Index of adapter (used to add ip addr) */

1 0

[ion] 20632: - Set the right Thread->WaitTime dring waits
by ion＠svn.reactos.org 06 Jan '06

06 Jan '06

- Set the right Thread->WaitTime dring waits - Initialize WaitBlock->Thread during thread creation. - Make APCs queuable for the thread after it's created - Enable Timer Block optimization since it works now. This allows us not to always set-up for each wait, since most of its fields can remain static. - Properly link wait block together with the waitlist of the timer. Modified: trunk/reactos/ntoskrnl/ke/gate.c Modified: trunk/reactos/ntoskrnl/ke/kthread.c Modified: trunk/reactos/ntoskrnl/ke/queue.c Modified: trunk/reactos/ntoskrnl/ke/wait.c _____ Modified: trunk/reactos/ntoskrnl/ke/gate.c --- trunk/reactos/ntoskrnl/ke/gate.c 2006-01-06 22:41:42 UTC (rev 20631) +++ trunk/reactos/ntoskrnl/ke/gate.c 2006-01-06 22:57:21 UTC (rev 20632) @@ -63,13 +63,12 @@ GateWaitBlock->Thread = CurrentThread; /* Set the Thread Wait Data */ - CurrentThread->WaitReason = WaitReason; - CurrentThread->WaitMode = WaitMode; CurrentThread->WaitIrql = OldIrql; CurrentThread->GateObject = Gate; /* Insert into the Wait List */ - InsertTailList(&Gate->Header.WaitListHead, &GateWaitBlock->WaitListEntry); + InsertTailList(&Gate->Header.WaitListHead, + &GateWaitBlock->WaitListEntry); /* Handle Kernel Queues */ if (CurrentThread->Queue) @@ -81,7 +80,7 @@ /* Setup the wait information */ CurrentThread->WaitMode = WaitMode; CurrentThread->WaitReason = WaitReason; - CurrentThread->WaitTime = 0; + CurrentThread->WaitTime = ((PLARGE_INTEGER)&KeTickCount)->LowPart; CurrentThread->State = Waiting; /* Find a new thread to run */ _____ Modified: trunk/reactos/ntoskrnl/ke/kthread.c --- trunk/reactos/ntoskrnl/ke/kthread.c 2006-01-06 22:41:42 UTC (rev 20631) +++ trunk/reactos/ntoskrnl/ke/kthread.c 2006-01-06 22:57:21 UTC (rev 20632) @@ -19,7 +19,9 @@ #define THREAD_ALERT_INCREMENT 2 extern EX_WORK_QUEUE ExWorkerQueue[MaximumWorkQueue]; +#define TIMER_WAIT_BLOCK 0x3L + /* * PURPOSE: List of threads associated with each priority level */ @@ -789,6 +791,10 @@ PVOID Teb, PVOID KernelStack) { + ULONG i; + PKWAIT_BLOCK TimerWaitBlock; + PKTIMER Timer; + /* Initalize the Dispatcher Header */ DPRINT("Initializing Dispatcher Header for New Thread: %x in Process: %x\n", Thread, Process); KeInitializeDispatcherHeader(&Thread->DispatcherHeader, @@ -803,6 +809,13 @@ /* Initialize the Mutant List */ InitializeListHead(&Thread->MutantListHead); + /* Initialize the wait blocks */ + for (i = 0; i< (THREAD_WAIT_OBJECTS + 1); i++) + { + /* Put our pointer */ + Thread->WaitBlock[i].Thread = Thread; + } + /* Setup the Service Descriptor Table for Native Calls */ Thread->ServiceTable = KeServiceDescriptorTable; @@ -813,6 +826,7 @@ Thread->ApcStatePointer[OriginalApcEnvironment] = &Thread->ApcState; Thread->ApcStatePointer[AttachedApcEnvironment] = &Thread->SavedApcState; Thread->ApcStateIndex = OriginalApcEnvironment; + Thread->ApcQueueable = TRUE; KeInitializeSpinLock(&Thread->ApcQueueLock); /* Initialize the Suspend APC */ @@ -829,17 +843,18 @@ KeInitializeSemaphore(&Thread->SuspendSemaphore, 0, 128); /* FIXME OPTIMIZATION OF DOOM. DO NOT ENABLE FIXME */ -#if 0 - Thread->WaitBlock[3].Object = (PVOID)&Thread->Timer; - Thread->WaitBlock[3].Thread = Thread; - Thread->WaitBlock[3].WaitKey = STATUS_TIMEOUT; - Thread->WaitBlock[3].WaitType = WaitAny; - Thread->WaitBlock[3].NextWaitBlock = NULL; - InsertTailList(&Thread->Timer.Header.WaitListHead, - &Thread->WaitBlock[3].WaitListEntry); -#endif - KeInitializeTimer(&Thread->Timer); + Timer = &Thread->Timer; + KeInitializeTimer(Timer); + TimerWaitBlock = &Thread->WaitBlock[TIMER_WAIT_BLOCK]; + TimerWaitBlock->Object = Timer; + TimerWaitBlock->WaitKey = STATUS_TIMEOUT; + TimerWaitBlock->WaitType = WaitAny; + TimerWaitBlock->NextWaitBlock = NULL; + /* Link the two wait lists together */ + TimerWaitBlock->WaitListEntry.Flink = &Timer->Header.WaitListHead; + TimerWaitBlock->WaitListEntry.Blink = &Timer->Header.WaitListHead; + /* Set the TEB */ Thread->Teb = Teb; _____ Modified: trunk/reactos/ntoskrnl/ke/queue.c --- trunk/reactos/ntoskrnl/ke/queue.c 2006-01-06 22:41:42 UTC (rev 20631) +++ trunk/reactos/ntoskrnl/ke/queue.c 2006-01-06 22:57:21 UTC (rev 20632) @@ -270,8 +270,8 @@ WaitBlock->WaitType = WaitAny; /* Link the timer to this Wait Block */ - InitializeListHead(&Timer->Header.WaitListHead); - InsertTailList(&Timer->Header.WaitListHead, &WaitBlock->WaitListEntry); + Timer->Header.WaitListHead.Flink = &WaitBlock->WaitListEntry; + Timer->Header.WaitListHead.Blink = &WaitBlock->WaitListEntry; /* Create Timer */ DPRINT("Creating Timer with timeout %I64d\n", *Timeout); @@ -290,7 +290,7 @@ Thread->WaitMode = WaitMode; Thread->WaitReason = WrQueue; Thread->Alertable = FALSE; - Thread->WaitTime = 0; + Thread->WaitTime = ((PLARGE_INTEGER)&KeTickCount)->LowPart; Thread->State = Waiting; /* Find a new thread to run */ _____ Modified: trunk/reactos/ntoskrnl/ke/wait.c --- trunk/reactos/ntoskrnl/ke/wait.c 2006-01-06 22:41:42 UTC (rev 20631) +++ trunk/reactos/ntoskrnl/ke/wait.c 2006-01-06 22:57:21 UTC (rev 20632) @@ -148,15 +148,11 @@ /* Setup the Wait Block */ CurrentThread->WaitBlockList = TimerWaitBlock; - TimerWaitBlock->Object = (PVOID)ThreadTimer; - TimerWaitBlock->Thread = CurrentThread; - TimerWaitBlock->WaitKey = (USHORT)STATUS_TIMEOUT; - TimerWaitBlock->WaitType = WaitAny; TimerWaitBlock->NextWaitBlock = TimerWaitBlock; /* Link the timer to this Wait Block */ - InitializeListHead(&ThreadTimer->Header.WaitListHead); - InsertTailList(&ThreadTimer->Header.WaitListHead, &TimerWaitBlock->WaitListEntry); + ThreadTimer->Header.WaitListHead.Flink = &TimerWaitBlock->WaitListEntry; + ThreadTimer->Header.WaitListHead.Blink = &TimerWaitBlock->WaitListEntry; /* Insert the Timer into the Timer Lists and enable it */ if (!KiInsertTimer(ThreadTimer, *Interval)) @@ -177,7 +173,7 @@ CurrentThread->Alertable = Alertable; CurrentThread->WaitMode = WaitMode; CurrentThread->WaitReason = DelayExecution; - CurrentThread->WaitTime = 0; + CurrentThread->WaitTime = ((PLARGE_INTEGER)&KeTickCount)->LowPart; CurrentThread->State = Waiting; /* Find a new thread to run */ @@ -336,16 +332,11 @@ WaitBlock->NextWaitBlock = TimerWaitBlock; /* Set up the Timer Wait Block */ - TimerWaitBlock->Object = (PVOID)ThreadTimer; - TimerWaitBlock->Thread = CurrentThread; - TimerWaitBlock->WaitKey = STATUS_TIMEOUT; - TimerWaitBlock->WaitType = WaitAny; TimerWaitBlock->NextWaitBlock = WaitBlock; /* Link the timer to this Wait Block */ - InitializeListHead(&ThreadTimer->Header.WaitListHead); - InsertTailList(&ThreadTimer->Header.WaitListHead, - &TimerWaitBlock->WaitListEntry); + ThreadTimer->Header.WaitListHead.Flink = &TimerWaitBlock->WaitListEntry; + ThreadTimer->Header.WaitListHead.Blink = &TimerWaitBlock->WaitListEntry; /* Insert the Timer into the Timer Lists and enable it */ if (!KiInsertTimer(ThreadTimer, *Timeout)) @@ -371,7 +362,7 @@ CurrentThread->Alertable = Alertable; CurrentThread->WaitMode = WaitMode; CurrentThread->WaitReason = WaitReason; - CurrentThread->WaitTime = 0; + CurrentThread->WaitTime = ((PLARGE_INTEGER)&KeTickCount)->LowPart; CurrentThread->State = Waiting; /* Find a new thread to run */ @@ -610,13 +601,9 @@ WaitBlock->NextWaitBlock = TimerWaitBlock; /* Set up the Timer Wait Block */ - TimerWaitBlock->Object = (PVOID)ThreadTimer; - TimerWaitBlock->Thread = CurrentThread; - TimerWaitBlock->WaitKey = STATUS_TIMEOUT; - TimerWaitBlock->WaitType = WaitAny; TimerWaitBlock->NextWaitBlock = WaitBlockArray; - /* Link the timer to this Wait Block */ + /* Initialize the list head */ InitializeListHead(&ThreadTimer->Header.WaitListHead); /* Insert the Timer into the Timer Lists and enable it */ @@ -655,7 +642,7 @@ CurrentThread->Alertable = Alertable; CurrentThread->WaitMode = WaitMode; CurrentThread->WaitReason = WaitReason; - CurrentThread->WaitTime = 0; + CurrentThread->WaitTime = ((PLARGE_INTEGER)&KeTickCount)->LowPart; CurrentThread->State = Waiting; /* Find a new thread to run */

1 0

[cwittich] 20631: buttons in page setup now working properly (for En and De only)
by cwittich＠svn.reactos.org 06 Jan '06

06 Jan '06

buttons in page setup now working properly (for En and De only) Modified: trunk/reactos/subsys/system/notepad/De.rc Modified: trunk/reactos/subsys/system/notepad/En.rc Modified: trunk/reactos/subsys/system/notepad/dialog.c _____ Modified: trunk/reactos/subsys/system/notepad/De.rc --- trunk/reactos/subsys/system/notepad/De.rc 2006-01-06 20:53:32 UTC (rev 20630) +++ trunk/reactos/subsys/system/notepad/De.rc 2006-01-06 22:41:42 UTC (rev 20631) @@ -95,8 +95,8 @@ LTEXT "&Unten:", 0x14E,100, 73, 30, 10, WS_CHILD EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150, 130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP -DEFPUSHBUTTON "OK", 0x151, 180, 3, 40, 15, WS_TABSTOP -PUSHBUTTON "Abbrechen", 0x152, 180, 21, 40, 15, WS_TABSTOP +DEFPUSHBUTTON "OK", IDOK, 180, 3, 40, 15, WS_TABSTOP +PUSHBUTTON "Abbrechen", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP PUSHBUTTON "&Hilfe", 0x153, 180, 39, 40, 15, WS_TABSTOP } _____ Modified: trunk/reactos/subsys/system/notepad/En.rc --- trunk/reactos/subsys/system/notepad/En.rc 2006-01-06 20:53:32 UTC (rev 20630) +++ trunk/reactos/subsys/system/notepad/En.rc 2006-01-06 22:41:42 UTC (rev 20631) @@ -97,8 +97,8 @@ LTEXT "&Bottom:", 0x14E,100, 73, 30, 10, WS_CHILD EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150, 130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP -DEFPUSHBUTTON "OK", 0x151, 180, 3, 40, 15, WS_TABSTOP -PUSHBUTTON "Cancel", 0x152, 180, 21, 40, 15, WS_TABSTOP +DEFPUSHBUTTON "OK", IDOK, 180, 3, 40, 15, WS_TABSTOP +PUSHBUTTON "Cancel", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP PUSHBUTTON "&Help", 0x153, 180, 39, 40, 15, WS_TABSTOP } _____ Modified: trunk/reactos/subsys/system/notepad/dialog.c --- trunk/reactos/subsys/system/notepad/dialog.c 2006-01-06 20:53:32 UTC (rev 20630) +++ trunk/reactos/subsys/system/notepad/dialog.c 2006-01-06 22:41:42 UTC (rev 20631) @@ -847,51 +847,54 @@ static INT_PTR WINAPI DIALOG_PAGESETUP_DlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam) { - switch (msg) + switch (msg) { case WM_COMMAND: - switch (wParam) + if (HIWORD(wParam) == BN_CLICKED) { - case IDOK: - /* save user input and close dialog */ - GetDlgItemText(hDlg, 0x141, Globals.szHeader, SIZEOF(Globals.szHeader)); - GetDlgItemText(hDlg, 0x143, Globals.szFooter, SIZEOF(Globals.szFooter)); - GetDlgItemText(hDlg, 0x14A, Globals.szMarginTop, SIZEOF(Globals.szMarginTop)); - GetDlgItemText(hDlg, 0x150, Globals.szMarginBottom, SIZEOF(Globals.szMarginBottom)); - GetDlgItemText(hDlg, 0x147, Globals.szMarginLeft, SIZEOF(Globals.szMarginLeft)); - GetDlgItemText(hDlg, 0x14D, Globals.szMarginRight, SIZEOF(Globals.szMarginRight)); - EndDialog(hDlg, IDOK); - return TRUE; + switch (LOWORD(wParam)) + { + case IDOK: + /* save user input and close dialog */ + GetDlgItemText(hDlg, 0x141, Globals.szHeader, SIZEOF(Globals.szHeader)); + GetDlgItemText(hDlg, 0x143, Globals.szFooter, SIZEOF(Globals.szFooter)); + GetDlgItemText(hDlg, 0x14A, Globals.szMarginTop, SIZEOF(Globals.szMarginTop)); + GetDlgItemText(hDlg, 0x150, Globals.szMarginBottom, SIZEOF(Globals.szMarginBottom)); + GetDlgItemText(hDlg, 0x147, Globals.szMarginLeft, SIZEOF(Globals.szMarginLeft)); + GetDlgItemText(hDlg, 0x14D, Globals.szMarginRight, SIZEOF(Globals.szMarginRight)); + EndDialog(hDlg, IDOK); + return TRUE; - case IDCANCEL: - /* discard user input and close dialog */ - EndDialog(hDlg, IDCANCEL); - return TRUE; + case IDCANCEL: + /* discard user input and close dialog */ + EndDialog(hDlg, IDCANCEL); + return TRUE; - case IDHELP: - { - /* FIXME: Bring this to work */ - static const WCHAR sorryW[] = { 'S','o','r','r','y',',',' ','n','o',' ','h','e','l','p',' ','a','v','a','i','l','a','b','l','e',0 }; - static const WCHAR helpW[] = { 'H','e','l','p',0 }; - MessageBox(Globals.hMainWnd, sorryW, helpW, MB_ICONEXCLAMATION); - return TRUE; - } + case IDHELP: + { + /* FIXME: Bring this to work */ + static const WCHAR sorryW[] = { 'S','o','r','r','y',',',' ','n','o',' ','h','e','l','p',' ','a','v','a','i','l','a','b','l','e',0 }; + static const WCHAR helpW[] = { 'H','e','l','p',0 }; + MessageBox(Globals.hMainWnd, sorryW, helpW, MB_ICONEXCLAMATION); + return TRUE; + } - default: - break; + default: + break; + } } - break; + break; case WM_INITDIALOG: - /* fetch last user input prior to display dialog */ - SetDlgItemText(hDlg, 0x141, Globals.szHeader); - SetDlgItemText(hDlg, 0x143, Globals.szFooter); - SetDlgItemText(hDlg, 0x14A, Globals.szMarginTop); - SetDlgItemText(hDlg, 0x150, Globals.szMarginBottom); - SetDlgItemText(hDlg, 0x147, Globals.szMarginLeft); - SetDlgItemText(hDlg, 0x14D, Globals.szMarginRight); - break; + /* fetch last user input prior to display dialog */ + SetDlgItemText(hDlg, 0x141, Globals.szHeader); + SetDlgItemText(hDlg, 0x143, Globals.szFooter); + SetDlgItemText(hDlg, 0x14A, Globals.szMarginTop); + SetDlgItemText(hDlg, 0x150, Globals.szMarginBottom); + SetDlgItemText(hDlg, 0x147, Globals.szMarginLeft); + SetDlgItemText(hDlg, 0x14D, Globals.szMarginRight); + break; } - return FALSE; + return FALSE; }

1 0

[gvg] 20630: Update status
by gvg＠svn.reactos.org 06 Jan '06

06 Jan '06

Update status Modified: trunk/reactos/media/doc/README.WINE _____ Modified: trunk/reactos/media/doc/README.WINE --- trunk/reactos/media/doc/README.WINE 2006-01-06 20:49:27 UTC (rev 20629) +++ trunk/reactos/media/doc/README.WINE 2006-01-06 20:53:32 UTC (rev 20630) @@ -26,56 +26,56 @@ work to import a new dll. The following build tools are shared with Wine. -reactos/tools/unicode # Synced to Wine-0_9_4 -reactos/tools/wpp # Synced to Wine-0_9_4 +reactos/tools/unicode # Synced to Wine-0_9_5 +reactos/tools/wpp # Synced to Wine-0_9_5 reactos/tools/bin2res # Resource to binary converter -reactos/tools/winebuild # Synced to Wine-0_9_4 -reactos/tools/wmc # Synced to Wine-0_9_4 -reactos/tools/wrc # Synced to Wine-0_9_4 +reactos/tools/winebuild # Synced to Wine-0_9_5 +reactos/tools/wmc # Synced to Wine-0_9_5 +reactos/tools/wrc # Synced to Wine-0_9_5 reactos/tools/widl # Forked at Wine-20050930 The following libraries are shared with Wine. -reactos/lib/avifil32 # Synced to Wine-0_9_4 -reactos/lib/cabinet # Synced to Wine-0_9_4 -reactos/lib/comctl32 # Synced to Wine-0_9_4 -reactos/lib/comdlg32 # Synced to Wine-0_9_4 -reactos/lib/crypt32 # Synced to Wine-0_9_4 +reactos/lib/avifil32 # Synced to Wine-0_9_5 +reactos/lib/cabinet # Synced to Wine-0_9_5 +reactos/lib/comctl32 # Synced to Wine-0_9_5 +reactos/lib/comdlg32 # Synced to Wine-0_9_5 +reactos/lib/crypt32 # Synced to Wine-0_9_5 reactos/lib/dbghelp # -reactos/lib/dinput # Synced to Wine-0_9_4 -reactos/lib/dinput8 # Synced to Wine-0_9_4 -reactos/lib/dplay # Synced to Wine-0_9_4 -reactos/lib/dplayx # Synced to Wine-0_9_4 -reactos/lib/dxdiagn # Synced to Wine-0_9_4 -reactos/lib/icmp # Synced to Wine-0_9_4 -reactos/lib/imm32 # Synced to Wine-0_9_4 +reactos/lib/dinput # Synced to Wine-0_9_5 +reactos/lib/dinput8 # Synced to Wine-0_9_5 +reactos/lib/dplay # Synced to Wine-0_9_5 +reactos/lib/dplayx # Synced to Wine-0_9_5 +reactos/lib/dxdiagn # Synced to Wine-0_9_5 +reactos/lib/icmp # Synced to Wine-0_9_5 +reactos/lib/imm32 # Synced to Wine-0_9_5 reactos/lib/iphlpapi # Out of sync reactos/lib/imagehlp # Patches for BindImage need review and submission to winehq. reactos/lib/msvcrt20 # Out of sync -reactos/lib/mpr # Synced to Wine-0_9_4 +reactos/lib/mpr # Synced to Wine-0_9_5 reactos/lib/msacm # Out of sync -reactos/lib/msimg32 # Synced to Wine-0_9_4 -reactos/lib/msi # Synced to Wine-0_9_4 +reactos/lib/msimg32 # Synced to Wine-0_9_5 +reactos/lib/msi # Synced to Wine-0_9_5 reactos/lib/msvideo # Out of sync -reactos/lib/netapi32 # Synced to Wine-0_9_4 -reactos/lib/objsel # Synced to Wine-0_9_4 +reactos/lib/netapi32 # Synced to Wine-0_9_5 +reactos/lib/objsel # Synced to Wine-0_9_5 reactos/lib/odbc32 # Out of sync. Depends on port of Linux ODBC. -reactos/lib/ole32 # Synced to Wine-0_9_4 -reactos/lib/oleacc # Synced to Wine-0_9_4 -reactos/lib/oleaut32 # Synced to Wine-0_9_4 -reactos/lib/oledlg # Synced to Wine-0_9_4 -reactos/lib/olepro32 # Synced to Wine-0_9_4 -reactos/lib/riched20 # Synced to Wine-0_9_4 -reactos/lib/richedit # Synced to Wine-0_9_4 -reactos/lib/rpcrt4 # Synced to Wine-0_9_4 +reactos/lib/ole32 # Synced to Wine-0_9_5 +reactos/lib/oleacc # Synced to Wine-0_9_5 +reactos/lib/oleaut32 # Synced to Wine-0_9_5 +reactos/lib/oledlg # Synced to Wine-0_9_5 +reactos/lib/olepro32 # Synced to Wine-0_9_5 +reactos/lib/riched20 # Synced to Wine-0_9_5 +reactos/lib/richedit # Synced to Wine-0_9_5 +reactos/lib/rpcrt4 # Synced to Wine-0_9_5 reactos/lib/setupapi # Forked at Wine-20050524 -reactos/lib/shell32 # Synced to Wine-0_9_4 -reactos/lib/shdocvw # Synced to Wine-0_9_4 -reactos/lib/shfolder # Synced to Wine-0_9_4 -reactos/lib/shlwapi # Synced to Wine-0_9_4 +reactos/lib/shell32 # Synced to Wine-0_9_5 +reactos/lib/shdocvw # Synced to Wine-0_9_5 +reactos/lib/shfolder # Synced to Wine-0_9_5 +reactos/lib/shlwapi # Synced to Wine-0_9_5 reactos/lib/twain # Out of sync -reactos/lib/urlmon # Synced to Wine-0_9_4 -reactos/lib/uxtheme # Synced to Wine-0_9_4 +reactos/lib/urlmon # Synced to Wine-0_9_5 +reactos/lib/uxtheme # Synced to Wine-0_9_5 reactos/lib/version # Out of sync reactos/lib/wininet # Out of sync reactos/lib/winmm # Forked at Wine-20050628

1 0

[gvg] 20629: Tag Wine-0_9_5, remove old tag
by gvg＠svn.reactos.org 06 Jan '06

06 Jan '06

Tag Wine-0_9_5, remove old tag Deleted: vendor/wine/dlls/avifil32/Wine-0_9_4/ Added: vendor/wine/dlls/avifil32/Wine-0_9_5/ Deleted: vendor/wine/dlls/cabinet/Wine-0_9_4/ Added: vendor/wine/dlls/cabinet/Wine-0_9_5/ Deleted: vendor/wine/dlls/comctl32/Wine-0_9_4/ Added: vendor/wine/dlls/comctl32/Wine-0_9_5/ Deleted: vendor/wine/dlls/comctl32/Wine-0_9_5/comctl32undoc.c Added: vendor/wine/dlls/comctl32/Wine-0_9_5/comctl32undoc.c Deleted: vendor/wine/dlls/comctl32/Wine-0_9_5/ipaddress.c Added: vendor/wine/dlls/comctl32/Wine-0_9_5/ipaddress.c Deleted: vendor/wine/dlls/comctl32/Wine-0_9_5/listview.c Added: vendor/wine/dlls/comctl32/Wine-0_9_5/listview.c Deleted: vendor/wine/dlls/comctl32/Wine-0_9_5/propsheet.c Added: vendor/wine/dlls/comctl32/Wine-0_9_5/propsheet.c Deleted: vendor/wine/dlls/commdlg/Wine-0_9_4/ Added: vendor/wine/dlls/commdlg/Wine-0_9_5/ Deleted: vendor/wine/dlls/commdlg/Wine-0_9_5/colordlg.c Added: vendor/wine/dlls/commdlg/Wine-0_9_5/colordlg.c Deleted: vendor/wine/dlls/crypt32/Wine-0_9_4/ Added: vendor/wine/dlls/crypt32/Wine-0_9_5/ Deleted: vendor/wine/dlls/dinput/Wine-0_9_4/ Added: vendor/wine/dlls/dinput/Wine-0_9_5/ Deleted: vendor/wine/dlls/dinput8/Wine-0_9_4/ Added: vendor/wine/dlls/dinput8/Wine-0_9_5/ Deleted: vendor/wine/dlls/dplay/Wine-0_9_4/ Added: vendor/wine/dlls/dplay/Wine-0_9_5/ Deleted: vendor/wine/dlls/dplayx/Wine-0_9_4/ Added: vendor/wine/dlls/dplayx/Wine-0_9_5/ Deleted: vendor/wine/dlls/dsound/Wine-0_9_4/ Added: vendor/wine/dlls/dsound/Wine-0_9_5/ Deleted: vendor/wine/dlls/dsound/Wine-0_9_5/buffer.c Added: vendor/wine/dlls/dsound/Wine-0_9_5/buffer.c Deleted: vendor/wine/dlls/dsound/Wine-0_9_5/capture.c Added: vendor/wine/dlls/dsound/Wine-0_9_5/capture.c Deleted: vendor/wine/dlls/dsound/Wine-0_9_5/dsound.c Added: vendor/wine/dlls/dsound/Wine-0_9_5/dsound.c Deleted: vendor/wine/dlls/dsound/Wine-0_9_5/dsound_private.h Added: vendor/wine/dlls/dsound/Wine-0_9_5/dsound_private.h Deleted: vendor/wine/dlls/dsound/Wine-0_9_5/primary.c Added: vendor/wine/dlls/dsound/Wine-0_9_5/primary.c Deleted: vendor/wine/dlls/dsound/Wine-0_9_5/propset.c Added: vendor/wine/dlls/dsound/Wine-0_9_5/propset.c Deleted: vendor/wine/dlls/dsound/Wine-0_9_5/sound3d.c Added: vendor/wine/dlls/dsound/Wine-0_9_5/sound3d.c Deleted: vendor/wine/dlls/dxdiagn/Wine-0_9_4/ Added: vendor/wine/dlls/dxdiagn/Wine-0_9_5/ Deleted: vendor/wine/dlls/icmp/Wine-0_9_4/ Added: vendor/wine/dlls/icmp/Wine-0_9_5/ Deleted: vendor/wine/dlls/imm32/Wine-0_9_4/ Added: vendor/wine/dlls/imm32/Wine-0_9_5/ Deleted: vendor/wine/dlls/midimap/Wine-0_9_4/ Added: vendor/wine/dlls/midimap/Wine-0_9_5/ Deleted: vendor/wine/dlls/mpr/Wine-0_9_4/ Added: vendor/wine/dlls/mpr/Wine-0_9_5/ Deleted: vendor/wine/dlls/msi/Wine-0_9_4/ Added: vendor/wine/dlls/msi/Wine-0_9_5/ Deleted: vendor/wine/dlls/msi/Wine-0_9_5/action.c Added: vendor/wine/dlls/msi/Wine-0_9_5/action.c Deleted: vendor/wine/dlls/msi/Wine-0_9_5/custom.c Added: vendor/wine/dlls/msi/Wine-0_9_5/custom.c Deleted: vendor/wine/dlls/msi/Wine-0_9_5/dialog.c Added: vendor/wine/dlls/msi/Wine-0_9_5/dialog.c Deleted: vendor/wine/dlls/msi/Wine-0_9_5/events.c Added: vendor/wine/dlls/msi/Wine-0_9_5/events.c Deleted: vendor/wine/dlls/msi/Wine-0_9_5/install.c Added: vendor/wine/dlls/msi/Wine-0_9_5/install.c Deleted: vendor/wine/dlls/msi/Wine-0_9_5/msi.c Added: vendor/wine/dlls/msi/Wine-0_9_5/msi.c Deleted: vendor/wine/dlls/msi/Wine-0_9_5/msi.spec Added: vendor/wine/dlls/msi/Wine-0_9_5/msi.spec Deleted: vendor/wine/dlls/msi/Wine-0_9_5/msipriv.h Added: vendor/wine/dlls/msi/Wine-0_9_5/msipriv.h Deleted: vendor/wine/dlls/msi/Wine-0_9_5/msiquery.c Added: vendor/wine/dlls/msi/Wine-0_9_5/msiquery.c Deleted: vendor/wine/dlls/msi/Wine-0_9_5/package.c Added: vendor/wine/dlls/msi/Wine-0_9_5/package.c Deleted: vendor/wine/dlls/msimg32/Wine-0_9_4/ Added: vendor/wine/dlls/msimg32/Wine-0_9_5/ Deleted: vendor/wine/dlls/netapi32/Wine-0_9_4/ Added: vendor/wine/dlls/netapi32/Wine-0_9_5/ Deleted: vendor/wine/dlls/objsel/Wine-0_9_4/ Added: vendor/wine/dlls/objsel/Wine-0_9_5/ Deleted: vendor/wine/dlls/ole32/Wine-0_9_4/ Added: vendor/wine/dlls/ole32/Wine-0_9_5/ Deleted: vendor/wine/dlls/ole32/Wine-0_9_5/hglobalstream.c Added: vendor/wine/dlls/ole32/Wine-0_9_5/hglobalstream.c Deleted: vendor/wine/dlls/ole32/Wine-0_9_5/stg_stream.c Added: vendor/wine/dlls/ole32/Wine-0_9_5/stg_stream.c Deleted: vendor/wine/dlls/oleacc/Wine-0_9_4/ Added: vendor/wine/dlls/oleacc/Wine-0_9_5/ Deleted: vendor/wine/dlls/oleaut32/Wine-0_9_4/ Added: vendor/wine/dlls/oleaut32/Wine-0_9_5/ Deleted: vendor/wine/dlls/oleaut32/Wine-0_9_5/typelib.c Added: vendor/wine/dlls/oleaut32/Wine-0_9_5/typelib.c Deleted: vendor/wine/dlls/oledlg/Wine-0_9_4/ Added: vendor/wine/dlls/oledlg/Wine-0_9_5/ Deleted: vendor/wine/dlls/olepro32/Wine-0_9_4/ Added: vendor/wine/dlls/olepro32/Wine-0_9_5/ Deleted: vendor/wine/dlls/riched20/Wine-0_9_4/ Added: vendor/wine/dlls/riched20/Wine-0_9_5/ [truncated at 100 lines; 88 more skipped] _____ Copied: vendor/wine/dlls/avifil32/Wine-0_9_5 (from rev 20612, vendor/wine/dlls/avifil32/current) _____ Copied: vendor/wine/dlls/cabinet/Wine-0_9_5 (from rev 20612, vendor/wine/dlls/cabinet/current) _____ Copied: vendor/wine/dlls/comctl32/Wine-0_9_5 (from rev 20612, vendor/wine/dlls/comctl32/current) _____ Deleted: vendor/wine/dlls/comctl32/Wine-0_9_5/comctl32undoc.c --- vendor/wine/dlls/comctl32/current/comctl32undoc.c 2006-01-06 15:42:12 UTC (rev 20612) +++ vendor/wine/dlls/comctl32/Wine-0_9_5/comctl32undoc.c 2006-01-06 20:49:27 UTC (rev 20629) @@ -1,1245 +0,0 @@ -/* - * Undocumented functions from COMCTL32.DLL - * - * Copyright 1998 Eric Kohl - * 1998 Juergen Schmied <j.schmied(a)metronet.de> - * 2000 Eric Kohl for CodeWeavers - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * NOTES - * All of these functions are UNDOCUMENTED!! And I mean UNDOCUMENTED!!!! - * Do NOT rely on names or contents of undocumented structures and types!!! - * These functions are used by EXPLORER.EXE, IEXPLORE.EXE and - * COMCTL32.DLL (internally). - * - */ -#include "config.h" -#include "wine/port.h" - -#include <stdarg.h> -#include <string.h> -#include <ctype.h> -#include <limits.h> - -#define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "winnls.h" -#include "winreg.h" -#include "commctrl.h" -#include "objbase.h" -#include "winerror.h" - -#include "wine/unicode.h" -#include "comctl32.h" - -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(commctrl); - -static const WCHAR strMRUList[] = { 'M','R','U','L','i','s','t',0 }; - -/********************************************************************** **** - * Alloc [COMCTL32.71] - * - * Allocates memory block from the dll's private heap - * - * PARAMS - * dwSize [I] size of the allocated memory block - * - * RETURNS - * Success: pointer to allocated memory block - * Failure: NULL - */ -LPVOID WINAPI Alloc (DWORD dwSize) -{ - return LocalAlloc( LMEM_ZEROINIT, dwSize ); -} - - -/********************************************************************** **** - * ReAlloc [COMCTL32.72] - * - * Changes the size of an allocated memory block or allocates a memory - * block using the dll's private heap. - * - * PARAMS - * lpSrc [I] pointer to memory block which will be resized - * dwSize [I] new size of the memory block. - * - * RETURNS - * Success: pointer to the resized memory block - * Failure: NULL - * - * NOTES - * If lpSrc is a NULL-pointer, then ReAlloc allocates a memory - * block like Alloc. - */ -LPVOID WINAPI ReAlloc (LPVOID lpSrc, DWORD dwSize) -{ - if (lpSrc) - return LocalReAlloc( lpSrc, dwSize, LMEM_ZEROINIT ); - else - return LocalAlloc( LMEM_ZEROINIT, dwSize); -} - - -/********************************************************************** **** - * Free [COMCTL32.73] - * - * Frees an allocated memory block from the dll's private heap. - * - * PARAMS - * lpMem [I] pointer to memory block which will be freed - * - * RETURNS - * Success: TRUE - * Failure: FALSE - */ -BOOL WINAPI Free (LPVOID lpMem) -{ - return !LocalFree( lpMem ); -} - - -/********************************************************************** **** - * GetSize [COMCTL32.74] - * - * Retrieves the size of the specified memory block from the dll's - * private heap. - * - * PARAMS - * lpMem [I] pointer to an allocated memory block - * - * RETURNS - * Success: size of the specified memory block - * Failure: 0 - */ -DWORD WINAPI GetSize (LPVOID lpMem) -{ - return LocalSize( lpMem ); -} - - -/********************************************************************** **** - * MRU-Functions {COMCTL32} - * - * NOTES - * The MRU-Api is a set of functions to manipulate lists of M.R.U. (Most Recently - * Used) items. It is an undocumented Api that is used (at least) by the shell - * and explorer to implement their recent documents feature. - * - * Since these functions are undocumented, they are unsupported by MS and - * may change at any time. - * - * Internally, the list is implemented as a last in, last out list of items - * persisted into the system registry under a caller chosen key. Each list - * item is given a one character identifier in the Ascii range from 'a' to - * '}'. A list of the identifiers in order from newest to oldest is stored - * under the same key in a value named "MRUList". - * - * Items are re-ordered by changing the order of the values in the MRUList - * value. When a new item is added, it becomes the new value of the oldest - * identifier, and that identifier is moved to the front of the MRUList value. - * - * Wine stores MRU-lists in the same registry format as Windows, so when - * switching between the builtin and native comctl32.dll no problems or - * incompatibilities should occur. - * - * The following undocumented structure is used to create an MRU-list: - *|typedef INT (CALLBACK *MRUStringCmpFn)(LPCTSTR lhs, LPCTSTR rhs); - *|typedef INT (CALLBACK *MRUBinaryCmpFn)(LPCVOID lhs, LPCVOID rhs, DWORD length); - *| - *|typedef struct tagCREATEMRULIST - *|{ - *| DWORD cbSize; - *| DWORD nMaxItems; - *| DWORD dwFlags; - *| HKEY hKey; - *| LPCTSTR lpszSubKey; - *| PROC lpfnCompare; - *|} CREATEMRULIST, *LPCREATEMRULIST; - * - * MEMBERS - * cbSize [I] The size of the CREATEMRULIST structure. This must be set - * to sizeof(CREATEMRULIST) by the caller. - * nMaxItems [I] The maximum number of items allowed in the list. Because - * of the limited number of identifiers, this should be set to - * a value from 1 to 30 by the caller. - * dwFlags [I] If bit 0 is set, the list will be used to store binary - * data, otherwise it is assumed to store strings. If bit 1 - * is set, every change made to the list will be reflected in - * the registry immediately, otherwise changes will only be - * written when the list is closed. - * hKey [I] The registry key that the list should be written under. - * This must be supplied by the caller. - * lpszSubKey [I] A caller supplied name of a subkey under hKey to write - * the list to. This may not be blank. - * lpfnCompare [I] A caller supplied comparison function, which may be either - * an MRUStringCmpFn if dwFlags does not have bit 0 set, or a - * MRUBinaryCmpFn otherwise. - * - * FUNCTIONS - * - Create an MRU-list with CreateMRUList() or CreateMRUListLazy(). - * - Add items to an MRU-list with AddMRUString() or AddMRUData(). - * - Remove items from an MRU-list with DelMRUString(). - * - Find data in an MRU-list with FindMRUString() or FindMRUData(). - * - Iterate through an MRU-list with EnumMRUList(). - * - Free an MRU-list with FreeMRUList(). - */ - -typedef struct tagCREATEMRULISTA -{ - DWORD cbSize; - DWORD nMaxItems; - DWORD dwFlags; - HKEY hKey; - LPCSTR lpszSubKey; - PROC lpfnCompare; -} CREATEMRULISTA, *LPCREATEMRULISTA; - -typedef struct tagCREATEMRULISTW -{ - DWORD cbSize; - DWORD nMaxItems; - DWORD dwFlags; - HKEY hKey; - LPCWSTR lpszSubKey; - PROC lpfnCompare; -} CREATEMRULISTW, *LPCREATEMRULISTW; - -/* dwFlags */ -#define MRUF_STRING_LIST 0 /* list will contain strings */ -#define MRUF_BINARY_LIST 1 /* list will contain binary data */ -#define MRUF_DELAYED_SAVE 2 /* only save list order to reg. is FreeMRUList */ - -/* If list is a string list lpfnCompare has the following prototype - * int CALLBACK MRUCompareString(LPCSTR s1, LPCSTR s2) - * for binary lists the prototype is - * int CALLBACK MRUCompareBinary(LPCVOID data1, LPCVOID data2, DWORD cbData) - * where cbData is the no. of bytes to compare. - * Need to check what return value means identical - 0? - */ - -typedef struct tagWINEMRUITEM -{ - DWORD size; /* size of data stored */ - DWORD itemFlag; /* flags */ - BYTE datastart; -} WINEMRUITEM, *LPWINEMRUITEM; - -/* itemFlag */ -#define WMRUIF_CHANGED 0x0001 /* this dataitem changed */ - -typedef struct tagWINEMRULIST -{ - CREATEMRULISTW extview; /* original create information */ - BOOL isUnicode; /* is compare fn Unicode */ - DWORD wineFlags; /* internal flags */ - DWORD cursize; /* current size of realMRU */ - LPWSTR realMRU; /* pointer to string of index names */ - LPWINEMRUITEM *array; /* array of pointers to data */ - /* in 'a' to 'z' order */ -} WINEMRULIST, *LPWINEMRULIST; - -/* wineFlags */ -#define WMRUF_CHANGED 0x0001 /* MRU list has changed */ - -/********************************************************************** **** - * MRU_SaveChanged (internal) - * - * Local MRU saving code - */ -static void MRU_SaveChanged ( LPWINEMRULIST mp ) -{ - UINT i, err; - HKEY newkey; - WCHAR realname[2]; - LPWINEMRUITEM witem; - - /* or should we do the following instead of RegOpenKeyEx: - */ - - /* open the sub key */ - if ((err = RegOpenKeyExW( mp->extview.hKey, mp->extview.lpszSubKey, - 0, KEY_WRITE, &newkey))) { - /* not present - what to do ??? */ - ERR("Could not open key, error=%d, attempting to create\n", - err); - if ((err = RegCreateKeyExW( mp->extview.hKey, mp->extview.lpszSubKey, - 0, - NULL, - REG_OPTION_NON_VOLATILE, - KEY_READ | KEY_WRITE, - 0, - &newkey, - 0))) { - ERR("failed to create key /%s/, err=%d\n", - debugstr_w(mp->extview.lpszSubKey), err); - return; - } - } - if (mp->wineFlags & WMRUF_CHANGED) { - mp->wineFlags &= ~WMRUF_CHANGED; - err = RegSetValueExW(newkey, strMRUList, 0, REG_SZ, (LPBYTE)mp->realMRU, - (strlenW(mp->realMRU) + 1)*sizeof(WCHAR)); - if (err) { - ERR("error saving MRUList, err=%d\n", err); - } - TRACE("saving MRUList=/%s/\n", debugstr_w(mp->realMRU)); - } - realname[1] = 0; - for(i=0; i<mp->cursize; i++) { - witem = mp->array[i]; - if (witem->itemFlag & WMRUIF_CHANGED) { - witem->itemFlag &= ~WMRUIF_CHANGED; - realname[0] = 'a' + i; - err = RegSetValueExW(newkey, realname, 0, - (mp->extview.dwFlags & MRUF_BINARY_LIST) ? - REG_BINARY : REG_SZ, - &witem->datastart, witem->size); - if (err) { - ERR("error saving /%s/, err=%d\n", debugstr_w(realname), err); - } - TRACE("saving value for name /%s/ size=%ld\n", - debugstr_w(realname), witem->size); - } - } - RegCloseKey( newkey ); -} - -/********************************************************************** **** - * FreeMRUList [COMCTL32.152] - * - * Frees a most-recently-used items list. - * - * PARAMS - * hMRUList [I] Handle to list. - * - * RETURNS - * Nothing. - */ -void WINAPI FreeMRUList (HANDLE hMRUList) -{ - LPWINEMRULIST mp = (LPWINEMRULIST)hMRUList; - UINT i; - - TRACE("(%p)\n", hMRUList); - if (!hMRUList) - return; - - if (mp->wineFlags & WMRUF_CHANGED) { - /* need to open key and then save the info */ - MRU_SaveChanged( mp ); - } - - for(i=0; i<mp->extview.nMaxItems; i++) { - if (mp->array[i]) - Free(mp->array[i]); - } - Free(mp->realMRU); - Free(mp->array); - Free((LPWSTR)mp->extview.lpszSubKey); - Free(mp); -} - - -/********************************************************************** **** - * FindMRUData [COMCTL32.169] - * - * Searches binary list for item that matches lpData of length cbData. - * Returns position in list order 0 -> MRU and if lpRegNum != NULL then value - * corresponding to item's reg. name will be stored in it ('a' -> 0). - * - * PARAMS - * hList [I] list handle - * lpData [I] data to find - * cbData [I] length of data - * lpRegNum [O] position in registry (maybe NULL) - * - * RETURNS - * Position in list 0 -> MRU. -1 if item not found. - */ -INT WINAPI FindMRUData (HANDLE hList, LPCVOID lpData, DWORD cbData, - LPINT lpRegNum) -{ - LPWINEMRULIST mp = (LPWINEMRULIST)hList; - INT ret; - UINT i; - LPSTR dataA = NULL; - - if (!mp->extview.lpfnCompare) { - ERR("MRU list not properly created. No compare procedure.\n"); - return -1; - } - - if(!(mp->extview.dwFlags & MRUF_BINARY_LIST) && !mp->isUnicode) { - DWORD len = WideCharToMultiByte(CP_ACP, 0, lpData, -1, - NULL, 0, NULL, NULL); - dataA = Alloc(len); - WideCharToMultiByte(CP_ACP, 0, lpData, -1, dataA, len, NULL, NULL); - } - - for(i=0; i<mp->cursize; i++) { - if (mp->extview.dwFlags & MRUF_BINARY_LIST) { - if (!mp->extview.lpfnCompare(lpData, &mp->array[i]->datastart, - cbData)) - break; - } - else { - if(mp->isUnicode) { - if (!mp->extview.lpfnCompare(lpData, &mp->array[i]->datastart)) - break; - } else { - DWORD len = WideCharToMultiByte(CP_ACP, 0, - (LPWSTR)&mp->array[i]->datastart, -1, - NULL, 0, NULL, NULL); - LPSTR itemA = Alloc(len); - INT cmp; - WideCharToMultiByte(CP_ACP, 0, (LPWSTR)&mp->array[i]->datastart, -1, - itemA, len, NULL, NULL); - - cmp = mp->extview.lpfnCompare(dataA, itemA); - Free(itemA); - if(!cmp) - break; - } - } - } - if(dataA) - Free(dataA); - if (i < mp->cursize) - ret = i; - else - ret = -1; - if (lpRegNum && (ret != -1)) - *lpRegNum = 'a' + i; - - TRACE("(%p, %p, %ld, %p) returning %d\n", - hList, lpData, cbData, lpRegNum, ret); - - return ret; -} - - -/********************************************************************** **** - * AddMRUData [COMCTL32.167] - * - * Add item to MRU binary list. If item already exists in list then it is - * simply moved up to the top of the list and not added again. If list is - * full then the least recently used item is removed to make room. - * - * PARAMS - * hList [I] Handle to list. - * lpData [I] ptr to data to add. - * cbData [I] no. of bytes of data. - * - * RETURNS - * No. corresponding to registry name where value is stored 'a' -> 0 etc. - * -1 on error. - */ -INT WINAPI AddMRUData (HANDLE hList, LPCVOID lpData, DWORD cbData) -{ - LPWINEMRULIST mp = (LPWINEMRULIST)hList; - LPWINEMRUITEM witem; - INT i, replace; - - if ((replace = FindMRUData (hList, lpData, cbData, NULL)) >= 0) { - /* Item exists, just move it to the front */ - LPWSTR pos = strchrW(mp->realMRU, replace + 'a'); - while (pos > mp->realMRU) - { - pos[0] = pos[-1]; - pos--; - } - } - else { - /* either add a new entry or replace oldest */ - if (mp->cursize < mp->extview.nMaxItems) { - /* Add in a new item */ - replace = mp->cursize; - mp->cursize++; - } - else { - /* get the oldest entry and replace data */ - replace = mp->realMRU[mp->cursize - 1] - 'a'; - Free(mp->array[replace]); - } - - /* Allocate space for new item and move in the data */ - mp->array[replace] = witem = Alloc(cbData + sizeof(WINEMRUITEM)); - witem->itemFlag |= WMRUIF_CHANGED; - witem->size = cbData; - memcpy( &witem->datastart, lpData, cbData); - - /* now rotate MRU list */ - for(i=mp->cursize-1; i>=1; i--) - mp->realMRU[i] = mp->realMRU[i-1]; - } - - /* The new item gets the front spot */ - mp->wineFlags |= WMRUF_CHANGED; - mp->realMRU[0] = replace + 'a'; - - TRACE("(%p, %p, %ld) adding data, /%c/ now most current\n", - hList, lpData, cbData, replace+'a'); - - if (!(mp->extview.dwFlags & MRUF_DELAYED_SAVE)) { - /* save changed stuff right now */ - MRU_SaveChanged( mp ); - } - - return replace; -} - -/********************************************************************** **** - * AddMRUStringW [COMCTL32.401] - * - * Add an item to an MRU string list. - * - * PARAMS - * hList [I] Handle to list. - * lpszString [I] The string to add. - * - * RETURNS - * Success: The number corresponding to the registry name where the string - * has been stored (0 maps to 'a', 1 to 'b' and so on). - * Failure: -1, if hList is NULL or memory allocation fails. If lpszString - * is invalid, the function returns 0, and GetLastError() returns - * ERROR_INVALID_PARAMETER. The last error value is set only in - * this case. - * - * NOTES - * -If lpszString exists in the list already, it is moved to the top of the - * MRU list (it is not duplicated). - * -If the list is full the least recently used list entry is replaced with - * lpszString. - * -If this function returns 0 you should check the last error value to - * ensure the call really succeeded. - */ -INT WINAPI AddMRUStringW(HANDLE hList, LPCWSTR lpszString) -{ - TRACE("(%p,%s)\n", hList, debugstr_w(lpszString)); - - if (!hList) - return -1; - - if (!lpszString || IsBadStringPtrW(lpszString, -1)) - { - SetLastError(ERROR_INVALID_PARAMETER); - return 0; - } - - return AddMRUData(hList, lpszString, - (strlenW(lpszString) + 1) * sizeof(WCHAR)); -} - -/********************************************************************** **** - * AddMRUStringA [COMCTL32.153] - * - * See AddMRUStringW. - */ -INT WINAPI AddMRUStringA(HANDLE hList, LPCSTR lpszString) -{ - DWORD len; - LPWSTR stringW; - INT ret; - - TRACE("(%p,%s)\n", hList, debugstr_a(lpszString)); - - if (!hList) - return -1; - - if (IsBadStringPtrA(lpszString, -1)) - { - SetLastError(ERROR_INVALID_PARAMETER); - return 0; - } - - len = MultiByteToWideChar(CP_ACP, 0, lpszString, -1, NULL, 0) * sizeof(WCHAR); - stringW = Alloc(len); - if (!stringW) - return -1; - - MultiByteToWideChar(CP_ACP, 0, lpszString, -1, stringW, len/sizeof(WCHAR)); - ret = AddMRUData(hList, stringW, len); - Free(stringW); - return ret; -} - -/********************************************************************** **** - * DelMRUString [COMCTL32.156] - * - * Removes item from either string or binary list (despite its name) - * - * PARAMS - * hList [I] list handle - * nItemPos [I] item position to remove 0 -> MRU - * - * RETURNS - * TRUE if successful, FALSE if nItemPos is out of range. - */ -BOOL WINAPI DelMRUString(HANDLE hList, INT nItemPos) -{ - FIXME("(%p, %d): stub\n", hList, nItemPos); - return TRUE; -} - -/********************************************************************** **** - * FindMRUStringW [COMCTL32.402] - * - * See FindMRUStringA. - */ -INT WINAPI FindMRUStringW (HANDLE hList, LPCWSTR lpszString, LPINT lpRegNum) -{ - return FindMRUData(hList, lpszString, - (lstrlenW(lpszString) + 1) * sizeof(WCHAR), lpRegNum); -} - -/********************************************************************** **** - * FindMRUStringA [COMCTL32.155] - * - * Searches string list for item that matches lpszString. - * Returns position in list order 0 -> MRU and if lpRegNum != NULL then value - * corresponding to item's reg. name will be stored in it ('a' -> 0). - * - * PARAMS - * hList [I] list handle - * lpszString [I] string to find - * lpRegNum [O] position in registry (maybe NULL) - * - * RETURNS - * Position in list 0 -> MRU. -1 if item not found. - */ -INT WINAPI FindMRUStringA (HANDLE hList, LPCSTR lpszString, LPINT lpRegNum) -{ - DWORD len = MultiByteToWideChar(CP_ACP, 0, lpszString, -1, NULL, 0); - LPWSTR stringW = Alloc(len * sizeof(WCHAR)); - INT ret; - - MultiByteToWideChar(CP_ACP, 0, lpszString, -1, stringW, len); - ret = FindMRUData(hList, stringW, len * sizeof(WCHAR), lpRegNum); - Free(stringW); - return ret; -} - -/********************************************************************** *** - * CreateMRUListLazy_common (internal) - */ -static HANDLE CreateMRUListLazy_common(LPWINEMRULIST mp) -{ - UINT i, err; - HKEY newkey; - DWORD datasize, dwdisp; - WCHAR realname[2]; - LPWINEMRUITEM witem; - DWORD type; - - /* get space to save indices that will turn into names - * but in order of most to least recently used - */ - mp->realMRU = Alloc((mp->extview.nMaxItems + 2) * sizeof(WCHAR)); - - /* get space to save pointers to actual data in order of - * 'a' to 'z' (0 to n). - */ - mp->array = Alloc(mp->extview.nMaxItems * sizeof(LPVOID)); - - /* open the sub key */ - if ((err = RegCreateKeyExW( mp->extview.hKey, mp->extview.lpszSubKey, - 0, - NULL, - REG_OPTION_NON_VOLATILE, - KEY_READ | KEY_WRITE, - 0, - &newkey, - &dwdisp))) { - /* error - what to do ??? */ - ERR("(%lu %lu %lx %p %s %p): Could not open key, error=%d\n", - mp->extview.cbSize, mp->extview.nMaxItems, mp->extview.dwFlags, - mp->extview.hKey, debugstr_w(mp->extview.lpszSubKey), - mp->extview.lpfnCompare, err); - return 0; - } - - /* get values from key 'MRUList' */ - if (newkey) { - datasize = (mp->extview.nMaxItems + 1) * sizeof(WCHAR); - if((err=RegQueryValueExW( newkey, strMRUList, 0, &type, - (LPBYTE)mp->realMRU, &datasize))) { - /* not present - set size to 1 (will become 0 later) */ - datasize = 1; - *mp->realMRU = 0; - } - else - datasize /= sizeof(WCHAR); - - TRACE("MRU list = %s, datasize = %ld\n", debugstr_w(mp->realMRU), datasize); - - mp->cursize = datasize - 1; - /* datasize now has number of items in the MRUList */ - - /* get actual values for each entry */ - realname[1] = 0; - for(i=0; i<mp->cursize; i++) { - realname[0] = 'a' + i; - if(RegQueryValueExW( newkey, realname, 0, &type, 0, &datasize)) { - /* not present - what to do ??? */ - ERR("Key %s not found 1\n", debugstr_w(realname)); - } - mp->array[i] = witem = Alloc(datasize + sizeof(WINEMRUITEM)); - witem->size = datasize; - if(RegQueryValueExW( newkey, realname, 0, &type, - &witem->datastart, &datasize)) { - /* not present - what to do ??? */ - ERR("Key %s not found 2\n", debugstr_w(realname)); - } - } - RegCloseKey( newkey ); - } - else - mp->cursize = 0; - - TRACE("(%lu %lu %lx %p %s %p): Current Size = %ld\n", - mp->extview.cbSize, mp->extview.nMaxItems, mp->extview.dwFlags, - mp->extview.hKey, debugstr_w(mp->extview.lpszSubKey), - mp->extview.lpfnCompare, mp->cursize); - return (HANDLE)mp; -} - -/********************************************************************** **** - * CreateMRUListLazyW [COMCTL32.404] - * - * See CreateMRUListLazyA. - */ -HANDLE WINAPI CreateMRUListLazyW (LPCREATEMRULISTW lpcml, DWORD dwParam2, - DWORD dwParam3, DWORD dwParam4) -{ - LPWINEMRULIST mp; - - /* Native does not check for a NULL lpcml */ - - if (lpcml->cbSize != sizeof(CREATEMRULISTW) || !lpcml->hKey || - IsBadStringPtrW(lpcml->lpszSubKey, -1)) - return NULL; - - mp = Alloc(sizeof(WINEMRULIST)); - memcpy(&mp->extview, lpcml, sizeof(CREATEMRULISTW)); - mp->extview.lpszSubKey = Alloc((strlenW(lpcml->lpszSubKey) + 1) * sizeof(WCHAR)); - strcpyW((LPWSTR)mp->extview.lpszSubKey, lpcml->lpszSubKey); - mp->isUnicode = TRUE; - - return CreateMRUListLazy_common(mp); -} - -/********************************************************************** **** - * CreateMRUListLazyA [COMCTL32.157] - * - * Creates a most-recently-used list. - * - * PARAMS - * lpcml [I] ptr to CREATEMRULIST structure. - * dwParam2 [I] Unknown - * dwParam3 [I] Unknown - * dwParam4 [I] Unknown - * - * RETURNS - * Handle to MRU list. - */ -HANDLE WINAPI CreateMRUListLazyA (LPCREATEMRULISTA lpcml, DWORD dwParam2, - DWORD dwParam3, DWORD dwParam4) -{ - LPWINEMRULIST mp; - DWORD len; - - /* Native does not check for a NULL lpcml */ - - if (lpcml->cbSize != sizeof(CREATEMRULISTA) || !lpcml->hKey || - IsBadStringPtrA(lpcml->lpszSubKey, -1)) - return 0; - - mp = Alloc(sizeof(WINEMRULIST)); - memcpy(&mp->extview, lpcml, sizeof(CREATEMRULISTW)); - len = MultiByteToWideChar(CP_ACP, 0, lpcml->lpszSubKey, -1, NULL, 0); - mp->extview.lpszSubKey = Alloc(len * sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP, 0, lpcml->lpszSubKey, -1, - (LPWSTR)mp->extview.lpszSubKey, len); - mp->isUnicode = FALSE; - return CreateMRUListLazy_common(mp); -} - -/********************************************************************** **** - * CreateMRUListW [COMCTL32.400] - * - * See CreateMRUListA. - */ -HANDLE WINAPI CreateMRUListW (LPCREATEMRULISTW lpcml) -{ - return CreateMRUListLazyW(lpcml, 0, 0, 0); -} - -/********************************************************************** **** - * CreateMRUListA [COMCTL32.151] - * - * Creates a most-recently-used list. - * - * PARAMS - * lpcml [I] ptr to CREATEMRULIST structure. - * - * RETURNS - * Handle to MRU list. - */ -HANDLE WINAPI CreateMRUListA (LPCREATEMRULISTA lpcml) -{ - return CreateMRUListLazyA (lpcml, 0, 0, 0); -} - - -/********************************************************************** **** - * EnumMRUListW [COMCTL32.403] - * - * Enumerate item in a most-recenty-used list - * - * PARAMS - * hList [I] list handle - * nItemPos [I] item position to enumerate - * lpBuffer [O] buffer to receive item - * nBufferSize [I] size of buffer - * - * RETURNS - * For binary lists specifies how many bytes were copied to buffer, for - * string lists specifies full length of string. Enumerating past the end - * of list returns -1. - * If lpBuffer == NULL or nItemPos is -ve return value is no. of items in - * the list. - */ -INT WINAPI EnumMRUListW (HANDLE hList, INT nItemPos, LPVOID lpBuffer, - DWORD nBufferSize) -{ - LPWINEMRULIST mp = (LPWINEMRULIST) hList; - LPWINEMRUITEM witem; - INT desired, datasize; - - if (nItemPos >= mp->cursize) return -1; - if ((nItemPos < 0) || !lpBuffer) return mp->cursize; - desired = mp->realMRU[nItemPos]; - desired -= 'a'; - TRACE("nItemPos=%d, desired=%d\n", nItemPos, desired); - witem = mp->array[desired]; - datasize = min( witem->size, nBufferSize ); - memcpy( lpBuffer, &witem->datastart, datasize); - TRACE("(%p, %d, %p, %ld): returning len=%d\n", - hList, nItemPos, lpBuffer, nBufferSize, datasize); - return datasize; -} - -/********************************************************************** **** - * EnumMRUListA [COMCTL32.154] - * - * See EnumMRUListW. - */ -INT WINAPI EnumMRUListA (HANDLE hList, INT nItemPos, LPVOID lpBuffer, - DWORD nBufferSize) -{ - LPWINEMRULIST mp = (LPWINEMRULIST) hList; - LPWINEMRUITEM witem; - INT desired, datasize; - DWORD lenA; - - if (nItemPos >= mp->cursize) return -1; - if ((nItemPos < 0) || !lpBuffer) return mp->cursize; - desired = mp->realMRU[nItemPos]; - desired -= 'a'; - TRACE("nItemPos=%d, desired=%d\n", nItemPos, desired); - witem = mp->array[desired]; - if(mp->extview.dwFlags & MRUF_BINARY_LIST) { - datasize = min( witem->size, nBufferSize ); - memcpy( lpBuffer, &witem->datastart, datasize); - } else { - lenA = WideCharToMultiByte(CP_ACP, 0, (LPWSTR)&witem->datastart, -1, - NULL, 0, NULL, NULL); - datasize = min( witem->size, nBufferSize ); - WideCharToMultiByte(CP_ACP, 0, (LPWSTR)&witem->datastart, -1, - lpBuffer, datasize, NULL, NULL); - } - TRACE("(%p, %d, %p, %ld): returning len=%d\n", - hList, nItemPos, lpBuffer, nBufferSize, datasize); - return datasize; -} - - -/********************************************************************** **** - * Str_GetPtrA [COMCTL32.233] - * - * Copies a string into a destination buffer. - * - * PARAMS - * lpSrc [I] Source string - * lpDest [O] Destination buffer - * nMaxLen [I] Size of buffer in characters - * - * RETURNS - * The number of characters copied. - */ -INT WINAPI Str_GetPtrA (LPCSTR lpSrc, LPSTR lpDest, INT nMaxLen) -{ - INT len; - - TRACE("(%p %p %d)\n", lpSrc, lpDest, nMaxLen); - - if (!lpDest && lpSrc) - return strlen (lpSrc); - - if (nMaxLen == 0) - return 0; - - if (lpSrc == NULL) { - lpDest[0] = '\0'; - return 0; - } - - len = strlen (lpSrc); - if (len >= nMaxLen) - len = nMaxLen - 1; - - RtlMoveMemory (lpDest, lpSrc, len); - lpDest[len] = '\0'; - - return len; -} - - -/********************************************************************** **** - * Str_SetPtrA [COMCTL32.234] - * - * Makes a copy of a string, allocating memory if necessary. - * - * PARAMS - * lppDest [O] Pointer to destination string - * lpSrc [I] Source string - * - * RETURNS - * Success: TRUE - * Failure: FALSE - * - * NOTES - * Set lpSrc to NULL to free the memory allocated by a previous call - * to this function. - */ -BOOL WINAPI Str_SetPtrA (LPSTR *lppDest, LPCSTR lpSrc) -{ - TRACE("(%p %p)\n", lppDest, lpSrc); - - if (lpSrc) { - LPSTR ptr = ReAlloc (*lppDest, strlen (lpSrc) + 1); - if (!ptr) - return FALSE; - strcpy (ptr, lpSrc); - *lppDest = ptr; - } - else { - if (*lppDest) { - Free (*lppDest); - *lppDest = NULL; - } - } - - return TRUE; -} - - -/********************************************************************** **** - * Str_GetPtrW [COMCTL32.235] - * - * See Str_GetPtrA. - */ -INT WINAPI Str_GetPtrW (LPCWSTR lpSrc, LPWSTR lpDest, INT nMaxLen) -{ - INT len; - - TRACE("(%p %p %d)\n", lpSrc, lpDest, nMaxLen); - - if (!lpDest && lpSrc) - return strlenW (lpSrc); - - if (nMaxLen == 0) - return 0; - - if (lpSrc == NULL) { - lpDest[0] = L'\0'; - return 0; - } - - len = strlenW (lpSrc); - if (len >= nMaxLen) [truncated at 1000 lines; 72822 more skipped]

1 0

[gvg] 20628: Sync to Wine-0_9_5:
by gvg＠svn.reactos.org 06 Jan '06

06 Jan '06

Sync to Wine-0_9_5: Mike McCormack <mike(a)codeweavers.com> - msiexec: Ignore the TRANSFORMS variable. Ignore the TRANSFORMS variable when building a list of transforms for advertising. The variable is used to apply transforms when installing. Modified: trunk/reactos/subsys/system/msiexec/msiexec.c _____ Modified: trunk/reactos/subsys/system/msiexec/msiexec.c --- trunk/reactos/subsys/system/msiexec/msiexec.c 2006-01-06 20:42:46 UTC (rev 20627) +++ trunk/reactos/subsys/system/msiexec/msiexec.c 2006-01-06 20:44:09 UTC (rev 20628) @@ -452,7 +452,6 @@ DWORD RepairMode = 0; DWORD AdvertiseMode = 0; - LPWSTR Transforms = NULL; struct string_list *transform_list = NULL; LANGID Language = 0; @@ -658,10 +657,6 @@ WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i])); StringListAppend(&transform_list, argvW[i]); } - else if(!msi_strprefix(argvW[i], "TRANSFORMS=")) - { - StringListAppend(&transform_list, argvW[i]+11); - } else if(!msi_strequal(argvW[i], "/g")) { i++; @@ -858,7 +853,6 @@ MsiSetInternalUI(InstallUILevel, NULL); Properties = build_properties( property_list ); - Transforms = build_transforms( transform_list ); if(FunctionInstallAdmin && FunctionPatch) FunctionInstall = FALSE; @@ -880,6 +874,7 @@ } else if(FunctionAdvertise) { + LPWSTR Transforms = build_transforms( property_list ); ReturnCode = MsiAdvertiseProductW(PackageName, (LPWSTR) AdvertiseMode, Transforms, Language); } else if(FunctionPatch)

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