Ros-diffs

ros-diffs@reactos.org

81390 discussions

[arty] 14585: Fixed warning, uninitialized length. Sorry, I did this in a different way
by arty＠svn.reactos.com 11 Apr '05

11 Apr '05

Fixed warning, uninitialized length. Sorry, I did this in a different way and missed one use of NewBufferLen. Not sure why I don't see the 'might be used uninitialized' warning. Modified: trunk/reactos/drivers/net/afd/afd/lock.c _____ Modified: trunk/reactos/drivers/net/afd/afd/lock.c --- trunk/reactos/drivers/net/afd/afd/lock.c 2005-04-11 06:03:20 UTC (rev 14584) +++ trunk/reactos/drivers/net/afd/afd/lock.c 2005-04-11 08:07:41 UTC (rev 14585) @@ -50,7 +50,6 @@ UINT Size = sizeof(AFD_WSABUF) * (Count + Lock); PAFD_WSABUF NewBuf = ExAllocatePool( PagedPool, Size * 2 ); PMDL NewMdl; - INT NewBufferLen; AFD_DbgPrint(MID_TRACE,("Called\n")); @@ -61,7 +60,7 @@ RtlCopyMemory( NewBuf, Buf, sizeof(AFD_WSABUF) * Count ); if( LockAddress ) { NewBuf[Count].buf = AddressBuf; - NewBuf[Count].len = NewBufferLen; + NewBuf[Count].len = *AddressLen; Count++; NewBuf[Count].buf = (PVOID)AddressLen; NewBuf[Count].len = sizeof(*AddressLen);

1 0

[arty] 14584: lock: Fixes suggested by w3seek:
by arty＠svn.reactos.com 11 Apr '05

11 Apr '05

lock: Fixes suggested by w3seek: protect the remaining MmProbeAndLockPages don't return from the exception handler read: Hopefully the last indecision in here: Avoid using AFD_EVENT_CLOSE until the socket is really toast. Use AFD_EVENT_DISCONNECT instead when we've got an EOF, but still have buffered data. I was doing this socket fiddling without a callout block. Fixed. Modified: trunk/reactos/drivers/net/afd/afd/lock.c Modified: trunk/reactos/drivers/net/afd/afd/read.c _____ Modified: trunk/reactos/drivers/net/afd/afd/lock.c --- trunk/reactos/drivers/net/afd/afd/lock.c 2005-04-10 21:01:13 UTC (rev 14583) +++ trunk/reactos/drivers/net/afd/afd/lock.c 2005-04-11 06:03:20 UTC (rev 14584) @@ -59,7 +59,14 @@ _SEH_TRY { RtlCopyMemory( NewBuf, Buf, sizeof(AFD_WSABUF) * Count ); - NewBufferLen = *AddressLen; + if( LockAddress ) { + NewBuf[Count].buf = AddressBuf; + NewBuf[Count].len = NewBufferLen; + Count++; + NewBuf[Count].buf = (PVOID)AddressLen; + NewBuf[Count].len = sizeof(*AddressLen); + Count++; + } } _SEH_HANDLE { AFD_DbgPrint(MIN_TRACE,("Access violation copying buffer info " "from userland (%x %x)\n", @@ -68,15 +75,6 @@ return NULL; } _SEH_END; - if( LockAddress ) { - NewBuf[Count].buf = AddressBuf; - NewBuf[Count].len = NewBufferLen; - Count++; - NewBuf[Count].buf = (PVOID)AddressLen; - NewBuf[Count].len = sizeof(*AddressLen); - Count++; - } - for( i = 0; i < Count; i++ ) { AFD_DbgPrint(MID_TRACE,("Locking buffer %d (%x:%d)\n", i, NewBuf[i].buf, NewBuf[i].len)); _____ Modified: trunk/reactos/drivers/net/afd/afd/read.c --- trunk/reactos/drivers/net/afd/afd/read.c 2005-04-10 21:01:13 UTC (rev 14583) +++ trunk/reactos/drivers/net/afd/afd/read.c 2005-04-11 06:03:20 UTC (rev 14584) @@ -36,7 +36,7 @@ VOID HandleEOFOnIrp( PAFD_FCB FCB, NTSTATUS Status, UINT Information ) { if( Status == STATUS_SUCCESS && Information == 0 ) { AFD_DbgPrint(MID_TRACE,("Looks like an EOF\n")); - FCB->PollState |= AFD_EVENT_CLOSE /*| AFD_EVENT_DISCONNECT */; + FCB->PollState |= AFD_EVENT_DISCONNECT; PollReeval( FCB->DeviceExt, FCB->FileObject ); } } @@ -109,10 +109,11 @@ ReceiveComplete, FCB ); - if( Status == STATUS_SUCCESS ) + SocketCalloutLeave( FCB ); + + if( Status == STATUS_SUCCESS ) FCB->Recv.Content = FCB->ReceiveIrp.Iosb.Information; - HandleEOFOnIrp( FCB, Status, FCB->Recv.Content ); - SocketCalloutLeave( FCB ); + HandleEOFOnIrp( FCB, Status, FCB->ReceiveIrp.Iosb.Information ); } }

1 0

[fireball] 14583: Started implementing Locale property page of intl.cpl appltet. It already provides choices for locale, the only thing it doesn't do - actually set chosen locale. Also it doesn't work under ReactOS.
by fireball＠svn.reactos.com 10 Apr '05

10 Apr '05

Started implementing Locale property page of intl.cpl appltet. It already provides choices for locale, the only thing it doesn't do - actually set chosen locale. Also it doesn't work under ReactOS. Modified: trunk/reactos/lib/cpl/intl/de.rc Modified: trunk/reactos/lib/cpl/intl/en.rc Modified: trunk/reactos/lib/cpl/intl/locale.c _____ Modified: trunk/reactos/lib/cpl/intl/de.rc --- trunk/reactos/lib/cpl/intl/de.rc 2005-04-10 19:44:11 UTC (rev 14582) +++ trunk/reactos/lib/cpl/intl/de.rc 2005-04-10 21:01:13 UTC (rev 14583) @@ -55,7 +55,7 @@ GROUPBOX "Standardsprache", -1, 8, 11, 228, 74 ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON LTEXT "Wõhlen Sie eine Sprache und Region aus welche Sie benutzen wollen:", -1, 38, 25, 193, 22 - COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP + COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP END _____ Modified: trunk/reactos/lib/cpl/intl/en.rc --- trunk/reactos/lib/cpl/intl/en.rc 2005-04-10 19:44:11 UTC (rev 14582) +++ trunk/reactos/lib/cpl/intl/en.rc 2005-04-10 21:01:13 UTC (rev 14583) @@ -55,7 +55,7 @@ GROUPBOX "Primary language", -1, 8, 11, 228, 74 ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON LTEXT "Select the primary language and region you want to use:", -1, 38, 25, 193, 22 - COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP + COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP END _____ Modified: trunk/reactos/lib/cpl/intl/locale.c --- trunk/reactos/lib/cpl/intl/locale.c 2005-04-10 19:44:11 UTC (rev 14582) +++ trunk/reactos/lib/cpl/intl/locale.c 2005-04-10 21:01:13 UTC (rev 14583) @@ -23,234 +23,68 @@ * PURPOSE: Locale property page * PROGRAMMER: Eric Kohl * Klemens Friedl + * Aleksey Bragin */ +#define WINVER 0x0501 + #include <windows.h> #include <commctrl.h> #include <cpl.h> +#include <stdio.h> + #include "intl.h" #include "resource.h" +HWND hList; -// FIXME: -// * change registry function (-> "HKCR\MIME\Database\Rfc1766") - - - -typedef struct _TZ_INFO +BOOL CALLBACK LocalesEnumProc( + LPTSTR lpLocale // locale id +) { - LONG Bias; - LONG StandardBias; - LONG DaylightBias; - SYSTEMTIME StandardDate; - SYSTEMTIME DaylightDate; -} TZ_INFO, *PTZ_INFO; + LCID lcid; + TCHAR lang[255]; + int index; -typedef struct _TIMEZONE_ENTRY -{ - struct _TIMEZONE_ENTRY *Prev; - struct _TIMEZONE_ENTRY *Next; - WCHAR Description[64]; /* 'Display' */ - WCHAR StandardName[32]; /* 'Std' */ - WCHAR DaylightName[32]; /* 'Dlt' */ - TZ_INFO TimezoneInfo; /* 'TZI' */ - ULONG Index; /* 'Index' */ -} TIMEZONE_ENTRY, *PTIMEZONE_ENTRY; + swscanf(lpLocale, L"%lx", &lcid); // maybe use wcstoul? + GetLocaleInfo(lcid, LOCALE_SLANGUAGE, lang, sizeof(lang)); + index = SendMessageW(hList, + CB_ADDSTRING, + 0, + (LPARAM)lang); -PTIMEZONE_ENTRY TimeZoneListHead = NULL; -PTIMEZONE_ENTRY TimeZoneListTail = NULL; + SendMessageW(hList, + CB_SETITEMDATA, + index, + (LPARAM)lcid); - - - -static PTIMEZONE_ENTRY -GetLargerTimeZoneEntry(DWORD Index) -{ - PTIMEZONE_ENTRY Entry; - - Entry = TimeZoneListHead; - while (Entry != NULL) - { - if (Entry->Index >= Index) - return Entry; - - Entry = Entry->Next; - } - - return NULL; + return TRUE; } static VOID -CreateTimeZoneList(VOID) +CreateLanguagesList(HWND hwnd) { + TCHAR langSel[255]; - WCHAR szKeyName[256]; - DWORD dwIndex; - DWORD dwNameSize; - DWORD dwValueSize; - LONG lError; - HKEY hZonesKey; - HKEY hZoneKey; + hList = hwnd; + EnumSystemLocalesW(LocalesEnumProc, LCID_SUPPORTED); - PTIMEZONE_ENTRY Entry; - PTIMEZONE_ENTRY Current; - - - - if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, - L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Time Zones", - 0, - KEY_ALL_ACCESS, - &hZonesKey)) - return; - - dwIndex = 0; - while (TRUE) - { - dwNameSize = 256; - lError = RegEnumKeyExW(hZonesKey, - dwIndex, - szKeyName, - &dwNameSize, - NULL, - NULL, - NULL, - NULL); - if (lError != ERROR_SUCCESS && lError != ERROR_MORE_DATA) - break; - - - if (RegOpenKeyExW(hZonesKey, - szKeyName, - 0, - KEY_ALL_ACCESS, - &hZoneKey)) - break; - - - Entry = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(TIMEZONE_ENTRY)); - if (Entry == NULL) - { - RegCloseKey(hZonesKey); - break; - } - - dwValueSize = 64 * sizeof(WCHAR); - if (RegQueryValueExW(hZonesKey, - L"Display", - NULL, - NULL, - (LPBYTE)&Entry->Description, - &dwValueSize)) - { - RegCloseKey(hZonesKey); - break; - } - - dwValueSize = 32 * sizeof(WCHAR); - if (RegQueryValueExW(hZonesKey, - L"Std", - NULL, - NULL, - (LPBYTE)&Entry->StandardName, - &dwValueSize)) - { - RegCloseKey(hZonesKey); - break; - } - - dwValueSize = 32 * sizeof(WCHAR); - if (RegQueryValueExW(hZonesKey, - L"Dlt", - NULL, - NULL, - (LPBYTE)&Entry->DaylightName, - &dwValueSize)) - { - RegCloseKey(hZonesKey); - break; - } - - dwValueSize = sizeof(DWORD); - if (RegQueryValueExW(hZonesKey, - L"Index", - NULL, - NULL, - (LPBYTE)&Entry->Index, - &dwValueSize)) - { - RegCloseKey(hZonesKey); - break; - } - - dwValueSize = sizeof(TZ_INFO); - if (RegQueryValueExW(hZonesKey, - L"TZI", - NULL, - NULL, - (LPBYTE)&Entry->TimezoneInfo, - &dwValueSize)) - { - RegCloseKey(hZonesKey); - break; - } - - RegCloseKey(hZoneKey); - - if (TimeZoneListHead == NULL && - TimeZoneListTail == NULL) - { - Entry->Prev = NULL; - Entry->Next = NULL; - TimeZoneListHead = Entry; - TimeZoneListTail = Entry; - } - else - { - Current = GetLargerTimeZoneEntry(Entry->Index); - if (Current != NULL) - { - if (Current == TimeZoneListHead) - { - /* Prepend to head */ - Entry->Prev = NULL; - Entry->Next = TimeZoneListHead; - TimeZoneListHead->Prev = Entry; - TimeZoneListHead = Entry; - } - else - { - /* Insert before current */ - Entry->Prev = Current->Prev; - Entry->Next = Current; - Current->Prev->Next = Entry; - Current->Prev = Entry; - } - } - else - { - /* Append to tail */ - Entry->Prev = TimeZoneListTail; - Entry->Next = NULL; - TimeZoneListTail->Next = Entry; - TimeZoneListTail = Entry; - } - } - - dwIndex++; - } - - RegCloseKey(hZonesKey); - + // Select current locale + GetLocaleInfo(GetUserDefaultLCID(), LOCALE_SLANGUAGE, langSel, sizeof(langSel)); // or should it be System? + + SendMessageW(hList, + CB_SELECTSTRING, + -1, + (LPARAM)langSel); } - +/* static VOID -ShowTimeZoneList(HWND hwnd) +ShowLanguagesList(HWND hwnd) { TIME_ZONE_INFORMATION TimeZoneInfo; PTIMEZONE_ENTRY Entry; @@ -281,10 +115,8 @@ (WPARAM)dwIndex, 0); } +*/ - - - /* Property page dialog callback */ INT_PTR CALLBACK LocalePageProc(HWND hwndDlg, @@ -292,16 +124,59 @@ WPARAM wParam, LPARAM lParam) { - switch(uMsg) - { - case WM_INITDIALOG: + switch(uMsg) + { + case WM_INITDIALOG: + CreateLanguagesList(GetDlgItem(hwndDlg, IDC_LANGUAGELIST)); + break; + case WM_COMMAND: + switch (LOWORD(wParam)) + { + case IDC_LANGUAGELIST: + if (HIWORD(wParam) == CBN_SELCHANGE) + { + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + } + break; + } + break; - CreateTimeZoneList(); - ShowTimeZoneList(GetDlgItem(hwndDlg, IDC_LANGUAGELIST)); + case WM_NOTIFY: + { + LPNMHDR lpnm = (LPNMHDR)lParam; + if (lpnm->code == PSN_APPLY) + { + // Apply changes + LCID NewLcid; + int iCurSel; + char tmp[100]; - break; - } - return FALSE; + // Acquire new value + iCurSel = SendMessageW(hList, + CB_GETCURSEL, + 0, + 0); + if (iCurSel == CB_ERR) + break; + + NewLcid = SendMessageW(hList, + CB_GETITEMDATA, + iCurSel, + 0); + + if (NewLcid == CB_ERR) + break; + + + //TOOD: Actually set new locale + + sprintf(tmp, "%x, cursel=%d", NewLcid, iCurSel); + MessageBoxA(hwndDlg, tmp, "debug", MB_OK); + } + } + break; + } + return FALSE; }

1 0

[chorns] 14582: Support -Werror
by chorns＠svn.reactos.com 10 Apr '05

10 Apr '05

Support -Werror Modified: branches/xmlbuildsystem/reactos/apps/utils/net/arp/arp.c Modified: branches/xmlbuildsystem/reactos/apps/utils/net/finger/finger.c Modified: branches/xmlbuildsystem/reactos/apps/utils/net/finger/net.c Modified: branches/xmlbuildsystem/reactos/apps/utils/net/ftp/ftp.xml Modified: branches/xmlbuildsystem/reactos/apps/utils/net/ipconfig/ipconfig.xml Modified: branches/xmlbuildsystem/reactos/apps/utils/net/netstat/netstat.xml Modified: branches/xmlbuildsystem/reactos/apps/utils/net/ping/ping.c Modified: branches/xmlbuildsystem/reactos/apps/utils/net/route/route.c Modified: branches/xmlbuildsystem/reactos/apps/utils/net/whois/whois.c Modified: branches/xmlbuildsystem/reactos/baseaddress.xml Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/freeldr_base.xml Modified: branches/xmlbuildsystem/reactos/drivers/bus/acpi/acpi.xml Modified: branches/xmlbuildsystem/reactos/drivers/bus/directory.xml Added: branches/xmlbuildsystem/reactos/drivers/bus/serenum/serenum.xml Modified: branches/xmlbuildsystem/reactos/drivers/dd/sndblst/card.c Modified: branches/xmlbuildsystem/reactos/drivers/dd/sndblst/dma.c Modified: branches/xmlbuildsystem/reactos/drivers/dd/sndblst/irq.c Modified: branches/xmlbuildsystem/reactos/drivers/dd/sndblst/portio.c Modified: branches/xmlbuildsystem/reactos/drivers/dd/sndblst/settings.c Modified: branches/xmlbuildsystem/reactos/drivers/dd/sndblst/sndblst.c Modified: branches/xmlbuildsystem/reactos/drivers/dd/sound/dsp.c Modified: branches/xmlbuildsystem/reactos/drivers/dd/sound/dsp.h Modified: branches/xmlbuildsystem/reactos/drivers/dd/sound/mixer.c Modified: branches/xmlbuildsystem/reactos/drivers/dd/sound/sound.c Modified: branches/xmlbuildsystem/reactos/drivers/dd/sound/wave.c Modified: branches/xmlbuildsystem/reactos/drivers/lib/oskittcp/oskittcp.xml Modified: branches/xmlbuildsystem/reactos/lib/cabinet/cabinet.xml Modified: branches/xmlbuildsystem/reactos/lib/comctl32/comctl32.xml Modified: branches/xmlbuildsystem/reactos/lib/comdlg32/comdlg32.xml Modified: branches/xmlbuildsystem/reactos/lib/dbghelp/dbghelp.xml Modified: branches/xmlbuildsystem/reactos/lib/devenum/devenum.xml Modified: branches/xmlbuildsystem/reactos/lib/dinput/dinput.xml Modified: branches/xmlbuildsystem/reactos/lib/directory.xml Modified: branches/xmlbuildsystem/reactos/lib/iphlpapi/iphlpapi.xml Modified: branches/xmlbuildsystem/reactos/lib/kbdda/kbdda.xml Modified: branches/xmlbuildsystem/reactos/lib/kbddv/kbddv.xml Modified: branches/xmlbuildsystem/reactos/lib/kbdes/kbdes.xml Modified: branches/xmlbuildsystem/reactos/lib/kbdfr/kbdfr.xml Modified: branches/xmlbuildsystem/reactos/lib/kbdgr/kbdgr.xml Modified: branches/xmlbuildsystem/reactos/lib/kbdse/kbdse.xml Modified: branches/xmlbuildsystem/reactos/lib/kbduk/kbduk.xml Modified: branches/xmlbuildsystem/reactos/lib/kbdus/kbdus.xml Added: branches/xmlbuildsystem/reactos/lib/msi/msi.xml Modified: branches/xmlbuildsystem/reactos/lib/ntdll/rtl/intrlck.c Modified: branches/xmlbuildsystem/reactos/lib/ole32/ole32.xml Modified: branches/xmlbuildsystem/reactos/lib/oleaut32/oleaut32.xml Modified: branches/xmlbuildsystem/reactos/lib/riched20/riched20.xml Modified: branches/xmlbuildsystem/reactos/lib/rpcrt4/rpcrt4.xml Added: branches/xmlbuildsystem/reactos/lib/serialui/serialui.xml Modified: branches/xmlbuildsystem/reactos/lib/setupapi/setupapi.xml Modified: branches/xmlbuildsystem/reactos/lib/shdocvw/shdocvw.xml Modified: branches/xmlbuildsystem/reactos/lib/shell32/shell32.xml Modified: branches/xmlbuildsystem/reactos/lib/shlwapi/shlwapi.xml Modified: branches/xmlbuildsystem/reactos/lib/urlmon/urlmon.xml Modified: branches/xmlbuildsystem/reactos/lib/userenv/desktop.c Modified: branches/xmlbuildsystem/reactos/lib/userenv/registry.c Modified: branches/xmlbuildsystem/reactos/lib/userenv/setup.c Modified: branches/xmlbuildsystem/reactos/lib/winmm/winmm.xml Modified: branches/xmlbuildsystem/reactos/subsys/system/calc/calc.xml Modified: branches/xmlbuildsystem/reactos/subsys/system/directory.xml Added: branches/xmlbuildsystem/reactos/subsys/system/msiexec/msiexec.xml Modified: branches/xmlbuildsystem/reactos/subsys/system/regedit/childwnd.c Modified: branches/xmlbuildsystem/reactos/subsys/system/regedit/edit.c Modified: branches/xmlbuildsystem/reactos/subsys/system/regedit/framewnd.c Modified: branches/xmlbuildsystem/reactos/subsys/system/regedit/hexedit.c Modified: branches/xmlbuildsystem/reactos/subsys/system/regedit/listview.c Modified: branches/xmlbuildsystem/reactos/subsys/system/regedit/main.c Modified: branches/xmlbuildsystem/reactos/subsys/system/regedit/main.h Modified: branches/xmlbuildsystem/reactos/subsys/system/regedit/regproc.c Modified: branches/xmlbuildsystem/reactos/subsys/system/regedit/security.c Modified: branches/xmlbuildsystem/reactos/subsys/system/regedit/security.h Modified: branches/xmlbuildsystem/reactos/subsys/system/reporterror/reporterror.c Modified: branches/xmlbuildsystem/reactos/subsys/system/usetup/usetup.xml Modified: branches/xmlbuildsystem/reactos/subsys/system/winefile/winefile.xml Modified: branches/xmlbuildsystem/reactos/subsys/win32k/objects/font.c Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.txt _____ Modified: branches/xmlbuildsystem/reactos/apps/utils/net/arp/arp.c --- branches/xmlbuildsystem/reactos/apps/utils/net/arp/arp.c 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/apps/utils/net/arp/arp.c 2005-04-10 19:44:11 UTC (rev 14582) @@ -87,7 +87,7 @@ DWORD dwUptime = SnmpSvcGetUptime(); - _tprintf(_T("SNMP uptime: %d\n"), dwUptime); + _tprintf(_T("SNMP uptime: %ld\n"), dwUptime); SnmpUtilMemFree(pCache); } else { _____ Modified: branches/xmlbuildsystem/reactos/apps/utils/net/finger/finger.c --- branches/xmlbuildsystem/reactos/apps/utils/net/finger/finger.c 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/apps/utils/net/finger/finger.c 2005-04-10 19:44:11 UTC (rev 14582) @@ -41,16 +41,6 @@ * Had to remove local handling. Otherwise, same as whois. */ -#ifndef lint -static char copyright[] = -"@(#) Copyright (c) 1989, 1993\n\ - The Regents of the University of California. All rights reserved.\n"; -#endif /* not lint */ - -#ifndef lint -static char sccsid[] = "@(#)finger.c 8.5 (Berkeley) 5/4/95"; -#endif /* not lint */ - /* * Finger prints out information about users. It is not portable since * certain fields (e.g. the full user name, office, and phone numbers) are _____ Modified: branches/xmlbuildsystem/reactos/apps/utils/net/finger/net.c --- branches/xmlbuildsystem/reactos/apps/utils/net/finger/net.c 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/apps/utils/net/finger/net.c 2005-04-10 19:44:11 UTC (rev 14582) @@ -34,10 +34,6 @@ * SUCH DAMAGE. */ -#ifndef lint -static char sccsid[] = "@(#)net.c 8.4 (Berkeley) 4/28/95"; -#endif /* not lint */ - #include <sys/types.h> #include <winsock2.h> #include "unistd.h" @@ -63,7 +59,7 @@ if (!(host = rindex(name, '@'))) return; - *host++ = NULL; + *host++ = 0; if (isdigit(*host) && (defaddr.s_addr = inet_addr(host)) != -1) { def.h_name = host; def.h_addr_list = alist; _____ Modified: branches/xmlbuildsystem/reactos/apps/utils/net/ftp/ftp.xml --- branches/xmlbuildsystem/reactos/apps/utils/net/ftp/ftp.xml 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/apps/utils/net/ftp/ftp.xml 2005-04-10 19:44:11 UTC (rev 14582) @@ -1,4 +1,4 @@ -<module name="ftp" type="win32cui" installbase="system32" installname="ftp.exe"> +<module name="ftp" type="win32cui" installbase="system32" installname="ftp.exe" warnings="true"> <include base="ftp">.</include> <define name="__USE_W32API" /> <library>kernel32</library> _____ Modified: branches/xmlbuildsystem/reactos/apps/utils/net/ipconfig/ipconfig.xml --- branches/xmlbuildsystem/reactos/apps/utils/net/ipconfig/ipconfig.xml 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/apps/utils/net/ipconfig/ipconfig.xml 2005-04-10 19:44:11 UTC (rev 14582) @@ -1,4 +1,4 @@ -<module name="ipconfig" type="win32cui" installbase="system32" installname="ipconfig.exe"> +<module name="ipconfig" type="win32cui" installbase="system32" installname="ipconfig.exe" warnings="true"> <include base="ipconfig">.</include> <define name="__USE_W32API" /> <library>kernel32</library> _____ Modified: branches/xmlbuildsystem/reactos/apps/utils/net/netstat/netstat.xml --- branches/xmlbuildsystem/reactos/apps/utils/net/netstat/netstat.xml 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/apps/utils/net/netstat/netstat.xml 2005-04-10 19:44:11 UTC (rev 14582) @@ -1,4 +1,4 @@ -<module name="netstat" type="win32cui" installbase="system32" installname="netstat.exe"> +<module name="netstat" type="win32cui" installbase="system32" installname="netstat.exe" warnings="true"> <include base="netstat">.</include> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> _____ Modified: branches/xmlbuildsystem/reactos/apps/utils/net/ping/ping.c --- branches/xmlbuildsystem/reactos/apps/utils/net/ping/ping.c 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/apps/utils/net/ping/ping.c 2005-04-10 19:44:11 UTC (rev 14582) @@ -113,7 +113,7 @@ UINT i; PCHAR p; - printf("Buffer (0x%X) Size (0x%X).\n", Buffer, Size); + printf("Buffer (0x%p) Size (0x%lX).\n", Buffer, Size); p = (PCHAR)Buffer; for (i = 0; i < Size; i++) { @@ -386,7 +386,6 @@ VOID TimeToMsString(LPSTR String, LARGE_INTEGER Time) { - UINT i, Length; CHAR Convstr[40]; LARGE_INTEGER LargeTime; _____ Modified: branches/xmlbuildsystem/reactos/apps/utils/net/route/route.c --- branches/xmlbuildsystem/reactos/apps/utils/net/route/route.c 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/apps/utils/net/route/route.c 2005-04-10 19:44:11 UTC (rev 14582) @@ -35,8 +35,7 @@ PMIB_IPFORWARDTABLE IpForwardTable; DWORD Error; ULONG Size = 0; - char Destination[IPBUF], Gateway[IPBUF], Netmask[IPBUF], - Index[IPBUF], Metric[IPBUF]; + char Destination[IPBUF], Gateway[IPBUF], Netmask[IPBUF]; int i; if( (Error = GetIpForwardTable( NULL, &Size, TRUE )) == @@ -63,7 +62,7 @@ inet_ntoa( IN_ADDR_OF(IpForwardTable->table[i]. dwForwardNextHop) ) ); - printf( "%-16s%-16s%-16s%-10d%-10d\n", + printf( "%-16s%-16s%-16s%-10ld%-10ld\n", Destination, Netmask, Gateway, _____ Modified: branches/xmlbuildsystem/reactos/apps/utils/net/whois/whois.c --- branches/xmlbuildsystem/reactos/apps/utils/net/whois/whois.c 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/apps/utils/net/whois/whois.c 2005-04-10 19:44:11 UTC (rev 14582) @@ -36,22 +36,13 @@ * more convenient fdopen()/fprintf() to send()/recv(). */ -#ifndef lint -static char copyright[] = -"@(#) Copyright (c) 1980, 1993\n\ - The Regents of the University of California. All rights reserved.\n"; -#endif /* not lint */ - -#ifndef lint -static char sccsid[] = "@(#)whois.c 8.1 (Berkeley) 6/6/93"; -#endif /* not lint */ - #include <sys/types.h> #include <winsock2.h> /* #include <sys/socket.h> */ /* #include <netinet/in.h> */ /* #include <netdb.h> */ #include <stdio.h> +#include <stdlib.h> /* #include <various.h> */ #include <getopt.h> @@ -160,6 +151,7 @@ putchar(ch); leave(0); + return 0; } void usage() _____ Modified: branches/xmlbuildsystem/reactos/baseaddress.xml --- branches/xmlbuildsystem/reactos/baseaddress.xml 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/baseaddress.xml 2005-04-10 19:44:11 UTC (rev 14582) @@ -25,6 +25,7 @@ <property name="BASEADDRESS_SECUR32" value="0x6b3A0000" /> <property name="BASEADDRESS_SMDLL" value="0x6b3B0000" /> <property name="BASEADDRESS_URLMON" value="0x6b3C0000" /> +<property name="BASEADDRESS_SERIALUI" value="0x6b3D0000" /> <property name="BASEADDRESS_CARDS" value="0x701a0000" /> <property name="BASEADDRESS_WININET" value="0x70200000" /> <property name="BASEADDRESS_ACLUI" value="0x71550000" /> @@ -58,6 +59,7 @@ <property name="BASEADDRESS_MMDRV" value="0x77500000" /> <property name="BASEADDRESS_CRTDLL" value="0x77630000" /> <property name="BASEADDRESS_MSAFD" value="0x777a0000" /> +<property name="BASEADDRESS_MSI" value="0x777b0000" /> <property name="BASEADDRESS_SNMPAPI" value="0x777c0000" /> <property name="BASEADDRESS_WINMM" value="0x777d0000" /> <property name="BASEADDRESS_WS2HELP" value="0x777e0000" /> _____ Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/freeldr_base.xml --- branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/freeldr_base.xml 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/freeldr_base.xml 2005-04-10 19:44:11 UTC (rev 14582) @@ -1,4 +1,4 @@ -<module name="freeldr_base" type="objectlibrary"> +<module name="freeldr_base" type="objectlibrary" warnings="true"> <include base="freeldr_base">include</include> <include base="freeldr_base">cache</include> <include base="ntoskrnl">include</include> _____ Modified: branches/xmlbuildsystem/reactos/drivers/bus/acpi/acpi.xml --- branches/xmlbuildsystem/reactos/drivers/bus/acpi/acpi.xml 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/drivers/bus/acpi/acpi.xml 2005-04-10 19:44:11 UTC (rev 14582) @@ -1,4 +1,4 @@ -<module name="acpi" type="kernelmodedriver" installbase="system32/drivers" installname="acpi.sys"> +<module name="acpi" type="kernelmodedriver" installbase="system32/drivers" installname="acpi.sys" warnings="true"> <include base="acpi">include</include> <include base="acpi">ospm/include</include> <library>ntoskrnl</library> _____ Modified: branches/xmlbuildsystem/reactos/drivers/bus/directory.xml --- branches/xmlbuildsystem/reactos/drivers/bus/directory.xml 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/drivers/bus/directory.xml 2005-04-10 19:44:11 UTC (rev 14582) @@ -7,3 +7,6 @@ <directory name="pci"> <xi:include href="pci/pci.xml" /> </directory> +<directory name="serenum"> + <xi:include href="serenum/serenum.xml" /> +</directory> _____ Added: branches/xmlbuildsystem/reactos/drivers/bus/serenum/serenum.xml --- branches/xmlbuildsystem/reactos/drivers/bus/serenum/serenum.xml 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/drivers/bus/serenum/serenum.xml 2005-04-10 19:44:11 UTC (rev 14582) @@ -0,0 +1,12 @@ +<module name="serenum" type="kernelmodedriver" installbase="system32/drivers" installname="serenum.sys"> + <include base="serenum">.</include> + <define name="__USE_W32API" /> + <library>ntoskrnl</library> + <library>hal</library> + <file>detect.c</file> + <file>fdo.c</file> + <file>misc.c</file> + <file>pdo.c</file> + <file>serenum.c</file> + <file>serenum.rc</file> +</module> Property changes on: branches/xmlbuildsystem/reactos/drivers/bus/serenum/serenum.xml ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: branches/xmlbuildsystem/reactos/drivers/dd/sndblst/card.c --- branches/xmlbuildsystem/reactos/drivers/dd/sndblst/card.c 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/drivers/dd/sndblst/card.c 2005-04-10 19:44:11 UTC (rev 14582) @@ -50,8 +50,6 @@ VOID BeginPlayback(UINT BasePort, UINT BitDepth, UINT Channels, UINT BlockSize) { - CHAR Command; - DPRINT("BeginPlayback(%d, %d, %d, %d)\n", BasePort, BitDepth, Channels, BlockSize); // switch(BitDepth) _____ Modified: branches/xmlbuildsystem/reactos/drivers/dd/sndblst/dma.c --- branches/xmlbuildsystem/reactos/drivers/dd/sndblst/dma.c 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/drivers/dd/sndblst/dma.c 2005-04-10 19:44:11 UTC (rev 14582) @@ -70,7 +70,6 @@ { DEVICE_DESCRIPTION Desc; ULONG MappedRegs = 0; - NTSTATUS Status; PDEVICE_EXTENSION Device = DeviceObject->DeviceExtension; KEVENT DMAEvent; KIRQL OldIrql; _____ Modified: branches/xmlbuildsystem/reactos/drivers/dd/sndblst/irq.c --- branches/xmlbuildsystem/reactos/drivers/dd/sndblst/irq.c 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/drivers/dd/sndblst/irq.c 2005-04-10 19:44:11 UTC (rev 14582) @@ -14,14 +14,6 @@ for (i = 0; ValidIRQs[i] != 0xffff; i ++) { - UCHAR ThisIRQ = ValidIRQs[i]; - UCHAR bConfig = (UCHAR)(0x40 | - (ThisIRQ == 7 ? 0x08 : - ThisIRQ == 9 ? 0x10 : - ThisIRQ == 10 ? 0x18 : - ThisIRQ == 11 ? 0x20 : - 0)); - // Consult the card // OUTPORT(pHw, BOARD_CONFIG, bConfig); @@ -37,7 +29,6 @@ // else // Compaq stuff? { - UCHAR CompaqPIDR; UCHAR Expected; switch (Parameters->IRQ) @@ -59,9 +50,6 @@ IN PKINTERRUPT pInterrupt, IN PVOID Context) { - PDEVICE_OBJECT DeviceObject = (PDEVICE_OBJECT)Context; - PDEVICE_EXTENSION Parameters = DeviceObject->DeviceExtension; - DPRINT("*** Processing ISR ***\n"); // What do we do here then? _____ Modified: branches/xmlbuildsystem/reactos/drivers/dd/sndblst/portio.c --- branches/xmlbuildsystem/reactos/drivers/dd/sndblst/portio.c 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/drivers/dd/sndblst/portio.c 2005-04-10 19:44:11 UTC (rev 14582) @@ -83,7 +83,7 @@ { // Check to make sure the reset was acknowledged: for (TimeOut = SB_TIMEOUT; - Status = (SB_READ_DATA(BasePort) != SB_DSP_READY) && TimeOut > 0; + (Status = (SB_READ_DATA(BasePort) != SB_DSP_READY) && (TimeOut > 0)); TimeOut --); } _____ Modified: branches/xmlbuildsystem/reactos/drivers/dd/sndblst/settings.c --- branches/xmlbuildsystem/reactos/drivers/dd/sndblst/settings.c 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/drivers/dd/sndblst/settings.c 2005-04-10 19:44:11 UTC (rev 14582) @@ -292,8 +292,6 @@ NT status STATUS_SUCCESS if successful */ { - NTSTATUS s; - DPRINT("SaveSettings() unimplemented\n"); // UNIMPLEMENTED; _____ Modified: branches/xmlbuildsystem/reactos/drivers/dd/sndblst/sndblst.c --- branches/xmlbuildsystem/reactos/drivers/dd/sndblst/sndblst.c 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/drivers/dd/sndblst/sndblst.c 2005-04-10 19:44:11 UTC (rev 14582) @@ -294,8 +294,6 @@ { PIO_STACK_LOCATION Stack; PDEVICE_EXTENSION DeviceExtension; - UINT ByteCount; - PBYTE Data; DPRINT("BlasterDeviceControl() called!\n"); _____ Modified: branches/xmlbuildsystem/reactos/drivers/dd/sound/dsp.c --- branches/xmlbuildsystem/reactos/drivers/dd/sound/dsp.c 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/drivers/dd/sound/dsp.c 2005-04-10 19:44:11 UTC (rev 14582) @@ -25,6 +25,7 @@ { // while((inb(base+0x0e)&0x80)==0); //Wait until there is something to read // return inb(base+0x0a); + return 0; } /************************************' _____ Modified: branches/xmlbuildsystem/reactos/drivers/dd/sound/dsp.h --- branches/xmlbuildsystem/reactos/drivers/dd/sound/dsp.h 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/drivers/dd/sound/dsp.h 2005-04-10 19:44:11 UTC (rev 14582) @@ -13,5 +13,5 @@ unsigned char irq,dma8,dma16; unsigned char read_dsp(unsigned short base); void write_dsp(unsigned short base,unsigned char data); -//sb_status detect_dsp(SB16* sb16); +sb_status detect_dsp(SB16* sb16); sb_status reset_dsp(unsigned short base_address); _____ Modified: branches/xmlbuildsystem/reactos/drivers/dd/sound/mixer.c --- branches/xmlbuildsystem/reactos/drivers/dd/sound/mixer.c 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/drivers/dd/sound/mixer.c 2005-04-10 19:44:11 UTC (rev 14582) @@ -20,6 +20,7 @@ // outb(base+0x04,reg); // return inb(base+0x05); + return 0; } unsigned char get_irq(SB16* sb16) _____ Modified: branches/xmlbuildsystem/reactos/drivers/dd/sound/sound.c --- branches/xmlbuildsystem/reactos/drivers/dd/sound/sound.c 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/drivers/dd/sound/sound.c 2005-04-10 19:44:11 UTC (rev 14582) @@ -77,6 +77,7 @@ * RETURNS: Success or failure */ { +#if 0 PDEVICE_OBJECT DeviceObject; NTSTATUS ret; @@ -96,7 +97,7 @@ DriverObject->MajorFunction[IRP_MJ_WRITE] = Dispatch; DriverObject->MajorFunction[IRP_MJ_WRITE] = Dispatch; DriverObject->DriverUnload = NULL; - +#endif return(STATUS_SUCCESS); } _____ Modified: branches/xmlbuildsystem/reactos/drivers/dd/sound/wave.c --- branches/xmlbuildsystem/reactos/drivers/dd/sound/wave.c 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/drivers/dd/sound/wave.c 2005-04-10 19:44:11 UTC (rev 14582) @@ -29,7 +29,7 @@ ULONG OldIRQ; PKINTERRUPT IrqObject; -BOOLEAN DMAOutputISR(PKINTERRUPT Interrupt, PVOID ServiceContext) +BOOLEAN STDCALL DMAOutputISR(PKINTERRUPT Interrupt, PVOID ServiceContext) { DPRINT1("interrupt\n"); return FALSE; @@ -42,7 +42,7 @@ KIRQL Dirql; KAFFINITY Affinity; PKINTERRUPT IrqObject; - unsigned int mask,newmask; + unsigned int newmask; unsigned int i; unsigned int tmp[255]; _____ Modified: branches/xmlbuildsystem/reactos/drivers/lib/oskittcp/oskittcp.xml --- branches/xmlbuildsystem/reactos/drivers/lib/oskittcp/oskittcp.xml 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/drivers/lib/oskittcp/oskittcp.xml 2005-04-10 19:44:11 UTC (rev 14582) @@ -1,5 +1,5 @@ -<module name="oskittcp" type="staticlibrary"> - <define name="__REACTOS__">1</define> +<module name="oskittcp" type="staticlibrary" warnings="true"> + <define name="__REACTOS__">1</define> <define name="__NTDRIVER__"/> <define name="KERNEL"/> <define name="_DISABLE_TIDENTS"/> _____ Modified: branches/xmlbuildsystem/reactos/lib/cabinet/cabinet.xml --- branches/xmlbuildsystem/reactos/lib/cabinet/cabinet.xml 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/lib/cabinet/cabinet.xml 2005-04-10 19:44:11 UTC (rev 14582) @@ -1,4 +1,4 @@ -<module name="cabinet" type="win32dll" baseaddress="${BASEADDRESS_CABINET}" installbase="system32" installname="cabinet.dll"> +<module name="cabinet" type="win32dll" baseaddress="${BASEADDRESS_CABINET}" installbase="system32" installname="cabinet.dll" warnings="true"> <importlibrary definition="cabinet.spec.def" /> <include base="cabinet">.</include> <include base="ReactOS">include/wine</include> _____ Modified: branches/xmlbuildsystem/reactos/lib/comctl32/comctl32.xml --- branches/xmlbuildsystem/reactos/lib/comctl32/comctl32.xml 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/lib/comctl32/comctl32.xml 2005-04-10 19:44:11 UTC (rev 14582) @@ -1,4 +1,4 @@ -<module name="comctl32" type="win32dll" baseaddress="${BASEADDRESS_COMCTL32}" installbase="system32" installname="comctl32.dll"> +<module name="comctl32" type="win32dll" baseaddress="${BASEADDRESS_COMCTL32}" installbase="system32" installname="comctl32.dll" warnings="true"> <importlibrary definition="comctl32.spec.def" /> <include base="comctl32">.</include> <include base="ReactOS">include/wine</include> _____ Modified: branches/xmlbuildsystem/reactos/lib/comdlg32/comdlg32.xml --- branches/xmlbuildsystem/reactos/lib/comdlg32/comdlg32.xml 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/lib/comdlg32/comdlg32.xml 2005-04-10 19:44:11 UTC (rev 14582) @@ -1,4 +1,4 @@ -<module name="comdlg32" type="win32dll" baseaddress="${BASEADDRESS_COMDLG32}" installbase="system32" installname="comdlg32.dll"> +<module name="comdlg32" type="win32dll" baseaddress="${BASEADDRESS_COMDLG32}" installbase="system32" installname="comdlg32.dll" warnings="true"> <importlibrary definition="comdlg32.spec.def" /> <include base="comdlg32">.</include> <include base="ReactOS">include/wine</include> _____ Modified: branches/xmlbuildsystem/reactos/lib/dbghelp/dbghelp.xml --- branches/xmlbuildsystem/reactos/lib/dbghelp/dbghelp.xml 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/lib/dbghelp/dbghelp.xml 2005-04-10 19:44:11 UTC (rev 14582) @@ -1,4 +1,4 @@ -<module name="dbghelp" type="win32dll" baseaddress="${BASEADDRESS_DBGHELP}" installbase="system32" installname="dbghelp.dll"> +<module name="dbghelp" type="win32dll" baseaddress="${BASEADDRESS_DBGHELP}" installbase="system32" installname="dbghelp.dll" warnings="true"> <importlibrary definition="dbghelp.spec.def" /> <include base="dbghelp">.</include> <include base="ReactOS">include/wine</include> _____ Modified: branches/xmlbuildsystem/reactos/lib/devenum/devenum.xml --- branches/xmlbuildsystem/reactos/lib/devenum/devenum.xml 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/lib/devenum/devenum.xml 2005-04-10 19:44:11 UTC (rev 14582) @@ -1,4 +1,4 @@ -<module name="devenum" type="win32dll" baseaddress="${BASEADDRESS_DEVENUM}" installbase="system32" installname="devenum.dll"> +<module name="devenum" type="win32dll" baseaddress="${BASEADDRESS_DEVENUM}" installbase="system32" installname="devenum.dll" warnings="true"> <importlibrary definition="devenum.spec.def" /> <include base="devenum">.</include> <include base="ReactOS">include/wine</include> _____ Modified: branches/xmlbuildsystem/reactos/lib/dinput/dinput.xml --- branches/xmlbuildsystem/reactos/lib/dinput/dinput.xml 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/lib/dinput/dinput.xml 2005-04-10 19:44:11 UTC (rev 14582) @@ -1,4 +1,4 @@ -<module name="dinput" type="win32dll" baseaddress="${BASEADDRESS_DINPUT}" installbase="system32" installname="dinput.dll"> +<module name="dinput" type="win32dll" baseaddress="${BASEADDRESS_DINPUT}" installbase="system32" installname="dinput.dll" warnings="true"> <importlibrary definition="dinput.spec.def" /> <include base="dinput">.</include> <include base="ReactOS">include/wine</include> _____ Modified: branches/xmlbuildsystem/reactos/lib/directory.xml --- branches/xmlbuildsystem/reactos/lib/directory.xml 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/lib/directory.xml 2005-04-10 19:44:11 UTC (rev 14582) @@ -148,6 +148,9 @@ <directory name="msgina"> <xi:include href="msgina/msgina.xml" /> </directory> +<directory name="msi"> + <xi:include href="msi/msi.xml" /> +</directory> <directory name="msimg32"> <xi:include href="msimg32/msimg32.xml" /> </directory> @@ -205,6 +208,9 @@ <directory name="secur32"> <xi:include href="secur32/secur32.xml" /> </directory> +<directory name="serialui"> + <xi:include href="serialui/serialui.xml" /> +</directory> <directory name="setupapi"> <xi:include href="setupapi/setupapi.xml" /> </directory> _____ Modified: branches/xmlbuildsystem/reactos/lib/iphlpapi/iphlpapi.xml --- branches/xmlbuildsystem/reactos/lib/iphlpapi/iphlpapi.xml 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/lib/iphlpapi/iphlpapi.xml 2005-04-10 19:44:11 UTC (rev 14582) @@ -1,4 +1,4 @@ -<module name="iphlpapi" type="win32dll" baseaddress="${BASEADDRESS_IPHLPAPI}" installbase="system32" installname="iphlpapi.dll"> +<module name="iphlpapi" type="win32dll" baseaddress="${BASEADDRESS_IPHLPAPI}" installbase="system32" installname="iphlpapi.dll" warnings="true"> <importlibrary definition="iphlpapi.spec.def" /> <include base="iphlpapi">include</include> <include base="ReactOS">include/wine</include> _____ Modified: branches/xmlbuildsystem/reactos/lib/kbdda/kbdda.xml --- branches/xmlbuildsystem/reactos/lib/kbdda/kbdda.xml 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/lib/kbdda/kbdda.xml 2005-04-10 19:44:11 UTC (rev 14582) @@ -1,4 +1,4 @@ -<module name="kbdda" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdda.dll"> +<module name="kbdda" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdda.dll" warnings="true"> <importlibrary definition="kbdda.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> _____ Modified: branches/xmlbuildsystem/reactos/lib/kbddv/kbddv.xml --- branches/xmlbuildsystem/reactos/lib/kbddv/kbddv.xml 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/lib/kbddv/kbddv.xml 2005-04-10 19:44:11 UTC (rev 14582) @@ -1,4 +1,4 @@ -<module name="kbddv" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbddv.dll"> +<module name="kbddv" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbddv.dll" warnings="true"> <importlibrary definition="kbddv.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> _____ Modified: branches/xmlbuildsystem/reactos/lib/kbdes/kbdes.xml --- branches/xmlbuildsystem/reactos/lib/kbdes/kbdes.xml 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/lib/kbdes/kbdes.xml 2005-04-10 19:44:11 UTC (rev 14582) @@ -1,4 +1,4 @@ -<module name="kbdes" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdes.dll"> +<module name="kbdes" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdes.dll" warnings="true"> <importlibrary definition="kbdes.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> _____ Modified: branches/xmlbuildsystem/reactos/lib/kbdfr/kbdfr.xml --- branches/xmlbuildsystem/reactos/lib/kbdfr/kbdfr.xml 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/lib/kbdfr/kbdfr.xml 2005-04-10 19:44:11 UTC (rev 14582) @@ -1,4 +1,4 @@ -<module name="kbdfr" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdfr.dll"> +<module name="kbdfr" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdfr.dll" warnings="true"> <importlibrary definition="kbdfr.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> _____ Modified: branches/xmlbuildsystem/reactos/lib/kbdgr/kbdgr.xml --- branches/xmlbuildsystem/reactos/lib/kbdgr/kbdgr.xml 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/lib/kbdgr/kbdgr.xml 2005-04-10 19:44:11 UTC (rev 14582) @@ -1,4 +1,4 @@ -<module name="kbdgr" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdgr.dll"> +<module name="kbdgr" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdgr.dll" warnings="true"> <importlibrary definition="kbdgr.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> _____ Modified: branches/xmlbuildsystem/reactos/lib/kbdse/kbdse.xml --- branches/xmlbuildsystem/reactos/lib/kbdse/kbdse.xml 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/lib/kbdse/kbdse.xml 2005-04-10 19:44:11 UTC (rev 14582) @@ -1,4 +1,4 @@ -<module name="kbdse" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdse.dll"> +<module name="kbdse" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdse.dll" warnings="true"> <importlibrary definition="kbdse.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> _____ Modified: branches/xmlbuildsystem/reactos/lib/kbduk/kbduk.xml --- branches/xmlbuildsystem/reactos/lib/kbduk/kbduk.xml 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/lib/kbduk/kbduk.xml 2005-04-10 19:44:11 UTC (rev 14582) @@ -1,4 +1,4 @@ -<module name="kbduk" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbduk.dll"> +<module name="kbduk" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbduk.dll" warnings="true"> <importlibrary definition="kbduk.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> _____ Modified: branches/xmlbuildsystem/reactos/lib/kbdus/kbdus.xml --- branches/xmlbuildsystem/reactos/lib/kbdus/kbdus.xml 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/lib/kbdus/kbdus.xml 2005-04-10 19:44:11 UTC (rev 14582) @@ -1,4 +1,4 @@ -<module name="kbdus" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdus.dll"> +<module name="kbdus" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdus.dll" warnings="true"> <importlibrary definition="kbdus.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> _____ Added: branches/xmlbuildsystem/reactos/lib/msi/msi.xml --- branches/xmlbuildsystem/reactos/lib/msi/msi.xml 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/lib/msi/msi.xml 2005-04-10 19:44:11 UTC (rev 14582) @@ -0,0 +1,52 @@ +<module name="msi" type="win32dll" baseaddress="${BASEADDRESS_MSI}" installbase="system32" installname="msi.dll" warnings="true"> + <importlibrary definition="msi.spec.def" /> + <include base="msi">.</include> + <include base="ReactOS">include/wine</include> + <define name="__REACTOS__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <define name="WINVER">0x501</define> + <library>wine</library> + <library>uuid</library> + <library>ntdll</library> + <library>kernel32</library> + <library>user32</library> + <library>gdi32</library> + <library>advapi32</library> + <library>shell32</library> + <library>winmm</library> + <library>cabinet</library> + <library>ole32</library> + <library>oleaut32</library> + <library>version</library> + <file>action.c</file> + <file>appsearch.c</file> + <file>cond.tab.c</file> + <file>create.c</file> + <file>custom.c</file> + <file>delete.c</file> + <file>dialog.c</file> + <file>distinct.c</file> + <file>format.c</file> + <file>handle.c</file> + <file>insert.c</file> + <file>msi.c</file> + <file>msiquery.c</file> + <file>order.c</file> + <file>package.c</file> + <file>preview.c</file> + <file>record.c</file> + <file>registry.c</file> + <file>regsvr.c</file> + <file>select.c</file> + <file>sql.tab.c</file> + <file>string.c</file> + <file>suminfo.c</file> + <file>table.c</file> + <file>tokenize.c</file> + <file>update.c</file> + <file>where.c</file> + <file>msi.spec</file> + <file>msi.rc</file> +</module> Property changes on: branches/xmlbuildsystem/reactos/lib/msi/msi.xml ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: branches/xmlbuildsystem/reactos/lib/ntdll/rtl/intrlck.c --- branches/xmlbuildsystem/reactos/lib/ntdll/rtl/intrlck.c 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/lib/ntdll/rtl/intrlck.c 2005-04-10 19:44:11 UTC (rev 14582) @@ -122,7 +122,7 @@ LONG Exchange, LONG Comperand) { - PVOID ret; + LONG ret; __asm__ ( /* lock for SMP systems */ "lock\n\t" "cmpxchgl %2,(%1)" _____ Modified: branches/xmlbuildsystem/reactos/lib/ole32/ole32.xml --- branches/xmlbuildsystem/reactos/lib/ole32/ole32.xml 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/lib/ole32/ole32.xml 2005-04-10 19:44:11 UTC (rev 14582) @@ -1,4 +1,4 @@ -<module name="ole32" type="win32dll" baseaddress="${BASEADDRESS_OLE32}" installbase="system32" installname="ole32.dll"> +<module name="ole32" type="win32dll" baseaddress="${BASEADDRESS_OLE32}" installbase="system32" installname="ole32.dll" warnings="true"> <importlibrary definition="ole32.spec.def" /> <include base="ole32">.</include> <include base="ReactOS">include/wine</include> _____ Modified: branches/xmlbuildsystem/reactos/lib/oleaut32/oleaut32.xml --- branches/xmlbuildsystem/reactos/lib/oleaut32/oleaut32.xml 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/lib/oleaut32/oleaut32.xml 2005-04-10 19:44:11 UTC (rev 14582) @@ -1,4 +1,4 @@ -<module name="oleaut32" type="win32dll" baseaddress="${BASEADDRESS_OLEAUT32}" installbase="system32" installname="oleaut32.dll"> +<module name="oleaut32" type="win32dll" baseaddress="${BASEADDRESS_OLEAUT32}" installbase="system32" installname="oleaut32.dll" warnings="true"> <importlibrary definition="oleaut32.spec.def" /> <include base="oleaut32">.</include> <include base="ReactOS">include/wine</include> _____ Modified: branches/xmlbuildsystem/reactos/lib/riched20/riched20.xml --- branches/xmlbuildsystem/reactos/lib/riched20/riched20.xml 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/lib/riched20/riched20.xml 2005-04-10 19:44:11 UTC (rev 14582) @@ -1,4 +1,4 @@ -<module name="riched20" type="win32dll" baseaddress="${BASEADDRESS_RICHED20}"> +<module name="riched20" type="win32dll" baseaddress="${BASEADDRESS_RICHED20}" warnings="true"> <importlibrary definition="riched20.spec.def" /> <include base="riched20">.</include> <include base="ReactOS">include/wine</include> _____ Modified: branches/xmlbuildsystem/reactos/lib/rpcrt4/rpcrt4.xml --- branches/xmlbuildsystem/reactos/lib/rpcrt4/rpcrt4.xml 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/lib/rpcrt4/rpcrt4.xml 2005-04-10 19:44:11 UTC (rev 14582) @@ -1,4 +1,4 @@ -<module name="rpcrt4" type="win32dll" baseaddress="${BASEADDRESS_RPCRT4}"> +<module name="rpcrt4" type="win32dll" baseaddress="${BASEADDRESS_RPCRT4}" warnings="true"> <importlibrary definition="rpcrt4.spec.def" /> <include base="rpcrt4">.</include> <include base="ReactOS">include/wine</include> _____ Added: branches/xmlbuildsystem/reactos/lib/serialui/serialui.xml --- branches/xmlbuildsystem/reactos/lib/serialui/serialui.xml 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/lib/serialui/serialui.xml 2005-04-10 19:44:11 UTC (rev 14582) @@ -0,0 +1,12 @@ +<module name="serialui" type="win32dll" baseaddress="${BASEADDRESS_SERIALUI}"> + <importlibrary definition="serialui.def" /> + <include base="serialui">.</include> + <define name="__USE_W32API" /> + <define name="UNICODE" /> + <define name="_UNICODE" /> + <library>kernel32</library> + <library>user32</library> + <library>shlwapi</library> + <file>serialui.c</file> + <file>serialui.rc</file> +</module> Property changes on: branches/xmlbuildsystem/reactos/lib/serialui/serialui.xml ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: branches/xmlbuildsystem/reactos/lib/setupapi/setupapi.xml --- branches/xmlbuildsystem/reactos/lib/setupapi/setupapi.xml 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/lib/setupapi/setupapi.xml 2005-04-10 19:44:11 UTC (rev 14582) @@ -1,4 +1,4 @@ -<module name="setupapi" type="win32dll" baseaddress="${BASEADDRESS_SETUPAPI}" installbase="system32" installname="setupapi.dll"> +<module name="setupapi" type="win32dll" baseaddress="${BASEADDRESS_SETUPAPI}" installbase="system32" installname="setupapi.dll" warnings="true"> <importlibrary definition="setupapi.spec.def" /> <include base="setupapi">.</include> <include base="ReactOS">include/wine</include> _____ Modified: branches/xmlbuildsystem/reactos/lib/shdocvw/shdocvw.xml --- branches/xmlbuildsystem/reactos/lib/shdocvw/shdocvw.xml 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/lib/shdocvw/shdocvw.xml 2005-04-10 19:44:11 UTC (rev 14582) @@ -1,4 +1,4 @@ -<module name="shdocvw" type="win32dll" baseaddress="${BASEADDRESS_SHDOCVW}" installbase="system32" installname="shdocvw.dll"> +<module name="shdocvw" type="win32dll" baseaddress="${BASEADDRESS_SHDOCVW}" installbase="system32" installname="shdocvw.dll" warnings="true"> <importlibrary definition="shdocvw.spec.def" /> <include base="shdocvw">.</include> <include base="ReactOS">include/wine</include> _____ Modified: branches/xmlbuildsystem/reactos/lib/shell32/shell32.xml --- branches/xmlbuildsystem/reactos/lib/shell32/shell32.xml 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/lib/shell32/shell32.xml 2005-04-10 19:44:11 UTC (rev 14582) @@ -1,4 +1,4 @@ -<module name="shell32" type="win32dll" baseaddress="${BASEADDRESS_SHELL32}" installbase="system32" installname="shell32.dll"> +<module name="shell32" type="win32dll" baseaddress="${BASEADDRESS_SHELL32}" installbase="system32" installname="shell32.dll" warnings="true"> <importlibrary definition="shell32.spec.def" /> <include base="shell32">.</include> <include base="ReactOS">include/wine</include> _____ Modified: branches/xmlbuildsystem/reactos/lib/shlwapi/shlwapi.xml --- branches/xmlbuildsystem/reactos/lib/shlwapi/shlwapi.xml 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/lib/shlwapi/shlwapi.xml 2005-04-10 19:44:11 UTC (rev 14582) @@ -1,4 +1,4 @@ -<module name="shlwapi" type="win32dll" baseaddress="${BASEADDRESS_SHLWAPI}" installbase="system32" installname="shlwapi.dll"> +<module name="shlwapi" type="win32dll" baseaddress="${BASEADDRESS_SHLWAPI}" installbase="system32" installname="shlwapi.dll" warnings="true"> <importlibrary definition="shlwapi.spec.def" /> <include base="shlwapi">.</include> <include base="ReactOS">include/wine</include> _____ Modified: branches/xmlbuildsystem/reactos/lib/urlmon/urlmon.xml --- branches/xmlbuildsystem/reactos/lib/urlmon/urlmon.xml 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/lib/urlmon/urlmon.xml 2005-04-10 19:44:11 UTC (rev 14582) @@ -1,4 +1,4 @@ -<module name="urlmon" type="win32dll" baseaddress="${BASEADDRESS_URLMON}" installbase="system32" installname="urlmon.dll"> +<module name="urlmon" type="win32dll" baseaddress="${BASEADDRESS_URLMON}" installbase="system32" installname="urlmon.dll" warnings="true"> <importlibrary definition="urlmon.spec.def" /> <include base="urlmon">.</include> <include base="ReactOS">include/wine</include> _____ Modified: branches/xmlbuildsystem/reactos/lib/userenv/desktop.c --- branches/xmlbuildsystem/reactos/lib/userenv/desktop.c 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/lib/userenv/desktop.c 2005-04-10 19:44:11 UTC (rev 14582) @@ -232,7 +232,7 @@ WCHAR szLinkPath[MAX_PATH]; WCHAR szArguments[MAX_PATH]; WCHAR szCommand[MAX_PATH]; - WIN32_FIND_DATA FindData; + WIN32_FIND_DATAW FindData; HANDLE hFind; LPWSTR Ptr; DWORD dwLength; @@ -416,7 +416,7 @@ wcscat (szLinkPath, L".lnk"); DPRINT ("Link path: '%S'\n", szLinkPath); - return DeleteFile (szLinkPath); + return DeleteFileW (szLinkPath); } @@ -657,7 +657,7 @@ WCHAR szLinkPath[MAX_PATH]; WCHAR szArguments[MAX_PATH]; WCHAR szCommand[MAX_PATH]; - WIN32_FIND_DATA FindData; + WIN32_FIND_DATAW FindData; HANDLE hFind; LPWSTR Ptr; DWORD dwLength; _____ Modified: branches/xmlbuildsystem/reactos/lib/userenv/registry.c --- branches/xmlbuildsystem/reactos/lib/userenv/registry.c 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/lib/userenv/registry.c 2005-04-10 19:44:11 UTC (rev 14582) @@ -206,7 +206,7 @@ return FALSE; } - if (RegSetValueEx (hDstKey, + if (RegSetValueExW (hDstKey, lpNameBuffer, 0, dwType, _____ Modified: branches/xmlbuildsystem/reactos/lib/userenv/setup.c --- branches/xmlbuildsystem/reactos/lib/userenv/setup.c 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/lib/userenv/setup.c 2005-04-10 19:44:11 UTC (rev 14582) @@ -110,7 +110,7 @@ HKEY hKey; /* Load profiles directory path */ - if (!LoadString(hInstance, + if (!LoadStringW(hInstance, IDS_PROFILEPATH, szBuffer, MAX_PATH)) @@ -289,7 +289,7 @@ } /* Set 'Fonts' folder path */ - GetWindowsDirectory(szBuffer, MAX_PATH); + GetWindowsDirectoryW(szBuffer, MAX_PATH); wcscat(szBuffer, L"\\media\\fonts"); dwLength = (wcslen(szBuffer) + 1) * sizeof(WCHAR); @@ -541,7 +541,7 @@ RegCloseKey(hKey); /* Load 'Program Files' location */ - if (!LoadString(hInstance, + if (!LoadStringW(hInstance, IDS_PROGRAMFILES, szBuffer, MAX_PATH)) _____ Modified: branches/xmlbuildsystem/reactos/lib/winmm/winmm.xml --- branches/xmlbuildsystem/reactos/lib/winmm/winmm.xml 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/lib/winmm/winmm.xml 2005-04-10 19:44:11 UTC (rev 14582) @@ -1,4 +1,4 @@ -<module name="winmm" type="win32dll" baseaddress="${BASEADDRESS_WINMM}" installbase="system32" installname="winmm.dll"> +<module name="winmm" type="win32dll" baseaddress="${BASEADDRESS_WINMM}" installbase="system32" installname="winmm.dll" warnings="true"> <importlibrary definition="winmm.spec.def" /> <include base="winmm">.</include> <include base="ReactOS">include/wine</include> _____ Modified: branches/xmlbuildsystem/reactos/subsys/system/calc/calc.xml --- branches/xmlbuildsystem/reactos/subsys/system/calc/calc.xml 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/subsys/system/calc/calc.xml 2005-04-10 19:44:11 UTC (rev 14582) @@ -1,4 +1,4 @@ -<module name="calc" type="win32gui" installbase="system32" installname="calc.exe"> +<module name="calc" type="win32gui" installbase="system32" installname="calc.exe" warnings="true"> <include base="calc">.</include> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x0501</define> _____ Modified: branches/xmlbuildsystem/reactos/subsys/system/directory.xml --- branches/xmlbuildsystem/reactos/subsys/system/directory.xml 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/subsys/system/directory.xml 2005-04-10 19:44:11 UTC (rev 14582) @@ -16,6 +16,9 @@ <directory name="format"> <xi:include href="format/format.xml" /> </directory> +<directory name="msiexec"> + <xi:include href="msiexec/msiexec.xml" /> +</directory> <directory name="notepad"> <xi:include href="notepad/notepad.xml" /> </directory> _____ Added: branches/xmlbuildsystem/reactos/subsys/system/msiexec/msiexec.xml --- branches/xmlbuildsystem/reactos/subsys/system/msiexec/msiexec.xml 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/subsys/system/msiexec/msiexec.xml 2005-04-10 19:44:11 UTC (rev 14582) @@ -0,0 +1,19 @@ +<module name="msiexec" type="win32gui" installbase="system32" installname="msiexec.exe" warnings="true"> + <include base="msiexec">.</include> + <include base="ReactOS">include/wine</include> + <define name="__REACTOS__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x501</define> + <define name="_WIN32_WINNT">0x501</define> + <define name="WINVER">0x501</define> + <library>uuid</library> + <library>wine</library> + <library>ntdll</library> + <library>kernel32</library> + <library>user32</library> + <library>advapi32</library> + <library>ole32</library> + <library>msi</library> + <file>msiexec.c</file> + <file>version.rc</file> +</module> Property changes on: branches/xmlbuildsystem/reactos/subsys/system/msiexec/msiexec.xml ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: branches/xmlbuildsystem/reactos/subsys/system/regedit/childwnd.c --- branches/xmlbuildsystem/reactos/subsys/system/regedit/childwnd.c 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/subsys/system/regedit/childwnd.c 2005-04-10 19:44:11 UTC (rev 14582) @@ -131,7 +131,7 @@ * WM_DESTROY - post a quit message and return * */ -INT_PTR CALLBACK +LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) { static short last_split; _____ Modified: branches/xmlbuildsystem/reactos/subsys/system/regedit/edit.c --- branches/xmlbuildsystem/reactos/subsys/system/regedit/edit.c 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/subsys/system/regedit/edit.c 2005-04-10 19:44:11 UTC (rev 14582) @@ -271,7 +271,6 @@ INT_PTR CALLBACK modify_dword_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { WNDPROC oldproc; - TCHAR* valueData; HWND hwndValue; int len; TCHAR ValueString[32]; @@ -398,7 +397,6 @@ INT_PTR CALLBACK modify_binary_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { - PVOID valueData; HWND hwndValue; int len; _____ Modified: branches/xmlbuildsystem/reactos/subsys/system/regedit/framewnd.c --- branches/xmlbuildsystem/reactos/subsys/system/regedit/framewnd.c 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/subsys/system/regedit/framewnd.c 2005-04-10 19:44:11 UTC (rev 14582) @@ -642,7 +642,7 @@ * */ -INT_PTR CALLBACK +LRESULT CALLBACK FrameWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) { switch (message) { _____ Modified: branches/xmlbuildsystem/reactos/subsys/system/regedit/hexedit.c --- branches/xmlbuildsystem/reactos/subsys/system/regedit/hexedit.c 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/subsys/system/regedit/hexedit.c 2005-04-10 19:44:11 UTC (rev 14582) @@ -21,6 +21,8 @@ #define WIN32_LEAN_AND_MEAN /* Exclude rarely-used stuff from Windows headers */ #include <windows.h> #include <commctrl.h> +#include <stdio.h> +#include <stdlib.h> #include <tchar.h> #include "hexedit.h" @@ -226,7 +228,7 @@ dx = hed->LeftMargin; /* draw address */ - _stprintf(addr, _T("%04X"), linestart); + _stprintf(addr, _T("%04lX"), linestart); TextOut(hDC, dx, dy, addr, 4); dx += ((4 + hed->AddressSpacing) * hed->CharWidth); @@ -273,7 +275,6 @@ static DWORD HEXEDIT_HitRegionTest(PHEXEDIT_DATA hed, POINTS pt) { - WINDOWINFO wi; [truncated at 1000 lines; 359 more skipped]

1 0

[ea] 14581: SM: initial work on SM_API_QUERY_INFORMATION (client side; ROS specific).
by ea＠svn.reactos.com 10 Apr '05

10 Apr '05

SM: initial work on SM_API_QUERY_INFORMATION (client side; ROS specific). SM: fixed connection data in callback SM->subsystem_server during ss registration Modified: trunk/reactos/include/sm/api.h Modified: trunk/reactos/include/sm/helper.h Modified: trunk/reactos/lib/smdll/query.c Modified: trunk/reactos/lib/smdll/smdll.def Deleted: trunk/reactos/lib/smdll/testapi.c Modified: trunk/reactos/lib/smlib/compses.c Modified: trunk/reactos/lib/smlib/connect.c Modified: trunk/reactos/lib/smlib/execpgm.c Modified: trunk/reactos/subsys/smss/client.c Modified: trunk/reactos/subsys/smss/smapi.c Modified: trunk/reactos/subsys/smss/smapicomp.c Modified: trunk/reactos/subsys/smss/smapiexec.c Modified: trunk/reactos/subsys/smss/smapiquery.c _____ Modified: trunk/reactos/include/sm/api.h --- trunk/reactos/include/sm/api.h 2005-04-10 17:03:40 UTC (rev 14580) +++ trunk/reactos/include/sm/api.h 2005-04-10 19:08:23 UTC (rev 14581) @@ -12,15 +12,16 @@ #pragma pack(push,4) -/* SmConnectApiPort */ +/* SmConnectApiPort (SS->SM) */ typedef struct _SM_CONNECT_DATA { - ULONG Subsystem; + USHORT SubSystemId; + WORD Unused; WCHAR SbName [SM_SB_NAME_MAX_LENGTH]; } SM_CONNECT_DATA, *PSM_CONNECT_DATA; -/* SmpConnectSbApiPort */ +/* SmpConnectSbApiPort (SM->SS) */ typedef struct _SB_CONNECT_DATA { ULONG SmApiMax; @@ -65,6 +66,47 @@ } SM_PORT_MESSAGE_EXECPGM, *PSM_PORT_MESSAGE_EXECPGM; +/*** 5 ****************************************************************/ + +#define SM_API_QUERY_INFORMATION 5 /* ask SM to send back some data */ + /* Note: this is not in NT */ +#define SM_QRYINFO_MAX_SS_COUNT 8 +#define SM_QRYINFO_MAX_ROOT_NODE 30 + +typedef enum { + SmBasicInformation = 0, + SmSubSystemInformation = 1, +} SM_INFORMATION_CLASS; + +typedef struct _SM_BASIC_INFORMATION +{ + USHORT SubSystemCount; + WORD Unused; + struct { + WORD Id; + WORD Flags; + DWORD ProcessId; + } SubSystem [SM_QRYINFO_MAX_SS_COUNT]; +} SM_BASIC_INFORMATION, *PSM_BASIC_INFORMATION; + +typedef struct _SM_SUBSYSTEM_INFORMATION +{ + WORD SubSystemId; + WORD Flags; + DWORD ProcessId; + WCHAR NameSpaceRootNode [SM_QRYINFO_MAX_ROOT_NODE]; +} SM_SUBSYSTEM_INFORMATION, *PSM_SUBSYSTEM_INFORMATION; + +typedef struct _SM_PORT_MESSAGE_QRYINFO +{ + SM_INFORMATION_CLASS SmInformationClass; + ULONG DataLength; + union { + SM_BASIC_INFORMATION BasicInformation; + SM_SUBSYSTEM_INFORMATION SubSystemInformation; + }; +} SM_PORT_MESSAGE_QRYINFO, * PSM_PORT_MESSAGE_QRYINFO; + /*** | ****************************************************************/ typedef struct _SM_PORT_MESSAGE @@ -72,12 +114,22 @@ /*** LPC common header ***/ LPC_MESSAGE Header; /*** SM common header ***/ - DWORD ApiIndex; - NTSTATUS Status; + struct { + DWORD ApiIndex; + NTSTATUS Status; + } SmHeader; /*** SM per API arguments ***/ union { - SM_PORT_MESSAGE_COMPSES CompSes; - SM_PORT_MESSAGE_EXECPGM ExecPgm; + union { + SM_PORT_MESSAGE_COMPSES CompSes; + SM_PORT_MESSAGE_EXECPGM ExecPgm; + SM_PORT_MESSAGE_QRYINFO QryInfo; + } Request; + union { + SM_PORT_MESSAGE_COMPSES CompSes; + SM_PORT_MESSAGE_EXECPGM ExecPgm; + SM_PORT_MESSAGE_QRYINFO QryInfo; + } Reply; }; } SM_PORT_MESSAGE, * PSM_PORT_MESSAGE; @@ -86,7 +138,7 @@ /*** MACRO ***********************************************************/ -#define SM_CONNECT_DATA_SIZE(m) ((m).Header.DataSize-sizeof(ULONG)) +#define SM_CONNECT_DATA_SIZE(m) ((m).Header.DataSize-sizeof(USHORT)-sizeof(WORD)) #define SM_PORT_DATA_SIZE(c) (sizeof(DWORD)+sizeof(NTSTATUS)+sizeof(c)) #define SM_PORT_MESSAGE_SIZE (sizeof(SM_PORT_MESSAGE)) _____ Modified: trunk/reactos/include/sm/helper.h --- trunk/reactos/include/sm/helper.h 2005-04-10 17:03:40 UTC (rev 14580) +++ trunk/reactos/include/sm/helper.h 2005-04-10 19:08:23 UTC (rev 14581) @@ -1,13 +1,17 @@ #if !defined(INCLUDE_SM_HELPER_H) #define INCLUDE_SM_HELPER_H +#if !defined(__SM_API_H) +#include <sm/api.h> +#endif + /* $Id$ */ /* smlib/connect.c */ NTSTATUS STDCALL SmConnectApiPort (IN PUNICODE_STRING pSbApiPortName OPTIONAL, IN HANDLE hSbApiPort OPTIONAL, - IN DWORD dwSubsystem OPTIONAL, /* pe.h */ + IN WORD wSubsystem OPTIONAL, /* pe.h */ IN OUT PHANDLE phSmApiPort); /* smlib/compses.c */ NTSTATUS STDCALL @@ -20,14 +24,11 @@ IN PUNICODE_STRING Pgm ); /* smdll/query.c */ -typedef enum { - SM_BASE_INFORMATION -} SM_INFORMATION_CLASS, *PSM_INFORMATION_CLASS; - NTSTATUS STDCALL -SmQuery (IN HANDLE SmApiPort, - IN SM_INFORMATION_CLASS SmInformationClass, - IN OUT PVOID Data, - IN OUT PULONG DataLength); +SmQueryInformation (IN HANDLE SmApiPort, + IN SM_INFORMATION_CLASS SmInformationClass, + IN OUT PVOID Data, + IN ULONG DataLength, + IN OUT PULONG ReturnedDataLength OPTIONAL); #endif /* ndef INCLUDE_SM_HELPER_H */ _____ Modified: trunk/reactos/lib/smdll/query.c --- trunk/reactos/lib/smdll/query.c 2005-04-10 17:03:40 UTC (rev 14580) +++ trunk/reactos/lib/smdll/query.c 2005-04-10 19:08:23 UTC (rev 14581) @@ -1,39 +1,105 @@ -/* $Id: compses.c 13731 2005-02-23 23:37:06Z ea $ +/* $Id$ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries * FILE: lib/smdll/query.c - * PURPOSE: Call SM API SM_API_QUERY (not in NT) + * PURPOSE: Call SM API SM_API_QUERY_INFORMATION (not in NT) */ #define NTOS_MODE_USER #include <ntos.h> -#include <sm/api.h> #include <sm/helper.h> #define NDEBUG #include <debug.h> + /********************************************************************** * NAME EXPORTED - * SmQuery/4 + * SmQueryInformation/5 * * DESCRIPTION + * Ask the SM to collect some data from its internal data + * structures and send it back. * * ARGUMENTS - * + * hSmApiPort: handle returned by SmConnectApiPort; + * SmInformationClass: an SM information class ID: + * SM_BASIC_INFORMATION: the number of registered subsystems + * Data: pointer to storage for the information to request; + * DataLength: length in bytes of the Data buffer; it must be + * set and must match the SmInformationClass info size; + * ReturnedDataLength: optional pointer to storage to receive + * the size of the returnede data. + * * RETURN VALUE + * STATUS_SUCCESS: OK you get what you asked for; + * STATUS_INFO_LENGTH_MISMATCH: you set DataLength to 0 or to a + * value that does not match whet the SmInformationClass + * requires; + * STATUS_INVALID_PARAMETER_2: bad information class; + * A port error. + * */ NTSTATUS STDCALL -SmQuery (IN HANDLE SmApiPort, - IN SM_INFORMATION_CLASS SmInformationClass, - IN OUT PVOID Data, - IN OUT PULONG DataLength) +SmQueryInformation (IN HANDLE hSmApiPort, + IN SM_INFORMATION_CLASS SmInformationClass, + IN OUT PVOID Data, + IN ULONG DataLength, + IN OUT PULONG ReturnedDataLength OPTIONAL) { - /* TODO */ - if(NULL != DataLength) + NTSTATUS Status = STATUS_SUCCESS; + SM_PORT_MESSAGE SmReqMsg; + + + if(0 == DataLength) { - *DataLength = 0; + return STATUS_INFO_LENGTH_MISMATCH; } - return STATUS_SUCCESS; + /* Marshal data in the port message */ + switch (SmInformationClass) + { + case SmBasicInformation: + if(DataLength != sizeof (SM_BASIC_INFORMATION)) + { + return STATUS_INFO_LENGTH_MISMATCH; + } + SmReqMsg.Request.QryInfo.SmInformationClass = SmBasicInformation; + SmReqMsg.Request.QryInfo.DataLength = DataLength; + SmReqMsg.Request.QryInfo.BasicInformation.SubSystemCount = 0; + break; + case SmSubSystemInformation: + if(DataLength != sizeof (SM_SUBSYSTEM_INFORMATION)) + { + return STATUS_INFO_LENGTH_MISMATCH; + } + SmReqMsg.Request.QryInfo.SmInformationClass = SmSubSystemInformation; + SmReqMsg.Request.QryInfo.DataLength = DataLength; + SmReqMsg.Request.QryInfo.SubSystemInformation.SubSystemId = + ((PSM_SUBSYSTEM_INFORMATION)Data)->SubSystemId; + break; + default: + return STATUS_INVALID_PARAMETER_2; + } + /* SM API to invoke */ + SmReqMsg.SmHeader.ApiIndex = SM_API_QUERY_INFORMATION; + + /* Prepare the port request message */ + SmReqMsg.Header.MessageType = LPC_NEW_MESSAGE; + SmReqMsg.Header.DataSize = SM_PORT_DATA_SIZE(SmReqMsg.Request); + SmReqMsg.Header.MessageSize = SM_PORT_MESSAGE_SIZE; + Status = NtRequestWaitReplyPort (hSmApiPort, (PLPC_MESSAGE) & SmReqMsg, (PLPC_MESSAGE) & SmReqMsg); + if (NT_SUCCESS(Status)) + { + /* Unmarshal data */ + RtlCopyMemory (Data, & SmReqMsg.Reply.QryInfo.BasicInformation, SmReqMsg.Reply.QryInfo.DataLength); + /* Use caller provided storage to store data size */ + if(NULL != ReturnedDataLength) + { + *ReturnedDataLength = SmReqMsg.Reply.QryInfo.DataLength; + } + return SmReqMsg.SmHeader.Status; + } + DPRINT("SMLIB: %s failed (Status=0x%08lx)\n", __FUNCTION__, Status); + return Status; } /* EOF */ _____ Modified: trunk/reactos/lib/smdll/smdll.def --- trunk/reactos/lib/smdll/smdll.def 2005-04-10 17:03:40 UTC (rev 14580) +++ trunk/reactos/lib/smdll/smdll.def 2005-04-10 19:08:23 UTC (rev 14581) @@ -3,4 +3,4 @@ SmCompleteSession@12 SmConnectApiPort@16 SmExecuteProgram@8 -SmQuery@16 +SmQueryInformation@20 _____ Deleted: trunk/reactos/lib/smdll/testapi.c --- trunk/reactos/lib/smdll/testapi.c 2005-04-10 17:03:40 UTC (rev 14580) +++ trunk/reactos/lib/smdll/testapi.c 2005-04-10 19:08:23 UTC (rev 14581) @@ -1,20 +0,0 @@ -/* $Id$ */ -#define NTOS_MODE_USER -#include <ntos.h> -#include <sm/api.h> - -VOID STDCALL SmPrintPortMessage (PSM_PORT_MESSAGE SmMessage) -{ - DbgPrint ("SM_PORT_MESSAGE %08lx:\n", (ULONG) SmMessage); - DbgPrint (" Header:\n"); - DbgPrint (" MessageType = %u\n", SmMessage->Header.MessageType); - DbgPrint (" DataSize = %d\n", SmMessage->Header.DataSize); - DbgPrint (" MessageSize = %d\n", SmMessage->Header.MessageSize); - DbgPrint (" ApiIndex = %ld\n", SmMessage->ApiIndex); - DbgPrint (" Status = %08lx\n", SmMessage->Status); - DbgPrint (" ExecPgm:\n"); - DbgPrint (" NameLength = %ld\n", SmMessage->ExecPgm.NameLength); - DbgPrint (" Name = %ls\n", (LPWSTR) & SmMessage->ExecPgm.Name); -} -/* EOF */ - _____ Modified: trunk/reactos/lib/smlib/compses.c --- trunk/reactos/lib/smlib/compses.c 2005-04-10 17:03:40 UTC (rev 14580) +++ trunk/reactos/lib/smlib/compses.c 2005-04-10 19:08:23 UTC (rev 14581) @@ -7,7 +7,6 @@ */ #define NTOS_MODE_USER #include <ntos.h> -#include <sm/api.h> #include <sm/helper.h> #define NDEBUG @@ -42,20 +41,20 @@ DPRINT("SMLIB: %s called\n", __FUNCTION__); /* Marshal Ses in the LPC message */ - SmReqMsg.CompSes.hApiPort = hApiPort; - SmReqMsg.CompSes.hSbApiPort = hSbApiPort; + SmReqMsg.Request.CompSes.hApiPort = hApiPort; + SmReqMsg.Request.CompSes.hSbApiPort = hSbApiPort; /* SM API to invoke */ - SmReqMsg.ApiIndex = SM_API_COMPLETE_SESSION; + SmReqMsg.SmHeader.ApiIndex = SM_API_COMPLETE_SESSION; /* Port message */ SmReqMsg.Header.MessageType = LPC_NEW_MESSAGE; - SmReqMsg.Header.DataSize = SM_PORT_DATA_SIZE(SmReqMsg.CompSes); + SmReqMsg.Header.DataSize = SM_PORT_DATA_SIZE(SmReqMsg.Request); SmReqMsg.Header.MessageSize = SM_PORT_MESSAGE_SIZE; Status = NtRequestWaitReplyPort (hSmApiPort, (PLPC_MESSAGE) & SmReqMsg, (PLPC_MESSAGE) & SmReqMsg); if (NT_SUCCESS(Status)) { - return SmReqMsg.Status; + return SmReqMsg.SmHeader.Status; } DPRINT("SMLIB: %s failed (Status=0x%08lx)\n", __FUNCTION__, Status); return Status; _____ Modified: trunk/reactos/lib/smlib/connect.c --- trunk/reactos/lib/smlib/connect.c 2005-04-10 17:03:40 UTC (rev 14580) +++ trunk/reactos/lib/smlib/connect.c 2005-04-10 19:08:23 UTC (rev 14581) @@ -7,7 +7,6 @@ */ #define NTOS_MODE_USER #include <ntos.h> -#include <sm/api.h> #include <sm/helper.h> #include <pe.h> @@ -25,26 +24,34 @@ * ARGUMENTS * pSbApiPortName: name of the Sb port the calling subsystem * server already created in the system name space; - * hSbApiPort: LPC port handle (checked, but not used); - * dwSubsystem: a valid IMAGE_SUBSYSTEM_xxx value; + * hSbApiPort: LPC port handle (checked, but not used: the + * subsystem is required to have already created + * the callback port before it connects to the SM); + * wSubsystem: a valid IMAGE_SUBSYSTEM_xxx value; * phSmApiPort: a pointer to a HANDLE, which will be * filled with a valid client-side LPC comm port. + * + * There should be only two ways to call this API: + * a) subsystems willing to register with SM will use it + * with full parameters (the function checks them); + * b) regular SM clients, will set to 0 the 1st, the 2nd, + * and the 3rd parameter. * * RETURN VALUE * If all three optional values are omitted, an LPC status. * STATUS_INVALID_PARAMETER_MIX if PortName is defined and - * both hSbApiPort and dwSubsystem are 0. + * both hSbApiPort and wSubsystem are 0. */ NTSTATUS STDCALL SmConnectApiPort (IN PUNICODE_STRING pSbApiPortName OPTIONAL, IN HANDLE hSbApiPort OPTIONAL, - IN DWORD dwSubsystem OPTIONAL, + IN WORD wSubSystemId OPTIONAL, IN OUT PHANDLE phSmApiPort) { UNICODE_STRING SmApiPortName; SECURITY_QUALITY_OF_SERVICE SecurityQos; NTSTATUS Status = STATUS_SUCCESS; - SM_CONNECT_DATA ConnectData = {0,{0}}; + SM_CONNECT_DATA ConnectData = {0,0,{0}}; ULONG ConnectDataLength = 0; DPRINT("SMLIB: %s called\n", __FUNCTION__); @@ -55,12 +62,13 @@ { return STATUS_INVALID_PARAMETER_1; } - if (NULL == hSbApiPort || IMAGE_SUBSYSTEM_UNKNOWN == dwSubsystem) + if (NULL == hSbApiPort || IMAGE_SUBSYSTEM_UNKNOWN == wSubSystemId) { return STATUS_INVALID_PARAMETER_MIX; } RtlZeroMemory (& ConnectData, sizeof ConnectData); - ConnectData.Subsystem = dwSubsystem; + ConnectData.Unused = 0; + ConnectData.SubSystemId = wSubSystemId; if (pSbApiPortName->Length > 0) { RtlCopyMemory (& ConnectData.SbName, _____ Modified: trunk/reactos/lib/smlib/execpgm.c --- trunk/reactos/lib/smlib/execpgm.c 2005-04-10 17:03:40 UTC (rev 14580) +++ trunk/reactos/lib/smlib/execpgm.c 2005-04-10 19:08:23 UTC (rev 14581) @@ -7,7 +7,6 @@ */ #define NTOS_MODE_USER #include <ntos.h> -#include <sm/api.h> #include <sm/helper.h> #include <string.h> @@ -41,7 +40,8 @@ SM_PORT_MESSAGE SmReqMsg; - DPRINT("SMLIB: %s called\n", __FUNCTION__); + DPRINT("SMLIB: %s(%08lx,'%S') called\n", + __FUNCTION__, hSmApiPort, Pgm->Buffer); /* Check Pgm's length */ if (Pgm->Length > (sizeof (Pgm->Buffer[0]) * SM_EXEXPGM_MAX_LENGTH)) @@ -50,24 +50,35 @@ } /* Marshal Pgm in the LPC message */ RtlZeroMemory (& SmReqMsg, sizeof SmReqMsg); - SmReqMsg.ExecPgm.NameLength = Pgm->Length; - RtlCopyMemory (SmReqMsg.ExecPgm.Name, + SmReqMsg.Request.ExecPgm.NameLength = Pgm->Length; + RtlCopyMemory (SmReqMsg.Request.ExecPgm.Name, Pgm->Buffer, Pgm->Length); /* SM API to invoke */ - SmReqMsg.ApiIndex = SM_API_EXECUTE_PROGRAMME; + SmReqMsg.SmHeader.ApiIndex = SM_API_EXECUTE_PROGRAMME; /* LPC message */ SmReqMsg.Header.MessageType = LPC_NEW_MESSAGE; - SmReqMsg.Header.DataSize = SM_PORT_DATA_SIZE(SmReqMsg.ExecPgm); + SmReqMsg.Header.DataSize = SM_PORT_DATA_SIZE(SmReqMsg.Request); SmReqMsg.Header.MessageSize = SM_PORT_MESSAGE_SIZE; + DPRINT("SMLIB: %s:\n" + " MessageType = %d\n" + " DataSize = %d\n" + " MessageSize = %d\n" + " sizeof(LPC_MESSAGE)==%d\n", + __FUNCTION__, + SmReqMsg.Header.MessageType, + SmReqMsg.Header.DataSize, + SmReqMsg.Header.MessageSize, + sizeof(LPC_MESSAGE)); + /* Call SM and wait for a reply */ Status = NtRequestWaitReplyPort (hSmApiPort, (PLPC_MESSAGE) & SmReqMsg, (PLPC_MESSAGE) & SmReqMsg); if (NT_SUCCESS(Status)) { - return SmReqMsg.Status; + return SmReqMsg.SmHeader.Status; } DPRINT("SMLIB: %s failed (Status=0x%08lx)\n", __FUNCTION__, Status); return Status; _____ Modified: trunk/reactos/subsys/smss/client.c --- trunk/reactos/subsys/smss/client.c 2005-04-10 17:03:40 UTC (rev 14580) +++ trunk/reactos/subsys/smss/client.c 2005-04-10 19:08:23 UTC (rev 14581) @@ -166,14 +166,14 @@ /* * Check if a client for the ID already exist. */ - if (SmpLookupClient(ConnectData->Subsystem)) + if (SmpLookupClient(ConnectData->SubSystemId)) { DPRINT("SM: %s: attempt to register again subsystem %d.\n", __FUNCTION__, - ConnectData->Subsystem); + ConnectData->SubSystemId); return STATUS_UNSUCCESSFUL; } - DPRINT("SM: %s: registering subsystem %d \n", __FUNCTION__, ConnectData->Subsystem); + DPRINT("SM: %s: registering subsystem ID=%d \n", __FUNCTION__, ConnectData->SubSystemId); /* * Allocate the storage for client data */ @@ -188,7 +188,7 @@ /* * Initialize the client data */ - pClient->SubsystemId = ConnectData->Subsystem; + pClient->SubsystemId = ConnectData->SubSystemId; /* SM auto-initializes; other subsystems are required to call * SM_API_COMPLETE_SESSION via SMDLL. */ pClient->Initialized = (IMAGE_SUBSYSTEM_NATIVE == pClient->SubsystemId); _____ Modified: trunk/reactos/subsys/smss/smapi.c --- trunk/reactos/subsys/smss/smapi.c 2005-04-10 17:03:40 UTC (rev 14580) +++ trunk/reactos/subsys/smss/smapi.c 2005-04-10 19:08:23 UTC (rev 14581) @@ -21,7 +21,7 @@ SMAPI(SmInvalid) { DPRINT("SM: %s called\n",__FUNCTION__); - Request->Status = STATUS_NOT_IMPLEMENTED; + Request->SmHeader.Status = STATUS_NOT_IMPLEMENTED; return STATUS_SUCCESS; } @@ -67,10 +67,12 @@ PSM_CONNECT_DATA ConnectData = SmpGetConnectData (Request); UNICODE_STRING CallbackPortName; ULONG CallbackPortNameLength = SM_SB_NAME_MAX_LENGTH; /* TODO: compute length */ + SB_CONNECT_DATA SbConnectData; + ULONG SbConnectDataLength = sizeof SbConnectData; DPRINT("SM: %s called\n", __FUNCTION__); - if(IMAGE_SUBSYSTEM_NATIVE == ConnectData->Subsystem) + if(IMAGE_SUBSYSTEM_NATIVE == ConnectData->SubSystemId) { DPRINT("SM: %s: we do not need calling back SM!\n", __FUNCTION__); @@ -81,14 +83,16 @@ CallbackPortNameLength); RtlInitUnicodeString (& CallbackPortName, ClientData->SbApiPortName); + + SbConnectData.SmApiMax = (sizeof SmApi / sizeof SmApi[0]); Status = NtConnectPort (& ClientData->SbApiPort, & CallbackPortName, NULL, NULL, NULL, NULL, - NULL, - NULL); + & SbConnectData, + & SbConnectDataLength); return Status; } @@ -138,13 +142,13 @@ Reply = NULL; break; default: - if ((Request.ApiIndex) && - (Request.ApiIndex < (sizeof SmApi / sizeof SmApi[0]))) + if ((Request.SmHeader.ApiIndex) && + (Request.SmHeader.ApiIndex < (sizeof SmApi / sizeof SmApi[0]))) { - Status = SmApi[Request.ApiIndex](&Request); + Status = SmApi[Request.SmHeader.ApiIndex](&Request); Reply = (PLPC_MESSAGE) & Request; } else { - Request.Status = STATUS_NOT_IMPLEMENTED; + Request.SmHeader.Status = STATUS_NOT_IMPLEMENTED; Reply = (PLPC_MESSAGE) & Request; } } @@ -181,11 +185,11 @@ PVOID Context = NULL; DPRINT("SM: %s called:\n SubSystemID=%d\n SbName=\"%S\"\n", - __FUNCTION__, ConnectData->Subsystem, ConnectData->SbName); + __FUNCTION__, ConnectData->SubSystemId, ConnectData->SbName); if(sizeof (SM_CONNECT_DATA) == Request->Header.DataSize) { - if(IMAGE_SUBSYSTEM_UNKNOWN == ConnectData->Subsystem) + if(IMAGE_SUBSYSTEM_UNKNOWN == ConnectData->SubSystemId) { /* * This is not a call to register an image set, @@ -202,9 +206,9 @@ * Reject GUIs classes: only odd subsystem IDs are * allowed to register here (tty mode images). */ - if(1 == (ConnectData->Subsystem % 2)) + if(1 == (ConnectData->SubSystemId % 2)) { - DPRINT("SM: %s: id = %d\n", __FUNCTION__, ConnectData->Subsystem); + DPRINT("SM: %s: id = %d\n", __FUNCTION__, ConnectData->SubSystemId); /* * SmCreateClient/2 is called here explicitly to *fail*. * If it succeeds, there is something wrong in the @@ -236,7 +240,7 @@ } else { DPRINT("SM: %s: SmpCallbackServer failed (Status=%08lx)\n", __FUNCTION__, Status); - Status = SmDestroyClient (ConnectData->Subsystem); + Status = SmDestroyClient (ConnectData->SubSystemId); } } } _____ Modified: trunk/reactos/subsys/smss/smapicomp.c --- trunk/reactos/subsys/smss/smapicomp.c 2005-04-10 17:03:40 UTC (rev 14580) +++ trunk/reactos/subsys/smss/smapicomp.c 2005-04-10 19:08:23 UTC (rev 14581) @@ -36,15 +36,12 @@ { NTSTATUS Status = STATUS_SUCCESS; - DPRINT("SM: %s called from [%lx|%lx]\n", - __FUNCTION__, - Request->ClientId.UniqueProcessId, - Request->ClientId.UniqueThreadId); + DPRINT("SM: %s called\n", __FUNCTION__); Status = SmCompleteClientInitialization (Request->Header.ClientId.UniqueProcess); if(!NT_SUCCESS(Status)) { - Request->Status = STATUS_UNSUCCESSFUL; + Request->SmHeader.Status = STATUS_UNSUCCESSFUL; } return Status; } _____ Modified: trunk/reactos/subsys/smss/smapiexec.c --- trunk/reactos/subsys/smss/smapiexec.c 2005-04-10 17:03:40 UTC (rev 14580) +++ trunk/reactos/subsys/smss/smapiexec.c 2005-04-10 19:08:23 UTC (rev 14581) @@ -253,7 +253,7 @@ DPRINT("SM: %s called from CID(%lx|%lx)\n", __FUNCTION__, Request->Header.ClientId.UniqueProcess, Request->Header.ClientId.UniqueThread); - ExecPgm = & Request->ExecPgm; + ExecPgm = & Request->Request.ExecPgm; /* Check if the name lenght is valid */ if((ExecPgm->NameLength > 0) && (ExecPgm->NameLength <= SM_EXEXPGM_MAX_LENGTH) && @@ -277,7 +277,7 @@ * independent process; now it is embedded in the * SM for performance or security. */ - Request->Status = SmInitializeDbgSs(); + Request->SmHeader.Status = SmInitializeDbgSs(); } else { @@ -299,20 +299,20 @@ wcscat (ImagePath, Data); /* Create native process */ - Request->Status = SmCreateUserProcess(ImagePath, + Request->SmHeader.Status = SmCreateUserProcess(ImagePath, L"", /* FIXME */ FALSE, /* wait */ NULL, FALSE, /* terminate */ NULL); }else{ - Request->Status = Status; + Request->SmHeader.Status = Status; } } } else { - Request->Status = Status = STATUS_INVALID_PARAMETER; + Request->SmHeader.Status = Status = STATUS_INVALID_PARAMETER; } return Status; } _____ Modified: trunk/reactos/subsys/smss/smapiquery.c --- trunk/reactos/subsys/smss/smapiquery.c 2005-04-10 17:03:40 UTC (rev 14580) +++ trunk/reactos/subsys/smss/smapiquery.c 2005-04-10 19:08:23 UTC (rev 14581) @@ -38,7 +38,7 @@ DPRINT("SM: %s called\n", __FUNCTION__); - Request->Status = STATUS_NOT_IMPLEMENTED; + Request->SmHeader.Status = STATUS_NOT_IMPLEMENTED; return Status; }

1 0

[mbosma] 14580: PackageManager: Cmdline fix
by mbosma＠svn.reactos.com 10 Apr '05

10 Apr '05

PackageManager: Cmdline fix Modified: trunk/rosapps/packmgr/cmd-line/main.cpp Modified: trunk/rosapps/packmgr/lib/download.cpp Modified: trunk/rosapps/packmgr/lib/tree.cpp Modified: trunk/rosapps/packmgr/tree/mozcontrol.xml _____ Modified: trunk/rosapps/packmgr/cmd-line/main.cpp --- trunk/rosapps/packmgr/cmd-line/main.cpp 2005-04-10 16:45:30 UTC (rev 14579) +++ trunk/rosapps/packmgr/cmd-line/main.cpp 2005-04-10 17:03:40 UTC (rev 14580) @@ -90,6 +90,25 @@ return 0; } + +int Ask (const WCHAR* question) +{ + char answer[255]; + + wprintf(question); + + cout << " [y/n] "; + cin >> answer; + cout << endl; + + if (answer[0]=='y') + return 1; + + else if (answer[0]=='n') + return 0; + + return Ask(question); +} int SetStatus (int status1, int status2, WCHAR* text) { @@ -125,14 +144,14 @@ int id = PML_FindItem(tree, cmdline[i].c_str()); if(id) - PML_SetAction(tree, id, 1, NULL); + PML_SetAction(tree, id, 1, NULL, Ask); else cout << "Could not find the Package \"" << cmdline[i] << "\"\n"; } // do it - error = PML_DoIt (tree, SetStatus); + error = PML_DoIt (tree, SetStatus, Ask); if(error) { wprintf(L"%s\n", PML_TransError(error)); @@ -168,15 +187,12 @@ { int id = PML_FindItem(tree, cmdline[i].c_str()); - cout << i << "<" << cmdline.size() << endl; - if(id) cout << PML_GetDescription (tree, id) << "\n"; else cout << "Could not find the Package \"" << cmdline[i] << "\"\n"; } - cout << i << "<" << cmdline.size() << endl; // clean up PML_CloseTree (tree); _____ Modified: trunk/rosapps/packmgr/lib/download.cpp --- trunk/rosapps/packmgr/lib/download.cpp 2005-04-10 16:45:30 UTC (rev 14579) +++ trunk/rosapps/packmgr/lib/download.cpp 2005-04-10 17:03:40 UTC (rev 14580) @@ -16,7 +16,7 @@ #include <wine/urlmon.h> // Server there all the files lie -const char* tree_server = "http://maarten-online.de/xml/"; +const char* tree_server = "http://svn.reactos.com/viewcvs/*checkout*/trunk/rosapps/packmgr/tree/"; HRESULT WINAPI URLDownloadToFileA( LPUNKNOWN pCaller, _____ Modified: trunk/rosapps/packmgr/lib/tree.cpp --- trunk/rosapps/packmgr/lib/tree.cpp 2005-04-10 16:45:30 UTC (rev 14579) +++ trunk/rosapps/packmgr/lib/tree.cpp 2005-04-10 17:03:40 UTC (rev 14580) @@ -99,7 +99,8 @@ // do some manipulation at the parent else { - tree->addItem(id, tree->packages[id].name, parents.back(), icon); + if(tree->addItem) + tree->addItem(id, tree->packages[id].name, parents.back(), icon); // list as child in the parent node tree->packages[parents.back()].children.push_back(id); _____ Modified: trunk/rosapps/packmgr/tree/mozcontrol.xml --- trunk/rosapps/packmgr/tree/mozcontrol.xml 2005-04-10 16:45:30 UTC (rev 14579) +++ trunk/rosapps/packmgr/tree/mozcontrol.xml 2005-04-10 17:03:40 UTC (rev 14580) @@ -1,7 +1,7 @@ <package> -<name>MozillaControl</name> -<description>Provide the Gekko Engine for ReactOS.</description> -<scripts inst="mozillacontrol.inst.rps" srcinst="mozillacontrol.inst.rps"/> - + <name>MozillaControl</name> + <description>Provide the Gekko Engine for ReactOS.</description> + <scripts inst="mozillacontrol.inst.rps" srcinst="mozillacontrol.inst.rps"/> + <depent>abiword</depent> </package>

1 0

[hbirr] 14579: Added dependency tracking.
by hbirr＠svn.reactos.com 10 Apr '05

10 Apr '05

Added dependency tracking. Modified: trunk/reactos/drivers/storage/floppy/GNUmakefile _____ Modified: trunk/reactos/drivers/storage/floppy/GNUmakefile --- trunk/reactos/drivers/storage/floppy/GNUmakefile 2005-04-10 16:44:00 UTC (rev 14578) +++ trunk/reactos/drivers/storage/floppy/GNUmakefile 2005-04-10 16:45:30 UTC (rev 14579) @@ -30,6 +30,8 @@ TARGET_OBJECTS = floppy.o csqrtns.o hardware.o readwrite.o ioctl.o TARGET_DDKLIBS = csq.a +DEP_OBJECTS = $(TARGET_OBJECTS) + include $(PATH_TO_TOP)/rules.mak include $(TOOLS_PATH)/helper.mk - +include $(TOOLS_PATH)/depend.mk

1 0

[hbirr] 14578: Set a better value for gap3 on read/write requests.
by hbirr＠svn.reactos.com 10 Apr '05

10 Apr '05

Set a better value for gap3 on read/write requests. Modified: trunk/reactos/drivers/storage/floppy/readwrite.c _____ Modified: trunk/reactos/drivers/storage/floppy/readwrite.c --- trunk/reactos/drivers/storage/floppy/readwrite.c 2005-04-10 16:41:32 UTC (rev 14577) +++ trunk/reactos/drivers/storage/floppy/readwrite.c 2005-04-10 16:44:00 UTC (rev 14578) @@ -430,6 +430,7 @@ NTSTATUS Status; BOOLEAN DiskChanged; ULONG_PTR TransferByteOffset; + UCHAR Gap; PAGED_CODE(); @@ -523,6 +524,15 @@ } /* + * FIXME: + * FloppyDeviceData.ReadWriteGapLength specify the value for the physical drive. + * We should set this value depend on the format of the inserted disk and possible + * depend on the request (read or write). A value of 0 results in one rotation + * between the sectors (7.2sec for reading a track). + */ + Gap = DriveInfo->FloppyDeviceData.ReadWriteGapLength; + + /* * Set up DMA transfer * * This is as good of a place as any to document something that used to confuse me @@ -703,7 +713,7 @@ /* Issue the read/write command to the controller. Note that it expects the opposite of WriteToDevice. */ if(HwReadWriteData(DriveInfo->ControllerInfo, !WriteToDevice, DriveInfo->UnitNumber, Cylinder, Head, StartSector, - DriveInfo->BytesPerSectorCode, DriveInfo->DiskGeometry.SectorsPerTrack, 0, 0xff) != STATUS_SUCCESS) + DriveInfo->BytesPerSectorCode, DriveInfo->DiskGeometry.SectorsPerTrack, Gap, 0xff) != STATUS_SUCCESS) { KdPrint(("floppy: ReadWritePassive(): HwReadWriteData returned failure; unable to read; completing with STATUS_UNSUCCESSFUL\n")); RWFreeAdapterChannel(DriveInfo->ControllerInfo->AdapterObject);

1 0

[hbirr] 14577: Made the hard coded value for the HUT a little bit longer.
by hbirr＠svn.reactos.com 10 Apr '05

10 Apr '05

Made the hard coded value for the HUT a little bit longer. Modified: trunk/reactos/drivers/storage/floppy/hardware.c _____ Modified: trunk/reactos/drivers/storage/floppy/hardware.c --- trunk/reactos/drivers/storage/floppy/hardware.c 2005-04-10 15:34:15 UTC (rev 14576) +++ trunk/reactos/drivers/storage/floppy/hardware.c 2005-04-10 16:41:32 UTC (rev 14577) @@ -991,7 +991,7 @@ Buffer[1] = (StepRateTime << 4) + HeadUnloadTime; Buffer[2] = (HeadLoadTime << 1) + (NonDma ? 1 : 0); */ - Buffer[1] = 0xd1; + Buffer[1] = 0xdf; Buffer[2] = 0x2; //KdPrint(("HwSpecify: sending 0x%x 0x%x 0x%x to FIFO\n", Buffer[0], Buffer[1], Buffer[2]));

1 0

[mbosma] 14576: PackageManager: Depencies
by mbosma＠svn.reactos.com 10 Apr '05

10 Apr '05

PackageManager: Depencies Modified: trunk/rosapps/packmgr/gui/main.cpp Modified: trunk/rosapps/packmgr/gui/main.h Modified: trunk/rosapps/packmgr/lib/download.cpp Modified: trunk/rosapps/packmgr/lib/en.rc Modified: trunk/rosapps/packmgr/lib/error.h Modified: trunk/rosapps/packmgr/lib/main.cpp Modified: trunk/rosapps/packmgr/lib/package.cpp Modified: trunk/rosapps/packmgr/lib/package.hpp _____ Modified: trunk/rosapps/packmgr/gui/main.cpp --- trunk/rosapps/packmgr/gui/main.cpp 2005-04-10 14:32:30 UTC (rev 14575) +++ trunk/rosapps/packmgr/gui/main.cpp 2005-04-10 15:34:15 UTC (rev 14576) @@ -174,6 +174,17 @@ return 1; } +// Set the Icons +int Ask (const WCHAR* message) +{ + int ans = MessageBox (0,message,0,MB_YESNO); + + if(ans == IDYES) + return 1; + + return 0; +} + // En- or Disable a Button inside of the toolbar and the Context Menu int SetButton (DWORD id, BOOL state) { @@ -182,7 +193,12 @@ ti.cbSize = sizeof (ti); ti.dwMask = TBIF_STATE; - +/* + if(state&&id==1) + MessageBox(0,L"on",0,0); + else if(!state&&id==1) + MessageBox(0,L"off",0,0); +*/ if(state) ti.fsState = TBSTATE_ENABLED; else @@ -294,7 +310,7 @@ if(LOWORD(wParam) <= 5 && LOWORD(wParam) >= 1) { if(selected) - if(PML_SetAction(tree, selected, LOWORD(wParam)-1, SetIcon) == ERR_OK) + if(PML_SetAction(tree, selected, LOWORD(wParam)-1, SetIcon, Ask) == ERR_OK) break; MessageBeep(MB_ICONHAND); @@ -303,7 +319,7 @@ // DoIt else if(LOWORD(wParam)==6) { - if(PML_DoIt(tree, SetStatus) == ERR_OK) + if(PML_DoIt(tree, SetStatus, Ask) == ERR_OK) DialogBox(GetModuleHandle(NULL), MAKEINTRESOURCE(IDD_DOIT), hwnd, StatusProc); else MessageBeep(MB_ICONHAND); @@ -325,7 +341,7 @@ // prozess hotkeys case WM_HOTKEY: { - if(PML_SetAction(tree, selected, wParam, SetIcon) != ERR_OK) + if(PML_SetAction(tree, selected, wParam, SetIcon, Ask) != ERR_OK) MessageBeep(MB_ICONHAND); } break; _____ Modified: trunk/rosapps/packmgr/gui/main.h --- trunk/rosapps/packmgr/gui/main.h 2005-04-10 14:32:30 UTC (rev 14575) +++ trunk/rosapps/packmgr/gui/main.h 2005-04-10 15:34:15 UTC (rev 14576) @@ -35,6 +35,7 @@ int AddItem (int id, const char* name, int parent, int icon); int SetText (const char* text); int SetStatus (int status1, int status2, WCHAR* text); +int Ask (const WCHAR* message); /* Toolbar Releated */ _____ Modified: trunk/rosapps/packmgr/lib/download.cpp --- trunk/rosapps/packmgr/lib/download.cpp 2005-04-10 14:32:30 UTC (rev 14575) +++ trunk/rosapps/packmgr/lib/download.cpp 2005-04-10 15:34:15 UTC (rev 14576) @@ -16,7 +16,7 @@ #include <wine/urlmon.h> // Server there all the files lie -const char* tree_server = "http://svn.reactos.com/viewcvs/*checkout*/trunk/rosapps/packmgr/tree/"; +const char* tree_server = "http://maarten-online.de/xml/"; HRESULT WINAPI URLDownloadToFileA( LPUNKNOWN pCaller, _____ Modified: trunk/rosapps/packmgr/lib/en.rc --- trunk/rosapps/packmgr/lib/en.rc 2005-04-10 14:32:30 UTC (rev 14575) +++ trunk/rosapps/packmgr/lib/en.rc 2005-04-10 15:34:15 UTC (rev 14576) @@ -14,6 +14,10 @@ ERR_SYNATX "Error while Script Execution.\nWrong Synatx." ERR_CALL "Error while Script Execution.\nCould not find function." ERR_PARAMETER "Error while Script Execution.\nWrong Parameter(s)." + + ERR_DEP1 "To install this package you have to install the following package(s) as well:\n\n" + ERR_DEP2 "\nDo you want this ?" + ERR_READY "You choosen to install %d package(s). To install them you have to read and agree with each of thier licences.\n\n Do you want still want to ?" END /* EOF */ _____ Modified: trunk/rosapps/packmgr/lib/error.h --- trunk/rosapps/packmgr/lib/error.h 2005-04-10 14:32:30 UTC (rev 14575) +++ trunk/rosapps/packmgr/lib/error.h 2005-04-10 15:34:15 UTC (rev 14576) @@ -6,6 +6,10 @@ #define ERR_NOTODO 0x003 // without text yet #define ERR_PACK 0x004 +#define ERR_DEP1 0x005 +#define ERR_DEP2 0x006 +#define ERR_READY 0x007 + // Script #define ERR_SYNATX 0x011 #define ERR_CALL 0x012 _____ Modified: trunk/rosapps/packmgr/lib/main.cpp --- trunk/rosapps/packmgr/lib/main.cpp 2005-04-10 14:32:30 UTC (rev 14575) +++ trunk/rosapps/packmgr/lib/main.cpp 2005-04-10 15:34:15 UTC (rev 14576) @@ -102,7 +102,7 @@ // set all actions to none for(i=0; i<tree->packages.size(); i++) - PML_SetAction (tree, i, 0, tree->setIcon); + PML_SetAction (tree, i, 0, tree->setIcon, NULL); tree->setStatus(1000, ret, NULL); @@ -110,7 +110,7 @@ } // Do the actions the user wants us to do -extern "C" int PML_DoIt (TREE* tree, PML_SetStatus SetStatus) +extern "C" int PML_DoIt (TREE* tree, PML_SetStatus SetStatus, PML_Ask Ask) { DWORD dummy; tree->setStatus = SetStatus; @@ -118,6 +118,14 @@ if(!tree->todo.size()) return ERR_NOTODO; + //ask + WCHAR buffer [2000]; + wsprintf(buffer, PML_TransError(ERR_READY), tree->todo.size()); + + if(!Ask(buffer)) + return ERR_GENERIC; + + hThread = CreateThread(NULL, 0, DoitThread, tree, 0, &dummy); if(!hThread) _____ Modified: trunk/rosapps/packmgr/lib/package.cpp --- trunk/rosapps/packmgr/lib/package.cpp 2005-04-10 14:32:30 UTC (rev 14575) +++ trunk/rosapps/packmgr/lib/package.cpp 2005-04-10 15:34:15 UTC (rev 14576) @@ -58,6 +58,12 @@ else if(!strcmp(tag, "description")) pack->field = &pack->description; + + else if (!strcmp(tag, "depent")) + { + pack->depencies.push_back((char*)NULL); + pack->field = &pack->depencies.back(); + } } } @@ -82,7 +88,6 @@ (*pack->field)[len] = '\0'; } - // The user clicks on a package extern "C" int PML_LoadPackage (TREE* tree, int id, PML_SetButton SetButton) { @@ -138,7 +143,7 @@ } // The user chooses a actions like Install -extern "C" int PML_SetAction (TREE* tree, int id, int action, PML_SetIcon SetIcon) +extern "C" int PML_SetAction (TREE* tree, int id, int action, PML_SetIcon SetIcon, PML_Ask Ask) { UINT i; int ret = ERR_OK; @@ -148,7 +153,7 @@ // if we have children, same action for them for (i=0; i<pack->children.size(); i++) - ret = ret || PML_SetAction(tree, pack->children[i], action, SetIcon); + ret = ret || PML_SetAction(tree, pack->children[i], action, SetIcon, Ask); // is the action possible ? if(!pack->actions[action]) @@ -158,11 +163,66 @@ if(pack->action == action) return ERR_OK; + // + if(pack->depencies.size() && action) + { + UINT count = pack->depencies.size(); + WCHAR buffer[2000], buffer2[200]; + wcscpy(buffer, PML_TransError(ERR_DEP1)); + + for (i=0; i<pack->depencies.size(); i++) + { + int item = PML_FindItem(tree, pack->depencies[i]); + + if(!item) + return ERR_GENERIC; + + if(action == tree->packages[item].action)// || tree->packages[item].installed + { + count--; + continue; + } + + MultiByteToWideChar (CP_ACP, 0, pack->depencies[i], strlen(pack->depencies[i])+1, buffer2, 200); + wsprintf(buffer, L"%s - %s\n", buffer, buffer2);// + } + + wcscat(buffer, PML_TransError(ERR_DEP2)); + + if(count) + if(!Ask(buffer)) + return ERR_GENERIC; + + for (i=0; i<pack->depencies.size(); i++) + { + int item = PML_FindItem(tree, pack->depencies[i]); + + tree->packages[item].neededBy.push_back(id); + + PML_SetAction(tree, item, action, SetIcon, Ask); + } + } + + // load it if it's not loaded yet + else if (!pack->loaded && pack->path) + { + PML_XmlDownload (pack->path, (void*)pack, pack_start, pack_end, pack_text); + pack->loaded = TRUE; + + return PML_SetAction(tree, id, action, SetIcon, Ask); + } + // set the icon - if(!pack->icon) - if(SetIcon) + if(SetIcon && !pack->icon) SetIcon(id, action); + // set the button(s) + if(tree->setButton && action != 2) + { + tree->setButton(1, action); + //tree->setButton(pack->action+1, action); + } + // can't do src install yet if(action == 2) { @@ -177,19 +237,13 @@ if(tree->setButton) tree->setButton(1, 1); //tree->setButton(action+1, 0); + pack->action = action; // root notes (like network) return here if(!pack->path) return ret; - // load it if it's not loaded yet - if(!pack->loaded) - { - PML_XmlDownload (pack->path, (void*)pack, pack_start, pack_end, pack_text); - pack->loaded = TRUE; - } - // save the name of the corresponding script in a vector tree->todo.push_back(pack->files[action-1]); } @@ -197,10 +251,16 @@ // undoing else { - // set other things back - if(tree->setButton) - tree->setButton(1, 0); - //tree->setButton(pack->action+1, 1); + for(i=0; i<pack->neededBy.size(); i++) + { + if(tree->packages[pack->neededBy[i]].action) + { + SetIcon(id, pack->action); + return ERR_GENERIC; + } + } + + // set action back pack->action = 0; // root notes (like network) return here @@ -211,8 +271,6 @@ for(i=0; i<tree->todo.size(); i++) if(!strcmp(tree->todo[i], pack->files[pack->action-1])) // look for right entry tree->todo.erase(tree->todo.begin()+i); // delete it - - return ERR_OK; } return ret; _____ Modified: trunk/rosapps/packmgr/lib/package.hpp --- trunk/rosapps/packmgr/lib/package.hpp 2005-04-10 14:32:30 UTC (rev 14575) +++ trunk/rosapps/packmgr/lib/package.hpp 2005-04-10 15:34:15 UTC (rev 14576) @@ -18,6 +18,7 @@ typedef int (*PML_SetButton) (DWORD dwID, BOOL state); typedef int (*PML_SetIcon) (int id, int icon); typedef int (*PML_SetText) (const char* text); +typedef int (*PML_Ask) (const WCHAR* text); /* Structs */ @@ -32,6 +33,8 @@ char** field; char* name; char* description; + vector<char*> depencies; + vector<int> neededBy; int action; char* files [4]; @@ -74,8 +77,8 @@ int PML_FindItem (TREE* tree, const char* what); int PML_LoadPackage (pTree, int id, PML_SetButton); char* PML_GetDescription (TREE* tree, int id); - int PML_SetAction (pTree, int package, int action, PML_SetIcon); - int PML_DoIt (pTree, PML_SetStatus); + int PML_SetAction (pTree, int package, int action, PML_SetIcon, PML_Ask); + int PML_DoIt (pTree, PML_SetStatus, PML_Ask); void PML_CloseTree (pTree); }

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